ng-packagr 4.0.0 → 4.2.0

package/lib/ng-v5/nodes.d.ts

@@ -1,8 +1,8 @@
 import * as ts from 'typescript';
+import { ParsedConfiguration } from '@angular/compiler-cli';
 import { Node } from '../brocc/node';
 import { NgEntryPoint } from '../ng-package-format/entry-point';
 import { NgPackage } from '../ng-package-format/package';
-import { TsConfig } from '../ts/tsconfig';
 import { DestinationFiles } from '../ng-package-format/shared';
 import { FileCache } from '../file/file-cache';
 export declare const TYPE_NG_PACKAGE = "application/ng-package";
@@ -26,15 +26,14 @@ export declare function ngUrl(path: string): string;
 export declare class EntryPointNode extends Node {
     readonly type: string;
     cache: {
-        analysisFileCache: FileCache;
-        compilationFileCache: FileCache;
+        sourcesFileCache: FileCache;
         moduleResolutionCache: ts.ModuleResolutionCache;
         analysisModuleResolutionCache: ts.ModuleResolutionCache;
     };
     data: {
         destinationFiles: DestinationFiles;
         entryPoint: NgEntryPoint;
-        tsConfig?: TsConfig;
+        tsConfig?: ParsedConfiguration;
     };
 }
 export declare class PackageNode extends Node {

package/lib/ng-v5/nodes.js

@@ -53,8 +53,7 @@ class EntryPointNode extends node_1.Node {
         super(...arguments);
         this.type = exports.TYPE_NG_ENTRY_POINT;
         this.cache = {
-            analysisFileCache: new file_cache_1.FileCache(),
-            compilationFileCache: new file_cache_1.FileCache(),
+            sourcesFileCache: new file_cache_1.FileCache(),
             moduleResolutionCache: ts.createModuleResolutionCache(process.cwd(), s => s),
             analysisModuleResolutionCache: ts.createModuleResolutionCache(process.cwd(), s => s)
         };

package/lib/ng-v5/nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/nodes.ts"],"names":[],"mappings":";;AAAA,iCAAiC;AACjC,wCAAqC;AACrC,4CAA4D;AAK5D,mDAA+C;AAElC,QAAA,eAAe,GAAG,wBAAwB,CAAC;AAC3C,QAAA,mBAAmB,GAAG,4BAA4B,CAAC;AAEhE,oDAAoD;AACvC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE3C,kCAAkC;AACrB,QAAA,eAAe,GAAG,OAAO,CAAC;AAEvC,sBAA6B,IAAU;IACrC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,2BAAmB,CAAC;AAC3C,CAAC;AAFD,oCAEC;AAED,mBAA0B,IAAU;IAClC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,uBAAe,CAAC;AACvC,CAAC;AAFD,8BAEC;AAED;IACE,MAAM,CAAC,WAAE,CAAC,YAAY,CAAC,CAAC;AAC1B,CAAC;AAFD,oCAEC;AAED;IACE,MAAM,CAAC,WAAE,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;AAC5C,CAAC;AAFD,wDAEC;AAED;IACE,MAAM,CAAC,WAAE,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAO,CAAC,CAAC;AACvC,CAAC;AAFD,8CAEC;AAED,mBAA0B,KAAa;IACrC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,yBAAiB,CAAC,CAAC;AAC7C,CAAC;AAFD,8BAEC;AAED,iBAAwB,IAAY;IAClC,MAAM,CAAC,GAAG,yBAAiB,GAAG,IAAI,EAAE,CAAC;AACvC,CAAC;AAFD,0BAEC;AAED,qBAA4B,GAAW;IACrC,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,yBAAiB,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,yBAAiB,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC;AAJD,kCAIC;AAED,eAAsB,IAAY;IAChC,MAAM,CAAC,GAAG,uBAAe,GAAG,IAAI,EAAE,CAAC;AACrC,CAAC;AAFD,sBAEC;AAED,oBAA4B,SAAQ,WAAI;IAAxC;;QACW,SAAI,GAAG,2BAAmB,CAAC;QAEpC,UAAK,GAAG;YACN,iBAAiB,EAAE,IAAI,sBAAS,EAAE;YAClC,oBAAoB,EAAE,IAAI,sBAAS,EAAE;YACrC,qBAAqB,EAAE,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5E,6BAA6B,EAAE,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACrF,CAAC;IAOJ,CAAC;CAAA;AAfD,wCAeC;AAED,iBAAyB,SAAQ,WAAI;IAArC;;QACW,SAAI,GAAG,uBAAe,CAAC;IAElC,CAAC;CAAA;AAHD,kCAGC","sourcesContent":["import * as ts from 'typescript';\nimport { Node } from '../brocc/node';\nimport { by, isInProgress, isDirty } from '../brocc/select';\nimport { NgEntryPoint } from '../ng-package-format/entry-point';\nimport { NgPackage } from '../ng-package-format/package';\nimport { TsConfig } from '../ts/tsconfig';\nimport { DestinationFiles } from '../ng-package-format/shared';\nimport { FileCache } from '../file/file-cache';\n\nexport const TYPE_NG_PACKAGE = 'application/ng-package';\nexport const TYPE_NG_ENTRY_POINT = 'application/ng-entry-point';\n\n/** A node that can be read through the `fs` api. */\nexport const URL_PROTOCOL_FILE = 'file://';\n\n/** A node specific to angular. */\nexport const URL_PROTOCOL_NG = 'ng://';\n\nexport function isEntryPoint(node: Node): node is EntryPointNode {\n  return node.type === TYPE_NG_ENTRY_POINT;\n}\n\nexport function isPackage(node: Node): node is PackageNode {\n  return node.type === TYPE_NG_PACKAGE;\n}\n\nexport function byEntryPoint() {\n  return by(isEntryPoint);\n}\n\nexport function isEntryPointInProgress() {\n  return by(isEntryPoint).and(isInProgress);\n}\n\nexport function isEntryPointDirty() {\n  return by(isEntryPoint).and(isDirty);\n}\n\nexport function isFileUrl(value: string): boolean {\n  return value.startsWith(URL_PROTOCOL_FILE);\n}\n\nexport function fileUrl(path: string): string {\n  return `${URL_PROTOCOL_FILE}${path}`;\n}\n\nexport function fileUrlPath(url: string): string {\n  if (url.startsWith(URL_PROTOCOL_FILE)) {\n    return url.substring(URL_PROTOCOL_FILE.length);\n  }\n}\n\nexport function ngUrl(path: string): string {\n  return `${URL_PROTOCOL_NG}${path}`;\n}\n\nexport class EntryPointNode extends Node {\n  readonly type = TYPE_NG_ENTRY_POINT;\n\n  cache = {\n    analysisFileCache: new FileCache(),\n    compilationFileCache: new FileCache(),\n    moduleResolutionCache: ts.createModuleResolutionCache(process.cwd(), s => s),\n    analysisModuleResolutionCache: ts.createModuleResolutionCache(process.cwd(), s => s)\n  };\n\n  data: {\n    destinationFiles: DestinationFiles;\n    entryPoint: NgEntryPoint;\n    tsConfig?: TsConfig;\n  };\n}\n\nexport class PackageNode extends Node {\n  readonly type = TYPE_NG_PACKAGE;\n  data: NgPackage;\n}\n"]}
+{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/nodes.ts"],"names":[],"mappings":";;AAAA,iCAAiC;AAEjC,wCAAqC;AACrC,4CAA4D;AAI5D,mDAA+C;AAElC,QAAA,eAAe,GAAG,wBAAwB,CAAC;AAC3C,QAAA,mBAAmB,GAAG,4BAA4B,CAAC;AAEhE,oDAAoD;AACvC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE3C,kCAAkC;AACrB,QAAA,eAAe,GAAG,OAAO,CAAC;AAEvC,sBAA6B,IAAU;IACrC,OAAO,IAAI,CAAC,IAAI,KAAK,2BAAmB,CAAC;AAC3C,CAAC;AAFD,oCAEC;AAED,mBAA0B,IAAU;IAClC,OAAO,IAAI,CAAC,IAAI,KAAK,uBAAe,CAAC;AACvC,CAAC;AAFD,8BAEC;AAED;IACE,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC;AAC1B,CAAC;AAFD,oCAEC;AAED;IACE,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;AAC5C,CAAC;AAFD,wDAEC;AAED;IACE,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAO,CAAC,CAAC;AACvC,CAAC;AAFD,8CAEC;AAED,mBAA0B,KAAa;IACrC,OAAO,KAAK,CAAC,UAAU,CAAC,yBAAiB,CAAC,CAAC;AAC7C,CAAC;AAFD,8BAEC;AAED,iBAAwB,IAAY;IAClC,OAAO,GAAG,yBAAiB,GAAG,IAAI,EAAE,CAAC;AACvC,CAAC;AAFD,0BAEC;AAED,qBAA4B,GAAW;IACrC,IAAI,GAAG,CAAC,UAAU,CAAC,yBAAiB,CAAC,EAAE;QACrC,OAAO,GAAG,CAAC,SAAS,CAAC,yBAAiB,CAAC,MAAM,CAAC,CAAC;KAChD;AACH,CAAC;AAJD,kCAIC;AAED,eAAsB,IAAY;IAChC,OAAO,GAAG,uBAAe,GAAG,IAAI,EAAE,CAAC;AACrC,CAAC;AAFD,sBAEC;AAED,oBAA4B,SAAQ,WAAI;IAAxC;;QACW,SAAI,GAAG,2BAAmB,CAAC;QAEpC,UAAK,GAAG;YACN,gBAAgB,EAAE,IAAI,sBAAS,EAAE;YACjC,qBAAqB,EAAE,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5E,6BAA6B,EAAE,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACrF,CAAC;IAOJ,CAAC;CAAA;AAdD,wCAcC;AAED,iBAAyB,SAAQ,WAAI;IAArC;;QACW,SAAI,GAAG,uBAAe,CAAC;IAElC,CAAC;CAAA;AAHD,kCAGC","sourcesContent":["import * as ts from 'typescript';\nimport { ParsedConfiguration } from '@angular/compiler-cli';\nimport { Node } from '../brocc/node';\nimport { by, isInProgress, isDirty } from '../brocc/select';\nimport { NgEntryPoint } from '../ng-package-format/entry-point';\nimport { NgPackage } from '../ng-package-format/package';\nimport { DestinationFiles } from '../ng-package-format/shared';\nimport { FileCache } from '../file/file-cache';\n\nexport const TYPE_NG_PACKAGE = 'application/ng-package';\nexport const TYPE_NG_ENTRY_POINT = 'application/ng-entry-point';\n\n/** A node that can be read through the `fs` api. */\nexport const URL_PROTOCOL_FILE = 'file://';\n\n/** A node specific to angular. */\nexport const URL_PROTOCOL_NG = 'ng://';\n\nexport function isEntryPoint(node: Node): node is EntryPointNode {\n  return node.type === TYPE_NG_ENTRY_POINT;\n}\n\nexport function isPackage(node: Node): node is PackageNode {\n  return node.type === TYPE_NG_PACKAGE;\n}\n\nexport function byEntryPoint() {\n  return by(isEntryPoint);\n}\n\nexport function isEntryPointInProgress() {\n  return by(isEntryPoint).and(isInProgress);\n}\n\nexport function isEntryPointDirty() {\n  return by(isEntryPoint).and(isDirty);\n}\n\nexport function isFileUrl(value: string): boolean {\n  return value.startsWith(URL_PROTOCOL_FILE);\n}\n\nexport function fileUrl(path: string): string {\n  return `${URL_PROTOCOL_FILE}${path}`;\n}\n\nexport function fileUrlPath(url: string): string {\n  if (url.startsWith(URL_PROTOCOL_FILE)) {\n    return url.substring(URL_PROTOCOL_FILE.length);\n  }\n}\n\nexport function ngUrl(path: string): string {\n  return `${URL_PROTOCOL_NG}${path}`;\n}\n\nexport class EntryPointNode extends Node {\n  readonly type = TYPE_NG_ENTRY_POINT;\n\n  cache = {\n    sourcesFileCache: new FileCache(),\n    moduleResolutionCache: ts.createModuleResolutionCache(process.cwd(), s => s),\n    analysisModuleResolutionCache: ts.createModuleResolutionCache(process.cwd(), s => s)\n  };\n\n  data: {\n    destinationFiles: DestinationFiles;\n    entryPoint: NgEntryPoint;\n    tsConfig?: ParsedConfiguration;\n  };\n}\n\nexport class PackageNode extends Node {\n  readonly type = TYPE_NG_PACKAGE;\n  data: NgPackage;\n}\n"]}

package/lib/ng-v5/package.di.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.di.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/package.di.ts"],"names":[],"mappings":";;AAAA,+CAAwD;AAExD,wDAA4E;AAC5E,6CAA6C;AAC7C,qDAA+D;AAC/D,2DAA8D;AAC9D,kEAA6F;AAC7F,8DAAqH;AACrH,6CAAuE;AAE1D,QAAA,uBAAuB,GAAG,IAAI,6BAAc,CAAY,wBAAwB,CAAC,CAAC;AAElF,QAAA,iBAAiB,GAAG,+BAAgB,CAAC;IAChD,OAAO,EAAE,+BAAuB;IAChC,UAAU,EAAE,2CAAuB;IACnC,IAAI,EAAE,CAAC,0BAAa,EAAE,0BAAa,EAAE,uCAAoB,EAAE,0CAAqB,EAAE,4CAA2B,CAAC;CAC/G,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAe;IAC3C,yBAAiB;IACjB,qCAAwB;IACxB,6CAA0B;IAC1B,2CAAwB;IACxB,8CAAyB;CAC1B,CAAC","sourcesContent":["import { InjectionToken, Provider } from 'injection-js';\nimport { Transform } from '../brocc/transform';\nimport { provideTransform, TransformProvider } from '../brocc/transform.di';\nimport { PROJECT_TOKEN } from './project.di';\nimport { ENTRY_POINT_TRANSFORM_TOKEN } from './entry-point.di';\nimport { packageTransformFactory } from './package.transform';\nimport { ANALYSE_SOURCES_TOKEN, ANALYSE_SOURCES_TRANSFORM } from './init/analyse-sources.di';\nimport { DEFAULT_TS_CONFIG_PROVIDER, INIT_TS_CONFIG_TRANSFORM, INIT_TS_CONFIG_TOKEN } from './init/init-tsconfig.di';\nimport { OPTIONS_TOKEN, DEFAULT_OPTIONS_PROVIDER } from './options.di';\n\nexport const PACKAGE_TRANSFORM_TOKEN = new InjectionToken<Transform>(`ng.v5.packageTransform`);\n\nexport const PACKAGE_TRANSFORM = provideTransform({\n  provide: PACKAGE_TRANSFORM_TOKEN,\n  useFactory: packageTransformFactory,\n  deps: [PROJECT_TOKEN, OPTIONS_TOKEN, INIT_TS_CONFIG_TOKEN, ANALYSE_SOURCES_TOKEN, ENTRY_POINT_TRANSFORM_TOKEN]\n});\n\nexport const PACKAGE_PROVIDERS: Provider[] = [\n  PACKAGE_TRANSFORM,\n  DEFAULT_OPTIONS_PROVIDER,\n  DEFAULT_TS_CONFIG_PROVIDER,\n  INIT_TS_CONFIG_TRANSFORM,\n  ANALYSE_SOURCES_TRANSFORM\n];\n"]}
+{"version":3,"file":"package.di.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/package.di.ts"],"names":[],"mappings":";;AAAA,+CAAwD;AAExD,wDAA4E;AAC5E,6CAA6C;AAC7C,qDAA+D;AAC/D,2DAA8D;AAC9D,kEAA6F;AAC7F,8DAAqH;AACrH,6CAAuE;AAE1D,QAAA,uBAAuB,GAAG,IAAI,6BAAc,CAAY,wBAAwB,CAAC,CAAC;AAElF,QAAA,iBAAiB,GAAsB,+BAAgB,CAAC;IACnE,OAAO,EAAE,+BAAuB;IAChC,UAAU,EAAE,2CAAuB;IACnC,IAAI,EAAE,CAAC,0BAAa,EAAE,0BAAa,EAAE,uCAAoB,EAAE,0CAAqB,EAAE,4CAA2B,CAAC;CAC/G,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAe;IAC3C,yBAAiB;IACjB,qCAAwB;IACxB,6CAA0B;IAC1B,2CAAwB;IACxB,8CAAyB;CAC1B,CAAC","sourcesContent":["import { InjectionToken, Provider } from 'injection-js';\nimport { Transform } from '../brocc/transform';\nimport { provideTransform, TransformProvider } from '../brocc/transform.di';\nimport { PROJECT_TOKEN } from './project.di';\nimport { ENTRY_POINT_TRANSFORM_TOKEN } from './entry-point.di';\nimport { packageTransformFactory } from './package.transform';\nimport { ANALYSE_SOURCES_TOKEN, ANALYSE_SOURCES_TRANSFORM } from './init/analyse-sources.di';\nimport { DEFAULT_TS_CONFIG_PROVIDER, INIT_TS_CONFIG_TRANSFORM, INIT_TS_CONFIG_TOKEN } from './init/init-tsconfig.di';\nimport { OPTIONS_TOKEN, DEFAULT_OPTIONS_PROVIDER } from './options.di';\n\nexport const PACKAGE_TRANSFORM_TOKEN = new InjectionToken<Transform>(`ng.v5.packageTransform`);\n\nexport const PACKAGE_TRANSFORM: TransformProvider = provideTransform({\n  provide: PACKAGE_TRANSFORM_TOKEN,\n  useFactory: packageTransformFactory,\n  deps: [PROJECT_TOKEN, OPTIONS_TOKEN, INIT_TS_CONFIG_TOKEN, ANALYSE_SOURCES_TOKEN, ENTRY_POINT_TRANSFORM_TOKEN]\n});\n\nexport const PACKAGE_PROVIDERS: Provider[] = [\n  PACKAGE_TRANSFORM,\n  DEFAULT_OPTIONS_PROVIDER,\n  DEFAULT_TS_CONFIG_PROVIDER,\n  INIT_TS_CONFIG_TRANSFORM,\n  ANALYSE_SOURCES_TRANSFORM\n];\n"]}

package/lib/ng-v5/package.transform.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const depth_1 = require("../brocc/depth");
 const node_1 = require("../brocc/node");
 const log = require("../util/log");
-const copy_1 = require("../util/copy");
 const rimraf_1 = require("../util/rimraf");
 const nodes_1 = require("./nodes");
 const discover_packages_1 = require("./discover-packages");
 const file_watcher_1 = require("../file/file-watcher");
 const array_1 = require("../util/array");
+const copy_1 = require("../util/copy");
 /**
  * A transformation for building an npm package:
  *
@@ -66,7 +67,7 @@ exports.packageTransformFactory = (project, options, initTsConfigTransform, anal
     // perform build
     buildTransform);
 };
-const watchTransformFactory = (project, options, analyseSourcesTransform, entryPointTransform) => (source$) => {
+const watchTransformFactory = (project, _options, analyseSourcesTransform, entryPointTransform) => (source$) => {
     const CompleteWaitingForFileChange = '\nCompilation complete. Watching for file changes...';
     const FileChangeDetected = '\nFile change detected. Starting incremental compilation...';
     const FailedWaitingForFileChange = '\nCompilation failed. Watching for file changes...';
@@ -77,8 +78,8 @@ const watchTransformFactory = (project, options, analyseSourcesTransform, entryP
             const { filePath } = fileChange;
             let filePathsToClean = [filePath];
             entryPoints.forEach((node) => {
-                const { compilationFileCache } = node.cache;
-                const cached = compilationFileCache.get(filePath);
+                const { sourcesFileCache } = node.cache;
+                const cached = sourcesFileCache.get(filePath);
                 // when a ts file changes we also need to clean it's .d.ts file
                 // and the entrypoint metadata due to the fact that metadata is used to validate component properties
                 if (cached && cached.declarationFileName) {
@@ -88,11 +89,10 @@ const watchTransformFactory = (project, options, analyseSourcesTransform, entryP
             });
             filePathsToClean = array_1.unique(filePathsToClean);
             entryPoints.forEach((node) => {
-                const { analysisFileCache, compilationFileCache } = node.cache;
+                const { sourcesFileCache } = node.cache;
                 let isDirty = false;
                 filePathsToClean.forEach(x => {
-                    isDirty = analysisFileCache.delete(x) || isDirty;
-                    isDirty = compilationFileCache.delete(x) || isDirty;
+                    isDirty = sourcesFileCache.delete(x) || isDirty;
                 });
                 if (isDirty) {
                     node.state = 'dirty';
@@ -123,32 +123,24 @@ const buildTransformFactory = (project, analyseSourcesTransform, entryPointTrans
     }));
 };
 const writeNpmPackage = (pkgUri) => rxjs_1.pipe(operators_1.switchMap(graph => {
-    const ngPkg = graph.get(pkgUri);
-    return rxjs_1.from(copy_1.copyFiles([`${ngPkg.data.src}/LICENSE`, `${ngPkg.data.src}/README.md`], ngPkg.data.dest)).pipe(operators_1.map(() => graph));
+    const { data } = graph.get(pkgUri);
+    const filesToCopy = Promise.all([`${data.src}/LICENSE`, `${data.src}/README.md`].map(src => copy_1.copyFile(src, path.join(data.dest, path.basename(src)))));
+    return rxjs_1.from(filesToCopy).pipe(operators_1.map(() => graph));
 }));
 const scheduleEntryPoints = (epTransform) => rxjs_1.pipe(operators_1.concatMap(graph => {
     // Calculate node/dependency depth and determine build order
     const depthBuilder = new depth_1.DepthBuilder();
-    const entryPoints = graph.filter(x => nodes_1.isEntryPoint(x) && x.state !== 'done');
+    const entryPoints = graph.filter(nodes_1.isEntryPoint);
     entryPoints.forEach(entryPoint => {
         const deps = entryPoint.filter(nodes_1.isEntryPoint).map(ep => ep.url);
         depthBuilder.add(entryPoint.url, deps);
     });
     // The array index is the depth.
     const groups = depthBuilder.build();
-    const flattenedGroups = groups.reduce((prev, current) => prev.concat(current), []);
-    let currentIndex = 0;
     // Build entry points with lower depth values first.
-    const eps$ = flattenedGroups.map(() => rxjs_1.of(graph).pipe(operators_1.tap(() => {
-        // Find current entry point in progress
-        const epUrl = flattenedGroups[currentIndex];
-        const entryPoint = graph.find(nodes_1.byEntryPoint().and(ep => ep.url === epUrl));
-        // Mark the entry point as 'in-progress'
-        entryPoint.state = node_1.STATE_IN_PROGESS;
-    }), epTransform, operators_1.tap(() => {
-        currentIndex += 1;
-    })));
-    // Build all entry points, then continue
-    return rxjs_1.concat(...eps$).pipe(operators_1.takeLast(1));
+    return rxjs_1.from(array_1.flatten(groups)).pipe(operators_1.map(epUrl => graph.find(nodes_1.byEntryPoint().and(ep => ep.url === epUrl))), operators_1.filter(entryPoint => entryPoint.state !== 'done'), operators_1.concatMap(ep => rxjs_1.of(ep).pipe(
+    // Mark the entry point as 'in-progress'
+    operators_1.tap(entryPoint => (entryPoint.state = node_1.STATE_IN_PROGESS)), operators_1.mapTo(graph), epTransform)), operators_1.takeLast(1), // don't use last as sometimes it this will cause 'no elements in sequence',
+    operators_1.defaultIfEmpty(graph));
 }));
 //# sourceMappingURL=package.transform.js.map

package/lib/ng-v5/package.transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.transform.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/package.transform.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, concat as concatStatic, from as fromPromise, of as observableOf, pipe, NEVER } from 'rxjs';\nimport { concatMap, map, switchMap, takeLast, tap, mapTo, catchError, startWith, debounceTime } from 'rxjs/operators';\nimport { BuildGraph } from '../brocc/build-graph';\nimport { DepthBuilder } from '../brocc/depth';\nimport { STATE_IN_PROGESS } from '../brocc/node';\nimport { Transform } from '../brocc/transform';\nimport * as log from '../util/log';\nimport { copyFiles } from '../util/copy';\nimport { rimraf } from '../util/rimraf';\nimport { PackageNode, EntryPointNode, ngUrl, isEntryPoint, byEntryPoint, isPackage } from './nodes';\nimport { discoverPackages } from './discover-packages';\nimport { createFileWatch } from '../file/file-watcher';\nimport { NgPackagrOptions } from './options.di';\nimport { unique } from '../util/array';\n\n/**\n * A transformation for building an npm package:\n *\n *  - discoverPackages\n *  - options\n *  - initTsConfig\n *  - analyzeTsSources (thereby extracting template and stylesheet files)\n *  - for each entry point\n *    - run the entryPontTransform\n *  - writeNpmPackage\n *\n * @param project Project token, reference to `ng-package.json`\n * @param options ng-packagr options\n * @param initTsConfigTransform Transformation initializing the tsconfig of each entry point.\n * @param analyseSourcesTransform Transformation analyzing the typescript source files of each entry point.\n * @param entryPointTransform Transformation for asset rendering and compilation of a single entry point.\n */\nexport const packageTransformFactory = (\n  project: string,\n  options: NgPackagrOptions,\n  initTsConfigTransform: Transform,\n  analyseSourcesTransform: Transform,\n  entryPointTransform: Transform\n) => (source$: Observable<BuildGraph>): Observable<BuildGraph> => {\n  const pkgUri = ngUrl(project);\n\n  const buildTransform = options.watch\n    ? watchTransformFactory(project, options, analyseSourcesTransform, entryPointTransform)\n    : buildTransformFactory(project, analyseSourcesTransform, entryPointTransform);\n\n  return source$.pipe(\n    tap(() => log.info(`Building Angular Package`)),\n    // Discover packages and entry points\n    switchMap(graph => {\n      const pkg = discoverPackages({ project });\n\n      return fromPromise(pkg).pipe(\n        map(value => {\n          const ngPkg = new PackageNode(pkgUri);\n          ngPkg.data = value;\n\n          return graph.put(ngPkg);\n        })\n      );\n    }),\n    // Clean the primary dest folder (should clean all secondary sub-directory, as well)\n    switchMap(graph => {\n      const { dest, deleteDestPath } = graph.get(pkgUri).data;\n      return fromPromise(deleteDestPath ? rimraf(dest) : Promise.resolve());\n    }, (graph, _) => graph),\n    // Add entry points to graph\n    map(graph => {\n      const ngPkg = graph.get(pkgUri);\n      const entryPoints = [ngPkg.data.primary, ...ngPkg.data.secondaries].map(entryPoint => {\n        const { destinationFiles, moduleId } = entryPoint;\n        const node = new EntryPointNode(ngUrl(moduleId));\n        node.data = { entryPoint, destinationFiles };\n        node.state = 'dirty';\n        ngPkg.dependsOn(node);\n\n        return node;\n      });\n\n      return graph.put(entryPoints);\n    }),\n    // Initialize the tsconfig for each entry point\n    initTsConfigTransform,\n    // perform build\n    buildTransform\n  );\n};\n\nconst watchTransformFactory = (\n  project: string,\n  options: NgPackagrOptions,\n  analyseSourcesTransform: Transform,\n  entryPointTransform: Transform\n) => (source$: Observable<BuildGraph>): Observable<BuildGraph> => {\n  const CompleteWaitingForFileChange = '\\nCompilation complete. Watching for file changes...';\n  const FileChangeDetected = '\\nFile change detected. Starting incremental compilation...';\n  const FailedWaitingForFileChange = '\\nCompilation failed. Watching for file changes...';\n\n  return source$.pipe(\n    switchMap(graph => {\n      const { data } = graph.find(isPackage) as PackageNode;\n      return createFileWatch(data.src, [data.dest]).pipe(\n        tap(fileChange => {\n          const entryPoints = graph.filter(isEntryPoint);\n          const { filePath } = fileChange;\n          let filePathsToClean: string[] = [filePath];\n\n          entryPoints.forEach((node: EntryPointNode) => {\n            const { compilationFileCache } = node.cache;\n            const cached = compilationFileCache.get(filePath);\n\n            // when a ts file changes we also need to clean it's .d.ts file\n            // and the entrypoint metadata due to the fact that metadata is used to validate component properties\n            if (cached && cached.declarationFileName) {\n              const { metadata } = node.data.destinationFiles;\n              filePathsToClean.push(cached.declarationFileName, metadata);\n            }\n          });\n\n          filePathsToClean = unique(filePathsToClean);\n\n          entryPoints.forEach((node: EntryPointNode) => {\n            const { analysisFileCache, compilationFileCache } = node.cache;\n\n            let isDirty = false;\n\n            filePathsToClean.forEach(x => {\n              isDirty = analysisFileCache.delete(x) || isDirty;\n              isDirty = compilationFileCache.delete(x) || isDirty;\n            });\n\n            if (isDirty) {\n              node.state = 'dirty';\n            }\n          });\n        }),\n        debounceTime(200),\n        tap(() => log.msg(FileChangeDetected)),\n        startWith(undefined),\n        mapTo(graph)\n      );\n    }),\n    switchMap(graph => {\n      return observableOf(graph).pipe(\n        buildTransformFactory(project, analyseSourcesTransform, entryPointTransform),\n        tap(() => log.msg(CompleteWaitingForFileChange)),\n        catchError(error => {\n          log.error(error);\n          log.msg(FailedWaitingForFileChange);\n          return NEVER;\n        })\n      );\n    })\n  );\n};\n\nconst buildTransformFactory = (project: string, analyseSourcesTransform: Transform, entryPointTransform: Transform) => (\n  source$: Observable<BuildGraph>\n): Observable<BuildGraph> => {\n  const pkgUri = ngUrl(project);\n  return source$.pipe(\n    // Analyse dependencies and external resources for each entry point\n    analyseSourcesTransform,\n    // Next, run through the entry point transformation (assets rendering, code compilation)\n    scheduleEntryPoints(entryPointTransform),\n    // Write npm package to dest folder\n    writeNpmPackage(pkgUri),\n    tap(graph => {\n      const ngPkg = graph.get(pkgUri);\n      log.success(`Built Angular Package!\n - from: ${ngPkg.data.src}\n - to:   ${ngPkg.data.dest}`);\n    })\n  );\n};\n\nconst writeNpmPackage = (pkgUri: string): Transform =>\n  pipe(\n    switchMap(graph => {\n      const ngPkg = graph.get(pkgUri);\n      return fromPromise(copyFiles([`${ngPkg.data.src}/LICENSE`, `${ngPkg.data.src}/README.md`], ngPkg.data.dest)).pipe(\n        map(() => graph)\n      );\n    })\n  );\n\nconst scheduleEntryPoints = (epTransform: Transform): Transform =>\n  pipe(\n    concatMap(graph => {\n      // Calculate node/dependency depth and determine build order\n      const depthBuilder = new DepthBuilder();\n      const entryPoints = graph.filter(x => isEntryPoint(x) && x.state !== 'done');\n      entryPoints.forEach(entryPoint => {\n        const deps = entryPoint.filter(isEntryPoint).map(ep => ep.url);\n        depthBuilder.add(entryPoint.url, deps);\n      });\n\n      // The array index is the depth.\n      const groups = depthBuilder.build();\n      const flattenedGroups = groups.reduce((prev, current) => prev.concat(current), []);\n      let currentIndex = 0;\n\n      // Build entry points with lower depth values first.\n      const eps$ = flattenedGroups.map(() =>\n        observableOf(graph).pipe(\n          tap(() => {\n            // Find current entry point in progress\n            const epUrl = flattenedGroups[currentIndex];\n            const entryPoint = graph.find(byEntryPoint().and(ep => ep.url === epUrl));\n\n            // Mark the entry point as 'in-progress'\n            entryPoint.state = STATE_IN_PROGESS;\n          }),\n          epTransform,\n          tap(() => {\n            currentIndex += 1;\n          })\n        )\n      );\n\n      // Build all entry points, then continue\n      return concatStatic(...eps$).pipe(takeLast(1));\n    })\n  );\n"]}
+{"version":3,"file":"package.transform.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/package.transform.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport { Observable, of as observableOf, pipe, NEVER, from } from 'rxjs';\nimport {\n  concatMap,\n  map,\n  switchMap,\n  tap,\n  mapTo,\n  catchError,\n  startWith,\n  debounceTime,\n  filter,\n  takeLast,\n  defaultIfEmpty\n} from 'rxjs/operators';\nimport { BuildGraph } from '../brocc/build-graph';\nimport { DepthBuilder } from '../brocc/depth';\nimport { STATE_IN_PROGESS } from '../brocc/node';\nimport { Transform } from '../brocc/transform';\nimport * as log from '../util/log';\nimport { rimraf } from '../util/rimraf';\nimport { PackageNode, EntryPointNode, ngUrl, isEntryPoint, byEntryPoint, isPackage } from './nodes';\nimport { discoverPackages } from './discover-packages';\nimport { createFileWatch } from '../file/file-watcher';\nimport { NgPackagrOptions } from './options.di';\nimport { unique, flatten } from '../util/array';\nimport { copyFile } from '../util/copy';\n\n/**\n * A transformation for building an npm package:\n *\n *  - discoverPackages\n *  - options\n *  - initTsConfig\n *  - analyzeTsSources (thereby extracting template and stylesheet files)\n *  - for each entry point\n *    - run the entryPontTransform\n *  - writeNpmPackage\n *\n * @param project Project token, reference to `ng-package.json`\n * @param options ng-packagr options\n * @param initTsConfigTransform Transformation initializing the tsconfig of each entry point.\n * @param analyseSourcesTransform Transformation analyzing the typescript source files of each entry point.\n * @param entryPointTransform Transformation for asset rendering and compilation of a single entry point.\n */\nexport const packageTransformFactory = (\n  project: string,\n  options: NgPackagrOptions,\n  initTsConfigTransform: Transform,\n  analyseSourcesTransform: Transform,\n  entryPointTransform: Transform\n) => (source$: Observable<BuildGraph>): Observable<BuildGraph> => {\n  const pkgUri = ngUrl(project);\n\n  const buildTransform = options.watch\n    ? watchTransformFactory(project, options, analyseSourcesTransform, entryPointTransform)\n    : buildTransformFactory(project, analyseSourcesTransform, entryPointTransform);\n\n  return source$.pipe(\n    tap(() => log.info(`Building Angular Package`)),\n    // Discover packages and entry points\n    switchMap(graph => {\n      const pkg = discoverPackages({ project });\n\n      return from(pkg).pipe(\n        map(value => {\n          const ngPkg = new PackageNode(pkgUri);\n          ngPkg.data = value;\n\n          return graph.put(ngPkg);\n        })\n      );\n    }),\n    // Clean the primary dest folder (should clean all secondary sub-directory, as well)\n    switchMap(graph => {\n      const { dest, deleteDestPath } = graph.get(pkgUri).data;\n      return from(deleteDestPath ? rimraf(dest) : Promise.resolve());\n    }, (graph, _) => graph),\n    // Add entry points to graph\n    map(graph => {\n      const ngPkg = graph.get(pkgUri);\n      const entryPoints = [ngPkg.data.primary, ...ngPkg.data.secondaries].map(entryPoint => {\n        const { destinationFiles, moduleId } = entryPoint;\n        const node = new EntryPointNode(ngUrl(moduleId));\n        node.data = { entryPoint, destinationFiles };\n        node.state = 'dirty';\n        ngPkg.dependsOn(node);\n\n        return node;\n      });\n\n      return graph.put(entryPoints);\n    }),\n    // Initialize the tsconfig for each entry point\n    initTsConfigTransform,\n    // perform build\n    buildTransform\n  );\n};\n\nconst watchTransformFactory = (\n  project: string,\n  _options: NgPackagrOptions,\n  analyseSourcesTransform: Transform,\n  entryPointTransform: Transform\n) => (source$: Observable<BuildGraph>): Observable<BuildGraph> => {\n  const CompleteWaitingForFileChange = '\\nCompilation complete. Watching for file changes...';\n  const FileChangeDetected = '\\nFile change detected. Starting incremental compilation...';\n  const FailedWaitingForFileChange = '\\nCompilation failed. Watching for file changes...';\n\n  return source$.pipe(\n    switchMap(graph => {\n      const { data } = graph.find(isPackage) as PackageNode;\n      return createFileWatch(data.src, [data.dest]).pipe(\n        tap(fileChange => {\n          const entryPoints = graph.filter(isEntryPoint);\n          const { filePath } = fileChange;\n          let filePathsToClean: string[] = [filePath];\n\n          entryPoints.forEach((node: EntryPointNode) => {\n            const { sourcesFileCache } = node.cache;\n            const cached = sourcesFileCache.get(filePath);\n\n            // when a ts file changes we also need to clean it's .d.ts file\n            // and the entrypoint metadata due to the fact that metadata is used to validate component properties\n            if (cached && cached.declarationFileName) {\n              const { metadata } = node.data.destinationFiles;\n              filePathsToClean.push(cached.declarationFileName, metadata);\n            }\n          });\n\n          filePathsToClean = unique(filePathsToClean);\n\n          entryPoints.forEach((node: EntryPointNode) => {\n            const { sourcesFileCache } = node.cache;\n\n            let isDirty = false;\n\n            filePathsToClean.forEach(x => {\n              isDirty = sourcesFileCache.delete(x) || isDirty;\n            });\n\n            if (isDirty) {\n              node.state = 'dirty';\n            }\n          });\n        }),\n        debounceTime(200),\n        tap(() => log.msg(FileChangeDetected)),\n        startWith(undefined),\n        mapTo(graph)\n      );\n    }),\n    switchMap(graph => {\n      return observableOf(graph).pipe(\n        buildTransformFactory(project, analyseSourcesTransform, entryPointTransform),\n        tap(() => log.msg(CompleteWaitingForFileChange)),\n        catchError(error => {\n          log.error(error);\n          log.msg(FailedWaitingForFileChange);\n          return NEVER;\n        })\n      );\n    })\n  );\n};\n\nconst buildTransformFactory = (project: string, analyseSourcesTransform: Transform, entryPointTransform: Transform) => (\n  source$: Observable<BuildGraph>\n): Observable<BuildGraph> => {\n  const pkgUri = ngUrl(project);\n  return source$.pipe(\n    // Analyse dependencies and external resources for each entry point\n    analyseSourcesTransform,\n    // Next, run through the entry point transformation (assets rendering, code compilation)\n    scheduleEntryPoints(entryPointTransform),\n    // Write npm package to dest folder\n    writeNpmPackage(pkgUri),\n    tap(graph => {\n      const ngPkg = graph.get(pkgUri);\n      log.success(`Built Angular Package!\n - from: ${ngPkg.data.src}\n - to:   ${ngPkg.data.dest}`);\n    })\n  );\n};\n\nconst writeNpmPackage = (pkgUri: string): Transform =>\n  pipe(\n    switchMap(graph => {\n      const { data } = graph.get(pkgUri);\n      const filesToCopy = Promise.all(\n        [`${data.src}/LICENSE`, `${data.src}/README.md`].map(src =>\n          copyFile(src, path.join(data.dest, path.basename(src)))\n        )\n      );\n\n      return from(filesToCopy).pipe(map(() => graph));\n    })\n  );\n\nconst scheduleEntryPoints = (epTransform: Transform): Transform =>\n  pipe(\n    concatMap(graph => {\n      // Calculate node/dependency depth and determine build order\n      const depthBuilder = new DepthBuilder();\n      const entryPoints = graph.filter(isEntryPoint);\n      entryPoints.forEach(entryPoint => {\n        const deps = entryPoint.filter(isEntryPoint).map(ep => ep.url);\n        depthBuilder.add(entryPoint.url, deps);\n      });\n\n      // The array index is the depth.\n      const groups = depthBuilder.build();\n\n      // Build entry points with lower depth values first.\n      return from(flatten(groups)).pipe(\n        map(epUrl => graph.find(byEntryPoint().and(ep => ep.url === epUrl)) as EntryPointNode),\n        filter(entryPoint => entryPoint.state !== 'done'),\n        concatMap(ep =>\n          observableOf(ep).pipe(\n            // Mark the entry point as 'in-progress'\n            tap(entryPoint => (entryPoint.state = STATE_IN_PROGESS)),\n            mapTo(graph),\n            epTransform\n          )\n        ),\n        takeLast(1), // don't use last as sometimes it this will cause 'no elements in sequence',\n        defaultIfEmpty(graph)\n      );\n    })\n  );\n"]}

package/lib/ng-v5/packagr.d.ts

@@ -1,7 +1,7 @@
 import { InjectionToken, Provider } from 'injection-js';
+import { ParsedConfiguration } from '@angular/compiler-cli';
 import { Observable } from 'rxjs';
 import { Transform } from '../brocc/transform';
-import { TsConfig } from '../ts/tsconfig';
 import { NgPackagrOptions } from './options.di';
 /**
  * The original ng-packagr implemented on top of a rxjs-ified and di-jectable transformation pipeline.
@@ -42,7 +42,7 @@ export declare class NgPackagr {
      * @param defaultValues A tsconfig providing default values to the compilation.
      * @return Self instance for fluent API
      */
-    withTsConfig(defaultValues: TsConfig | string): NgPackagr;
+    withTsConfig(defaultValues: ParsedConfiguration | string): NgPackagr;
     /**
      * Overwrites the 'build' transform.
      *

package/lib/ng-v5/packagr.js.map

@@ -1 +1 @@
-{"version":3,"file":"packagr.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/packagr.ts"],"names":[],"mappings":";;AAAA,+CAA4E;AAC5E,+BAAsD;AACtD,8CAAiD;AACjD,sDAAkD;AAGlD,mCAAmC;AACnC,8DAA0D;AAC1D,qDAAyD;AACzD,6CAAoE;AACpE,6CAA8C;AAC9C,6CAAgE;AAEhE;;;;;;GAMG;AACH;IAGE,YAAoB,SAAqB;QAArB,cAAS,GAAT,SAAS,CAAY;QAFjC,mBAAc,GAA8B,8BAAiB,CAAC,OAAO,CAAC;IAElC,CAAC;IAE7C;;;;;OAKG;IACI,WAAW,CAAC,OAAyB;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,MAAM,CAAC,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,MAAM,CAAC,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACI,aAAa,CAAC,SAAqB;QACxC,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;QAEnD,MAAM,CAAC,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAC,aAAgC;QAClD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEpD,MAAM,CAAC,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,kBAAkB,CAAC,SAAoC;QAC5D,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAEhC,MAAM,CAAC,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAErD,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,iBAAiB;QACtB,MAAM,QAAQ,GAAG,iCAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEjE,MAAM,CAAC,SAAY,CAAC,IAAI,wBAAU,EAAE,CAAC,CAAC,IAAI,CACxC,sBAAsB,EACtB,sBAAU,CAAC,GAAG,CAAC,EAAE;YACf,2CAA2C;YAC3C,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,MAAM,GAAG,CAAC;QACZ,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CACrB,CAAC;IACJ,CAAC;CACF;AAzGD,8BAyGC;AAEY,QAAA,SAAS,GAAG,GAAc,EAAE,CACvC,IAAI,SAAS,CAAC;IACZ,sCAAsC;IACtC,GAAG,8BAAiB;IACpB,GAAG,sCAAqB;CACzB,CAAC,CAAC","sourcesContent":["import { InjectionToken, Provider, ReflectiveInjector } from 'injection-js';\nimport { of as observableOf, Observable } from 'rxjs';\nimport { map, catchError } from 'rxjs/operators';\nimport { BuildGraph } from '../brocc/build-graph';\nimport { Transform } from '../brocc/transform';\nimport { TsConfig } from '../ts/tsconfig';\nimport * as log from '../util/log';\nimport { provideTsConfig } from './init/init-tsconfig.di';\nimport { ENTRY_POINT_PROVIDERS } from './entry-point.di';\nimport { PACKAGE_TRANSFORM, PACKAGE_PROVIDERS } from './package.di';\nimport { provideProject } from './project.di';\nimport { provideOptions, NgPackagrOptions } from './options.di';\n\n/**\n * The original ng-packagr implemented on top of a rxjs-ified and di-jectable transformation pipeline.\n *\n * See the `docs/transformations.md` for more prose description.\n *\n * @link https://github.com/dherges/ng-packagr/pull/572\n */\nexport class NgPackagr {\n  private buildTransform: InjectionToken<Transform> = PACKAGE_TRANSFORM.provide;\n\n  constructor(private providers: Provider[]) {}\n\n  /**\n   * Adds options to ng-packagr\n   *\n   * @param options Ng Packagr Options\n   * @return Self instance for fluent API\n   */\n  public withOptions(options: NgPackagrOptions): NgPackagr {\n    this.providers.push(provideOptions(options));\n\n    return this;\n  }\n\n  /**\n   * Sets the path to the user's \"ng-package\" file (either `package.json`, `ng-package.json`, or `ng-package.js`)\n   *\n   * @param project File path\n   * @return Self instance for fluent API\n   */\n  public forProject(project: string): NgPackagr {\n    this.providers.push(provideProject(project));\n\n    return this;\n  }\n\n  /**\n   * Adds dependency injection providers.\n   *\n   * @param providers\n   * @return Self instance for fluent API\n   * @link https://github.com/mgechev/injection-js\n   */\n  public withProviders(providers: Provider[]): NgPackagr {\n    this.providers = [...this.providers, ...providers];\n\n    return this;\n  }\n\n  /**\n   * Overwrites the default TypeScript configuration.\n   *\n   * @param defaultValues A tsconfig providing default values to the compilation.\n   * @return Self instance for fluent API\n   */\n  public withTsConfig(defaultValues: TsConfig | string): NgPackagr {\n    this.providers.push(provideTsConfig(defaultValues));\n\n    return this;\n  }\n\n  /**\n   * Overwrites the 'build' transform.\n   *\n   * @param transform\n   * @return Self intance for fluent API\n   */\n  public withBuildTransform(transform: InjectionToken<Transform>): NgPackagr {\n    this.buildTransform = transform;\n\n    return this;\n  }\n\n  /**\n   * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n   *\n   * @return A promisified result of the transformation pipeline.\n   */\n  public build(): Promise<void> {\n    return this.buildAsObservable().toPromise();\n  }\n\n  /**\n   * Builds and watch for changes by kick-starting the 'watch' transform over an (initially) empty `BuildGraph``\n   *\n   * @return An observable result of the transformation pipeline.\n   */\n  public watch(): Observable<void> {\n    this.providers.push(provideOptions({ watch: true }));\n\n    return this.buildAsObservable();\n  }\n\n  /**\n   * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n   *\n   * @return An observable result of the transformation pipeline.\n   */\n  public buildAsObservable(): Observable<void> {\n    const injector = ReflectiveInjector.resolveAndCreate(this.providers);\n    const buildTransformOperator = injector.get(this.buildTransform);\n\n    return observableOf(new BuildGraph()).pipe(\n      buildTransformOperator,\n      catchError(err => {\n        // Report error and re-throw to subscribers\n        log.error(err);\n        throw err;\n      }),\n      map(() => undefined)\n    );\n  }\n}\n\nexport const ngPackagr = (): NgPackagr =>\n  new NgPackagr([\n    // Add default providers to this list.\n    ...PACKAGE_PROVIDERS,\n    ...ENTRY_POINT_PROVIDERS\n  ]);\n"]}
+{"version":3,"file":"packagr.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/packagr.ts"],"names":[],"mappings":";;AAAA,+CAA4E;AAE5E,+BAAsD;AACtD,8CAAiD;AACjD,sDAAkD;AAElD,mCAAmC;AACnC,8DAA0D;AAC1D,qDAAyD;AACzD,6CAAoE;AACpE,6CAA8C;AAC9C,6CAAgE;AAEhE;;;;;;GAMG;AACH;IAGE,YAAoB,SAAqB;QAArB,cAAS,GAAT,SAAS,CAAY;QAFjC,mBAAc,GAA8B,8BAAiB,CAAC,OAAO,CAAC;IAElC,CAAC;IAE7C;;;;;OAKG;IACI,WAAW,CAAC,OAAyB;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACI,aAAa,CAAC,SAAqB;QACxC,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAC,aAA2C;QAC7D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,kBAAkB,CAAC,SAAoC;QAC5D,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAEhC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,iBAAiB;QACtB,MAAM,QAAQ,GAAG,iCAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEjE,OAAO,SAAY,CAAC,IAAI,wBAAU,EAAE,CAAC,CAAC,IAAI,CACxC,sBAAsB,EACtB,sBAAU,CAAC,GAAG,CAAC,EAAE;YACf,2CAA2C;YAC3C,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,MAAM,GAAG,CAAC;QACZ,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CACrB,CAAC;IACJ,CAAC;CACF;AAzGD,8BAyGC;AAEY,QAAA,SAAS,GAAG,GAAc,EAAE,CACvC,IAAI,SAAS,CAAC;IACZ,sCAAsC;IACtC,GAAG,8BAAiB;IACpB,GAAG,sCAAqB;CACzB,CAAC,CAAC","sourcesContent":["import { InjectionToken, Provider, ReflectiveInjector } from 'injection-js';\nimport { ParsedConfiguration } from '@angular/compiler-cli';\nimport { of as observableOf, Observable } from 'rxjs';\nimport { map, catchError } from 'rxjs/operators';\nimport { BuildGraph } from '../brocc/build-graph';\nimport { Transform } from '../brocc/transform';\nimport * as log from '../util/log';\nimport { provideTsConfig } from './init/init-tsconfig.di';\nimport { ENTRY_POINT_PROVIDERS } from './entry-point.di';\nimport { PACKAGE_TRANSFORM, PACKAGE_PROVIDERS } from './package.di';\nimport { provideProject } from './project.di';\nimport { provideOptions, NgPackagrOptions } from './options.di';\n\n/**\n * The original ng-packagr implemented on top of a rxjs-ified and di-jectable transformation pipeline.\n *\n * See the `docs/transformations.md` for more prose description.\n *\n * @link https://github.com/dherges/ng-packagr/pull/572\n */\nexport class NgPackagr {\n  private buildTransform: InjectionToken<Transform> = PACKAGE_TRANSFORM.provide;\n\n  constructor(private providers: Provider[]) {}\n\n  /**\n   * Adds options to ng-packagr\n   *\n   * @param options Ng Packagr Options\n   * @return Self instance for fluent API\n   */\n  public withOptions(options: NgPackagrOptions): NgPackagr {\n    this.providers.push(provideOptions(options));\n\n    return this;\n  }\n\n  /**\n   * Sets the path to the user's \"ng-package\" file (either `package.json`, `ng-package.json`, or `ng-package.js`)\n   *\n   * @param project File path\n   * @return Self instance for fluent API\n   */\n  public forProject(project: string): NgPackagr {\n    this.providers.push(provideProject(project));\n\n    return this;\n  }\n\n  /**\n   * Adds dependency injection providers.\n   *\n   * @param providers\n   * @return Self instance for fluent API\n   * @link https://github.com/mgechev/injection-js\n   */\n  public withProviders(providers: Provider[]): NgPackagr {\n    this.providers = [...this.providers, ...providers];\n\n    return this;\n  }\n\n  /**\n   * Overwrites the default TypeScript configuration.\n   *\n   * @param defaultValues A tsconfig providing default values to the compilation.\n   * @return Self instance for fluent API\n   */\n  public withTsConfig(defaultValues: ParsedConfiguration | string): NgPackagr {\n    this.providers.push(provideTsConfig(defaultValues));\n\n    return this;\n  }\n\n  /**\n   * Overwrites the 'build' transform.\n   *\n   * @param transform\n   * @return Self intance for fluent API\n   */\n  public withBuildTransform(transform: InjectionToken<Transform>): NgPackagr {\n    this.buildTransform = transform;\n\n    return this;\n  }\n\n  /**\n   * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n   *\n   * @return A promisified result of the transformation pipeline.\n   */\n  public build(): Promise<void> {\n    return this.buildAsObservable().toPromise();\n  }\n\n  /**\n   * Builds and watch for changes by kick-starting the 'watch' transform over an (initially) empty `BuildGraph``\n   *\n   * @return An observable result of the transformation pipeline.\n   */\n  public watch(): Observable<void> {\n    this.providers.push(provideOptions({ watch: true }));\n\n    return this.buildAsObservable();\n  }\n\n  /**\n   * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n   *\n   * @return An observable result of the transformation pipeline.\n   */\n  public buildAsObservable(): Observable<void> {\n    const injector = ReflectiveInjector.resolveAndCreate(this.providers);\n    const buildTransformOperator = injector.get(this.buildTransform);\n\n    return observableOf(new BuildGraph()).pipe(\n      buildTransformOperator,\n      catchError(err => {\n        // Report error and re-throw to subscribers\n        log.error(err);\n        throw err;\n      }),\n      map(() => undefined)\n    );\n  }\n}\n\nexport const ngPackagr = (): NgPackagr =>\n  new NgPackagr([\n    // Add default providers to this list.\n    ...PACKAGE_PROVIDERS,\n    ...ENTRY_POINT_PROVIDERS\n  ]);\n"]}

package/lib/ngc/compile-source-files.d.ts

@@ -1,6 +1,5 @@
 import * as ng from '@angular/compiler-cli';
 import * as ts from 'typescript';
-import { TsConfig } from '../ts/tsconfig';
 import { FileCache } from '../file/file-cache';
 import { StylesheetProcessor } from '../ng-v5/entry-point/resources/stylesheet-processor';
-export declare function compileSourceFiles(tsConfig: TsConfig, sourcesFileCache: FileCache, moduleResolutionCache: ts.ModuleResolutionCache, stylesheetProcessor: StylesheetProcessor, extraOptions?: Partial<ng.CompilerOptions>, declarationDir?: string): Promise<void>;
+export declare function compileSourceFiles(tsConfig: ng.ParsedConfiguration, sourcesFileCache: FileCache, moduleResolutionCache: ts.ModuleResolutionCache, stylesheetProcessor: StylesheetProcessor, extraOptions?: Partial<ng.CompilerOptions>, declarationDir?: string): Promise<void>;

package/lib/ngc/compile-source-files.js

@@ -8,9 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs-extra");
 const ng = require("@angular/compiler-cli");
-const path = require("path");
 const log = require("../util/log");
 const create_emit_callback_1 = require("./create-emit-callback");
 const redirect_write_file_compiler_host_1 = require("../ts/redirect-write-file-compiler-host");
@@ -30,25 +28,14 @@ function compileSourceFiles(tsConfig, sourcesFileCache, moduleResolutionCache, s
         });
         // Don't use `ng.emit` as it doesn't output all errors.
         // https://github.com/angular/angular/issues/24024
+        const emitFlags = tsConfigOptions.declaration ? tsConfig.emitFlags : ng.EmitFlags.JS;
         const result = ng.performCompilation({
             rootNames: tsConfig.rootNames,
             options: tsConfigOptions,
             host: ngCompilerHost,
             emitCallback: create_emit_callback_1.createEmitCallback(tsConfigOptions),
-            emitFlags: tsConfig.emitFlags
+            emitFlags
         });
-        // XX(hack): redirect the `*.metadata.json` to the correct outDir
-        // @link https://github.com/angular/angular/pull/21787
-        if (declarationDir) {
-            const flatModuleFile = tsConfigOptions.flatModuleOutFile;
-            const flatModuleFileExtension = path.extname(flatModuleFile);
-            const metadataBundleFile = flatModuleFile.replace(flatModuleFileExtension, '.metadata.json');
-            const metadataSrc = path.resolve(tsConfigOptions.declarationDir, metadataBundleFile);
-            const metadataDest = path.resolve(declarationDir, metadataBundleFile);
-            if (metadataDest !== metadataSrc && fs.existsSync(metadataSrc)) {
-                fs.moveSync(metadataSrc, metadataDest, { overwrite: true });
-            }
-        }
         const exitCode = ng.exitCodeFromResult(result.diagnostics);
         return exitCode === 0 ? Promise.resolve() : Promise.reject(new Error(ng.formatDiagnostics(result.diagnostics)));
     });

package/lib/ngc/compile-source-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../src/lib/ngc/compile-source-files.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,+BAA+B;AAC/B,4CAA4C;AAE5C,6BAA6B;AAE7B,mCAAmC;AACnC,iEAA4D;AAC5D,+FAAwF;AACxF,mEAA8D;AAI9D,4BACE,QAAkB,EAClB,gBAA2B,EAC3B,qBAA+C,EAC/C,mBAAwC,EACxC,YAA0C,EAC1C,cAAuB;;QAEvB,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;QAEvC,MAAM,eAAe,qBAA4B,QAAQ,CAAC,OAAO,EAAK,YAAY,CAAE,CAAC;QAErF,IAAI,cAAc,GAAG,uCAAiB,CAAC,eAAe,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,CAAC;QACtH,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACnB,cAAc,GAAG,iEAA6B,CAAC,cAAc,EAAE,eAAe,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAC3G,CAAC;QAED,kBAAkB;QAClB,MAAM,cAAc,GAAG,EAAE,CAAC,kBAAkB,CAAC;YAC3C,OAAO,EAAE,eAAe;YACxB,MAAM,EAAE,cAAc;SACvB,CAAC,CAAC;QAEH,uDAAuD;QACvD,kDAAkD;QAClD,MAAM,MAAM,GAAG,EAAE,CAAC,kBAAkB,CAAC;YACnC,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,OAAO,EAAE,eAAe;YACxB,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE,yCAAkB,CAAC,eAAe,CAAC;YACjD,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAC;QAEH,iEAAiE;QACjE,sDAAsD;QACtD,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;YACnB,MAAM,cAAc,GAAG,eAAe,CAAC,iBAAiB,CAAC;YACzD,MAAM,uBAAuB,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAC7D,MAAM,kBAAkB,GAAG,cAAc,CAAC,OAAO,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,CAAC;YAC7F,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YACrF,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YACtE,EAAE,CAAC,CAAC,YAAY,KAAK,WAAW,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC/D,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3D,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC;CAAA;AAhDD,gDAgDC","sourcesContent":["import * as fs from 'fs-extra';\nimport * as ng from '@angular/compiler-cli';\nimport * as ts from 'typescript';\nimport * as path from 'path';\nimport { TsConfig } from '../ts/tsconfig';\nimport * as log from '../util/log';\nimport { createEmitCallback } from './create-emit-callback';\nimport { redirectWriteFileCompilerHost } from '../ts/redirect-write-file-compiler-host';\nimport { cacheCompilerHost } from '../ts/cache-compiler-host';\nimport { FileCache } from '../file/file-cache';\nimport { StylesheetProcessor } from '../ng-v5/entry-point/resources/stylesheet-processor';\n\nexport async function compileSourceFiles(\n  tsConfig: TsConfig,\n  sourcesFileCache: FileCache,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor: StylesheetProcessor,\n  extraOptions?: Partial<ng.CompilerOptions>,\n  declarationDir?: string\n) {\n  log.debug(`ngc (v${ng.VERSION.full})`);\n\n  const tsConfigOptions: ng.CompilerOptions = { ...tsConfig.options, ...extraOptions };\n\n  let tsCompilerHost = cacheCompilerHost(tsConfigOptions, sourcesFileCache, moduleResolutionCache, stylesheetProcessor);\n  if (declarationDir) {\n    tsCompilerHost = redirectWriteFileCompilerHost(tsCompilerHost, tsConfigOptions.basePath, declarationDir);\n  }\n\n  // ng.CompilerHost\n  const ngCompilerHost = ng.createCompilerHost({\n    options: tsConfigOptions,\n    tsHost: tsCompilerHost\n  });\n\n  // Don't use `ng.emit` as it doesn't output all errors.\n  // https://github.com/angular/angular/issues/24024\n  const result = ng.performCompilation({\n    rootNames: tsConfig.rootNames,\n    options: tsConfigOptions,\n    host: ngCompilerHost,\n    emitCallback: createEmitCallback(tsConfigOptions),\n    emitFlags: tsConfig.emitFlags\n  });\n\n  // XX(hack): redirect the `*.metadata.json` to the correct outDir\n  // @link https://github.com/angular/angular/pull/21787\n  if (declarationDir) {\n    const flatModuleFile = tsConfigOptions.flatModuleOutFile;\n    const flatModuleFileExtension = path.extname(flatModuleFile);\n    const metadataBundleFile = flatModuleFile.replace(flatModuleFileExtension, '.metadata.json');\n    const metadataSrc = path.resolve(tsConfigOptions.declarationDir, metadataBundleFile);\n    const metadataDest = path.resolve(declarationDir, metadataBundleFile);\n    if (metadataDest !== metadataSrc && fs.existsSync(metadataSrc)) {\n      fs.moveSync(metadataSrc, metadataDest, { overwrite: true });\n    }\n  }\n\n  const exitCode = ng.exitCodeFromResult(result.diagnostics);\n  return exitCode === 0 ? Promise.resolve() : Promise.reject(new Error(ng.formatDiagnostics(result.diagnostics)));\n}\n"]}
+{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../src/lib/ngc/compile-source-files.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,4CAA4C;AAE5C,mCAAmC;AACnC,iEAA4D;AAC5D,+FAAwF;AACxF,mEAA8D;AAI9D,4BACE,QAAgC,EAChC,gBAA2B,EAC3B,qBAA+C,EAC/C,mBAAwC,EACxC,YAA0C,EAC1C,cAAuB;;QAEvB,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;QAEvC,MAAM,eAAe,qBAA4B,QAAQ,CAAC,OAAO,EAAK,YAAY,CAAE,CAAC;QAErF,IAAI,cAAc,GAAG,uCAAiB,CAAC,eAAe,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,CAAC;QACtH,IAAI,cAAc,EAAE;YAClB,cAAc,GAAG,iEAA6B,CAAC,cAAc,EAAE,eAAe,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;SAC1G;QAED,kBAAkB;QAClB,MAAM,cAAc,GAAG,EAAE,CAAC,kBAAkB,CAAC;YAC3C,OAAO,EAAE,eAAe;YACxB,MAAM,EAAE,cAAc;SACvB,CAAC,CAAC;QAEH,uDAAuD;QACvD,kDAAkD;QAClD,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC;QAErF,MAAM,MAAM,GAAG,EAAE,CAAC,kBAAkB,CAAC;YACnC,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,OAAO,EAAE,eAAe;YACxB,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE,yCAAkB,CAAC,eAAe,CAAC;YACjD,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC3D,OAAO,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC;CAAA;AArCD,gDAqCC","sourcesContent":["import * as ng from '@angular/compiler-cli';\nimport * as ts from 'typescript';\nimport * as log from '../util/log';\nimport { createEmitCallback } from './create-emit-callback';\nimport { redirectWriteFileCompilerHost } from '../ts/redirect-write-file-compiler-host';\nimport { cacheCompilerHost } from '../ts/cache-compiler-host';\nimport { FileCache } from '../file/file-cache';\nimport { StylesheetProcessor } from '../ng-v5/entry-point/resources/stylesheet-processor';\n\nexport async function compileSourceFiles(\n  tsConfig: ng.ParsedConfiguration,\n  sourcesFileCache: FileCache,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor: StylesheetProcessor,\n  extraOptions?: Partial<ng.CompilerOptions>,\n  declarationDir?: string\n) {\n  log.debug(`ngc (v${ng.VERSION.full})`);\n\n  const tsConfigOptions: ng.CompilerOptions = { ...tsConfig.options, ...extraOptions };\n\n  let tsCompilerHost = cacheCompilerHost(tsConfigOptions, sourcesFileCache, moduleResolutionCache, stylesheetProcessor);\n  if (declarationDir) {\n    tsCompilerHost = redirectWriteFileCompilerHost(tsCompilerHost, tsConfigOptions.basePath, declarationDir);\n  }\n\n  // ng.CompilerHost\n  const ngCompilerHost = ng.createCompilerHost({\n    options: tsConfigOptions,\n    tsHost: tsCompilerHost\n  });\n\n  // Don't use `ng.emit` as it doesn't output all errors.\n  // https://github.com/angular/angular/issues/24024\n  const emitFlags = tsConfigOptions.declaration ? tsConfig.emitFlags : ng.EmitFlags.JS;\n\n  const result = ng.performCompilation({\n    rootNames: tsConfig.rootNames,\n    options: tsConfigOptions,\n    host: ngCompilerHost,\n    emitCallback: createEmitCallback(tsConfigOptions),\n    emitFlags\n  });\n\n  const exitCode = ng.exitCodeFromResult(result.diagnostics);\n  return exitCode === 0 ? Promise.resolve() : Promise.reject(new Error(ng.formatDiagnostics(result.diagnostics)));\n}\n"]}

package/lib/ngc/create-emit-callback.js

@@ -28,8 +28,8 @@ function createEmitCallback(options) {
     }
     const tsickleHost = {
         shouldSkipTsickleProcessing: fileName => /\.d\.ts$/.test(fileName) || GENERATED_FILES.test(fileName),
-        pathToModuleName: (context, importPath) => '',
-        shouldIgnoreWarningsForPath: filePath => false,
+        pathToModuleName: (_context, _importPath) => '',
+        shouldIgnoreWarningsForPath: _filePath => false,
         fileNameToModuleId: fileName => fileName,
         googmodule: false,
         untyped: true,

package/lib/ngc/create-emit-callback.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-emit-callback.js","sourceRoot":"","sources":["../../../src/lib/ngc/create-emit-callback.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,0EAA0E;AAC1E,uIAAuI;;AAEvI;;;;;;GAMG;AAEH,4IAA4I;AAC5I,MAAM,eAAe,GAAG,oEAAoE,CAAC;AAE7F,+CAAmC;AAGnC,kGAAkG;AAClG,4BAAmC,OAA4B;IAC7D,MAAM,mBAAmB,GAAG,OAAO,CAAC,aAAa,KAAK,YAAY,CAAC;IACnE,MAAM,uBAAuB,GAAG,OAAO,CAAC,0BAA0B,CAAC;IACnE,EAAE,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,SAAS,CAAC;IACnB,CAAC;IACD,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;QACxB,mFAAmF;QACnF,iEAAiE;QACjE,mCAAmC;QACnC,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACvC,CAAC;IACD,MAAM,WAAW,GAWb;QACF,2BAA2B,EAAE,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpG,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE;QAC7C,2BAA2B,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK;QAC9C,kBAAkB,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ;QACxC,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,IAAI;QACb,2BAA2B,EAAE,KAAK;QAClC,mBAAmB;QACnB,uBAAuB;KACxB,CAAC;IAEF,MAAM,CAAC,CAAC,EACN,OAAO,EACP,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,GAAG,EAAE,EACvB,IAAI,EACJ,OAAO,EACR,EAAE,EAAE,CACH,OAAO,CAAC,eAAe,CACrB,OAAO,oBACF,WAAW,IAAE,OAAO,EAAE,IAAI,KAC/B,IAAI,EACJ,OAAO,EACP,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB;QACE,QAAQ,EAAE,kBAAkB,CAAC,MAAM;QACnC,OAAO,EAAE,kBAAkB,CAAC,KAAK;KAClC,CACF,CAAC;AACN,CAAC;AA3DD,gDA2DC","sourcesContent":["// XX: internal in ngc's `main()`, a tsickle emit callback is passed to the tsc compiler\n// ... blatanlty copy-paste the emit callback here. it's not a public api.\n// ... @link https://github.com/angular/angular/blob/24bf3e2a251634811096b939e61d63297934579e/packages/compiler-cli/src/main.ts#L36-L38\n\n/*\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\n// @link https://github.com/angular/angular/blob/24bf3e2a251634811096b939e61d63297934579e/packages/compiler-cli/src/transformers/util.ts#L14\nconst GENERATED_FILES = /(.*?)\\.(ngfactory|shim\\.ngstyle|ngstyle|ngsummary)\\.(js|d\\.ts|ts)$/;\n\nimport * as tsickle from 'tsickle';\nimport * as api from '@angular/compiler-cli/src/transformers/api';\n\n// @link https://github.com/angular/angular/blob/83d207d/packages/compiler-cli/src/main.ts#L42-L84\nexport function createEmitCallback(options: api.CompilerOptions): api.TsEmitCallback | undefined {\n  const transformDecorators = options.annotationsAs !== 'decorators';\n  const transformTypesToClosure = options.annotateForClosureCompiler;\n  if (!transformDecorators && !transformTypesToClosure) {\n    return undefined;\n  }\n  if (transformDecorators) {\n    // This is needed as a workaround for https://github.com/angular/tsickle/issues/635\n    // Otherwise tsickle might emit references to non imported values\n    // as TypeScript elided the import.\n    options.emitDecoratorMetadata = true;\n  }\n  const tsickleHost: Pick<\n    tsickle.TsickleHost,\n    | 'shouldSkipTsickleProcessing'\n    | 'pathToModuleName'\n    | 'shouldIgnoreWarningsForPath'\n    | 'fileNameToModuleId'\n    | 'googmodule'\n    | 'untyped'\n    | 'convertIndexImportShorthand'\n    | 'transformDecorators'\n    | 'transformTypesToClosure'\n  > = {\n    shouldSkipTsickleProcessing: fileName => /\\.d\\.ts$/.test(fileName) || GENERATED_FILES.test(fileName),\n    pathToModuleName: (context, importPath) => '',\n    shouldIgnoreWarningsForPath: filePath => false,\n    fileNameToModuleId: fileName => fileName,\n    googmodule: false,\n    untyped: true,\n    convertIndexImportShorthand: false,\n    transformDecorators,\n    transformTypesToClosure\n  };\n\n  return ({\n    program,\n    targetSourceFile,\n    writeFile,\n    cancellationToken,\n    emitOnlyDtsFiles,\n    customTransformers = {},\n    host,\n    options\n  }) =>\n    tsickle.emitWithTsickle(\n      program,\n      { ...tsickleHost, options, host },\n      host,\n      options,\n      targetSourceFile,\n      writeFile,\n      cancellationToken,\n      emitOnlyDtsFiles,\n      {\n        beforeTs: customTransformers.before,\n        afterTs: customTransformers.after\n      }\n    );\n}\n"]}
+{"version":3,"file":"create-emit-callback.js","sourceRoot":"","sources":["../../../src/lib/ngc/create-emit-callback.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,0EAA0E;AAC1E,uIAAuI;;AAEvI;;;;;;GAMG;AAEH,4IAA4I;AAC5I,MAAM,eAAe,GAAG,oEAAoE,CAAC;AAE7F,+CAAmC;AAGnC,kGAAkG;AAClG,4BAAmC,OAA4B;IAC7D,MAAM,mBAAmB,GAAG,OAAO,CAAC,aAAa,KAAK,YAAY,CAAC;IACnE,MAAM,uBAAuB,GAAG,OAAO,CAAC,0BAA0B,CAAC;IACnE,IAAI,CAAC,mBAAmB,IAAI,CAAC,uBAAuB,EAAE;QACpD,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,mBAAmB,EAAE;QACvB,mFAAmF;QACnF,iEAAiE;QACjE,mCAAmC;QACnC,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;KACtC;IACD,MAAM,WAAW,GAWb;QACF,2BAA2B,EAAE,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpG,gBAAgB,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,CAAC,EAAE;QAC/C,2BAA2B,EAAE,SAAS,CAAC,EAAE,CAAC,KAAK;QAC/C,kBAAkB,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ;QACxC,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,IAAI;QACb,2BAA2B,EAAE,KAAK;QAClC,mBAAmB;QACnB,uBAAuB;KACxB,CAAC;IAEF,OAAO,CAAC,EACN,OAAO,EACP,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,GAAG,EAAE,EACvB,IAAI,EACJ,OAAO,EACR,EAAE,EAAE,CACH,OAAO,CAAC,eAAe,CACrB,OAAO,oBACF,WAAW,IAAE,OAAO,EAAE,IAAI,KAC/B,IAAI,EACJ,OAAO,EACP,gBAAgB,EAChB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB;QACE,QAAQ,EAAE,kBAAkB,CAAC,MAAM;QACnC,OAAO,EAAE,kBAAkB,CAAC,KAAK;KAClC,CACF,CAAC;AACN,CAAC;AA3DD,gDA2DC","sourcesContent":["// XX: internal in ngc's `main()`, a tsickle emit callback is passed to the tsc compiler\n// ... blatanlty copy-paste the emit callback here. it's not a public api.\n// ... @link https://github.com/angular/angular/blob/24bf3e2a251634811096b939e61d63297934579e/packages/compiler-cli/src/main.ts#L36-L38\n\n/*\n * @license\n * Copyright Google Inc. All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\n// @link https://github.com/angular/angular/blob/24bf3e2a251634811096b939e61d63297934579e/packages/compiler-cli/src/transformers/util.ts#L14\nconst GENERATED_FILES = /(.*?)\\.(ngfactory|shim\\.ngstyle|ngstyle|ngsummary)\\.(js|d\\.ts|ts)$/;\n\nimport * as tsickle from 'tsickle';\nimport * as api from '@angular/compiler-cli/src/transformers/api';\n\n// @link https://github.com/angular/angular/blob/83d207d/packages/compiler-cli/src/main.ts#L42-L84\nexport function createEmitCallback(options: api.CompilerOptions): api.TsEmitCallback | undefined {\n  const transformDecorators = options.annotationsAs !== 'decorators';\n  const transformTypesToClosure = options.annotateForClosureCompiler;\n  if (!transformDecorators && !transformTypesToClosure) {\n    return undefined;\n  }\n  if (transformDecorators) {\n    // This is needed as a workaround for https://github.com/angular/tsickle/issues/635\n    // Otherwise tsickle might emit references to non imported values\n    // as TypeScript elided the import.\n    options.emitDecoratorMetadata = true;\n  }\n  const tsickleHost: Pick<\n    tsickle.TsickleHost,\n    | 'shouldSkipTsickleProcessing'\n    | 'pathToModuleName'\n    | 'shouldIgnoreWarningsForPath'\n    | 'fileNameToModuleId'\n    | 'googmodule'\n    | 'untyped'\n    | 'convertIndexImportShorthand'\n    | 'transformDecorators'\n    | 'transformTypesToClosure'\n  > = {\n    shouldSkipTsickleProcessing: fileName => /\\.d\\.ts$/.test(fileName) || GENERATED_FILES.test(fileName),\n    pathToModuleName: (_context, _importPath) => '',\n    shouldIgnoreWarningsForPath: _filePath => false,\n    fileNameToModuleId: fileName => fileName,\n    googmodule: false,\n    untyped: true,\n    convertIndexImportShorthand: false,\n    transformDecorators,\n    transformTypesToClosure\n  };\n\n  return ({\n    program,\n    targetSourceFile,\n    writeFile,\n    cancellationToken,\n    emitOnlyDtsFiles,\n    customTransformers = {},\n    host,\n    options\n  }) =>\n    tsickle.emitWithTsickle(\n      program,\n      { ...tsickleHost, options, host },\n      host,\n      options,\n      targetSourceFile,\n      writeFile,\n      cancellationToken,\n      emitOnlyDtsFiles,\n      {\n        beforeTs: customTransformers.before,\n        afterTs: customTransformers.after\n      }\n    );\n}\n"]}

package/lib/ts/cache-compiler-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ts/cache-compiler-host.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\nimport * as ng from '@angular/compiler-cli';\nimport * as path from 'path';\nimport { ensureUnixPath } from '../util/path';\nimport { FileCache } from '../file/file-cache';\nimport { StylesheetProcessor } from '../ng-v5/entry-point/resources/stylesheet-processor';\n\nexport function cacheCompilerHost(\n  compilerOptions: ng.CompilerOptions,\n  sourcesFileCache: FileCache,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor?: StylesheetProcessor\n): ng.CompilerHost {\n  const compilerHost = ng.createCompilerHost({ options: compilerOptions });\n\n  return {\n    ...compilerHost,\n\n    // ts specific\n    fileExists: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.exists === undefined) {\n        cache.exists = compilerHost.fileExists.call(this, fileName);\n      }\n      return cache.exists;\n    },\n\n    getSourceFile: (fileName: string, languageVersion: ts.ScriptTarget) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (!cache.sourceFile) {\n        cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);\n      }\n      return cache.sourceFile;\n    },\n\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>\n    ) => {\n      if (fileName.endsWith('.d.ts')) {\n        sourceFiles.forEach(source => {\n          const cache = sourcesFileCache.getOrCreate(source.fileName);\n          if (!cache.declarationFileName) {\n            cache.declarationFileName = ensureUnixPath(fileName);\n          }\n        });\n      }\n\n      compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);\n    },\n\n    readFile: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        cache.content = compilerHost.readFile.call(this, fileName);\n      }\n      return cache.content;\n    },\n\n    // ng specific\n    moduleNameToFileName: (moduleName: string, containingFile: string) => {\n      const { resolvedModule } = ts.resolveModuleName(\n        moduleName,\n        ensureUnixPath(containingFile),\n        compilerOptions,\n        compilerHost,\n        moduleResolutionCache\n      );\n\n      return resolvedModule && resolvedModule.resolvedFileName;\n    },\n\n    resourceNameToFileName: (resourceName: string, containingFilePath: string) => {\n      return path.resolve(path.dirname(containingFilePath), resourceName);\n    },\n\n    readResource: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        // todo: transform styles here.\n        // the empty string is needed because of include paths file's won't be resolved properly.\n        cache.content = compilerHost.readFile.call(this, fileName);\n        if (!/(html|htm)$/.test(path.extname(fileName))) {\n          cache.content = stylesheetProcessor.process(fileName, cache.content);\n        }\n        cache.exists = true;\n      }\n\n      return cache.content;\n    }\n  };\n}\n"]}
+{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ts/cache-compiler-host.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\nimport * as ng from '@angular/compiler-cli';\nimport * as path from 'path';\nimport { ensureUnixPath } from '../util/path';\nimport { FileCache } from '../file/file-cache';\nimport { StylesheetProcessor } from '../ng-v5/entry-point/resources/stylesheet-processor';\n\nexport function cacheCompilerHost(\n  compilerOptions: ng.CompilerOptions,\n  sourcesFileCache: FileCache,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor?: StylesheetProcessor\n): ng.CompilerHost {\n  const compilerHost = ng.createCompilerHost({ options: compilerOptions });\n\n  return {\n    ...compilerHost,\n\n    // ts specific\n    fileExists: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.exists === undefined) {\n        cache.exists = compilerHost.fileExists.call(this, fileName);\n      }\n      return cache.exists;\n    },\n\n    getSourceFile: (fileName: string, languageVersion: ts.ScriptTarget) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (!cache.sourceFile) {\n        cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);\n      }\n      return cache.sourceFile;\n    },\n\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>\n    ) => {\n      if (fileName.endsWith('.d.ts')) {\n        sourceFiles.forEach(source => {\n          const cache = sourcesFileCache.getOrCreate(source.fileName);\n          if (!cache.declarationFileName) {\n            cache.declarationFileName = ensureUnixPath(fileName);\n          }\n        });\n      }\n\n      compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);\n    },\n\n    readFile: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        cache.content = compilerHost.readFile.call(this, fileName);\n      }\n      return cache.content;\n    },\n\n    // ng specific\n    moduleNameToFileName: (moduleName: string, containingFile: string) => {\n      const { resolvedModule } = ts.resolveModuleName(\n        moduleName,\n        ensureUnixPath(containingFile),\n        compilerOptions,\n        compilerHost,\n        moduleResolutionCache\n      );\n\n      return resolvedModule && resolvedModule.resolvedFileName;\n    },\n\n    resourceNameToFileName: (resourceName: string, containingFilePath: string) => {\n      return path.resolve(path.dirname(containingFilePath), resourceName);\n    },\n\n    readResource: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        // todo: transform styles here.\n        // the empty string is needed because of include paths file's won't be resolved properly.\n        cache.content = compilerHost.readFile.call(this, fileName);\n        if (!/(html|htm)$/.test(path.extname(fileName))) {\n          cache.content = stylesheetProcessor.process(fileName, cache.content);\n        }\n        cache.exists = true;\n      }\n\n      return cache.content;\n    }\n  };\n}\n"]}

package/lib/ts/conf/tsconfig.ngc.json

@@ -1,8 +1,6 @@
 {
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "flatModuleId": "AUTOGENERATED",
-    "flatModuleOutFile": "AUTOGENERATED",
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,

package/lib/ts/redirect-write-file-compiler-host.js

@@ -11,7 +11,7 @@ const path = require("path");
 function redirectWriteFileCompilerHost(compilerHost, baseDir, declarationDir) {
     return Object.assign({}, compilerHost, { writeFile: (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
             let filePath = fileName;
-            if (fileName.endsWith('.d.ts')) {
+            if (/(\.d\.ts|\.metadata\.json)$/.test(fileName)) {
                 const projectRelativePath = path.relative(baseDir, fileName);
                 filePath = path.resolve(declarationDir, projectRelativePath);
             }

package/lib/ts/redirect-write-file-compiler-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"redirect-write-file-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ts/redirect-write-file-compiler-host.ts"],"names":[],"mappings":";;AACA,6BAA6B;AAE7B;;;;;;GAMG;AACH,uCACE,YAA6B,EAC7B,OAAe,EACf,cAAsB;IAEtB,MAAM,mBACD,YAAY,IACf,SAAS,EAAE,CACT,QAAgB,EAChB,IAAY,EACZ,kBAA2B,EAC3B,OAAmC,EACnC,WAA0C,EAC1C,EAAE;YACF,IAAI,QAAQ,GAAG,QAAQ,CAAC;YACxB,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC/B,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC7D,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;YAC/D,CAAC;YACD,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAC9F,CAAC,IACD;AACJ,CAAC;AAtBD,sEAsBC","sourcesContent":["import * as ts from 'typescript';\nimport * as path from 'path';\n\n/**\n * Returns a TypeScript compiler host that redirects `writeFile` output to the given `declarationDir`.\n *\n * @param compilerHost Original compiler host\n * @param baseDir Project base directory\n * @param declarationDir Declarations target directory\n */\nexport function redirectWriteFileCompilerHost(\n  compilerHost: ts.CompilerHost,\n  baseDir: string,\n  declarationDir: string\n): ts.CompilerHost {\n  return {\n    ...compilerHost,\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>\n    ) => {\n      let filePath = fileName;\n      if (fileName.endsWith('.d.ts')) {\n        const projectRelativePath = path.relative(baseDir, fileName);\n        filePath = path.resolve(declarationDir, projectRelativePath);\n      }\n      compilerHost.writeFile.call(this, filePath, data, writeByteOrderMark, onError, sourceFiles);\n    }\n  };\n}\n"]}
+{"version":3,"file":"redirect-write-file-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ts/redirect-write-file-compiler-host.ts"],"names":[],"mappings":";;AACA,6BAA6B;AAE7B;;;;;;GAMG;AACH,uCACE,YAA6B,EAC7B,OAAe,EACf,cAAsB;IAEtB,yBACK,YAAY,IACf,SAAS,EAAE,CACT,QAAgB,EAChB,IAAY,EACZ,kBAA2B,EAC3B,OAAmC,EACnC,WAA0C,EAC1C,EAAE;YACF,IAAI,QAAQ,GAAG,QAAQ,CAAC;YACxB,IAAI,6BAA6B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAChD,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC7D,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;aAC9D;YACD,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAC9F,CAAC,IACD;AACJ,CAAC;AAtBD,sEAsBC","sourcesContent":["import * as ts from 'typescript';\nimport * as path from 'path';\n\n/**\n * Returns a TypeScript compiler host that redirects `writeFile` output to the given `declarationDir`.\n *\n * @param compilerHost Original compiler host\n * @param baseDir Project base directory\n * @param declarationDir Declarations target directory\n */\nexport function redirectWriteFileCompilerHost(\n  compilerHost: ts.CompilerHost,\n  baseDir: string,\n  declarationDir: string\n): ts.CompilerHost {\n  return {\n    ...compilerHost,\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>\n    ) => {\n      let filePath = fileName;\n      if (/(\\.d\\.ts|\\.metadata\\.json)$/.test(fileName)) {\n        const projectRelativePath = path.relative(baseDir, fileName);\n        filePath = path.resolve(declarationDir, projectRelativePath);\n      }\n      compilerHost.writeFile.call(this, filePath, data, writeByteOrderMark, onError, sourceFiles);\n    }\n  };\n}\n"]}

package/lib/ts/tsconfig.d.ts

@@ -1,21 +1,28 @@
-import * as ng from '@angular/compiler-cli/src/perform_compile';
+import * as ng from '@angular/compiler-cli';
 import { EntryPointNode } from '../ng-v5/nodes';
-/**
- * TypeScript configuration used internally (marker typer).
- */
-export declare type TsConfig = ng.ParsedConfiguration;
 /**
  * Reads the default TypeScript configuration.
  */
-export declare function readDefaultTsConfig(fileName?: string): TsConfig;
+export declare function readDefaultTsConfig(fileName?: string): ng.ParsedConfiguration;
 /**
  * Creates a parsed TypeScript configuration object.
  *
  * @param values File path or parsed configuration.
  */
-export declare function createDefaultTsConfig(values?: TsConfig | string): TsConfig;
+export declare function createDefaultTsConfig(values?: ng.ParsedConfiguration | string): ng.ParsedConfiguration;
 /**
  * Initializes TypeScript Compiler options and Angular Compiler options by overriding the
  * default config with entry point-specific values.
  */
 export declare const initializeTsConfig: (defaultTsConfig: ng.ParsedConfiguration, entryPoints: EntryPointNode[]) => void;
+/**
+ * Set the paths for entrypoint dependencies.
+ *
+ * This doesn't mutate the object.
+ *
+ * @param parsedTsConfig - A parsed tsconfig
+ * @param entryPoints - A list of entryPoints
+ * @param pointToSource Point the path mapping to either the source code or emitted declarations.
+ * Typically for analysis one should point to the source files while for a compilation once should use the emitted declarations
+ */
+export declare function setDependenciesTsConfigPaths(parsedTsConfig: ng.ParsedConfiguration, entryPoints: EntryPointNode[], pointToSource?: boolean): any;