@schematics/angular 14.0.0-next.1 → 14.0.0-next.12

package/universal/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -33,6 +37,7 @@ const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/
 const ast_utils_1 = require("../utility/ast-utils");
 const change_1 = require("../utility/change");
 const dependencies_1 = require("../utility/dependencies");
+const latest_versions_1 = require("../utility/latest-versions");
 const ng_ast_utils_1 = require("../utility/ng-ast-utils");
 const paths_1 = require("../utility/paths");
 const project_targets_1 = require("../utility/project-targets");
@@ -91,11 +96,7 @@ function updateConfigFile(options, tsConfigDirectory) {
     });
 }
 function findBrowserModuleImport(host, modulePath) {
-    const moduleBuffer = host.read(modulePath);
-    if (!moduleBuffer) {
-        throw new schematics_1.SchematicsException(`Module file (${modulePath}) not found`);
-    }
-    const moduleFileText = moduleBuffer.toString('utf-8');
+    const moduleFileText = host.readText(modulePath);
     const source = ts.createSourceFile(modulePath, moduleFileText, ts.ScriptTarget.Latest, true);
     const decoratorMetadata = (0, ast_utils_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core')[0];
     const browserModuleNode = (0, ast_utils_1.findNode)(decoratorMetadata, ts.SyntaxKind.Identifier, 'BrowserModule');
@@ -194,7 +195,11 @@ function addDependencies() {
             name: '@angular/platform-server',
         };
         (0, dependencies_1.addPackageJsonDependency)(host, platformServerDep);
-        return host;
+        (0, dependencies_1.addPackageJsonDependency)(host, {
+            type: dependencies_1.NodeDependencyType.Dev,
+            name: '@types/node',
+            version: latest_versions_1.latestVersions['@types/node'],
+        });
     };
 }
 function default_1(options) {
@@ -221,7 +226,7 @@ function default_1(options) {
         }
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files/src'), [
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 ...options,
                 stripTsExtension: (s) => s.replace(/\.ts$/, ''),
                 hasLocalizePackage: !!(0, dependencies_1.getPackageJsonDependency)(host, '@angular/localize'),
@@ -230,7 +235,7 @@ function default_1(options) {
         ]);
         const rootSource = (0, schematics_1.apply)((0, schematics_1.url)('./files/root'), [
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 ...options,
                 stripTsExtension: (s) => s.replace(/\.ts$/, ''),
                 tsConfigExtends,

package/universal/schema.d.ts

@@ -7,7 +7,7 @@ export interface Schema {
      */
     appDir?: string;
     /**
-     * The app identifier to use for transition.
+     * The application identifier to use for transition.
      */
     appId?: string;
     /**

package/universal/schema.json

@@ -16,7 +16,7 @@
     "appId": {
       "type": "string",
       "format": "html-selector",
-      "description": "The app identifier to use for transition.",
+      "description": "The application identifier to use for transition.",
       "default": "serverApp"
     },
     "main": {

package/utility/ast-utils.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -140,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;
@@ -280,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 =
@@ -323,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}`}`;
@@ -466,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;
@@ -486,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.d.ts

@@ -15,6 +15,7 @@ export interface ModuleOptions {
     skipImport?: boolean;
     moduleExt?: string;
     routingModuleExt?: string;
+    standalone?: boolean;
 }
 export declare const MODULE_EXT = ".module.ts";
 export declare const ROUTING_MODULE_EXT = "-routing.module.ts";

package/utility/find-module.js

@@ -15,8 +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) {
+    if (options.standalone || options.skipImport) {
         return undefined;
     }
     const moduleExt = options.moduleExt || exports.MODULE_EXT;
@@ -38,11 +37,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 +63,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 +71,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;

package/utility/generate-from-files.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateFromFiles = void 0;
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const parse_name_1 = require("./parse-name");
 const workspace_1 = require("./workspace");
@@ -24,11 +23,11 @@ function generateFromFiles(options, extraTemplateValues = {}) {
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
             options.skipTests ? (0, schematics_1.filter)((path) => !path.endsWith('.spec.ts.template')) : (0, schematics_1.noop)(),
             (0, schematics_1.applyTemplates)({
-                ...core_1.strings,
+                ...schematics_1.strings,
                 ...options,
                 ...extraTemplateValues,
             }),
-            (0, schematics_1.move)(parsedPath.path + (options.flat ? '' : '/' + core_1.strings.dasherize(options.name))),
+            (0, schematics_1.move)(parsedPath.path + (options.flat ? '' : '/' + schematics_1.strings.dasherize(options.name))),
         ]);
         return (0, schematics_1.chain)([(0, schematics_1.mergeWith)(templateSource)]);
     };

package/utility/json-file.js

@@ -14,13 +14,7 @@ class JSONFile {
     constructor(host, path) {
         this.host = host;
         this.path = path;
-        const buffer = this.host.read(this.path);
-        if (buffer) {
-            this.content = buffer.toString();
-        }
-        else {
-            throw new Error(`Could not read '${path}'.`);
-        }
+        this.content = this.host.readText(this.path);
     }
     get JsonAst() {
         if (this._jsonAst) {

package/utility/latest-versions/package.json

@@ -3,18 +3,18 @@
   "comment": "This file is needed so that depedencies are synced by Renovate.",
   "private": true,
   "dependencies": {
-    "@types/jasmine": "~3.10.0",
-    "@types/node": "^12.11.1",
-    "jasmine-core": "~4.0.0",
+    "@types/jasmine": "~4.0.0",
+    "@types/node": "^14.15.0",
+    "jasmine-core": "~4.1.0",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage": "~2.1.0",
+    "karma-coverage": "~2.2.0",
     "karma-jasmine-html-reporter": "~1.7.0",
-    "karma-jasmine": "~4.0.0",
+    "karma-jasmine": "~5.0.0",
     "karma": "~6.3.0",
-    "ng-packagr": "^13.0.0",
+    "ng-packagr": "^14.0.0-next.2",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.0",
-    "typescript": "~4.5.2",
+    "typescript": "~4.6.2",
     "zone.js": "~0.11.4"
   }
 }

package/utility/ng-ast-utils.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -33,11 +37,7 @@ const path_1 = require("path");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
 function findBootstrapModuleCall(host, mainPath) {
-    const mainBuffer = host.read(mainPath);
-    if (!mainBuffer) {
-        throw new schematics_1.SchematicsException(`Main file (${mainPath}) not found`);
-    }
-    const mainText = mainBuffer.toString('utf-8');
+    const mainText = host.readText(mainPath);
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
     const allNodes = (0, ast_utils_1.getSourceNodes)(source);
     let bootstrapCall = null;
@@ -66,11 +66,7 @@ function findBootstrapModulePath(host, mainPath) {
         throw new schematics_1.SchematicsException('Bootstrap call not found');
     }
     const bootstrapModule = bootstrapCall.arguments[0];
-    const mainBuffer = host.read(mainPath);
-    if (!mainBuffer) {
-        throw new schematics_1.SchematicsException(`Client app main file (${mainPath}) not found`);
-    }
-    const mainText = mainBuffer.toString('utf-8');
+    const mainText = host.readText(mainPath);
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
     const allNodes = (0, ast_utils_1.getSourceNodes)(source);
     const bootstrapModuleRelativePath = allNodes

package/utility/parse-name.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseName = void 0;
-// import { relative, Path } from "../../../angular_devkit/core/src/virtual-fs";
 const core_1 = require("@angular-devkit/core");
 function parseName(path, name) {
     const nameWithoutPath = (0, core_1.basename)((0, core_1.normalize)(name));

package/utility/test/index.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/utility/validation.js

@@ -8,15 +8,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateHtmlSelector = exports.htmlSelectorRe = void 0;
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 // Must start with a letter, and must contain only alphanumeric characters or dashes.
 // When adding a dash the segment after the dash must also start with a letter.
 exports.htmlSelectorRe = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
 function validateHtmlSelector(selector) {
     if (selector && !exports.htmlSelectorRe.test(selector)) {
-        throw new schematics_1.SchematicsException(core_1.tags.oneLine `Selector (${selector})
-        is invalid.`);
+        throw new schematics_1.SchematicsException(`Selector (${selector}) is invalid.`);
     }
 }
 exports.validateHtmlSelector = validateHtmlSelector;

package/utility/workspace-models.d.ts

@@ -110,12 +110,15 @@ export declare type TestBuilderTarget = BuilderTarget<Builders.Karma, TestBuilde
 export declare type ServeBuilderTarget = BuilderTarget<Builders.DevServer, ServeBuilderOptions>;
 export declare type ExtractI18nBuilderTarget = BuilderTarget<Builders.ExtractI18n, ExtractI18nOptions>;
 export declare type E2EBuilderTarget = BuilderTarget<Builders.Protractor, E2EOptions>;
+interface WorkspaceCLISchema {
+    warnings?: Record<string, boolean>;
+    schematicCollections?: string[];
+    defaultCollection?: string;
+}
 export interface WorkspaceSchema {
     version: 1;
     defaultProject?: string;
-    cli?: {
-        warnings?: Record<string, boolean>;
-    };
+    cli?: WorkspaceCLISchema;
     projects: {
         [key: string]: WorkspaceProject<ProjectType.Application | ProjectType.Library>;
     };
@@ -128,9 +131,7 @@ export interface WorkspaceProject<TProjectType extends ProjectType = ProjectType
     root: string;
     sourceRoot: string;
     prefix: string;
-    cli?: {
-        warnings?: Record<string, boolean>;
-    };
+    cli?: WorkspaceCLISchema;
     /**
      * Tool options.
      */
@@ -150,3 +151,4 @@ export interface WorkspaceTargets<TProjectType extends ProjectType = ProjectType
     'extract-i18n'?: ExtractI18nBuilderTarget;
     [key: string]: any;
 }
+export {};

package/utility/workspace.js

@@ -14,11 +14,7 @@ const workspace_models_1 = require("./workspace-models");
 function createHost(tree) {
     return {
         async readFile(path) {
-            const data = tree.read(path);
-            if (!data) {
-                throw new Error('File not found.');
-            }
-            return core_1.virtualFs.fileBufferToString(data);
+            return tree.readText(path);
         },
         async writeFile(path, data) {
             return tree.overwrite(path, data);

package/web-worker/index.js

@@ -46,7 +46,7 @@ function addSnippet(options) {
       }
     `;
         // Append the worker creation snippet.
-        const originalContent = host.read(siblingModulePath);
+        const originalContent = host.readText(siblingModulePath);
         host.overwrite(siblingModulePath, originalContent + '\n' + workerCreationSnippet);
         return host;
     };
@@ -72,7 +72,7 @@ function default_1(options) {
         options.name = parsedPath.name;
         options.path = parsedPath.path;
         const templateSourceWorkerCode = (0, schematics_1.apply)((0, schematics_1.url)('./files/worker'), [
-            (0, schematics_1.applyTemplates)({ ...options, ...core_1.strings }),
+            (0, schematics_1.applyTemplates)({ ...options, ...schematics_1.strings }),
             (0, schematics_1.move)(parsedPath.path),
         ]);
         const root = project.root || '';

package/workspace/files/README.md.template

@@ -4,7 +4,7 @@ This project was generated with [Angular CLI](https://github.com/angular/angular
 
 ## Development server
 
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The application will automatically reload if you change any of the source files.
 
 ## Code scaffolding
 

package/workspace/files/package.json.template

@@ -25,8 +25,7 @@
   "devDependencies": {
     "@angular/cli": "<%= '~' + version %>",
     "@angular/compiler-cli": "<%= latestVersions.Angular %>",<% if (!minimal) { %>
-    "@types/jasmine": "<%= latestVersions['@types/jasmine'] %>",<% } %>
-    "@types/node": "<%= latestVersions['@types/node'] %>",<% if (!minimal) { %>
+    "@types/jasmine": "<%= latestVersions['@types/jasmine'] %>",
     "jasmine-core": "<%= latestVersions['jasmine-core'] %>",
     "karma": "<%= latestVersions['karma'] %>",
     "karma-chrome-launcher": "<%= latestVersions['karma-chrome-launcher'] %>",

package/workspace/index.js

@@ -7,14 +7,13 @@
  * 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 latest_versions_1 = require("../utility/latest-versions");
 function default_1(options) {
     return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
         options.minimal ? (0, schematics_1.filter)((path) => !path.endsWith('editorconfig.template')) : (0, schematics_1.noop)(),
         (0, schematics_1.applyTemplates)({
-            utils: core_1.strings,
+            utils: schematics_1.strings,
             ...options,
             'dot': '.',
             latestVersions: latest_versions_1.latestVersions,