@schematics/angular 22.0.0-next.5 → 22.0.0-next.7
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/app-shell/index.js +1 -1
- package/app-shell/index.js.map +1 -1
- package/migrations/{karma → migrate-karma-to-vitest}/karma-config-analyzer.js +1 -1
- package/migrations/{karma → migrate-karma-to-vitest}/karma-config-analyzer.js.map +1 -1
- package/migrations/migrate-karma-to-vitest/karma-processor.js +4 -3
- package/migrations/migrate-karma-to-vitest/karma-processor.js.map +1 -1
- package/migrations/migration-collection.json +6 -6
- package/migrations/{karma → trust-proxy-headers}/migration.d.ts +1 -1
- package/migrations/trust-proxy-headers/migration.js +80 -0
- package/migrations/trust-proxy-headers/migration.js.map +1 -0
- package/module/index.js +6 -36
- package/module/index.js.map +1 -1
- package/package.json +6 -5
- package/refactor/jasmine-vitest/test-file-transformer.js +22 -15
- package/refactor/jasmine-vitest/test-file-transformer.js.map +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-lifecycle.d.ts +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-lifecycle.js +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-lifecycle.js.map +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-matcher.d.ts +3 -2
- package/refactor/jasmine-vitest/transformers/jasmine-matcher.js +37 -15
- package/refactor/jasmine-vitest/transformers/jasmine-matcher.js.map +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-misc.d.ts +3 -3
- package/refactor/jasmine-vitest/transformers/jasmine-misc.js +76 -20
- package/refactor/jasmine-vitest/transformers/jasmine-misc.js.map +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-spy.d.ts +2 -1
- package/refactor/jasmine-vitest/transformers/jasmine-spy.js +76 -17
- package/refactor/jasmine-vitest/transformers/jasmine-spy.js.map +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-type.d.ts +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-type.js +1 -1
- package/refactor/jasmine-vitest/transformers/jasmine-type.js.map +1 -1
- package/refactor/jasmine-vitest/utils/ast-helpers.d.ts +5 -1
- package/refactor/jasmine-vitest/utils/ast-helpers.js +22 -1
- package/refactor/jasmine-vitest/utils/ast-helpers.js.map +1 -1
- package/refactor/jasmine-vitest/utils/ast-validation.d.ts +1 -1
- package/refactor/jasmine-vitest/utils/ast-validation.js +1 -1
- package/refactor/jasmine-vitest/utils/ast-validation.js.map +1 -1
- package/refactor/jasmine-vitest/utils/comment-helpers.d.ts +1 -1
- package/refactor/jasmine-vitest/utils/comment-helpers.js +1 -1
- package/refactor/jasmine-vitest/utils/comment-helpers.js.map +1 -1
- package/refactor/jasmine-vitest/utils/refactor-context.d.ts +1 -1
- package/refactor/jasmine-vitest/utils/refactor-reporter.d.ts +1 -1
- package/refactor/jasmine-vitest/utils/refactor-reporter.js +1 -1
- package/refactor/jasmine-vitest/utils/refactor-reporter.js.map +1 -1
- package/refactor/jasmine-vitest/utils/todo-notes.d.ts +39 -1
- package/refactor/jasmine-vitest/utils/todo-notes.js +43 -2
- package/refactor/jasmine-vitest/utils/todo-notes.js.map +1 -1
- package/server/index.js +1 -1
- package/server/index.js.map +1 -1
- package/service-worker/index.js +1 -1
- package/service-worker/index.js.map +1 -1
- package/utility/add-declaration-to-ng-module.js +5 -35
- package/utility/add-declaration-to-ng-module.js.map +1 -1
- package/utility/ast-utils.d.ts +1 -1
- package/utility/ast-utils.js +49 -79
- package/utility/ast-utils.js.map +1 -1
- package/utility/latest-versions/package.json +1 -1
- package/utility/latest-versions.js +3 -3
- package/utility/ng-ast-utils.d.ts +1 -1
- package/utility/ng-ast-utils.js +11 -41
- package/utility/ng-ast-utils.js.map +1 -1
- package/utility/standalone/app_component.js +1 -1
- package/utility/standalone/app_component.js.map +1 -1
- package/utility/standalone/app_config.d.ts +1 -1
- package/utility/standalone/app_config.js +1 -1
- package/utility/standalone/app_config.js.map +1 -1
- package/utility/standalone/code_block.js +1 -1
- package/utility/standalone/code_block.js.map +1 -1
- package/utility/standalone/util.d.ts +1 -1
- package/utility/standalone/util.js +1 -1
- package/utility/standalone/util.js.map +1 -1
- package/workspace/files/tsconfig.json.template +2 -2
- package/migrations/karma/migration.js +0 -63
- package/migrations/karma/migration.js.map +0 -1
- package/third_party/github.com/Microsoft/TypeScript/LICENSE +0 -55
- package/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts +0 -11448
- package/third_party/github.com/Microsoft/TypeScript/lib/typescript.js +0 -201020
- /package/migrations/{karma → migrate-karma-to-vitest}/karma-config-analyzer.d.ts +0 -0
- /package/migrations/{karma → migrate-karma-to-vitest}/karma-config-comparer.d.ts +0 -0
- /package/migrations/{karma → migrate-karma-to-vitest}/karma-config-comparer.js +0 -0
- /package/migrations/{karma → migrate-karma-to-vitest}/karma-config-comparer.js.map +0 -0
package/utility/ast-utils.js
CHANGED
|
@@ -6,39 +6,9 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
|
-
var
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
-
}
|
|
15
|
-
Object.defineProperty(o, k2, desc);
|
|
16
|
-
}) : (function(o, m, k, k2) {
|
|
17
|
-
if (k2 === undefined) k2 = k;
|
|
18
|
-
o[k2] = m[k];
|
|
19
|
-
}));
|
|
20
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
-
}) : function(o, v) {
|
|
23
|
-
o["default"] = v;
|
|
24
|
-
});
|
|
25
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
26
|
-
var ownKeys = function(o) {
|
|
27
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
-
var ar = [];
|
|
29
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
-
return ar;
|
|
31
|
-
};
|
|
32
|
-
return ownKeys(o);
|
|
33
|
-
};
|
|
34
|
-
return function (mod) {
|
|
35
|
-
if (mod && mod.__esModule) return mod;
|
|
36
|
-
var result = {};
|
|
37
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
-
__setModuleDefault(result, mod);
|
|
39
|
-
return result;
|
|
40
|
-
};
|
|
41
|
-
})();
|
|
9
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
|
+
};
|
|
42
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
13
|
exports.insertImport = insertImport;
|
|
44
14
|
exports.findNodes = findNodes;
|
|
@@ -57,7 +27,7 @@ exports.isImported = isImported;
|
|
|
57
27
|
exports.getRouterModuleDeclaration = getRouterModuleDeclaration;
|
|
58
28
|
exports.addRouteDeclarationToModule = addRouteDeclarationToModule;
|
|
59
29
|
exports.hasTopLevelIdentifier = hasTopLevelIdentifier;
|
|
60
|
-
const
|
|
30
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
61
31
|
const change_1 = require("./change");
|
|
62
32
|
const eol_1 = require("./eol");
|
|
63
33
|
/**
|
|
@@ -72,35 +42,35 @@ const eol_1 = require("./eol");
|
|
|
72
42
|
*/
|
|
73
43
|
function insertImport(source, fileToEdit, symbolName, fileName, isDefault = false, alias) {
|
|
74
44
|
const rootNode = source;
|
|
75
|
-
const allImports = findNodes(rootNode,
|
|
45
|
+
const allImports = findNodes(rootNode, typescript_1.default.isImportDeclaration);
|
|
76
46
|
const importExpression = alias ? `${symbolName} as ${alias}` : symbolName;
|
|
77
47
|
// get nodes that map to import statements from the file fileName
|
|
78
48
|
const relevantImports = allImports.filter((node) => {
|
|
79
|
-
return
|
|
49
|
+
return typescript_1.default.isStringLiteralLike(node.moduleSpecifier) && node.moduleSpecifier.text === fileName;
|
|
80
50
|
});
|
|
81
51
|
if (relevantImports.length > 0) {
|
|
82
52
|
const hasNamespaceImport = relevantImports.some((node) => {
|
|
83
|
-
return node.importClause?.namedBindings?.kind ===
|
|
53
|
+
return node.importClause?.namedBindings?.kind === typescript_1.default.SyntaxKind.NamespaceImport;
|
|
84
54
|
});
|
|
85
55
|
// if imports * from fileName, don't add symbolName
|
|
86
56
|
if (hasNamespaceImport) {
|
|
87
57
|
return new change_1.NoopChange();
|
|
88
58
|
}
|
|
89
59
|
const imports = relevantImports.flatMap((node) => {
|
|
90
|
-
return node.importClause?.namedBindings &&
|
|
60
|
+
return node.importClause?.namedBindings && typescript_1.default.isNamedImports(node.importClause.namedBindings)
|
|
91
61
|
? node.importClause.namedBindings.elements
|
|
92
62
|
: [];
|
|
93
63
|
});
|
|
94
64
|
// insert import if it's not there
|
|
95
65
|
if (!imports.some((node) => (node.propertyName || node.name).text === symbolName)) {
|
|
96
|
-
const fallbackPos = findNodes(relevantImports[0],
|
|
97
|
-
findNodes(relevantImports[0],
|
|
66
|
+
const fallbackPos = findNodes(relevantImports[0], typescript_1.default.SyntaxKind.CloseBraceToken)[0].getStart() ||
|
|
67
|
+
findNodes(relevantImports[0], typescript_1.default.SyntaxKind.FromKeyword)[0].getStart();
|
|
98
68
|
return insertAfterLastOccurrence(imports, `, ${importExpression}`, fileToEdit, fallbackPos);
|
|
99
69
|
}
|
|
100
70
|
return new change_1.NoopChange();
|
|
101
71
|
}
|
|
102
72
|
// no such import declaration exists
|
|
103
|
-
const useStrict = findNodes(rootNode,
|
|
73
|
+
const useStrict = findNodes(rootNode, typescript_1.default.isStringLiteral).filter((n) => n.text === 'use strict');
|
|
104
74
|
let fallbackPos = 0;
|
|
105
75
|
if (useStrict.length > 0) {
|
|
106
76
|
fallbackPos = useStrict[0].end;
|
|
@@ -113,7 +83,7 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
|
|
|
113
83
|
const separator = insertAtBeginning ? '' : `;${eol}`;
|
|
114
84
|
const toInsert = `${separator}import ${open}${importExpression}${close}` +
|
|
115
85
|
` from '${fileName}'${insertAtBeginning ? `;${eol}` : ''}`;
|
|
116
|
-
return insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos,
|
|
86
|
+
return insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, typescript_1.default.SyntaxKind.StringLiteral);
|
|
117
87
|
}
|
|
118
88
|
const findNodesCache = new WeakMap();
|
|
119
89
|
function findNodes(node, kindOrGuard, max = Infinity, recursive = false) {
|
|
@@ -124,7 +94,7 @@ function findNodes(node, kindOrGuard, max = Infinity, recursive = false) {
|
|
|
124
94
|
? kindOrGuard
|
|
125
95
|
: (node) => node.kind === kindOrGuard;
|
|
126
96
|
// Caching is only supported for the entire file
|
|
127
|
-
if (
|
|
97
|
+
if (typescript_1.default.isSourceFile(node)) {
|
|
128
98
|
const sourceFileCache = findNodesCache.get(node);
|
|
129
99
|
if (sourceFileCache?.has(kindOrGuard)) {
|
|
130
100
|
return sourceFileCache.get(kindOrGuard);
|
|
@@ -148,7 +118,7 @@ function findNodes(node, kindOrGuard, max = Infinity, recursive = false) {
|
|
|
148
118
|
}
|
|
149
119
|
}
|
|
150
120
|
}
|
|
151
|
-
if (
|
|
121
|
+
if (typescript_1.default.isSourceFile(node)) {
|
|
152
122
|
let sourceFileCache = findNodesCache.get(node);
|
|
153
123
|
if (!sourceFileCache) {
|
|
154
124
|
sourceFileCache = new Map();
|
|
@@ -177,7 +147,7 @@ function findNode(node, kind, text) {
|
|
|
177
147
|
return node;
|
|
178
148
|
}
|
|
179
149
|
let foundNode = null;
|
|
180
|
-
|
|
150
|
+
typescript_1.default.forEachChild(node, (childNode) => {
|
|
181
151
|
foundNode = foundNode || findNode(childNode, kind, text);
|
|
182
152
|
});
|
|
183
153
|
return foundNode;
|
|
@@ -222,7 +192,7 @@ function _angularImportsFromNode(node) {
|
|
|
222
192
|
const ms = node.moduleSpecifier;
|
|
223
193
|
let modulePath;
|
|
224
194
|
switch (ms.kind) {
|
|
225
|
-
case
|
|
195
|
+
case typescript_1.default.SyntaxKind.StringLiteral:
|
|
226
196
|
modulePath = ms.text;
|
|
227
197
|
break;
|
|
228
198
|
default:
|
|
@@ -238,7 +208,7 @@ function _angularImportsFromNode(node) {
|
|
|
238
208
|
}
|
|
239
209
|
else if (node.importClause.namedBindings) {
|
|
240
210
|
const nb = node.importClause.namedBindings;
|
|
241
|
-
if (nb.kind ==
|
|
211
|
+
if (nb.kind == typescript_1.default.SyntaxKind.NamespaceImport) {
|
|
242
212
|
// This is of the form `import * as name from 'path'`. Return `name.`.
|
|
243
213
|
return {
|
|
244
214
|
[nb.name.text + '.']: modulePath,
|
|
@@ -263,7 +233,7 @@ function _angularImportsFromNode(node) {
|
|
|
263
233
|
}
|
|
264
234
|
}
|
|
265
235
|
function getDecoratorMetadata(source, identifier, module) {
|
|
266
|
-
const angularImports = findNodes(source,
|
|
236
|
+
const angularImports = findNodes(source, typescript_1.default.isImportDeclaration)
|
|
267
237
|
.map((node) => _angularImportsFromNode(node))
|
|
268
238
|
.reduce((acc, current) => {
|
|
269
239
|
for (const key of Object.keys(current)) {
|
|
@@ -273,20 +243,20 @@ function getDecoratorMetadata(source, identifier, module) {
|
|
|
273
243
|
}, {});
|
|
274
244
|
return getSourceNodes(source)
|
|
275
245
|
.filter((node) => {
|
|
276
|
-
return (node.kind ==
|
|
277
|
-
node.expression.kind ==
|
|
246
|
+
return (node.kind == typescript_1.default.SyntaxKind.Decorator &&
|
|
247
|
+
node.expression.kind == typescript_1.default.SyntaxKind.CallExpression);
|
|
278
248
|
})
|
|
279
249
|
.map((node) => node.expression)
|
|
280
250
|
.filter((expr) => {
|
|
281
|
-
if (expr.expression.kind ==
|
|
251
|
+
if (expr.expression.kind == typescript_1.default.SyntaxKind.Identifier) {
|
|
282
252
|
const id = expr.expression;
|
|
283
253
|
return id.text == identifier && angularImports[id.text] === module;
|
|
284
254
|
}
|
|
285
|
-
else if (expr.expression.kind ==
|
|
255
|
+
else if (expr.expression.kind == typescript_1.default.SyntaxKind.PropertyAccessExpression) {
|
|
286
256
|
// This covers foo.NgModule when importing * as foo.
|
|
287
257
|
const paExpr = expr.expression;
|
|
288
258
|
// If the left expression is not an identifier, just give up at that point.
|
|
289
|
-
if (paExpr.expression.kind !==
|
|
259
|
+
if (paExpr.expression.kind !== typescript_1.default.SyntaxKind.Identifier) {
|
|
290
260
|
return false;
|
|
291
261
|
}
|
|
292
262
|
const id = paExpr.name.text;
|
|
@@ -295,23 +265,23 @@ function getDecoratorMetadata(source, identifier, module) {
|
|
|
295
265
|
}
|
|
296
266
|
return false;
|
|
297
267
|
})
|
|
298
|
-
.filter((expr) => expr.arguments[0] && expr.arguments[0].kind ==
|
|
268
|
+
.filter((expr) => expr.arguments[0] && expr.arguments[0].kind == typescript_1.default.SyntaxKind.ObjectLiteralExpression)
|
|
299
269
|
.map((expr) => expr.arguments[0]);
|
|
300
270
|
}
|
|
301
271
|
function getMetadataField(node, metadataField) {
|
|
302
272
|
return (node.properties
|
|
303
|
-
.filter(
|
|
273
|
+
.filter(typescript_1.default.isPropertyAssignment)
|
|
304
274
|
// Filter out every fields that's not "metadataField". Also handles string literals
|
|
305
275
|
// (but not expressions).
|
|
306
276
|
.filter(({ name }) => {
|
|
307
|
-
return (
|
|
277
|
+
return (typescript_1.default.isIdentifier(name) || typescript_1.default.isStringLiteral(name)) && name.text === metadataField;
|
|
308
278
|
}));
|
|
309
279
|
}
|
|
310
280
|
function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbolName, importPath = null) {
|
|
311
281
|
const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
|
|
312
282
|
const node = nodes[0];
|
|
313
283
|
// Find the decorator declaration.
|
|
314
|
-
if (!node || !
|
|
284
|
+
if (!node || !typescript_1.default.isObjectLiteralExpression(node)) {
|
|
315
285
|
return [];
|
|
316
286
|
}
|
|
317
287
|
// Get all the children property assignment of object literals.
|
|
@@ -355,8 +325,8 @@ ${' '.repeat(4)}${symbolName}
|
|
|
355
325
|
}
|
|
356
326
|
const assignment = matchingProperties[0];
|
|
357
327
|
// If it's not an array, nothing we can do really.
|
|
358
|
-
if (!
|
|
359
|
-
!
|
|
328
|
+
if (!typescript_1.default.isPropertyAssignment(assignment) ||
|
|
329
|
+
!typescript_1.default.isArrayLiteralExpression(assignment.initializer)) {
|
|
360
330
|
return [];
|
|
361
331
|
}
|
|
362
332
|
let expression;
|
|
@@ -374,7 +344,7 @@ ${' '.repeat(4)}${symbolName}
|
|
|
374
344
|
}
|
|
375
345
|
let toInsert;
|
|
376
346
|
let position = expression.getEnd();
|
|
377
|
-
if (
|
|
347
|
+
if (typescript_1.default.isArrayLiteralExpression(expression)) {
|
|
378
348
|
// We found the field but it's empty. Insert it just before the `]`.
|
|
379
349
|
position--;
|
|
380
350
|
toInsert = `\n${' '.repeat(4)}${symbolName}\n `;
|
|
@@ -435,13 +405,13 @@ function addBootstrapToModule(source, modulePath, classifiedName, importPath) {
|
|
|
435
405
|
function isImported(source, classifiedName, importPath) {
|
|
436
406
|
const allNodes = getSourceNodes(source);
|
|
437
407
|
const matchingNodes = allNodes
|
|
438
|
-
.filter(
|
|
439
|
-
.filter((imp) =>
|
|
408
|
+
.filter(typescript_1.default.isImportDeclaration)
|
|
409
|
+
.filter((imp) => typescript_1.default.isStringLiteral(imp.moduleSpecifier) && imp.moduleSpecifier.text === importPath)
|
|
440
410
|
.filter((imp) => {
|
|
441
411
|
if (!imp.importClause) {
|
|
442
412
|
return false;
|
|
443
413
|
}
|
|
444
|
-
const nodes = findNodes(imp.importClause,
|
|
414
|
+
const nodes = findNodes(imp.importClause, typescript_1.default.isImportSpecifier).filter((n) => n.getText() === classifiedName);
|
|
445
415
|
return nodes.length > 0;
|
|
446
416
|
});
|
|
447
417
|
return matchingNodes.length > 0;
|
|
@@ -452,17 +422,17 @@ function isImported(source, classifiedName, importPath) {
|
|
|
452
422
|
function getRouterModuleDeclaration(source) {
|
|
453
423
|
const result = getDecoratorMetadata(source, 'NgModule', '@angular/core');
|
|
454
424
|
const node = result[0];
|
|
455
|
-
if (!node || !
|
|
425
|
+
if (!node || !typescript_1.default.isObjectLiteralExpression(node)) {
|
|
456
426
|
return undefined;
|
|
457
427
|
}
|
|
458
428
|
const matchingProperties = getMetadataField(node, 'imports');
|
|
459
429
|
const assignment = matchingProperties[0];
|
|
460
|
-
if (!assignment || assignment.initializer.kind !==
|
|
430
|
+
if (!assignment || assignment.initializer.kind !== typescript_1.default.SyntaxKind.ArrayLiteralExpression) {
|
|
461
431
|
return;
|
|
462
432
|
}
|
|
463
433
|
const arrLiteral = assignment.initializer;
|
|
464
434
|
return arrLiteral.elements
|
|
465
|
-
.filter((el) => el.kind ===
|
|
435
|
+
.filter((el) => el.kind === typescript_1.default.SyntaxKind.CallExpression)
|
|
466
436
|
.find((el) => el.getText().startsWith('RouterModule'));
|
|
467
437
|
}
|
|
468
438
|
/**
|
|
@@ -483,14 +453,14 @@ function addRouteDeclarationToModule(source, fileToAdd, routeLiteral) {
|
|
|
483
453
|
const routesArg = scopeConfigMethodArgs[0];
|
|
484
454
|
// Check if the route declarations array is
|
|
485
455
|
// an inlined argument of RouterModule or a standalone variable
|
|
486
|
-
if (
|
|
456
|
+
if (typescript_1.default.isArrayLiteralExpression(routesArg)) {
|
|
487
457
|
routesArr = routesArg;
|
|
488
458
|
}
|
|
489
459
|
else {
|
|
490
460
|
const routesVarName = routesArg.getText();
|
|
491
461
|
let routesVar;
|
|
492
|
-
if (routesArg.kind ===
|
|
493
|
-
routesVar = source.statements.filter(
|
|
462
|
+
if (routesArg.kind === typescript_1.default.SyntaxKind.Identifier) {
|
|
463
|
+
routesVar = source.statements.filter(typescript_1.default.isVariableStatement).find((v) => {
|
|
494
464
|
return v.declarationList.declarations[0].name.getText() === routesVarName;
|
|
495
465
|
});
|
|
496
466
|
}
|
|
@@ -499,7 +469,7 @@ function addRouteDeclarationToModule(source, fileToAdd, routeLiteral) {
|
|
|
499
469
|
throw new Error(`No route declaration array was found that corresponds ` +
|
|
500
470
|
`to router module at line ${line} in ${fileToAdd}`);
|
|
501
471
|
}
|
|
502
|
-
routesArr = findNodes(routesVar,
|
|
472
|
+
routesArr = findNodes(routesVar, typescript_1.default.SyntaxKind.ArrayLiteralExpression, 1)[0];
|
|
503
473
|
}
|
|
504
474
|
const occurrencesCount = routesArr.elements.length;
|
|
505
475
|
const text = routesArr.getFullText(source);
|
|
@@ -507,11 +477,11 @@ function addRouteDeclarationToModule(source, fileToAdd, routeLiteral) {
|
|
|
507
477
|
let insertPos = routesArr.elements.pos;
|
|
508
478
|
if (occurrencesCount > 0) {
|
|
509
479
|
const lastRouteLiteral = [...routesArr.elements].pop();
|
|
510
|
-
const lastRouteIsWildcard =
|
|
511
|
-
lastRouteLiteral.properties.some((n) =>
|
|
512
|
-
|
|
480
|
+
const lastRouteIsWildcard = typescript_1.default.isObjectLiteralExpression(lastRouteLiteral) &&
|
|
481
|
+
lastRouteLiteral.properties.some((n) => typescript_1.default.isPropertyAssignment(n) &&
|
|
482
|
+
typescript_1.default.isIdentifier(n.name) &&
|
|
513
483
|
n.name.text === 'path' &&
|
|
514
|
-
|
|
484
|
+
typescript_1.default.isStringLiteral(n.initializer) &&
|
|
515
485
|
n.initializer.text === '**');
|
|
516
486
|
const indentation = text.match(/\r?\n(\r?)\s*/) || [];
|
|
517
487
|
const routeText = `${indentation[0] || ' '}${routeLiteral}`;
|
|
@@ -530,7 +500,7 @@ function addRouteDeclarationToModule(source, fileToAdd, routeLiteral) {
|
|
|
530
500
|
}
|
|
531
501
|
/** Asserts if the specified node is a named declaration (e.g. class, interface). */
|
|
532
502
|
function isNamedNode(node) {
|
|
533
|
-
return !!node.name &&
|
|
503
|
+
return !!node.name && typescript_1.default.isIdentifier(node.name);
|
|
534
504
|
}
|
|
535
505
|
/**
|
|
536
506
|
* Determines if a SourceFile has a top-level declaration whose name matches a specific symbol.
|
|
@@ -545,17 +515,17 @@ function hasTopLevelIdentifier(sourceFile, symbolName, skipModule = null) {
|
|
|
545
515
|
if (isNamedNode(node) && node.name.text === symbolName) {
|
|
546
516
|
return true;
|
|
547
517
|
}
|
|
548
|
-
if (
|
|
518
|
+
if (typescript_1.default.isVariableStatement(node) &&
|
|
549
519
|
node.declarationList.declarations.some((decl) => {
|
|
550
520
|
return isNamedNode(decl) && decl.name.text === symbolName;
|
|
551
521
|
})) {
|
|
552
522
|
return true;
|
|
553
523
|
}
|
|
554
|
-
if (
|
|
555
|
-
|
|
524
|
+
if (typescript_1.default.isImportDeclaration(node) &&
|
|
525
|
+
typescript_1.default.isStringLiteralLike(node.moduleSpecifier) &&
|
|
556
526
|
node.moduleSpecifier.text !== skipModule &&
|
|
557
527
|
node.importClause?.namedBindings &&
|
|
558
|
-
|
|
528
|
+
typescript_1.default.isNamedImports(node.importClause.namedBindings) &&
|
|
559
529
|
node.importClause.namedBindings.elements.some((el) => el.name.text === symbolName)) {
|
|
560
530
|
return true;
|
|
561
531
|
}
|
package/utility/ast-utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["ast-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,8 @@ exports.latestVersions = {
|
|
|
16
16
|
// As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
|
|
17
17
|
Angular: '^22.0.0-next.0',
|
|
18
18
|
NgPackagr: '^22.0.0-next.0',
|
|
19
|
-
DevkitBuildAngular: '^22.0.0-next.
|
|
20
|
-
AngularBuild: '^22.0.0-next.
|
|
21
|
-
AngularSSR: '^22.0.0-next.
|
|
19
|
+
DevkitBuildAngular: '^22.0.0-next.7',
|
|
20
|
+
AngularBuild: '^22.0.0-next.7',
|
|
21
|
+
AngularSSR: '^22.0.0-next.7',
|
|
22
22
|
};
|
|
23
23
|
//# sourceMappingURL=latest-versions.js.map
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
8
|
import { Tree } from '@angular-devkit/schematics';
|
|
9
|
-
import
|
|
9
|
+
import ts from 'typescript';
|
|
10
10
|
export declare function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallExpression | null;
|
|
11
11
|
export declare function getAppModulePath(host: Tree, mainPath: string): string;
|
|
12
12
|
export declare function isStandaloneApp(host: Tree, mainPath: string): boolean;
|
package/utility/ng-ast-utils.js
CHANGED
|
@@ -6,64 +6,34 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
|
-
var
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
-
}
|
|
15
|
-
Object.defineProperty(o, k2, desc);
|
|
16
|
-
}) : (function(o, m, k, k2) {
|
|
17
|
-
if (k2 === undefined) k2 = k;
|
|
18
|
-
o[k2] = m[k];
|
|
19
|
-
}));
|
|
20
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
-
}) : function(o, v) {
|
|
23
|
-
o["default"] = v;
|
|
24
|
-
});
|
|
25
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
26
|
-
var ownKeys = function(o) {
|
|
27
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
-
var ar = [];
|
|
29
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
-
return ar;
|
|
31
|
-
};
|
|
32
|
-
return ownKeys(o);
|
|
33
|
-
};
|
|
34
|
-
return function (mod) {
|
|
35
|
-
if (mod && mod.__esModule) return mod;
|
|
36
|
-
var result = {};
|
|
37
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
-
__setModuleDefault(result, mod);
|
|
39
|
-
return result;
|
|
40
|
-
};
|
|
41
|
-
})();
|
|
9
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
|
+
};
|
|
42
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
13
|
exports.findBootstrapModuleCall = findBootstrapModuleCall;
|
|
44
14
|
exports.getAppModulePath = getAppModulePath;
|
|
45
15
|
exports.isStandaloneApp = isStandaloneApp;
|
|
46
16
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
47
17
|
const posix_1 = require("node:path/posix");
|
|
48
|
-
const
|
|
18
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
49
19
|
const ast_utils_1 = require("../utility/ast-utils");
|
|
50
20
|
const util_1 = require("./standalone/util");
|
|
51
21
|
function findBootstrapModuleCall(host, mainPath) {
|
|
52
22
|
const mainText = host.readText(mainPath);
|
|
53
|
-
const source =
|
|
23
|
+
const source = typescript_1.default.createSourceFile(mainPath, mainText, typescript_1.default.ScriptTarget.Latest, true);
|
|
54
24
|
const allNodes = (0, ast_utils_1.getSourceNodes)(source);
|
|
55
25
|
let bootstrapCall = null;
|
|
56
26
|
for (const node of allNodes) {
|
|
57
|
-
let bootstrapCallNode = (0, ast_utils_1.findNode)(node,
|
|
27
|
+
let bootstrapCallNode = (0, ast_utils_1.findNode)(node, typescript_1.default.SyntaxKind.Identifier, 'bootstrapModule');
|
|
58
28
|
// Walk up the parent until CallExpression is found.
|
|
59
29
|
while (bootstrapCallNode &&
|
|
60
30
|
bootstrapCallNode.parent &&
|
|
61
|
-
bootstrapCallNode.parent.kind !==
|
|
31
|
+
bootstrapCallNode.parent.kind !== typescript_1.default.SyntaxKind.CallExpression) {
|
|
62
32
|
bootstrapCallNode = bootstrapCallNode.parent;
|
|
63
33
|
}
|
|
64
34
|
if (bootstrapCallNode !== null &&
|
|
65
35
|
bootstrapCallNode.parent !== undefined &&
|
|
66
|
-
bootstrapCallNode.parent.kind ===
|
|
36
|
+
bootstrapCallNode.parent.kind === typescript_1.default.SyntaxKind.CallExpression) {
|
|
67
37
|
bootstrapCall = bootstrapCallNode.parent;
|
|
68
38
|
break;
|
|
69
39
|
}
|
|
@@ -77,12 +47,12 @@ function findBootstrapModulePath(host, mainPath) {
|
|
|
77
47
|
}
|
|
78
48
|
const bootstrapModule = bootstrapCall.arguments[0];
|
|
79
49
|
const mainText = host.readText(mainPath);
|
|
80
|
-
const source =
|
|
50
|
+
const source = typescript_1.default.createSourceFile(mainPath, mainText, typescript_1.default.ScriptTarget.Latest, true);
|
|
81
51
|
const allNodes = (0, ast_utils_1.getSourceNodes)(source);
|
|
82
52
|
const bootstrapModuleRelativePath = allNodes
|
|
83
|
-
.filter(
|
|
53
|
+
.filter(typescript_1.default.isImportDeclaration)
|
|
84
54
|
.filter((imp) => {
|
|
85
|
-
return (0, ast_utils_1.findNode)(imp,
|
|
55
|
+
return (0, ast_utils_1.findNode)(imp, typescript_1.default.SyntaxKind.Identifier, bootstrapModule.getText());
|
|
86
56
|
})
|
|
87
57
|
.map((imp) => {
|
|
88
58
|
const modulePathStringLiteral = imp.moduleSpecifier;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-ast-utils.js","sourceRoot":"","sources":["ng-ast-utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG
|
|
1
|
+
{"version":3,"file":"ng-ast-utils.js","sourceRoot":"","sources":["ng-ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.resolveBootstrappedComponentData = resolveBootstrappedComponentData;
|
|
14
14
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
15
|
-
const typescript_1 = __importDefault(require("
|
|
15
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
16
16
|
const ast_utils_1 = require("../ast-utils");
|
|
17
17
|
const ng_ast_utils_1 = require("../ng-ast-utils");
|
|
18
18
|
const util_1 = require("./util");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app_component.js","sourceRoot":"","sources":["app_component.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AA+BH,4EA8BC;AA3DD,2DAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"app_component.js","sourceRoot":"","sources":["app_component.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
8
|
import { Tree } from '@angular-devkit/schematics';
|
|
9
|
-
import ts from '
|
|
9
|
+
import ts from 'typescript';
|
|
10
10
|
/** App config that was resolved to its source node. */
|
|
11
11
|
export interface ResolvedAppConfig {
|
|
12
12
|
/** Tree-relative path of the file containing the app config. */
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.findAppConfig = findAppConfig;
|
|
14
14
|
const node_path_1 = require("node:path");
|
|
15
|
-
const typescript_1 = __importDefault(require("
|
|
15
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
16
16
|
const util_1 = require("./util");
|
|
17
17
|
/**
|
|
18
18
|
* Resolves the node that defines the app config from a bootstrap call.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app_config.js","sourceRoot":"","sources":["app_config.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAsBH,sCAkBC;AArCD,yCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"app_config.js","sourceRoot":"","sources":["app_config.ts"],"names":[],"mappings":"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"}
|