@schematics/angular 14.0.0-next.7 → 14.0.0-next.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.0.0-next.7",
+  "version": "14.0.0-next.8",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -15,8 +15,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.0.0-next.7",
-    "@angular-devkit/schematics": "14.0.0-next.7",
+    "@angular-devkit/core": "14.0.0-next.8",
+    "@angular-devkit/schematics": "14.0.0-next.8",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

package/utility/ast-utils.js

@@ -144,7 +144,6 @@ function getSourceNodes(sourceFile) {
 exports.getSourceNodes = getSourceNodes;
 function findNode(node, kind, text) {
     if (node.kind === kind && node.getText() === text) {
-        // throw new Error(node.getText());
         return node;
     }
     let foundNode = null;
@@ -284,27 +283,26 @@ function getMetadataField(node, metadataField) {
 exports.getMetadataField = getMetadataField;
 function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbolName, importPath = null) {
     const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
-    let node = nodes[0]; // eslint-disable-line @typescript-eslint/no-explicit-any
+    const node = nodes[0];
     // Find the decorator declaration.
-    if (!node) {
+    if (!node || !ts.isObjectLiteralExpression(node)) {
         return [];
     }
     // Get all the children property assignment of object literals.
     const matchingProperties = getMetadataField(node, metadataField);
     if (matchingProperties.length == 0) {
         // We haven't found the field in the metadata declaration. Insert a new field.
-        const expr = node;
         let position;
         let toInsert;
-        if (expr.properties.length == 0) {
-            position = expr.getEnd() - 1;
+        if (node.properties.length == 0) {
+            position = node.getEnd() - 1;
             toInsert = `\n  ${metadataField}: [\n${core_1.tags.indentBy(4) `${symbolName}`}\n  ]\n`;
         }
         else {
-            node = expr.properties[expr.properties.length - 1];
-            position = node.getEnd();
+            const childNode = node.properties[node.properties.length - 1];
+            position = childNode.getEnd();
             // Get the indentation of the last element, if any.
-            const text = node.getFullText(source);
+            const text = childNode.getFullText(source);
             const matches = text.match(/^(\r?\n)(\s*)/);
             if (matches) {
                 toInsert =
@@ -327,35 +325,33 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
     }
     const assignment = matchingProperties[0];
     // If it's not an array, nothing we can do really.
-    if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {
+    if (!ts.isPropertyAssignment(assignment) ||
+        !ts.isArrayLiteralExpression(assignment.initializer)) {
         return [];
     }
-    const arrLiteral = assignment.initializer;
-    if (arrLiteral.elements.length == 0) {
-        // Forward the property.
-        node = arrLiteral;
-    }
-    else {
-        node = arrLiteral.elements;
-    }
-    if (Array.isArray(node)) {
-        const nodeArray = node;
-        const symbolsArray = nodeArray.map((node) => core_1.tags.oneLine `${node.getText()}`);
+    let expresssion;
+    const assignmentInit = assignment.initializer;
+    const elements = assignmentInit.elements;
+    if (elements.length) {
+        const symbolsArray = elements.map((node) => core_1.tags.oneLine `${node.getText()}`);
         if (symbolsArray.includes(core_1.tags.oneLine `${symbolName}`)) {
             return [];
         }
-        node = node[node.length - 1];
+        expresssion = elements[elements.length - 1];
+    }
+    else {
+        expresssion = assignmentInit;
     }
     let toInsert;
-    let position = node.getEnd();
-    if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {
+    let position = expresssion.getEnd();
+    if (ts.isArrayLiteralExpression(expresssion)) {
         // We found the field but it's empty. Insert it just before the `]`.
         position--;
         toInsert = `\n${core_1.tags.indentBy(4) `${symbolName}`}\n  `;
     }
     else {
         // Get the indentation of the last element, if any.
-        const text = node.getFullText(source);
+        const text = expresssion.getFullText(source);
         const matches = text.match(/^(\r?\n)(\s*)/);
         if (matches) {
             toInsert = `,${matches[1]}${core_1.tags.indentBy(matches[2].length) `${symbolName}`}`;
@@ -470,6 +466,9 @@ exports.getEnvironmentExportName = getEnvironmentExportName;
 function getRouterModuleDeclaration(source) {
     const result = getDecoratorMetadata(source, 'NgModule', '@angular/core');
     const node = result[0];
+    if (!node || !ts.isObjectLiteralExpression(node)) {
+        return undefined;
+    }
     const matchingProperties = getMetadataField(node, 'imports');
     if (!matchingProperties) {
         return;
@@ -490,7 +489,8 @@ exports.getRouterModuleDeclaration = getRouterModuleDeclaration;
 function addRouteDeclarationToModule(source, fileToAdd, routeLiteral) {
     const routerModuleExpr = getRouterModuleDeclaration(source);
     if (!routerModuleExpr) {
-        throw new Error(`Couldn't find a route declaration in ${fileToAdd}.`);
+        throw new Error(`Couldn't find a route declaration in ${fileToAdd}.\n` +
+            `Use the '--module' option to specify a different routing module.`);
     }
     const scopeConfigMethodArgs = routerModuleExpr.arguments;
     if (!scopeConfigMethodArgs.length) {

package/utility/find-module.js

@@ -38,11 +38,7 @@ function findModuleFromOptions(host, options) {
         }
         const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
         for (const c of candidatesDirs) {
-            const candidateFiles = [
-                '',
-                `${moduleBaseName}.ts`,
-                `${moduleBaseName}${moduleExt}`,
-            ].map((x) => (0, core_1.join)(c, x));
+            const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map((x) => (0, core_1.join)(c, x));
             for (const sc of candidateFiles) {
                 if (host.exists(sc)) {
                     return (0, core_1.normalize)(sc);
@@ -68,7 +64,7 @@ function findModule(host, generateDir, moduleExt = exports.MODULE_EXT, routingMo
             return (0, core_1.join)(dir.path, filteredMatches[0]);
         }
         else if (filteredMatches.length > 1) {
-            throw new Error('More than one module matches. Use the skip-import option to skip importing ' +
+            throw new Error(`More than one module matches. Use the '--skip-import' option to skip importing ` +
                 'the component into the closest module or use the module option to specify a module.');
         }
         dir = dir.parent;
@@ -76,8 +72,8 @@ function findModule(host, generateDir, moduleExt = exports.MODULE_EXT, routingMo
     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.';
+            `\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);
 }
 exports.findModule = findModule;