@magic-xpa/cli 4.800.0-dev480.94 → 4.801.0-dev000.0

package/src/schematics/utils/ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast.js","sourceRoot":"","sources":["ast.ts"],"names":[],"mappings":"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","sourcesContent":["import {normalize} from '@angular-devkit/core';\nimport {SchematicsException, Tree} from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport {addImportToModule} from './devkit-utils/ast-utils';\nimport {InsertChange} from './devkit-utils/change';\nimport {Project, getWorkspace} from './devkit-utils/config';\nimport {findBootstrapModulePath, getAppModulePath} from './devkit-utils/ng-ast-utils';\nimport {ModuleOptions, findModuleFromOptions as internalFindModule} from './devkit-utils/find-module';\n\n\n/** Reads file given path and returns TypeScript source file. */\nexport function getSourceFile(host: Tree, path: string): ts.SourceFile {\n  const buffer = host.read(path);\n  if (!buffer) {\n    throw new SchematicsException(`Could not find file for path: ${path}`);\n  }\n  const content = buffer.toString();\n  return ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);\n}\n\n/** Import and add module to root app module. */\nexport function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: Project) {\n  const modulePath = getAppModulePath(host, project.architect.build.options.main);\n  addModuleImportToModule(host, modulePath, moduleName, src);\n}\n\n/**\n * Import and add module to specific module path.\n * @param host the tree we are updating\n * @param modulePath src location of the module to import\n * @param moduleName name of module to import\n * @param src src location to import\n */\nexport function addModuleImportToModule(\n    host: Tree, modulePath: string, moduleName: string, src: string) {\n  const moduleSource = getSourceFile(host, modulePath);\n\n  if (!moduleSource) {\n    throw new SchematicsException(`Module not found: ${modulePath}`);\n  }\n\n  const changes = addImportToModule(moduleSource, modulePath, moduleName, src);\n  const recorder = host.beginUpdate(modulePath);\n\n  changes.forEach((change) => {\n    if (change instanceof InsertChange) {\n      recorder.insertLeft(change.pos, change.toAdd);\n    }\n  });\n\n  host.commitUpdate(recorder);\n}\n\n/** Gets the app index.html file */\nexport function getIndexHtmlPath(host: Tree, project: Project): string {\n  const buildTarget = project.architect.build.options;\n\n  if (buildTarget.index && buildTarget.index.endsWith('index.html')) {\n    return buildTarget.index;\n  }\n\n  throw new SchematicsException('No index.html file was found.');\n}\n\n/** Get the root stylesheet file. */\nexport function getStylesPath(host: Tree, project: Project): string {\n  const buildTarget = project.architect['build'];\n\n  if (buildTarget.options && buildTarget.options.styles && buildTarget.options.styles.length) {\n    const styles = buildTarget.options.styles.map(s => s.input);\n\n    // First, see if any of the assets is called \"styles.(le|sc|c)ss\", which is the default\n    // \"main\" style sheet.\n    const defaultMainStylePath = styles.find(a => /styles\\.(c|le|sc)ss/.test(a));\n    if (defaultMainStylePath) {\n      return normalize(defaultMainStylePath);\n    }\n\n    // If there was no obvious default file, use the first style asset.\n    const fallbackStylePath = styles.find(a => /\\.(c|le|sc)ss/.test(a));\n    if (fallbackStylePath) {\n      return normalize(fallbackStylePath);\n    }\n  }\n\n  throw new SchematicsException('No style files could be found into which a theme could be added');\n}\n\n/** Wraps the internal find module from options with undefined path handling  */\nexport function findModuleFromOptions(host: Tree, options: any) {\n  const workspace = getWorkspace(host);\n  if (!options.project) {\n    options.project = Object.keys(workspace.projects)[0];\n  }\n\n  const project = workspace.projects[options.project];\n\n  if (options.path === undefined) {\n    options.path = `/${project.root}/src/app`;\n  }\n\n  return internalFindModule(host, options);\n}\n"]}
+{"version":3,"file":"ast.js","sourceRoot":"","sources":["ast.ts"],"names":[],"mappings":"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","sourcesContent":["import {normalize} from '@angular-devkit/core';\nimport {SchematicsException, Tree} from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport {addImportToModule} from './devkit-utils/ast-utils';\nimport {InsertChange} from './devkit-utils/change';\nimport {Project, getWorkspace} from './devkit-utils/config';\nimport {findBootstrapModulePath, getAppModulePath} from './devkit-utils/ng-ast-utils';\nimport {ModuleOptions, findModuleFromOptions as internalFindModule} from './devkit-utils/find-module';\n\n\n/** Reads file given path and returns TypeScript source file. */\nexport function getSourceFile(host: Tree, path: string): ts.SourceFile {\n  const buffer = host.read(path);\n  if (!buffer) {\n    throw new SchematicsException(`Could not find file for path: ${path}`);\n  }\n  const content = buffer.toString();\n  return ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);\n}\n\n/** Import and add module to root app module. */\nexport function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: Project) {\n  const modulePath = getAppModulePath(host, project.architect.build.options.main);\n  addModuleImportToModule(host, modulePath, moduleName, src);\n}\n\n/**\n * Import and add module to specific module path.\n * @param host the tree we are updating\n * @param modulePath src location of the module to import\n * @param moduleName name of module to import\n * @param src src location to import\n */\nexport function addModuleImportToModule(\n    host: Tree, modulePath: string, moduleName: string, src: string) {\n  const moduleSource = getSourceFile(host, modulePath);\n\n  if (!moduleSource) {\n    throw new SchematicsException(`Module not found: ${modulePath}`);\n  }\n\n  const changes = addImportToModule(moduleSource, modulePath, moduleName, src);\n  const recorder = host.beginUpdate(modulePath);\n\n  changes.forEach((change) => {\n    if (change instanceof InsertChange) {\n      recorder.insertLeft(change.pos, change.toAdd);\n    }\n  });\n\n  host.commitUpdate(recorder);\n}\n\n/** Gets the app index.html file */\nexport function getIndexHtmlPath(host: Tree, project: Project): string {\n  const buildTarget = project.architect.build.options;\n\n  if (buildTarget.index && buildTarget.index.endsWith('index.html')) {\n    return buildTarget.index;\n  }\n\n  throw new SchematicsException('No index.html file was found.');\n}\n\n/** Get the root stylesheet file. */\nexport function getStylesPath(host: Tree, project: Project): string {\n  const buildTarget = project.architect['build'];\n\n  if (buildTarget.options && buildTarget.options.styles && buildTarget.options.styles.length) {\n    const styles = buildTarget.options.styles.map(s => s.input);\n\n    // First, see if any of the assets is called \"styles.(le|sc|c)ss\", which is the default\n    // \"main\" style sheet.\n    const defaultMainStylePath = styles.find(a => /styles\\.(c|le|sc)ss/.test(a));\n    if (defaultMainStylePath) {\n      return normalize(defaultMainStylePath);\n    }\n\n    // If there was no obvious default file, use the first style asset.\n    const fallbackStylePath = styles.find(a => /\\.(c|le|sc)ss/.test(a));\n    if (fallbackStylePath) {\n      return normalize(fallbackStylePath);\n    }\n  }\n\n  throw new SchematicsException('No style files could be found into which a theme could be added');\n}\n\n/** Wraps the internal find module from options with undefined path handling  */\nexport function findModuleFromOptions(host: Tree, options: any) {\n  const workspace = getWorkspace(host);\n  if (!options.project) {\n    options.project = Object.keys(workspace.projects)[0];\n  }\n\n  const project = workspace.projects[options.project];\n\n  if (options.path === undefined) {\n    options.path = `/${project.root}/src/app`;\n  }\n\n  return internalFindModule(host, options);\n}\n"]}

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

@@ -281,7 +281,7 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
         if (importPath !== null) {
             return [
                 new change_1.InsertChange(ngModulePath, position, toInsert),
-                route_utils_1.insertImport(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
+                (0, route_utils_1.insertImport)(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
             ];
         }
         else {
@@ -354,7 +354,7 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
     if (importPath !== null) {
         return [
             new change_1.InsertChange(ngModulePath, position, toInsert),
-            route_utils_1.insertImport(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
+            (0, route_utils_1.insertImport)(source, ngModulePath, symbolName.replace(/\..*$/, ''), importPath),
         ];
     }
     return [new change_1.InsertChange(ngModulePath, position, toInsert)];

package/src/schematics/utils/devkit-utils/ast-utils_old.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast-utils_old.js","sourceRoot":"","sources":["ast-utils_old.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 * as ts from 'typescript';\nimport { Change, InsertChange } from './change';\nimport { insertImport } from './route-utils';\n\n\n/**\n * Find all nodes from the AST in the subtree of node of SyntaxKind kind.\n * @param node\n * @param kind\n * @param max The maximum number of items to return.\n * @return all nodes of kind, or [] if none is found\n */\nexport function findNodes(node: ts.Node, kind: ts.SyntaxKind, max = Infinity): ts.Node[] {\n  if (!node || max == 0) {\n    return [];\n  }\n\n  const arr: ts.Node[] = [];\n  if (node.kind === kind) {\n    arr.push(node);\n    max--;\n  }\n  if (max > 0) {\n    for (const child of node.getChildren()) {\n      findNodes(child, kind, max).forEach(node => {\n        if (max > 0) {\n          arr.push(node);\n        }\n        max--;\n      });\n\n      if (max <= 0) {\n        break;\n      }\n    }\n  }\n\n  return arr;\n}\n\n\n\nexport function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[] {\n  const nodes: ts.Node[] = [sourceFile];\n  const result = [];\n\n  while (nodes.length > 0) {\n    const node = nodes.shift();\n\n    if (node) {\n      result.push(node);\n      if (node.getChildCount(sourceFile) >= 0) {\n        nodes.unshift(...node.getChildren());\n      }\n    }\n  }\n\n  return result;\n}\n\nexport function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null {\n  if (node.kind === kind && node.getText() === text) {\n    // throw new Error(node.getText());\n    return node;\n  }\n\n  let foundNode: ts.Node | null = null;\n  ts.forEachChild(node, childNode => {\n    foundNode = foundNode || findNode(childNode, kind, text);\n  });\n\n  return foundNode;\n}\n\n\n/**\n * Helper for sorting nodes.\n * @return function to sort nodes in increasing order of position in sourceFile\n */\nfunction nodesByPosition(first: ts.Node, second: ts.Node): number {\n  return first.getStart() - second.getStart();\n}\n\n\n/**\n * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`\n * or after the last of occurence of `syntaxKind` if the last occurence is a sub child\n * of ts.SyntaxKind[nodes[i].kind] and save the changes in file.\n *\n * @param nodes insert after the last occurence of nodes\n * @param toInsert string to insert\n * @param file file to insert changes into\n * @param fallbackPos position to insert if toInsert happens to be the first occurence\n * @param syntaxKind the ts.SyntaxKind of the subchildren to insert after\n * @return Change instance\n * @throw Error if toInsert is first occurence but fall back is not set\n */\nexport function insertAfterLastOccurrence(nodes: ts.Node[],\n                                          toInsert: string,\n                                          file: string,\n                                          fallbackPos: number,\n                                          syntaxKind?: ts.SyntaxKind): Change {\n  let lastItem = nodes.sort(nodesByPosition).pop();\n  if (!lastItem) {\n    //throw new Error();\n    // No imports exist....\n    new InsertChange(file, 0, toInsert);\n  }\n  if (syntaxKind) {\n    lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();\n  }\n  if (!lastItem && fallbackPos == undefined) {\n    throw new Error(`tried to insert ${toInsert} as first occurence with no fallback position`);\n  }\n  const lastItemPosition: number = lastItem ? lastItem.getEnd() : fallbackPos;\n\n  return new InsertChange(file, lastItemPosition, toInsert);\n}\n\n\nexport function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {\n  if (node.kind == ts.SyntaxKind.Identifier) {\n    return (node as ts.Identifier).text;\n  } else if (node.kind == ts.SyntaxKind.StringLiteral) {\n    return (node as ts.StringLiteral).text;\n  } else {\n    return null;\n  }\n}\n\n\nfunction _angularImportsFromNode(node: ts.ImportDeclaration,\n                                 _sourceFile: ts.SourceFile): {[name: string]: string} {\n  const ms = node.moduleSpecifier;\n  let modulePath: string;\n  switch (ms.kind) {\n    case ts.SyntaxKind.StringLiteral:\n      modulePath = (ms as ts.StringLiteral).text;\n      break;\n    default:\n      return {};\n  }\n\n  if (!modulePath.startsWith('@angular/')) {\n    return {};\n  }\n\n  if (node.importClause) {\n    if (node.importClause.name) {\n      // This is of the form `import Name from 'path'`. Ignore.\n      return {};\n    } else if (node.importClause.namedBindings) {\n      const nb = node.importClause.namedBindings;\n      if (nb.kind == ts.SyntaxKind.NamespaceImport) {\n        // This is of the form `import * as name from 'path'`. Return `name.`.\n        return {\n          [(nb as ts.NamespaceImport).name.text + '.']: modulePath,\n        };\n      } else {\n        // This is of the form `import {a,b,c} from 'path'`\n        const namedImports = nb as ts.NamedImports;\n\n        return namedImports.elements\n          .map((is: ts.ImportSpecifier) => is.propertyName ? is.propertyName.text : is.name.text)\n          .reduce((acc: {[name: string]: string}, curr: string) => {\n            acc[curr] = modulePath;\n\n            return acc;\n          }, {});\n      }\n    }\n\n    return {};\n  } else {\n    // This is of the form `import 'path';`. Nothing to do.\n    return {};\n  }\n}\n\n\nexport function getDecoratorMetadata(source: ts.SourceFile, identifier: string,\n                                     module: string): ts.Node[] {\n  const angularImports: {[name: string]: string}\n    = findNodes(source, ts.SyntaxKind.ImportDeclaration)\n    .map((node: ts.ImportDeclaration) => _angularImportsFromNode(node, source))\n    .reduce((acc: {[name: string]: string}, current: {[name: string]: string}) => {\n      for (const key of Object.keys(current)) {\n        acc[key] = current[key];\n      }\n\n      return acc;\n    }, {});\n\n  return getSourceNodes(source)\n    .filter(node => {\n      return node.kind == ts.SyntaxKind.Decorator\n        && (node as ts.Decorator).expression.kind == ts.SyntaxKind.CallExpression;\n    })\n    .map(node => (node as ts.Decorator).expression as ts.CallExpression)\n    .filter(expr => {\n      if (expr.expression.kind == ts.SyntaxKind.Identifier) {\n        const id = expr.expression as ts.Identifier;\n\n        return id.getFullText(source) == identifier\n          && angularImports[id.getFullText(source)] === module;\n      } else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {\n        // This covers foo.NgModule when importing * as foo.\n        const paExpr = expr.expression as ts.PropertyAccessExpression;\n        // If the left expression is not an identifier, just give up at that point.\n        if (paExpr.expression.kind !== ts.SyntaxKind.Identifier) {\n          return false;\n        }\n\n        const id = paExpr.name.text;\n        const moduleId = (paExpr.expression as ts.Identifier).getText(source);\n\n        return id === identifier && (angularImports[moduleId + '.'] === module);\n      }\n\n      return false;\n    })\n    .filter(expr => expr.arguments[0]\n                 && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)\n    .map(expr => expr.arguments[0] as ts.ObjectLiteralExpression);\n}\n\nfunction findClassDeclarationParent(node: ts.Node): ts.ClassDeclaration|undefined {\n  if (ts.isClassDeclaration(node)) {\n    return node;\n  }\n\n  return node.parent && findClassDeclarationParent(node.parent);\n}\n\n/**\n * Given a source file with @NgModule class(es), find the name of the first @NgModule class.\n *\n * @param source source file containing one or more @NgModule\n * @returns the name of the first @NgModule, or `undefined` if none is found\n */\nexport function getFirstNgModuleName(source: ts.SourceFile): string|undefined {\n  // First, find the @NgModule decorators.\n  const ngModulesMetadata = getDecoratorMetadata(source, 'NgModule', '@angular/core');\n  if (ngModulesMetadata.length === 0) {\n    return undefined;\n  }\n\n  // Then walk parent pointers up the AST, looking for the ClassDeclaration parent of the NgModule\n  // metadata.\n  const moduleClass = findClassDeclarationParent(ngModulesMetadata[0]);\n  if (!moduleClass || !moduleClass.name) {\n    return undefined;\n  }\n\n  // Get the class name of the module ClassDeclaration.\n  return moduleClass.name.text;\n}\n\nexport function addSymbolToNgModuleMetadata(\n  source: ts.SourceFile,\n  ngModulePath: string,\n  metadataField: string,\n  symbolName: string,\n  importPath: string | null = null,\n): Change[] {\n  const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');\n  let node: any = nodes[0];  // tslint:disable-line:no-any\n\n  // Find the decorator declaration.\n  if (!node) {\n    return [];\n  }\n\n  // Get all the children property assignment of object literals.\n  const matchingProperties: ts.ObjectLiteralElement[] =\n    (node as ts.ObjectLiteralExpression).properties\n    .filter(prop => prop.kind == ts.SyntaxKind.PropertyAssignment)\n    // Filter out every fields that's not \"metadataField\". Also handles string literals\n    // (but not expressions).\n    .filter((prop: ts.PropertyAssignment) => {\n      const name = prop.name;\n      switch (name.kind) {\n        case ts.SyntaxKind.Identifier:\n          return (name as ts.Identifier).getText(source) == metadataField;\n        case ts.SyntaxKind.StringLiteral:\n          return (name as ts.StringLiteral).text == metadataField;\n      }\n\n      return false;\n    });\n\n  // Get the last node of the array literal.\n  if (!matchingProperties) {\n    return [];\n  }\n  if (matchingProperties.length == 0) {\n    // We haven't found the field in the metadata declaration. Insert a new field.\n    const expr = node as ts.ObjectLiteralExpression;\n    let position: number;\n    let toInsert: string;\n    if (expr.properties.length == 0) {\n      position = expr.getEnd() - 1;\n      toInsert = `  ${metadataField}: [${symbolName}]\\n`;\n    } else {\n      node = expr.properties[expr.properties.length - 1];\n      position = node.getEnd();\n      // Get the indentation of the last element, if any.\n      const text = node.getFullText(source);\n      const matches = text.match(/^\\r?\\n\\s*/);\n      if (matches.length > 0) {\n        toInsert = `,${matches[0]}${metadataField}: [${symbolName}]`;\n      } else {\n        toInsert = `, ${metadataField}: [${symbolName}]`;\n      }\n    }\n    if (importPath !== null) {\n      return [\n        new InsertChange(ngModulePath, position, toInsert),\n        insertImport(source, ngModulePath, symbolName.replace(/\\..*$/, ''), importPath),\n      ];\n    } else {\n      return [new InsertChange(ngModulePath, position, toInsert)];\n    }\n  }\n  const assignment = matchingProperties[0] as ts.PropertyAssignment;\n\n  // If it's not an array, nothing we can do really.\n  if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {\n    return [];\n  }\n\n  const arrLiteral = assignment.initializer as ts.ArrayLiteralExpression;\n  if (arrLiteral.elements.length == 0) {\n    // Forward the property.\n    node = arrLiteral;\n  } else {\n    node = arrLiteral.elements;\n  }\n\n  if (!node) {\n    console.log('No app module found. Please add your new class to your component.');\n\n    return [];\n  }\n\n  if (Array.isArray(node)) {\n    const nodeArray = node as {} as Array<ts.Node>;\n    const symbolsArray = nodeArray.map(node => node.getText());\n    if (symbolsArray.includes(symbolName)) {\n      return [];\n    }\n\n    node = node[node.length - 1];\n  }\n\n  let toInsert: string;\n  let position = node.getEnd();\n  if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {\n    // We haven't found the field in the metadata declaration. Insert a new\n    // field.\n    const expr = node as ts.ObjectLiteralExpression;\n    if (expr.properties.length == 0) {\n      position = expr.getEnd() - 1;\n      toInsert = `  ${metadataField}: [${symbolName}]\\n`;\n    } else {\n      node = expr.properties[expr.properties.length - 1];\n      position = node.getEnd();\n      // Get the indentation of the last element, if any.\n      const text = node.getFullText(source);\n      if (text.match('^\\r?\\r?\\n')) {\n        toInsert = `,${text.match(/^\\r?\\n\\s+/)[0]}${metadataField}: [${symbolName}]`;\n      } else {\n        toInsert = `, ${metadataField}: [${symbolName}]`;\n      }\n    }\n  } else if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {\n    // We found the field but it's empty. Insert it just before the `]`.\n    position--;\n    toInsert = `${symbolName}`;\n  } else {\n    // Get the indentation of the last element, if any.\n    const text = node.getFullText(source);\n    if (text.match(/^\\r?\\n/)) {\n      toInsert = `,${text.match(/^\\r?\\n(\\r?)\\s+/)[0]}${symbolName}`;\n    } else {\n      toInsert = `, ${symbolName}`;\n    }\n  }\n  if (importPath !== null) {\n    return [\n      new InsertChange(ngModulePath, position, toInsert),\n      insertImport(source, ngModulePath, symbolName.replace(/\\..*$/, ''), importPath),\n    ];\n  }\n\n  return [new InsertChange(ngModulePath, position, toInsert)];\n}\n\n/**\n * Custom function to insert a declaration (component, pipe, directive)\n * into NgModule declarations. It also imports the component.\n */\nexport function addDeclarationToModule(source: ts.SourceFile,\n                                       modulePath: string, classifiedName: string,\n                                       importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(\n    source, modulePath, 'declarations', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an NgModule into NgModule imports. It also imports the module.\n */\nexport function addImportToModule(source: ts.SourceFile,\n                                  modulePath: string, classifiedName: string,\n                                  importPath: string): Change[] {\n\n  return addSymbolToNgModuleMetadata(source, modulePath, 'imports', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert a provider into NgModule. It also imports it.\n */\nexport function addProviderToModule(source: ts.SourceFile,\n                                    modulePath: string, classifiedName: string,\n                                    importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'providers', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an export into NgModule. It also imports it.\n */\nexport function addExportToModule(source: ts.SourceFile,\n                                  modulePath: string, classifiedName: string,\n                                  importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'exports', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an export into NgModule. It also imports it.\n */\nexport function addBootstrapToModule(source: ts.SourceFile,\n                                     modulePath: string, classifiedName: string,\n                                     importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'bootstrap', classifiedName, importPath);\n}\n\n/**\n * Determine if an import already exists.\n */\nexport function isImported(source: ts.SourceFile,\n                           classifiedName: string,\n                           importPath: string): boolean {\n  const allNodes = getSourceNodes(source);\n  const matchingNodes = allNodes\n    .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)\n    .filter((imp: ts.ImportDeclaration) => imp.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)\n    .filter((imp: ts.ImportDeclaration) => {\n      return (<ts.StringLiteral> imp.moduleSpecifier).text === importPath;\n    })\n    .filter((imp: ts.ImportDeclaration) => {\n      if (!imp.importClause) {\n        return false;\n      }\n      const nodes = findNodes(imp.importClause, ts.SyntaxKind.ImportSpecifier)\n        .filter(n => n.getText() === classifiedName);\n\n      return nodes.length > 0;\n    });\n\n  return matchingNodes.length > 0;\n}\n"]}
+{"version":3,"file":"ast-utils_old.js","sourceRoot":"","sources":["ast-utils_old.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 * as ts from 'typescript';\nimport { Change, InsertChange } from './change';\nimport { insertImport } from './route-utils';\n\n\n/**\n * Find all nodes from the AST in the subtree of node of SyntaxKind kind.\n * @param node\n * @param kind\n * @param max The maximum number of items to return.\n * @return all nodes of kind, or [] if none is found\n */\nexport function findNodes(node: ts.Node, kind: ts.SyntaxKind, max = Infinity): ts.Node[] {\n  if (!node || max == 0) {\n    return [];\n  }\n\n  const arr: ts.Node[] = [];\n  if (node.kind === kind) {\n    arr.push(node);\n    max--;\n  }\n  if (max > 0) {\n    for (const child of node.getChildren()) {\n      findNodes(child, kind, max).forEach(node => {\n        if (max > 0) {\n          arr.push(node);\n        }\n        max--;\n      });\n\n      if (max <= 0) {\n        break;\n      }\n    }\n  }\n\n  return arr;\n}\n\n\n\nexport function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[] {\n  const nodes: ts.Node[] = [sourceFile];\n  const result = [];\n\n  while (nodes.length > 0) {\n    const node = nodes.shift();\n\n    if (node) {\n      result.push(node);\n      if (node.getChildCount(sourceFile) >= 0) {\n        nodes.unshift(...node.getChildren());\n      }\n    }\n  }\n\n  return result;\n}\n\nexport function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null {\n  if (node.kind === kind && node.getText() === text) {\n    // throw new Error(node.getText());\n    return node;\n  }\n\n  let foundNode: ts.Node | null = null;\n  ts.forEachChild(node, childNode => {\n    foundNode = foundNode || findNode(childNode, kind, text);\n  });\n\n  return foundNode;\n}\n\n\n/**\n * Helper for sorting nodes.\n * @return function to sort nodes in increasing order of position in sourceFile\n */\nfunction nodesByPosition(first: ts.Node, second: ts.Node): number {\n  return first.getStart() - second.getStart();\n}\n\n\n/**\n * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`\n * or after the last of occurence of `syntaxKind` if the last occurence is a sub child\n * of ts.SyntaxKind[nodes[i].kind] and save the changes in file.\n *\n * @param nodes insert after the last occurence of nodes\n * @param toInsert string to insert\n * @param file file to insert changes into\n * @param fallbackPos position to insert if toInsert happens to be the first occurence\n * @param syntaxKind the ts.SyntaxKind of the subchildren to insert after\n * @return Change instance\n * @throw Error if toInsert is first occurence but fall back is not set\n */\nexport function insertAfterLastOccurrence(nodes: ts.Node[],\n                                          toInsert: string,\n                                          file: string,\n                                          fallbackPos: number,\n                                          syntaxKind?: ts.SyntaxKind): Change {\n  let lastItem = nodes.sort(nodesByPosition).pop();\n  if (!lastItem) {\n    //throw new Error();\n    // No imports exist....\n    new InsertChange(file, 0, toInsert);\n  }\n  if (syntaxKind) {\n    lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();\n  }\n  if (!lastItem && fallbackPos == undefined) {\n    throw new Error(`tried to insert ${toInsert} as first occurence with no fallback position`);\n  }\n  const lastItemPosition: number = lastItem ? lastItem.getEnd() : fallbackPos;\n\n  return new InsertChange(file, lastItemPosition, toInsert);\n}\n\n\nexport function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {\n  if (node.kind == ts.SyntaxKind.Identifier) {\n    return (node as ts.Identifier).text;\n  } else if (node.kind == ts.SyntaxKind.StringLiteral) {\n    return (node as ts.StringLiteral).text;\n  } else {\n    return null;\n  }\n}\n\n\nfunction _angularImportsFromNode(node: ts.ImportDeclaration,\n                                 _sourceFile: ts.SourceFile): {[name: string]: string} {\n  const ms = node.moduleSpecifier;\n  let modulePath: string;\n  switch (ms.kind) {\n    case ts.SyntaxKind.StringLiteral:\n      modulePath = (ms as ts.StringLiteral).text;\n      break;\n    default:\n      return {};\n  }\n\n  if (!modulePath.startsWith('@angular/')) {\n    return {};\n  }\n\n  if (node.importClause) {\n    if (node.importClause.name) {\n      // This is of the form `import Name from 'path'`. Ignore.\n      return {};\n    } else if (node.importClause.namedBindings) {\n      const nb = node.importClause.namedBindings;\n      if (nb.kind == ts.SyntaxKind.NamespaceImport) {\n        // This is of the form `import * as name from 'path'`. Return `name.`.\n        return {\n          [(nb as ts.NamespaceImport).name.text + '.']: modulePath,\n        };\n      } else {\n        // This is of the form `import {a,b,c} from 'path'`\n        const namedImports = nb as ts.NamedImports;\n\n        return namedImports.elements\n          .map((is: ts.ImportSpecifier) => is.propertyName ? is.propertyName.text : is.name.text)\n          .reduce((acc: {[name: string]: string}, curr: string) => {\n            acc[curr] = modulePath;\n\n            return acc;\n          }, {});\n      }\n    }\n\n    return {};\n  } else {\n    // This is of the form `import 'path';`. Nothing to do.\n    return {};\n  }\n}\n\n\nexport function getDecoratorMetadata(source: ts.SourceFile, identifier: string,\n                                     module: string): ts.Node[] {\n  const angularImports: {[name: string]: string}\n    = findNodes(source, ts.SyntaxKind.ImportDeclaration)\n    .map((node: ts.ImportDeclaration) => _angularImportsFromNode(node, source))\n    .reduce((acc: {[name: string]: string}, current: {[name: string]: string}) => {\n      for (const key of Object.keys(current)) {\n        acc[key] = current[key];\n      }\n\n      return acc;\n    }, {});\n\n  return getSourceNodes(source)\n    .filter(node => {\n      return node.kind == ts.SyntaxKind.Decorator\n        && (node as ts.Decorator).expression.kind == ts.SyntaxKind.CallExpression;\n    })\n    .map(node => (node as ts.Decorator).expression as ts.CallExpression)\n    .filter(expr => {\n      if (expr.expression.kind == ts.SyntaxKind.Identifier) {\n        const id = expr.expression as ts.Identifier;\n\n        return id.getFullText(source) == identifier\n          && angularImports[id.getFullText(source)] === module;\n      } else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {\n        // This covers foo.NgModule when importing * as foo.\n        const paExpr = expr.expression as ts.PropertyAccessExpression;\n        // If the left expression is not an identifier, just give up at that point.\n        if (paExpr.expression.kind !== ts.SyntaxKind.Identifier) {\n          return false;\n        }\n\n        const id = paExpr.name.text;\n        const moduleId = (paExpr.expression as ts.Identifier).getText(source);\n\n        return id === identifier && (angularImports[moduleId + '.'] === module);\n      }\n\n      return false;\n    })\n    .filter(expr => expr.arguments[0]\n                 && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)\n    .map(expr => expr.arguments[0] as ts.ObjectLiteralExpression);\n}\n\nfunction findClassDeclarationParent(node: ts.Node): ts.ClassDeclaration|undefined {\n  if (ts.isClassDeclaration(node)) {\n    return node;\n  }\n\n  return node.parent && findClassDeclarationParent(node.parent);\n}\n\n/**\n * Given a source file with @NgModule class(es), find the name of the first @NgModule class.\n *\n * @param source source file containing one or more @NgModule\n * @returns the name of the first @NgModule, or `undefined` if none is found\n */\nexport function getFirstNgModuleName(source: ts.SourceFile): string|undefined {\n  // First, find the @NgModule decorators.\n  const ngModulesMetadata = getDecoratorMetadata(source, 'NgModule', '@angular/core');\n  if (ngModulesMetadata.length === 0) {\n    return undefined;\n  }\n\n  // Then walk parent pointers up the AST, looking for the ClassDeclaration parent of the NgModule\n  // metadata.\n  const moduleClass = findClassDeclarationParent(ngModulesMetadata[0]);\n  if (!moduleClass || !moduleClass.name) {\n    return undefined;\n  }\n\n  // Get the class name of the module ClassDeclaration.\n  return moduleClass.name.text;\n}\n\nexport function addSymbolToNgModuleMetadata(\n  source: ts.SourceFile,\n  ngModulePath: string,\n  metadataField: string,\n  symbolName: string,\n  importPath: string | null = null,\n): Change[] {\n  const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');\n  let node: any = nodes[0];  // tslint:disable-line:no-any\n\n  // Find the decorator declaration.\n  if (!node) {\n    return [];\n  }\n\n  // Get all the children property assignment of object literals.\n  const matchingProperties: ts.ObjectLiteralElement[] =\n    (node as ts.ObjectLiteralExpression).properties\n    .filter(prop => prop.kind == ts.SyntaxKind.PropertyAssignment)\n    // Filter out every fields that's not \"metadataField\". Also handles string literals\n    // (but not expressions).\n    .filter((prop: ts.PropertyAssignment) => {\n      const name = prop.name;\n      switch (name.kind) {\n        case ts.SyntaxKind.Identifier:\n          return (name as ts.Identifier).getText(source) == metadataField;\n        case ts.SyntaxKind.StringLiteral:\n          return (name as ts.StringLiteral).text == metadataField;\n      }\n\n      return false;\n    });\n\n  // Get the last node of the array literal.\n  if (!matchingProperties) {\n    return [];\n  }\n  if (matchingProperties.length == 0) {\n    // We haven't found the field in the metadata declaration. Insert a new field.\n    const expr = node as ts.ObjectLiteralExpression;\n    let position: number;\n    let toInsert: string;\n    if (expr.properties.length == 0) {\n      position = expr.getEnd() - 1;\n      toInsert = `  ${metadataField}: [${symbolName}]\\n`;\n    } else {\n      node = expr.properties[expr.properties.length - 1];\n      position = node.getEnd();\n      // Get the indentation of the last element, if any.\n      const text = node.getFullText(source);\n      const matches = text.match(/^\\r?\\n\\s*/);\n      if (matches.length > 0) {\n        toInsert = `,${matches[0]}${metadataField}: [${symbolName}]`;\n      } else {\n        toInsert = `, ${metadataField}: [${symbolName}]`;\n      }\n    }\n    if (importPath !== null) {\n      return [\n        new InsertChange(ngModulePath, position, toInsert),\n        insertImport(source, ngModulePath, symbolName.replace(/\\..*$/, ''), importPath),\n      ];\n    } else {\n      return [new InsertChange(ngModulePath, position, toInsert)];\n    }\n  }\n  const assignment = matchingProperties[0] as ts.PropertyAssignment;\n\n  // If it's not an array, nothing we can do really.\n  if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {\n    return [];\n  }\n\n  const arrLiteral = assignment.initializer as ts.ArrayLiteralExpression;\n  if (arrLiteral.elements.length == 0) {\n    // Forward the property.\n    node = arrLiteral;\n  } else {\n    node = arrLiteral.elements;\n  }\n\n  if (!node) {\n    console.log('No app module found. Please add your new class to your component.');\n\n    return [];\n  }\n\n  if (Array.isArray(node)) {\n    const nodeArray = node as {} as Array<ts.Node>;\n    const symbolsArray = nodeArray.map(node => node.getText());\n    if (symbolsArray.includes(symbolName)) {\n      return [];\n    }\n\n    node = node[node.length - 1];\n  }\n\n  let toInsert: string;\n  let position = node.getEnd();\n  if (node.kind == ts.SyntaxKind.ObjectLiteralExpression) {\n    // We haven't found the field in the metadata declaration. Insert a new\n    // field.\n    const expr = node as ts.ObjectLiteralExpression;\n    if (expr.properties.length == 0) {\n      position = expr.getEnd() - 1;\n      toInsert = `  ${metadataField}: [${symbolName}]\\n`;\n    } else {\n      node = expr.properties[expr.properties.length - 1];\n      position = node.getEnd();\n      // Get the indentation of the last element, if any.\n      const text = node.getFullText(source);\n      if (text.match('^\\r?\\r?\\n')) {\n        toInsert = `,${text.match(/^\\r?\\n\\s+/)[0]}${metadataField}: [${symbolName}]`;\n      } else {\n        toInsert = `, ${metadataField}: [${symbolName}]`;\n      }\n    }\n  } else if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {\n    // We found the field but it's empty. Insert it just before the `]`.\n    position--;\n    toInsert = `${symbolName}`;\n  } else {\n    // Get the indentation of the last element, if any.\n    const text = node.getFullText(source);\n    if (text.match(/^\\r?\\n/)) {\n      toInsert = `,${text.match(/^\\r?\\n(\\r?)\\s+/)[0]}${symbolName}`;\n    } else {\n      toInsert = `, ${symbolName}`;\n    }\n  }\n  if (importPath !== null) {\n    return [\n      new InsertChange(ngModulePath, position, toInsert),\n      insertImport(source, ngModulePath, symbolName.replace(/\\..*$/, ''), importPath),\n    ];\n  }\n\n  return [new InsertChange(ngModulePath, position, toInsert)];\n}\n\n/**\n * Custom function to insert a declaration (component, pipe, directive)\n * into NgModule declarations. It also imports the component.\n */\nexport function addDeclarationToModule(source: ts.SourceFile,\n                                       modulePath: string, classifiedName: string,\n                                       importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(\n    source, modulePath, 'declarations', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an NgModule into NgModule imports. It also imports the module.\n */\nexport function addImportToModule(source: ts.SourceFile,\n                                  modulePath: string, classifiedName: string,\n                                  importPath: string): Change[] {\n\n  return addSymbolToNgModuleMetadata(source, modulePath, 'imports', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert a provider into NgModule. It also imports it.\n */\nexport function addProviderToModule(source: ts.SourceFile,\n                                    modulePath: string, classifiedName: string,\n                                    importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'providers', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an export into NgModule. It also imports it.\n */\nexport function addExportToModule(source: ts.SourceFile,\n                                  modulePath: string, classifiedName: string,\n                                  importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'exports', classifiedName, importPath);\n}\n\n/**\n * Custom function to insert an export into NgModule. It also imports it.\n */\nexport function addBootstrapToModule(source: ts.SourceFile,\n                                     modulePath: string, classifiedName: string,\n                                     importPath: string): Change[] {\n  return addSymbolToNgModuleMetadata(source, modulePath, 'bootstrap', classifiedName, importPath);\n}\n\n/**\n * Determine if an import already exists.\n */\nexport function isImported(source: ts.SourceFile,\n                           classifiedName: string,\n                           importPath: string): boolean {\n  const allNodes = getSourceNodes(source);\n  const matchingNodes = allNodes\n    .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)\n    .filter((imp: ts.ImportDeclaration) => imp.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)\n    .filter((imp: ts.ImportDeclaration) => {\n      return (<ts.StringLiteral> imp.moduleSpecifier).text === importPath;\n    })\n    .filter((imp: ts.ImportDeclaration) => {\n      if (!imp.importClause) {\n        return false;\n      }\n      const nodes = findNodes(imp.importClause, ts.SyntaxKind.ImportSpecifier)\n        .filter(n => n.getText() === classifiedName);\n\n      return nodes.length > 0;\n    });\n\n  return matchingNodes.length > 0;\n}\n"]}

package/src/schematics/utils/devkit-utils/component.js

@@ -26,9 +26,9 @@ function addDeclarationToNgModule(options) {
             + (options.flat ? '' : core_1.strings.dasherize(options.name) + '/')
             + core_1.strings.dasherize(options.name)
             + '.component';
-        const relativePath = find_module_1.buildRelativePath(modulePath, componentPath);
+        const relativePath = (0, find_module_1.buildRelativePath)(modulePath, componentPath);
         const classifiedName = core_1.strings.classify(`${options.name}Component`);
-        const declarationChanges = ast_utils_1.addDeclarationToModule(source, modulePath, classifiedName, relativePath);
+        const declarationChanges = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, classifiedName, relativePath);
         const declarationRecorder = host.beginUpdate(modulePath);
         for (const change of declarationChanges) {
             if (change instanceof change_1.InsertChange) {
@@ -45,7 +45,7 @@ function addDeclarationToNgModule(options) {
             const sourceText = text.toString('utf-8');
             const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
             const exportRecorder = host.beginUpdate(modulePath);
-            const exportChanges = ast_utils_1.addExportToModule(source, modulePath, core_1.strings.classify(`${options.name}Component`), relativePath);
+            const exportChanges = (0, ast_utils_1.addExportToModule)(source, modulePath, core_1.strings.classify(`${options.name}Component`), relativePath);
             for (const change of exportChanges) {
                 if (change instanceof change_1.InsertChange) {
                     exportRecorder.insertLeft(change.pos, change.toAdd);
@@ -65,7 +65,7 @@ function buildSelector(options) {
 }
 function buildComponent(options) {
     return (host, context) => {
-        const workspace = config_1.getWorkspace(host);
+        const workspace = (0, config_1.getWorkspace)(host);
         if (!options.project) {
             options.project = Object.keys(workspace.projects)[0];
         }
@@ -74,22 +74,22 @@ function buildComponent(options) {
             options.path = `/${project.root}/src/app`;
         }
         options.selector = options.selector || buildSelector(options);
-        options.module = find_module_1.findModuleFromOptions(host, options);
-        const parsedPath = parse_name_1.parseName(options.path, options.name);
+        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
+        const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;
-        validation_1.validateName(options.name);
-        const templateSource = schematics_1.apply(schematics_1.url('./files'), [
-            options.spec ? schematics_1.noop() : schematics_1.filter(path => !path.endsWith('.spec.ts')),
-            options.inlineStyle ? schematics_1.filter(path => !path.endsWith('.__styleext__')) : schematics_1.noop(),
-            options.inlineTemplate ? schematics_1.filter(path => !path.endsWith('.html')) : schematics_1.noop(),
-            schematics_1.template(Object.assign(Object.assign(Object.assign({}, core_1.strings), { 'if-flat': (s) => options.flat ? '' : s }), options)),
-            schematics_1.move(null, parsedPath.path),
+        (0, validation_1.validateName)(options.name);
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
+            options.spec ? (0, schematics_1.noop)() : (0, schematics_1.filter)(path => !path.endsWith('.spec.ts')),
+            options.inlineStyle ? (0, schematics_1.filter)(path => !path.endsWith('.__styleext__')) : (0, schematics_1.noop)(),
+            options.inlineTemplate ? (0, schematics_1.filter)(path => !path.endsWith('.html')) : (0, schematics_1.noop)(),
+            (0, schematics_1.template)(Object.assign(Object.assign(Object.assign({}, core_1.strings), { 'if-flat': (s) => options.flat ? '' : s }), options)),
+            (0, schematics_1.move)(null, parsedPath.path),
         ]);
-        return schematics_1.chain([
-            schematics_1.branchAndMerge(schematics_1.chain([
+        return (0, schematics_1.chain)([
+            (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
                 addDeclarationToNgModule(options),
-                schematics_1.mergeWith(templateSource),
+                (0, schematics_1.mergeWith)(templateSource),
             ])),
         ])(host, context);
     };

package/src/schematics/utils/devkit-utils/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"","sources":["component.ts"],"names":[],"mappings":"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","sourcesContent":["import {normalize, strings} from '@angular-devkit/core';\nimport {\n  apply,\n  branchAndMerge,\n  chain,\n  filter,\n  mergeWith,\n  move,\n  noop,\n  Rule,\n  SchematicContext,\n  SchematicsException,\n  template,\n  Tree,\n  url,\n} from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport {addDeclarationToModule, addExportToModule} from './ast-utils';\nimport {InsertChange} from './change';\nimport {buildRelativePath, findModuleFromOptions} from './find-module';\nimport {getWorkspace} from './config';\nimport {parseName} from './parse-name';\nimport {validateName} from './validation';\n\nfunction addDeclarationToNgModule(options: any): Rule {\n  return (host: Tree) => {\n    if (options.skipImport || !options.module) {\n      return host;\n    }\n\n    const modulePath = options.module;\n    const text = host.read(modulePath);\n    if (text === null) {\n      throw new SchematicsException(`File ${modulePath} does not exist.`);\n    }\n    const sourceText = text.toString('utf-8');\n    const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);\n\n    const componentPath = `/${options.path}/`\n                          + (options.flat ? '' : strings.dasherize(options.name) + '/')\n                          + strings.dasherize(options.name)\n                          + '.component';\n    const relativePath = buildRelativePath(modulePath, componentPath);\n    const classifiedName = strings.classify(`${options.name}Component`);\n    const declarationChanges = addDeclarationToModule(source,\n                                                      modulePath,\n                                                      classifiedName,\n                                                      relativePath);\n\n    const declarationRecorder = host.beginUpdate(modulePath);\n    for (const change of declarationChanges) {\n      if (change instanceof InsertChange) {\n        declarationRecorder.insertLeft(change.pos, change.toAdd);\n      }\n    }\n    host.commitUpdate(declarationRecorder);\n\n    if (options.export) {\n      // Need to refresh the AST because we overwrote the file in the host.\n      const text = host.read(modulePath);\n      if (text === null) {\n        throw new SchematicsException(`File ${modulePath} does not exist.`);\n      }\n      const sourceText = text.toString('utf-8');\n      const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);\n\n      const exportRecorder = host.beginUpdate(modulePath);\n      const exportChanges = addExportToModule(source, modulePath,\n                                              strings.classify(`${options.name}Component`),\n                                              relativePath);\n\n      for (const change of exportChanges) {\n        if (change instanceof InsertChange) {\n          exportRecorder.insertLeft(change.pos, change.toAdd);\n        }\n      }\n      host.commitUpdate(exportRecorder);\n    }\n\n\n    return host;\n  };\n}\n\n\nfunction buildSelector(options: any) {\n  let selector = strings.dasherize(options.name);\n  if (options.prefix) {\n    selector = `${options.prefix}-${selector}`;\n  }\n\n  return selector;\n}\n\n\nexport function buildComponent(options: any): Rule {\n  return (host: Tree, context: SchematicContext) => {\n    const workspace = getWorkspace(host);\n    if (!options.project) {\n      options.project = Object.keys(workspace.projects)[0];\n    }\n    const project = workspace.projects[options.project];\n\n    if (options.path === undefined) {\n      options.path = `/${project.root}/src/app`;\n    }\n\n    options.selector = options.selector || buildSelector(options);\n    options.module = findModuleFromOptions(host, options);\n\n    const parsedPath = parseName(options.path, options.name);\n    options.name = parsedPath.name;\n    options.path = parsedPath.path;\n\n    validateName(options.name);\n\n    const templateSource = apply(url('./files'), [\n      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),\n      options.inlineStyle ? filter(path => !path.endsWith('.__styleext__')) : noop(),\n      options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),\n      template({\n        ...strings,\n        'if-flat': (s: string) => options.flat ? '' : s,\n        ...options,\n      }),\n      move(null, parsedPath.path),\n    ]);\n\n    return chain([\n      branchAndMerge(chain([\n        addDeclarationToNgModule(options),\n        mergeWith(templateSource),\n      ])),\n    ])(host, context);\n  };\n}\n"]}
+{"version":3,"file":"component.js","sourceRoot":"","sources":["component.ts"],"names":[],"mappings":"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","sourcesContent":["import {normalize, strings} from '@angular-devkit/core';\nimport {\n  apply,\n  branchAndMerge,\n  chain,\n  filter,\n  mergeWith,\n  move,\n  noop,\n  Rule,\n  SchematicContext,\n  SchematicsException,\n  template,\n  Tree,\n  url,\n} from '@angular-devkit/schematics';\nimport * as ts from 'typescript';\nimport {addDeclarationToModule, addExportToModule} from './ast-utils';\nimport {InsertChange} from './change';\nimport {buildRelativePath, findModuleFromOptions} from './find-module';\nimport {getWorkspace} from './config';\nimport {parseName} from './parse-name';\nimport {validateName} from './validation';\n\nfunction addDeclarationToNgModule(options: any): Rule {\n  return (host: Tree) => {\n    if (options.skipImport || !options.module) {\n      return host;\n    }\n\n    const modulePath = options.module;\n    const text = host.read(modulePath);\n    if (text === null) {\n      throw new SchematicsException(`File ${modulePath} does not exist.`);\n    }\n    const sourceText = text.toString('utf-8');\n    const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);\n\n    const componentPath = `/${options.path}/`\n                          + (options.flat ? '' : strings.dasherize(options.name) + '/')\n                          + strings.dasherize(options.name)\n                          + '.component';\n    const relativePath = buildRelativePath(modulePath, componentPath);\n    const classifiedName = strings.classify(`${options.name}Component`);\n    const declarationChanges = addDeclarationToModule(source,\n                                                      modulePath,\n                                                      classifiedName,\n                                                      relativePath);\n\n    const declarationRecorder = host.beginUpdate(modulePath);\n    for (const change of declarationChanges) {\n      if (change instanceof InsertChange) {\n        declarationRecorder.insertLeft(change.pos, change.toAdd);\n      }\n    }\n    host.commitUpdate(declarationRecorder);\n\n    if (options.export) {\n      // Need to refresh the AST because we overwrote the file in the host.\n      const text = host.read(modulePath);\n      if (text === null) {\n        throw new SchematicsException(`File ${modulePath} does not exist.`);\n      }\n      const sourceText = text.toString('utf-8');\n      const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);\n\n      const exportRecorder = host.beginUpdate(modulePath);\n      const exportChanges = addExportToModule(source, modulePath,\n                                              strings.classify(`${options.name}Component`),\n                                              relativePath);\n\n      for (const change of exportChanges) {\n        if (change instanceof InsertChange) {\n          exportRecorder.insertLeft(change.pos, change.toAdd);\n        }\n      }\n      host.commitUpdate(exportRecorder);\n    }\n\n\n    return host;\n  };\n}\n\n\nfunction buildSelector(options: any) {\n  let selector = strings.dasherize(options.name);\n  if (options.prefix) {\n    selector = `${options.prefix}-${selector}`;\n  }\n\n  return selector;\n}\n\n\nexport function buildComponent(options: any): Rule {\n  return (host: Tree, context: SchematicContext) => {\n    const workspace = getWorkspace(host);\n    if (!options.project) {\n      options.project = Object.keys(workspace.projects)[0];\n    }\n    const project = workspace.projects[options.project];\n\n    if (options.path === undefined) {\n      options.path = `/${project.root}/src/app`;\n    }\n\n    options.selector = options.selector || buildSelector(options);\n    options.module = findModuleFromOptions(host, options);\n\n    const parsedPath = parseName(options.path, options.name);\n    options.name = parsedPath.name;\n    options.path = parsedPath.path;\n\n    validateName(options.name);\n\n    const templateSource = apply(url('./files'), [\n      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),\n      options.inlineStyle ? filter(path => !path.endsWith('.__styleext__')) : noop(),\n      options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),\n      template({\n        ...strings,\n        'if-flat': (s: string) => options.flat ? '' : s,\n        ...options,\n      }),\n      move(null, parsedPath.path),\n    ]);\n\n    return chain([\n      branchAndMerge(chain([\n        addDeclarationToNgModule(options),\n        mergeWith(templateSource),\n      ])),\n    ])(host, context);\n  };\n}\n"]}

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

@@ -19,22 +19,22 @@ function findModuleFromOptions(host, options) {
     if (!options.module) {
         const pathToCheck = (options.path || '')
             + (options.flat ? '' : '/' + core_1.strings.dasherize(options.name));
-        return core_1.normalize(findModule(host, pathToCheck));
+        return (0, core_1.normalize)(findModule(host, pathToCheck));
     }
     else {
-        const modulePath = core_1.normalize('/' + (options.path) + '/' + options.module);
-        const moduleBaseName = core_1.normalize(modulePath).split('/').pop();
+        const modulePath = (0, core_1.normalize)('/' + (options.path) + '/' + options.module);
+        const moduleBaseName = (0, core_1.normalize)(modulePath).split('/').pop();
         if (host.exists(modulePath)) {
-            return core_1.normalize(modulePath);
+            return (0, core_1.normalize)(modulePath);
         }
         else if (host.exists(modulePath + '.ts')) {
-            return core_1.normalize(modulePath + '.ts');
+            return (0, core_1.normalize)(modulePath + '.ts');
         }
         else if (host.exists(modulePath + '.module.ts')) {
-            return core_1.normalize(modulePath + '.module.ts');
+            return (0, core_1.normalize)(modulePath + '.module.ts');
         }
         else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {
-            return core_1.normalize(modulePath + '/' + moduleBaseName + '.module.ts');
+            return (0, core_1.normalize)(modulePath + '/' + moduleBaseName + '.module.ts');
         }
         else {
             throw new Error('Specified module does not exist');
@@ -52,7 +52,7 @@ function findModule(host, generateDir) {
     while (dir) {
         const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));
         if (matches.length == 1) {
-            return core_1.join(dir.path, matches[0]);
+            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 '
@@ -68,15 +68,15 @@ exports.findModule = findModule;
  * Build a relative path from one file path to another file path.
  */
 function buildRelativePath(from, to) {
-    from = core_1.normalize(from);
-    to = core_1.normalize(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 = core_1.relative(core_1.normalize(fromParts.join('/')), core_1.normalize(toParts.join('/')));
+    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) {

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":["/**\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"]}

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

@@ -20,11 +20,11 @@ function findBootstrapModuleCall(host, mainPath) {
     }
     const mainText = mainBuffer.toString('utf-8');
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
-    const allNodes = ast_utils_1.getSourceNodes(source);
+    const allNodes = (0, ast_utils_1.getSourceNodes)(source);
     let bootstrapCall = null;
     for (const node of allNodes) {
         let bootstrapCallNode = null;
-        bootstrapCallNode = ast_utils_1.findNode(node, ts.SyntaxKind.Identifier, 'bootstrapModule');
+        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) {
@@ -52,11 +52,11 @@ function findBootstrapModulePath(host, mainPath) {
     }
     const mainText = mainBuffer.toString('utf-8');
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
-    const allNodes = ast_utils_1.getSourceNodes(source);
+    const allNodes = (0, ast_utils_1.getSourceNodes)(source);
     const bootstrapModuleRelativePath = allNodes
         .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)
         .filter(imp => {
-        return ast_utils_1.findNode(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());
+        return (0, ast_utils_1.findNode)(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());
     })
         .map((imp) => {
         const modulePathStringLiteral = imp.moduleSpecifier;
@@ -67,8 +67,8 @@ function findBootstrapModulePath(host, mainPath) {
 exports.findBootstrapModulePath = findBootstrapModulePath;
 function getAppModulePath(host, mainPath) {
     const moduleRelativePath = findBootstrapModulePath(host, mainPath);
-    const mainDir = path_1.dirname(mainPath);
-    const modulePath = core_1.normalize(`/${mainDir}/${moduleRelativePath}.ts`);
+    const mainDir = (0, path_1.dirname)(mainPath);
+    const modulePath = (0, core_1.normalize)(`/${mainDir}/${moduleRelativePath}.ts`);
     return modulePath;
 }
 exports.getAppModulePath = getAppModulePath;

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

@@ -1 +1 @@
-{"version":3,"file":"ng-ast-utils.js","sourceRoot":"","sources":["ng-ast-utils.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 { normalize } from '@angular-devkit/core';\nimport { SchematicsException, Tree } from '@angular-devkit/schematics';\nimport { dirname } from 'path';\nimport * as ts from 'typescript';\nimport { findNode, getSourceNodes } from './ast-utils';\n\nexport function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallExpression | null {\n  const mainBuffer = host.read(mainPath);\n  if (!mainBuffer) {\n    throw new SchematicsException(`Main file (${mainPath}) not found`);\n  }\n  const mainText = mainBuffer.toString('utf-8');\n  const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);\n\n  const allNodes = getSourceNodes(source);\n\n  let bootstrapCall: ts.CallExpression | null = null;\n\n  for (const node of allNodes) {\n\n    let bootstrapCallNode: ts.Node | null = null;\n    bootstrapCallNode = findNode(node, ts.SyntaxKind.Identifier, 'bootstrapModule');\n\n    // Walk up the parent until CallExpression is found.\n    while (bootstrapCallNode && bootstrapCallNode.parent\n      && bootstrapCallNode.parent.kind !== ts.SyntaxKind.CallExpression) {\n\n      bootstrapCallNode = bootstrapCallNode.parent;\n    }\n\n    if (bootstrapCallNode !== null &&\n      bootstrapCallNode.parent !== undefined &&\n      bootstrapCallNode.parent.kind === ts.SyntaxKind.CallExpression) {\n      bootstrapCall = bootstrapCallNode.parent as ts.CallExpression;\n      break;\n    }\n  }\n\n  return bootstrapCall;\n}\n\nexport function findBootstrapModulePath(host: Tree, mainPath: string): string {\n  const bootstrapCall = findBootstrapModuleCall(host, mainPath);\n  if (!bootstrapCall) {\n    throw new SchematicsException('Bootstrap call not found');\n  }\n\n  const bootstrapModule = bootstrapCall.arguments[0];\n\n  const mainBuffer = host.read(mainPath);\n  if (!mainBuffer) {\n    throw new SchematicsException(`Client app main file (${mainPath}) not found`);\n  }\n  const mainText = mainBuffer.toString('utf-8');\n  const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);\n  const allNodes = getSourceNodes(source);\n  const bootstrapModuleRelativePath = allNodes\n    .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)\n    .filter(imp => {\n      return findNode(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());\n    })\n    .map((imp: ts.ImportDeclaration) => {\n      const modulePathStringLiteral = <ts.StringLiteral> imp.moduleSpecifier;\n\n      return modulePathStringLiteral.text;\n    })[0];\n\n  return bootstrapModuleRelativePath;\n}\n\nexport function getAppModulePath(host: Tree, mainPath: string): string {\n  const moduleRelativePath = findBootstrapModulePath(host, mainPath);\n  const mainDir = dirname(mainPath);\n  const modulePath = normalize(`/${mainDir}/${moduleRelativePath}.ts`);\n\n  return modulePath;\n}\n"]}
+{"version":3,"file":"ng-ast-utils.js","sourceRoot":"","sources":["ng-ast-utils.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 { normalize } from '@angular-devkit/core';\nimport { SchematicsException, Tree } from '@angular-devkit/schematics';\nimport { dirname } from 'path';\nimport * as ts from 'typescript';\nimport { findNode, getSourceNodes } from './ast-utils';\n\nexport function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallExpression | null {\n  const mainBuffer = host.read(mainPath);\n  if (!mainBuffer) {\n    throw new SchematicsException(`Main file (${mainPath}) not found`);\n  }\n  const mainText = mainBuffer.toString('utf-8');\n  const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);\n\n  const allNodes = getSourceNodes(source);\n\n  let bootstrapCall: ts.CallExpression | null = null;\n\n  for (const node of allNodes) {\n\n    let bootstrapCallNode: ts.Node | null = null;\n    bootstrapCallNode = findNode(node, ts.SyntaxKind.Identifier, 'bootstrapModule');\n\n    // Walk up the parent until CallExpression is found.\n    while (bootstrapCallNode && bootstrapCallNode.parent\n      && bootstrapCallNode.parent.kind !== ts.SyntaxKind.CallExpression) {\n\n      bootstrapCallNode = bootstrapCallNode.parent;\n    }\n\n    if (bootstrapCallNode !== null &&\n      bootstrapCallNode.parent !== undefined &&\n      bootstrapCallNode.parent.kind === ts.SyntaxKind.CallExpression) {\n      bootstrapCall = bootstrapCallNode.parent as ts.CallExpression;\n      break;\n    }\n  }\n\n  return bootstrapCall;\n}\n\nexport function findBootstrapModulePath(host: Tree, mainPath: string): string {\n  const bootstrapCall = findBootstrapModuleCall(host, mainPath);\n  if (!bootstrapCall) {\n    throw new SchematicsException('Bootstrap call not found');\n  }\n\n  const bootstrapModule = bootstrapCall.arguments[0];\n\n  const mainBuffer = host.read(mainPath);\n  if (!mainBuffer) {\n    throw new SchematicsException(`Client app main file (${mainPath}) not found`);\n  }\n  const mainText = mainBuffer.toString('utf-8');\n  const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);\n  const allNodes = getSourceNodes(source);\n  const bootstrapModuleRelativePath = allNodes\n    .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)\n    .filter(imp => {\n      return findNode(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());\n    })\n    .map((imp: ts.ImportDeclaration) => {\n      const modulePathStringLiteral = <ts.StringLiteral> imp.moduleSpecifier;\n\n      return modulePathStringLiteral.text;\n    })[0];\n\n  return bootstrapModuleRelativePath;\n}\n\nexport function getAppModulePath(host: Tree, mainPath: string): string {\n  const moduleRelativePath = findBootstrapModulePath(host, mainPath);\n  const mainDir = dirname(mainPath);\n  const modulePath = normalize(`/${mainDir}/${moduleRelativePath}.ts`);\n\n  return modulePath;\n}\n"]}

package/src/schematics/utils/devkit-utils/parse-name.js

@@ -10,11 +10,11 @@ exports.parseName = void 0;
  */
 const core_1 = require("@angular-devkit/core");
 function parseName(path, name) {
-    const nameWithoutPath = core_1.basename(name);
-    const namePath = core_1.dirname((path + '/' + name));
+    const nameWithoutPath = (0, core_1.basename)(name);
+    const namePath = (0, core_1.dirname)((path + '/' + name));
     return {
         name: nameWithoutPath,
-        path: core_1.normalize('/' + namePath),
+        path: (0, core_1.normalize)('/' + namePath),
     };
 }
 exports.parseName = parseName;

package/src/schematics/utils/devkit-utils/parse-name.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-name.js","sourceRoot":"","sources":["parse-name.ts"],"names":[],"mappings":";;;AACA;;;;;;GAMG;AACH,+CAA0E;AAO1E,SAAgB,SAAS,CAAC,IAAY,EAAE,IAAY;IAClD,MAAM,eAAe,GAAG,eAAQ,CAAC,IAAY,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,cAAO,CAAC,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAS,CAAC,CAAC;IAEtD,OAAO;QACL,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,gBAAS,CAAC,GAAG,GAAG,QAAQ,CAAC;KAChC,CAAC;AACJ,CAAC;AARD,8BAQC","sourcesContent":["\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 */\nimport { Path, basename, dirname, normalize } from '@angular-devkit/core';\n\nexport interface Location {\n  name: string;\n  path: Path;\n}\n\nexport function parseName(path: string, name: string): Location {\n  const nameWithoutPath = basename(name as Path);\n  const namePath = dirname((path + '/' + name) as Path);\n\n  return {\n    name: nameWithoutPath,\n    path: normalize('/' + namePath),\n  };\n}\n"]}
+{"version":3,"file":"parse-name.js","sourceRoot":"","sources":["parse-name.ts"],"names":[],"mappings":";;;AACA;;;;;;GAMG;AACH,+CAA0E;AAO1E,SAAgB,SAAS,CAAC,IAAY,EAAE,IAAY;IAClD,MAAM,eAAe,GAAG,IAAA,eAAQ,EAAC,IAAY,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAS,CAAC,CAAC;IAEtD,OAAO;QACL,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,IAAA,gBAAS,EAAC,GAAG,GAAG,QAAQ,CAAC;KAChC,CAAC;AACJ,CAAC;AARD,8BAQC","sourcesContent":["\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 */\nimport { Path, basename, dirname, normalize } from '@angular-devkit/core';\n\nexport interface Location {\n  name: string;\n  path: Path;\n}\n\nexport function parseName(path: string, name: string): Location {\n  const nameWithoutPath = basename(name as Path);\n  const namePath = dirname((path + '/' + name) as Path);\n\n  return {\n    name: nameWithoutPath,\n    path: normalize('/' + namePath),\n  };\n}\n"]}

package/src/schematics/utils/devkit-utils/route-utils.js

@@ -23,7 +23,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 */
 function insertImport2(source, fileToEdit, symbolName, asSymbolName, fileName, isDefault = false) {
     const rootNode = source;
-    const allImports = ast_utils_1.findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);
+    const allImports = (0, ast_utils_1.findNodes)(rootNode, ts.SyntaxKind.ImportDeclaration);
     // get nodes that map to import statements from the file fileName
     const relevantImports = allImports.filter(node => {
         // StringLiteral of the ImportDeclaration is the import file (fileName in this case).
@@ -37,8 +37,8 @@ function insertImport2(source, fileToEdit, symbolName, asSymbolName, fileName, i
         // imports from import file
         const imports = [];
         relevantImports.forEach(n => {
-            Array.prototype.push.apply(imports, ast_utils_1.findNodes(n, ts.SyntaxKind.Identifier));
-            if (ast_utils_1.findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {
+            Array.prototype.push.apply(imports, (0, ast_utils_1.findNodes)(n, ts.SyntaxKind.Identifier));
+            if ((0, ast_utils_1.findNodes)(n, ts.SyntaxKind.AsteriskToken).length > 0) {
                 importsAsterisk = true;
             }
         });
@@ -49,14 +49,14 @@ function insertImport2(source, fileToEdit, symbolName, asSymbolName, fileName, i
         const importTextNodes = imports.filter(n => n.text === symbolName);
         // insert import if it's not there
         if (importTextNodes.length === 0) {
-            const fallbackPos = ast_utils_1.findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
-                ast_utils_1.findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
-            return ast_utils_1.insertAfterLastOccurrence(imports, `, ${symbolName} as ${asSymbolName}`, fileToEdit, fallbackPos);
+            const fallbackPos = (0, ast_utils_1.findNodes)(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
+                (0, ast_utils_1.findNodes)(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
+            return (0, ast_utils_1.insertAfterLastOccurrence)(imports, `, ${symbolName} as ${asSymbolName}`, fileToEdit, fallbackPos);
         }
         return new change_1.NoopChange();
     }
     // no such import declaration exists
-    const useStrict = ast_utils_1.findNodes(rootNode, ts.SyntaxKind.StringLiteral)
+    const useStrict = (0, ast_utils_1.findNodes)(rootNode, ts.SyntaxKind.StringLiteral)
         .filter((n) => n.text === 'use strict');
     let fallbackPos = 0;
     if (useStrict.length > 0) {
@@ -69,12 +69,12 @@ function insertImport2(source, fileToEdit, symbolName, asSymbolName, fileName, i
     const separator = insertAtBeginning ? '' : ';\n';
     const toInsert = `${separator}import ${open}${symbolName} as ${asSymbolName}${close}` +
         ` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
-    return ast_utils_1.insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
+    return (0, ast_utils_1.insertAfterLastOccurrence)(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
 }
 exports.insertImport2 = insertImport2;
 function insertImport(source, fileToEdit, symbolName, fileName, isDefault = false) {
     const rootNode = source;
-    const allImports = ast_utils_1.findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);
+    const allImports = (0, ast_utils_1.findNodes)(rootNode, ts.SyntaxKind.ImportDeclaration);
     // get nodes that map to import statements from the file fileName
     const relevantImports = allImports.filter(node => {
         // StringLiteral of the ImportDeclaration is the import file (fileName in this case).
@@ -88,8 +88,8 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
         // imports from import file
         const imports = [];
         relevantImports.forEach(n => {
-            Array.prototype.push.apply(imports, ast_utils_1.findNodes(n, ts.SyntaxKind.Identifier));
-            if (ast_utils_1.findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {
+            Array.prototype.push.apply(imports, (0, ast_utils_1.findNodes)(n, ts.SyntaxKind.Identifier));
+            if ((0, ast_utils_1.findNodes)(n, ts.SyntaxKind.AsteriskToken).length > 0) {
                 importsAsterisk = true;
             }
         });
@@ -100,14 +100,14 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
         const importTextNodes = imports.filter(n => n.text === symbolName);
         // insert import if it's not there
         if (importTextNodes.length === 0) {
-            const fallbackPos = ast_utils_1.findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
-                ast_utils_1.findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
-            return ast_utils_1.insertAfterLastOccurrence(imports, `, ${symbolName}`, fileToEdit, fallbackPos);
+            const fallbackPos = (0, ast_utils_1.findNodes)(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
+                (0, ast_utils_1.findNodes)(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
+            return (0, ast_utils_1.insertAfterLastOccurrence)(imports, `, ${symbolName}`, fileToEdit, fallbackPos);
         }
         return new change_1.NoopChange();
     }
     // no such import declaration exists
-    const useStrict = ast_utils_1.findNodes(rootNode, ts.SyntaxKind.StringLiteral)
+    const useStrict = (0, ast_utils_1.findNodes)(rootNode, ts.SyntaxKind.StringLiteral)
         .filter((n) => n.text === 'use strict');
     let fallbackPos = 0;
     if (useStrict.length > 0) {
@@ -120,7 +120,7 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
     const separator = insertAtBeginning ? '' : ';\n';
     const toInsert = `${separator}import ${open}${symbolName}${close}` +
         ` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
-    return ast_utils_1.insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
+    return (0, ast_utils_1.insertAfterLastOccurrence)(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
 }
 exports.insertImport = insertImport;
 function getSourceFile(host, path) {