@abp/ng.schematics 9.2.0-rc.2 → 9.2.0-rc.3

package/utils/angular/standalone/util.js

@@ -0,0 +1,136 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findProvidersLiteral = exports.isMergeAppConfigCall = exports.applyChangesToFile = exports.findBootstrapApplicationCall = exports.getSourceFile = exports.getMainFilePath = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const ts = require("typescript");
+const change_1 = require("../change");
+const project_targets_1 = require("../project-targets");
+const workspace_1 = require("../workspace");
+const workspace_models_1 = require("../workspace-models");
+/**
+ * Finds the main file of a project.
+ * @param tree File tree for the project.
+ * @param projectName Name of the project in which to search.
+ */
+async function getMainFilePath(tree, projectName) {
+    const workspace = await (0, workspace_1.getWorkspace)(tree);
+    const project = workspace.projects.get(projectName);
+    const buildTarget = project?.targets.get('build');
+    if (!buildTarget) {
+        throw (0, project_targets_1.targetBuildNotFoundError)();
+    }
+    const options = buildTarget.options;
+    return buildTarget.builder === workspace_models_1.Builders.Application ||
+        buildTarget.builder === workspace_models_1.Builders.BuildApplication
+        ? options.browser
+        : options.main;
+}
+exports.getMainFilePath = getMainFilePath;
+/**
+ * Gets a TypeScript source file at a specific path.
+ * @param tree File tree of a project.
+ * @param path Path to the file.
+ */
+function getSourceFile(tree, path) {
+    const content = tree.readText(path);
+    const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
+    return source;
+}
+exports.getSourceFile = getSourceFile;
+/** Finds the call to `bootstrapApplication` within a file. */
+function findBootstrapApplicationCall(tree, mainFilePath) {
+    const sourceFile = getSourceFile(tree, mainFilePath);
+    const localName = findImportLocalName(sourceFile, 'bootstrapApplication', '@angular/platform-browser');
+    if (localName) {
+        let result = null;
+        sourceFile.forEachChild(function walk(node) {
+            if (ts.isCallExpression(node) &&
+                ts.isIdentifier(node.expression) &&
+                node.expression.text === localName) {
+                result = node;
+            }
+            if (!result) {
+                node.forEachChild(walk);
+            }
+        });
+        if (result) {
+            return result;
+        }
+    }
+    throw new schematics_1.SchematicsException(`Could not find bootstrapApplication call in ${mainFilePath}`);
+}
+exports.findBootstrapApplicationCall = findBootstrapApplicationCall;
+/**
+ * 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 (!ts.isImportDeclaration(node) ||
+            !ts.isStringLiteral(node.moduleSpecifier) ||
+            node.moduleSpecifier.text !== moduleName) {
+            continue;
+        }
+        // Filter out imports that don't have the right shape.
+        if (!node.importClause ||
+            !node.importClause.namedBindings ||
+            !ts.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;
+}
+/**
+ * Applies a set of changes to a file.
+ * @param tree File tree of the project.
+ * @param path Path to the file that is being changed.
+ * @param changes Changes that should be applied to the file.
+ */
+function applyChangesToFile(tree, path, changes) {
+    if (changes.length > 0) {
+        const recorder = tree.beginUpdate(path);
+        (0, change_1.applyToUpdateRecorder)(recorder, changes);
+        tree.commitUpdate(recorder);
+    }
+}
+exports.applyChangesToFile = applyChangesToFile;
+/** Checks whether a node is a call to `mergeApplicationConfig`. */
+function isMergeAppConfigCall(node) {
+    if (!ts.isCallExpression(node)) {
+        return false;
+    }
+    const localName = findImportLocalName(node.getSourceFile(), 'mergeApplicationConfig', '@angular/core');
+    return !!localName && ts.isIdentifier(node.expression) && node.expression.text === localName;
+}
+exports.isMergeAppConfigCall = isMergeAppConfigCall;
+/** Finds the `providers` array literal within an application config. */
+function findProvidersLiteral(config) {
+    for (const prop of config.properties) {
+        if (ts.isPropertyAssignment(prop) &&
+            ts.isIdentifier(prop.name) &&
+            prop.name.text === 'providers' &&
+            ts.isArrayLiteralExpression(prop.initializer)) {
+            return prop.initializer;
+        }
+    }
+    return null;
+}
+exports.findProvidersLiteral = findProvidersLiteral;
+//# sourceMappingURL=util.js.map

package/utils/angular/standalone/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../../packages/schematics/src/utils/angular/standalone/util.ts"],"names":[],"mappings":"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"}

package/utils/angular/validation.d.ts

@@ -3,7 +3,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 export declare const htmlSelectorRe: RegExp;
 export declare function validateHtmlSelector(selector: string): void;

package/utils/angular/validation.js

@@ -4,14 +4,14 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateClassName = exports.validateHtmlSelector = exports.htmlSelectorRe = void 0;
 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]*)*$/;
+exports.htmlSelectorRe = /^[a-zA-Z][.0-9a-zA-Z]*((:?-[0-9]+)*|(:?-[a-zA-Z][.0-9a-zA-Z]*(:?-[0-9]+)*)*)$/;
 // See: https://github.com/tc39/proposal-regexp-unicode-property-escapes/blob/fe6d07fad74cd0192d154966baa1e95e7cda78a1/README.md#other-examples
 const ecmaIdentifierNameRegExp = /^(?:[$_\p{ID_Start}])(?:[$_\u200C\u200D\p{ID_Continue}])*$/u;
 function validateHtmlSelector(selector) {

package/utils/angular/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/validation.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,2DAAiE;AAEjE,qFAAqF;AACrF,+EAA+E;AAClE,QAAA,cAAc,GAAG,oDAAoD,CAAC;AAEnF,+IAA+I;AAC/I,MAAM,wBAAwB,GAAG,6DAA6D,CAAC;AAE/F,SAAgB,oBAAoB,CAAC,QAAgB;IACnD,IAAI,QAAQ,IAAI,CAAC,sBAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC9C,MAAM,IAAI,gCAAmB,CAAC,aAAa,QAAQ,eAAe,CAAC,CAAC;KACrE;AACH,CAAC;AAJD,oDAIC;AAED,SAAgB,iBAAiB,CAAC,SAAiB;IACjD,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC7C,MAAM,IAAI,gCAAmB,CAAC,eAAe,SAAS,eAAe,CAAC,CAAC;KACxE;AACH,CAAC;AAJD,8CAIC"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/validation.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,2DAAiE;AAEjE,qFAAqF;AACrF,+EAA+E;AAClE,QAAA,cAAc,GACzB,+EAA+E,CAAC;AAElF,+IAA+I;AAC/I,MAAM,wBAAwB,GAAG,6DAA6D,CAAC;AAE/F,SAAgB,oBAAoB,CAAC,QAAgB;IACnD,IAAI,QAAQ,IAAI,CAAC,sBAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC9C,MAAM,IAAI,gCAAmB,CAAC,aAAa,QAAQ,eAAe,CAAC,CAAC;KACrE;AACH,CAAC;AAJD,oDAIC;AAED,SAAgB,iBAAiB,CAAC,SAAiB;IACjD,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QAC7C,MAAM,IAAI,gCAAmB,CAAC,eAAe,SAAS,eAAe,CAAC,CAAC;KACxE;AACH,CAAC;AAJD,8CAIC"}

package/utils/angular/workspace-models.d.ts

@@ -3,7 +3,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 export declare enum ProjectType {
     Application = "application",
@@ -16,16 +16,24 @@ export declare enum ProjectType {
  * `angular.json` workspace file.
  */
 export declare enum Builders {
+    Application = "@angular-devkit/build-angular:application",
     AppShell = "@angular-devkit/build-angular:app-shell",
     Server = "@angular-devkit/build-angular:server",
     Browser = "@angular-devkit/build-angular:browser",
+    SsrDevServer = "@angular-devkit/build-angular:ssr-dev-server",
+    Prerender = "@angular-devkit/build-angular:prerender",
+    BrowserEsbuild = "@angular-devkit/build-angular:browser-esbuild",
     Karma = "@angular-devkit/build-angular:karma",
+    BuildKarma = "@angular/build:karma",
     TsLint = "@angular-devkit/build-angular:tslint",
-    DeprecatedNgPackagr = "@angular-devkit/build-ng-packagr:build",
     NgPackagr = "@angular-devkit/build-angular:ng-packagr",
+    BuildNgPackagr = "@angular/build:ng-packagr",
     DevServer = "@angular-devkit/build-angular:dev-server",
+    BuildDevServer = "@angular/build:dev-server",
     ExtractI18n = "@angular-devkit/build-angular:extract-i18n",
-    Protractor = "@angular-devkit/build-angular:protractor"
+    BuildExtractI18n = "@angular/build:extract-i18n",
+    Protractor = "@angular-devkit/build-angular:private-protractor",
+    BuildApplication = "@angular/build:application"
 }
 export interface FileReplacements {
     replace: string;
@@ -63,7 +71,7 @@ export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions {
     webWorkerTsConfig?: string;
 }
 export interface ServeBuilderOptions {
-    browserTarget: string;
+    buildTarget: string;
 }
 export interface LibraryBuilderOptions {
     tsConfig: string;
@@ -119,11 +127,9 @@ export declare type E2EBuilderTarget = BuilderTarget<Builders.Protractor, E2EOpt
 interface WorkspaceCLISchema {
     warnings?: Record<string, boolean>;
     schematicCollections?: string[];
-    defaultCollection?: string;
 }
 export interface WorkspaceSchema {
     version: 1;
-    defaultProject?: string;
     cli?: WorkspaceCLISchema;
     projects: {
         [key: string]: WorkspaceProject<ProjectType.Application | ProjectType.Library>;

package/utils/angular/workspace-models.js

@@ -4,7 +4,7 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Builders = exports.ProjectType = void 0;
@@ -21,15 +21,23 @@ var ProjectType;
  */
 var Builders;
 (function (Builders) {
+    Builders["Application"] = "@angular-devkit/build-angular:application";
     Builders["AppShell"] = "@angular-devkit/build-angular:app-shell";
     Builders["Server"] = "@angular-devkit/build-angular:server";
     Builders["Browser"] = "@angular-devkit/build-angular:browser";
+    Builders["SsrDevServer"] = "@angular-devkit/build-angular:ssr-dev-server";
+    Builders["Prerender"] = "@angular-devkit/build-angular:prerender";
+    Builders["BrowserEsbuild"] = "@angular-devkit/build-angular:browser-esbuild";
     Builders["Karma"] = "@angular-devkit/build-angular:karma";
+    Builders["BuildKarma"] = "@angular/build:karma";
     Builders["TsLint"] = "@angular-devkit/build-angular:tslint";
-    Builders["DeprecatedNgPackagr"] = "@angular-devkit/build-ng-packagr:build";
     Builders["NgPackagr"] = "@angular-devkit/build-angular:ng-packagr";
+    Builders["BuildNgPackagr"] = "@angular/build:ng-packagr";
     Builders["DevServer"] = "@angular-devkit/build-angular:dev-server";
+    Builders["BuildDevServer"] = "@angular/build:dev-server";
     Builders["ExtractI18n"] = "@angular-devkit/build-angular:extract-i18n";
-    Builders["Protractor"] = "@angular-devkit/build-angular:protractor";
+    Builders["BuildExtractI18n"] = "@angular/build:extract-i18n";
+    Builders["Protractor"] = "@angular-devkit/build-angular:private-protractor";
+    Builders["BuildApplication"] = "@angular/build:application";
 })(Builders = exports.Builders || (exports.Builders = {}));
 //# sourceMappingURL=workspace-models.js.map

package/utils/angular/workspace-models.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-models.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/workspace-models.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,0CAA2B,CAAA;IAC3B,kCAAmB,CAAA;AACrB,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAED;;;;;GAKG;AACH,IAAY,QAWX;AAXD,WAAY,QAAQ;IAClB,gEAAoD,CAAA;IACpD,2DAA+C,CAAA;IAC/C,6DAAiD,CAAA;IACjD,yDAA6C,CAAA;IAC7C,2DAA+C,CAAA;IAC/C,0EAA8D,CAAA;IAC9D,kEAAsD,CAAA;IACtD,kEAAsD,CAAA;IACtD,sEAA0D,CAAA;IAC1D,mEAAuD,CAAA;AACzD,CAAC,EAXW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAWnB"}
+{"version":3,"file":"workspace-models.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/workspace-models.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,0CAA2B,CAAA;IAC3B,kCAAmB,CAAA;AACrB,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAED;;;;;GAKG;AACH,IAAY,QAmBX;AAnBD,WAAY,QAAQ;IAClB,qEAAyD,CAAA;IACzD,gEAAoD,CAAA;IACpD,2DAA+C,CAAA;IAC/C,6DAAiD,CAAA;IACjD,yEAA6D,CAAA;IAC7D,iEAAqD,CAAA;IACrD,4EAAgE,CAAA;IAChE,yDAA6C,CAAA;IAC7C,+CAAmC,CAAA;IACnC,2DAA+C,CAAA;IAC/C,kEAAsD,CAAA;IACtD,wDAA4C,CAAA;IAC5C,kEAAsD,CAAA;IACtD,wDAA4C,CAAA;IAC5C,sEAA0D,CAAA;IAC1D,4DAAgD,CAAA;IAChD,2EAA+D,CAAA;IAC/D,2DAA+C,CAAA;AACjD,CAAC,EAnBW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAmBnB"}

package/utils/angular/workspace.d.ts

@@ -3,13 +3,24 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 import { json, workspaces } from '@angular-devkit/core';
 import { Rule, Tree } from '@angular-devkit/schematics';
 export declare type WorkspaceDefinition = workspaces.WorkspaceDefinition;
 export declare type ProjectDefinition = workspaces.ProjectDefinition;
 export declare type TargetDefinition = workspaces.TargetDefinition;
+/**
+ * A {@link workspaces.WorkspaceHost} backed by a Schematics {@link Tree} instance.
+ */
+export declare class TreeWorkspaceHost implements workspaces.WorkspaceHost {
+    private readonly tree;
+    constructor(tree: Tree);
+    readFile(path: string): Promise<string>;
+    writeFile(path: string, data: string): Promise<void>;
+    isDirectory(path: string): Promise<boolean>;
+    isFile(path: string): Promise<boolean>;
+}
 /**
  * Updates the workspace file (`angular.json`) found within the root of the schematic's tree.
  * The workspace object model can be directly modified within the provided updater function

package/utils/angular/workspace.js

@@ -4,10 +4,10 @@
  * 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
+ * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allTargetOptions = exports.allWorkspaceTargets = exports.createDefaultPath = exports.buildDefaultPath = exports.writeWorkspace = exports.getWorkspace = exports.updateWorkspace = void 0;
+exports.allTargetOptions = exports.allWorkspaceTargets = exports.createDefaultPath = exports.buildDefaultPath = exports.writeWorkspace = exports.getWorkspace = exports.updateWorkspace = exports.TreeWorkspaceHost = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const workspace_models_1 = require("./workspace-models");
@@ -38,6 +38,7 @@ class TreeWorkspaceHost {
         return this.tree.exists(path);
     }
 }
+exports.TreeWorkspaceHost = TreeWorkspaceHost;
 /**
  * Updates the workspace file (`angular.json`) found within the root of the schematic's tree.
  * The workspace object model can be directly modified within the provided updater function
@@ -49,11 +50,10 @@ class TreeWorkspaceHost {
  * workspace. A {@link WorkspaceDefinition} is provided as the first argument to the function.
  */
 function updateWorkspace(updater) {
-    return async (tree) => {
-        const host = new TreeWorkspaceHost(tree);
-        const { workspace } = await core_1.workspaces.readWorkspace(DEFAULT_WORKSPACE_PATH, host);
+    return async (host) => {
+        const workspace = await getWorkspace(host);
         const result = await updater(workspace);
-        await core_1.workspaces.writeWorkspace(workspace, host);
+        await core_1.workspaces.writeWorkspace(workspace, new TreeWorkspaceHost(host));
         return result || schematics_1.noop;
     };
 }

package/utils/angular/workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/workspace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../packages/schematics/src/utils/angular/workspace.ts"],"names":[],"mappings":"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"}

package/utils/ast.d.ts

@@ -2,3 +2,4 @@ import * as ts from 'typescript';
 export declare function findEnvironmentExpression(source: ts.SourceFile): ts.ObjectLiteralExpression | undefined;
 export declare function getAssignedPropertyFromObjectliteral(expression: ts.ObjectLiteralExpression, variableSelector: string[]): string | undefined;
 export declare function isBooleanStringOrNumberLiteral(node: ts.Node): node is ts.StringLiteral | ts.NumericLiteral | ts.BooleanLiteral;
+export declare function removeEmptyElementsFromArrayLiteral(array: ts.ArrayLiteralExpression): ts.ArrayLiteralExpression;

package/utils/ast.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBooleanStringOrNumberLiteral = exports.getAssignedPropertyFromObjectliteral = exports.findEnvironmentExpression = void 0;
+exports.removeEmptyElementsFromArrayLiteral = exports.isBooleanStringOrNumberLiteral = exports.getAssignedPropertyFromObjectliteral = exports.findEnvironmentExpression = void 0;
 const ts = require("typescript");
 const ast_utils_1 = require("./angular/ast-utils");
 function findEnvironmentExpression(source) {
@@ -21,4 +21,9 @@ function isBooleanStringOrNumberLiteral(node) {
         node.kind === ts.SyntaxKind.FalseKeyword);
 }
 exports.isBooleanStringOrNumberLiteral = isBooleanStringOrNumberLiteral;
+function removeEmptyElementsFromArrayLiteral(array) {
+    const cleaned = array.elements.filter(el => el.kind !== ts.SyntaxKind.OmittedExpression);
+    return ts.factory.updateArrayLiteralExpression(array, ts.factory.createNodeArray(cleaned));
+}
+exports.removeEmptyElementsFromArrayLiteral = removeEmptyElementsFromArrayLiteral;
 //# sourceMappingURL=ast.js.map

package/utils/ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/ast.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,mDAAgD;AAEhD,SAAgB,yBAAyB,CAAC,MAAqB;IAC7D,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,CAAC,CAAC;IACpE,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;AACzE,CAAC;AAHD,8DAGC;AAED,SAAgB,oCAAoC,CAClD,UAAsC,EACtC,gBAA0B;IAE1B,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,UAAU,EAAE,8BAA8B,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtC,OAAO,CACL,gBAAgB,CAAC,WAAW,CAC1B,CAAC,GAA0B,EAAE,GAAG,EAAE,EAAE,CAClC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAC9D,IAAI,CAAC,MAAM,CACZ,CACF,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACjD,CAAC;AAjBD,oFAiBC;AAED,SAAgB,8BAA8B,CAC5C,IAAa;IAEb,OAAO,CACL,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;QACxB,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW;QACvC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CACzC,CAAC;AACJ,CAAC;AATD,wEASC"}
+{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/ast.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,mDAAgD;AAEhD,SAAgB,yBAAyB,CAAC,MAAqB;IAC7D,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,CAAC,CAAC;IACpE,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;AACzE,CAAC;AAHD,8DAGC;AAED,SAAgB,oCAAoC,CAClD,UAAsC,EACtC,gBAA0B;IAE1B,MAAM,WAAW,GAAG,IAAA,qBAAS,EAAC,UAAU,EAAE,8BAA8B,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtC,OAAO,CACL,gBAAgB,CAAC,WAAW,CAC1B,CAAC,GAA0B,EAAE,GAAG,EAAE,EAAE,CAClC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EAC9D,IAAI,CAAC,MAAM,CACZ,CACF,CACF,CAAC;IAEF,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACjD,CAAC;AAjBD,oFAiBC;AAED,SAAgB,8BAA8B,CAC5C,IAAa;IAEb,OAAO,CACL,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;QACxB,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW;QACvC,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,CACzC,CAAC;AACJ,CAAC;AATD,wEASC;AAED,SAAgB,mCAAmC,CACjD,KAAgC;IAEhC,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IACzF,OAAO,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;AAC7F,CAAC;AALD,kFAKC"}

package/utils/index.d.ts

@@ -18,3 +18,5 @@ export * from './text';
 export * from './tree';
 export * from './type';
 export * from './workspace';
+export * from './standalone';
+export * from './ng-module';

package/utils/index.js

@@ -34,4 +34,6 @@ __exportStar(require("./text"), exports);
 __exportStar(require("./tree"), exports);
 __exportStar(require("./type"), exports);
 __exportStar(require("./workspace"), exports);
+__exportStar(require("./standalone"), exports);
+__exportStar(require("./ng-module"), exports);
 //# sourceMappingURL=index.js.map

package/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,6CAA2B;AAC3B,2CAAyB;AACzB,4CAA0B;AAC1B,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,wCAAsB;AACtB,wCAAsB;AACtB,2CAAyB;AACzB,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,6CAA2B;AAC3B,2CAAyB;AACzB,4CAA0B;AAC1B,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,2CAAyB;AACzB,yCAAuB;AACvB,yCAAuB;AACvB,yCAAuB;AACvB,8CAA4B;AAC5B,+CAA6B;AAC7B,8CAA4B"}

package/utils/ng-module.d.ts

@@ -0,0 +1,46 @@
+import { Tree, UpdateRecorder } from '@angular-devkit/schematics';
+import * as ts from 'typescript';
+import { Path } from '@angular-devkit/core';
+/**
+ * Checks whether a specific import or provider exists in the specified metadata
+ * array (`imports`, `providers`, etc.) of the `NgModule` decorator in the AppModule.
+ *
+ * This function locates the AppModule file of the given Angular project,
+ * parses its AST, and inspects the specified metadata array to determine
+ * if it includes an element matching the provided string (e.g., `CommonModule`, `HttpClientModule`).
+ *
+ * @param host - The virtual file system tree used by Angular schematics.
+ * @param projectName - The name of the Angular project.
+ * @param metadataFn - The name (string) to match against the elements of the metadata array.
+ * @param metadataName - The metadata field to search in (e.g., 'imports', 'providers'). Defaults to 'imports'.
+ * @returns A promise that resolves to `true` if the metadata function is found, or `false` otherwise.
+ * @throws SchematicsException if the AppModule file or expected metadata is not found or malformed.
+ */
+export declare const hasImportInNgModule: (host: Tree, projectName: string, metadataFn: string, metadataName?: string) => Promise<boolean>;
+/**
+ * Attempts to locate the path of the `AppRoutingModule` file that is imported
+ * within the root AppModule file of an Angular application.
+ *
+ * This function reads the AppModule file (resolved from the main file path),
+ * parses its AST, and searches for an import declaration that imports
+ * `AppRoutingModule`. Once found, it resolves the import path to a normalized
+ * file path relative to the workspace root.
+ *
+ * @param tree - The virtual file system tree used by Angular schematics.
+ * @param mainFilePath - The path to the main entry file of the Angular application (typically `main.ts`).
+ * @returns A normalized workspace-relative path to the AppRoutingModule file if found, or `null` otherwise.
+ * @throws If the route file path is resolved but the file does not exist in the tree.
+ */
+export declare function findAppRoutesModulePath(tree: Tree, mainFilePath: string): Promise<Path | null>;
+/**
+ * Cleans up empty or invalid expressions (e.g., extra commas) from the `imports` and `providers`
+ * arrays in the NgModule decorator of an Angular module file.
+ *
+ * This function parses the source file's AST, locates the `NgModule` decorator, and processes
+ * the `imports` and `providers` metadata fields. If these fields contain array literals with
+ * empty slots (such as trailing or double commas), they are removed and the array is rewritten.
+ *
+ * @param source - The TypeScript source file containing the Angular module.
+ * @param recorder - The recorder used to apply changes to the source file.
+ */
+export declare function cleanEmptyExprFromModule(source: ts.SourceFile, recorder: UpdateRecorder): void;

package/utils/ng-module.js

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanEmptyExprFromModule = exports.findAppRoutesModulePath = exports.hasImportInNgModule = void 0;
+const schematics_1 = require("@angular-devkit/schematics");
+const util_1 = require("./angular/standalone/util");
+const ts = require("typescript");
+const angular_1 = require("./angular");
+const index_1 = require("../commands/change-theme/index");
+const core_1 = require("@angular-devkit/core");
+const path = require("path");
+const ast_1 = require("./ast");
+/**
+ * Checks whether a specific import or provider exists in the specified metadata
+ * array (`imports`, `providers`, etc.) of the `NgModule` decorator in the AppModule.
+ *
+ * This function locates the AppModule file of the given Angular project,
+ * parses its AST, and inspects the specified metadata array to determine
+ * if it includes an element matching the provided string (e.g., `CommonModule`, `HttpClientModule`).
+ *
+ * @param host - The virtual file system tree used by Angular schematics.
+ * @param projectName - The name of the Angular project.
+ * @param metadataFn - The name (string) to match against the elements of the metadata array.
+ * @param metadataName - The metadata field to search in (e.g., 'imports', 'providers'). Defaults to 'imports'.
+ * @returns A promise that resolves to `true` if the metadata function is found, or `false` otherwise.
+ * @throws SchematicsException if the AppModule file or expected metadata is not found or malformed.
+ */
+const hasImportInNgModule = async (host, projectName, metadataFn, metadataName = 'imports') => {
+    const mainFilePath = await (0, util_1.getMainFilePath)(host, projectName);
+    const appModulePath = (0, angular_1.getAppModulePath)(host, mainFilePath);
+    const buffer = host.read(appModulePath);
+    if (!buffer) {
+        throw new schematics_1.SchematicsException(`Could not read file: ${appModulePath}`);
+    }
+    const source = (0, index_1.createSourceFile)(host, appModulePath);
+    // Get the NgModule decorator metadata
+    const ngModuleDecorator = (0, angular_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core')[0];
+    if (!ngModuleDecorator) {
+        throw new schematics_1.SchematicsException('The app module does not found');
+    }
+    const matchingProperties = (0, angular_1.getMetadataField)(ngModuleDecorator, metadataName);
+    const assignment = matchingProperties[0];
+    const assignmentInit = assignment.initializer;
+    const elements = assignmentInit.elements;
+    if (!elements || elements.length < 1) {
+        throw new schematics_1.SchematicsException(`Elements could not found: ${elements}`);
+    }
+    return elements.some(f => f.getText().match(metadataFn));
+};
+exports.hasImportInNgModule = hasImportInNgModule;
+/**
+ * Attempts to locate the path of the `AppRoutingModule` file that is imported
+ * within the root AppModule file of an Angular application.
+ *
+ * This function reads the AppModule file (resolved from the main file path),
+ * parses its AST, and searches for an import declaration that imports
+ * `AppRoutingModule`. Once found, it resolves the import path to a normalized
+ * file path relative to the workspace root.
+ *
+ * @param tree - The virtual file system tree used by Angular schematics.
+ * @param mainFilePath - The path to the main entry file of the Angular application (typically `main.ts`).
+ * @returns A normalized workspace-relative path to the AppRoutingModule file if found, or `null` otherwise.
+ * @throws If the route file path is resolved but the file does not exist in the tree.
+ */
+async function findAppRoutesModulePath(tree, mainFilePath) {
+    const appModulePath = (0, angular_1.getAppModulePath)(tree, mainFilePath);
+    if (!appModulePath || !tree.exists(appModulePath))
+        return null;
+    const buffer = tree.read(appModulePath);
+    if (!buffer)
+        return null;
+    const source = ts.createSourceFile(appModulePath, buffer.toString('utf-8'), ts.ScriptTarget.Latest, true);
+    for (const stmt of source.statements) {
+        if (!ts.isImportDeclaration(stmt))
+            continue;
+        const importClause = stmt.importClause;
+        if (!importClause?.namedBindings || !ts.isNamedImports(importClause.namedBindings))
+            continue;
+        const isRoutesImport = importClause.namedBindings.elements.some(el => el.name.getText() === 'AppRoutingModule');
+        if (!isRoutesImport || !ts.isStringLiteral(stmt.moduleSpecifier))
+            continue;
+        let importPath = stmt.moduleSpecifier.text;
+        if (!importPath.endsWith('.ts')) {
+            importPath += '.ts';
+        }
+        const configDir = path.dirname(appModulePath);
+        const resolvedFsPath = path.resolve(configDir, importPath);
+        const workspaceRelativePath = path.relative(process.cwd(), resolvedFsPath).replace(/\\/g, '/');
+        const normalizedPath = (0, core_1.normalize)(workspaceRelativePath);
+        if (!tree.exists(normalizedPath)) {
+            throw new Error(`Cannot find routes file: ${normalizedPath}`);
+        }
+        return normalizedPath;
+    }
+    return null;
+}
+exports.findAppRoutesModulePath = findAppRoutesModulePath;
+/**
+ * Cleans up empty or invalid expressions (e.g., extra commas) from the `imports` and `providers`
+ * arrays in the NgModule decorator of an Angular module file.
+ *
+ * This function parses the source file's AST, locates the `NgModule` decorator, and processes
+ * the `imports` and `providers` metadata fields. If these fields contain array literals with
+ * empty slots (such as trailing or double commas), they are removed and the array is rewritten.
+ *
+ * @param source - The TypeScript source file containing the Angular module.
+ * @param recorder - The recorder used to apply changes to the source file.
+ */
+function cleanEmptyExprFromModule(source, recorder) {
+    const ngModuleNode = (0, angular_1.getDecoratorMetadata)(source, 'NgModule', '@angular/core')[0];
+    if (!ngModuleNode)
+        return;
+    const printer = ts.createPrinter();
+    const metadataKeys = ['imports', 'providers'];
+    for (const key of metadataKeys) {
+        const metadataField = (0, angular_1.getMetadataField)(ngModuleNode, key);
+        if (!metadataField.length)
+            continue;
+        const assignment = metadataField[0];
+        const arrayLiteral = assignment.initializer;
+        const cleanedArray = (0, ast_1.removeEmptyElementsFromArrayLiteral)(arrayLiteral);
+        recorder.remove(arrayLiteral.getStart(), arrayLiteral.getWidth());
+        recorder.insertLeft(arrayLiteral.getStart(), printer.printNode(ts.EmitHint.Expression, cleanedArray, source));
+    }
+}
+exports.cleanEmptyExprFromModule = cleanEmptyExprFromModule;
+//# sourceMappingURL=ng-module.js.map

package/utils/ng-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ng-module.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/ng-module.ts"],"names":[],"mappings":"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"}