@schematics/angular 22.0.0-next.7 → 22.0.0-rc.0
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.
- package/migrations/migrate-karma-to-vitest/karma-config-analyzer.js +1 -0
- package/migrations/migrate-karma-to-vitest/karma-config-analyzer.js.map +1 -1
- package/migrations/migrate-karma-to-vitest/karma-processor.d.ts +6 -1
- package/migrations/migrate-karma-to-vitest/karma-processor.js +14 -18
- package/migrations/migrate-karma-to-vitest/karma-processor.js.map +1 -1
- package/migrations/migrate-karma-to-vitest/migration.js +99 -27
- package/migrations/migrate-karma-to-vitest/migration.js.map +1 -1
- package/package.json +4 -5
- package/refactor/jasmine-vitest/index.js +1 -0
- package/refactor/jasmine-vitest/index.js.map +1 -1
- package/refactor/jasmine-vitest/schema.d.ts +4 -0
- package/refactor/jasmine-vitest/schema.json +5 -0
- package/refactor/jasmine-vitest/test-file-transformer.d.ts +1 -0
- package/refactor/jasmine-vitest/test-file-transformer.js +25 -2
- package/refactor/jasmine-vitest/test-file-transformer.js.map +1 -1
- package/refactor/jasmine-vitest/transformers/fake-async-flush-microtasks.d.ts +10 -0
- package/refactor/jasmine-vitest/transformers/fake-async-flush-microtasks.js +29 -0
- package/refactor/jasmine-vitest/transformers/fake-async-flush-microtasks.js.map +1 -0
- package/refactor/jasmine-vitest/transformers/fake-async-flush.d.ts +10 -0
- package/refactor/jasmine-vitest/transformers/fake-async-flush.js +45 -0
- package/refactor/jasmine-vitest/transformers/fake-async-flush.js.map +1 -0
- package/refactor/jasmine-vitest/transformers/fake-async-test.d.ts +14 -0
- package/refactor/jasmine-vitest/transformers/fake-async-test.js +145 -0
- package/refactor/jasmine-vitest/transformers/fake-async-test.js.map +1 -0
- package/refactor/jasmine-vitest/transformers/fake-async-tick.d.ts +10 -0
- package/refactor/jasmine-vitest/transformers/fake-async-tick.js +30 -0
- package/refactor/jasmine-vitest/transformers/fake-async-tick.js.map +1 -0
- package/refactor/jasmine-vitest/transformers/jasmine-misc.d.ts +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-misc.js +7 -4
- package/refactor/jasmine-vitest/transformers/jasmine-misc.js.map +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-spy.d.ts +2 -2
- package/refactor/jasmine-vitest/transformers/jasmine-spy.js +12 -9
- package/refactor/jasmine-vitest/transformers/jasmine-spy.js.map +1 -1
- package/refactor/jasmine-vitest/utils/ast-helpers.d.ts +12 -1
- package/refactor/jasmine-vitest/utils/ast-helpers.js +67 -8
- package/refactor/jasmine-vitest/utils/ast-helpers.js.map +1 -1
- package/refactor/jasmine-vitest/utils/constants.d.ts +8 -0
- package/refactor/jasmine-vitest/utils/constants.js +12 -0
- package/refactor/jasmine-vitest/utils/constants.js.map +1 -0
- package/refactor/jasmine-vitest/utils/refactor-context.d.ts +5 -0
- package/refactor/jasmine-vitest/utils/refactor-helpers.d.ts +39 -0
- package/refactor/jasmine-vitest/utils/refactor-helpers.js +58 -0
- package/refactor/jasmine-vitest/utils/refactor-helpers.js.map +1 -0
- package/refactor/jasmine-vitest/utils/todo-notes.d.ts +6 -0
- package/refactor/jasmine-vitest/utils/todo-notes.js +6 -0
- package/refactor/jasmine-vitest/utils/todo-notes.js.map +1 -1
- package/service/files/__name@dasherize__.__type@dasherize__.ts.template +3 -3
- package/service/schema.d.ts +4 -0
- package/service/schema.json +5 -0
- package/utility/latest-versions/package.json +1 -0
- package/utility/latest-versions.js +3 -3
|
@@ -55,6 +55,7 @@ function analyzeKarmaConfig(content) {
|
|
|
55
55
|
function extractValue(node) {
|
|
56
56
|
switch (node.kind) {
|
|
57
57
|
case typescript_1.default.SyntaxKind.StringLiteral:
|
|
58
|
+
case typescript_1.default.SyntaxKind.NoSubstitutionTemplateLiteral:
|
|
58
59
|
return node.text;
|
|
59
60
|
case typescript_1.default.SyntaxKind.NumericLiteral:
|
|
60
61
|
return Number(node.text);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma-config-analyzer.js","sourceRoot":"","sources":["karma-config-analyzer.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AA2CH,
|
|
1
|
+
{"version":3,"file":"karma-config-analyzer.js","sourceRoot":"","sources":["karma-config-analyzer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,4 +7,9 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import type { json } from '@angular-devkit/core';
|
|
9
9
|
import { SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
10
|
-
|
|
10
|
+
import { KarmaConfigAnalysis } from './karma-config-analyzer';
|
|
11
|
+
export interface KarmaConfigProcessingResult {
|
|
12
|
+
analysis: KarmaConfigAnalysis;
|
|
13
|
+
isRemovable: boolean;
|
|
14
|
+
}
|
|
15
|
+
export declare function processKarmaConfig(karmaConfig: string, options: Record<string, json.JsonValue | undefined>, projectName: string, context: SchematicContext, tree: Tree, cache: Map<string, KarmaConfigProcessingResult>, needDevkitPlugin: boolean, manualMigrationFiles: string[]): Promise<void>;
|
|
@@ -101,27 +101,23 @@ function extractCoverageSettings(analysis, options, projectName, context) {
|
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
|
-
async function processKarmaConfig(karmaConfig, options, projectName, context, tree,
|
|
105
|
-
|
|
104
|
+
async function processKarmaConfig(karmaConfig, options, projectName, context, tree, cache, needDevkitPlugin, manualMigrationFiles) {
|
|
105
|
+
let cachedResult = cache.get(karmaConfig);
|
|
106
|
+
if (!cachedResult && tree.exists(karmaConfig)) {
|
|
106
107
|
const content = tree.readText(karmaConfig);
|
|
107
108
|
const analysis = (0, karma_config_analyzer_1.analyzeKarmaConfig)(content);
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
if (analysis.hasUnsupportedValues) {
|
|
113
|
-
isRemovable = false;
|
|
114
|
-
}
|
|
115
|
-
else {
|
|
116
|
-
const diff = await (0, karma_config_comparer_1.compareKarmaConfigToDefault)(analysis, projectName, karmaConfig, needDevkitPlugin);
|
|
117
|
-
isRemovable = !(0, karma_config_comparer_1.hasDifferences)(diff) && diff.isReliable;
|
|
118
|
-
}
|
|
119
|
-
removableKarmaConfigs.set(karmaConfig, isRemovable);
|
|
109
|
+
let isRemovable = false;
|
|
110
|
+
if (!analysis.hasUnsupportedValues) {
|
|
111
|
+
const diff = await (0, karma_config_comparer_1.compareKarmaConfigToDefault)(analysis, projectName, karmaConfig, needDevkitPlugin);
|
|
112
|
+
isRemovable = !(0, karma_config_comparer_1.hasDifferences)(diff) && diff.isReliable;
|
|
120
113
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
114
|
+
cachedResult = { analysis, isRemovable };
|
|
115
|
+
cache.set(karmaConfig, cachedResult);
|
|
116
|
+
}
|
|
117
|
+
if (cachedResult) {
|
|
118
|
+
extractReporters(cachedResult.analysis, options, projectName, context);
|
|
119
|
+
extractCoverageSettings(cachedResult.analysis, options, projectName, context);
|
|
120
|
+
if (!cachedResult.isRemovable) {
|
|
125
121
|
context.logger.warn(`Project "${projectName}" uses a custom Karma configuration file "${karmaConfig}". ` +
|
|
126
122
|
`Tests have been migrated to use Vitest, but you may need to manually migrate custom settings ` +
|
|
127
123
|
`from this Karma config to a Vitest config (e.g. "vitest-base.config.ts") ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"karma-processor.js","sourceRoot":"","sources":["karma-processor.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"karma-processor.js","sourceRoot":"","sources":["karma-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,10 @@
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.default = default_1;
|
|
11
11
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
12
|
+
const posix_1 = require("node:path/posix");
|
|
12
13
|
const util_1 = require("util");
|
|
13
14
|
const dependency_1 = require("../../utility/dependency");
|
|
15
|
+
const json_file_1 = require("../../utility/json-file");
|
|
14
16
|
const latest_versions_1 = require("../../utility/latest-versions");
|
|
15
17
|
const workspace_1 = require("../../utility/workspace");
|
|
16
18
|
const workspace_models_1 = require("../../utility/workspace-models");
|
|
@@ -18,6 +20,7 @@ const constants_1 = require("./constants");
|
|
|
18
20
|
const karma_processor_1 = require("./karma-processor");
|
|
19
21
|
async function processTestTargetOptions(testTarget, projectName, context, tree, removableKarmaConfigs, customBuildOptions, needDevkitPlugin, manualMigrationFiles) {
|
|
20
22
|
let needsCoverage = false;
|
|
23
|
+
let needsIstanbul = false;
|
|
21
24
|
for (const [configName, options] of (0, workspace_1.allTargetOptions)(testTarget, false)) {
|
|
22
25
|
const configKey = configName || '';
|
|
23
26
|
if (!customBuildOptions[configKey]) {
|
|
@@ -62,6 +65,16 @@ async function processTestTargetOptions(testTarget, projectName, context, tree,
|
|
|
62
65
|
}
|
|
63
66
|
const updatedBrowsers = options['browsers'];
|
|
64
67
|
if (Array.isArray(updatedBrowsers) && updatedBrowsers.length > 0) {
|
|
68
|
+
const hasNonChromium = updatedBrowsers.some((b) => {
|
|
69
|
+
if (typeof b !== 'string') {
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
const normalized = b.toLowerCase();
|
|
73
|
+
return !['chrome', 'chromium', 'edge'].some((name) => normalized.includes(name));
|
|
74
|
+
});
|
|
75
|
+
if (hasNonChromium) {
|
|
76
|
+
needsIstanbul = true;
|
|
77
|
+
}
|
|
65
78
|
context.logger.info(`Project "${projectName}" has browsers configured for tests. ` +
|
|
66
79
|
`To run tests in a browser with Vitest, you will need to install either ` +
|
|
67
80
|
`"@vitest/browser-playwright" or "@vitest/browser-webdriverio" depending on your preference.`);
|
|
@@ -82,13 +95,65 @@ async function processTestTargetOptions(testTarget, projectName, context, tree,
|
|
|
82
95
|
}
|
|
83
96
|
delete options['main'];
|
|
84
97
|
}
|
|
85
|
-
return needsCoverage;
|
|
98
|
+
return { needsCoverage, needsIstanbul };
|
|
99
|
+
}
|
|
100
|
+
function updateTsConfigTypes(tree, tsConfigsToUpdate, context) {
|
|
101
|
+
for (const tsConfigPath of tsConfigsToUpdate) {
|
|
102
|
+
if (tree.exists(tsConfigPath)) {
|
|
103
|
+
try {
|
|
104
|
+
const json = new json_file_1.JSONFile(tree, tsConfigPath);
|
|
105
|
+
const typesPath = ['compilerOptions', 'types'];
|
|
106
|
+
const existingTypes = json.get(typesPath) ?? [];
|
|
107
|
+
const newTypes = existingTypes.filter((t) => t !== 'jasmine');
|
|
108
|
+
if (!newTypes.includes('vitest/globals')) {
|
|
109
|
+
newTypes.push('vitest/globals');
|
|
110
|
+
}
|
|
111
|
+
if (newTypes.length !== existingTypes.length ||
|
|
112
|
+
newTypes.some((t, i) => t !== existingTypes[i])) {
|
|
113
|
+
json.modify(typesPath, newTypes);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
catch (err) {
|
|
117
|
+
context.logger.warn(`Failed to automatically update types in "${tsConfigPath}". ` +
|
|
118
|
+
`Please manually remove "jasmine" and add "vitest/globals" to compilerOptions.types.`);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
function logSummary(context, migratedProjects, skippedNonApplications, skippedMissingAppBuilder, manualMigrationFiles) {
|
|
124
|
+
context.logger.info('\n--- Karma to Vitest Migration Summary ---');
|
|
125
|
+
context.logger.info(`Projects migrated: ${migratedProjects.length}`);
|
|
126
|
+
if (migratedProjects.length > 0) {
|
|
127
|
+
context.logger.info(` - ${migratedProjects.join(', ')}`);
|
|
128
|
+
}
|
|
129
|
+
context.logger.info(`Projects skipped (non-applications): ${skippedNonApplications.length}`);
|
|
130
|
+
if (skippedNonApplications.length > 0) {
|
|
131
|
+
context.logger.info(` - ${skippedNonApplications.join(', ')}`);
|
|
132
|
+
}
|
|
133
|
+
context.logger.info(`Projects skipped (missing application builder): ${skippedMissingAppBuilder.length}`);
|
|
134
|
+
if (skippedMissingAppBuilder.length > 0) {
|
|
135
|
+
context.logger.info(` - ${skippedMissingAppBuilder.join(', ')}`);
|
|
136
|
+
}
|
|
137
|
+
const uniqueManualFiles = [...new Set(manualMigrationFiles)];
|
|
138
|
+
if (uniqueManualFiles.length > 0) {
|
|
139
|
+
context.logger.warn(`\nThe following Karma configuration files require manual migration:`);
|
|
140
|
+
for (const file of uniqueManualFiles) {
|
|
141
|
+
context.logger.warn(` - ${file}`);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
if (migratedProjects.length > 0) {
|
|
145
|
+
context.logger.info(`\nNote: To refactor your test files from Jasmine to Vitest, consider running the following command:` +
|
|
146
|
+
`\n ng g @schematics/angular:refactor-jasmine-vitest <project_name>`);
|
|
147
|
+
}
|
|
148
|
+
context.logger.info('-----------------------------------------\n');
|
|
86
149
|
}
|
|
87
150
|
function updateProjects(tree, context) {
|
|
88
151
|
return (0, workspace_1.updateWorkspace)(async (workspace) => {
|
|
89
152
|
let needsCoverage = false;
|
|
153
|
+
let needsIstanbul = false;
|
|
90
154
|
const removableKarmaConfigs = new Map();
|
|
91
155
|
const migratedProjects = [];
|
|
156
|
+
const tsConfigsToUpdate = new Set();
|
|
92
157
|
const skippedNonApplications = [];
|
|
93
158
|
const skippedMissingAppBuilder = [];
|
|
94
159
|
const manualMigrationFiles = [];
|
|
@@ -126,11 +191,28 @@ function updateProjects(tree, context) {
|
|
|
126
191
|
if (!isKarma) {
|
|
127
192
|
continue;
|
|
128
193
|
}
|
|
194
|
+
// Collect tsConfig paths to perform globals updates
|
|
195
|
+
const baseTsConfig = testTarget.options?.['tsConfig'];
|
|
196
|
+
if (typeof baseTsConfig === 'string') {
|
|
197
|
+
tsConfigsToUpdate.add(baseTsConfig);
|
|
198
|
+
}
|
|
199
|
+
if (testTarget.configurations) {
|
|
200
|
+
for (const config of Object.values(testTarget.configurations)) {
|
|
201
|
+
if (typeof config?.['tsConfig'] === 'string') {
|
|
202
|
+
tsConfigsToUpdate.add(config['tsConfig']);
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
// Always include fallback to the default tsconfig.spec.json path
|
|
207
|
+
tsConfigsToUpdate.add((0, posix_1.join)(project.root, 'tsconfig.spec.json'));
|
|
129
208
|
// Store custom build options to move to a new build configuration if needed
|
|
130
209
|
const customBuildOptions = {};
|
|
131
|
-
const
|
|
132
|
-
if (
|
|
210
|
+
const projectCoverageInfo = await processTestTargetOptions(testTarget, projectName, context, tree, removableKarmaConfigs, customBuildOptions, needDevkitPlugin, manualMigrationFiles);
|
|
211
|
+
if (projectCoverageInfo.needsCoverage) {
|
|
133
212
|
needsCoverage = true;
|
|
213
|
+
if (projectCoverageInfo.needsIstanbul) {
|
|
214
|
+
needsIstanbul = true;
|
|
215
|
+
}
|
|
134
216
|
}
|
|
135
217
|
// If we have custom build options, create testing configurations
|
|
136
218
|
const baseOptions = buildTarget.options || {};
|
|
@@ -172,32 +254,16 @@ function updateProjects(tree, context) {
|
|
|
172
254
|
testTarget.options['runner'] = 'vitest';
|
|
173
255
|
migratedProjects.push(projectName);
|
|
174
256
|
}
|
|
175
|
-
//
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
context.logger.info(` - ${migratedProjects.join(', ')}`);
|
|
180
|
-
}
|
|
181
|
-
context.logger.info(`Projects skipped (non-applications): ${skippedNonApplications.length}`);
|
|
182
|
-
if (skippedNonApplications.length > 0) {
|
|
183
|
-
context.logger.info(` - ${skippedNonApplications.join(', ')}`);
|
|
184
|
-
}
|
|
185
|
-
context.logger.info(`Projects skipped (missing application builder): ${skippedMissingAppBuilder.length}`);
|
|
186
|
-
if (skippedMissingAppBuilder.length > 0) {
|
|
187
|
-
context.logger.info(` - ${skippedMissingAppBuilder.join(', ')}`);
|
|
188
|
-
}
|
|
189
|
-
const uniqueManualFiles = [...new Set(manualMigrationFiles)];
|
|
190
|
-
if (uniqueManualFiles.length > 0) {
|
|
191
|
-
context.logger.warn(`\nThe following Karma configuration files require manual migration:`);
|
|
192
|
-
for (const file of uniqueManualFiles) {
|
|
193
|
-
context.logger.warn(` - ${file}`);
|
|
257
|
+
// Perform cleanup of removable karma config files
|
|
258
|
+
for (const [configPath, result] of removableKarmaConfigs) {
|
|
259
|
+
if (result.isRemovable && tree.exists(configPath)) {
|
|
260
|
+
tree.delete(configPath);
|
|
194
261
|
}
|
|
195
262
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
context.logger.info('-----------------------------------------\n');
|
|
263
|
+
// Update TSConfig files to use Vitest types instead of Jasmine
|
|
264
|
+
updateTsConfigTypes(tree, tsConfigsToUpdate, context);
|
|
265
|
+
// Log summary
|
|
266
|
+
logSummary(context, migratedProjects, skippedNonApplications, skippedMissingAppBuilder, manualMigrationFiles);
|
|
201
267
|
if (migratedProjects.length > 0) {
|
|
202
268
|
const rules = [
|
|
203
269
|
(0, dependency_1.addDependency)('vitest', latest_versions_1.latestVersions['vitest'], {
|
|
@@ -210,6 +276,12 @@ function updateProjects(tree, context) {
|
|
|
210
276
|
type: dependency_1.DependencyType.Dev,
|
|
211
277
|
existing: dependency_1.ExistingBehavior.Skip,
|
|
212
278
|
}));
|
|
279
|
+
if (needsIstanbul) {
|
|
280
|
+
rules.push((0, dependency_1.addDependency)('@vitest/coverage-istanbul', latest_versions_1.latestVersions['@vitest/coverage-istanbul'], {
|
|
281
|
+
type: dependency_1.DependencyType.Dev,
|
|
282
|
+
existing: dependency_1.ExistingBehavior.Skip,
|
|
283
|
+
}));
|
|
284
|
+
}
|
|
213
285
|
}
|
|
214
286
|
return (0, schematics_1.chain)(rules);
|
|
215
287
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.js","sourceRoot":"","sources":["migration.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"migration.js","sourceRoot":"","sources":["migration.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@schematics/angular",
|
|
3
|
-
"version": "22.0.0-
|
|
3
|
+
"version": "22.0.0-rc.0",
|
|
4
4
|
"description": "Schematics specific to Angular",
|
|
5
5
|
"homepage": "https://github.com/angular/angular-cli",
|
|
6
6
|
"keywords": [
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
},
|
|
23
23
|
"schematics": "./collection.json",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@angular-devkit/core": "22.0.0-
|
|
26
|
-
"@angular-devkit/schematics": "22.0.0-
|
|
25
|
+
"@angular-devkit/core": "22.0.0-rc.0",
|
|
26
|
+
"@angular-devkit/schematics": "22.0.0-rc.0",
|
|
27
27
|
"jsonc-parser": "3.3.1",
|
|
28
28
|
"typescript": "6.0.3"
|
|
29
29
|
},
|
|
@@ -31,9 +31,8 @@
|
|
|
31
31
|
"type": "git",
|
|
32
32
|
"url": "git+https://github.com/angular/angular-cli.git"
|
|
33
33
|
},
|
|
34
|
-
"packageManager": "pnpm@10.33.2",
|
|
35
34
|
"engines": {
|
|
36
|
-
"node": "^22.22.0 ||
|
|
35
|
+
"node": "^22.22.0 || ^24.13.1 || >=26.0.0",
|
|
37
36
|
"npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
|
|
38
37
|
"yarn": ">= 1.13.0"
|
|
39
38
|
},
|
|
@@ -94,6 +94,7 @@ function default_1(options) {
|
|
|
94
94
|
const newContent = (0, test_file_transformer_1.transformJasmineToVitest)(file, content, reporter, {
|
|
95
95
|
addImports: !!options.addImports,
|
|
96
96
|
browserMode: !!options.browerMode,
|
|
97
|
+
fakeAsync: !!options.fakeAsync,
|
|
97
98
|
});
|
|
98
99
|
if (content !== newContent) {
|
|
99
100
|
tree.overwrite(file, newContent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAmEH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,10 @@ export type Schema = {
|
|
|
15
15
|
* they're migrated to an equivalent assertion.
|
|
16
16
|
*/
|
|
17
17
|
browserMode?: boolean;
|
|
18
|
+
/**
|
|
19
|
+
* Whether to transform `fakeAsync` tests to Vitest fake timers.
|
|
20
|
+
*/
|
|
21
|
+
fakeAsync?: boolean;
|
|
18
22
|
/**
|
|
19
23
|
* The file suffix to identify test files (e.g., '.spec.ts', '.test.ts').
|
|
20
24
|
*/
|
|
@@ -36,6 +36,11 @@
|
|
|
36
36
|
"description": "Whether the tests are intended to run in browser mode. If true, the `toHaveClass` assertions are left as is because Vitest browser mode has such an assertion. Otherwise they're migrated to an equivalent assertion.",
|
|
37
37
|
"default": false
|
|
38
38
|
},
|
|
39
|
+
"fakeAsync": {
|
|
40
|
+
"type": "boolean",
|
|
41
|
+
"description": "Whether to transform `fakeAsync` tests to Vitest fake timers.",
|
|
42
|
+
"default": false
|
|
43
|
+
},
|
|
39
44
|
"report": {
|
|
40
45
|
"type": "boolean",
|
|
41
46
|
"description": "Whether to generate a summary report file (jasmine-vitest-<date>.md) in the project root.",
|
|
@@ -18,4 +18,5 @@ import { RefactorReporter } from './utils/refactor-reporter';
|
|
|
18
18
|
export declare function transformJasmineToVitest(filePath: string, content: string, reporter: RefactorReporter, options: {
|
|
19
19
|
addImports: boolean;
|
|
20
20
|
browserMode: boolean;
|
|
21
|
+
fakeAsync?: boolean;
|
|
21
22
|
}): string;
|
|
@@ -18,6 +18,10 @@ exports.transformJasmineToVitest = transformJasmineToVitest;
|
|
|
18
18
|
* blank line preservation, and reporting of transformation details.
|
|
19
19
|
*/
|
|
20
20
|
const typescript_1 = __importDefault(require("typescript"));
|
|
21
|
+
const fake_async_flush_1 = require("./transformers/fake-async-flush");
|
|
22
|
+
const fake_async_flush_microtasks_1 = require("./transformers/fake-async-flush-microtasks");
|
|
23
|
+
const fake_async_test_1 = require("./transformers/fake-async-test");
|
|
24
|
+
const fake_async_tick_1 = require("./transformers/fake-async-tick");
|
|
21
25
|
const jasmine_lifecycle_1 = require("./transformers/jasmine-lifecycle");
|
|
22
26
|
const jasmine_matcher_1 = require("./transformers/jasmine-matcher");
|
|
23
27
|
const jasmine_misc_1 = require("./transformers/jasmine-misc");
|
|
@@ -95,6 +99,10 @@ const callExpressionTransformers = [
|
|
|
95
99
|
jasmine_matcher_1.transformToHaveBeenCalledBefore,
|
|
96
100
|
jasmine_matcher_1.transformToHaveClass,
|
|
97
101
|
jasmine_matcher_1.transformToBeNullish,
|
|
102
|
+
fake_async_test_1.transformFakeAsyncTest,
|
|
103
|
+
fake_async_tick_1.transformFakeAsyncTick,
|
|
104
|
+
fake_async_flush_1.transformFakeAsyncFlush,
|
|
105
|
+
fake_async_flush_microtasks_1.transformFakeAsyncFlushMicrotasks,
|
|
98
106
|
// **Stage 3: Global Functions & Cleanup**
|
|
99
107
|
// These handle global Jasmine functions and catch-alls for unsupported APIs.
|
|
100
108
|
jasmine_misc_1.transformTimerMocks,
|
|
@@ -132,10 +140,12 @@ const expressionStatementTransformers = [
|
|
|
132
140
|
* @returns The transformed code.
|
|
133
141
|
*/
|
|
134
142
|
function transformJasmineToVitest(filePath, content, reporter, options) {
|
|
143
|
+
options.fakeAsync ??= false;
|
|
135
144
|
const contentWithPlaceholders = preserveBlankLines(content);
|
|
136
145
|
const sourceFile = typescript_1.default.createSourceFile(filePath, contentWithPlaceholders, typescript_1.default.ScriptTarget.Latest, true, typescript_1.default.ScriptKind.TS);
|
|
137
146
|
const pendingVitestValueImports = new Set();
|
|
138
147
|
const pendingVitestTypeImports = new Set();
|
|
148
|
+
const pendingImportSpecifierRemovals = new Map();
|
|
139
149
|
const transformer = (context) => {
|
|
140
150
|
const refactorCtx = {
|
|
141
151
|
sourceFile,
|
|
@@ -143,6 +153,7 @@ function transformJasmineToVitest(filePath, content, reporter, options) {
|
|
|
143
153
|
tsContext: context,
|
|
144
154
|
pendingVitestValueImports,
|
|
145
155
|
pendingVitestTypeImports,
|
|
156
|
+
pendingImportSpecifierRemovals,
|
|
146
157
|
};
|
|
147
158
|
const visitor = (node) => {
|
|
148
159
|
let transformedNode = node;
|
|
@@ -156,7 +167,14 @@ function transformJasmineToVitest(filePath, content, reporter, options) {
|
|
|
156
167
|
}
|
|
157
168
|
}
|
|
158
169
|
for (const transformer of callExpressionTransformers) {
|
|
159
|
-
if (!(options.browserMode && transformer === jasmine_matcher_1.transformToHaveClass)
|
|
170
|
+
if (!((options.browserMode && transformer === jasmine_matcher_1.transformToHaveClass) ||
|
|
171
|
+
(options.fakeAsync === false &&
|
|
172
|
+
[
|
|
173
|
+
fake_async_flush_1.transformFakeAsyncFlush,
|
|
174
|
+
fake_async_flush_microtasks_1.transformFakeAsyncFlushMicrotasks,
|
|
175
|
+
fake_async_tick_1.transformFakeAsyncTick,
|
|
176
|
+
fake_async_test_1.transformFakeAsyncTest,
|
|
177
|
+
].includes(transformer)))) {
|
|
160
178
|
transformedNode = transformer(transformedNode, refactorCtx);
|
|
161
179
|
}
|
|
162
180
|
}
|
|
@@ -194,12 +212,17 @@ function transformJasmineToVitest(filePath, content, reporter, options) {
|
|
|
194
212
|
let transformedSourceFile = result.transformed[0];
|
|
195
213
|
const hasPendingValueImports = pendingVitestValueImports.size > 0;
|
|
196
214
|
const hasPendingTypeImports = pendingVitestTypeImports.size > 0;
|
|
215
|
+
const hasPendingImportSpecifierRemovals = pendingImportSpecifierRemovals.size > 0;
|
|
197
216
|
if (transformedSourceFile === sourceFile &&
|
|
198
217
|
!reporter.hasTodos &&
|
|
199
218
|
!hasPendingValueImports &&
|
|
200
|
-
!hasPendingTypeImports
|
|
219
|
+
!hasPendingTypeImports &&
|
|
220
|
+
!hasPendingImportSpecifierRemovals) {
|
|
201
221
|
return content;
|
|
202
222
|
}
|
|
223
|
+
if (hasPendingImportSpecifierRemovals) {
|
|
224
|
+
transformedSourceFile = (0, ast_helpers_1.removeImportSpecifiers)(transformedSourceFile, pendingImportSpecifierRemovals);
|
|
225
|
+
}
|
|
203
226
|
if (hasPendingTypeImports || (options.addImports && hasPendingValueImports)) {
|
|
204
227
|
const vitestImport = (0, ast_helpers_1.getVitestAutoImports)(options.addImports ? pendingVitestValueImports : new Set(), pendingVitestTypeImports);
|
|
205
228
|
if (vitestImport) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-file-transformer.js","sourceRoot":"","sources":["test-file-transformer.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"test-file-transformer.js","sourceRoot":"","sources":["test-file-transformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
7
|
+
*/
|
|
8
|
+
import ts from 'typescript';
|
|
9
|
+
import { RefactorContext } from '../utils/refactor-context';
|
|
10
|
+
export declare function transformFakeAsyncFlushMicrotasks(node: ts.Node, ctx: RefactorContext): ts.Node;
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
8
|
+
*/
|
|
9
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
|
+
};
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.transformFakeAsyncFlushMicrotasks = transformFakeAsyncFlushMicrotasks;
|
|
14
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
15
|
+
const ast_helpers_1 = require("../utils/ast-helpers");
|
|
16
|
+
const constants_1 = require("../utils/constants");
|
|
17
|
+
const refactor_helpers_1 = require("../utils/refactor-helpers");
|
|
18
|
+
function transformFakeAsyncFlushMicrotasks(node, ctx) {
|
|
19
|
+
if (!(typescript_1.default.isCallExpression(node) &&
|
|
20
|
+
typescript_1.default.isIdentifier(node.expression) &&
|
|
21
|
+
node.expression.text === 'flushMicrotasks' &&
|
|
22
|
+
(0, ast_helpers_1.isNamedImportFrom)(ctx.sourceFile, 'flushMicrotasks', constants_1.ANGULAR_CORE_TESTING))) {
|
|
23
|
+
return node;
|
|
24
|
+
}
|
|
25
|
+
ctx.reporter.reportTransformation(ctx.sourceFile, node, `Transformed \`flushMicrotasks\` to \`await vi.advanceTimersByTimeAsync(0)\`.`);
|
|
26
|
+
(0, refactor_helpers_1.addImportSpecifierRemoval)(ctx, 'flushMicrotasks', constants_1.ANGULAR_CORE_TESTING);
|
|
27
|
+
return typescript_1.default.factory.createAwaitExpression((0, refactor_helpers_1.createViCallExpression)(ctx, 'advanceTimersByTimeAsync', [typescript_1.default.factory.createNumericLiteral(0)]));
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=fake-async-flush-microtasks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fake-async-flush-microtasks.js","sourceRoot":"","sources":["fake-async-flush-microtasks.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAQH,8EAuBC;AA7BD,4DAA4B;AAC5B,sDAAyD;AACzD,kDAA0D;AAE1D,gEAA8F;AAE9F,SAAgB,iCAAiC,CAAC,IAAa,EAAE,GAAoB;IACnF,IACE,CAAC,CACC,oBAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACzB,oBAAE,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,iBAAiB;QAC1C,IAAA,+BAAiB,EAAC,GAAG,CAAC,UAAU,EAAE,iBAAiB,EAAE,gCAAoB,CAAC,CAC3E,EACD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,QAAQ,CAAC,oBAAoB,CAC/B,GAAG,CAAC,UAAU,EACd,IAAI,EACJ,8EAA8E,CAC/E,CAAC;IAEF,IAAA,4CAAyB,EAAC,GAAG,EAAE,iBAAiB,EAAE,gCAAoB,CAAC,CAAC;IAExE,OAAO,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CACrC,IAAA,yCAAsB,EAAC,GAAG,EAAE,0BAA0B,EAAE,CAAC,oBAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9F,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
7
|
+
*/
|
|
8
|
+
import ts from 'typescript';
|
|
9
|
+
import { RefactorContext } from '../utils/refactor-context';
|
|
10
|
+
export declare function transformFakeAsyncFlush(node: ts.Node, ctx: RefactorContext): ts.Node;
|