@nrwl/angular 15.7.1 → 15.8.0-beta.1
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/package.json +9 -8
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js +14 -1
- package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
- package/src/builders/module-federation-dev-server/schema.d.ts +1 -0
- package/src/builders/module-federation-dev-server/schema.json +4 -0
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js +13 -1
- package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js.map +1 -1
- package/src/builders/module-federation-dev-ssr/schema.d.ts +1 -0
- package/src/builders/module-federation-dev-ssr/schema.json +4 -0
- package/src/builders/utilities/module-federation.d.ts +1 -1
- package/src/builders/utilities/module-federation.js +5 -6
- package/src/builders/utilities/module-federation.js.map +1 -1
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js +6 -5
- package/src/generators/application/angular-v14/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/angular-v14/lib/create-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-component-spec.js +5 -2
- package/src/generators/application/angular-v14/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-config-files.js +2 -2
- package/src/generators/application/angular-v14/lib/update-config-files.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-e2e-project.js +2 -2
- package/src/generators/application/angular-v14/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/application.d.ts +2 -2
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/lib/convert-to-standalone-app.js +6 -5
- package/src/generators/application/lib/convert-to-standalone-app.js.map +1 -1
- package/src/generators/application/lib/create-files.js +2 -2
- package/src/generators/application/lib/create-files.js.map +1 -1
- package/src/generators/application/lib/root-router-config.js +5 -2
- package/src/generators/application/lib/root-router-config.js.map +1 -1
- package/src/generators/application/lib/update-app-component-template.d.ts +1 -1
- package/src/generators/application/lib/update-app-component-template.js +18 -12
- package/src/generators/application/lib/update-app-component-template.js.map +1 -1
- package/src/generators/application/lib/update-component-spec.js +5 -2
- package/src/generators/application/lib/update-component-spec.js.map +1 -1
- package/src/generators/application/lib/update-config-files.js +2 -2
- package/src/generators/application/lib/update-config-files.js.map +1 -1
- package/src/generators/application/lib/update-e2e-project.js +2 -2
- package/src/generators/application/lib/update-e2e-project.js.map +1 -1
- package/src/generators/application/lib/update-nx-component-template.js +7 -4
- package/src/generators/application/lib/update-nx-component-template.js.map +1 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js +1 -1
- package/src/generators/change-storybook-targets/change-storybook-targets.js.map +1 -1
- package/src/generators/component/lib/entry-point.js +3 -3
- package/src/generators/component/lib/entry-point.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js +3 -3
- package/src/generators/convert-to-with-mf/lib/check-name-matches.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js +5 -5
- package/src/generators/convert-to-with-mf/lib/check-shared-npm-packages.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.d.ts +1 -1
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js +8 -6
- package/src/generators/convert-to-with-mf/lib/is-host-remote-config.js.map +1 -1
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.d.ts +1 -1
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js +2 -2
- package/src/generators/convert-to-with-mf/lib/parse-ast-webpack-config.js.map +1 -1
- package/src/generators/init/angular-v14/init.js +12 -4
- package/src/generators/init/angular-v14/init.js.map +1 -1
- package/src/generators/init/init.js +12 -4
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/karma-project/lib/generate-karma-project-files.js +3 -3
- package/src/generators/karma-project/lib/generate-karma-project-files.js.map +1 -1
- package/src/generators/library/lib/add-children.js +5 -2
- package/src/generators/library/lib/add-children.js.map +1 -1
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js +5 -2
- package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map +1 -1
- package/src/generators/library/lib/add-load-children.js +5 -2
- package/src/generators/library/lib/add-load-children.js.map +1 -1
- package/src/generators/library/lib/add-router-configuration.js +5 -2
- package/src/generators/library/lib/add-router-configuration.js.map +1 -1
- package/src/generators/library/lib/update-project.js +2 -2
- package/src/generators/library/lib/update-project.js.map +1 -1
- package/src/generators/library/lib/update-tsconfig.js +2 -17
- package/src/generators/library/lib/update-tsconfig.js.map +1 -1
- package/src/generators/library/library.d.ts +2 -2
- package/src/generators/library/library.js +5 -3
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js +2 -2
- package/src/generators/library-secondary-entry-point/lib/add-path-mapping.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js +2 -2
- package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js +2 -2
- package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/app.migrator.js +2 -2
- package/src/generators/ng-add/migrators/projects/app.migrator.js.map +1 -1
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js +21 -20
- package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map +1 -1
- package/src/generators/ng-add/utilities/workspace.js +3 -3
- package/src/generators/ng-add/utilities/workspace.js.map +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +5 -2
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-ssr/lib/update-app-module.js +3 -3
- package/src/generators/setup-ssr/lib/update-app-module.js.map +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js +1 -1
- package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map +1 -1
- package/src/generators/utils/create-ts-config.d.ts +1 -1
- package/src/generators/utils/create-ts-config.js +4 -4
- package/src/generators/utils/create-ts-config.js.map +1 -1
- package/src/generators/utils/storybook-ast/module-info.js +3 -3
- package/src/generators/utils/storybook-ast/module-info.js.map +1 -1
- package/src/generators/web-worker/lib/update-tsconfig.js +2 -2
- package/src/generators/web-worker/lib/update-tsconfig.js.map +1 -1
- package/src/utils/nx-devkit/ast-utils.d.ts +1 -1
- package/src/utils/nx-devkit/ast-utils.js +78 -43
- package/src/utils/nx-devkit/ast-utils.js.map +1 -1
- package/src/utils/nx-devkit/route-utils.js +14 -10
- package/src/utils/nx-devkit/route-utils.js.map +1 -1
- package/src/utils/versions.d.ts +1 -1
- package/src/utils/versions.js +1 -1
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToComponent = exports.addProviderToModule = exports.addProviderToBootstrapApplication = exports.addRouteToNgModule = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.removeFromNgModule = exports.getDecoratorMetadata = exports.isStandalone = void 0;
|
|
4
|
-
const ts = require("typescript");
|
|
5
4
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
6
5
|
const get_source_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/get-source-nodes");
|
|
7
|
-
const
|
|
6
|
+
const path_1 = require("path");
|
|
8
7
|
const devkit_1 = require("@nrwl/devkit");
|
|
9
8
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
10
|
-
|
|
9
|
+
let tsModule;
|
|
11
10
|
function _angularImportsFromNode(node, _sourceFile) {
|
|
11
|
+
if (!tsModule) {
|
|
12
|
+
tsModule = require('typescript');
|
|
13
|
+
}
|
|
12
14
|
const ms = node.moduleSpecifier;
|
|
13
15
|
let modulePath;
|
|
14
16
|
switch (ms.kind) {
|
|
15
|
-
case
|
|
17
|
+
case tsModule.SyntaxKind.StringLiteral:
|
|
16
18
|
modulePath = ms.text;
|
|
17
19
|
break;
|
|
18
20
|
default:
|
|
@@ -28,7 +30,7 @@ function _angularImportsFromNode(node, _sourceFile) {
|
|
|
28
30
|
}
|
|
29
31
|
else if (node.importClause.namedBindings) {
|
|
30
32
|
const nb = node.importClause.namedBindings;
|
|
31
|
-
if (nb.kind ==
|
|
33
|
+
if (nb.kind == tsModule.SyntaxKind.NamespaceImport) {
|
|
32
34
|
// This is of the form `import * as name from 'path'`. Return `name.`.
|
|
33
35
|
return {
|
|
34
36
|
[`${nb.name.text}.`]: modulePath,
|
|
@@ -58,7 +60,10 @@ function isStandalone(sourceFile, decoratorName) {
|
|
|
58
60
|
}
|
|
59
61
|
exports.isStandalone = isStandalone;
|
|
60
62
|
function getDecoratorMetadata(source, identifier, module) {
|
|
61
|
-
|
|
63
|
+
if (!tsModule) {
|
|
64
|
+
tsModule = require('typescript');
|
|
65
|
+
}
|
|
66
|
+
const angularImports = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration)
|
|
62
67
|
.map((node) => _angularImportsFromNode(node, source))
|
|
63
68
|
.reduce((acc, current) => {
|
|
64
69
|
for (const key of Object.keys(current)) {
|
|
@@ -68,21 +73,22 @@ function getDecoratorMetadata(source, identifier, module) {
|
|
|
68
73
|
}, {});
|
|
69
74
|
return (0, get_source_nodes_1.getSourceNodes)(source)
|
|
70
75
|
.filter((node) => {
|
|
71
|
-
return (node.kind ==
|
|
72
|
-
node.expression.kind ==
|
|
76
|
+
return (node.kind == tsModule.SyntaxKind.Decorator &&
|
|
77
|
+
node.expression.kind ==
|
|
78
|
+
tsModule.SyntaxKind.CallExpression);
|
|
73
79
|
})
|
|
74
80
|
.map((node) => node.expression)
|
|
75
81
|
.filter((expr) => {
|
|
76
|
-
if (expr.expression.kind ==
|
|
82
|
+
if (expr.expression.kind == tsModule.SyntaxKind.Identifier) {
|
|
77
83
|
const id = expr.expression;
|
|
78
84
|
return (id.getFullText(source) == identifier &&
|
|
79
85
|
angularImports[id.getFullText(source)] === module);
|
|
80
86
|
}
|
|
81
|
-
else if (expr.expression.kind ==
|
|
87
|
+
else if (expr.expression.kind == tsModule.SyntaxKind.PropertyAccessExpression) {
|
|
82
88
|
// This covers foo.NgModule when importing * as foo.
|
|
83
89
|
const paExpr = expr.expression;
|
|
84
90
|
// If the left expression is not an identifier, just give up at that point.
|
|
85
|
-
if (paExpr.expression.kind !==
|
|
91
|
+
if (paExpr.expression.kind !== tsModule.SyntaxKind.Identifier) {
|
|
86
92
|
return false;
|
|
87
93
|
}
|
|
88
94
|
const id = paExpr.name.text;
|
|
@@ -92,7 +98,7 @@ function getDecoratorMetadata(source, identifier, module) {
|
|
|
92
98
|
return false;
|
|
93
99
|
})
|
|
94
100
|
.filter((expr) => expr.arguments[0] &&
|
|
95
|
-
expr.arguments[0].kind ==
|
|
101
|
+
expr.arguments[0].kind == tsModule.SyntaxKind.ObjectLiteralExpression)
|
|
96
102
|
.map((expr) => expr.arguments[0]);
|
|
97
103
|
}
|
|
98
104
|
exports.getDecoratorMetadata = getDecoratorMetadata;
|
|
@@ -103,17 +109,20 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
|
|
|
103
109
|
if (!node) {
|
|
104
110
|
return source;
|
|
105
111
|
}
|
|
112
|
+
if (!tsModule) {
|
|
113
|
+
tsModule = require('typescript');
|
|
114
|
+
}
|
|
106
115
|
// Get all the children property assignment of object literals.
|
|
107
116
|
const matchingProperties = node.properties
|
|
108
|
-
.filter((prop) => prop.kind ==
|
|
117
|
+
.filter((prop) => prop.kind == tsModule.SyntaxKind.PropertyAssignment)
|
|
109
118
|
// Filter out every fields that's not "metadataField". Also handles string literals
|
|
110
119
|
// (but not expressions).
|
|
111
120
|
.filter((prop) => {
|
|
112
121
|
const name = prop.name;
|
|
113
122
|
switch (name.kind) {
|
|
114
|
-
case
|
|
123
|
+
case tsModule.SyntaxKind.Identifier:
|
|
115
124
|
return name.getText(source) == metadataField;
|
|
116
|
-
case
|
|
125
|
+
case tsModule.SyntaxKind.StringLiteral:
|
|
117
126
|
return name.text == metadataField;
|
|
118
127
|
}
|
|
119
128
|
return false;
|
|
@@ -147,7 +156,7 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
|
|
|
147
156
|
}
|
|
148
157
|
const assignment = matchingProperties[0];
|
|
149
158
|
// If it's not an array, nothing we can do really.
|
|
150
|
-
if (assignment.initializer.kind !==
|
|
159
|
+
if (assignment.initializer.kind !== tsModule.SyntaxKind.ArrayLiteralExpression) {
|
|
151
160
|
return source;
|
|
152
161
|
}
|
|
153
162
|
const arrLiteral = assignment.initializer;
|
|
@@ -173,7 +182,7 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
|
|
|
173
182
|
}
|
|
174
183
|
let toInsert;
|
|
175
184
|
let position = node.getEnd();
|
|
176
|
-
if (!isArray && node.kind ==
|
|
185
|
+
if (!isArray && node.kind == tsModule.SyntaxKind.ObjectLiteralExpression) {
|
|
177
186
|
// We haven't found the field in the metadata declaration. Insert a new
|
|
178
187
|
// field.
|
|
179
188
|
const expr = node;
|
|
@@ -194,7 +203,8 @@ function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, ex
|
|
|
194
203
|
}
|
|
195
204
|
}
|
|
196
205
|
}
|
|
197
|
-
else if (!isArray &&
|
|
206
|
+
else if (!isArray &&
|
|
207
|
+
node.kind == tsModule.SyntaxKind.ArrayLiteralExpression) {
|
|
198
208
|
// We found the field but it's empty. Insert it just before the `]`.
|
|
199
209
|
position--;
|
|
200
210
|
toInsert = `${expression}`;
|
|
@@ -245,11 +255,14 @@ function addImportToModule(host, source, modulePath, symbolName) {
|
|
|
245
255
|
}
|
|
246
256
|
exports.addImportToModule = addImportToModule;
|
|
247
257
|
function addImportToTestBed(host, source, specPath, symbolName) {
|
|
248
|
-
|
|
258
|
+
if (!tsModule) {
|
|
259
|
+
tsModule = require('typescript');
|
|
260
|
+
}
|
|
261
|
+
const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
|
|
249
262
|
const configureTestingModuleObjectLiterals = allCalls
|
|
250
|
-
.filter((c) => c.expression.kind ===
|
|
263
|
+
.filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
|
|
251
264
|
.filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
|
|
252
|
-
.map((c) => c.arguments[0].kind ===
|
|
265
|
+
.map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
|
|
253
266
|
? c.arguments[0]
|
|
254
267
|
: null);
|
|
255
268
|
if (configureTestingModuleObjectLiterals.length > 0) {
|
|
@@ -262,11 +275,14 @@ function addImportToTestBed(host, source, specPath, symbolName) {
|
|
|
262
275
|
}
|
|
263
276
|
exports.addImportToTestBed = addImportToTestBed;
|
|
264
277
|
function addDeclarationsToTestBed(host, source, specPath, symbolName) {
|
|
265
|
-
|
|
278
|
+
if (!tsModule) {
|
|
279
|
+
tsModule = require('typescript');
|
|
280
|
+
}
|
|
281
|
+
const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
|
|
266
282
|
const configureTestingModuleObjectLiterals = allCalls
|
|
267
|
-
.filter((c) => c.expression.kind ===
|
|
283
|
+
.filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
|
|
268
284
|
.filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
|
|
269
|
-
.map((c) => c.arguments[0].kind ===
|
|
285
|
+
.map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
|
|
270
286
|
? c.arguments[0]
|
|
271
287
|
: null);
|
|
272
288
|
if (configureTestingModuleObjectLiterals.length > 0) {
|
|
@@ -279,11 +295,14 @@ function addDeclarationsToTestBed(host, source, specPath, symbolName) {
|
|
|
279
295
|
}
|
|
280
296
|
exports.addDeclarationsToTestBed = addDeclarationsToTestBed;
|
|
281
297
|
function replaceIntoToTestBed(host, source, specPath, newSymbol, previousSymbol) {
|
|
282
|
-
|
|
298
|
+
if (!tsModule) {
|
|
299
|
+
tsModule = require('typescript');
|
|
300
|
+
}
|
|
301
|
+
const allCalls = ((0, typescript_1.findNodes)(source, tsModule.SyntaxKind.CallExpression));
|
|
283
302
|
const configureTestingModuleObjectLiterals = allCalls
|
|
284
|
-
.filter((c) => c.expression.kind ===
|
|
303
|
+
.filter((c) => c.expression.kind === tsModule.SyntaxKind.PropertyAccessExpression)
|
|
285
304
|
.filter((c) => c.expression.name.getText(source) === 'configureTestingModule')
|
|
286
|
-
.map((c) => c.arguments[0].kind ===
|
|
305
|
+
.map((c) => c.arguments[0].kind === tsModule.SyntaxKind.ObjectLiteralExpression
|
|
287
306
|
? c.arguments[0]
|
|
288
307
|
: null);
|
|
289
308
|
if (configureTestingModuleObjectLiterals.length > 0) {
|
|
@@ -330,23 +349,26 @@ function addRouteToNgModule(host, ngModulePath, source, route) {
|
|
|
330
349
|
}
|
|
331
350
|
exports.addRouteToNgModule = addRouteToNgModule;
|
|
332
351
|
function getListOfRoutes(source) {
|
|
352
|
+
if (!tsModule) {
|
|
353
|
+
tsModule = require('typescript');
|
|
354
|
+
}
|
|
333
355
|
const imports = getMatchingProperty(source, 'imports', 'NgModule', '@angular/core');
|
|
334
|
-
if ((imports === null || imports === void 0 ? void 0 : imports.initializer.kind) ===
|
|
356
|
+
if ((imports === null || imports === void 0 ? void 0 : imports.initializer.kind) === tsModule.SyntaxKind.ArrayLiteralExpression) {
|
|
335
357
|
const a = imports.initializer;
|
|
336
358
|
for (const e of a.elements) {
|
|
337
|
-
if (e.kind ===
|
|
359
|
+
if (e.kind === tsModule.SyntaxKind.CallExpression) {
|
|
338
360
|
const ee = e;
|
|
339
361
|
const text = ee.expression.getText(source);
|
|
340
362
|
if ((text === 'RouterModule.forRoot' ||
|
|
341
363
|
text === 'RouterModule.forChild') &&
|
|
342
364
|
ee.arguments.length > 0) {
|
|
343
365
|
const routes = ee.arguments[0];
|
|
344
|
-
if (routes.kind ===
|
|
366
|
+
if (routes.kind === tsModule.SyntaxKind.ArrayLiteralExpression) {
|
|
345
367
|
return routes.elements;
|
|
346
368
|
}
|
|
347
|
-
else if (routes.kind ===
|
|
369
|
+
else if (routes.kind === tsModule.SyntaxKind.Identifier) {
|
|
348
370
|
// find the array expression
|
|
349
|
-
const variableDeclarations = (0, typescript_1.findNodes)(source,
|
|
371
|
+
const variableDeclarations = (0, typescript_1.findNodes)(source, tsModule.SyntaxKind.VariableDeclaration);
|
|
350
372
|
const routesDeclaration = variableDeclarations.find((x) => {
|
|
351
373
|
return x.name.getText() === routes.getText();
|
|
352
374
|
});
|
|
@@ -361,10 +383,11 @@ function getListOfRoutes(source) {
|
|
|
361
383
|
return null;
|
|
362
384
|
}
|
|
363
385
|
function addProviderToBootstrapApplication(tree, filePath, providerToAdd) {
|
|
386
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
364
387
|
const PROVIDERS_ARRAY_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression';
|
|
365
388
|
const fileContents = tree.read(filePath, 'utf-8');
|
|
366
|
-
const ast =
|
|
367
|
-
const providersArrayNodes =
|
|
389
|
+
const ast = tsquery.ast(fileContents);
|
|
390
|
+
const providersArrayNodes = tsquery(ast, PROVIDERS_ARRAY_SELECTOR, {
|
|
368
391
|
visitAllChildren: true,
|
|
369
392
|
});
|
|
370
393
|
if (providersArrayNodes.length === 0) {
|
|
@@ -392,6 +415,9 @@ function addEntryComponents(host, source, modulePath, symbolName) {
|
|
|
392
415
|
}
|
|
393
416
|
exports.addEntryComponents = addEntryComponents;
|
|
394
417
|
function readBootstrapInfo(host, app) {
|
|
418
|
+
if (!tsModule) {
|
|
419
|
+
tsModule = require('typescript');
|
|
420
|
+
}
|
|
395
421
|
const config = (0, devkit_1.readProjectConfiguration)(host, app);
|
|
396
422
|
let mainPath;
|
|
397
423
|
try {
|
|
@@ -404,21 +430,21 @@ function readBootstrapInfo(host, app) {
|
|
|
404
430
|
throw new Error('Main file cannot be located');
|
|
405
431
|
}
|
|
406
432
|
const mainSource = host.read(mainPath).toString('utf-8');
|
|
407
|
-
const main =
|
|
433
|
+
const main = tsModule.createSourceFile(mainPath, mainSource, tsModule.ScriptTarget.Latest, true);
|
|
408
434
|
const moduleImports = (0, ast_utils_1.getImport)(main, (s) => s.indexOf('.module') > -1);
|
|
409
435
|
if (moduleImports.length !== 1) {
|
|
410
436
|
throw new Error(`main.ts can only import a single module`);
|
|
411
437
|
}
|
|
412
438
|
const moduleImport = moduleImports[0];
|
|
413
439
|
const moduleClassName = moduleImport.bindings.filter((b) => b.endsWith('Module'))[0];
|
|
414
|
-
const modulePath = `${
|
|
440
|
+
const modulePath = `${(0, path_1.join)((0, path_1.dirname)(mainPath), moduleImport.moduleSpec)}.ts`;
|
|
415
441
|
if (!host.exists(modulePath)) {
|
|
416
442
|
throw new Error(`Cannot find '${modulePath}'`);
|
|
417
443
|
}
|
|
418
444
|
const moduleSourceText = host.read(modulePath).toString('utf-8');
|
|
419
|
-
const moduleSource =
|
|
445
|
+
const moduleSource = tsModule.createSourceFile(modulePath, moduleSourceText, tsModule.ScriptTarget.Latest, true);
|
|
420
446
|
const bootstrapComponentClassName = getBootstrapComponent(moduleSource, moduleClassName);
|
|
421
|
-
const bootstrapComponentFileName = `./${
|
|
447
|
+
const bootstrapComponentFileName = `./${(0, path_1.join)((0, path_1.dirname)(moduleImport.moduleSpec), `${(0, devkit_1.names)(bootstrapComponentClassName.substring(0, bootstrapComponentClassName.length - 9)).fileName}.component`)}`;
|
|
422
448
|
return {
|
|
423
449
|
moduleSpec: moduleImport.moduleSpec,
|
|
424
450
|
mainPath,
|
|
@@ -431,35 +457,44 @@ function readBootstrapInfo(host, app) {
|
|
|
431
457
|
}
|
|
432
458
|
exports.readBootstrapInfo = readBootstrapInfo;
|
|
433
459
|
function getDecoratorPropertyValueNode(host, modulePath, identifier, property, module) {
|
|
460
|
+
if (!tsModule) {
|
|
461
|
+
tsModule = require('typescript');
|
|
462
|
+
}
|
|
434
463
|
const moduleSourceText = host.read(modulePath).toString('utf-8');
|
|
435
|
-
const moduleSource =
|
|
464
|
+
const moduleSource = tsModule.createSourceFile(modulePath, moduleSourceText, tsModule.ScriptTarget.Latest, true);
|
|
436
465
|
const templateNode = getMatchingProperty(moduleSource, property, identifier, module);
|
|
437
466
|
return templateNode.getChildAt(templateNode.getChildCount() - 1);
|
|
438
467
|
}
|
|
439
468
|
exports.getDecoratorPropertyValueNode = getDecoratorPropertyValueNode;
|
|
440
469
|
function getMatchingObjectLiteralElement(node, source, property) {
|
|
470
|
+
if (!tsModule) {
|
|
471
|
+
tsModule = require('typescript');
|
|
472
|
+
}
|
|
441
473
|
return (node.properties
|
|
442
|
-
.filter((prop) => prop.kind ==
|
|
474
|
+
.filter((prop) => prop.kind == tsModule.SyntaxKind.PropertyAssignment)
|
|
443
475
|
// Filter out every fields that's not "metadataField". Also handles string literals
|
|
444
476
|
// (but not expressions).
|
|
445
477
|
.filter((prop) => {
|
|
446
478
|
const name = prop.name;
|
|
447
479
|
switch (name.kind) {
|
|
448
|
-
case
|
|
480
|
+
case tsModule.SyntaxKind.Identifier:
|
|
449
481
|
return name.getText(source) === property;
|
|
450
|
-
case
|
|
482
|
+
case tsModule.SyntaxKind.StringLiteral:
|
|
451
483
|
return name.text === property;
|
|
452
484
|
}
|
|
453
485
|
return false;
|
|
454
486
|
})[0]);
|
|
455
487
|
}
|
|
456
488
|
function getTsSourceFile(host, path) {
|
|
489
|
+
if (!tsModule) {
|
|
490
|
+
tsModule = require('typescript');
|
|
491
|
+
}
|
|
457
492
|
const buffer = host.read(path);
|
|
458
493
|
if (!buffer) {
|
|
459
494
|
throw new Error(`Could not read TS file (${path}).`);
|
|
460
495
|
}
|
|
461
496
|
const content = buffer.toString();
|
|
462
|
-
const source =
|
|
497
|
+
const source = tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true);
|
|
463
498
|
return source;
|
|
464
499
|
}
|
|
465
500
|
exports.getTsSourceFile = getTsSourceFile;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/ast-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,29 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addProviderToRoute = exports.addRoute = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
|
-
const ts = require("typescript");
|
|
6
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
7
5
|
const ast_utils_2 = require("./ast-utils");
|
|
6
|
+
let tsModule;
|
|
8
7
|
function addRoute(tree, routesFile, route, lazy = true, routesConst, importPath) {
|
|
9
8
|
if (!tree.exists(routesFile)) {
|
|
10
9
|
throw new Error(`Path to parent routing declaration (${routesFile}) does not exist. Please ensure path is correct.`);
|
|
11
10
|
}
|
|
11
|
+
if (!tsModule) {
|
|
12
|
+
tsModule = require('typescript');
|
|
13
|
+
}
|
|
14
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
12
15
|
let routesFileContents = tree.read(routesFile, 'utf-8');
|
|
13
16
|
if (!lazy) {
|
|
14
|
-
let parentSourceFile =
|
|
17
|
+
let parentSourceFile = tsModule.createSourceFile(routesFile, routesFileContents, tsModule.ScriptTarget.Latest, true);
|
|
15
18
|
parentSourceFile = (0, ast_utils_1.insertImport)(tree, parentSourceFile, routesFile, routesConst, importPath);
|
|
16
19
|
routesFileContents = tree.read(routesFile, 'utf-8');
|
|
17
20
|
}
|
|
18
|
-
const ast =
|
|
21
|
+
const ast = tsquery.ast(routesFileContents);
|
|
19
22
|
const ROUTES_ARRAY_SELECTOR = 'VariableDeclaration:has(ArrayType > TypeReference > Identifier[name=Route], Identifier[name=Routes]) > ArrayLiteralExpression';
|
|
20
|
-
const routesArrayNodes =
|
|
23
|
+
const routesArrayNodes = tsquery(ast, ROUTES_ARRAY_SELECTOR, {
|
|
21
24
|
visitAllChildren: true,
|
|
22
25
|
});
|
|
23
26
|
const isRoutesArray = routesArrayNodes.length > 0;
|
|
24
27
|
if (!isRoutesArray) {
|
|
25
28
|
if (routesFileContents.includes('@NgModule')) {
|
|
26
|
-
const sourceFile =
|
|
29
|
+
const sourceFile = tsModule.createSourceFile(routesFile, routesFileContents, tsModule.ScriptTarget.Latest, true);
|
|
27
30
|
(0, ast_utils_2.addRouteToNgModule)(tree, routesFile, sourceFile, route);
|
|
28
31
|
return;
|
|
29
32
|
}
|
|
@@ -40,10 +43,11 @@ function addProviderToRoute(tree, routesFile, routeToAddProviderTo, providerToAd
|
|
|
40
43
|
if (!tree.exists(routesFile)) {
|
|
41
44
|
throw new Error(`Path to parent routing declaration (${routesFile}) does not exist. Please ensure path is correct.`);
|
|
42
45
|
}
|
|
46
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
43
47
|
let routesFileContents = tree.read(routesFile, 'utf-8');
|
|
44
|
-
const ast =
|
|
48
|
+
const ast = tsquery.ast(routesFileContents);
|
|
45
49
|
const ROUTES_ARRAY_SELECTOR = 'VariableDeclaration:has(ArrayType > TypeReference > Identifier[name=Route], Identifier[name=Routes]) > ArrayLiteralExpression';
|
|
46
|
-
const routesArrayNodes =
|
|
50
|
+
const routesArrayNodes = tsquery(ast, ROUTES_ARRAY_SELECTOR, {
|
|
47
51
|
visitAllChildren: true,
|
|
48
52
|
});
|
|
49
53
|
const isRoutesArray = routesArrayNodes.length > 0;
|
|
@@ -52,14 +56,14 @@ function addProviderToRoute(tree, routesFile, routeToAddProviderTo, providerToAd
|
|
|
52
56
|
}
|
|
53
57
|
const ROUTE_SELECTOR = `ObjectLiteralExpression:has(PropertyAssignment:has(Identifier[name=path]) > StringLiteral[value='${routeToAddProviderTo}']):last-child`;
|
|
54
58
|
const ROUTE_PATH_PROVIDERS_SELECTOR = 'ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=providers])';
|
|
55
|
-
const selectedRouteNodes =
|
|
59
|
+
const selectedRouteNodes = tsquery(routesArrayNodes[0], ROUTE_SELECTOR, {
|
|
56
60
|
visitAllChildren: true,
|
|
57
61
|
});
|
|
58
62
|
if (selectedRouteNodes.length === 0) {
|
|
59
63
|
throw new Error(`Could not find '${routeToAddProviderTo}' in routes definition.`);
|
|
60
64
|
}
|
|
61
65
|
for (const selectedRouteNode of selectedRouteNodes) {
|
|
62
|
-
const routeProivdersNodes =
|
|
66
|
+
const routeProivdersNodes = tsquery(selectedRouteNode, ROUTE_PATH_PROVIDERS_SELECTOR, {
|
|
63
67
|
visitAllChildren: true,
|
|
64
68
|
});
|
|
65
69
|
if (routeProivdersNodes.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/route-utils.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/route-utils.ts"],"names":[],"mappings":"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"}
|
package/src/utils/versions.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ export declare const angularVersion = "~15.1.0";
|
|
|
3
3
|
export declare const angularDevkitVersion = "~15.1.0";
|
|
4
4
|
export declare const ngPackagrVersion = "~15.1.0";
|
|
5
5
|
export declare const ngrxVersion = "~15.0.0";
|
|
6
|
-
export declare const rxjsVersion = "~7.
|
|
6
|
+
export declare const rxjsVersion = "~7.8.0";
|
|
7
7
|
export declare const zoneJsVersion = "~0.11.4";
|
|
8
8
|
export declare const angularJsVersion = "1.7.9";
|
|
9
9
|
export declare const tsLibVersion = "^2.3.0";
|
package/src/utils/versions.js
CHANGED
|
@@ -6,7 +6,7 @@ exports.angularVersion = '~15.1.0';
|
|
|
6
6
|
exports.angularDevkitVersion = '~15.1.0';
|
|
7
7
|
exports.ngPackagrVersion = '~15.1.0';
|
|
8
8
|
exports.ngrxVersion = '~15.0.0';
|
|
9
|
-
exports.rxjsVersion = '~7.
|
|
9
|
+
exports.rxjsVersion = '~7.8.0';
|
|
10
10
|
exports.zoneJsVersion = '~0.11.4';
|
|
11
11
|
exports.angularJsVersion = '1.7.9';
|
|
12
12
|
exports.tsLibVersion = '^2.3.0';
|