@schematics/angular 12.0.0-rc.0 → 12.0.0

package/service/index.js

@@ -1,12 +1,12 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const lint_fix_1 = require("../utility/lint-fix");
@@ -21,10 +21,10 @@ function default_1(options) {
         options.name = parsedPath.name;
         options.path = parsedPath.path;
         const templateSource = schematics_1.apply(schematics_1.url('./files'), [
-            options.skipTests ? schematics_1.filter(path => !path.endsWith('.spec.ts.template')) : schematics_1.noop(),
+            options.skipTests ? schematics_1.filter((path) => !path.endsWith('.spec.ts.template')) : schematics_1.noop(),
             schematics_1.applyTemplates({
                 ...core_1.strings,
-                'if-flat': (s) => options.flat ? '' : s,
+                'if-flat': (s) => (options.flat ? '' : s),
                 ...options,
             }),
             schematics_1.move(parsedPath.path),

package/service-worker/index.d.ts

@@ -1,3 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC 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 { Rule } from '@angular-devkit/schematics';
 import { Schema as ServiceWorkerOptions } from './schema';
 export default function (options: ServiceWorkerOptions): Rule;

package/service-worker/index.js

@@ -1,12 +1,12 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");

package/service-worker/schema.d.ts

@@ -1,22 +1,22 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
 
 export interface Schema {
-    /**
-     * The name of the project.
-     */
-    project: string;
-    /**
-     * The target to apply service worker to.
-     */
-    target: string;
-    /**
-     * The configuration to apply service worker to.
-     */
-    configuration: string;
+  /**
+   * The name of the project.
+   */
+  project: string;
+  /**
+   * The target to apply service worker to.
+   */
+  target: string;
+  /**
+   * The configuration to apply service worker to.
+   */
+  configuration: string;
 }

package/service-worker/schema.json

@@ -24,7 +24,5 @@
       "x-deprecated": "No longer has an effect."
     }
   },
-  "required": [
-    "project"
-  ]
+  "required": ["project"]
 }

package/universal/index.d.ts

@@ -1,3 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC 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 { Rule } from '@angular-devkit/schematics';
 import { Schema as UniversalOptions } from './schema';
 export default function (options: UniversalOptions): Rule;

package/universal/index.js

@@ -1,12 +1,12 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
@@ -20,8 +20,8 @@ const project_targets_1 = require("../utility/project-targets");
 const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
 function updateConfigFile(options, tsConfigDirectory) {
-    return workspace_1.updateWorkspace(workspace => {
-        const clientProject = workspace.projects.get(options.clientProject);
+    return workspace_1.updateWorkspace((workspace) => {
+        const clientProject = workspace.projects.get(options.project);
         if (clientProject) {
             // In case the browser builder hashes the assets
             // we need to add this setting to the server builder
@@ -45,7 +45,7 @@ function updateConfigFile(options, tsConfigDirectory) {
             };
             const buildTarget = clientProject.targets.get('build');
             if (buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.options) {
-                buildTarget.options.outputPath = `dist/${options.clientProject}/browser`;
+                buildTarget.options.outputPath = `dist/${options.project}/browser`;
             }
             const buildConfigurations = buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.configurations;
             const configurations = {};
@@ -61,7 +61,7 @@ function updateConfigFile(options, tsConfigDirectory) {
                 builder: workspace_models_1.Builders.Server,
                 defaultConfiguration: 'production',
                 options: {
-                    outputPath: `dist/${options.clientProject}/server`,
+                    outputPath: `dist/${options.project}/server`,
                     main: core_1.join(core_1.normalize(clientProject.root), 'src', mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts'),
                     tsConfig: serverTsConfig,
                     ...((buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.options) ? getServerOptions(buildTarget === null || buildTarget === void 0 ? void 0 : buildTarget.options) : {}),
@@ -111,8 +111,8 @@ function wrapBootstrapCall(mainFile) {
         }
         // indent contents
         const triviaWidth = bootstrapCall.getLeadingTriviaWidth();
-        const beforeText = `document.addEventListener('DOMContentLoaded', () => {\n`
-            + ' '.repeat(triviaWidth > 2 ? triviaWidth + 1 : triviaWidth);
+        const beforeText = `document.addEventListener('DOMContentLoaded', () => {\n` +
+            ' '.repeat(triviaWidth > 2 ? triviaWidth + 1 : triviaWidth);
         const afterText = `\n${triviaWidth > 2 ? ' '.repeat(triviaWidth - 1) : ''}});`;
         // in some cases we need to cater for a trailing semicolon such as;
         // bootstrap().catch(err => console.log(err));
@@ -128,13 +128,13 @@ function wrapBootstrapCall(mainFile) {
     };
 }
 function findCallExpressionNode(node, text) {
-    if (ts.isCallExpression(node)
-        && ts.isIdentifier(node.expression)
-        && node.expression.text === text) {
+    if (ts.isCallExpression(node) &&
+        ts.isIdentifier(node.expression) &&
+        node.expression.text === text) {
         return node;
     }
     let foundNode = null;
-    ts.forEachChild(node, childNode => {
+    ts.forEachChild(node, (childNode) => {
         foundNode = findCallExpressionNode(childNode, text);
         if (foundNode) {
             return true;
@@ -174,7 +174,7 @@ function addDependencies() {
 function default_1(options) {
     return async (host, context) => {
         const workspace = await workspace_1.getWorkspace(host);
-        const clientProject = workspace.projects.get(options.clientProject);
+        const clientProject = workspace.projects.get(options.project);
         if (!clientProject || clientProject.extensions.projectType !== 'application') {
             throw new schematics_1.SchematicsException(`Universal requires a project type of "application".`);
         }
@@ -182,7 +182,8 @@ function default_1(options) {
         if (!clientBuildTarget) {
             throw project_targets_1.targetBuildNotFoundError();
         }
-        const clientBuildOptions = (clientBuildTarget.options || {});
+        const clientBuildOptions = (clientBuildTarget.options ||
+            {});
         const clientTsConfig = core_1.normalize(clientBuildOptions.tsConfig);
         const tsConfigExtends = core_1.basename(clientTsConfig);
         // this is needed because prior to version 8, tsconfig might have been in 'src'

package/universal/schema.d.ts

@@ -10,14 +10,14 @@ export interface Schema {
      * The app identifier to use for transition.
      */
     appId?: string;
-    /**
-     * The name of the related client app. Required in place of "project".
-     */
-    clientProject: string;
     /**
      * The name of the main entry-point file.
      */
     main?: string;
+    /**
+     * The name of the project.
+     */
+    project: string;
     /**
      * The name of the root NgModule class.
      */

package/universal/schema.json

@@ -6,9 +6,12 @@
   "additionalProperties": false,
   "description": "Pass this schematic to the \"run\" command to set up server-side rendering for an app.",
   "properties": {
-    "clientProject": {
+    "project": {
       "type": "string",
-      "description": "The name of the related client app. Required in place of \"project\"."
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "appId": {
       "type": "string",
@@ -45,7 +48,5 @@
       "default": false
     }
   },
-  "required": [
-    "clientProject"
-  ]
+  "required": ["project"]
 }

package/utility/ast-utils.d.ts

@@ -1,3 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC 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 '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change } from './change';
 /**

package/utility/ast-utils.js

@@ -1,13 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addRouteDeclarationToModule = exports.getRouterModuleDeclaration = exports.getEnvironmentExportName = exports.isImported = exports.addBootstrapToModule = exports.addExportToModule = exports.addProviderToModule = exports.addImportToModule = exports.addDeclarationToModule = exports.addSymbolToNgModuleMetadata = exports.getMetadataField = exports.getDecoratorMetadata = exports.insertAfterLastOccurrence = exports.findNode = exports.getSourceNodes = exports.findNodes = exports.insertImport = void 0;
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addRouteDeclarationToModule = exports.getRouterModuleDeclaration = exports.getEnvironmentExportName = exports.isImported = exports.addBootstrapToModule = exports.addExportToModule = exports.addProviderToModule = exports.addImportToModule = exports.addDeclarationToModule = exports.addSymbolToNgModuleMetadata = exports.getMetadataField = exports.getDecoratorMetadata = exports.insertAfterLastOccurrence = exports.findNode = exports.getSourceNodes = exports.findNodes = exports.insertImport = void 0;
 const core_1 = require("@angular-devkit/core");
 const ts = require("../third_party/github.com/Microsoft/TypeScript/lib/typescript");
 const change_1 = require("./change");
@@ -24,18 +24,19 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
     const rootNode = source;
     const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);
     // get nodes that map to import statements from the file fileName
-    const relevantImports = allImports.filter(node => {
+    const relevantImports = allImports.filter((node) => {
         // StringLiteral of the ImportDeclaration is the import file (fileName in this case).
-        const importFiles = node.getChildren()
+        const importFiles = node
+            .getChildren()
             .filter(ts.isStringLiteral)
-            .map(n => n.text);
-        return importFiles.filter(file => file === fileName).length === 1;
+            .map((n) => n.text);
+        return importFiles.filter((file) => file === fileName).length === 1;
     });
     if (relevantImports.length > 0) {
         let importsAsterisk = false;
         // imports from import file
         const imports = [];
-        relevantImports.forEach(n => {
+        relevantImports.forEach((n) => {
             Array.prototype.push.apply(imports, findNodes(n, ts.SyntaxKind.Identifier));
             if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {
                 importsAsterisk = true;
@@ -45,7 +46,7 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
         if (importsAsterisk) {
             return new change_1.NoopChange();
         }
-        const importTextNodes = imports.filter(n => n.text === symbolName);
+        const importTextNodes = imports.filter((n) => n.text === symbolName);
         // insert import if it's not there
         if (importTextNodes.length === 0) {
             const fallbackPos = findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
@@ -55,8 +56,7 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
         return new change_1.NoopChange();
     }
     // no such import declaration exists
-    const useStrict = findNodes(rootNode, ts.isStringLiteral)
-        .filter((n) => n.text === 'use strict');
+    const useStrict = findNodes(rootNode, ts.isStringLiteral).filter((n) => n.text === 'use strict');
     let fallbackPos = 0;
     if (useStrict.length > 0) {
         fallbackPos = useStrict[0].end;
@@ -125,7 +125,7 @@ function findNode(node, kind, text) {
         return node;
     }
     let foundNode = null;
-    ts.forEachChild(node, childNode => {
+    ts.forEachChild(node, (childNode) => {
         foundNode = foundNode || findNode(childNode, kind, text);
     });
     return foundNode;
@@ -168,7 +168,7 @@ function insertAfterLastOccurrence(nodes, toInsert, file, fallbackPos, syntaxKin
     return new change_1.InsertChange(file, lastItemPosition, toInsert);
 }
 exports.insertAfterLastOccurrence = insertAfterLastOccurrence;
-function _angularImportsFromNode(node, _sourceFile) {
+function _angularImportsFromNode(node) {
     const ms = node.moduleSpecifier;
     let modulePath;
     switch (ms.kind) {
@@ -198,7 +198,7 @@ function _angularImportsFromNode(node, _sourceFile) {
                 // This is of the form `import {a,b,c} from 'path'`
                 const namedImports = nb;
                 return namedImports.elements
-                    .map((is) => is.propertyName ? is.propertyName.text : is.name.text)
+                    .map((is) => (is.propertyName ? is.propertyName.text : is.name.text))
                     .reduce((acc, curr) => {
                     acc[curr] = modulePath;
                     return acc;
@@ -214,7 +214,7 @@ function _angularImportsFromNode(node, _sourceFile) {
 }
 function getDecoratorMetadata(source, identifier, module) {
     const angularImports = findNodes(source, ts.isImportDeclaration)
-        .map((node) => _angularImportsFromNode(node, source))
+        .map((node) => _angularImportsFromNode(node))
         .reduce((acc, current) => {
         for (const key of Object.keys(current)) {
             acc[key] = current[key];
@@ -222,12 +222,12 @@ function getDecoratorMetadata(source, identifier, module) {
         return acc;
     }, {});
     return getSourceNodes(source)
-        .filter(node => {
-        return node.kind == ts.SyntaxKind.Decorator
-            && node.expression.kind == ts.SyntaxKind.CallExpression;
+        .filter((node) => {
+        return (node.kind == ts.SyntaxKind.Decorator &&
+            node.expression.kind == ts.SyntaxKind.CallExpression);
     })
-        .map(node => node.expression)
-        .filter(expr => {
+        .map((node) => node.expression)
+        .filter((expr) => {
         if (expr.expression.kind == ts.SyntaxKind.Identifier) {
             const id = expr.expression;
             return id.text == identifier && angularImports[id.text] === module;
@@ -241,28 +241,27 @@ function getDecoratorMetadata(source, identifier, module) {
             }
             const id = paExpr.name.text;
             const moduleId = paExpr.expression.text;
-            return id === identifier && (angularImports[moduleId + '.'] === module);
+            return id === identifier && angularImports[moduleId + '.'] === module;
         }
         return false;
     })
-        .filter(expr => expr.arguments[0]
-        && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)
-        .map(expr => expr.arguments[0]);
+        .filter((expr) => expr.arguments[0] && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)
+        .map((expr) => expr.arguments[0]);
 }
 exports.getDecoratorMetadata = getDecoratorMetadata;
 function getMetadataField(node, metadataField) {
-    return node.properties
+    return (node.properties
         .filter(ts.isPropertyAssignment)
         // Filter out every fields that's not "metadataField". Also handles string literals
         // (but not expressions).
         .filter(({ name }) => {
         return (ts.isIdentifier(name) || ts.isStringLiteral(name)) && name.text === metadataField;
-    });
+    }));
 }
 exports.getMetadataField = getMetadataField;
 function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbolName, importPath = null) {
     const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
-    let node = nodes[0]; // tslint:disable-line:no-any
+    let node = nodes[0]; // eslint-disable-line @typescript-eslint/no-explicit-any
     // Find the decorator declaration.
     if (!node) {
         return [];
@@ -285,8 +284,9 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
             const text = node.getFullText(source);
             const matches = text.match(/^(\r?\n)(\s*)/);
             if (matches) {
-                toInsert = `,${matches[0]}${metadataField}: [${matches[1]}` +
-                    `${core_1.tags.indentBy(matches[2].length + 2) `${symbolName}`}${matches[0]}]`;
+                toInsert =
+                    `,${matches[0]}${metadataField}: [${matches[1]}` +
+                        `${core_1.tags.indentBy(matches[2].length + 2) `${symbolName}`}${matches[0]}]`;
             }
             else {
                 toInsert = `, ${metadataField}: [${symbolName}]`;
@@ -317,7 +317,7 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
     }
     if (Array.isArray(node)) {
         const nodeArray = node;
-        const symbolsArray = nodeArray.map(node => core_1.tags.oneLine `${node.getText()}`);
+        const symbolsArray = nodeArray.map((node) => core_1.tags.oneLine `${node.getText()}`);
         if (symbolsArray.includes(core_1.tags.oneLine `${symbolName}`)) {
             return [];
         }
@@ -457,8 +457,8 @@ function getRouterModuleDeclaration(source) {
     }
     const arrLiteral = assignment.initializer;
     return arrLiteral.elements
-        .filter(el => el.kind === ts.SyntaxKind.CallExpression)
-        .find(el => el.getText().startsWith('RouterModule'));
+        .filter((el) => el.kind === ts.SyntaxKind.CallExpression)
+        .find((el) => el.getText().startsWith('RouterModule'));
 }
 exports.getRouterModuleDeclaration = getRouterModuleDeclaration;
 /**
@@ -472,8 +472,7 @@ function addRouteDeclarationToModule(source, fileToAdd, routeLiteral) {
     const scopeConfigMethodArgs = routerModuleExpr.arguments;
     if (!scopeConfigMethodArgs.length) {
         const { line } = source.getLineAndCharacterOfPosition(routerModuleExpr.getStart());
-        throw new Error(`The router module method doesn't have arguments ` +
-            `at line ${line} in ${fileToAdd}`);
+        throw new Error(`The router module method doesn't have arguments ` + `at line ${line} in ${fileToAdd}`);
     }
     let routesArr;
     const routesArg = scopeConfigMethodArgs[0];
@@ -486,9 +485,7 @@ function addRouteDeclarationToModule(source, fileToAdd, routeLiteral) {
         const routesVarName = routesArg.getText();
         let routesVar;
         if (routesArg.kind === ts.SyntaxKind.Identifier) {
-            routesVar = source.statements
-                .filter(ts.isVariableStatement)
-                .find((v) => {
+            routesVar = source.statements.filter(ts.isVariableStatement).find((v) => {
                 return v.declarationList.declarations[0].name.getText() === routesVarName;
             });
         }
@@ -505,14 +502,12 @@ function addRouteDeclarationToModule(source, fileToAdd, routeLiteral) {
     let insertPos = routesArr.elements.pos;
     if (occurrencesCount > 0) {
         const lastRouteLiteral = [...routesArr.elements].pop();
-        const lastRouteIsWildcard = ts.isObjectLiteralExpression(lastRouteLiteral)
-            && lastRouteLiteral
-                .properties
-                .some(n => (ts.isPropertyAssignment(n)
-                && ts.isIdentifier(n.name)
-                && n.name.text === 'path'
-                && ts.isStringLiteral(n.initializer)
-                && n.initializer.text === '**'));
+        const lastRouteIsWildcard = ts.isObjectLiteralExpression(lastRouteLiteral) &&
+            lastRouteLiteral.properties.some((n) => ts.isPropertyAssignment(n) &&
+                ts.isIdentifier(n.name) &&
+                n.name.text === 'path' &&
+                ts.isStringLiteral(n.initializer) &&
+                n.initializer.text === '**');
         const indentation = text.match(/\r?\n(\r?)\s*/) || [];
         const routeText = `${indentation[0] || ' '}${routeLiteral}`;
         // Add the new route before the wildcard route

package/utility/change.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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

package/utility/change.js

@@ -1,4 +1,11 @@
 "use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyToUpdateRecorder = exports.ReplaceChange = exports.RemoveChange = exports.InsertChange = exports.NoopChange = void 0;
 /**
@@ -10,7 +17,9 @@ class NoopChange {
         this.order = Infinity;
         this.path = null;
     }
-    apply() { return Promise.resolve(); }
+    apply() {
+        return Promise.resolve();
+    }
 }
 exports.NoopChange = NoopChange;
 /**
@@ -31,7 +40,7 @@ class InsertChange {
      * This method does not insert spaces if there is none in the original string.
      */
     apply(host) {
-        return host.read(this.path).then(content => {
+        return host.read(this.path).then((content) => {
             const prefix = content.substring(0, this.pos);
             const suffix = content.substring(this.pos);
             return host.write(this.path, `${prefix}${this.toAdd}${suffix}`);
@@ -54,7 +63,7 @@ class RemoveChange {
         this.order = pos;
     }
     apply(host) {
-        return host.read(this.path).then(content => {
+        return host.read(this.path).then((content) => {
             const prefix = content.substring(0, this.pos);
             const suffix = content.substring(this.pos + this.toRemove.length);
             // TODO: throw error if toRemove doesn't match removed string.
@@ -79,7 +88,7 @@ class ReplaceChange {
         this.order = pos;
     }
     apply(host) {
-        return host.read(this.path).then(content => {
+        return host.read(this.path).then((content) => {
             const prefix = content.substring(0, this.pos);
             const suffix = content.substring(this.pos + this.oldText.length);
             const text = content.substring(this.pos, this.pos + this.oldText.length);

package/utility/dependencies.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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

package/utility/dependencies.js

@@ -1,4 +1,11 @@
 "use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackageJsonDependency = exports.removePackageJsonDependency = exports.addPackageJsonDependency = exports.NodeDependencyType = void 0;
 const json_file_1 = require("./json-file");

package/utility/find-module.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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

package/utility/find-module.js

@@ -1,13 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRelativePath = exports.findModule = exports.findModuleFromOptions = exports.ROUTING_MODULE_EXT = exports.MODULE_EXT = void 0;
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC 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
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildRelativePath = exports.findModule = exports.findModuleFromOptions = exports.ROUTING_MODULE_EXT = exports.MODULE_EXT = void 0;
 const core_1 = require("@angular-devkit/core");
 exports.MODULE_EXT = '.module.ts';
 exports.ROUTING_MODULE_EXT = '-routing.module.ts';
@@ -15,6 +15,7 @@ exports.ROUTING_MODULE_EXT = '-routing.module.ts';
  * Find the module referred by a set of options passed to the schematics.
  */
 function findModuleFromOptions(host, options) {
+    // eslint-disable-next-line no-prototype-builtins
     if (options.hasOwnProperty('skipImport') && options.skipImport) {
         return undefined;
     }
@@ -28,9 +29,7 @@ function findModuleFromOptions(host, options) {
         const modulePath = core_1.normalize(`/${options.path}/${options.module}`);
         const componentPath = core_1.normalize(`/${options.path}/${options.name}`);
         const moduleBaseName = core_1.normalize(modulePath).split('/').pop();
-        const candidateSet = new Set([
-            core_1.normalize(options.path || '/'),
-        ]);
+        const candidateSet = new Set([core_1.normalize(options.path || '/')]);
         for (let dir = modulePath; dir != core_1.NormalizedRoot; dir = core_1.dirname(dir)) {
             candidateSet.add(dir);
         }
@@ -43,15 +42,15 @@ function findModuleFromOptions(host, options) {
                 '',
                 `${moduleBaseName}.ts`,
                 `${moduleBaseName}${moduleExt}`,
-            ].map(x => core_1.join(c, x));
+            ].map((x) => core_1.join(c, x));
             for (const sc of candidateFiles) {
                 if (host.exists(sc)) {
                     return core_1.normalize(sc);
                 }
             }
         }
-        throw new Error(`Specified module '${options.module}' does not exist.\n`
-            + `Looked in the following directories:\n    ${candidatesDirs.join('\n    ')}`);
+        throw new Error(`Specified module '${options.module}' does not exist.\n` +
+            `Looked in the following directories:\n    ${candidatesDirs.join('\n    ')}`);
     }
 }
 exports.findModuleFromOptions = findModuleFromOptions;
@@ -62,8 +61,8 @@ function findModule(host, generateDir, moduleExt = exports.MODULE_EXT, routingMo
     let dir = host.getDir('/' + generateDir);
     let foundRoutingModule = false;
     while (dir) {
-        const allMatches = dir.subfiles.filter(p => p.endsWith(moduleExt));
-        const filteredMatches = allMatches.filter(p => !p.endsWith(routingModuleExt));
+        const allMatches = dir.subfiles.filter((p) => p.endsWith(moduleExt));
+        const filteredMatches = allMatches.filter((p) => !p.endsWith(routingModuleExt));
         foundRoutingModule = foundRoutingModule || allMatches.length !== filteredMatches.length;
         if (filteredMatches.length == 1) {
             return core_1.join(dir.path, filteredMatches[0]);
@@ -74,9 +73,10 @@ function findModule(host, generateDir, moduleExt = exports.MODULE_EXT, routingMo
         }
         dir = dir.parent;
     }
-    const errorMsg = foundRoutingModule ? 'Could not find a non Routing NgModule.'
-        + `\nModules with suffix '${routingModuleExt}' are strictly reserved for routing.`
-        + '\nUse the skip-import option to skip importing in NgModule.'
+    const errorMsg = foundRoutingModule
+        ? 'Could not find a non Routing NgModule.' +
+            `\nModules with suffix '${routingModuleExt}' are strictly reserved for routing.` +
+            '\nUse the skip-import option to skip importing in NgModule.'
         : 'Could not find an NgModule. Use the skip-import option to skip importing in NgModule.';
     throw new Error(errorMsg);
 }