@magic-xpa/cli 4.1100.0-dev4110.24 → 4.1100.0-dev4110.240

package/src/schematics/utils/ast.js

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

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.browser);\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/ast.ts

@@ -20,7 +20,7 @@ export function getSourceFile(host: Tree, path: string): ts.SourceFile {
 
 /** Import and add module to root app module. */
 export function addModuleImportToRootModule(host: Tree, moduleName: string, src: string, project: Project) {
-  const modulePath = getAppModulePath(host, project.architect.build.options.main);
+  const modulePath = getAppModulePath(host, project.architect.build.options.browser);
   addModuleImportToModule(host, modulePath, moduleName, src);
 }
 

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

@@ -1,87 +1,87 @@
-/**
- * @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 * as ts from 'typescript';
-import { Change } from './change';
-/**
- * Add Import `import { symbolName } from fileName` if the import doesn't exit
- * already. Assumes fileToEdit can be resolved and accessed.
- * @param fileToEdit (file we want to add import to)
- * @param symbolName (item to import)
- * @param fileName (path to the file)
- * @param isDefault (if true, import follows style for importing default exports)
- * @return Change
- */
-export declare function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string, fileName: string, isDefault?: boolean): Change;
-/**
- * Find all nodes from the AST in the subtree of node of SyntaxKind kind.
- * @param node
- * @param kind
- * @param max The maximum number of items to return.
- * @return all nodes of kind, or [] if none is found
- */
-export declare function findNodes(node: ts.Node, kind: ts.SyntaxKind, max?: number): ts.Node[];
-/**
- * Get all the nodes from a source.
- * @param sourceFile The source file object.
- * @returns {Observable<ts.Node>} An observable of all the nodes in the source.
- */
-export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];
-export declare function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null;
-/**
- * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`
- * or after the last of occurence of `syntaxKind` if the last occurence is a sub child
- * of ts.SyntaxKind[nodes[i].kind] and save the changes in file.
- *
- * @param nodes insert after the last occurence of nodes
- * @param toInsert string to insert
- * @param file file to insert changes into
- * @param fallbackPos position to insert if toInsert happens to be the first occurence
- * @param syntaxKind the ts.SyntaxKind of the subchildren to insert after
- * @return Change instance
- * @throw Error if toInsert is first occurence but fall back is not set
- */
-export declare function insertAfterLastOccurrence(nodes: ts.Node[], toInsert: string, file: string, fallbackPos: number, syntaxKind?: ts.SyntaxKind): Change;
-export declare function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null;
-export declare function getDecoratorMetadata(source: ts.SourceFile, identifier: string, module: string): ts.Node[];
-/**
- * Given a source file with @NgModule class(es), find the name of the first @NgModule class.
- *
- * @param source source file containing one or more @NgModule
- * @returns the name of the first @NgModule, or `undefined` if none is found
- */
-export declare function getFirstNgModuleName(source: ts.SourceFile): string | undefined;
-export declare function addSymbolToNgModuleMetadata(source: ts.SourceFile, ngModulePath: string, metadataField: string, symbolName: string, importPath?: string | null): Change[];
-/**
- * Custom function to insert a declaration (component, pipe, directive)
- * into NgModule declarations. It also imports the component.
- */
-export declare function addDeclarationToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
-/**
- * Custom function to insert an NgModule into NgModule imports. It also imports the module.
- */
-export declare function addImportToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
-/**
- * Custom function to insert a provider into NgModule. It also imports it.
- */
-export declare function addProviderToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
-/**
- * Custom function to insert an export into NgModule. It also imports it.
- */
-export declare function addExportToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
-/**
- * Custom function to insert an export into NgModule. It also imports it.
- */
-export declare function addBootstrapToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
-/**
- * Custom function to insert an entryComponent into NgModule. It also imports it.
- */
-export declare function addEntryComponentToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
-/**
- * Determine if an import already exists.
- */
-export declare function isImported(source: ts.SourceFile, classifiedName: string, importPath: string): boolean;
+/**
+ * @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 * as ts from 'typescript';
+import { Change } from './change';
+/**
+ * Add Import `import { symbolName } from fileName` if the import doesn't exit
+ * already. Assumes fileToEdit can be resolved and accessed.
+ * @param fileToEdit (file we want to add import to)
+ * @param symbolName (item to import)
+ * @param fileName (path to the file)
+ * @param isDefault (if true, import follows style for importing default exports)
+ * @return Change
+ */
+export declare function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string, fileName: string, isDefault?: boolean): Change;
+/**
+ * Find all nodes from the AST in the subtree of node of SyntaxKind kind.
+ * @param node
+ * @param kind
+ * @param max The maximum number of items to return.
+ * @return all nodes of kind, or [] if none is found
+ */
+export declare function findNodes(node: ts.Node, kind: ts.SyntaxKind, max?: number): ts.Node[];
+/**
+ * Get all the nodes from a source.
+ * @param sourceFile The source file object.
+ * @returns {Observable<ts.Node>} An observable of all the nodes in the source.
+ */
+export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];
+export declare function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null;
+/**
+ * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`
+ * or after the last of occurence of `syntaxKind` if the last occurence is a sub child
+ * of ts.SyntaxKind[nodes[i].kind] and save the changes in file.
+ *
+ * @param nodes insert after the last occurence of nodes
+ * @param toInsert string to insert
+ * @param file file to insert changes into
+ * @param fallbackPos position to insert if toInsert happens to be the first occurence
+ * @param syntaxKind the ts.SyntaxKind of the subchildren to insert after
+ * @return Change instance
+ * @throw Error if toInsert is first occurence but fall back is not set
+ */
+export declare function insertAfterLastOccurrence(nodes: ts.Node[], toInsert: string, file: string, fallbackPos: number, syntaxKind?: ts.SyntaxKind): Change;
+export declare function getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null;
+export declare function getDecoratorMetadata(source: ts.SourceFile, identifier: string, module: string): ts.Node[];
+/**
+ * Given a source file with @NgModule class(es), find the name of the first @NgModule class.
+ *
+ * @param source source file containing one or more @NgModule
+ * @returns the name of the first @NgModule, or `undefined` if none is found
+ */
+export declare function getFirstNgModuleName(source: ts.SourceFile): string | undefined;
+export declare function addSymbolToNgModuleMetadata(source: ts.SourceFile, ngModulePath: string, metadataField: string, symbolName: string, importPath?: string | null): Change[];
+/**
+ * Custom function to insert a declaration (component, pipe, directive)
+ * into NgModule declarations. It also imports the component.
+ */
+export declare function addDeclarationToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert an NgModule into NgModule imports. It also imports the module.
+ */
+export declare function addImportToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert a provider into NgModule. It also imports it.
+ */
+export declare function addProviderToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert an export into NgModule. It also imports it.
+ */
+export declare function addExportToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert an export into NgModule. It also imports it.
+ */
+export declare function addBootstrapToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Custom function to insert an entryComponent into NgModule. It also imports it.
+ */
+export declare function addEntryComponentToModule(source: ts.SourceFile, modulePath: string, classifiedName: string, importPath: string): Change[];
+/**
+ * Determine if an import already exists.
+ */
+export declare function isImported(source: ts.SourceFile, classifiedName: string, importPath: string): boolean;