@magic-xpa/cli 4.1000.0 → 4.1100.0-dev000.0

package/src/schematics/utils/devkit-utils/find-module.js

@@ -1,94 +1,93 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRelativePath = exports.findModule = exports.findModuleFromOptions = void 0;
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-const core_1 = require("@angular-devkit/core");
-/**
- * Find the module referred by a set of options passed to the schematics.
- */
-function findModuleFromOptions(host, options) {
-    if (options.hasOwnProperty('skipImport') && options.skipImport) {
-        return undefined;
-    }
-    if (!options.module) {
-        const pathToCheck = (options.path || '')
-            + (options.flat ? '' : '/' + core_1.strings.dasherize(options.name));
-        return (0, core_1.normalize)(findModule(host, pathToCheck));
-    }
-    else {
-        const modulePath = (0, core_1.normalize)('/' + (options.path) + '/' + options.module);
-        const moduleBaseName = (0, core_1.normalize)(modulePath).split('/').pop();
-        if (host.exists(modulePath)) {
-            return (0, core_1.normalize)(modulePath);
-        }
-        else if (host.exists(modulePath + '.ts')) {
-            return (0, core_1.normalize)(modulePath + '.ts');
-        }
-        else if (host.exists(modulePath + '.module.ts')) {
-            return (0, core_1.normalize)(modulePath + '.module.ts');
-        }
-        else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {
-            return (0, core_1.normalize)(modulePath + '/' + moduleBaseName + '.module.ts');
-        }
-        else {
-            throw new Error('Specified module does not exist');
-        }
-    }
-}
-exports.findModuleFromOptions = findModuleFromOptions;
-/**
- * Function to find the "closest" module to a generated file's path.
- */
-function findModule(host, generateDir) {
-    let dir = host.getDir('/' + generateDir);
-    const moduleRe = /\.module\.ts$/;
-    const routingModuleRe = /-routing\.module\.ts/;
-    while (dir) {
-        const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));
-        if (matches.length == 1) {
-            return (0, core_1.join)(dir.path, matches[0]);
-        }
-        else if (matches.length > 1) {
-            throw new Error('More than one module matches. Use skip-import option to skip importing '
-                + 'the component into the closest module.');
-        }
-        dir = dir.parent;
-    }
-    throw new Error('Could not find an NgModule. Use the skip-import '
-        + 'option to skip importing in NgModule.');
-}
-exports.findModule = findModule;
-/**
- * Build a relative path from one file path to another file path.
- */
-function buildRelativePath(from, to) {
-    from = (0, core_1.normalize)(from);
-    to = (0, core_1.normalize)(to);
-    // Convert to arrays.
-    const fromParts = from.split('/');
-    const toParts = to.split('/');
-    // Remove file names (preserving destination)
-    fromParts.pop();
-    const toFileName = toParts.pop();
-    const relativePath = (0, core_1.relative)((0, core_1.normalize)(fromParts.join('/')), (0, core_1.normalize)(toParts.join('/')));
-    let pathPrefix = '';
-    // Set the path prefix for same dir or child dir, parent dir starts with `..`
-    if (!relativePath) {
-        pathPrefix = '.';
-    }
-    else if (!relativePath.startsWith('.')) {
-        pathPrefix = `./`;
-    }
-    if (pathPrefix && !pathPrefix.endsWith('/')) {
-        pathPrefix += '/';
-    }
-    return pathPrefix + (relativePath ? relativePath + '/' : '') + toFileName;
-}
-exports.buildRelativePath = buildRelativePath;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findModuleFromOptions = findModuleFromOptions;
+exports.findModule = findModule;
+exports.buildRelativePath = buildRelativePath;
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+const core_1 = require("@angular-devkit/core");
+/**
+ * Find the module referred by a set of options passed to the schematics.
+ */
+function findModuleFromOptions(host, options) {
+    if (options.hasOwnProperty('skipImport') && options.skipImport) {
+        return undefined;
+    }
+    if (!options.module) {
+        const pathToCheck = (options.path || '')
+            + (options.flat ? '' : '/' + core_1.strings.dasherize(options.name));
+        return (0, core_1.normalize)(findModule(host, pathToCheck));
+    }
+    else {
+        const modulePath = (0, core_1.normalize)('/' + (options.path) + '/' + options.module);
+        const moduleBaseName = (0, core_1.normalize)(modulePath).split('/').pop();
+        if (host.exists(modulePath)) {
+            return (0, core_1.normalize)(modulePath);
+        }
+        else if (host.exists(modulePath + '.ts')) {
+            return (0, core_1.normalize)(modulePath + '.ts');
+        }
+        else if (host.exists(modulePath + '.module.ts')) {
+            return (0, core_1.normalize)(modulePath + '.module.ts');
+        }
+        else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {
+            return (0, core_1.normalize)(modulePath + '/' + moduleBaseName + '.module.ts');
+        }
+        else {
+            throw new Error('Specified module does not exist');
+        }
+    }
+}
+/**
+ * Function to find the "closest" module to a generated file's path.
+ */
+function findModule(host, generateDir) {
+    let dir = host.getDir('/' + generateDir);
+    const moduleRe = /\.module\.ts$/;
+    const routingModuleRe = /-routing\.module\.ts/;
+    while (dir) {
+        const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));
+        if (matches.length == 1) {
+            return (0, core_1.join)(dir.path, matches[0]);
+        }
+        else if (matches.length > 1) {
+            throw new Error('More than one module matches. Use skip-import option to skip importing '
+                + 'the component into the closest module.');
+        }
+        dir = dir.parent;
+    }
+    throw new Error('Could not find an NgModule. Use the skip-import '
+        + 'option to skip importing in NgModule.');
+}
+/**
+ * Build a relative path from one file path to another file path.
+ */
+function buildRelativePath(from, to) {
+    from = (0, core_1.normalize)(from);
+    to = (0, core_1.normalize)(to);
+    // Convert to arrays.
+    const fromParts = from.split('/');
+    const toParts = to.split('/');
+    // Remove file names (preserving destination)
+    fromParts.pop();
+    const toFileName = toParts.pop();
+    const relativePath = (0, core_1.relative)((0, core_1.normalize)(fromParts.join('/')), (0, core_1.normalize)(toParts.join('/')));
+    let pathPrefix = '';
+    // Set the path prefix for same dir or child dir, parent dir starts with `..`
+    if (!relativePath) {
+        pathPrefix = '.';
+    }
+    else if (!relativePath.startsWith('.')) {
+        pathPrefix = `./`;
+    }
+    if (pathPrefix && !pathPrefix.endsWith('/')) {
+        pathPrefix += '/';
+    }
+    return pathPrefix + (relativePath ? relativePath + '/' : '') + toFileName;
+}
 //# sourceMappingURL=find-module.js.map

package/src/schematics/utils/devkit-utils/find-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-module.js","sourceRoot":"","sources":["find-module.ts"],"names":[],"mappings":"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","sourcesContent":["/**\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 */\nimport { Path, join, normalize, relative, strings } from '@angular-devkit/core';\nimport { DirEntry, Tree } from '@angular-devkit/schematics';\n\n\nexport interface ModuleOptions {\n  module?: string;\n  name: string;\n  flat?: boolean;\n  path?: string;\n  skipImport?: boolean;\n}\n\n\n/**\n * Find the module referred by a set of options passed to the schematics.\n */\nexport function findModuleFromOptions(host: Tree, options: ModuleOptions): Path | undefined {\n  if (options.hasOwnProperty('skipImport') && options.skipImport) {\n    return undefined;\n  }\n\n  if (!options.module) {\n    const pathToCheck = (options.path || '')\n                      + (options.flat ? '' : '/' + strings.dasherize(options.name));\n\n    return normalize(findModule(host, pathToCheck));\n  } else {\n    const modulePath = normalize(\n      '/' + (options.path) + '/' + options.module);\n    const moduleBaseName = normalize(modulePath).split('/').pop();\n\n    if (host.exists(modulePath)) {\n      return normalize(modulePath);\n    } else if (host.exists(modulePath + '.ts')) {\n      return normalize(modulePath + '.ts');\n    } else if (host.exists(modulePath + '.module.ts')) {\n      return normalize(modulePath + '.module.ts');\n    } else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {\n      return normalize(modulePath + '/' + moduleBaseName + '.module.ts');\n    } else {\n      throw new Error('Specified module does not exist');\n    }\n  }\n}\n\n/**\n * Function to find the \"closest\" module to a generated file's path.\n */\nexport function findModule(host: Tree, generateDir: string): Path {\n  let dir: DirEntry | null = host.getDir('/' + generateDir);\n\n  const moduleRe = /\\.module\\.ts$/;\n  const routingModuleRe = /-routing\\.module\\.ts/;\n\n  while (dir) {\n    const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));\n\n    if (matches.length == 1) {\n      return join(dir.path, matches[0]);\n    } else if (matches.length > 1) {\n      throw new Error('More than one module matches. Use skip-import option to skip importing '\n        + 'the component into the closest module.');\n    }\n\n    dir = dir.parent;\n  }\n\n  throw new Error('Could not find an NgModule. Use the skip-import '\n    + 'option to skip importing in NgModule.');\n}\n\n/**\n * Build a relative path from one file path to another file path.\n */\nexport function buildRelativePath(from: string, to: string): string {\n  from = normalize(from);\n  to = normalize(to);\n\n  // Convert to arrays.\n  const fromParts = from.split('/');\n  const toParts = to.split('/');\n\n  // Remove file names (preserving destination)\n  fromParts.pop();\n  const toFileName = toParts.pop();\n\n  const relativePath = relative(normalize(fromParts.join('/')), normalize(toParts.join('/')));\n  let pathPrefix = '';\n\n  // Set the path prefix for same dir or child dir, parent dir starts with `..`\n  if (!relativePath) {\n    pathPrefix = '.';\n  } else if (!relativePath.startsWith('.')) {\n    pathPrefix = `./`;\n  }\n  if (pathPrefix && !pathPrefix.endsWith('/')) {\n    pathPrefix += '/';\n  }\n\n  return pathPrefix + (relativePath ? relativePath + '/' : '') + toFileName;\n}\n"]}
+{"version":3,"file":"find-module.js","sourceRoot":"","sources":["find-module.ts"],"names":[],"mappings":"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","sourcesContent":["/**\r\n * @license\r\n * Copyright Google Inc. All Rights Reserved.\r\n *\r\n * Use of this source code is governed by an MIT-style license that can be\r\n * found in the LICENSE file at https://angular.io/license\r\n */\r\nimport { Path, join, normalize, relative, strings } from '@angular-devkit/core';\r\nimport { DirEntry, Tree } from '@angular-devkit/schematics';\r\n\r\n\r\nexport interface ModuleOptions {\r\n  module?: string;\r\n  name: string;\r\n  flat?: boolean;\r\n  path?: string;\r\n  skipImport?: boolean;\r\n}\r\n\r\n\r\n/**\r\n * Find the module referred by a set of options passed to the schematics.\r\n */\r\nexport function findModuleFromOptions(host: Tree, options: ModuleOptions): Path | undefined {\r\n  if (options.hasOwnProperty('skipImport') && options.skipImport) {\r\n    return undefined;\r\n  }\r\n\r\n  if (!options.module) {\r\n    const pathToCheck = (options.path || '')\r\n                      + (options.flat ? '' : '/' + strings.dasherize(options.name));\r\n\r\n    return normalize(findModule(host, pathToCheck));\r\n  } else {\r\n    const modulePath = normalize(\r\n      '/' + (options.path) + '/' + options.module);\r\n    const moduleBaseName = normalize(modulePath).split('/').pop();\r\n\r\n    if (host.exists(modulePath)) {\r\n      return normalize(modulePath);\r\n    } else if (host.exists(modulePath + '.ts')) {\r\n      return normalize(modulePath + '.ts');\r\n    } else if (host.exists(modulePath + '.module.ts')) {\r\n      return normalize(modulePath + '.module.ts');\r\n    } else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {\r\n      return normalize(modulePath + '/' + moduleBaseName + '.module.ts');\r\n    } else {\r\n      throw new Error('Specified module does not exist');\r\n    }\r\n  }\r\n}\r\n\r\n/**\r\n * Function to find the \"closest\" module to a generated file's path.\r\n */\r\nexport function findModule(host: Tree, generateDir: string): Path {\r\n  let dir: DirEntry | null = host.getDir('/' + generateDir);\r\n\r\n  const moduleRe = /\\.module\\.ts$/;\r\n  const routingModuleRe = /-routing\\.module\\.ts/;\r\n\r\n  while (dir) {\r\n    const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));\r\n\r\n    if (matches.length == 1) {\r\n      return join(dir.path, matches[0]);\r\n    } else if (matches.length > 1) {\r\n      throw new Error('More than one module matches. Use skip-import option to skip importing '\r\n        + 'the component into the closest module.');\r\n    }\r\n\r\n    dir = dir.parent;\r\n  }\r\n\r\n  throw new Error('Could not find an NgModule. Use the skip-import '\r\n    + 'option to skip importing in NgModule.');\r\n}\r\n\r\n/**\r\n * Build a relative path from one file path to another file path.\r\n */\r\nexport function buildRelativePath(from: string, to: string): string {\r\n  from = normalize(from);\r\n  to = normalize(to);\r\n\r\n  // Convert to arrays.\r\n  const fromParts = from.split('/');\r\n  const toParts = to.split('/');\r\n\r\n  // Remove file names (preserving destination)\r\n  fromParts.pop();\r\n  const toFileName = toParts.pop();\r\n\r\n  const relativePath = relative(normalize(fromParts.join('/')), normalize(toParts.join('/')));\r\n  let pathPrefix = '';\r\n\r\n  // Set the path prefix for same dir or child dir, parent dir starts with `..`\r\n  if (!relativePath) {\r\n    pathPrefix = '.';\r\n  } else if (!relativePath.startsWith('.')) {\r\n    pathPrefix = `./`;\r\n  }\r\n  if (pathPrefix && !pathPrefix.endsWith('/')) {\r\n    pathPrefix += '/';\r\n  }\r\n\r\n  return pathPrefix + (relativePath ? relativePath + '/' : '') + toFileName;\r\n}\r\n"]}

package/src/schematics/utils/devkit-utils/find-module.ts

@@ -1,108 +1,108 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Path, join, normalize, relative, strings } from '@angular-devkit/core';
-import { DirEntry, Tree } from '@angular-devkit/schematics';
-
-
-export interface ModuleOptions {
-  module?: string;
-  name: string;
-  flat?: boolean;
-  path?: string;
-  skipImport?: boolean;
-}
-
-
-/**
- * Find the module referred by a set of options passed to the schematics.
- */
-export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path | undefined {
-  if (options.hasOwnProperty('skipImport') && options.skipImport) {
-    return undefined;
-  }
-
-  if (!options.module) {
-    const pathToCheck = (options.path || '')
-                      + (options.flat ? '' : '/' + strings.dasherize(options.name));
-
-    return normalize(findModule(host, pathToCheck));
-  } else {
-    const modulePath = normalize(
-      '/' + (options.path) + '/' + options.module);
-    const moduleBaseName = normalize(modulePath).split('/').pop();
-
-    if (host.exists(modulePath)) {
-      return normalize(modulePath);
-    } else if (host.exists(modulePath + '.ts')) {
-      return normalize(modulePath + '.ts');
-    } else if (host.exists(modulePath + '.module.ts')) {
-      return normalize(modulePath + '.module.ts');
-    } else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {
-      return normalize(modulePath + '/' + moduleBaseName + '.module.ts');
-    } else {
-      throw new Error('Specified module does not exist');
-    }
-  }
-}
-
-/**
- * Function to find the "closest" module to a generated file's path.
- */
-export function findModule(host: Tree, generateDir: string): Path {
-  let dir: DirEntry | null = host.getDir('/' + generateDir);
-
-  const moduleRe = /\.module\.ts$/;
-  const routingModuleRe = /-routing\.module\.ts/;
-
-  while (dir) {
-    const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));
-
-    if (matches.length == 1) {
-      return join(dir.path, matches[0]);
-    } else if (matches.length > 1) {
-      throw new Error('More than one module matches. Use skip-import option to skip importing '
-        + 'the component into the closest module.');
-    }
-
-    dir = dir.parent;
-  }
-
-  throw new Error('Could not find an NgModule. Use the skip-import '
-    + 'option to skip importing in NgModule.');
-}
-
-/**
- * Build a relative path from one file path to another file path.
- */
-export function buildRelativePath(from: string, to: string): string {
-  from = normalize(from);
-  to = normalize(to);
-
-  // Convert to arrays.
-  const fromParts = from.split('/');
-  const toParts = to.split('/');
-
-  // Remove file names (preserving destination)
-  fromParts.pop();
-  const toFileName = toParts.pop();
-
-  const relativePath = relative(normalize(fromParts.join('/')), normalize(toParts.join('/')));
-  let pathPrefix = '';
-
-  // Set the path prefix for same dir or child dir, parent dir starts with `..`
-  if (!relativePath) {
-    pathPrefix = '.';
-  } else if (!relativePath.startsWith('.')) {
-    pathPrefix = `./`;
-  }
-  if (pathPrefix && !pathPrefix.endsWith('/')) {
-    pathPrefix += '/';
-  }
-
-  return pathPrefix + (relativePath ? relativePath + '/' : '') + toFileName;
-}
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Path, join, normalize, relative, strings } from '@angular-devkit/core';
+import { DirEntry, Tree } from '@angular-devkit/schematics';
+
+
+export interface ModuleOptions {
+  module?: string;
+  name: string;
+  flat?: boolean;
+  path?: string;
+  skipImport?: boolean;
+}
+
+
+/**
+ * Find the module referred by a set of options passed to the schematics.
+ */
+export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path | undefined {
+  if (options.hasOwnProperty('skipImport') && options.skipImport) {
+    return undefined;
+  }
+
+  if (!options.module) {
+    const pathToCheck = (options.path || '')
+                      + (options.flat ? '' : '/' + strings.dasherize(options.name));
+
+    return normalize(findModule(host, pathToCheck));
+  } else {
+    const modulePath = normalize(
+      '/' + (options.path) + '/' + options.module);
+    const moduleBaseName = normalize(modulePath).split('/').pop();
+
+    if (host.exists(modulePath)) {
+      return normalize(modulePath);
+    } else if (host.exists(modulePath + '.ts')) {
+      return normalize(modulePath + '.ts');
+    } else if (host.exists(modulePath + '.module.ts')) {
+      return normalize(modulePath + '.module.ts');
+    } else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {
+      return normalize(modulePath + '/' + moduleBaseName + '.module.ts');
+    } else {
+      throw new Error('Specified module does not exist');
+    }
+  }
+}
+
+/**
+ * Function to find the "closest" module to a generated file's path.
+ */
+export function findModule(host: Tree, generateDir: string): Path {
+  let dir: DirEntry | null = host.getDir('/' + generateDir);
+
+  const moduleRe = /\.module\.ts$/;
+  const routingModuleRe = /-routing\.module\.ts/;
+
+  while (dir) {
+    const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));
+
+    if (matches.length == 1) {
+      return join(dir.path, matches[0]);
+    } else if (matches.length > 1) {
+      throw new Error('More than one module matches. Use skip-import option to skip importing '
+        + 'the component into the closest module.');
+    }
+
+    dir = dir.parent;
+  }
+
+  throw new Error('Could not find an NgModule. Use the skip-import '
+    + 'option to skip importing in NgModule.');
+}
+
+/**
+ * Build a relative path from one file path to another file path.
+ */
+export function buildRelativePath(from: string, to: string): string {
+  from = normalize(from);
+  to = normalize(to);
+
+  // Convert to arrays.
+  const fromParts = from.split('/');
+  const toParts = to.split('/');
+
+  // Remove file names (preserving destination)
+  fromParts.pop();
+  const toFileName = toParts.pop();
+
+  const relativePath = relative(normalize(fromParts.join('/')), normalize(toParts.join('/')));
+  let pathPrefix = '';
+
+  // Set the path prefix for same dir or child dir, parent dir starts with `..`
+  if (!relativePath) {
+    pathPrefix = '.';
+  } else if (!relativePath.startsWith('.')) {
+    pathPrefix = `./`;
+  }
+  if (pathPrefix && !pathPrefix.endsWith('/')) {
+    pathPrefix += '/';
+  }
+
+  return pathPrefix + (relativePath ? relativePath + '/' : '') + toFileName;
+}

package/src/schematics/utils/devkit-utils/ng-ast-utils.d.ts

@@ -1,5 +1,5 @@
-import { Tree } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
-export declare function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallExpression | null;
-export declare function findBootstrapModulePath(host: Tree, mainPath: string): string;
-export declare function getAppModulePath(host: Tree, mainPath: string): string;
+import { Tree } from '@angular-devkit/schematics';
+import * as ts from 'typescript';
+export declare function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallExpression | null;
+export declare function findBootstrapModulePath(host: Tree, mainPath: string): string;
+export declare function getAppModulePath(host: Tree, mainPath: string): string;

package/src/schematics/utils/devkit-utils/ng-ast-utils.js

@@ -1,75 +1,74 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAppModulePath = exports.findBootstrapModulePath = exports.findBootstrapModuleCall = void 0;
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const path_1 = require("path");
-const ts = require("typescript");
-const ast_utils_1 = require("./ast-utils");
-function findBootstrapModuleCall(host, mainPath) {
-    const mainBuffer = host.read(mainPath);
-    if (!mainBuffer) {
-        throw new schematics_1.SchematicsException(`Main file (${mainPath}) not found`);
-    }
-    const mainText = mainBuffer.toString('utf-8');
-    const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
-    const allNodes = (0, ast_utils_1.getSourceNodes)(source);
-    let bootstrapCall = null;
-    for (const node of allNodes) {
-        let bootstrapCallNode = null;
-        bootstrapCallNode = (0, ast_utils_1.findNode)(node, ts.SyntaxKind.Identifier, 'bootstrapModule');
-        // Walk up the parent until CallExpression is found.
-        while (bootstrapCallNode && bootstrapCallNode.parent
-            && bootstrapCallNode.parent.kind !== ts.SyntaxKind.CallExpression) {
-            bootstrapCallNode = bootstrapCallNode.parent;
-        }
-        if (bootstrapCallNode !== null &&
-            bootstrapCallNode.parent !== undefined &&
-            bootstrapCallNode.parent.kind === ts.SyntaxKind.CallExpression) {
-            bootstrapCall = bootstrapCallNode.parent;
-            break;
-        }
-    }
-    return bootstrapCall;
-}
-exports.findBootstrapModuleCall = findBootstrapModuleCall;
-function findBootstrapModulePath(host, mainPath) {
-    const bootstrapCall = findBootstrapModuleCall(host, mainPath);
-    if (!bootstrapCall) {
-        throw new schematics_1.SchematicsException('Bootstrap call not found');
-    }
-    const bootstrapModule = bootstrapCall.arguments[0];
-    const mainBuffer = host.read(mainPath);
-    if (!mainBuffer) {
-        throw new schematics_1.SchematicsException(`Client app main file (${mainPath}) not found`);
-    }
-    const mainText = mainBuffer.toString('utf-8');
-    const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
-    const allNodes = (0, ast_utils_1.getSourceNodes)(source);
-    const bootstrapModuleRelativePath = allNodes
-        .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)
-        .filter(imp => {
-        return (0, ast_utils_1.findNode)(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());
-    })
-        .map((imp) => {
-        const modulePathStringLiteral = imp.moduleSpecifier;
-        return modulePathStringLiteral.text;
-    })[0];
-    return bootstrapModuleRelativePath;
-}
-exports.findBootstrapModulePath = findBootstrapModulePath;
-function getAppModulePath(host, mainPath) {
-    const moduleRelativePath = findBootstrapModulePath(host, mainPath);
-    const mainDir = (0, path_1.dirname)(mainPath);
-    const modulePath = (0, core_1.normalize)(`/${mainDir}/${moduleRelativePath}.ts`);
-    return modulePath;
-}
-exports.getAppModulePath = getAppModulePath;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findBootstrapModuleCall = findBootstrapModuleCall;
+exports.findBootstrapModulePath = findBootstrapModulePath;
+exports.getAppModulePath = getAppModulePath;
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+const core_1 = require("@angular-devkit/core");
+const schematics_1 = require("@angular-devkit/schematics");
+const path_1 = require("path");
+const ts = require("typescript");
+const ast_utils_1 = require("./ast-utils");
+function findBootstrapModuleCall(host, mainPath) {
+    const mainBuffer = host.read(mainPath);
+    if (!mainBuffer) {
+        throw new schematics_1.SchematicsException(`Main file (${mainPath}) not found`);
+    }
+    const mainText = mainBuffer.toString('utf-8');
+    const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
+    const allNodes = (0, ast_utils_1.getSourceNodes)(source);
+    let bootstrapCall = null;
+    for (const node of allNodes) {
+        let bootstrapCallNode = null;
+        bootstrapCallNode = (0, ast_utils_1.findNode)(node, ts.SyntaxKind.Identifier, 'bootstrapModule');
+        // Walk up the parent until CallExpression is found.
+        while (bootstrapCallNode && bootstrapCallNode.parent
+            && bootstrapCallNode.parent.kind !== ts.SyntaxKind.CallExpression) {
+            bootstrapCallNode = bootstrapCallNode.parent;
+        }
+        if (bootstrapCallNode !== null &&
+            bootstrapCallNode.parent !== undefined &&
+            bootstrapCallNode.parent.kind === ts.SyntaxKind.CallExpression) {
+            bootstrapCall = bootstrapCallNode.parent;
+            break;
+        }
+    }
+    return bootstrapCall;
+}
+function findBootstrapModulePath(host, mainPath) {
+    const bootstrapCall = findBootstrapModuleCall(host, mainPath);
+    if (!bootstrapCall) {
+        throw new schematics_1.SchematicsException('Bootstrap call not found');
+    }
+    const bootstrapModule = bootstrapCall.arguments[0];
+    const mainBuffer = host.read(mainPath);
+    if (!mainBuffer) {
+        throw new schematics_1.SchematicsException(`Client app main file (${mainPath}) not found`);
+    }
+    const mainText = mainBuffer.toString('utf-8');
+    const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
+    const allNodes = (0, ast_utils_1.getSourceNodes)(source);
+    const bootstrapModuleRelativePath = allNodes
+        .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)
+        .filter(imp => {
+        return (0, ast_utils_1.findNode)(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());
+    })
+        .map((imp) => {
+        const modulePathStringLiteral = imp.moduleSpecifier;
+        return modulePathStringLiteral.text;
+    })[0];
+    return bootstrapModuleRelativePath;
+}
+function getAppModulePath(host, mainPath) {
+    const moduleRelativePath = findBootstrapModulePath(host, mainPath);
+    const mainDir = (0, path_1.dirname)(mainPath);
+    const modulePath = (0, core_1.normalize)(`/${mainDir}/${moduleRelativePath}.ts`);
+    return modulePath;
+}
 //# sourceMappingURL=ng-ast-utils.js.map