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

package/refactor/jasmine-vitest/utils/ast-helpers.js

@@ -13,10 +13,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addVitestValueImport = addVitestValueImport;
 exports.addVitestTypeImport = addVitestTypeImport;
 exports.getVitestAutoImports = getVitestAutoImports;
-exports.createViCallExpression = createViCallExpression;
 exports.createExpectCallExpression = createExpectCallExpression;
 exports.createPropertyAccess = createPropertyAccess;
 exports.getPromiseResolveRejectMethod = getPromiseResolveRejectMethod;
+exports.isNamedImportFrom = isNamedImportFrom;
+exports.removeImportSpecifiers = removeImportSpecifiers;
 const typescript_1 = __importDefault(require("typescript"));
 function addVitestValueImport(imports, importName) {
     imports.add(importName);
@@ -40,13 +41,8 @@ function getVitestAutoImports(valueImports, typeImports) {
         allSpecifiers.push(typescript_1.default.factory.createImportSpecifier(!isClauseTypeOnly, undefined, typescript_1.default.factory.createIdentifier(i)));
     }
     allSpecifiers.sort((a, b) => a.name.text.localeCompare(b.name.text));
-    const importClause = typescript_1.default.factory.createImportClause(isClauseTypeOnly, // Set isTypeOnly on the clause if only type imports
-    undefined, typescript_1.default.factory.createNamedImports(allSpecifiers));
-    return typescript_1.default.factory.createImportDeclaration(undefined, importClause, typescript_1.default.factory.createStringLiteral('vitest'));
-}
-function createViCallExpression(methodName, args = [], typeArgs = undefined) {
-    const callee = typescript_1.default.factory.createPropertyAccessExpression(typescript_1.default.factory.createIdentifier('vi'), methodName);
-    return typescript_1.default.factory.createCallExpression(callee, typeArgs, args);
+    return typescript_1.default.factory.createImportDeclaration(undefined, typescript_1.default.factory.createImportClause(isClauseTypeOnly, // Set isTypeOnly on the clause if only type imports
+    undefined, typescript_1.default.factory.createNamedImports(allSpecifiers)), typescript_1.default.factory.createStringLiteral('vitest'));
 }
 function createExpectCallExpression(args, typeArgs = undefined) {
     return typescript_1.default.factory.createCallExpression(typescript_1.default.factory.createIdentifier('expect'), typeArgs, args);
@@ -76,4 +72,67 @@ function getPromiseResolveRejectMethod(node) {
         arguments: node.arguments,
     };
 }
+/**
+ * Checks if a named binding is imported from the given module in the source file.
+ * @param sourceFile The source file to search for imports.
+ * @param name The import name (e.g. 'flush', 'tick').
+ * @param moduleSpecifier The module path (e.g. '@angular/core/testing').
+ */
+function isNamedImportFrom(sourceFile, name, moduleSpecifier) {
+    return sourceFile.statements.some((statement) => {
+        if (!_isImportDeclarationWithNamedBindings(statement)) {
+            return false;
+        }
+        const specifier = statement.moduleSpecifier;
+        const modulePath = typescript_1.default.isStringLiteralLike(specifier) ? specifier.text : null;
+        if (modulePath !== moduleSpecifier) {
+            return false;
+        }
+        for (const element of statement.importClause.namedBindings.elements) {
+            const importedName = element.propertyName ? element.propertyName.text : element.name.text;
+            if (importedName === name) {
+                return true;
+            }
+        }
+    });
+}
+/**
+ * Removes specified import specifiers from ImportDeclarations.
+ * If all specifiers are removed from an import, the entire import is dropped.
+ */
+function removeImportSpecifiers(sourceFile, removals) {
+    const newStatements = sourceFile.statements
+        .map((statement) => {
+        if (!_isImportDeclarationWithNamedBindings(statement)) {
+            return statement;
+        }
+        const specifier = statement.moduleSpecifier;
+        const modulePath = typescript_1.default.isStringLiteralLike(specifier) ? specifier.text : null;
+        if (modulePath === null) {
+            return statement;
+        }
+        const namesToRemove = removals.get(modulePath);
+        if (namesToRemove === undefined || namesToRemove.size === 0) {
+            return statement;
+        }
+        const remaining = statement.importClause.namedBindings.elements.filter((el) => {
+            const name = el.propertyName ? el.propertyName.text : el.name.text;
+            return !namesToRemove.has(name);
+        });
+        if (remaining.length === 0) {
+            return;
+        }
+        if (remaining.length === statement.importClause.namedBindings.elements.length) {
+            return statement;
+        }
+        return typescript_1.default.factory.updateImportDeclaration(statement, statement.modifiers, typescript_1.default.factory.updateImportClause(statement.importClause, undefined, statement.importClause.name, typescript_1.default.factory.createNamedImports(remaining)), statement.moduleSpecifier, statement.attributes);
+    })
+        .filter((statement) => statement !== undefined);
+    return typescript_1.default.factory.updateSourceFile(sourceFile, newStatements);
+}
+function _isImportDeclarationWithNamedBindings(statement) {
+    return (typescript_1.default.isImportDeclaration(statement) &&
+        statement.importClause?.namedBindings !== undefined &&
+        typescript_1.default.isNamedImports(statement.importClause.namedBindings));
+}
 //# sourceMappingURL=ast-helpers.js.map

package/refactor/jasmine-vitest/utils/ast-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["ast-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["ast-helpers.ts"],"names":[],"mappings":"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"}

package/refactor/jasmine-vitest/utils/constants.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.dev/license
+ */
+export declare const ANGULAR_CORE_TESTING = "@angular/core/testing";

package/refactor/jasmine-vitest/utils/constants.js

@@ -0,0 +1,12 @@
+"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.ANGULAR_CORE_TESTING = void 0;
+exports.ANGULAR_CORE_TESTING = '@angular/core/testing';
+//# sourceMappingURL=constants.js.map

package/refactor/jasmine-vitest/utils/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["constants.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEU,QAAA,oBAAoB,GAAG,uBAAuB,CAAC"}

package/refactor/jasmine-vitest/utils/refactor-context.d.ts

@@ -22,6 +22,11 @@ export interface RefactorContext {
     readonly pendingVitestValueImports: Set<string>;
     /** A set of Vitest type imports to be added to the file. */
     readonly pendingVitestTypeImports: Set<string>;
+    /**
+     * Map of module specifier -> names to remove from that import.
+     * Used when transforming identifiers that become inlined (e.g. flush -> vi.runAllTimersAsync).
+     */
+    readonly pendingImportSpecifierRemovals: Map<string, Set<string>>;
 }
 /**
  * A generic transformer function that operates on a specific type of ts.Node.

package/refactor/jasmine-vitest/utils/refactor-helpers.d.ts

@@ -0,0 +1,39 @@
+/**
+ * @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
+ */
+import ts from 'typescript';
+import { RefactorContext } from './refactor-context';
+/**
+ * Marks an identifier to be removed from an import specifier.
+ *
+ * @param ctx The refactor context object.
+ * @param name The name of the identifier to remove from the import specifier.
+ * @param moduleSpecifier The module specifier to remove the identifier from.
+ */
+export declare function addImportSpecifierRemoval(ctx: RefactorContext, name: string, moduleSpecifier: string): void;
+/**
+ * Creates a call expression to a vitest method.
+ * This also adds the `vi` identifier to the context object,
+ * to import it later if addImports option is enabled.
+ *
+ * @param ctx The refactor context object.
+ * @param args The arguments to pass to the method.
+ * @param typeArgs The type arguments to pass to the method.
+ * @param methodeName The name of the vitest method to call.
+ * @returns The created identifier node.
+ */
+export declare function createViCallExpression(ctx: RefactorContext, methodName: string, args?: readonly ts.Expression[], typeArgs?: ts.TypeNode[] | undefined): ts.CallExpression;
+/**
+ * Creates an identifier for a vitest value import.
+ * This also adds the identifier to the context object,
+ * to import it later if addImports option is enabled.
+ *
+ * @param ctx The refactor context object.
+ * @param name The name of the vitest identifier to require.
+ * @returns The created identifier node.
+ */
+export declare function requireVitestIdentifier(ctx: RefactorContext, name: string): ts.Identifier;

package/refactor/jasmine-vitest/utils/refactor-helpers.js

@@ -0,0 +1,58 @@
+"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
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addImportSpecifierRemoval = addImportSpecifierRemoval;
+exports.createViCallExpression = createViCallExpression;
+exports.requireVitestIdentifier = requireVitestIdentifier;
+const typescript_1 = __importDefault(require("typescript"));
+/**
+ * Marks an identifier to be removed from an import specifier.
+ *
+ * @param ctx The refactor context object.
+ * @param name The name of the identifier to remove from the import specifier.
+ * @param moduleSpecifier The module specifier to remove the identifier from.
+ */
+function addImportSpecifierRemoval(ctx, name, moduleSpecifier) {
+    const removals = ctx.pendingImportSpecifierRemovals.get(moduleSpecifier) ?? new Set();
+    removals.add(name);
+    ctx.pendingImportSpecifierRemovals.set(moduleSpecifier, removals);
+}
+/**
+ * Creates a call expression to a vitest method.
+ * This also adds the `vi` identifier to the context object,
+ * to import it later if addImports option is enabled.
+ *
+ * @param ctx The refactor context object.
+ * @param args The arguments to pass to the method.
+ * @param typeArgs The type arguments to pass to the method.
+ * @param methodeName The name of the vitest method to call.
+ * @returns The created identifier node.
+ */
+function createViCallExpression(ctx, methodName, args = [], typeArgs = undefined) {
+    const vi = requireVitestIdentifier(ctx, 'vi');
+    const callee = typescript_1.default.factory.createPropertyAccessExpression(vi, methodName);
+    return typescript_1.default.factory.createCallExpression(callee, typeArgs, args);
+}
+/**
+ * Creates an identifier for a vitest value import.
+ * This also adds the identifier to the context object,
+ * to import it later if addImports option is enabled.
+ *
+ * @param ctx The refactor context object.
+ * @param name The name of the vitest identifier to require.
+ * @returns The created identifier node.
+ */
+function requireVitestIdentifier(ctx, name) {
+    ctx.pendingVitestValueImports.add(name);
+    return typescript_1.default.factory.createIdentifier(name);
+}
+//# sourceMappingURL=refactor-helpers.js.map

package/refactor/jasmine-vitest/utils/refactor-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refactor-helpers.js","sourceRoot":"","sources":["refactor-helpers.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAYH,8DAQC;AAaD,wDAUC;AAWD,0DAIC;AAxDD,4DAA4B;AAG5B;;;;;;GAMG;AACH,SAAgB,yBAAyB,CACvC,GAAoB,EACpB,IAAY,EACZ,eAAuB;IAEvB,MAAM,QAAQ,GAAG,GAAG,CAAC,8BAA8B,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;IAC9F,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnB,GAAG,CAAC,8BAA8B,CAAC,GAAG,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;AACpE,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAgB,sBAAsB,CACpC,GAAoB,EACpB,UAAkB,EAClB,OAAiC,EAAE,EACnC,WAAsC,SAAS;IAE/C,MAAM,EAAE,GAAG,uBAAuB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,oBAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAEzE,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AACjE,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,uBAAuB,CAAC,GAAoB,EAAE,IAAY;IACxE,GAAG,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAExC,OAAO,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;AAC3C,CAAC"}

package/refactor/jasmine-vitest/utils/todo-notes.d.ts

@@ -148,6 +148,12 @@ export declare const TODO_NOTES: {
     readonly 'unhandled-done-usage': {
         readonly message: "The 'done' callback was used in an unhandled way. Please migrate manually.";
     };
+    readonly 'flush-max-turns': {
+        readonly message: "flush(maxTurns) was called but maxTurns parameter is not migrated. Please migrate manually.";
+    };
+    readonly 'flush-return-value': {
+        readonly message: "flush() return value is not migrated. Please migrate manually.";
+    };
 };
 /**
  * A union type of all possible "TODO" categories.

package/refactor/jasmine-vitest/utils/todo-notes.js

@@ -151,5 +151,11 @@ exports.TODO_NOTES = {
     'unhandled-done-usage': {
         message: "The 'done' callback was used in an unhandled way. Please migrate manually.",
     },
+    'flush-max-turns': {
+        message: 'flush(maxTurns) was called but maxTurns parameter is not migrated. Please migrate manually.',
+    },
+    'flush-return-value': {
+        message: 'flush() return value is not migrated. Please migrate manually.',
+    },
 };
 //# sourceMappingURL=todo-notes.js.map

package/refactor/jasmine-vitest/utils/todo-notes.js.map

@@ -1 +1 @@
-{"version":3,"file":"todo-notes.js","sourceRoot":"","sources":["todo-notes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"todo-notes.js","sourceRoot":"","sources":["todo-notes.ts"],"names":[],"mappings":"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"}

package/service/files/__name@dasherize__.__type@dasherize__.ts.template

@@ -1,8 +1,8 @@
-import { Injectable } from '@angular/core';
+import { <%= injectable ? 'Injectable' : 'Service' %> } from '@angular/core';
 
-@Injectable({
+<% if (injectable) { %>@Injectable({
   providedIn: 'root',
-})
+})<% } else { %>@Service()<% } %>
 export class <%= classifiedName %> {
   
 }

package/service/schema.d.ts

@@ -14,6 +14,10 @@ export type Schema = {
      * folder with the service's name will be created to contain the files.
      */
     flat?: boolean;
+    /**
+     * When true, generates an `@Injectable` instead of `@Service`.
+     */
+    injectable?: boolean;
     /**
      * The name for the new service. This will be used to create the service's class and spec
      * files (e.g., `my-service.service.ts` and `my-service.service.spec.ts`).

package/service/schema.json

@@ -48,6 +48,11 @@
       "type": "boolean",
       "default": true,
       "description": "When true, the 'type' option will be appended to the generated class name. When false, only the file name will include the type."
+    },
+    "injectable": {
+      "type": "boolean",
+      "default": false,
+      "description": "When true, generates an `@Injectable` instead of `@Service`."
     }
   },
   "required": ["name", "project"]

package/utility/latest-versions/package.json

@@ -27,6 +27,7 @@
     "typescript": "~6.0.2",
     "vitest": "^4.0.8",
     "@vitest/coverage-v8": "^4.0.8",
+    "@vitest/coverage-istanbul": "^4.0.8",
     "@vitest/browser-playwright": "^4.0.8",
     "@vitest/browser-webdriverio": "^4.0.8",
     "@vitest/browser-preview": "^4.0.8",

package/utility/latest-versions.js

@@ -16,8 +16,8 @@ exports.latestVersions = {
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^22.0.0-next.0',
     NgPackagr: '^22.0.0-next.0',
-    DevkitBuildAngular: '^22.0.0-next.7',
-    AngularBuild: '^22.0.0-next.7',
-    AngularSSR: '^22.0.0-next.7',
+    DevkitBuildAngular: '^22.0.0-next.8',
+    AngularBuild: '^22.0.0-next.8',
+    AngularSSR: '^22.0.0-next.8',
 };
 //# sourceMappingURL=latest-versions.js.map