@schematics/angular 21.0.0-next.9 → 21.0.0-rc.1

package/refactor/jasmine-vitest/transformers/jasmine-spy.js

@@ -25,12 +25,13 @@ const ast_helpers_1 = require("../utils/ast-helpers");
 const ast_validation_1 = require("../utils/ast-validation");
 const comment_helpers_1 = require("../utils/comment-helpers");
 function transformSpies(node, refactorCtx) {
-    const { sourceFile, reporter } = refactorCtx;
+    const { sourceFile, reporter, pendingVitestValueImports } = refactorCtx;
     if (!typescript_1.default.isCallExpression(node)) {
         return node;
     }
     if (typescript_1.default.isIdentifier(node.expression) &&
         (node.expression.text === 'spyOn' || node.expression.text === 'spyOnProperty')) {
+        (0, ast_helpers_1.addVitestValueImport)(pendingVitestValueImports, 'vi');
         reporter.reportTransformation(sourceFile, node, `Transformed \`${node.expression.text}\` to \`vi.spyOn\`.`);
         return typescript_1.default.factory.updateCallExpression(node, (0, ast_helpers_1.createPropertyAccess)('vi', 'spyOn'), node.typeArguments, node.arguments);
     }
@@ -108,6 +109,7 @@ function transformSpies(node, refactorCtx) {
     const jasmineMethodName = (0, ast_validation_1.getJasmineMethodName)(node);
     switch (jasmineMethodName) {
         case 'createSpy':
+            (0, ast_helpers_1.addVitestValueImport)(pendingVitestValueImports, 'vi');
             reporter.reportTransformation(sourceFile, node, 'Transformed `jasmine.createSpy()` to `vi.fn()`.');
             // jasmine.createSpy(name, originalFn) -> vi.fn(originalFn)
             return (0, ast_helpers_1.createViCallExpression)('fn', node.arguments.length > 1 ? [node.arguments[1]] : []);
@@ -121,10 +123,11 @@ function transformSpies(node, refactorCtx) {
     }
     return node;
 }
-function transformCreateSpyObj(node, { sourceFile, reporter }) {
+function transformCreateSpyObj(node, { sourceFile, reporter, pendingVitestValueImports }) {
     if (!(0, ast_validation_1.isJasmineCallExpression)(node, 'createSpyObj')) {
         return node;
     }
+    (0, ast_helpers_1.addVitestValueImport)(pendingVitestValueImports, 'vi');
     reporter.reportTransformation(sourceFile, node, 'Transformed `jasmine.createSpyObj()` to an object literal with `vi.fn()`.');
     if (node.arguments.length < 2) {
         const category = 'createSpyObj-single-argument';
@@ -205,78 +208,95 @@ function getSpyIdentifierFromCalls(node) {
     }
     return undefined;
 }
-function createMockedSpyMockProperty(spyIdentifier) {
+function createMockedSpyMockProperty(spyIdentifier, pendingVitestValueImports) {
+    (0, ast_helpers_1.addVitestValueImport)(pendingVitestValueImports, 'vi');
     const mockedSpy = typescript_1.default.factory.createCallExpression((0, ast_helpers_1.createPropertyAccess)('vi', 'mocked'), undefined, [spyIdentifier]);
     return (0, ast_helpers_1.createPropertyAccess)(mockedSpy, 'mock');
 }
-function transformSpyCallInspection(node, { sourceFile, reporter }) {
-    // mySpy.calls.mostRecent().args -> vi.mocked(mySpy).mock.lastCall
-    if (typescript_1.default.isPropertyAccessExpression(node) &&
-        typescript_1.default.isIdentifier(node.name) &&
-        node.name.text === 'args') {
-        const mostRecentCall = node.expression;
-        if (typescript_1.default.isCallExpression(mostRecentCall) &&
-            typescript_1.default.isPropertyAccessExpression(mostRecentCall.expression)) {
-            const mostRecentPae = mostRecentCall.expression; // mySpy.calls.mostRecent
-            if (typescript_1.default.isIdentifier(mostRecentPae.name) &&
-                mostRecentPae.name.text === 'mostRecent' &&
-                typescript_1.default.isPropertyAccessExpression(mostRecentPae.expression)) {
-                const spyIdentifier = getSpyIdentifierFromCalls(mostRecentPae.expression);
-                if (spyIdentifier) {
-                    reporter.reportTransformation(sourceFile, node, 'Transformed `spy.calls.mostRecent().args` to `vi.mocked(spy).mock.lastCall`.');
-                    const mockProperty = createMockedSpyMockProperty(spyIdentifier);
-                    return (0, ast_helpers_1.createPropertyAccess)(mockProperty, 'lastCall');
+function transformMostRecentArgs(node, { sourceFile, reporter, pendingVitestValueImports }) {
+    // Check 1: Is it a property access for `.args`?
+    if (!typescript_1.default.isPropertyAccessExpression(node) ||
+        !typescript_1.default.isIdentifier(node.name) ||
+        node.name.text !== 'args') {
+        return node;
+    }
+    // Check 2: Is the preceding expression a call expression?
+    const mostRecentCall = node.expression;
+    if (!typescript_1.default.isCallExpression(mostRecentCall) ||
+        !typescript_1.default.isPropertyAccessExpression(mostRecentCall.expression)) {
+        return node;
+    }
+    // Check 3: Is it a call to `.mostRecent`?
+    const mostRecentPae = mostRecentCall.expression;
+    if (!typescript_1.default.isIdentifier(mostRecentPae.name) ||
+        mostRecentPae.name.text !== 'mostRecent' ||
+        !typescript_1.default.isPropertyAccessExpression(mostRecentPae.expression)) {
+        return node;
+    }
+    // Check 4: Can we get the spy identifier from `spy.calls`?
+    const spyIdentifier = getSpyIdentifierFromCalls(mostRecentPae.expression);
+    if (!spyIdentifier) {
+        return node;
+    }
+    // If all checks pass, perform the transformation.
+    reporter.reportTransformation(sourceFile, node, 'Transformed `spy.calls.mostRecent().args` to `vi.mocked(spy).mock.lastCall`.');
+    const mockProperty = createMockedSpyMockProperty(spyIdentifier, pendingVitestValueImports);
+    return (0, ast_helpers_1.createPropertyAccess)(mockProperty, 'lastCall');
+}
+function transformSpyCallInspection(node, refactorCtx) {
+    const mostRecentArgsTransformed = transformMostRecentArgs(node, refactorCtx);
+    if (mostRecentArgsTransformed !== node) {
+        return mostRecentArgsTransformed;
+    }
+    if (!typescript_1.default.isCallExpression(node) || !typescript_1.default.isPropertyAccessExpression(node.expression)) {
+        return node;
+    }
+    const { sourceFile, reporter, pendingVitestValueImports } = refactorCtx;
+    const pae = node.expression; // e.g., mySpy.calls.count
+    const spyIdentifier = typescript_1.default.isPropertyAccessExpression(pae.expression)
+        ? getSpyIdentifierFromCalls(pae.expression)
+        : undefined;
+    if (spyIdentifier) {
+        const mockProperty = createMockedSpyMockProperty(spyIdentifier, pendingVitestValueImports);
+        const callsProperty = (0, ast_helpers_1.createPropertyAccess)(mockProperty, 'calls');
+        const callName = pae.name.text;
+        let newExpression;
+        let message;
+        switch (callName) {
+            case 'any':
+                message = 'Transformed `spy.calls.any()` to a check on `mock.calls.length`.';
+                newExpression = typescript_1.default.factory.createBinaryExpression((0, ast_helpers_1.createPropertyAccess)(callsProperty, 'length'), typescript_1.default.SyntaxKind.GreaterThanToken, typescript_1.default.factory.createNumericLiteral(0));
+                break;
+            case 'count':
+                message = 'Transformed `spy.calls.count()` to `mock.calls.length`.';
+                newExpression = (0, ast_helpers_1.createPropertyAccess)(callsProperty, 'length');
+                break;
+            case 'first':
+                message = 'Transformed `spy.calls.first()` to `mock.calls[0]`.';
+                newExpression = typescript_1.default.factory.createElementAccessExpression(callsProperty, 0);
+                break;
+            case 'all':
+            case 'allArgs':
+                message = `Transformed \`spy.calls.${callName}()\` to \`mock.calls\`.`;
+                newExpression = callsProperty;
+                break;
+            case 'argsFor':
+                message = 'Transformed `spy.calls.argsFor()` to `mock.calls[i]`.';
+                newExpression = typescript_1.default.factory.createElementAccessExpression(callsProperty, node.arguments[0]);
+                break;
+            case 'mostRecent':
+                if (!typescript_1.default.isPropertyAccessExpression(node.parent) ||
+                    !typescript_1.default.isIdentifier(node.parent.name) ||
+                    node.parent.name.text !== 'args') {
+                    const category = 'mostRecent-without-args';
+                    reporter.recordTodo(category);
+                    (0, comment_helpers_1.addTodoComment)(node, category);
                 }
-            }
+                return node;
         }
-    }
-    if (typescript_1.default.isCallExpression(node) && typescript_1.default.isPropertyAccessExpression(node.expression)) {
-        const pae = node.expression; // e.g., mySpy.calls.count
-        const spyIdentifier = typescript_1.default.isPropertyAccessExpression(pae.expression)
-            ? getSpyIdentifierFromCalls(pae.expression)
-            : undefined;
-        if (spyIdentifier) {
-            const mockProperty = createMockedSpyMockProperty(spyIdentifier);
-            const callsProperty = (0, ast_helpers_1.createPropertyAccess)(mockProperty, 'calls');
-            const callName = pae.name.text;
-            let newExpression;
-            let message;
-            switch (callName) {
-                case 'any':
-                    message = 'Transformed `spy.calls.any()` to a check on `mock.calls.length`.';
-                    newExpression = typescript_1.default.factory.createBinaryExpression((0, ast_helpers_1.createPropertyAccess)(callsProperty, 'length'), typescript_1.default.SyntaxKind.GreaterThanToken, typescript_1.default.factory.createNumericLiteral(0));
-                    break;
-                case 'count':
-                    message = 'Transformed `spy.calls.count()` to `mock.calls.length`.';
-                    newExpression = (0, ast_helpers_1.createPropertyAccess)(callsProperty, 'length');
-                    break;
-                case 'first':
-                    message = 'Transformed `spy.calls.first()` to `mock.calls[0]`.';
-                    newExpression = typescript_1.default.factory.createElementAccessExpression(callsProperty, 0);
-                    break;
-                case 'all':
-                case 'allArgs':
-                    message = `Transformed \`spy.calls.${callName}()\` to \`mock.calls\`.`;
-                    newExpression = callsProperty;
-                    break;
-                case 'argsFor':
-                    message = 'Transformed `spy.calls.argsFor()` to `mock.calls[i]`.';
-                    newExpression = typescript_1.default.factory.createElementAccessExpression(callsProperty, node.arguments[0]);
-                    break;
-                case 'mostRecent':
-                    if (!typescript_1.default.isPropertyAccessExpression(node.parent) ||
-                        !typescript_1.default.isIdentifier(node.parent.name) ||
-                        node.parent.name.text !== 'args') {
-                        const category = 'mostRecent-without-args';
-                        reporter.recordTodo(category);
-                        (0, comment_helpers_1.addTodoComment)(node, category);
-                    }
-                    return node;
-            }
-            if (newExpression && message) {
-                reporter.reportTransformation(sourceFile, node, message);
-                return newExpression;
-            }
+        if (newExpression && message) {
+            reporter.reportTransformation(sourceFile, node, message);
+            return newExpression;
         }
     }
     return node;

package/refactor/jasmine-vitest/transformers/jasmine-spy.js.map

@@ -1 +1 @@
-{"version":3,"file":"jasmine-spy.js","sourceRoot":"","sources":["jasmine-spy.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAeH,wCAyLC;AAED,sDAiDC;AAqCD,8CA0BC;AAoBD,gEAsGC;AAlbD;;;;;GAKG;AAEH,qHAAqF;AACrF,sDAAoF;AACpF,4DAAwF;AACxF,8DAA0D;AAG1D,SAAgB,cAAc,CAAC,IAAa,EAAE,WAA4B;IACxE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAC7C,IAAI,CAAC,oBAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IACE,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC;QAChC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,eAAe,CAAC,EAC9E,CAAC;QACD,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,iBAAiB,IAAI,CAAC,UAAU,CAAC,IAAI,qBAAqB,CAC3D,CAAC;QAEF,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CACpC,IAAI,EACJ,IAAA,kCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,EACnC,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,SAAS,CACf,CAAC;IACJ,CAAC;IAED,IAAI,oBAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5B,IACE,oBAAE,CAAC,0BAA0B,CAAC,GAAG,CAAC,UAAU,CAAC;YAC7C,oBAAE,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;YACpC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,EAClC,CAAC;YACD,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC;YAC1C,IAAI,aAAiC,CAAC;YACtC,IAAI,oBAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;gBACnC,QAAQ,YAAY,EAAE,CAAC;oBACrB,KAAK,aAAa;wBAChB,aAAa,GAAG,iBAAiB,CAAC;wBAClC,MAAM;oBACR,KAAK,WAAW;wBACd,aAAa,GAAG,mBAAmB,CAAC;wBACpC,MAAM;oBACR,KAAK,YAAY;wBACf,aAAa,GAAG,mBAAmB,CAAC;wBACpC,MAAM;oBACR,KAAK,cAAc,CAAC,CAAC,CAAC;wBACpB,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,8EAA8E,CAC/E,CAAC;wBACF,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC;wBACpC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BAC9B,6DAA6D;4BAC7D,OAAO,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;wBAC9C,CAAC;wBACD,kFAAkF;wBAClF,IAAI,WAAW,GAAkB,OAAO,CAAC;wBACzC,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;4BACjC,MAAM,QAAQ,GAAG,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAC9C,IAAA,kCAAoB,EAAC,WAAW,EAAE,qBAAqB,CAAC,EACxD,SAAS,EACT,CAAC,KAAK,CAAC,CACR,CAAC;4BACF,WAAW,GAAG,QAAQ,CAAC;wBACzB,CAAC;wBAED,OAAO,WAAW,CAAC;oBACrB,CAAC;oBACD,KAAK,UAAU;wBACb,aAAa,GAAG,oBAAoB,CAAC;wBACrC,MAAM;oBACR,KAAK,aAAa;wBAChB,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,8CAA8C,CAC/C,CAAC;wBAEF,OAAO,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,yDAAyD;oBACxG,KAAK,MAAM,CAAC,CAAC,CAAC;wBACZ,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,uDAAuD,CACxD,CAAC;wBACF,MAAM,aAAa,GAAG,IAAA,kCAAoB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;wBAC1E,MAAM,OAAO,GAAG,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAC5C,SAAS,EACT,SAAS,EACT,EAAE,EACF,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAC5D,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,CACjD,CAAC;wBAEF,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC9E,CAAC;oBACD,KAAK,YAAY,CAAC,CAAC,CAAC;wBAClB,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,6DAA6D,CAC9D,CAAC;wBACF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;wBACnC,MAAM,cAAc,GAAG,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CACpD,oBAAE,CAAC,eAAe,CAAC,QAAQ,CAAC;4BAC1B,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAC5B,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACpC,SAAS,EACT,IAAI,CAAC,SAAS,CACf,CACN,CAAC;wBACF,MAAM,aAAa,GAAG,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAClD,SAAS,EACT,SAAS,EACT,EAAE,EACF,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,oBAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAC5D,oBAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,CAC/C,CAAC;wBACF,MAAM,aAAa,GAAG,IAAA,kCAAoB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;wBAE1E,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;oBACpF,CAAC;oBACD,OAAO,CAAC,CAAC,CAAC;wBACR,MAAM,QAAQ,GAAG,0BAA0B,CAAC;wBAC5C,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;wBAC9B,IAAA,gCAAc,EAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;wBACvD,MAAM;oBACR,CAAC;gBACH,CAAC;gBAED,IAAI,aAAa,EAAE,CAAC;oBAClB,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,mCAAmC,YAAY,cAAc,aAAa,OAAO,CAClF,CAAC;oBAEF,MAAM,aAAa,GAAG,oBAAE,CAAC,OAAO,CAAC,8BAA8B,CAC7D,GAAG,EACH,OAAO,EACP,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAC3C,CAAC;oBAEF,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CACpC,IAAI,EACJ,aAAa,EACb,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,SAAS,CACf,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAA,qCAAoB,EAAC,IAAI,CAAC,CAAC;IACrD,QAAQ,iBAAiB,EAAE,CAAC;QAC1B,KAAK,WAAW;YACd,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,iDAAiD,CAClD,CAAC;YAEF,2DAA2D;YAC3D,OAAO,IAAA,oCAAsB,EAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5F,KAAK,mBAAmB,CAAC,CAAC,CAAC;YACzB,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,kDAAkD,CACnD,CAAC;YACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC;YACrC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC9B,IAAA,gCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAE/B,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,qBAAqB,CACnC,IAAa,EACb,EAAE,UAAU,EAAE,QAAQ,EAAmB;IAEzC,IAAI,CAAC,IAAA,wCAAuB,EAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,2EAA2E,CAC5E,CAAC;IAEF,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,8BAA8B,CAAC;QAChD,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAA,gCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACxC,IAAI,UAAU,GAA4B,EAAE,CAAC;IAE7C,IAAI,oBAAE,CAAC,wBAAwB,CAAC,OAAO,CAAC,EAAE,CAAC;QACzC,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,oBAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,UAAU,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,+BAA+B,CAAC;QACjD,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAA,gCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,IAAI,oBAAE,CAAC,yBAAyB,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAI,aAAa,CAAC,UAAiD,CAAC,CAAC;QACvF,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,mCAAmC,CAAC;YACrD,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC9B,IAAA,gCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,OAAO,oBAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAkC;IAC/D,OAAO,OAAO,CAAC,QAAQ;SACpB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,IAAI,oBAAE,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO,oBAAE,CAAC,OAAO,CAAC,wBAAwB,CACxC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EACzC,IAAA,oCAAsB,EAAC,IAAI,CAAC,CAC7B,CAAC;QACJ,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAA8B,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAmC;IACjE,OAAO,OAAO,CAAC,UAAU;SACtB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,IAAI,oBAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAChE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAClC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YACrC,MAAM,MAAM,GAAG,IAAA,oCAAsB,EAAC,IAAI,CAAC,CAAC;YAC5C,MAAM,eAAe,GAAG,IAAA,kCAAoB,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;YAExE,OAAO,oBAAE,CAAC,OAAO,CAAC,wBAAwB,CACxC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,EACvC,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,eAAe,EAAE,SAAS,EAAE,CAAC,WAAW,CAAC,CAAC,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAA8B,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,SAAgB,iBAAiB,CAC/B,IAAa,EACb,EAAE,UAAU,EAAE,QAAQ,EAAmB;IAEzC,IACE,oBAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACzB,oBAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC;QAC9C,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO;QACrC,oBAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EACzD,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,IAAI,oBAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACrE,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,oDAAoD,CACrD,CAAC;YACF,MAAM,aAAa,GAAG,QAAQ,CAAC,UAAU,CAAC;YAC1C,MAAM,aAAa,GAAG,IAAA,kCAAoB,EAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAEvE,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAiC;IAClE,IAAI,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC7D,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,2BAA2B,CAAC,aAA4B;IAC/D,MAAM,SAAS,GAAG,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAC/C,IAAA,kCAAoB,EAAC,IAAI,EAAE,QAAQ,CAAC,EACpC,SAAS,EACT,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,OAAO,IAAA,kCAAoB,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AACjD,CAAC;AAED,SAAgB,0BAA0B,CACxC,IAAa,EACb,EAAE,UAAU,EAAE,QAAQ,EAAmB;IAEzC,kEAAkE;IAClE,IACE,oBAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC;QACnC,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EACzB,CAAC;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC;QACvC,IACE,oBAAE,CAAC,gBAAgB,CAAC,cAAc,CAAC;YACnC,oBAAE,CAAC,0BAA0B,CAAC,cAAc,CAAC,UAAU,CAAC,EACxD,CAAC;YACD,MAAM,aAAa,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC,yBAAyB;YAC1E,IACE,oBAAE,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC;gBACnC,aAAa,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY;gBACxC,oBAAE,CAAC,0BAA0B,CAAC,aAAa,CAAC,UAAU,CAAC,EACvD,CAAC;gBACD,MAAM,aAAa,GAAG,yBAAyB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC1E,IAAI,aAAa,EAAE,CAAC;oBAClB,QAAQ,CAAC,oBAAoB,CAC3B,UAAU,EACV,IAAI,EACJ,8EAA8E,CAC/E,CAAC;oBACF,MAAM,YAAY,GAAG,2BAA2B,CAAC,aAAa,CAAC,CAAC;oBAEhE,OAAO,IAAA,kCAAoB,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,oBAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,oBAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QAChF,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,0BAA0B;QACvD,MAAM,aAAa,GAAG,oBAAE,CAAC,0BAA0B,CAAC,GAAG,CAAC,UAAU,CAAC;YACjE,CAAC,CAAC,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC;YAC3C,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,YAAY,GAAG,2BAA2B,CAAC,aAAa,CAAC,CAAC;YAChE,MAAM,aAAa,GAAG,IAAA,kCAAoB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAElE,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;YAC/B,IAAI,aAAkC,CAAC;YACvC,IAAI,OAA2B,CAAC;YAEhC,QAAQ,QAAQ,EAAE,CAAC;gBACjB,KAAK,KAAK;oBACR,OAAO,GAAG,kEAAkE,CAAC;oBAC7E,aAAa,GAAG,oBAAE,CAAC,OAAO,CAAC,sBAAsB,CAC/C,IAAA,kCAAoB,EAAC,aAAa,EAAE,QAAQ,CAAC,EAC7C,oBAAE,CAAC,UAAU,CAAC,gBAAgB,EAC9B,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CACnC,CAAC;oBACF,MAAM;gBACR,KAAK,OAAO;oBACV,OAAO,GAAG,yDAAyD,CAAC;oBACpE,aAAa,GAAG,IAAA,kCAAoB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;oBAC9D,MAAM;gBACR,KAAK,OAAO;oBACV,OAAO,GAAG,qDAAqD,CAAC;oBAChE,aAAa,GAAG,oBAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;oBAC3E,MAAM;gBACR,KAAK,KAAK,CAAC;gBACX,KAAK,SAAS;oBACZ,OAAO,GAAG,2BAA2B,QAAQ,yBAAyB,CAAC;oBACvE,aAAa,GAAG,aAAa,CAAC;oBAC9B,MAAM;gBACR,KAAK,SAAS;oBACZ,OAAO,GAAG,uDAAuD,CAAC;oBAClE,aAAa,GAAG,oBAAE,CAAC,OAAO,CAAC,6BAA6B,CACtD,aAAa,EACb,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAClB,CAAC;oBACF,MAAM;gBACR,KAAK,YAAY;oBACf,IACE,CAAC,oBAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,MAAM,CAAC;wBAC3C,CAAC,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;wBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,EAChC,CAAC;wBACD,MAAM,QAAQ,GAAG,yBAAyB,CAAC;wBAC3C,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;wBAC9B,IAAA,gCAAc,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBACjC,CAAC;oBAED,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,IAAI,aAAa,IAAI,OAAO,EAAE,CAAC;gBAC7B,QAAQ,CAAC,oBAAoB,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBAEzD,OAAO,aAAa,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"jasmine-spy.js","sourceRoot":"","sources":["jasmine-spy.ts"],"names":[],"mappings":"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"}

package/refactor/jasmine-vitest/transformers/jasmine-type.d.ts

@@ -13,4 +13,4 @@
  */
 import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { RefactorContext } from '../utils/refactor-context';
-export declare function transformJasmineTypes(node: ts.Node, { sourceFile, reporter, pendingVitestImports }: RefactorContext): ts.Node;
+export declare function transformJasmineTypes(node: ts.Node, { sourceFile, reporter, pendingVitestTypeImports }: RefactorContext): ts.Node;

package/refactor/jasmine-vitest/transformers/jasmine-type.js

@@ -19,7 +19,7 @@ exports.transformJasmineTypes = transformJasmineTypes;
  */
 const typescript_1 = __importDefault(require("../../../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const ast_helpers_1 = require("../utils/ast-helpers");
-function transformJasmineTypes(node, { sourceFile, reporter, pendingVitestImports }) {
+function transformJasmineTypes(node, { sourceFile, reporter, pendingVitestTypeImports }) {
     const typeNameNode = typescript_1.default.isTypeReferenceNode(node) ? node.typeName : node;
     if (!typescript_1.default.isQualifiedName(typeNameNode) ||
         !typescript_1.default.isIdentifier(typeNameNode.left) ||
@@ -31,13 +31,13 @@ function transformJasmineTypes(node, { sourceFile, reporter, pendingVitestImport
         case 'Spy': {
             const vitestTypeName = 'Mock';
             reporter.reportTransformation(sourceFile, node, `Transformed type \`jasmine.Spy\` to \`${vitestTypeName}\`.`);
-            (0, ast_helpers_1.addVitestAutoImport)(pendingVitestImports, vitestTypeName);
+            (0, ast_helpers_1.addVitestTypeImport)(pendingVitestTypeImports, vitestTypeName);
             return typescript_1.default.factory.createIdentifier(vitestTypeName);
         }
         case 'SpyObj': {
             const vitestTypeName = 'MockedObject';
             reporter.reportTransformation(sourceFile, node, `Transformed type \`jasmine.SpyObj\` to \`${vitestTypeName}\`.`);
-            (0, ast_helpers_1.addVitestAutoImport)(pendingVitestImports, vitestTypeName);
+            (0, ast_helpers_1.addVitestTypeImport)(pendingVitestTypeImports, vitestTypeName);
             if (typescript_1.default.isTypeReferenceNode(node)) {
                 return typescript_1.default.factory.updateTypeReferenceNode(node, typescript_1.default.factory.createIdentifier(vitestTypeName), node.typeArguments);
             }

package/refactor/jasmine-vitest/transformers/jasmine-type.js.map

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

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

@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
-export declare function addVitestAutoImport(imports: Set<string>, importName: string): void;
-export declare function getVitestAutoImports(imports: Set<string>): ts.ImportDeclaration | undefined;
+export declare function addVitestValueImport(imports: Set<string>, importName: string): void;
+export declare function addVitestTypeImport(imports: Set<string>, importName: string): void;
+export declare function getVitestAutoImports(valueImports: Set<string>, typeImports: Set<string>): ts.ImportDeclaration | undefined;
 export declare function createViCallExpression(methodName: string, args?: readonly ts.Expression[], typeArgs?: ts.TypeNode[] | undefined): ts.CallExpression;
 export declare function createExpectCallExpression(args: ts.Expression[], typeArgs?: ts.TypeNode[] | undefined): ts.CallExpression;
 export declare function createPropertyAccess(expressionOrIndentifierText: ts.Expression | string, name: string | ts.MemberName): ts.PropertyAccessExpression;

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

@@ -10,23 +10,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addVitestAutoImport = addVitestAutoImport;
+exports.addVitestValueImport = addVitestValueImport;
+exports.addVitestTypeImport = addVitestTypeImport;
 exports.getVitestAutoImports = getVitestAutoImports;
 exports.createViCallExpression = createViCallExpression;
 exports.createExpectCallExpression = createExpectCallExpression;
 exports.createPropertyAccess = createPropertyAccess;
 const typescript_1 = __importDefault(require("../../../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
-function addVitestAutoImport(imports, importName) {
+function addVitestValueImport(imports, importName) {
     imports.add(importName);
 }
-function getVitestAutoImports(imports) {
-    if (!imports?.size) {
+function addVitestTypeImport(imports, importName) {
+    imports.add(importName);
+}
+function getVitestAutoImports(valueImports, typeImports) {
+    if (valueImports.size === 0 && typeImports.size === 0) {
         return undefined;
     }
-    const importNames = [...imports];
-    importNames.sort();
-    const importSpecifiers = importNames.map((i) => typescript_1.default.factory.createImportSpecifier(false, undefined, typescript_1.default.factory.createIdentifier(i)));
-    return typescript_1.default.factory.createImportDeclaration(undefined, typescript_1.default.factory.createImportClause(typescript_1.default.SyntaxKind.TypeKeyword, undefined, typescript_1.default.factory.createNamedImports(importSpecifiers)), typescript_1.default.factory.createStringLiteral('vitest'));
+    const isClauseTypeOnly = valueImports.size === 0 && typeImports.size > 0;
+    const allSpecifiers = [];
+    // Add value imports
+    for (const i of [...valueImports].sort()) {
+        allSpecifiers.push(typescript_1.default.factory.createImportSpecifier(false, undefined, typescript_1.default.factory.createIdentifier(i)));
+    }
+    // Add type imports
+    for (const i of [...typeImports].sort()) {
+        // Only set isTypeOnly on individual specifiers if the clause itself is NOT type-only
+        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);

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

@@ -1 +1 @@
-{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["ast-helpers.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAIH,kDAEC;AAED,oDAoBC;AAED,wDAWC;AAED,gEAKC;AAED,oDAUC;AA1DD,qHAAqF;AAErF,SAAgB,mBAAmB,CAAC,OAAoB,EAAE,UAAkB;IAC1E,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAC1B,CAAC;AAED,SAAgB,oBAAoB,CAAC,OAAoB;IACvD,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;QACnB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,WAAW,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;IACjC,WAAW,CAAC,IAAI,EAAE,CAAC;IACnB,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7C,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,EAAE,SAAS,EAAE,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CACnF,CAAC;IAEF,OAAO,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CACvC,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,kBAAkB,CAC3B,oBAAE,CAAC,UAAU,CAAC,WAAW,EACzB,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAChD,EACD,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CACzC,CAAC;AACJ,CAAC;AAED,SAAgB,sBAAsB,CACpC,UAAkB,EAClB,OAAiC,EAAE,EACnC,WAAsC,SAAS;IAE/C,MAAM,MAAM,GAAG,oBAAE,CAAC,OAAO,CAAC,8BAA8B,CACtD,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,EACjC,UAAU,CACX,CAAC;IAEF,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AACjE,CAAC;AAED,SAAgB,0BAA0B,CACxC,IAAqB,EACrB,WAAsC,SAAS;IAE/C,OAAO,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAChG,CAAC;AAED,SAAgB,oBAAoB,CAClC,2BAAmD,EACnD,IAA4B;IAE5B,OAAO,oBAAE,CAAC,OAAO,CAAC,8BAA8B,CAC9C,OAAO,2BAA2B,KAAK,QAAQ;QAC7C,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,2BAA2B,CAAC;QAC1D,CAAC,CAAC,2BAA2B,EAC/B,IAAI,CACL,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ast-helpers.js","sourceRoot":"","sources":["ast-helpers.ts"],"names":[],"mappings":"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"}

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

@@ -18,8 +18,10 @@ export interface RefactorContext {
     readonly reporter: RefactorReporter;
     /** The official context from the TypeScript Transformer API. */
     readonly tsContext: ts.TransformationContext;
+    /** A set of Vitest value imports to be added to the file. */
+    readonly pendingVitestValueImports: Set<string>;
     /** A set of Vitest type imports to be added to the file. */
-    readonly pendingVitestImports: Set<string>;
+    readonly pendingVitestTypeImports: Set<string>;
 }
 /**
  * A generic transformer function that operates on a specific type of ts.Node.

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class <%= classifiedName %> {
   

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: '^21.0.0-next.0',
     NgPackagr: '^21.0.0-next.0',
-    DevkitBuildAngular: '^21.0.0-next.9',
-    AngularBuild: '^21.0.0-next.9',
-    AngularSSR: '^21.0.0-next.9',
+    DevkitBuildAngular: '^21.0.0-rc.1',
+    AngularBuild: '^21.0.0-rc.1',
+    AngularSSR: '^21.0.0-rc.1',
 };
 //# sourceMappingURL=latest-versions.js.map