build: produce metadata bundles for @angular modules (#14509)

Closes #14509

integration/hello_world__closure/bundle.sh

@@ -35,6 +35,7 @@ CLOSURE_ARGS=(
   node_modules/zone.js/dist/zone.js
   $(find -L vendor/rxjs -name *.js)
   node_modules/@angular/{core,common,compiler,platform-browser}/index.js
+  node_modules/@angular/{core,common}/public_api.js
   $(find node_modules/@angular/{core,common,compiler,platform-browser}/src -name *.js)
   "built/src/*.js"
   "--entry_point=./built/src/main"

modules/@angular/animation/index.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
+// This file is not used to build this module. It is only used during editing
- * @module
+// by the TypeScript language serivce and during build for verifcation. `ngc`
- * @description
+// replaces this file with production index.ts when it rewrites private symbol
- * Entry point for all public APIs of the animation package.
+// names.
- */
+
-export * from './src/animation';
+export * from './public_api';

modules/@angular/animation/public_api.ts

@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the animation package.
+ */
+export * from './src/animation';

modules/@angular/animation/tsconfig-build.json

@@ -20,12 +20,14 @@
     "types": []
   },
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts",
     "../../system.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/animation"
   }
 }

modules/@angular/common/index.ts

@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
+// This file is not used to build this module. It is only used during editing
- * @module
+// by the TypeScript language serivce and during build for verifcation. `ngc`
- * @description
+// replaces this file with production index.ts when it rewrites private symbol
- * Entry point for all public APIs of the common package.
+// names.
- */
-export * from './src/common';
 
-// This file only reexports content of the `src` folder. Keep it that way.
+export * from './public_api';

modules/@angular/common/public_api.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the common package.
+ */
+export * from './src/common';
+
+// This file only reexports content of the `src` folder. Keep it that way.

modules/@angular/common/src/common.ts

@@ -13,7 +13,7 @@
  */
 export * from './location/index';
 export {NgLocaleLocalization, NgLocalization} from './localization';
-export {CommonModule} from './common_module';
+export {CommonModule, DeprecatedCommonModule} from './common_module';
 export {NgClass, NgFor, NgForOf, NgIf, NgPlural, NgPluralCase, NgStyle, NgSwitch, NgSwitchCase, NgSwitchDefault, NgTemplateOutlet, NgComponentOutlet} from './directives/index';
 export {AsyncPipe, DatePipe, I18nPluralPipe, I18nSelectPipe, JsonPipe, LowerCasePipe, CurrencyPipe, DecimalPipe, PercentPipe, SlicePipe, UpperCasePipe, TitleCasePipe} from './pipes/index';
 export {VERSION} from './version';

modules/@angular/common/src/common_module.ts

@@ -32,7 +32,9 @@ export class CommonModule {
 
 /**
  * A module to contain deprecated directives.
+ *
+ * @deprecated
  */
 @NgModule({declarations: [COMMON_DEPRECATED_DIRECTIVES], exports: [COMMON_DEPRECATED_DIRECTIVES]})
-export class CommonDeprecatedModule {
+export class DeprecatedCommonModule {
 }

modules/@angular/common/tsconfig-build.json

@@ -20,11 +20,13 @@
     "types": []
   },
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/common"
   }
 }

modules/@angular/compiler-cli/integrationtest/test/test_summaries.ts

@@ -31,8 +31,9 @@ function main() {
 
   class AssertingHostContext extends NodeCompilerHostContext {
     readFile(fileName: string): string {
-      if (/.*\/node_modules\/.*/.test(fileName) && !/.*ngsummary\.json$/.test(fileName)) {
+      if (/.*\/node_modules\/.*/.test(fileName) && !/.*ngsummary\.json$/.test(fileName) &&
-        // Only allow to read summaries from node_modules
+          !/package\.json$/.test(fileName)) {
+        // Only allow to read summaries and package.json files from node_modules
         return null;
       }
       readFiles.push(path.relative(basePath, fileName));

modules/@angular/compiler-cli/src/ngtools_impl.ts

@@ -17,7 +17,7 @@ import {NgModule} from '@angular/core';
 
 // We cannot depend directly to @angular/router.
 type Route = any;
-const ROUTER_MODULE_PATH = '@angular/router/src/router_config_loader';
+const ROUTER_MODULE_PATH = '@angular/router';
 const ROUTER_ROUTES_SYMBOL_NAME = 'ROUTES';
 
 

modules/@angular/compiler/src/aot/static_reflector.ts

@@ -14,15 +14,7 @@ import {syntaxError} from '../util';
 import {StaticSymbol} from './static_symbol';
 import {StaticSymbolResolver} from './static_symbol_resolver';
 
-const ANGULAR_IMPORT_LOCATIONS = {
+const ANGULAR_CORE = '@angular/core';
-  coreDecorators: '@angular/core/src/metadata',
-  diDecorators: '@angular/core/src/di/metadata',
-  diMetadata: '@angular/core/src/di/metadata',
-  diInjectionToken: '@angular/core/src/di/injection_token',
-  diOpaqueToken: '@angular/core/src/di/injection_token',
-  animationMetadata: '@angular/core/src/animation/metadata',
-  provider: '@angular/core/src/di/provider'
-};
 
 const HIDDEN_KEY = /^\$.*\$$/;
 
@@ -241,56 +233,53 @@ export class StaticReflector implements ReflectorReader {
   }
 
   private initializeConversionMap(): void {
-    const {coreDecorators, diDecorators,      diMetadata, diInjectionToken,
+    this.injectionToken = this.findDeclaration(ANGULAR_CORE, 'InjectionToken');
-           diOpaqueToken,  animationMetadata, provider} = ANGULAR_IMPORT_LOCATIONS;
+    this.opaqueToken = this.findDeclaration(ANGULAR_CORE, 'OpaqueToken');
-    this.injectionToken = this.findDeclaration(diInjectionToken, 'InjectionToken');
-    this.opaqueToken = this.findDeclaration(diInjectionToken, 'OpaqueToken');
 
-    this._registerDecoratorOrConstructor(this.findDeclaration(diDecorators, 'Host'), Host);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Host'), Host);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(diDecorators, 'Injectable'), Injectable);
+        this.findDeclaration(ANGULAR_CORE, 'Injectable'), Injectable);
-    this._registerDecoratorOrConstructor(this.findDeclaration(diDecorators, 'Self'), Self);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Self'), Self);
-    this._registerDecoratorOrConstructor(this.findDeclaration(diDecorators, 'SkipSelf'), SkipSelf);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'SkipSelf'), SkipSelf);
-    this._registerDecoratorOrConstructor(this.findDeclaration(diDecorators, 'Inject'), Inject);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Inject'), Inject);
-    this._registerDecoratorOrConstructor(this.findDeclaration(diDecorators, 'Optional'), Optional);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Optional'), Optional);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'Attribute'), Attribute);
+        this.findDeclaration(ANGULAR_CORE, 'Attribute'), Attribute);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'ContentChild'), ContentChild);
+        this.findDeclaration(ANGULAR_CORE, 'ContentChild'), ContentChild);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'ContentChildren'), ContentChildren);
+        this.findDeclaration(ANGULAR_CORE, 'ContentChildren'), ContentChildren);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'ViewChild'), ViewChild);
+        this.findDeclaration(ANGULAR_CORE, 'ViewChild'), ViewChild);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'ViewChildren'), ViewChildren);
+        this.findDeclaration(ANGULAR_CORE, 'ViewChildren'), ViewChildren);
-    this._registerDecoratorOrConstructor(this.findDeclaration(coreDecorators, 'Input'), Input);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Input'), Input);
-    this._registerDecoratorOrConstructor(this.findDeclaration(coreDecorators, 'Output'), Output);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Output'), Output);
-    this._registerDecoratorOrConstructor(this.findDeclaration(coreDecorators, 'Pipe'), Pipe);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Pipe'), Pipe);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'HostBinding'), HostBinding);
+        this.findDeclaration(ANGULAR_CORE, 'HostBinding'), HostBinding);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'HostListener'), HostListener);
+        this.findDeclaration(ANGULAR_CORE, 'HostListener'), HostListener);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'Directive'), Directive);
+        this.findDeclaration(ANGULAR_CORE, 'Directive'), Directive);
     this._registerDecoratorOrConstructor(
-        this.findDeclaration(coreDecorators, 'Component'), Component);
+        this.findDeclaration(ANGULAR_CORE, 'Component'), Component);
-    this._registerDecoratorOrConstructor(
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'NgModule'), NgModule);
-        this.findDeclaration(coreDecorators, 'NgModule'), NgModule);
 
     // Note: Some metadata classes can be used directly with Provider.deps.
-    this._registerDecoratorOrConstructor(this.findDeclaration(diMetadata, 'Host'), Host);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Host'), Host);
-    this._registerDecoratorOrConstructor(this.findDeclaration(diMetadata, 'Self'), Self);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Self'), Self);
-    this._registerDecoratorOrConstructor(this.findDeclaration(diMetadata, 'SkipSelf'), SkipSelf);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'SkipSelf'), SkipSelf);
-    this._registerDecoratorOrConstructor(this.findDeclaration(diMetadata, 'Optional'), Optional);
+    this._registerDecoratorOrConstructor(this.findDeclaration(ANGULAR_CORE, 'Optional'), Optional);
 
-    this._registerFunction(this.findDeclaration(animationMetadata, 'trigger'), trigger);
+    this._registerFunction(this.findDeclaration(ANGULAR_CORE, 'trigger'), trigger);
-    this._registerFunction(this.findDeclaration(animationMetadata, 'state'), state);
+    this._registerFunction(this.findDeclaration(ANGULAR_CORE, 'state'), state);
-    this._registerFunction(this.findDeclaration(animationMetadata, 'transition'), transition);
+    this._registerFunction(this.findDeclaration(ANGULAR_CORE, 'transition'), transition);
-    this._registerFunction(this.findDeclaration(animationMetadata, 'style'), style);
+    this._registerFunction(this.findDeclaration(ANGULAR_CORE, 'style'), style);
-    this._registerFunction(this.findDeclaration(animationMetadata, 'animate'), animate);
+    this._registerFunction(this.findDeclaration(ANGULAR_CORE, 'animate'), animate);
-    this._registerFunction(this.findDeclaration(animationMetadata, 'keyframes'), keyframes);
+    this._registerFunction(this.findDeclaration(ANGULAR_CORE, 'keyframes'), keyframes);
-    this._registerFunction(this.findDeclaration(animationMetadata, 'sequence'), sequence);
+    this._registerFunction(this.findDeclaration(ANGULAR_CORE, 'sequence'), sequence);
-    this._registerFunction(this.findDeclaration(animationMetadata, 'group'), group);
+    this._registerFunction(this.findDeclaration(ANGULAR_CORE, 'group'), group);
   }
 
   /**

modules/@angular/compiler/src/aot/static_symbol_resolver.ts

@@ -202,9 +202,16 @@ export class StaticSymbolResolver {
           new Set<string>(Object.keys(metadata['metadata']).map(unescapeIdentifier));
       Object.keys(metadata['metadata']).forEach((metadataKey) => {
         const symbolMeta = metadata['metadata'][metadataKey];
-        resolvedSymbols.push(this.createResolvedSymbol(
+        const name = unescapeIdentifier(metadataKey);
-            this.getStaticSymbol(filePath, unescapeIdentifier(metadataKey)), topLevelSymbolNames,
+        const canonicalSymbol = this.getStaticSymbol(filePath, name);
-            symbolMeta));
+        if (metadata['importAs']) {
+          // Index bundle indexes should use the importAs module name instead of a reference
+          // to the .d.ts file directly.
+          const importSymbol = this.getStaticSymbol(metadata['importAs'], name);
+          this.recordImportAs(canonicalSymbol, importSymbol);
+        }
+        resolvedSymbols.push(
+            this.createResolvedSymbol(canonicalSymbol, topLevelSymbolNames, symbolMeta));
       });
     }
 
@@ -372,7 +379,7 @@ export class StaticSymbolResolver {
       return this.host.moduleNameToFileName(module, containingFile);
     } catch (e) {
       console.error(`Could not resolve module '${module}' relative to file ${containingFile}`);
-      this.reportError(new e, null, containingFile);
+      this.reportError(e, null, containingFile);
     }
   }
 }

modules/@angular/compiler/test/aot/compiler_spec.ts

@@ -9,15 +9,18 @@
 import {AotCompiler, AotCompilerHost, createAotCompiler} from '@angular/compiler';
 import {RenderComponentType} from '@angular/core';
 import {async} from '@angular/core/testing';
+import {MetadataBundler, MetadataCollector, ModuleMetadata, privateEntriesToIndex} from '@angular/tsc-wrapped';
 import * as path from 'path';
 import * as ts from 'typescript';
 
 import {ReflectionCapabilities, reflector} from './private_import_core';
-import {EmittingCompilerHost, MockAotCompilerHost, MockCompilerHost, MockData, settings} from './test_util';
+import {EmittingCompilerHost, MockAotCompilerHost, MockCompilerHost, MockData, MockMetadataBundlerHost, settings} from './test_util';
 
 const DTS = /\.d\.ts$/;
 
 const minCoreIndex = `
+  export * from './src/application_module';
+  export * from './src/change_detection';
   export * from './src/metadata';
   export * from './src/di/metadata';
   export * from './src/di/injector';
@@ -28,7 +31,7 @@ const minCoreIndex = `
   export * from './src/codegen_private_exports';
 `;
 
-describe('compiler', () => {
+describe('compiler (unbundled Angular)', () => {
   let angularFiles: Map<string, string>;
 
   beforeAll(() => {
@@ -55,17 +58,64 @@ describe('compiler', () => {
     it('should compile',
        async(() => compile(host, aotHost, expectNoDiagnostics).then(generatedFiles => {
          expect(generatedFiles.find(f => /app\.component\.ngfactory\.ts/.test(f.genFileUrl)))
-             .not.toBeUndefined();
+             .toBeDefined();
          expect(generatedFiles.find(f => /app\.module\.ngfactory\.ts/.test(f.genFileUrl)))
-             .not.toBeUndefined();
+             .toBeDefined();
        })));
 
     it('should compile using summaries',
        async(() => summaryCompile(host, aotHost).then(generatedFiles => {
          expect(generatedFiles.find(f => /app\.component\.ngfactory\.ts/.test(f.genFileUrl)))
-             .not.toBeUndefined();
+             .toBeDefined();
          expect(generatedFiles.find(f => /app\.module\.ngfactory\.ts/.test(f.genFileUrl)))
-             .not.toBeUndefined();
+             .toBeDefined();
+       })));
+  });
+});
+
+describe('compiler (bundled Angular)', () => {
+  let angularFiles: Map<string, string>;
+
+  beforeAll(() => {
+    const emittingHost = new EmittingCompilerHost(['@angular/core/index'], {emitMetadata: false});
+
+    // Create the metadata bundled
+    const indexModule = emittingHost.effectiveName('@angular/core/index');
+    const bundler = new MetadataBundler(
+        indexModule, '@angular/core', new MockMetadataBundlerHost(emittingHost));
+    const bundle = bundler.getMetadataBundle();
+    const metadata = JSON.stringify(bundle.metadata, null, ' ');
+    const bundleIndexSource = privateEntriesToIndex('./index', bundle.privates);
+    emittingHost.override('@angular/core/bundle_index.ts', bundleIndexSource);
+    emittingHost.addWrittenFile(
+        '@angular/core/package.json', JSON.stringify({typings: 'bundle_index.d.ts'}));
+    emittingHost.addWrittenFile('@angular/core/bundle_index.metadata.json', metadata);
+
+    // Emit the sources
+    const bundleIndexName = emittingHost.effectiveName('@angular/core/bundle_index.ts');
+    const emittingProgram = ts.createProgram([bundleIndexName], settings, emittingHost);
+    emittingProgram.emit();
+    angularFiles = emittingHost.written;
+  });
+
+  describe('Quickstart', () => {
+    let host: MockCompilerHost;
+    let aotHost: MockAotCompilerHost;
+
+    beforeEach(() => {
+      host = new MockCompilerHost(QUICKSTART, FILES, angularFiles);
+      aotHost = new MockAotCompilerHost(host);
+    });
+
+    // Restore reflector since AoT compiler will update it with a new static reflector
+    afterEach(() => { reflector.updateCapabilities(new ReflectionCapabilities()); });
+
+    it('should compile',
+       async(() => compile(host, aotHost, expectNoDiagnostics).then(generatedFiles => {
+         expect(generatedFiles.find(f => /app\.component\.ngfactory\.ts/.test(f.genFileUrl)))
+             .toBeDefined();
+         expect(generatedFiles.find(f => /app\.module\.ngfactory\.ts/.test(f.genFileUrl)))
+             .toBeDefined();
        })));
   });
 });

modules/@angular/compiler/test/aot/static_reflector_spec.ts

@@ -44,14 +44,10 @@ describe('StaticReflector', () => {
 
   it('should get constructor for NgFor', () => {
     const NgFor = reflector.findDeclaration('@angular/common/src/directives/ng_for', 'NgFor');
-    const ViewContainerRef = reflector.findDeclaration(
+    const ViewContainerRef = reflector.findDeclaration('@angular/core', 'ViewContainerRef');
-        '@angular/core/src/linker/view_container_ref', 'ViewContainerRef');
+    const TemplateRef = reflector.findDeclaration('@angular/core', 'TemplateRef');
-    const TemplateRef =
+    const IterableDiffers = reflector.findDeclaration('@angular/core', 'IterableDiffers');
-        reflector.findDeclaration('@angular/core/src/linker/template_ref', 'TemplateRef');
+    const ChangeDetectorRef = reflector.findDeclaration('@angular/core', 'ChangeDetectorRef');
-    const IterableDiffers = reflector.findDeclaration(
-        '@angular/core/src/change_detection/differs/iterable_differs', 'IterableDiffers');
-    const ChangeDetectorRef = reflector.findDeclaration(
-        '@angular/core/src/change_detection/change_detector_ref', 'ChangeDetectorRef');
 
     const parameters = reflector.parameters(NgFor);
     expect(parameters).toEqual([
@@ -732,7 +728,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                 'expression': {
                   '__symbolic': 'reference',
                   'name': 'Directive',
-                  'module': '@angular/core/src/metadata'
+                  'module': '@angular/core'
                 },
                 'arguments': [
                   {
@@ -749,22 +745,22 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                   'parameters': [
                     {
                       '__symbolic': 'reference',
-                      'module': '@angular/core/src/linker/view_container_ref',
+                      'module': '@angular/core',
                       'name': 'ViewContainerRef'
                     },
                     {
                       '__symbolic': 'reference',
-                      'module': '@angular/core/src/linker/template_ref',
+                      'module': '@angular/core',
                       'name': 'TemplateRef'
                     },
                     {
                       '__symbolic': 'reference',
-                      'module': '@angular/core/src/change_detection/differs/iterable_differs',
+                      'module': '@angular/core',
                       'name': 'IterableDiffers'
                     },
                     {
                       '__symbolic': 'reference',
-                      'module': '@angular/core/src/change_detection/change_detector_ref',
+                      'module': '@angular/core',
                       'name': 'ChangeDetectorRef'
                     }
                   ]
@@ -794,7 +790,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                 'expression': {
                   '__symbolic': 'reference',
                   'name': 'Component',
-                  'module': '@angular/core/src/metadata'
+                  'module': '@angular/core'
                 },
                 'arguments': [
                   {
@@ -806,7 +802,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                       'expression': {
                         '__symbolic': 'reference',
                         'name': 'trigger',
-                        'module': '@angular/core/src/animation/metadata'
+                        'module': '@angular/core'
                       },
                       'arguments': [
                         'myAnimation',
@@ -814,7 +810,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                            'expression': {
                              '__symbolic': 'reference',
                              'name': 'state',
-                             'module': '@angular/core/src/animation/metadata'
+                             'module': '@angular/core'
                            },
                            'arguments': [
                              'state1',
@@ -822,7 +818,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                                 'expression': {
                                   '__symbolic': 'reference',
                                   'name': 'style',
-                                  'module': '@angular/core/src/animation/metadata'
+                                  'module': '@angular/core'
                                 },
                                 'arguments': [
                                   { 'background':'white' }
@@ -834,7 +830,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                             'expression': {
                               '__symbolic':'reference',
                               'name':'transition',
-                              'module': '@angular/core/src/animation/metadata'
+                              'module': '@angular/core'
                             },
                             'arguments': [
                               '* => *',
@@ -843,20 +839,20 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                                 'expression':{
                                   '__symbolic':'reference',
                                   'name':'sequence',
-                                  'module': '@angular/core/src/animation/metadata'
+                                  'module': '@angular/core'
                                 },
                                 'arguments':[[{ '__symbolic': 'call',
                                   'expression': {
                                     '__symbolic':'reference',
                                     'name':'group',
-                                    'module': '@angular/core/src/animation/metadata'
+                                    'module': '@angular/core'
                                   },
                                   'arguments':[[{
                                     '__symbolic': 'call',
                                     'expression': {
                                       '__symbolic':'reference',
                                       'name':'animate',
-                                      'module': '@angular/core/src/animation/metadata'
+                                      'module': '@angular/core'
                                     },
                                     'arguments':[
                                       '1s 0.5s',
@@ -864,13 +860,13 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                                         'expression': {
                                           '__symbolic':'reference',
                                           'name':'keyframes',
-                                          'module': '@angular/core/src/animation/metadata'
+                                          'module': '@angular/core'
                                         },
                                         'arguments':[[{ '__symbolic': 'call',
                                           'expression': {
                                             '__symbolic':'reference',
                                             'name':'style',
-                                            'module': '@angular/core/src/animation/metadata'
+                                            'module': '@angular/core'
                                           },
                                           'arguments':[ { 'background': 'blue'} ]
                                         }, {
@@ -878,7 +874,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                                           'expression': {
                                             '__symbolic':'reference',
                                             'name':'style',
-                                            'module': '@angular/core/src/animation/metadata'
+                                            'module': '@angular/core'
                                           },
                                           'arguments':[ { 'background': 'red'} ]
                                         }]]
@@ -904,7 +900,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                       'expression': {
                         '__symbolic': 'reference',
                         'name': 'Input',
-                        'module': '@angular/core/src/metadata'
+                        'module': '@angular/core'
                       }
                     }
                   ]
@@ -918,7 +914,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                                 '__symbolic': 'call',
                                 'expression': {
                                     '__symbolic': 'reference',
-                                    'module': '@angular/core/src/metadata',
+                                    'module': '@angular/core',
                                     'name': 'HostListener'
                                 },
                                 'arguments': [
@@ -948,7 +944,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
                 expression: {
                   __symbolic: 'reference',
                   name: 'Component',
-                  module: '@angular/core/src/metadata'
+                  module: '@angular/core'
                 },
                 arguments: [
                   {
@@ -1149,7 +1145,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
       `,
       '/tmp/src/invalid-calls.ts': `
         import {someFunction} from './nvalid-calll-definitions.ts';
-        import {Component} from '@angular/core/src/metadata';
+        import {Component} from '@angular/core';
         import {NgIf} from '@angular/common';
 
         @Component({
@@ -1193,7 +1189,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
         }
       `,
       '/tmp/src/static-method-call.ts': `
-        import {Component} from '@angular/core/src/metadata';
+        import {Component} from '@angular/core';
         import {MyModule} from './static-method';
 
         @Component({
@@ -1225,7 +1221,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
         }
       `,
       '/tmp/src/static-field-reference.ts': `
-        import {Component} from '@angular/core/src/metadata';
+        import {Component} from '@angular/core';
         import {MyModule} from './static-field';
 
         @Component({
@@ -1239,7 +1235,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
         }
       `,
       '/tmp/src/static-method-ref.ts': `
-        import {Component} from '@angular/core/src/metadata';
+        import {Component} from '@angular/core';
         import {ClassWithStatics} from './static-method-def';
 
         @Component({
@@ -1250,7 +1246,7 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
         }
       `,
       '/tmp/src/invalid-metadata.ts': `
-        import {Component} from '@angular/core/src/metadata';
+        import {Component} from '@angular/core';
 
         @Component({
           providers: [ { provider: 'a', useValue: (() => 1)() }]
@@ -1259,8 +1255,8 @@ const DEFAULT_TEST_DATA: {[key: string]: any} = {
       `,
       '/tmp/src/forward-ref.ts': `
         import {forwardRef} from '@angular/core';
-        import {Component} from '@angular/core/src/metadata';
+        import {Component} from '@angular/core';
-        import {Inject} from '@angular/core/src/di/metadata';
+        import {Inject} from '@angular/core';
         @Component({})
         export class Forward {
           constructor(@Inject(forwardRef(() => Dep)) d: Dep) {}

modules/@angular/compiler/test/aot/test_util.ts

@@ -7,7 +7,7 @@
  */
 
 import {AotCompilerHost} from '@angular/compiler';
-import {MetadataCollector} from '@angular/tsc-wrapped';
+import {MetadataBundlerHost, MetadataCollector, ModuleMetadata} from '@angular/tsc-wrapped';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
@@ -216,12 +216,15 @@ export class MockCompilerHost implements ts.CompilerHost {
     }
     const effectiveName = this.getEffectiveName(fileName);
     if (effectiveName == fileName) {
-      return open(fileName, this.data) != null;
+      let result = open(fileName, this.data) != null;
+      return result;
     } else {
       if (fileName.match(rxjs)) {
-        return fs.existsSync(effectiveName);
+        let result = fs.existsSync(effectiveName);
+        return result;
       }
-      return this.angular.has(effectiveName);
+      let result = this.angular.has(effectiveName);
+      return result;
     }
   }
 
@@ -389,6 +392,17 @@ export class MockAotCompilerHost implements AotCompilerHost {
   }
 }
 
+export class MockMetadataBundlerHost implements MetadataBundlerHost {
+  private collector = new MetadataCollector();
+
+  constructor(private host: ts.CompilerHost) {}
+
+  getMetadataFor(moduleName: string): ModuleMetadata {
+    const source = this.host.getSourceFile(moduleName + '.ts', ts.ScriptTarget.Latest);
+    return this.collector.getMetadata(source);
+  }
+}
+
 function find(fileName: string, data: MockData): MockData|undefined {
   let names = fileName.split('/');
   if (names.length && !names[0].length) names.shift();

modules/@angular/core/index.ts

@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
+// This file is not used to build this module. It is only used during editing
- * @module
+// by the TypeScript language serivce and during build for verifcation. `ngc`
- * @description
+// replaces this file with production index.ts when it rewrites private symbol
- * Entry point for all public APIs of the core package.
+// names.
- */
-export * from './src/core';
 
-// This file only reexports content of the `src` folder. Keep it that way.
+export * from './public_api';

modules/@angular/core/public_api.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the core package.
+ */
+export * from './src/core';
+
+// This file only reexports content of the `src` folder. Keep it that way.

modules/@angular/core/tsconfig-build.json

@@ -20,12 +20,14 @@
     "types": []
   },
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts",
     "../../system.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/core"
   }
 }

modules/@angular/forms/index.ts

@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
+// This file is not used to build this module. It is only used during editing
- * @module
+// by the TypeScript language serivce and during build for verifcation. `ngc`
- * @description
+// replaces this file with production index.ts when it rewrites private symbol
- * Entry point for all public APIs of the forms package.
+// names.
- */
-export * from './src/forms';
 
-// This file only reexports content of the `src` folder. Keep it that way.
+export * from './public_api';

modules/@angular/forms/public_api.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the forms package.
+ */
+export * from './src/forms';
+
+// This file only reexports content of the `src` folder. Keep it that way.

modules/@angular/forms/tsconfig-build.json

@@ -25,11 +25,13 @@
     "types": []
   },
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/forms"
   }
 }

modules/@angular/http/index.ts

@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
+// This file is not used to build this module. It is only used during editing
- * @module
+// by the TypeScript language serivce and during build for verifcation. `ngc`
- * @description
+// replaces this file with production index.ts when it rewrites private symbol
- * Entry point for all public APIs of the http package.
+// names.
- */
-export * from './src/index';
 
-// This file only reexports content of the `src` folder. Keep it that way.
+export * from './public_api';

modules/@angular/http/public_api.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the http package.
+ */
+export * from './src/index';
+
+// This file only reexports content of the `src` folder. Keep it that way.

modules/@angular/http/tsconfig-build.json

@@ -20,11 +20,13 @@
     "lib": ["es2015", "dom"]
   },
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/http"
   }
 }

modules/@angular/router/index.ts

@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
+// This file is not used to build this module. It is only used during editing
- * @module
+// by the TypeScript language serivce and during build for verifcation. `ngc`
- * @description
+// replaces this file with production index.ts when it rewrites private symbol
- * Entry point for all public APIs of the router package.
+// names.
- */
-export * from './src/index';
 
-// This file only reexports content of the `src` folder. Keep it that way.
+export * from './public_api';

modules/@angular/router/public_api.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the router package.
+ */
+export * from './src/index';
+
+// This file only reexports content of the `src` folder. Keep it that way.

modules/@angular/router/src/index.ts

@@ -14,6 +14,7 @@ export {RouterOutlet} from './directives/router_outlet';
 export {CanActivate, CanActivateChild, CanDeactivate, CanLoad, Resolve} from './interfaces';
 export {DetachedRouteHandle, RouteReuseStrategy} from './route_reuse_strategy';
 export {Event, NavigationCancel, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router, RoutesRecognized} from './router';
+export {ROUTES} from './router_config_loader';
 export {ExtraOptions, ROUTER_CONFIGURATION, ROUTER_INITIALIZER, RouterModule, provideRoutes} from './router_module';
 export {RouterOutletMap} from './router_outlet_map';
 export {NoPreloading, PreloadAllModules, PreloadingStrategy, RouterPreloader} from './router_preloader';
@@ -22,4 +23,5 @@ export {PRIMARY_OUTLET, Params} from './shared';
 export {UrlHandlingStrategy} from './url_handling_strategy';
 export {DefaultUrlSerializer, UrlSegment, UrlSegmentGroup, UrlSerializer, UrlTree} from './url_tree';
 export {VERSION} from './version';
+
 export * from './private_export'

modules/@angular/router/src/router_config_loader.ts

@@ -18,6 +18,7 @@ import {flatten, wrapIntoObservable} from './utils/collection';
 
 
 /**
+ * @docsNotRequired
  * @experimental
  */
 export const ROUTES = new InjectionToken<Route[][]>('ROUTES');

modules/@angular/router/tsconfig-build.json

@@ -24,10 +24,12 @@
     "skipLibCheck": true
   },
   "files": [
-    "index.ts"
+    "public_api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/router"
   }
 }

modules/@angular/upgrade/public_api_static.ts

@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of the upgrade/static package, allowing
+ * Angular 1 and Angular 2+ to run side by side in the same application.
+ */
+export {downgradeComponent} from './src/common/downgrade_component';
+export {downgradeInjectable} from './src/common/downgrade_injectable';
+export {VERSION} from './src/common/version';
+export {UpgradeComponent} from './src/static/upgrade_component';
+export {UpgradeModule} from './src/static/upgrade_module';
+
+// This file only re-exports content of the `src` folder. Keep it that way.

modules/@angular/upgrade/static.ts

@@ -6,16 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
+// This file is not used to build this module. It is only used during editing
- * @module
+// by the TypeScript language serivce and during build for verifcation. `ngc`
- * @description
+// replaces this file with production static.ts when it rewrites private symbol
- * Entry point for all public APIs of the upgrade/static package, allowing
+// names.
- * Angular 1 and Angular 2+ to run side by side in the same application.
- */
-export {downgradeComponent} from './src/common/downgrade_component';
-export {downgradeInjectable} from './src/common/downgrade_injectable';
-export {VERSION} from './src/common/version';
-export {UpgradeComponent} from './src/static/upgrade_component';
-export {UpgradeModule} from './src/static/upgrade_module';
 
-// This file only re-exports content of the `src` folder. Keep it that way.
+export * from './public_api_static';

modules/@angular/upgrade/tsconfig-build.json

@@ -24,12 +24,15 @@
     "types": []
   },
   "files": [
+    "public_api_static.ts",
     "index.ts",
-    "static.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "static",
+    "libraryIndex": "./public_api_static",
+    "importAs": "@angular/upgrade/static"
   }
 }

tools/public_api_guard/common/index.d.ts

@@ -32,6 +32,10 @@ export declare class DecimalPipe implements PipeTransform {
     transform(value: any, digits?: string): string;
 }
 
+/** @deprecated */
+export declare class DeprecatedCommonModule {
+}
+
 /** @stable */
 export declare class HashLocationStrategy extends LocationStrategy {
     constructor(_platformLocation: PlatformLocation, _baseHref?: string);

tools/public_api_guard/router/index.d.ts

@@ -345,6 +345,9 @@ export declare class RouterStateSnapshot extends Tree<ActivatedRouteSnapshot> {
 /** @stable */
 export declare type Routes = Route[];
 
+/** @experimental */
+export declare const ROUTES: InjectionToken<Route[][]>;
+
 /** @stable */
 export declare class RoutesRecognized {
     id: number;