@schematics/angular 14.0.0-rc.0 → 14.0.0-rc.3

package/app-shell/schema.json

@@ -27,19 +27,16 @@
     },
     "main": {
       "type": "string",
-      "format": "path",
       "description": "The name of the main entry-point file.",
       "default": "main.server.ts"
     },
     "appDir": {
       "type": "string",
-      "format": "path",
       "description": "The name of the application directory.",
       "default": "app"
     },
     "rootModuleFileName": {
       "type": "string",
-      "format": "path",
       "description": "The name of the root module file",
       "default": "app.server.module.ts"
     },

package/class/schema.json

@@ -18,6 +18,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the class, relative to the workspace root.",
       "visible": false
     },

package/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template

@@ -1,4 +1,4 @@
-import { Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';<% if(standalone) {%>
+import { <% if(changeDetection !== 'Default') { %>ChangeDetectionStrategy, <% }%>Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } from '@angular/core';<% if(standalone) {%>
 import { CommonModule } from '@angular/common';<% } %>
 
 @Component({<% if(!skipSelector) {%>

package/component/schema.json

@@ -9,6 +9,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the component file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
       "visible": false
     },

package/directive/schema.json

@@ -18,6 +18,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the interface that defines the directive, relative to the workspace root.",
       "visible": false
     },

package/enum/schema.json

@@ -18,6 +18,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the enum definition, relative to the current workspace.",
       "visible": false
     },

package/guard/schema.json

@@ -29,6 +29,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the interface that defines the guard, relative to the current workspace.",
       "visible": false
     },

package/interceptor/schema.json

@@ -18,6 +18,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the interceptor, relative to the workspace root.",
       "visible": false
     },

package/interface/schema.json

@@ -18,6 +18,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the interface, relative to the workspace root.",
       "visible": false
     },

package/module/schema.json

@@ -18,6 +18,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the NgModule, relative to the workspace root.",
       "visible": false
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "14.0.0-rc.0",
+  "version": "14.0.0-rc.3",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -18,12 +18,13 @@
     "./utility": "./utility/index.js",
     "./utility/*": "./utility/*.js",
     "./migrations/migration-collection.json": "./migrations/migration-collection.json",
-    "./*": "./*.js"
+    "./*": "./*.js",
+    "./private/components": "./private/components.js"
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.0.0-rc.0",
-    "@angular-devkit/schematics": "14.0.0-rc.0",
+    "@angular-devkit/core": "14.0.0-rc.3",
+    "@angular-devkit/schematics": "14.0.0-rc.3",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

package/pipe/schema.json

@@ -18,6 +18,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the pipe, relative to the workspace root.",
       "visible": false
     },

package/private/components.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @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
+ */
+export { addModuleImportToStandaloneBootstrap, findBootstrapApplicationCall, importsProvidersFrom, } from './standalone';

package/private/components.js

@@ -0,0 +1,14 @@
+"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.importsProvidersFrom = exports.findBootstrapApplicationCall = exports.addModuleImportToStandaloneBootstrap = void 0;
+var standalone_1 = require("./standalone");
+Object.defineProperty(exports, "addModuleImportToStandaloneBootstrap", { enumerable: true, get: function () { return standalone_1.addModuleImportToStandaloneBootstrap; } });
+Object.defineProperty(exports, "findBootstrapApplicationCall", { enumerable: true, get: function () { return standalone_1.findBootstrapApplicationCall; } });
+Object.defineProperty(exports, "importsProvidersFrom", { enumerable: true, get: function () { return standalone_1.importsProvidersFrom; } });

package/private/standalone.d.ts

@@ -0,0 +1,26 @@
+/**
+ * @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 { Tree } from '@angular-devkit/schematics';
+import ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
+/**
+ * Checks whether the providers from a module are being imported in a `bootstrapApplication` call.
+ * @param tree File tree of the project.
+ * @param filePath Path of the file in which to check.
+ * @param className Class name of the module to search for.
+ */
+export declare function importsProvidersFrom(tree: Tree, filePath: string, className: string): boolean;
+/**
+ * Adds an `importProvidersFrom` call to the `bootstrapApplication` call.
+ * @param tree File tree of the project.
+ * @param filePath Path to the file that should be updated.
+ * @param moduleName Name of the module that should be imported.
+ * @param modulePath Path from which to import the module.
+ */
+export declare function addModuleImportToStandaloneBootstrap(tree: Tree, filePath: string, moduleName: string, modulePath: string): void;
+/** Finds the call to `bootstrapApplication` within a file. */
+export declare function findBootstrapApplicationCall(sourceFile: ts.SourceFile): ts.CallExpression | null;

package/private/standalone.js

@@ -0,0 +1,193 @@
+"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
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findBootstrapApplicationCall = exports.addModuleImportToStandaloneBootstrap = exports.importsProvidersFrom = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const typescript_1 = __importDefault(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const ast_utils_1 = require("../utility/ast-utils");
+const change_1 = require("../utility/change");
+/**
+ * Checks whether the providers from a module are being imported in a `bootstrapApplication` call.
+ * @param tree File tree of the project.
+ * @param filePath Path of the file in which to check.
+ * @param className Class name of the module to search for.
+ */
+function importsProvidersFrom(tree, filePath, className) {
+    const sourceFile = typescript_1.default.createSourceFile(filePath, tree.readText(filePath), typescript_1.default.ScriptTarget.Latest, true);
+    const bootstrapCall = findBootstrapApplicationCall(sourceFile);
+    const importProvidersFromCall = bootstrapCall ? findImportProvidersFromCall(bootstrapCall) : null;
+    return (!!importProvidersFromCall &&
+        importProvidersFromCall.arguments.some((arg) => typescript_1.default.isIdentifier(arg) && arg.text === className));
+}
+exports.importsProvidersFrom = importsProvidersFrom;
+/**
+ * Adds an `importProvidersFrom` call to the `bootstrapApplication` call.
+ * @param tree File tree of the project.
+ * @param filePath Path to the file that should be updated.
+ * @param moduleName Name of the module that should be imported.
+ * @param modulePath Path from which to import the module.
+ */
+function addModuleImportToStandaloneBootstrap(tree, filePath, moduleName, modulePath) {
+    const sourceFile = typescript_1.default.createSourceFile(filePath, tree.readText(filePath), typescript_1.default.ScriptTarget.Latest, true);
+    const bootstrapCall = findBootstrapApplicationCall(sourceFile);
+    if (!bootstrapCall) {
+        throw new schematics_1.SchematicsException(`Could not find bootstrapApplication call in ${filePath}`);
+    }
+    const recorder = tree.beginUpdate(filePath);
+    const importCall = findImportProvidersFromCall(bootstrapCall);
+    const printer = typescript_1.default.createPrinter();
+    const sourceText = sourceFile.getText();
+    // Add imports to the module being added and `importProvidersFrom`. We don't
+    // have to worry about duplicates, because `insertImport` handles them.
+    [
+        (0, ast_utils_1.insertImport)(sourceFile, sourceText, moduleName, modulePath),
+        (0, ast_utils_1.insertImport)(sourceFile, sourceText, 'importProvidersFrom', '@angular/core'),
+    ].forEach((change) => {
+        if (change instanceof change_1.InsertChange) {
+            recorder.insertLeft(change.pos, change.toAdd);
+        }
+    });
+    // If there is an `importProvidersFrom` call already, reuse it.
+    if (importCall) {
+        recorder.insertRight(importCall.arguments[importCall.arguments.length - 1].getEnd(), `, ${moduleName}`);
+    }
+    else if (bootstrapCall.arguments.length === 1) {
+        // Otherwise if there is no options parameter to `bootstrapApplication`,
+        // create an object literal with a `providers` array and the import.
+        const newCall = typescript_1.default.factory.updateCallExpression(bootstrapCall, bootstrapCall.expression, bootstrapCall.typeArguments, [
+            ...bootstrapCall.arguments,
+            typescript_1.default.factory.createObjectLiteralExpression([createProvidersAssignment(moduleName)], true),
+        ]);
+        recorder.remove(bootstrapCall.getStart(), bootstrapCall.getWidth());
+        recorder.insertRight(bootstrapCall.getStart(), printer.printNode(typescript_1.default.EmitHint.Unspecified, newCall, sourceFile));
+    }
+    else {
+        const providersLiteral = findProvidersLiteral(bootstrapCall);
+        if (providersLiteral) {
+            // If there's a `providers` array, add the import to it.
+            const newProvidersLiteral = typescript_1.default.factory.updateArrayLiteralExpression(providersLiteral, [
+                ...providersLiteral.elements,
+                createImportProvidersFromCall(moduleName),
+            ]);
+            recorder.remove(providersLiteral.getStart(), providersLiteral.getWidth());
+            recorder.insertRight(providersLiteral.getStart(), printer.printNode(typescript_1.default.EmitHint.Unspecified, newProvidersLiteral, sourceFile));
+        }
+        else {
+            // Otherwise add a `providers` array to the existing object literal.
+            const optionsLiteral = bootstrapCall.arguments[1];
+            const newOptionsLiteral = typescript_1.default.factory.updateObjectLiteralExpression(optionsLiteral, [
+                ...optionsLiteral.properties,
+                createProvidersAssignment(moduleName),
+            ]);
+            recorder.remove(optionsLiteral.getStart(), optionsLiteral.getWidth());
+            recorder.insertRight(optionsLiteral.getStart(), printer.printNode(typescript_1.default.EmitHint.Unspecified, newOptionsLiteral, sourceFile));
+        }
+    }
+    tree.commitUpdate(recorder);
+}
+exports.addModuleImportToStandaloneBootstrap = addModuleImportToStandaloneBootstrap;
+/** Finds the call to `bootstrapApplication` within a file. */
+function findBootstrapApplicationCall(sourceFile) {
+    const localName = findImportLocalName(sourceFile, 'bootstrapApplication', '@angular/platform-browser');
+    return localName ? findCall(sourceFile, localName) : null;
+}
+exports.findBootstrapApplicationCall = findBootstrapApplicationCall;
+/** Find a call to `importProvidersFrom` within a `bootstrapApplication` call. */
+function findImportProvidersFromCall(bootstrapCall) {
+    const providersLiteral = findProvidersLiteral(bootstrapCall);
+    const importProvidersName = findImportLocalName(bootstrapCall.getSourceFile(), 'importProvidersFrom', '@angular/core');
+    if (providersLiteral && importProvidersName) {
+        for (const element of providersLiteral.elements) {
+            // Look for an array element that calls the `importProvidersFrom` function.
+            if (typescript_1.default.isCallExpression(element) &&
+                typescript_1.default.isIdentifier(element.expression) &&
+                element.expression.text === importProvidersName) {
+                return element;
+            }
+        }
+    }
+    return null;
+}
+/** Finds the `providers` array literal within a `bootstrapApplication` call. */
+function findProvidersLiteral(bootstrapCall) {
+    // The imports have to be in the second argument of
+    // the function which has to be an object literal.
+    if (bootstrapCall.arguments.length > 1 &&
+        typescript_1.default.isObjectLiteralExpression(bootstrapCall.arguments[1])) {
+        for (const prop of bootstrapCall.arguments[1].properties) {
+            if (typescript_1.default.isPropertyAssignment(prop) &&
+                typescript_1.default.isIdentifier(prop.name) &&
+                prop.name.text === 'providers' &&
+                typescript_1.default.isArrayLiteralExpression(prop.initializer)) {
+                return prop.initializer;
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Finds the local name of an imported symbol. Could be the symbol name itself or its alias.
+ * @param sourceFile File within which to search for the import.
+ * @param name Actual name of the import, not its local alias.
+ * @param moduleName Name of the module from which the symbol is imported.
+ */
+function findImportLocalName(sourceFile, name, moduleName) {
+    for (const node of sourceFile.statements) {
+        // Only look for top-level imports.
+        if (!typescript_1.default.isImportDeclaration(node) ||
+            !typescript_1.default.isStringLiteral(node.moduleSpecifier) ||
+            node.moduleSpecifier.text !== moduleName) {
+            continue;
+        }
+        // Filter out imports that don't have the right shape.
+        if (!node.importClause ||
+            !node.importClause.namedBindings ||
+            !typescript_1.default.isNamedImports(node.importClause.namedBindings)) {
+            continue;
+        }
+        // Look through the elements of the declaration for the specific import.
+        for (const element of node.importClause.namedBindings.elements) {
+            if ((element.propertyName || element.name).text === name) {
+                // The local name is always in `name`.
+                return element.name.text;
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Finds a call to a function with a specific name.
+ * @param rootNode Node from which to start searching.
+ * @param name Name of the function to search for.
+ */
+function findCall(rootNode, name) {
+    let result = null;
+    rootNode.forEachChild(function walk(node) {
+        if (typescript_1.default.isCallExpression(node) &&
+            typescript_1.default.isIdentifier(node.expression) &&
+            node.expression.text === name) {
+            result = node;
+        }
+        if (!result) {
+            node.forEachChild(walk);
+        }
+    });
+    return result;
+}
+/** Creates an `importProvidersFrom({{moduleName}})` call. */
+function createImportProvidersFromCall(moduleName) {
+    return typescript_1.default.factory.createCallChain(typescript_1.default.factory.createIdentifier('importProvidersFrom'), undefined, undefined, [typescript_1.default.factory.createIdentifier(moduleName)]);
+}
+/** Creates a `providers: [importProvidersFrom({{moduleName}})]` property assignment. */
+function createProvidersAssignment(moduleName) {
+    return typescript_1.default.factory.createPropertyAssignment('providers', typescript_1.default.factory.createArrayLiteralExpression([createImportProvidersFromCall(moduleName)]));
+}

package/resolver/schema.json

@@ -29,6 +29,9 @@
     "path": {
       "type": "string",
       "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the interface that defines the resolver, relative to the current workspace.",
       "visible": false
     },

package/service/schema.json

@@ -17,7 +17,9 @@
     },
     "path": {
       "type": "string",
-      "format": "path",
+      "$default": {
+        "$source": "workingDirectory"
+      },
       "description": "The path at which to create the service, relative to the workspace root.",
       "visible": false
     },

package/third_party/github.com/Microsoft/TypeScript/BUILD.bazel

@@ -1,11 +1,11 @@
 load("//tools:defaults.bzl", "ts_library")
 
-# files fetched on 2022-05-06 from
-# https://github.com/microsoft/TypeScript/releases/tag/v4.7-beta
+# files fetched on 2022-05-25 from
+# https://github.com/microsoft/TypeScript/releases/tag/v4.7.2
 
 # Commands to download:
-# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7-beta/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
-# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7-beta/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7.2/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7.2/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
 
 licenses(["notice"])  # Apache 2.0
 

package/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts

@@ -2063,7 +2063,7 @@ declare namespace ts {
         hasNoDefaultLib: boolean;
         languageVersion: ScriptTarget;
         /**
-         * When `module` is `Node12` or `NodeNext`, this field controls whether the
+         * When `module` is `Node16` or `NodeNext`, this field controls whether the
          * source file in question is an ESNext-output-format file, or a CommonJS-output-format
          * module. This is derived by the module resolver as it looks up the file, since
          * it is derived from either the file extension of the module, or the containing
@@ -2172,7 +2172,9 @@ declare namespace ts {
     export type ResolvedConfigFileName = string & {
         _isResolvedConfigFileName: never;
     };
-    export type WriteFileCallback = (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: readonly SourceFile[]) => void;
+    export interface WriteFileCallbackData {
+    }
+    export type WriteFileCallback = (fileName: string, text: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: readonly SourceFile[], data?: WriteFileCallbackData) => void;
     export class OperationCanceledException {
     }
     export interface CancellationToken {
@@ -2394,7 +2396,6 @@ declare namespace ts {
         UseAliasDefinedOutsideCurrentScope = 16384,
         UseSingleQuotesForStringLiteralType = 268435456,
         NoTypeReduction = 536870912,
-        NoUndefinedOptionalParameterType = 1073741824,
         AllowThisInObjectLiteral = 32768,
         AllowQualifiedNameInPlaceOfIdentifier = 65536,
         /** @deprecated AllowQualifedNameInPlaceOfIdentifier. Use AllowQualifiedNameInPlaceOfIdentifier instead. */
@@ -2892,7 +2893,7 @@ declare namespace ts {
     export enum ModuleResolutionKind {
         Classic = 1,
         NodeJs = 2,
-        Node12 = 3,
+        Node16 = 3,
         NodeNext = 99
     }
     export enum ModuleDetectionKind {
@@ -2901,7 +2902,7 @@ declare namespace ts {
          */
         Legacy = 1,
         /**
-         * Legacy, but also files with jsx under react-jsx or react-jsxdev and esm mode files under moduleResolution: node12+
+         * Legacy, but also files with jsx under react-jsx or react-jsxdev and esm mode files under moduleResolution: node16+
          */
         Auto = 2,
         /**
@@ -3073,7 +3074,7 @@ declare namespace ts {
         ES2020 = 6,
         ES2022 = 7,
         ESNext = 99,
-        Node12 = 100,
+        Node16 = 100,
         NodeNext = 199
     }
     export enum JsxEmit {
@@ -4817,7 +4818,7 @@ declare namespace ts {
         /**
          * Controls the format the file is detected as - this can be derived from only the path
          * and files on disk, but needs to be done with a module resolution cache in scope to be performant.
-         * This is usually `undefined` for compilations that do not have `moduleResolution` values of `node12` or `nodenext`.
+         * This is usually `undefined` for compilations that do not have `moduleResolution` values of `node16` or `nodenext`.
          */
         impliedNodeFormat?: ModuleKind.ESNext | ModuleKind.CommonJS;
         /**
@@ -6434,7 +6435,18 @@ declare namespace ts {
         argumentIndex: number;
         argumentCount: number;
     }
+    enum CompletionInfoFlags {
+        None = 0,
+        MayIncludeAutoImports = 1,
+        IsImportStatementCompletion = 2,
+        IsContinuation = 4,
+        ResolvedModuleSpecifiers = 8,
+        ResolvedModuleSpecifiersBeyondLimit = 16,
+        MayIncludeMethodSnippets = 32
+    }
     interface CompletionInfo {
+        /** For performance telemetry. */
+        flags?: CompletionInfoFlags;
         /** Not true for all global completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
         isGlobalCompletion: boolean;
         isMemberCompletion: boolean;
@@ -6810,7 +6822,7 @@ declare namespace ts {
          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
          * multiple copies of the same file for different compilation settings. A minimal
          * resolution cache is needed to fully define a source file's shape when
-         * the compilation settings include `module: node12`+, so providing a cache host
+         * the compilation settings include `module: node16`+, so providing a cache host
          * object should be preferred. A common host is a language service `ConfiguredProject`.
          * @param scriptSnapshot Text of the file. Only used if the file was not found
          * in the registry and a new one was created.
@@ -6829,7 +6841,7 @@ declare namespace ts {
          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
          * multiple copies of the same file for different compilation settings. A minimal
          * resolution cache is needed to fully define a source file's shape when
-         * the compilation settings include `module: node12`+, so providing a cache host
+         * the compilation settings include `module: node16`+, so providing a cache host
          * object should be preferred. A common host is a language service `ConfiguredProject`.
          * @param scriptSnapshot Text of the file.
          * @param version Current version of the file.