@schematics/angular 17.3.0 → 18.0.0-next.0

package/app-shell/index.js

@@ -6,34 +6,13 @@
  * 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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const standalone_1 = require("../private/standalone");
-const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const posix_1 = require("node:path/posix");
+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");
 const ng_ast_utils_1 = require("../utility/ng-ast-utils");
@@ -43,18 +22,18 @@ const workspace_models_1 = require("../utility/workspace-models");
 const APP_SHELL_ROUTE = 'shell';
 function getSourceFile(host, path) {
     const content = host.readText(path);
-    const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
+    const source = typescript_1.default.createSourceFile(path, content, typescript_1.default.ScriptTarget.Latest, true);
     return source;
 }
 function getServerModulePath(host, sourceRoot, mainPath) {
-    const mainSource = getSourceFile(host, (0, core_1.join)((0, core_1.normalize)(sourceRoot), mainPath));
+    const mainSource = getSourceFile(host, (0, posix_1.join)(sourceRoot, mainPath));
     const allNodes = (0, ast_utils_1.getSourceNodes)(mainSource);
-    const expNode = allNodes.find((node) => ts.isExportDeclaration(node));
+    const expNode = allNodes.find((node) => typescript_1.default.isExportDeclaration(node));
     if (!expNode) {
         return null;
     }
     const relativePath = expNode.moduleSpecifier;
-    const modulePath = (0, core_1.normalize)(`/${sourceRoot}/${relativePath.text}.ts`);
+    const modulePath = (0, posix_1.join)(sourceRoot, `${relativePath.text}.ts`);
     return modulePath;
 }
 function getComponentTemplateInfo(host, componentPath) {
@@ -72,8 +51,8 @@ function getComponentTemplate(host, compPath, tmplInfo) {
     }
     else if (tmplInfo.templateUrlProp) {
         const templateUrl = tmplInfo.templateUrlProp.initializer.text;
-        const dir = (0, core_1.dirname)((0, core_1.normalize)(compPath));
-        const templatePath = (0, core_1.join)(dir, templateUrl);
+        const dir = (0, posix_1.dirname)(compPath);
+        const templatePath = (0, posix_1.join)(dir, templateUrl);
         try {
             template = host.readText(templatePath);
         }
@@ -82,16 +61,15 @@ function getComponentTemplate(host, compPath, tmplInfo) {
     return template;
 }
 function getBootstrapComponentPath(host, mainPath) {
-    const mainSource = getSourceFile(host, mainPath);
-    const bootstrapAppCall = (0, standalone_1.findBootstrapApplicationCall)(mainSource);
     let bootstrappingFilePath;
     let bootstrappingSource;
     let componentName;
-    if (bootstrapAppCall) {
+    if ((0, ng_ast_utils_1.isStandaloneApp)(host, mainPath)) {
         // Standalone Application
-        componentName = bootstrapAppCall.arguments[0].getText();
+        const bootstrapCall = (0, util_1.findBootstrapApplicationCall)(host, mainPath);
+        componentName = bootstrapCall.arguments[0].getText();
         bootstrappingFilePath = mainPath;
-        bootstrappingSource = mainSource;
+        bootstrappingSource = getSourceFile(host, mainPath);
     }
     else {
         // NgModule Application
@@ -105,15 +83,15 @@ function getBootstrapComponentPath(host, mainPath) {
         bootstrappingFilePath = modulePath;
     }
     const componentRelativeFilePath = (0, ast_utils_1.getSourceNodes)(bootstrappingSource)
-        .filter(ts.isImportDeclaration)
+        .filter(typescript_1.default.isImportDeclaration)
         .filter((imp) => {
-        return (0, ast_utils_1.findNode)(imp, ts.SyntaxKind.Identifier, componentName);
+        return (0, ast_utils_1.findNode)(imp, typescript_1.default.SyntaxKind.Identifier, componentName);
     })
         .map((imp) => {
         const pathStringLiteral = imp.moduleSpecifier;
         return pathStringLiteral.text;
     })[0];
-    return (0, core_1.join)((0, core_1.dirname)((0, core_1.normalize)(bootstrappingFilePath)), componentRelativeFilePath + '.ts');
+    return (0, posix_1.join)((0, posix_1.dirname)(bootstrappingFilePath), componentRelativeFilePath + '.ts');
 }
 // end helper functions.
 function validateProject(mainPath) {
@@ -193,12 +171,12 @@ function addRouterModule(mainPath) {
 }
 function getMetadataProperty(metadata, propertyName) {
     const properties = metadata.properties;
-    const property = properties.filter(ts.isPropertyAssignment).filter((prop) => {
+    const property = properties.filter(typescript_1.default.isPropertyAssignment).filter((prop) => {
         const name = prop.name;
         switch (name.kind) {
-            case ts.SyntaxKind.Identifier:
+            case typescript_1.default.SyntaxKind.Identifier:
                 return name.getText() === propertyName;
-            case ts.SyntaxKind.StringLiteral:
+            case typescript_1.default.SyntaxKind.StringLiteral:
                 return name.text === propertyName;
         }
         return false;
@@ -225,7 +203,7 @@ function addServerRoutes(options) {
                 (0, change_1.applyToUpdateRecorder)(recorder, [routesChange]);
             }
             const imports = (0, ast_utils_1.getSourceNodes)(moduleSource)
-                .filter((node) => node.kind === ts.SyntaxKind.ImportDeclaration)
+                .filter((node) => node.kind === typescript_1.default.SyntaxKind.ImportDeclaration)
                 .sort((a, b) => a.getStart() - b.getStart());
             const insertPosition = imports[imports.length - 1].getEnd();
             const routeText = `\n\nconst routes: Routes = [ { path: '${APP_SHELL_ROUTE}', component: AppShellComponent }];`;
@@ -254,7 +232,7 @@ function addStandaloneServerRoute(options) {
         if (!project) {
             throw new schematics_1.SchematicsException(`Project name "${options.project}" doesn't not exist.`);
         }
-        const configFilePath = (0, core_1.join)((0, core_1.normalize)(project.sourceRoot ?? 'src'), 'app/app.config.server.ts');
+        const configFilePath = (0, posix_1.join)(project.sourceRoot ?? 'src', 'app/app.config.server.ts');
         if (!host.exists(configFilePath)) {
             throw new schematics_1.SchematicsException(`Cannot find "${configFilePath}".`);
         }
@@ -268,28 +246,28 @@ function addStandaloneServerRoute(options) {
             }
         }
         configSourceFile = getSourceFile(host, configFilePath);
-        const providersLiteral = (0, ast_utils_1.findNodes)(configSourceFile, ts.isPropertyAssignment).find((n) => ts.isArrayLiteralExpression(n.initializer) && n.name.getText() === 'providers')?.initializer;
+        const providersLiteral = (0, ast_utils_1.findNodes)(configSourceFile, typescript_1.default.isPropertyAssignment).find((n) => typescript_1.default.isArrayLiteralExpression(n.initializer) && n.name.getText() === 'providers')?.initializer;
         if (!providersLiteral) {
             throw new schematics_1.SchematicsException(`Cannot find the "providers" configuration in "${configFilePath}".`);
         }
         // Add route to providers literal.
-        const newProvidersLiteral = ts.factory.updateArrayLiteralExpression(providersLiteral, [
+        const newProvidersLiteral = typescript_1.default.factory.updateArrayLiteralExpression(providersLiteral, [
             ...providersLiteral.elements,
-            ts.factory.createObjectLiteralExpression([
-                ts.factory.createPropertyAssignment('provide', ts.factory.createIdentifier('ROUTES')),
-                ts.factory.createPropertyAssignment('multi', ts.factory.createIdentifier('true')),
-                ts.factory.createPropertyAssignment('useValue', ts.factory.createArrayLiteralExpression([
-                    ts.factory.createObjectLiteralExpression([
-                        ts.factory.createPropertyAssignment('path', ts.factory.createIdentifier(`'${APP_SHELL_ROUTE}'`)),
-                        ts.factory.createPropertyAssignment('component', ts.factory.createIdentifier('AppShellComponent')),
+            typescript_1.default.factory.createObjectLiteralExpression([
+                typescript_1.default.factory.createPropertyAssignment('provide', typescript_1.default.factory.createIdentifier('ROUTES')),
+                typescript_1.default.factory.createPropertyAssignment('multi', typescript_1.default.factory.createIdentifier('true')),
+                typescript_1.default.factory.createPropertyAssignment('useValue', typescript_1.default.factory.createArrayLiteralExpression([
+                    typescript_1.default.factory.createObjectLiteralExpression([
+                        typescript_1.default.factory.createPropertyAssignment('path', typescript_1.default.factory.createIdentifier(`'${APP_SHELL_ROUTE}'`)),
+                        typescript_1.default.factory.createPropertyAssignment('component', typescript_1.default.factory.createIdentifier('AppShellComponent')),
                     ], true),
                 ], true)),
             ], true),
         ]);
         const recorder = host.beginUpdate(configFilePath);
         recorder.remove(providersLiteral.getStart(), providersLiteral.getWidth());
-        const printer = ts.createPrinter();
-        recorder.insertRight(providersLiteral.getStart(), printer.printNode(ts.EmitHint.Unspecified, newProvidersLiteral, configSourceFile));
+        const printer = typescript_1.default.createPrinter();
+        recorder.insertRight(providersLiteral.getStart(), printer.printNode(typescript_1.default.EmitHint.Unspecified, newProvidersLiteral, configSourceFile));
         // Add AppShellComponent import
         const appShellImportChange = (0, ast_utils_1.insertImport)(configSourceFile, configFilePath, 'AppShellComponent', './app-shell/app-shell.component');
         (0, change_1.applyToUpdateRecorder)(recorder, [appShellImportChange]);

package/application/schema.json

@@ -59,18 +59,21 @@
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css", "label": "CSS" },
+          {
+            "value": "css",
+            "label": "CSS             [ https://developer.mozilla.org/docs/Web/CSS                     ]"
+          },
           {
             "value": "scss",
-            "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]"
+            "label": "Sass (SCSS)     [ https://sass-lang.com/documentation/syntax#scss                ]"
           },
           {
             "value": "sass",
-            "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]"
+            "label": "Sass (Indented) [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]"
           },
           {
             "value": "less",
-            "label": "Less   [ http://lesscss.org                                             ]"
+            "label": "Less            [ http://lesscss.org                                             ]"
           }
         ]
       },

package/guard/implements-files/__name@dasherize__.guard.ts.template

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { <%= routerImports %> } from '@angular/router';
-import { Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -8,24 +7,24 @@ import { Observable } from 'rxjs';
 export class <%= classify(name) %>Guard implements <%= implementations %> {
   <% if (implements.includes('CanActivate')) { %>canActivate(
     route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    state: RouterStateSnapshot): MaybeAsync<GuardResult> {
     return true;
   }
   <% } %><% if (implements.includes('CanActivateChild')) { %>canActivateChild(
     childRoute: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    state: RouterStateSnapshot): MaybeAsync<GuardResult> {
     return true;
   }
   <% } %><% if (implements.includes('CanDeactivate')) { %>canDeactivate(
     component: unknown,
     currentRoute: ActivatedRouteSnapshot,
     currentState: RouterStateSnapshot,
-    nextState?: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    nextState?: RouterStateSnapshot): MaybeAsync<GuardResult> {
     return true;
   }
   <% } %><% if (implements.includes('CanMatch')) { %>canMatch(
     route: Route,
-    segments: UrlSegment[]): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    segments: UrlSegment[]): MaybeAsync<GuardResult> {
     return true;
   }<% } %>
 }

package/guard/index.js

@@ -26,7 +26,7 @@ function default_1(options) {
             .map((implement) => (implement === 'CanDeactivate' ? 'CanDeactivate<unknown>' : implement))
             .join(', ');
         const commonRouterNameImports = ['ActivatedRouteSnapshot', 'RouterStateSnapshot'];
-        const routerNamedImports = [...options.implements, 'UrlTree'];
+        const routerNamedImports = [...options.implements, 'MaybeAsync', 'GuardResult'];
         if (options.implements.includes(schema_1.Implement.CanMatch)) {
             routerNamedImports.push('Route', 'UrlSegment');
             if (options.implements.length > 1) {

package/library/index.js

@@ -7,9 +7,9 @@
  * 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");
+const posix_1 = require("node:path/posix");
 const dependencies_1 = require("../utility/dependencies");
 const json_file_1 = require("../utility/json-file");
 const latest_versions_1 = require("../utility/latest-versions");
@@ -110,8 +110,8 @@ function default_1(options) {
             folderName = schematics_1.strings.dasherize(folderName);
         }
         const libDir = options.projectRoot !== undefined
-            ? (0, core_1.normalize)(options.projectRoot)
-            : (0, core_1.join)((0, core_1.normalize)(newProjectRoot), folderName);
+            ? (0, posix_1.join)(options.projectRoot)
+            : (0, posix_1.join)(newProjectRoot, folderName);
         const distRoot = `dist/${folderName}`;
         const sourceDir = `${libDir}/src/lib`;
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [

package/migrations/update-17/replace-nguniversal-engines.js

@@ -7,8 +7,8 @@
  * 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 posix_1 = require("node:path/posix");
 const utility_1 = require("../../utility");
 const dependencies_1 = require("../../utility/dependencies");
 const latest_versions_1 = require("../../utility/latest-versions");
@@ -80,7 +80,7 @@ function default_1() {
                         // Check if file is importing tokens
                         if (content.includes('@nguniversal/express-engine/tokens')) {
                             hasExpressTokens ||= true;
-                            let tokensFileRelativePath = (0, core_1.relative)((0, core_1.dirname)((0, core_1.normalize)(path)), (0, core_1.normalize)(tokensFilePath));
+                            let tokensFileRelativePath = (0, posix_1.relative)((0, posix_1.dirname)(path), tokensFilePath);
                             if (tokensFileRelativePath.charAt(0) !== '.') {
                                 tokensFileRelativePath = './' + tokensFileRelativePath;
                             }

package/module/index.js

@@ -30,8 +30,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const posix_1 = require("node:path/posix");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
 const change_1 = require("../utility/change");
@@ -41,10 +41,7 @@ const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
 function buildRelativeModulePath(options, modulePath) {
-    const importModulePath = (0, core_1.normalize)(`/${options.path}/` +
-        (options.flat ? '' : schematics_1.strings.dasherize(options.name) + '/') +
-        schematics_1.strings.dasherize(options.name) +
-        '.module');
+    const importModulePath = (0, posix_1.join)(options.path ?? '', options.flat ? '' : schematics_1.strings.dasherize(options.name), schematics_1.strings.dasherize(options.name) + '.module');
     return (0, find_module_1.buildRelativePath)(modulePath, importModulePath);
 }
 function addImportToNgModule(options) {
@@ -94,7 +91,7 @@ function getRoutingModulePath(host, modulePath) {
     const routingModulePath = modulePath.endsWith(find_module_1.ROUTING_MODULE_EXT)
         ? modulePath
         : modulePath.replace(find_module_1.MODULE_EXT, find_module_1.ROUTING_MODULE_EXT);
-    return host.exists(routingModulePath) ? (0, core_1.normalize)(routingModulePath) : undefined;
+    return host.exists(routingModulePath) ? routingModulePath : undefined;
 }
 function buildRoute(options, modulePath) {
     const relativeModulePath = buildRelativeModulePath(options, modulePath);

package/ng-new/index.js

@@ -53,9 +53,6 @@ function default_1(options) {
                     workingDirectory: options.directory,
                     packageManager: options.packageManager,
                 }));
-                if (options.linkCli) {
-                    packageTask = context.addTask(new tasks_1.NodePackageLinkTask('@angular/cli', options.directory), [packageTask]);
-                }
             }
             if (!options.skipGit) {
                 const commit = typeof options.commit == 'object' ? options.commit : options.commit ? {} : false;

package/ng-new/schema.d.ts

@@ -26,10 +26,6 @@ export interface Schema {
      * is created and referenced in the component TypeScript file.
      */
     inlineTemplate?: boolean;
-    /**
-     * Link the CLI to the global version (internal development only).
-     */
-    linkCli?: boolean;
     /**
      * Create a workspace without any testing frameworks. (Use for learning purposes only.)
      */

package/ng-new/schema.json

@@ -24,12 +24,6 @@
       "type": "boolean",
       "default": false
     },
-    "linkCli": {
-      "description": "Link the CLI to the global version (internal development only).",
-      "type": "boolean",
-      "default": false,
-      "visible": false
-    },
     "skipGit": {
       "description": "Do not initialize a git repository.",
       "type": "boolean",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "17.3.0",
+  "version": "18.0.0-next.0",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -18,13 +18,12 @@
     "./utility": "./utility/index.js",
     "./utility/*": "./utility/*.js",
     "./migrations/migration-collection.json": "./migrations/migration-collection.json",
-    "./*": "./*.js",
-    "./private/components": "./private/components.js"
+    "./*": "./*.js"
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "17.3.0",
-    "@angular-devkit/schematics": "17.3.0",
+    "@angular-devkit/core": "18.0.0-next.0",
+    "@angular-devkit/schematics": "18.0.0-next.0",
     "jsonc-parser": "3.2.1"
   },
   "repository": {
@@ -32,7 +31,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^18.13.0 || >=20.9.0",
+    "node": "^18.19.1 || >=20.11.1",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/service-worker/index.js

@@ -32,7 +32,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const standalone_1 = require("../private/standalone");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const utility_1 = require("../utility");
 const ast_utils_1 = require("../utility/ast-utils");
@@ -41,6 +40,8 @@ const dependencies_1 = require("../utility/dependencies");
 const ng_ast_utils_1 = require("../utility/ng-ast-utils");
 const paths_1 = require("../utility/paths");
 const project_targets_1 = require("../utility/project-targets");
+const app_config_1 = require("../utility/standalone/app_config");
+const util_1 = require("../utility/standalone/util");
 const workspace_models_1 = require("../utility/workspace-models");
 function addDependencies() {
     return (host) => {
@@ -77,17 +78,15 @@ function updateAppModule(mainPath) {
         return host;
     };
 }
-function addProvideServiceWorker(mainPath) {
+function addProvideServiceWorker(projectName, mainPath) {
     return (host) => {
-        const updatedFilePath = (0, standalone_1.addFunctionalProvidersToStandaloneBootstrap)(host, mainPath, 'provideServiceWorker', '@angular/service-worker', [
-            ts.factory.createStringLiteral('ngsw-worker.js', true),
-            ts.factory.createObjectLiteralExpression([
-                ts.factory.createPropertyAssignment(ts.factory.createIdentifier('enabled'), ts.factory.createPrefixUnaryExpression(ts.SyntaxKind.ExclamationToken, ts.factory.createCallExpression(ts.factory.createIdentifier('isDevMode'), undefined, []))),
-                ts.factory.createPropertyAssignment(ts.factory.createIdentifier('registrationStrategy'), ts.factory.createStringLiteral('registerWhenStable:30000', true)),
-            ], true),
-        ]);
-        addImport(host, updatedFilePath, 'isDevMode', '@angular/core');
-        return host;
+        const bootstrapCall = (0, util_1.findBootstrapApplicationCall)(host, mainPath);
+        const appConfig = (0, app_config_1.findAppConfig)(bootstrapCall, host, mainPath)?.filePath || mainPath;
+        addImport(host, appConfig, 'isDevMode', '@angular/core');
+        return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => code `${external('provideServiceWorker', '@angular/service-worker')}('ngsw-worker.js', {
+            enabled: !isDevMode(),
+            registrationStrategy: 'registerWhenStable:30000'
+          })`);
     };
 }
 function getTsSourceFile(host, path) {
@@ -141,7 +140,7 @@ function default_1(options) {
                 (0, schematics_1.move)(project.root),
             ])),
             (0, ng_ast_utils_1.isStandaloneApp)(host, browserEntryPoint)
-                ? addProvideServiceWorker(browserEntryPoint)
+                ? addProvideServiceWorker(options.project, browserEntryPoint)
                 : updateAppModule(browserEntryPoint),
         ]);
     };

package/utility/latest-versions/package.json

@@ -15,7 +15,7 @@
     "karma-jasmine-html-reporter": "~2.1.0",
     "karma-jasmine": "~5.1.0",
     "karma": "~6.4.0",
-    "ng-packagr": "^17.3.0",
+    "ng-packagr": "^18.0.0-next.0",
     "protractor": "~7.0.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",

package/utility/latest-versions.js

@@ -13,7 +13,7 @@ exports.latestVersions = {
     // but ts_library doesn't support JSON inputs.
     ...require('./latest-versions/package.json')['dependencies'],
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
-    Angular: '^17.3.0',
-    DevkitBuildAngular: '^17.3.0',
-    AngularSSR: '^17.3.0',
+    Angular: '^18.0.0-next.0',
+    DevkitBuildAngular: '^18.0.0-next.0',
+    AngularSSR: '^18.0.0-next.0',
 };

package/utility/ng-ast-utils.js

@@ -31,12 +31,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isStandaloneApp = exports.getAppModulePath = exports.findBootstrapModuleCall = void 0;
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const path_1 = require("path");
-const standalone_1 = require("../private/standalone");
+const posix_1 = require("node:path/posix");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_utils_1 = require("../utility/ast-utils");
+const util_1 = require("./standalone/util");
 function findBootstrapModuleCall(host, mainPath) {
     const mainText = host.readText(mainPath);
     const source = ts.createSourceFile(mainPath, mainText, ts.ScriptTarget.Latest, true);
@@ -83,14 +82,21 @@ function findBootstrapModulePath(host, mainPath) {
 }
 function getAppModulePath(host, mainPath) {
     const moduleRelativePath = findBootstrapModulePath(host, mainPath);
-    const mainDir = (0, path_1.dirname)(mainPath);
-    const modulePath = (0, core_1.normalize)(`/${mainDir}/${moduleRelativePath}.ts`);
+    const mainDir = (0, posix_1.dirname)(mainPath);
+    const modulePath = (0, posix_1.join)(mainDir, `${moduleRelativePath}.ts`);
     return modulePath;
 }
 exports.getAppModulePath = getAppModulePath;
 function isStandaloneApp(host, mainPath) {
-    const source = ts.createSourceFile(mainPath, host.readText(mainPath), ts.ScriptTarget.Latest, true);
-    const bootstrapCall = (0, standalone_1.findBootstrapApplicationCall)(source);
-    return bootstrapCall !== null;
+    try {
+        (0, util_1.findBootstrapApplicationCall)(host, mainPath);
+        return true;
+    }
+    catch (error) {
+        if (error instanceof schematics_1.SchematicsException) {
+            return false;
+        }
+        throw error;
+    }
 }
 exports.isStandaloneApp = isStandaloneApp;

package/utility/paths.js

@@ -8,14 +8,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.relativePathToWorkspaceRoot = void 0;
-const core_1 = require("@angular-devkit/core");
+const posix_1 = require("node:path/posix");
 function relativePathToWorkspaceRoot(projectRoot) {
-    const normalizedPath = (0, core_1.split)((0, core_1.normalize)(projectRoot || ''));
-    if (normalizedPath.length === 0 || !normalizedPath[0]) {
+    if (!projectRoot) {
         return '.';
     }
-    else {
-        return normalizedPath.map(() => '..').join('/');
-    }
+    return (0, posix_1.relative)((0, posix_1.join)('/', projectRoot), '/') || '.';
 }
 exports.relativePathToWorkspaceRoot = relativePathToWorkspaceRoot;

package/workspace/files/tsconfig.json.template

@@ -3,7 +3,6 @@
   "compileOnSave": false,
   "compilerOptions": {
     "outDir": "./dist/out-tsc",<% if (strict) { %>
-    "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
@@ -14,7 +13,7 @@
     "sourceMap": true,
     "declaration": false,
     "experimentalDecorators": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "importHelpers": true,
     "target": "ES2022",
     "module": "ES2022",

package/private/components.d.ts

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

package/private/components.js

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

@@ -1,55 +0,0 @@
-/**
- * @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.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-export declare function importsProvidersFrom(tree: Tree, filePath: string, className: string): boolean;
-/**
- * Checks whether a providers function is being called in a `bootstrapApplication` call.
- * @param tree File tree of the project.
- * @param filePath Path of the file in which to check.
- * @param functionName Name of the function to search for.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-export declare function callsProvidersFunction(tree: Tree, filePath: string, functionName: 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.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-export declare function addModuleImportToStandaloneBootstrap(tree: Tree, filePath: string, moduleName: string, modulePath: string): void;
-/**
- * Adds a providers function call to the `bootstrapApplication` call.
- * @param tree File tree of the project.
- * @param filePath Path to the file that should be updated.
- * @param functionName Name of the function that should be called.
- * @param importPath Path from which to import the function.
- * @param args Arguments to use when calling the function.
- * @return The file path that the provider was added to.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-export declare function addFunctionalProvidersToStandaloneBootstrap(tree: Tree, filePath: string, functionName: string, importPath: string, args?: ts.Expression[]): string;
-/**
- * Finds the call to `bootstrapApplication` within a file.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-export declare function findBootstrapApplicationCall(sourceFile: ts.SourceFile): ts.CallExpression | null;

package/private/standalone.js

@@ -1,393 +0,0 @@
-"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.addFunctionalProvidersToStandaloneBootstrap = exports.addModuleImportToStandaloneBootstrap = exports.callsProvidersFunction = exports.importsProvidersFrom = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const path_1 = require("path");
-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.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-function importsProvidersFrom(tree, filePath, className) {
-    const sourceFile = createSourceFile(tree, filePath);
-    const bootstrapCall = findBootstrapApplicationCall(sourceFile);
-    const appConfig = bootstrapCall ? findAppConfig(bootstrapCall, tree, filePath) : null;
-    const importProvidersFromCall = appConfig ? findImportProvidersFromCall(appConfig.node) : null;
-    return !!importProvidersFromCall?.arguments.some((arg) => typescript_1.default.isIdentifier(arg) && arg.text === className);
-}
-exports.importsProvidersFrom = importsProvidersFrom;
-/**
- * Checks whether a providers function is being called in a `bootstrapApplication` call.
- * @param tree File tree of the project.
- * @param filePath Path of the file in which to check.
- * @param functionName Name of the function to search for.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-function callsProvidersFunction(tree, filePath, functionName) {
-    const sourceFile = createSourceFile(tree, filePath);
-    const bootstrapCall = findBootstrapApplicationCall(sourceFile);
-    const appConfig = bootstrapCall ? findAppConfig(bootstrapCall, tree, filePath) : null;
-    const providersLiteral = appConfig ? findProvidersLiteral(appConfig.node) : null;
-    return !!providersLiteral?.elements.some((el) => typescript_1.default.isCallExpression(el) &&
-        typescript_1.default.isIdentifier(el.expression) &&
-        el.expression.text === functionName);
-}
-exports.callsProvidersFunction = callsProvidersFunction;
-/**
- * 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.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-function addModuleImportToStandaloneBootstrap(tree, filePath, moduleName, modulePath) {
-    const sourceFile = createSourceFile(tree, filePath);
-    const bootstrapCall = findBootstrapApplicationCall(sourceFile);
-    const addImports = (file, recorder) => {
-        const sourceText = file.getText();
-        [
-            (0, ast_utils_1.insertImport)(file, sourceText, moduleName, modulePath),
-            (0, ast_utils_1.insertImport)(file, sourceText, 'importProvidersFrom', '@angular/core'),
-        ].forEach((change) => {
-            if (change instanceof change_1.InsertChange) {
-                recorder.insertLeft(change.pos, change.toAdd);
-            }
-        });
-    };
-    if (!bootstrapCall) {
-        throw new schematics_1.SchematicsException(`Could not find bootstrapApplication call in ${filePath}`);
-    }
-    const importProvidersCall = typescript_1.default.factory.createCallExpression(typescript_1.default.factory.createIdentifier('importProvidersFrom'), [], [typescript_1.default.factory.createIdentifier(moduleName)]);
-    // If there's only one argument, we have to create a new object literal.
-    if (bootstrapCall.arguments.length === 1) {
-        const recorder = tree.beginUpdate(filePath);
-        addNewAppConfigToCall(bootstrapCall, importProvidersCall, recorder);
-        addImports(sourceFile, recorder);
-        tree.commitUpdate(recorder);
-        return;
-    }
-    // If the config is a `mergeApplicationProviders` call, add another config to it.
-    if (isMergeAppConfigCall(bootstrapCall.arguments[1])) {
-        const recorder = tree.beginUpdate(filePath);
-        addNewAppConfigToCall(bootstrapCall.arguments[1], importProvidersCall, recorder);
-        addImports(sourceFile, recorder);
-        tree.commitUpdate(recorder);
-        return;
-    }
-    // Otherwise attempt to merge into the current config.
-    const appConfig = findAppConfig(bootstrapCall, tree, filePath);
-    if (!appConfig) {
-        throw new schematics_1.SchematicsException(`Could not statically analyze config in bootstrapApplication call in ${filePath}`);
-    }
-    const { filePath: configFilePath, node: config } = appConfig;
-    const recorder = tree.beginUpdate(configFilePath);
-    const importCall = findImportProvidersFromCall(config);
-    addImports(config.getSourceFile(), recorder);
-    if (importCall) {
-        // If there's an `importProvidersFrom` call already, add the module to it.
-        recorder.insertRight(importCall.arguments[importCall.arguments.length - 1].getEnd(), `, ${moduleName}`);
-    }
-    else {
-        const providersLiteral = findProvidersLiteral(config);
-        if (providersLiteral) {
-            // If there's a `providers` array, add the import to it.
-            addElementToArray(providersLiteral, importProvidersCall, recorder);
-        }
-        else {
-            // Otherwise add a `providers` array to the existing object literal.
-            addProvidersToObjectLiteral(config, importProvidersCall, recorder);
-        }
-    }
-    tree.commitUpdate(recorder);
-}
-exports.addModuleImportToStandaloneBootstrap = addModuleImportToStandaloneBootstrap;
-/**
- * Adds a providers function call to the `bootstrapApplication` call.
- * @param tree File tree of the project.
- * @param filePath Path to the file that should be updated.
- * @param functionName Name of the function that should be called.
- * @param importPath Path from which to import the function.
- * @param args Arguments to use when calling the function.
- * @return The file path that the provider was added to.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-function addFunctionalProvidersToStandaloneBootstrap(tree, filePath, functionName, importPath, args = []) {
-    const sourceFile = createSourceFile(tree, filePath);
-    const bootstrapCall = findBootstrapApplicationCall(sourceFile);
-    const addImports = (file, recorder) => {
-        const change = (0, ast_utils_1.insertImport)(file, file.getText(), functionName, importPath);
-        if (change instanceof change_1.InsertChange) {
-            recorder.insertLeft(change.pos, change.toAdd);
-        }
-    };
-    if (!bootstrapCall) {
-        throw new schematics_1.SchematicsException(`Could not find bootstrapApplication call in ${filePath}`);
-    }
-    const providersCall = typescript_1.default.factory.createCallExpression(typescript_1.default.factory.createIdentifier(functionName), undefined, args);
-    // If there's only one argument, we have to create a new object literal.
-    if (bootstrapCall.arguments.length === 1) {
-        const recorder = tree.beginUpdate(filePath);
-        addNewAppConfigToCall(bootstrapCall, providersCall, recorder);
-        addImports(sourceFile, recorder);
-        tree.commitUpdate(recorder);
-        return filePath;
-    }
-    // If the config is a `mergeApplicationProviders` call, add another config to it.
-    if (isMergeAppConfigCall(bootstrapCall.arguments[1])) {
-        const recorder = tree.beginUpdate(filePath);
-        addNewAppConfigToCall(bootstrapCall.arguments[1], providersCall, recorder);
-        addImports(sourceFile, recorder);
-        tree.commitUpdate(recorder);
-        return filePath;
-    }
-    // Otherwise attempt to merge into the current config.
-    const appConfig = findAppConfig(bootstrapCall, tree, filePath);
-    if (!appConfig) {
-        throw new schematics_1.SchematicsException(`Could not statically analyze config in bootstrapApplication call in ${filePath}`);
-    }
-    const { filePath: configFilePath, node: config } = appConfig;
-    const recorder = tree.beginUpdate(configFilePath);
-    const providersLiteral = findProvidersLiteral(config);
-    addImports(config.getSourceFile(), recorder);
-    if (providersLiteral) {
-        // If there's a `providers` array, add the import to it.
-        addElementToArray(providersLiteral, providersCall, recorder);
-    }
-    else {
-        // Otherwise add a `providers` array to the existing object literal.
-        addProvidersToObjectLiteral(config, providersCall, recorder);
-    }
-    tree.commitUpdate(recorder);
-    return configFilePath;
-}
-exports.addFunctionalProvidersToStandaloneBootstrap = addFunctionalProvidersToStandaloneBootstrap;
-/**
- * Finds the call to `bootstrapApplication` within a file.
- * @deprecated Private utility that will be removed. Use `addRootImport` or `addRootProvider` from
- * `@schematics/angular/utility` instead.
- */
-function findBootstrapApplicationCall(sourceFile) {
-    const localName = findImportLocalName(sourceFile, 'bootstrapApplication', '@angular/platform-browser');
-    if (!localName) {
-        return null;
-    }
-    let result = null;
-    sourceFile.forEachChild(function walk(node) {
-        if (typescript_1.default.isCallExpression(node) &&
-            typescript_1.default.isIdentifier(node.expression) &&
-            node.expression.text === localName) {
-            result = node;
-        }
-        if (!result) {
-            node.forEachChild(walk);
-        }
-    });
-    return result;
-}
-exports.findBootstrapApplicationCall = findBootstrapApplicationCall;
-/** Find a call to `importProvidersFrom` within an application config. */
-function findImportProvidersFromCall(config) {
-    const importProvidersName = findImportLocalName(config.getSourceFile(), 'importProvidersFrom', '@angular/core');
-    const providersLiteral = findProvidersLiteral(config);
-    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 an application config. */
-function findProvidersLiteral(config) {
-    for (const prop of config.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;
-}
-/**
- * Resolves the node that defines the app config from a bootstrap call.
- * @param bootstrapCall Call for which to resolve the config.
- * @param tree File tree of the project.
- * @param filePath File path of the bootstrap call.
- */
-function findAppConfig(bootstrapCall, tree, filePath) {
-    if (bootstrapCall.arguments.length > 1) {
-        const config = bootstrapCall.arguments[1];
-        if (typescript_1.default.isObjectLiteralExpression(config)) {
-            return { filePath, node: config };
-        }
-        if (typescript_1.default.isIdentifier(config)) {
-            return resolveAppConfigFromIdentifier(config, tree, filePath);
-        }
-    }
-    return null;
-}
-/**
- * Resolves the app config from an identifier referring to it.
- * @param identifier Identifier referring to the app config.
- * @param tree File tree of the project.
- * @param bootstapFilePath Path of the bootstrap call.
- */
-function resolveAppConfigFromIdentifier(identifier, tree, bootstapFilePath) {
-    const sourceFile = identifier.getSourceFile();
-    for (const node of sourceFile.statements) {
-        // Only look at relative imports. This will break if the app uses a path
-        // mapping to refer to the import, but in order to resolve those, we would
-        // need knowledge about the entire program.
-        if (!typescript_1.default.isImportDeclaration(node) ||
-            !node.importClause?.namedBindings ||
-            !typescript_1.default.isNamedImports(node.importClause.namedBindings) ||
-            !typescript_1.default.isStringLiteralLike(node.moduleSpecifier) ||
-            !node.moduleSpecifier.text.startsWith('.')) {
-            continue;
-        }
-        for (const specifier of node.importClause.namedBindings.elements) {
-            if (specifier.name.text !== identifier.text) {
-                continue;
-            }
-            // Look for a variable with the imported name in the file. Note that ideally we would use
-            // the type checker to resolve this, but we can't because these utilities are set up to
-            // operate on individual files, not the entire program.
-            const filePath = (0, path_1.join)((0, path_1.dirname)(bootstapFilePath), node.moduleSpecifier.text + '.ts');
-            const importedSourceFile = createSourceFile(tree, filePath);
-            const resolvedVariable = findAppConfigFromVariableName(importedSourceFile, (specifier.propertyName || specifier.name).text);
-            if (resolvedVariable) {
-                return { filePath, node: resolvedVariable };
-            }
-        }
-    }
-    const variableInSameFile = findAppConfigFromVariableName(sourceFile, identifier.text);
-    return variableInSameFile ? { filePath: bootstapFilePath, node: variableInSameFile } : null;
-}
-/**
- * Finds an app config within the top-level variables of a file.
- * @param sourceFile File in which to search for the config.
- * @param variableName Name of the variable containing the config.
- */
-function findAppConfigFromVariableName(sourceFile, variableName) {
-    for (const node of sourceFile.statements) {
-        if (typescript_1.default.isVariableStatement(node)) {
-            for (const decl of node.declarationList.declarations) {
-                if (typescript_1.default.isIdentifier(decl.name) &&
-                    decl.name.text === variableName &&
-                    decl.initializer &&
-                    typescript_1.default.isObjectLiteralExpression(decl.initializer)) {
-                    return decl.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;
-}
-/** Creates a source file from a file path within a project. */
-function createSourceFile(tree, filePath) {
-    return typescript_1.default.createSourceFile(filePath, tree.readText(filePath), typescript_1.default.ScriptTarget.Latest, true);
-}
-/**
- * Creates a new app config object literal and adds it to a call expression as an argument.
- * @param call Call to which to add the config.
- * @param expression Expression that should inserted into the new config.
- * @param recorder Recorder to which to log the change.
- */
-function addNewAppConfigToCall(call, expression, recorder) {
-    const newCall = typescript_1.default.factory.updateCallExpression(call, call.expression, call.typeArguments, [
-        ...call.arguments,
-        typescript_1.default.factory.createObjectLiteralExpression([
-            typescript_1.default.factory.createPropertyAssignment('providers', typescript_1.default.factory.createArrayLiteralExpression([expression])),
-        ], true),
-    ]);
-    recorder.remove(call.getStart(), call.getWidth());
-    recorder.insertRight(call.getStart(), typescript_1.default.createPrinter().printNode(typescript_1.default.EmitHint.Unspecified, newCall, call.getSourceFile()));
-}
-/**
- * Adds an element to an array literal expression.
- * @param node Array to which to add the element.
- * @param element Element to be added.
- * @param recorder Recorder to which to log the change.
- */
-function addElementToArray(node, element, recorder) {
-    const newLiteral = typescript_1.default.factory.updateArrayLiteralExpression(node, [...node.elements, element]);
-    recorder.remove(node.getStart(), node.getWidth());
-    recorder.insertRight(node.getStart(), typescript_1.default.createPrinter().printNode(typescript_1.default.EmitHint.Unspecified, newLiteral, node.getSourceFile()));
-}
-/**
- * Adds a `providers` property to an object literal.
- * @param node Literal to which to add the `providers`.
- * @param expression Provider that should be part of the generated `providers` array.
- * @param recorder Recorder to which to log the change.
- */
-function addProvidersToObjectLiteral(node, expression, recorder) {
-    const newOptionsLiteral = typescript_1.default.factory.updateObjectLiteralExpression(node, [
-        ...node.properties,
-        typescript_1.default.factory.createPropertyAssignment('providers', typescript_1.default.factory.createArrayLiteralExpression([expression])),
-    ]);
-    recorder.remove(node.getStart(), node.getWidth());
-    recorder.insertRight(node.getStart(), typescript_1.default.createPrinter().printNode(typescript_1.default.EmitHint.Unspecified, newOptionsLiteral, node.getSourceFile()));
-}
-/** Checks whether a node is a call to `mergeApplicationConfig`. */
-function isMergeAppConfigCall(node) {
-    if (!typescript_1.default.isCallExpression(node)) {
-        return false;
-    }
-    const localName = findImportLocalName(node.getSourceFile(), 'mergeApplicationConfig', '@angular/core');
-    return !!localName && typescript_1.default.isIdentifier(node.expression) && node.expression.text === localName;
-}