fix(tsc-wrapped): use agreed on options names (angular#14630)

chuckjaz · IgorMinar · commit c9bfc59a2177 · 2017-02-22T10:57:01.000-08:00
diff --git a/modules/@angular/animation/tsconfig-build.json b/modules/@angular/animation/tsconfig-build.json
@@ -27,7 +27,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/animation"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/animation"
   }
 }
diff --git a/modules/@angular/common/tsconfig-build.json b/modules/@angular/common/tsconfig-build.json
@@ -26,7 +26,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/common"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/common"
   }
 }
diff --git a/modules/@angular/core/tsconfig-build.json b/modules/@angular/core/tsconfig-build.json
@@ -27,7 +27,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/core"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/core"
   }
 }
diff --git a/modules/@angular/forms/tsconfig-build.json b/modules/@angular/forms/tsconfig-build.json
@@ -31,7 +31,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/forms"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/forms"
   }
 }
diff --git a/modules/@angular/http/tsconfig-build.json b/modules/@angular/http/tsconfig-build.json
@@ -26,7 +26,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/http"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/http"
   }
 }
diff --git a/modules/@angular/platform-browser/tsconfig-build.json b/modules/@angular/platform-browser/tsconfig-build.json
@@ -28,7 +28,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/platform-browser"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/platform-browser"
   }
 }
diff --git a/modules/@angular/platform-server/tsconfig-build.json b/modules/@angular/platform-server/tsconfig-build.json
@@ -32,7 +32,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/platform-server"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/platform-server"
   }
 }
diff --git a/modules/@angular/platform-webworker/tsconfig-build.json b/modules/@angular/platform-webworker/tsconfig-build.json
@@ -28,7 +28,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/platform-webworker"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/platform-webworker"
   }
 }
diff --git a/modules/@angular/router/tsconfig-build.json b/modules/@angular/router/tsconfig-build.json
@@ -29,7 +29,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/router"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/router"
   }
 }
diff --git a/modules/@angular/upgrade/tsconfig-build.json b/modules/@angular/upgrade/tsconfig-build.json
@@ -30,7 +30,7 @@
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "index",
-    "importAs": "@angular/upgrade"
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/upgrade"
   }
 }
diff --git a/modules/@angular/upgrade/tsconfig-static.json b/modules/@angular/upgrade/tsconfig-static.json
@@ -16,7 +16,7 @@
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
-    "bundleIndex": "static",
-    "importAs": "@angular/upgrade/static"
+    "flatModuleOutFile": "static.js",
+    "flatModuleId": "@angular/upgrade/static"
   }
 }
diff --git a/tools/@angular/tsc-wrapped/src/compiler_host.ts b/tools/@angular/tsc-wrapped/src/compiler_host.ts
@@ -109,7 +109,7 @@ export class MetadataWriterHost extends DelegatingHost {
         if (sourceFiles.length > 1) {
           throw new Error('Bundled emit with --out is not supported');
         }
-        if (!this.ngOptions.skipMetadataEmit && !this.ngOptions.bundleIndex) {
+        if (!this.ngOptions.skipMetadataEmit && !this.ngOptions.flatModuleOutFile) {
           this.writeMetadata(fileName, sourceFiles[0]);
         }
       }
diff --git a/tools/@angular/tsc-wrapped/src/main.ts b/tools/@angular/tsc-wrapped/src/main.ts
@@ -22,6 +22,7 @@ import {privateEntriesToIndex} from './index_writer';
 export {UserError} from './tsc';
 
 const DTS = /\.d\.ts$/;
+const JS_EXT = /(\.js|)$/;
 
 export type CodegenExtension =
     (ngOptions: NgOptions, cliOptions: CliOptions, program: ts.Program, host: ts.CompilerHost) =>
@@ -59,34 +60,32 @@ export function main(
     // todo(misko): remove once facade symlinks are removed
     host.realpath = (path) => path;
 
-    // If the comilation is a bundle index then produce the bundle index metadata and
-    // the synthetic bundle index.
-    if (ngOptions.bundleIndex && !ngOptions.skipMetadataEmit) {
+    // If the comilation is a flat module index then produce the flat module index
+    // metadata and the synthetic flat module index.
+    if (ngOptions.flatModuleOutFile && !ngOptions.skipMetadataEmit) {
       const files = parsed.fileNames.filter(f => !DTS.test(f));
-      if (files.length != 1 && (!ngOptions.libraryIndex || files.length < 1)) {
+      if (files.length != 1) {
         check([{
           file: null,
           start: null,
           length: null,
           messageText:
-              'Angular compiler option "bundleIndex" requires one and only one .ts file in the "files" field or "libraryIndex" to also be specified in order to select which module to use as the library index',
+              'Angular compiler option "flatModuleIndex" requires one and only one .ts file in the "files" field.',
           category: ts.DiagnosticCategory.Error,
           code: 0
         }]);
       }
       const file = files[0];
       const indexModule = file.replace(/\.ts$/, '');
-      const libraryIndexModule = ngOptions.libraryIndex ?
-          MetadataBundler.resolveModule(ngOptions.libraryIndex, indexModule) :
-          indexModule;
       const bundler =
-          new MetadataBundler(indexModule, ngOptions.importAs, new CompilerHostAdapter(host));
-      if (diagnostics) console.time('NG bundle index');
+          new MetadataBundler(indexModule, ngOptions.flatModuleId, new CompilerHostAdapter(host));
+      if (diagnostics) console.time('NG flat module index');
       const metadataBundle = bundler.getMetadataBundle();
-      if (diagnostics) console.timeEnd('NG bundle index');
+      if (diagnostics) console.timeEnd('NG flat module index');
       const metadata = JSON.stringify(metadataBundle.metadata);
-      const name = path.join(path.dirname(libraryIndexModule), ngOptions.bundleIndex + '.ts');
-      const libraryIndex = ngOptions.libraryIndex || `./${path.basename(indexModule)}`;
+      const name =
+          path.join(path.dirname(indexModule), ngOptions.flatModuleOutFile.replace(JS_EXT, '.ts'));
+      const libraryIndex = `./${path.basename(indexModule)}`;
       const content = privateEntriesToIndex(libraryIndex, metadataBundle.privates);
       host = new SyntheticIndexHost(host, {name, content, metadata});
       parsed.fileNames.push(name);
diff --git a/tools/@angular/tsc-wrapped/src/options.ts b/tools/@angular/tsc-wrapped/src/options.ts
@@ -25,40 +25,34 @@ interface Options extends ts.CompilerOptions {
   // Don't produce .ngfactory.ts or .ngstyle.ts files
   skipTemplateCodegen?: boolean;
 
-  // Whether to generate a bundle index of the given name and the corresponding bundled
-  // metadata. This option is intended to be used when creating library bundles similar
-  // to how `@angular/core` and `@angular/common` are generated.
+  // Whether to generate a flat module index of the given name and the corresponding
+  // flat module metadata. This option is intended to be used when creating flat
+  // modules similar to how `@angular/core` and `@angular/common` are packaged.
   // When this option is used the `package.json` for the library should refered to the
-  // generated bundle index instead of the library index file. Only the bundle index
-  // metadata is required as the bundle index contains all metadata visible from the
-  // bundle index. The bundle index is used to import symbols for generating
-  // .ngfactory.ts files and includes both the public API from the root .ts file as well
-  // as shrowded internal symbols.
-  // The by default the .ts file supplied in the `files` files field is assumed to be
+  // generated flat module index instead of the library index file. When using this
+  // option only one .metadata.json file is produced that contains all the metadata
+  // necessary for symbols exported from the library index.
+  // In the generated .ngfactory.ts files flat module index is used to import symbols
+  // includes both the public API from the library index as well as shrowded internal
+  // symbols.
+  // By default the .ts file supplied in the `files` files field is assumed to be
   // library index. If more than one is specified, uses `libraryIndex` to select the
-  // file to use. If more than on .ts file is supplied and no `libraryIndex` is supllied
+  // file to use. If more than on .ts file is supplied and no `libraryIndex` is supplied
   // an error is produced.
-  // A bundle index .d.ts and .js will be created with the given `bundleIndex` name in the
-  // same location as the library index .d.ts file is emitted.
-  // For example, if a library uses `index.ts` file as the root file, the `tsconfig.json`
-  // `files` field would be `["index.ts"]`. The `bundleIndex` options could then be set
-  // to, for example `"bundle_index"`, which produces a `bundle_index.d.ts` and
-  // `bundle_index.metadata.json` files. The library's `package.json`'s `module` field
-  // would be `"bundle_index.js"` and the `typings` field would be `"bundle_index.d.ts"`.
-  bundleIndex?: string;
+  // A flat module index .d.ts and .js will be created with the given `flatModuleOutFile`
+  // name in the same location as the library index .d.ts file is emitted.
+  // For example, if a library uses `public_api.ts` file as the library index of the
+  // module the `tsconfig.json` `files` field would be `["public_api.ts"]`. The
+  // `flatModuleOutFile` options could then be set to, for example `"index.js"`, which
+  // produces `index.d.ts` and  `index.metadata.json` files. The library's
+  // `package.json`'s `module` field would be `"index.js"` and the `typings` field would
+  // be `"index.d.ts"`.
+  flatModuleOutFile?: string;
 
-  // Override which module is used as the library index. This is only meaningful if
-  // `bundleIndex` is also supplied and only necessary if more than one `.ts` file is
-  // supplied in the `files` field. This must be of the form found in a import
-  // declaration. For example, if the library index is in `index.ts` then the
-  // `libraryIndex` field should be `"./index"`.
-  libraryIndex?: string;
-
-  // Preferred module name to use for importing the generated bundle. References
-  // generated by `ngc` will use this module name when importing symbols from the
-  // generated bundle. This is only meaningful when `bundleIndex` is also supplied. It is
-  // otherwise ignored.
-  importAs?: string;
+  // Preferred module id to use for importing flat module. References generated by `ngc`
+  // will use this module name when importing symbols from the flat module. This is only
+  // meaningful when `flatModuleOutFile` is also supplied. It is otherwise ignored.
+  flatModuleId?: string;
 
   // Whether to generate code for library code.
   // If true, produce .ngfactory.ts and .ngstyle.ts files for .d.ts inputs.

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"angularCompilerOptions": {`
`28`	`28`	`"annotateForClosureCompiler": true,`
`29`	`29`	`"strictMetadataEmit": true,`
`30`		`- "bundleIndex": "index",`
`31`		`- "importAs": "@angular/animation"`
	`30`	`+ "flatModuleOutFile": "index.js",`
	`31`	`+ "flatModuleId": "@angular/animation"`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"angularCompilerOptions": {`
`27`	`27`	`"annotateForClosureCompiler": true,`
`28`	`28`	`"strictMetadataEmit": true,`
`29`		`- "bundleIndex": "index",`
`30`		`- "importAs": "@angular/common"`
	`29`	`+ "flatModuleOutFile": "index.js",`
	`30`	`+ "flatModuleId": "@angular/common"`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`"angularCompilerOptions": {`
`32`	`32`	`"annotateForClosureCompiler": true,`
`33`	`33`	`"strictMetadataEmit": true,`
`34`		`- "bundleIndex": "index",`
`35`		`- "importAs": "@angular/forms"`
	`34`	`+ "flatModuleOutFile": "index.js",`
	`35`	`+ "flatModuleId": "@angular/forms"`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`"angularCompilerOptions": {`
`29`	`29`	`"annotateForClosureCompiler": true,`
`30`	`30`	`"strictMetadataEmit": true,`
`31`		`- "bundleIndex": "index",`
`32`		`- "importAs": "@angular/platform-browser"`
	`31`	`+ "flatModuleOutFile": "index.js",`
	`32`	`+ "flatModuleId": "@angular/platform-browser"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`"angularCompilerOptions": {`
`33`	`33`	`"annotateForClosureCompiler": true,`
`34`	`34`	`"strictMetadataEmit": true,`
`35`		`- "bundleIndex": "index",`
`36`		`- "importAs": "@angular/platform-server"`
	`35`	`+ "flatModuleOutFile": "index.js",`
	`36`	`+ "flatModuleId": "@angular/platform-server"`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`"angularCompilerOptions": {`
`30`	`30`	`"annotateForClosureCompiler": true,`
`31`	`31`	`"strictMetadataEmit": true,`
`32`		`- "bundleIndex": "index",`
`33`		`- "importAs": "@angular/router"`
	`32`	`+ "flatModuleOutFile": "index.js",`
	`33`	`+ "flatModuleId": "@angular/router"`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"angularCompilerOptions": {`
`31`	`31`	`"annotateForClosureCompiler": true,`
`32`	`32`	`"strictMetadataEmit": true,`
`33`		`- "bundleIndex": "index",`
`34`		`- "importAs": "@angular/upgrade"`
	`33`	`+ "flatModuleOutFile": "index.js",`
	`34`	`+ "flatModuleId": "@angular/upgrade"`
`35`	`35`	`}`
`36`	`36`	`}`