@schematics/angular 21.0.0-rc.0 → 21.0.0-rc.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/application/files/common-files/tsconfig.spec.json.template +2 -1
  2. package/application/index.js +2 -6
  3. package/application/index.js.map +1 -1
  4. package/config/files/vitest-base.config.ts.template +9 -0
  5. package/config/index.js +77 -4
  6. package/config/index.js.map +1 -1
  7. package/config/schema.d.ts +2 -1
  8. package/config/schema.js +1 -0
  9. package/config/schema.js.map +1 -1
  10. package/config/schema.json +1 -1
  11. package/library/files/tsconfig.spec.json.template +2 -1
  12. package/package.json +4 -4
  13. package/refactor/jasmine-vitest/index.js +3 -1
  14. package/refactor/jasmine-vitest/index.js.map +1 -1
  15. package/refactor/jasmine-vitest/schema.d.ts +7 -0
  16. package/refactor/jasmine-vitest/schema.json +5 -0
  17. package/refactor/jasmine-vitest/test-file-transformer.d.ts +5 -1
  18. package/refactor/jasmine-vitest/test-file-transformer.js +106 -52
  19. package/refactor/jasmine-vitest/test-file-transformer.js.map +1 -1
  20. package/refactor/jasmine-vitest/transformers/jasmine-matcher.d.ts +1 -1
  21. package/refactor/jasmine-vitest/transformers/jasmine-matcher.js +2 -1
  22. package/refactor/jasmine-vitest/transformers/jasmine-matcher.js.map +1 -1
  23. package/refactor/jasmine-vitest/transformers/jasmine-misc.d.ts +2 -2
  24. package/refactor/jasmine-vitest/transformers/jasmine-misc.js +4 -2
  25. package/refactor/jasmine-vitest/transformers/jasmine-misc.js.map +1 -1
  26. package/refactor/jasmine-vitest/transformers/jasmine-spy.d.ts +2 -2
  27. package/refactor/jasmine-vitest/transformers/jasmine-spy.js +89 -69
  28. package/refactor/jasmine-vitest/transformers/jasmine-spy.js.map +1 -1
  29. package/refactor/jasmine-vitest/transformers/jasmine-type.d.ts +1 -1
  30. package/refactor/jasmine-vitest/transformers/jasmine-type.js +3 -3
  31. package/refactor/jasmine-vitest/transformers/jasmine-type.js.map +1 -1
  32. package/refactor/jasmine-vitest/utils/ast-helpers.d.ts +3 -2
  33. package/refactor/jasmine-vitest/utils/ast-helpers.js +23 -8
  34. package/refactor/jasmine-vitest/utils/ast-helpers.js.map +1 -1
  35. package/refactor/jasmine-vitest/utils/refactor-context.d.ts +3 -1
  36. package/utility/latest-versions/package.json +2 -2
  37. package/utility/latest-versions.js +3 -3
package/application/files/common-files/tsconfig.spec.json.template CHANGED
@@ -9,6 +9,7 @@
9
9
  ]
10
10
  },
11
11
  "include": [
12
- "src/**/*.ts"
12
+ "src/**/*.d.ts",
13
+ "src/**/*<% if (standalone) { %>.spec<% } %>.ts"
13
14
  ]
14
15
  }
package/application/index.js CHANGED
@@ -324,13 +324,9 @@ function addAppToWorkspaceFile(options, appDir) {
324
324
  options: {},
325
325
  }
326
326
  : {
327
- builder: workspace_models_1.Builders.BuildKarma,
327
+ builder: workspace_models_1.Builders.BuildUnitTest,
328
328
  options: {
329
- polyfills: options.zoneless ? undefined : ['zone.js', 'zone.js/testing'],
330
- tsConfig: `${projectRoot}tsconfig.spec.json`,
331
- inlineStyleLanguage,
332
- assets: [{ 'glob': '**/*', 'input': `${projectRoot}public` }],
333
- styles: [`${sourceRoot}/styles.${options.style}`],
329
+ runner: 'karma',
334
330
  },
335
331
  },
336
332
  },
package/application/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
package/config/files/vitest-base.config.ts.template ADDED
@@ -0,0 +1,9 @@
1
+ // Learn more about Vitest configuration options at https://vitest.dev/config/
2
+
3
+ import { defineConfig } from 'vitest/config';
4
+
5
+ export default defineConfig({
6
+ test: {
7
+ // ...
8
+ },
9
+ });
package/config/index.js CHANGED
@@ -20,10 +20,50 @@ exports.default = (0, project_1.createProjectSchematic)((options, { project }) =
20
20
  return addKarmaConfig(options);
21
21
  case schema_1.Type.Browserslist:
22
22
  return addBrowserslistConfig(project.root);
23
+ case schema_1.Type.Vitest:
24
+ return addVitestConfig(options);
23
25
  default:
24
26
  throw new schematics_1.SchematicsException(`"${options.type}" is an unknown configuration file type.`);
25
27
  }
26
28
  });
29
+ function addVitestConfig(options) {
30
+ return (tree, context) => (0, workspace_1.updateWorkspace)((workspace) => {
31
+ const project = workspace.projects.get(options.project);
32
+ if (!project) {
33
+ throw new schematics_1.SchematicsException(`Project name "${options.project}" doesn't not exist.`);
34
+ }
35
+ const testTarget = project.targets.get('test');
36
+ if (!testTarget) {
37
+ throw new schematics_1.SchematicsException(`No "test" target found for project "${options.project}".` +
38
+ ' A "test" target is required to generate a Vitest configuration.');
39
+ }
40
+ if (testTarget.builder !== workspace_models_1.Builders.BuildUnitTest) {
41
+ throw new schematics_1.SchematicsException(`Cannot add a Vitest configuration as builder for "test" target in project does not` +
42
+ ` use "${workspace_models_1.Builders.BuildUnitTest}".`);
43
+ }
44
+ testTarget.options ??= {};
45
+ testTarget.options.runnerConfig = true;
46
+ // Check runner option.
47
+ if (testTarget.options.runner === 'karma') {
48
+ context.logger.warn(`The "test" target is configured to use the "karma" runner in the main options.` +
49
+ ' The generated "vitest-base.config.ts" file may not be used.');
50
+ }
51
+ for (const [name, config] of Object.entries(testTarget.configurations ?? {})) {
52
+ if (config &&
53
+ typeof config === 'object' &&
54
+ 'runner' in config &&
55
+ config.runner === 'karma') {
56
+ context.logger.warn(`The "test" target's "${name}" configuration is configured to use the "karma" runner.` +
57
+ ' The generated "vitest-base.config.ts" file may not be used for that configuration.');
58
+ }
59
+ }
60
+ return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
61
+ (0, schematics_1.filter)((p) => p.endsWith('vitest-base.config.ts.template')),
62
+ (0, schematics_1.applyTemplates)({}),
63
+ (0, schematics_1.move)(project.root),
64
+ ]));
65
+ });
66
+ }
27
67
  async function addBrowserslistConfig(projectRoot) {
28
68
  return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./files'), [
29
69
  (0, schematics_1.filter)((p) => p.endsWith('.browserslistrc.template')),
@@ -33,7 +73,7 @@ async function addBrowserslistConfig(projectRoot) {
33
73
  ]));
34
74
  }
35
75
  function addKarmaConfig(options) {
36
- return (0, workspace_1.updateWorkspace)((workspace) => {
76
+ return (_, context) => (0, workspace_1.updateWorkspace)((workspace) => {
37
77
  const project = workspace.projects.get(options.project);
38
78
  if (!project) {
39
79
  throw new schematics_1.SchematicsException(`Project name "${options.project}" doesn't not exist.`);
@@ -44,12 +84,45 @@ function addKarmaConfig(options) {
44
84
  ' A "test" target is required to generate a karma configuration.');
45
85
  }
46
86
  if (testTarget.builder !== workspace_models_1.Builders.Karma &&
47
- testTarget.builder !== workspace_models_1.Builders.BuildKarma) {
87
+ testTarget.builder !== workspace_models_1.Builders.BuildKarma &&
88
+ testTarget.builder !== workspace_models_1.Builders.BuildUnitTest) {
48
89
  throw new schematics_1.SchematicsException(`Cannot add a karma configuration as builder for "test" target in project does not` +
49
- ` use "${workspace_models_1.Builders.Karma}" or "${workspace_models_1.Builders.BuildKarma}".`);
90
+ ` use "${workspace_models_1.Builders.Karma}", "${workspace_models_1.Builders.BuildKarma}", or ${workspace_models_1.Builders.BuildUnitTest}.`);
50
91
  }
51
92
  testTarget.options ??= {};
52
- testTarget.options.karmaConfig = node_path_1.posix.join(project.root, 'karma.conf.js');
93
+ if (testTarget.builder !== workspace_models_1.Builders.BuildUnitTest) {
94
+ testTarget.options.karmaConfig = node_path_1.posix.join(project.root, 'karma.conf.js');
95
+ }
96
+ else {
97
+ // `unit-test` uses the `runnerConfig` option which has configuration discovery if enabled
98
+ testTarget.options.runnerConfig = true;
99
+ let isKarmaRunnerConfigured = false;
100
+ // Check runner option
101
+ if (testTarget.options.runner) {
102
+ if (testTarget.options.runner === 'karma') {
103
+ isKarmaRunnerConfigured = true;
104
+ }
105
+ else {
106
+ context.logger.warn(`The "test" target is configured to use a runner other than "karma" in the main options.` +
107
+ ' The generated "karma.conf.js" file may not be used.');
108
+ }
109
+ }
110
+ for (const [name, config] of Object.entries(testTarget.configurations ?? {})) {
111
+ if (config && typeof config === 'object' && 'runner' in config) {
112
+ if (config.runner !== 'karma') {
113
+ context.logger.warn(`The "test" target's "${name}" configuration is configured to use a runner other than "karma".` +
114
+ ' The generated "karma.conf.js" file may not be used for that configuration.');
115
+ }
116
+ else {
117
+ isKarmaRunnerConfigured = true;
118
+ }
119
+ }
120
+ }
121
+ if (!isKarmaRunnerConfigured) {
122
+ context.logger.warn(`The "test" target is not explicitly configured to use the "karma" runner.` +
123
+ ' The generated "karma.conf.js" file may not be used as the default runner is "vitest".');
124
+ }
125
+ }
53
126
  // If scoped project (i.e. "@foo/bar"), convert dir to "foo/bar".
54
127
  let folderName = options.project.startsWith('@') ? options.project.slice(1) : options.project;
55
128
  if (/[A-Z]/.test(folderName)) {
package/config/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
package/config/schema.d.ts CHANGED
@@ -18,5 +18,6 @@ export type Schema = {
18
18
  */
19
19
  export declare enum Type {
20
20
  Browserslist = "browserslist",
21
- Karma = "karma"
21
+ Karma = "karma",
22
+ Vitest = "vitest"
22
23
  }
package/config/schema.js CHANGED
@@ -10,5 +10,6 @@ var Type;
10
10
  (function (Type) {
11
11
  Type["Browserslist"] = "browserslist";
12
12
  Type["Karma"] = "karma";
13
+ Type["Vitest"] = "vitest";
13
14
  })(Type || (exports.Type = Type = {}));
14
15
  //# sourceMappingURL=schema.js.map
package/config/schema.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AAkBpF;;GAEG;AACH,IAAY,IAGX;AAHD,WAAY,IAAI;IACZ,qCAA6B,CAAA;IAC7B,uBAAe,CAAA;AACnB,CAAC,EAHW,IAAI,oBAAJ,IAAI,QAGf"}
1
+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AAkBpF;;GAEG;AACH,IAAY,IAIX;AAJD,WAAY,IAAI;IACZ,qCAA6B,CAAA;IAC7B,uBAAe,CAAA;IACf,yBAAiB,CAAA;AACrB,CAAC,EAJW,IAAI,oBAAJ,IAAI,QAIf"}
package/config/schema.json CHANGED
@@ -16,7 +16,7 @@
16
16
  "type": {
17
17
  "type": "string",
18
18
  "description": "Specifies the type of configuration file to generate.",
19
- "enum": ["karma", "browserslist"],
19
+ "enum": ["karma", "browserslist", "vitest"],
20
20
  "x-prompt": "Which type of configuration file would you like to create?",
21
21
  "$default": {
22
22
  "$source": "argv",
package/library/files/tsconfig.spec.json.template CHANGED
@@ -9,6 +9,7 @@
9
9
  ]
10
10
  },
11
11
  "include": [
12
- "src/**/*.ts"
12
+ "src/**/*.d.ts",
13
+ "src/**/*<% if (standalone) { %>.spec<% } %>.ts"
13
14
  ]
14
15
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@schematics/angular",
3
- "version": "21.0.0-rc.0",
3
+ "version": "21.0.0-rc.2",
4
4
  "description": "Schematics specific to Angular",
5
5
  "homepage": "https://github.com/angular/angular-cli",
6
6
  "keywords": [
@@ -22,15 +22,15 @@
22
22
  },
23
23
  "schematics": "./collection.json",
24
24
  "dependencies": {
25
- "@angular-devkit/core": "21.0.0-rc.0",
26
- "@angular-devkit/schematics": "21.0.0-rc.0",
25
+ "@angular-devkit/core": "21.0.0-rc.2",
26
+ "@angular-devkit/schematics": "21.0.0-rc.2",
27
27
  "jsonc-parser": "3.3.1"
28
28
  },
29
29
  "repository": {
30
30
  "type": "git",
31
31
  "url": "https://github.com/angular/angular-cli.git"
32
32
  },
33
- "packageManager": "pnpm@10.19.0",
33
+ "packageManager": "pnpm@10.21.0",
34
34
  "engines": {
35
35
  "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
36
36
  "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
package/refactor/jasmine-vitest/index.js CHANGED
@@ -91,7 +91,9 @@ function default_1(options) {
91
91
  for (const file of files) {
92
92
  reporter.incrementScannedFiles();
93
93
  const content = tree.readText(file);
94
- const newContent = (0, test_file_transformer_1.transformJasmineToVitest)(file, content, reporter);
94
+ const newContent = (0, test_file_transformer_1.transformJasmineToVitest)(file, content, reporter, {
95
+ addImports: !!options.addImports,
96
+ });
95
97
  if (content !== newContent) {
96
98
  tree.overwrite(file, newContent);
97
99
  reporter.incrementTransformedFiles();
package/refactor/jasmine-vitest/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
package/refactor/jasmine-vitest/schema.d.ts CHANGED
@@ -2,6 +2,13 @@
2
2
  * Refactors a Jasmine test file to use Vitest.
3
3
  */
4
4
  export type Schema = {
5
+ /**
6
+ * Whether to add imports for the Vitest API. The Angular `unit-test` system automatically
7
+ * uses the Vitest globals option, which means explicit imports for global APIs like
8
+ * `describe`, `it`, `expect`, and `vi` are often not strictly necessary unless Vitest has
9
+ * been configured not to use globals.
10
+ */
11
+ addImports?: boolean;
5
12
  /**
6
13
  * The file suffix to identify test files (e.g., '.spec.ts', '.test.ts').
7
14
  */
package/refactor/jasmine-vitest/schema.json CHANGED
@@ -25,6 +25,11 @@
25
25
  "type": "boolean",
26
26
  "description": "Enable verbose logging to see detailed information about the transformations being applied.",
27
27
  "default": false
28
+ },
29
+ "addImports": {
30
+ "type": "boolean",
31
+ "description": "Whether to add imports for the Vitest API. The Angular `unit-test` system automatically uses the Vitest globals option, which means explicit imports for global APIs like `describe`, `it`, `expect`, and `vi` are often not strictly necessary unless Vitest has been configured not to use globals.",
32
+ "default": false
28
33
  }
29
34
  }
30
35
  }
package/refactor/jasmine-vitest/test-file-transformer.d.ts CHANGED
@@ -9,8 +9,12 @@ import { RefactorReporter } from './utils/refactor-reporter';
9
9
  /**
10
10
  * Transforms a string of Jasmine test code to Vitest test code.
11
11
  * This is the main entry point for the transformation.
12
+ * @param filePath The path to the file being transformed.
12
13
  * @param content The source code to transform.
13
14
  * @param reporter The reporter to track TODOs.
15
+ * @param options Transformation options, including whether to add Vitest API imports.
14
16
  * @returns The transformed code.
15
17
  */
16
- export declare function transformJasmineToVitest(filePath: string, content: string, reporter: RefactorReporter): string;
18
+ export declare function transformJasmineToVitest(filePath: string, content: string, reporter: RefactorReporter, options: {
19
+ addImports: boolean;
20
+ }): string;
package/refactor/jasmine-vitest/test-file-transformer.js CHANGED
@@ -11,6 +11,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
11
11
  };
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  exports.transformJasmineToVitest = transformJasmineToVitest;
14
+ /**
15
+ * @fileoverview This is the main entry point for the Jasmine to Vitest transformation.
16
+ * It orchestrates the application of various AST transformers to convert Jasmine test
17
+ * syntax and APIs to their Vitest equivalents. It also handles import management,
18
+ * blank line preservation, and reporting of transformation details.
19
+ */
14
20
  const typescript_1 = __importDefault(require("../../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
15
21
  const jasmine_lifecycle_1 = require("./transformers/jasmine-lifecycle");
16
22
  const jasmine_matcher_1 = require("./transformers/jasmine-matcher");
@@ -18,90 +24,131 @@ const jasmine_misc_1 = require("./transformers/jasmine-misc");
18
24
  const jasmine_spy_1 = require("./transformers/jasmine-spy");
19
25
  const jasmine_type_1 = require("./transformers/jasmine-type");
20
26
  const ast_helpers_1 = require("./utils/ast-helpers");
27
+ /**
28
+ * A placeholder used to temporarily replace blank lines in the source code.
29
+ * This is necessary because TypeScript's printer removes blank lines by default.
30
+ */
21
31
  const BLANK_LINE_PLACEHOLDER = '// __PRESERVE_BLANK_LINE__';
32
+ /**
33
+ * Replaces blank lines in the content with a placeholder to prevent TypeScript's printer
34
+ * from removing them. This ensures that the original formatting of blank lines is preserved.
35
+ * @param content The source code content.
36
+ * @returns The content with blank lines replaced by placeholders.
37
+ */
22
38
  function preserveBlankLines(content) {
23
39
  return content
24
40
  .split('\n')
25
41
  .map((line) => (line.trim() === '' ? BLANK_LINE_PLACEHOLDER : line))
26
42
  .join('\n');
27
43
  }
44
+ /**
45
+ * Restores blank lines in the content by replacing the placeholder with actual blank lines.
46
+ * This is called after TypeScript's printer has processed the file.
47
+ * @param content The content with blank line placeholders.
48
+ * @returns The content with blank lines restored.
49
+ */
28
50
  function restoreBlankLines(content) {
29
- const regex = new RegExp(`^\\s*${BLANK_LINE_PLACEHOLDER.replace(/\//g, '\\/')}\\s*$`, 'gm');
51
+ const regex = /^\s*\/\/ __PRESERVE_BLANK_LINE__\s*$/gm;
30
52
  return content.replace(regex, '');
31
53
  }
54
+ /**
55
+ * A collection of transformers that operate on `ts.CallExpression` nodes.
56
+ * These are applied in stages to ensure correct order of operations:
57
+ * 1. High-Level & Context-Sensitive: Transformations that fundamentally change the call.
58
+ * 2. Core Matcher & Spy: Bulk conversions for `expect(...)` and `spyOn(...)`.
59
+ * 3. Global Functions & Cleanup: Handles global Jasmine functions and unsupported APIs.
60
+ */
61
+ const callExpressionTransformers = [
62
+ // **Stage 1: High-Level & Context-Sensitive Transformations**
63
+ // These transformers often wrap or fundamentally change the nature of the call,
64
+ // so they need to run before more specific matchers.
65
+ jasmine_matcher_1.transformWithContext,
66
+ jasmine_matcher_1.transformExpectAsync,
67
+ jasmine_lifecycle_1.transformFocusedAndSkippedTests,
68
+ jasmine_lifecycle_1.transformPending,
69
+ jasmine_lifecycle_1.transformDoneCallback,
70
+ // **Stage 2: Core Matcher & Spy Transformations**
71
+ // This is the bulk of the `expect(...)` and `spyOn(...)` conversions.
72
+ jasmine_matcher_1.transformSyntacticSugarMatchers,
73
+ jasmine_matcher_1.transformComplexMatchers,
74
+ jasmine_spy_1.transformSpies,
75
+ jasmine_spy_1.transformCreateSpyObj,
76
+ jasmine_spy_1.transformSpyReset,
77
+ jasmine_spy_1.transformSpyCallInspection,
78
+ jasmine_matcher_1.transformtoHaveBeenCalledBefore,
79
+ jasmine_matcher_1.transformToHaveClass,
80
+ // **Stage 3: Global Functions & Cleanup**
81
+ // These handle global Jasmine functions and catch-alls for unsupported APIs.
82
+ jasmine_misc_1.transformTimerMocks,
83
+ jasmine_misc_1.transformGlobalFunctions,
84
+ jasmine_misc_1.transformUnsupportedJasmineCalls,
85
+ ];
86
+ /**
87
+ * A collection of transformers that operate on `ts.PropertyAccessExpression` nodes.
88
+ * These primarily handle `jasmine.any()` and other `jasmine.*` properties.
89
+ */
90
+ const propertyAccessExpressionTransformers = [
91
+ // These transformers handle `jasmine.any()` and other `jasmine.*` properties.
92
+ jasmine_matcher_1.transformAsymmetricMatchers,
93
+ jasmine_spy_1.transformSpyCallInspection,
94
+ jasmine_misc_1.transformUnknownJasmineProperties,
95
+ ];
96
+ /**
97
+ * A collection of transformers that operate on `ts.ExpressionStatement` nodes.
98
+ * These are mutually exclusive; the first one that matches will be applied.
99
+ */
100
+ const expressionStatementTransformers = [
101
+ jasmine_matcher_1.transformCalledOnceWith,
102
+ jasmine_matcher_1.transformArrayWithExactContents,
103
+ jasmine_matcher_1.transformExpectNothing,
104
+ jasmine_misc_1.transformFail,
105
+ jasmine_misc_1.transformDefaultTimeoutInterval,
106
+ ];
32
107
  /**
33
108
  * Transforms a string of Jasmine test code to Vitest test code.
34
109
  * This is the main entry point for the transformation.
110
+ * @param filePath The path to the file being transformed.
35
111
  * @param content The source code to transform.
36
112
  * @param reporter The reporter to track TODOs.
113
+ * @param options Transformation options, including whether to add Vitest API imports.
37
114
  * @returns The transformed code.
38
115
  */
39
- function transformJasmineToVitest(filePath, content, reporter) {
116
+ function transformJasmineToVitest(filePath, content, reporter, options) {
40
117
  const contentWithPlaceholders = preserveBlankLines(content);
41
118
  const sourceFile = typescript_1.default.createSourceFile(filePath, contentWithPlaceholders, typescript_1.default.ScriptTarget.Latest, true, typescript_1.default.ScriptKind.TS);
42
- const pendingVitestImports = new Set();
119
+ const pendingVitestValueImports = new Set();
120
+ const pendingVitestTypeImports = new Set();
43
121
  const transformer = (context) => {
44
122
  const refactorCtx = {
45
123
  sourceFile,
46
124
  reporter,
47
125
  tsContext: context,
48
- pendingVitestImports,
126
+ pendingVitestValueImports,
127
+ pendingVitestTypeImports,
49
128
  };
50
129
  const visitor = (node) => {
51
130
  let transformedNode = node;
52
131
  // Transform the node itself based on its type
53
132
  if (typescript_1.default.isCallExpression(transformedNode)) {
54
- const transformations = [
55
- // **Stage 1: High-Level & Context-Sensitive Transformations**
56
- // These transformers often wrap or fundamentally change the nature of the call,
57
- // so they need to run before more specific matchers.
58
- jasmine_matcher_1.transformWithContext,
59
- jasmine_matcher_1.transformExpectAsync,
60
- jasmine_lifecycle_1.transformFocusedAndSkippedTests,
61
- jasmine_lifecycle_1.transformPending,
62
- jasmine_lifecycle_1.transformDoneCallback,
63
- // **Stage 2: Core Matcher & Spy Transformations**
64
- // This is the bulk of the `expect(...)` and `spyOn(...)` conversions.
65
- jasmine_matcher_1.transformSyntacticSugarMatchers,
66
- jasmine_matcher_1.transformComplexMatchers,
67
- jasmine_spy_1.transformSpies,
68
- jasmine_spy_1.transformCreateSpyObj,
69
- jasmine_spy_1.transformSpyReset,
70
- jasmine_spy_1.transformSpyCallInspection,
71
- jasmine_matcher_1.transformtoHaveBeenCalledBefore,
72
- jasmine_matcher_1.transformToHaveClass,
73
- // **Stage 3: Global Functions & Cleanup**
74
- // These handle global Jasmine functions and catch-alls for unsupported APIs.
75
- jasmine_misc_1.transformTimerMocks,
76
- jasmine_misc_1.transformGlobalFunctions,
77
- jasmine_misc_1.transformUnsupportedJasmineCalls,
78
- ];
79
- for (const transformer of transformations) {
133
+ if (options.addImports && typescript_1.default.isIdentifier(transformedNode.expression)) {
134
+ const name = transformedNode.expression.text;
135
+ if (name === 'describe' || name === 'it' || name === 'expect') {
136
+ (0, ast_helpers_1.addVitestValueImport)(pendingVitestValueImports, name);
137
+ }
138
+ }
139
+ for (const transformer of callExpressionTransformers) {
80
140
  transformedNode = transformer(transformedNode, refactorCtx);
81
141
  }
82
142
  }
83
143
  else if (typescript_1.default.isPropertyAccessExpression(transformedNode)) {
84
- const transformations = [
85
- // These transformers handle `jasmine.any()` and other `jasmine.*` properties.
86
- jasmine_matcher_1.transformAsymmetricMatchers,
87
- jasmine_spy_1.transformSpyCallInspection,
88
- jasmine_misc_1.transformUnknownJasmineProperties,
89
- ];
90
- for (const transformer of transformations) {
144
+ for (const transformer of propertyAccessExpressionTransformers) {
91
145
  transformedNode = transformer(transformedNode, refactorCtx);
92
146
  }
93
147
  }
94
148
  else if (typescript_1.default.isExpressionStatement(transformedNode)) {
95
149
  // Statement-level transformers are mutually exclusive. The first one that
96
150
  // matches will be applied, and then the visitor will stop for this node.
97
- const statementTransformers = [
98
- jasmine_matcher_1.transformCalledOnceWith,
99
- jasmine_matcher_1.transformArrayWithExactContents,
100
- jasmine_matcher_1.transformExpectNothing,
101
- jasmine_misc_1.transformFail,
102
- jasmine_misc_1.transformDefaultTimeoutInterval,
103
- ];
104
- for (const transformer of statementTransformers) {
151
+ for (const transformer of expressionStatementTransformers) {
105
152
  const result = transformer(transformedNode, refactorCtx);
106
153
  if (result !== transformedNode) {
107
154
  transformedNode = result;
@@ -124,15 +171,22 @@ function transformJasmineToVitest(filePath, content, reporter) {
124
171
  };
125
172
  const result = typescript_1.default.transform(sourceFile, [transformer]);
126
173
  let transformedSourceFile = result.transformed[0];
127
- if (transformedSourceFile === sourceFile && !reporter.hasTodos && !pendingVitestImports.size) {
174
+ const hasPendingValueImports = pendingVitestValueImports.size > 0;
175
+ const hasPendingTypeImports = pendingVitestTypeImports.size > 0;
176
+ if (transformedSourceFile === sourceFile &&
177
+ !reporter.hasTodos &&
178
+ !hasPendingValueImports &&
179
+ !hasPendingTypeImports) {
128
180
  return content;
129
181
  }
130
- const vitestImport = (0, ast_helpers_1.getVitestAutoImports)(pendingVitestImports);
131
- if (vitestImport) {
132
- transformedSourceFile = typescript_1.default.factory.updateSourceFile(transformedSourceFile, [
133
- vitestImport,
134
- ...transformedSourceFile.statements,
135
- ]);
182
+ if (hasPendingTypeImports || (options.addImports && hasPendingValueImports)) {
183
+ const vitestImport = (0, ast_helpers_1.getVitestAutoImports)(options.addImports ? pendingVitestValueImports : new Set(), pendingVitestTypeImports);
184
+ if (vitestImport) {
185
+ transformedSourceFile = typescript_1.default.factory.updateSourceFile(transformedSourceFile, [
186
+ vitestImport,
187
+ ...transformedSourceFile.statements,
188
+ ]);
189
+ }
136
190
  }
137
191
  const printer = typescript_1.default.createPrinter();
138
192
  const transformedContentWithPlaceholders = printer.printFile(transformedSourceFile);
package/refactor/jasmine-vitest/test-file-transformer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"test-file-transformer.js","sourceRoot":"","sources":["test-file-transformer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test-file-transformer.js","sourceRoot":"","sources":["test-file-transformer.ts"],"names":[],"mappings":"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"}