@nrwl/angular 15.8.0-beta.6 → 15.8.0-beta.8
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 -9
- package/src/generators/application/angular-v14/lib/root-router-config.js +6 -2
- package/src/generators/application/angular-v14/lib/root-router-config.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-app-component-template.js +6 -2
- package/src/generators/application/angular-v14/lib/update-app-component-template.js.map +1 -1
- package/src/generators/application/angular-v14/lib/update-component-spec.js +2 -1
- package/src/generators/application/angular-v14/lib/update-component-spec.js.map +1 -1
- package/src/generators/component-cypress-spec/lib/get-args-default-value.js +9 -5
- package/src/generators/component-cypress-spec/lib/get-args-default-value.js.map +1 -1
- package/src/generators/component-cypress-spec/lib/get-component-selector.js +6 -2
- package/src/generators/component-cypress-spec/lib/get-component-selector.js.map +1 -1
- package/src/generators/ngrx/lib/add-exports-barrel.js +6 -2
- package/src/generators/ngrx/lib/add-exports-barrel.js.map +1 -1
- package/src/generators/ngrx/lib/add-imports-to-module.js +6 -2
- package/src/generators/ngrx/lib/add-imports-to-module.js.map +1 -1
- package/src/generators/ngrx/lib/validate-options.js +3 -3
- package/src/generators/ngrx/lib/validate-options.js.map +1 -1
- package/src/generators/scam/lib/convert-component-to-scam.js +6 -2
- package/src/generators/scam/lib/convert-component-to-scam.js.map +1 -1
- package/src/generators/scam-directive/lib/convert-directive-to-scam.js +6 -2
- package/src/generators/scam-directive/lib/convert-directive-to-scam.js.map +1 -1
- package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js +6 -2
- package/src/generators/scam-pipe/lib/convert-pipe-to-scam.js.map +1 -1
- package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.d.ts +1 -1
- package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js +2 -2
- package/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.js.map +1 -1
- package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.d.ts +3 -3
- package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.js +4 -4
- package/src/generators/scam-to-standalone/lib/get-component-data-from-ast.js.map +1 -1
- package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.d.ts +3 -3
- package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.js +8 -8
- package/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.js.map +1 -1
- package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.d.ts +1 -1
- package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.js +2 -2
- package/src/generators/scam-to-standalone/lib/selector-exists-in-ast.js.map +1 -1
- package/src/generators/scam-to-standalone/lib/verify-is-inline-scam.d.ts +1 -1
- package/src/generators/setup-mf/lib/add-remote-to-host.js +3 -3
- package/src/generators/setup-mf/lib/add-remote-to-host.js.map +1 -1
- package/src/generators/setup-mf/lib/update-host-app-routes.js +6 -2
- package/src/generators/setup-mf/lib/update-host-app-routes.js.map +1 -1
- package/src/generators/utils/storybook-ast/component-info.js +26 -11
- package/src/generators/utils/storybook-ast/component-info.js.map +1 -1
- package/src/generators/utils/storybook-ast/module-info.js +43 -20
- package/src/generators/utils/storybook-ast/module-info.js.map +1 -1
- package/src/generators/utils/storybook-ast/storybook-inputs.js +18 -8
- package/src/generators/utils/storybook-ast/storybook-inputs.js.map +1 -1
- package/src/utils/get-mf-projects.js +3 -3
- package/src/utils/get-mf-projects.js.map +1 -1
- package/src/utils/nx-devkit/route-utils.js +1 -2
- package/src/utils/nx-devkit/route-utils.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/angular",
|
|
3
|
-
"version": "15.8.0-beta.
|
|
3
|
+
"version": "15.8.0-beta.8",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
|
|
6
6
|
"repository": {
|
|
@@ -63,13 +63,13 @@
|
|
|
63
63
|
"migrations": "./migrations.json"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@nrwl/cypress": "15.8.0-beta.
|
|
67
|
-
"@nrwl/devkit": "15.8.0-beta.
|
|
68
|
-
"@nrwl/jest": "15.8.0-beta.
|
|
69
|
-
"@nrwl/js": "15.8.0-beta.
|
|
70
|
-
"@nrwl/linter": "15.8.0-beta.
|
|
71
|
-
"@nrwl/webpack": "15.8.0-beta.
|
|
72
|
-
"@nrwl/workspace": "15.8.0-beta.
|
|
66
|
+
"@nrwl/cypress": "15.8.0-beta.8",
|
|
67
|
+
"@nrwl/devkit": "15.8.0-beta.8",
|
|
68
|
+
"@nrwl/jest": "15.8.0-beta.8",
|
|
69
|
+
"@nrwl/js": "15.8.0-beta.8",
|
|
70
|
+
"@nrwl/linter": "15.8.0-beta.8",
|
|
71
|
+
"@nrwl/webpack": "15.8.0-beta.8",
|
|
72
|
+
"@nrwl/workspace": "15.8.0-beta.8",
|
|
73
73
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
74
74
|
"chalk": "^4.1.0",
|
|
75
75
|
"chokidar": "^3.5.1",
|
|
@@ -108,5 +108,5 @@
|
|
|
108
108
|
"fesm2015": "fesm2015/nrwl-angular.mjs",
|
|
109
109
|
"typings": "index.d.ts",
|
|
110
110
|
"sideEffects": false,
|
|
111
|
-
"gitHead": "
|
|
111
|
+
"gitHead": "521a404cb1c4481d8bdb9332316622e76410ed6d"
|
|
112
112
|
}
|
|
@@ -2,12 +2,16 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addRouterRootConfiguration = void 0;
|
|
4
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
5
|
-
const
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
6
|
const ast_utils_2 = require("../../../../utils/nx-devkit/ast-utils");
|
|
7
|
+
let tsModule;
|
|
7
8
|
function addRouterRootConfiguration(host, options) {
|
|
9
|
+
if (!tsModule) {
|
|
10
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
11
|
+
}
|
|
8
12
|
const modulePath = `${options.appProjectRoot}/src/app/app.module.ts`;
|
|
9
13
|
const moduleSource = host.read(modulePath, 'utf-8');
|
|
10
|
-
let sourceFile =
|
|
14
|
+
let sourceFile = tsModule.createSourceFile(modulePath, moduleSource, tsModule.ScriptTarget.Latest, true);
|
|
11
15
|
sourceFile = (0, ast_utils_1.insertImport)(host, sourceFile, modulePath, 'RouterModule', '@angular/router');
|
|
12
16
|
sourceFile = (0, ast_utils_1.insertImport)(host, sourceFile, modulePath, 'appRoutes', './app.routes');
|
|
13
17
|
sourceFile = (0, ast_utils_2.addImportToModule)(host, sourceFile, modulePath, `RouterModule.forRoot(appRoutes, {initialNavigation: 'enabledBlocking'})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"root-router-config.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/root-router-config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"root-router-config.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/root-router-config.ts"],"names":[],"mappings":";;;AACA,uEAAuE;AACvE,uFAAmF;AACnF,qEAA0E;AAG1E,IAAI,QAAqC,CAAC;AAE1C,SAAgB,0BAA0B,CACxC,IAAU,EACV,OAAyB;IAEzB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,wBAAwB,CAAC;IACrE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEpD,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,UAAU,EACV,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,cAAc,EACd,iBAAiB,CAClB,CAAC;IACF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,WAAW,EACX,cAAc,CACf,CAAC;IACF,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,UAAU,EACV,yEAAyE,CAC1E,CAAC;AACJ,CAAC;AArCD,gEAqCC"}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateAppComponentTemplate = void 0;
|
|
4
|
-
const ts = require("typescript");
|
|
5
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
6
|
const ast_utils_2 = require("../../../../utils/nx-devkit/ast-utils");
|
|
7
7
|
const nrwl_home_tpl_1 = require("./nrwl-home-tpl");
|
|
8
|
+
let tsModule;
|
|
8
9
|
function updateAppComponentTemplate(host, options) {
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
|
+
}
|
|
9
13
|
const content = options.routing
|
|
10
14
|
? `${nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix)}\n<router-outlet></router-outlet>`
|
|
11
15
|
: nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix);
|
|
@@ -16,7 +20,7 @@ function updateAppComponentTemplate(host, options) {
|
|
|
16
20
|
// Inline component update
|
|
17
21
|
const componentPath = `${options.appProjectRoot}/src/app/app.component.ts`;
|
|
18
22
|
const templateNodeValue = (0, ast_utils_2.getDecoratorPropertyValueNode)(host, componentPath, 'Component', 'template', '@angular/core');
|
|
19
|
-
(0, ast_utils_1.replaceNodeValue)(host,
|
|
23
|
+
(0, ast_utils_1.replaceNodeValue)(host, tsModule.createSourceFile(componentPath, host.read(componentPath, 'utf-8'), tsModule.ScriptTarget.Latest, true), componentPath, templateNodeValue, `\`\n${nrwl_home_tpl_1.nrwlHomeTemplate.getSelector(options.prefix)}\n\``);
|
|
20
24
|
}
|
|
21
25
|
exports.updateAppComponentTemplate = updateAppComponentTemplate;
|
|
22
26
|
//# sourceMappingURL=update-app-component-template.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-app-component-template.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-app-component-template.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"update-app-component-template.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-app-component-template.ts"],"names":[],"mappings":";;;AAEA,uEAA2E;AAC3E,uFAAmF;AACnF,qEAAsF;AACtF,mDAAmD;AAGnD,IAAI,QAAqC,CAAC;AAE1C,SAAgB,0BAA0B,CACxC,IAAU,EACV,OAAyB;IAEzB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO;QAC7B,CAAC,CAAC,GAAG,gCAAgB,CAAC,WAAW,CAC7B,OAAO,CAAC,MAAM,CACf,mCAAmC;QACtC,CAAC,CAAC,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjD,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,6BAA6B,EAAE,OAAO,CAAC,CAAC;QAE5E,OAAO;KACR;IAED,0BAA0B;IAC1B,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,cAAc,2BAA2B,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAA,yCAA6B,EACrD,IAAI,EACJ,aAAa,EACb,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAA,4BAAgB,EACd,IAAI,EACJ,QAAQ,CAAC,gBAAgB,CACvB,aAAa,EACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EACjC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,EACD,aAAa,EACb,iBAAiB,EACjB,OAAO,gCAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAC1D,CAAC;AACJ,CAAC;AAzCD,gEAyCC"}
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateComponentSpec = void 0;
|
|
4
4
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
const ast_utils_2 = require("../../../../utils/nx-devkit/ast-utils");
|
|
6
7
|
let tsModule;
|
|
7
8
|
function updateComponentSpec(host, options) {
|
|
8
9
|
if (!tsModule) {
|
|
9
|
-
tsModule =
|
|
10
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
10
11
|
}
|
|
11
12
|
if (options.skipTests !== true) {
|
|
12
13
|
const componentSpecPath = `${options.appProjectRoot}/src/app/app.component.spec.ts`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-component-spec.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"update-component-spec.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/application/angular-v14/lib/update-component-spec.ts"],"names":[],"mappings":";;;AACA,uEAAuE;AACvE,uFAAmF;AACnF,qEAG+C;AAG/C,IAAI,QAAqC,CAAC;AAE1C,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IACvE,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE;QAC9B,MAAM,iBAAiB,GAAG,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC;QACpF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAElE,IAAI,uBAAuB,GAAG,QAAQ,CAAC,gBAAgB,CACrD,iBAAiB,EACjB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,iBAAiB,EACjB,mBAAmB;aAChB,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC;aAC9B,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,kBAAkB,EAAE,WAAW,OAAO,CAAC,IAAI,EAAE,CAAC,CACzE,CAAC;QAEF,mDAAmD;QACnD,uBAAuB,GAAG,IAAA,wBAAY,EACpC,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,CACzB,CAAC;QAEF,uBAAuB,GAAG,IAAA,gCAAoB,EAC5C,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,kDAAkD,EAClD;;;;KAID,CACA,CAAC;QAEF,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,uBAAuB,GAAG,IAAA,wBAAY,EACpC,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,yBAAyB,CAC1B,CAAC;YAEF,uBAAuB,GAAG,IAAA,8BAAkB,EAC1C,IAAI,EACJ,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,CACtB,CAAC;SACH;KACF;AACH,CAAC;AA5DD,kDA4DC"}
|
|
@@ -1,18 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getArgsDefaultValue = void 0;
|
|
4
|
-
const
|
|
4
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
|
+
let tsModule;
|
|
5
6
|
function getArgsDefaultValue(property) {
|
|
6
7
|
if (!property.initializer) {
|
|
7
8
|
return undefined;
|
|
8
9
|
}
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
|
+
}
|
|
9
13
|
switch (property.initializer.kind) {
|
|
10
|
-
case
|
|
14
|
+
case tsModule.SyntaxKind.StringLiteral:
|
|
11
15
|
const returnString = property.initializer.getText().slice(1, -1);
|
|
12
16
|
return returnString.replace(/\s/g, '+');
|
|
13
|
-
case
|
|
14
|
-
case
|
|
15
|
-
case
|
|
17
|
+
case tsModule.SyntaxKind.NumericLiteral:
|
|
18
|
+
case tsModule.SyntaxKind.TrueKeyword:
|
|
19
|
+
case tsModule.SyntaxKind.FalseKeyword:
|
|
16
20
|
return property.initializer.getText();
|
|
17
21
|
default:
|
|
18
22
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-args-default-value.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-args-default-value.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"get-args-default-value.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-args-default-value.ts"],"names":[],"mappings":";;;AAAA,uFAAmF;AAGnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,mBAAmB,CACjC,QAA6B;IAE7B,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,QAAQ,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;QACjC,KAAK,QAAQ,CAAC,UAAU,CAAC,aAAa;YACpC,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YACjE,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1C,KAAK,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;QACxC,KAAK,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;QACrC,KAAK,QAAQ,CAAC,UAAU,CAAC,YAAY;YACnC,OAAO,QAAQ,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QACxC;YACE,OAAO,SAAS,CAAC;KACpB;AACH,CAAC;AApBD,kDAoBC"}
|
|
@@ -1,17 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getComponentSelector = void 0;
|
|
4
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
4
5
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
5
|
-
const typescript_2 = require("typescript");
|
|
6
6
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
|
+
let tsModule;
|
|
7
8
|
function getComponentSelector(tree, path) {
|
|
9
|
+
if (!tsModule) {
|
|
10
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
11
|
+
}
|
|
8
12
|
const file = (0, ast_utils_1.getTsSourceFile)(tree, path);
|
|
9
13
|
const componentDecorators = (0, ast_utils_1.getDecoratorMetadata)(file, 'Component', '@angular/core');
|
|
10
14
|
if (componentDecorators.length === 0) {
|
|
11
15
|
throw new Error(`No @Component decorator in ${path}.`);
|
|
12
16
|
}
|
|
13
17
|
const componentDecorator = componentDecorators[0];
|
|
14
|
-
const selectorNode = ((0, typescript_1.findNodes)(componentDecorator,
|
|
18
|
+
const selectorNode = ((0, typescript_1.findNodes)(componentDecorator, tsModule.SyntaxKind.PropertyAssignment).find((node) => node.name.getText() === 'selector'));
|
|
15
19
|
if (!selectorNode) {
|
|
16
20
|
throw new Error(`No selector defined for the component in ${path}.`);
|
|
17
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-component-selector.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"get-component-selector.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts"],"names":[],"mappings":";;;AACA,uFAAmF;AACnF,wDAAoD;AAGpD,kEAG4C;AAE5C,IAAI,QAAqC,CAAC;AAE1C,SAAgB,oBAAoB,CAAC,IAAU,EAAE,IAAY;IAC3D,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzC,MAAM,mBAAmB,GAAG,IAAA,gCAAoB,EAC9C,IAAI,EACJ,WAAW,EACX,eAAe,CAChB,CAAC;IACF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,GAAG,CAAC,CAAC;KACxD;IACD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,YAAY,GAAuB,CACvC,IAAA,sBAAS,EAAC,kBAAkB,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACxE,CAAC,IAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,UAAU,CACjE,CACF,CAAC;IACF,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,GAAG,CAAC,CAAC;KACtE;IAED,OAAO,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC;AAzBD,oDAyBC"}
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addExportsToBarrel = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
|
|
7
|
+
let tsModule;
|
|
7
8
|
/**
|
|
8
9
|
* Add ngrx feature exports to the public barrel in the feature library
|
|
9
10
|
*/
|
|
@@ -16,8 +17,11 @@ function addExportsToBarrel(tree, options) {
|
|
|
16
17
|
if (!tree.exists(indexFilePath)) {
|
|
17
18
|
return;
|
|
18
19
|
}
|
|
20
|
+
if (!tsModule) {
|
|
21
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
22
|
+
}
|
|
19
23
|
const indexSourceText = tree.read(indexFilePath, 'utf-8');
|
|
20
|
-
let sourceFile =
|
|
24
|
+
let sourceFile = tsModule.createSourceFile(indexFilePath, indexSourceText, tsModule.ScriptTarget.Latest, true);
|
|
21
25
|
// Public API for the feature interfaces, selectors, and facade
|
|
22
26
|
const { className, fileName } = (0, devkit_1.names)(options.name);
|
|
23
27
|
const statePath = `./lib/${options.directory}/${fileName}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-exports-barrel.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-exports-barrel.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAoE;
|
|
1
|
+
{"version":3,"file":"add-exports-barrel.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-exports-barrel.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,uEAAoE;AAGpE,IAAI,QAAqC,CAAC;AAE1C;;GAEG;AACH,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAAuC;IAEvC,6EAA6E;IAC7E,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,eAAe,EACvB,IAAI,EACJ,UAAU,CACX,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,aAAa,EACb,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,+DAA+D;IAC/D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,SAAS,OAAO,CAAC,SAAS,IAAI,QAAQ,EAAE,CAAC;IAE3D,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,iBAAiB,SAAS,YAAY;QAChE,CAAC,CAAC,kBAAkB,SAAS,YAAY,CAC5C,CAAC;IACF,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,iBAAiB,SAAS,YAAY;QAChE,CAAC,CAAC,kBAAkB,SAAS,YAAY,CAC5C,CAAC;IACF,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,mBAAmB,SAAS,cAAc;QACpE,CAAC,CAAC,kBAAkB,SAAS,cAAc,CAC9C,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,YAAY,SAAS,YAAY,SAAS,YAAY,SAAS,cAAc,CAC9E,CAAC;KACH;IAED,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,kBAAkB,SAAS,WAAW,CACvC,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,kBAAkB,SAAS,WAAW,CACvC,CAAC;KACH;AACH,CAAC;AAlFD,gDAkFC"}
|
|
@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addImportsToModule = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
const
|
|
6
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
7
|
const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
|
|
8
8
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
9
|
+
let tsModule;
|
|
9
10
|
function addRootStoreImport(tree, isParentStandalone, route, sourceFile, parentPath, provideRootStore, storeForRoot) {
|
|
10
11
|
if (isParentStandalone) {
|
|
11
12
|
if (tree.read(parentPath, 'utf-8').includes('bootstrapApplication')) {
|
|
@@ -68,9 +69,12 @@ function addEffectsForFeatureImport(tree, isParentStandalone, route, sourceFile,
|
|
|
68
69
|
}
|
|
69
70
|
function addImportsToModule(tree, options) {
|
|
70
71
|
var _a;
|
|
72
|
+
if (!tsModule) {
|
|
73
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
74
|
+
}
|
|
71
75
|
const parentPath = (_a = options.module) !== null && _a !== void 0 ? _a : options.parent;
|
|
72
76
|
const sourceText = tree.read(parentPath, 'utf-8');
|
|
73
|
-
let sourceFile =
|
|
77
|
+
let sourceFile = tsModule.createSourceFile(parentPath, sourceText, tsModule.ScriptTarget.Latest, true);
|
|
74
78
|
const isParentStandalone = !sourceText.includes('@NgModule');
|
|
75
79
|
const addImport = (source, symbolName, fileName, isDefault = false) => {
|
|
76
80
|
return (0, ast_utils_1.insertImport)(tree, source, parentPath, symbolName, fileName, isDefault);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AACrC,uEAAuE;
|
|
1
|
+
{"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateOptions = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
const semver_1 = require("semver");
|
|
6
5
|
const version_utils_1 = require("../../utils/version-utils");
|
|
7
6
|
const version_utils_2 = require("../../../utils/version-utils");
|
|
@@ -22,9 +21,10 @@ function validateOptions(tree, options) {
|
|
|
22
21
|
if ((0, semver_1.lt)(angularVersionInfo.version, '14.1.0') || ngrxMajorVersion < 15) {
|
|
23
22
|
const parentPath = (_c = options.parent) !== null && _c !== void 0 ? _c : options.module;
|
|
24
23
|
const parentContent = tree.read(parentPath, 'utf-8');
|
|
25
|
-
const
|
|
24
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
25
|
+
const ast = tsquery.ast(parentContent);
|
|
26
26
|
const NG_MODULE_DECORATOR_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule])';
|
|
27
|
-
const nodes =
|
|
27
|
+
const nodes = tsquery(ast, NG_MODULE_DECORATOR_SELECTOR, {
|
|
28
28
|
visitAllChildren: true,
|
|
29
29
|
});
|
|
30
30
|
if (nodes.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,mCAA2C;AAC3C,6DAGmC;AAEnC,gEAAmF;AAEnF,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA6B;;IAE7B,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC3D;IACD,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAClD,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KAC9D;IACD,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAClD,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KAC9D;IAED,MAAM,kBAAkB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IAChE,MAAM,kCAAkC,GACtC,IAAA,mDAAmC,EACjC,aAAa,EACb,kBAAkB,CAAC,KAAK,CACzB,CAAC;IAEJ,MAAM,gBAAgB,GACpB,MAAA,MAAA,IAAA,8CAA8B,EAAC,IAAI,EAAE,aAAa,CAAC,0CAAE,KAAK,mCAC1D,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,kCAAkC,CAAC,CAAC,CAAC;IAEpD,IAAI,IAAA,WAAE,EAAC,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,gBAAgB,GAAG,EAAE,EAAE;QACrE,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,OAAO,CAAC,MAAM,CAAC;QACpD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAEvC,MAAM,4BAA4B,GAChC,8EAA8E,CAAC;QACjF,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,4BAA4B,EAAE;YACvD,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,MAAM,IAAI,KAAK,CACb,6BAA6B,UAAU,oCAAoC;gBACzE,0FAA0F;gBAC1F,kFAAkF;gBAClF,0EAA0E,CAC7E,CAAC;SACH;KACF;AACH,CAAC;AA7CD,0CA6CC"}
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertComponentToScam = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
|
|
7
|
+
let tsModule;
|
|
7
8
|
function convertComponentToScam(tree, componentFileInfo, options) {
|
|
8
9
|
var _a;
|
|
9
10
|
if (!tree.exists(componentFileInfo.filePath)) {
|
|
@@ -12,9 +13,12 @@ function convertComponentToScam(tree, componentFileInfo, options) {
|
|
|
12
13
|
const componentNames = (0, devkit_1.names)(options.name);
|
|
13
14
|
const typeNames = (0, devkit_1.names)((_a = options.type) !== null && _a !== void 0 ? _a : 'component');
|
|
14
15
|
const componentClassName = `${componentNames.className}${typeNames.className}`;
|
|
16
|
+
if (!tsModule) {
|
|
17
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
18
|
+
}
|
|
15
19
|
if (options.inlineScam) {
|
|
16
20
|
const currentComponentContents = tree.read(componentFileInfo.filePath, 'utf-8');
|
|
17
|
-
let source =
|
|
21
|
+
let source = tsModule.createSourceFile(componentFileInfo.filePath, currentComponentContents, tsModule.ScriptTarget.Latest, true);
|
|
18
22
|
source = (0, ast_utils_1.insertImport)(tree, source, componentFileInfo.filePath, 'NgModule', '@angular/core');
|
|
19
23
|
source = (0, ast_utils_1.insertImport)(tree, source, componentFileInfo.filePath, 'CommonModule', '@angular/common');
|
|
20
24
|
let updatedComponentSource = source.getText();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-component-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/convert-component-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAuE;
|
|
1
|
+
{"version":3,"file":"convert-component-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/convert-component-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,uEAAuE;AAIvE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,iBAA2B,EAC3B,OAAyB;;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,mCAAmC,iBAAiB,CAAC,QAAQ,qBAAqB,CACnF,CAAC;KACH;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,CAAC,CAAC;IACrD,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACxC,iBAAiB,CAAC,QAAQ,EAC1B,OAAO,CACR,CAAC;QACF,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,iBAAiB,CAAC,QAAQ,EAC1B,wBAAwB,EACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9C,sBAAsB,GAAG,GAAG,sBAAsB,GAAG,sBAAsB,CACzE,kBAAkB,CACnB,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QAC/D,OAAO;KACR;IAED,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,iBAAiB,CAAC,SAAS,EAC3B,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,oBAAoB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AAhED,wDAgEC;AAED,SAAS,oBAAoB,CAC3B,kBAA0B,EAC1B,iBAAyB;IAEzB,OAAO;;WAEE,kBAAkB,cAAc,iBAAiB;EAC1D,sBAAsB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAAC,kBAA0B;IACxD,OAAO;;;mBAGU,kBAAkB;cACvB,kBAAkB;;eAEjB,kBAAkB,WAAW,CAAC;AAC7C,CAAC"}
|
|
@@ -2,18 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertDirectiveToScam = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
|
|
7
|
+
let tsModule;
|
|
7
8
|
function convertDirectiveToScam(tree, directiveFileInfo, options) {
|
|
8
9
|
if (!tree.exists(directiveFileInfo.filePath)) {
|
|
9
10
|
throw new Error(`Couldn't find directive at path ${directiveFileInfo.filePath} to add SCAM setup.`);
|
|
10
11
|
}
|
|
12
|
+
if (!tsModule) {
|
|
13
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
14
|
+
}
|
|
11
15
|
const directiveNames = (0, devkit_1.names)(options.name);
|
|
12
16
|
const typeNames = (0, devkit_1.names)('directive');
|
|
13
17
|
const directiveClassName = `${directiveNames.className}${typeNames.className}`;
|
|
14
18
|
if (options.inlineScam) {
|
|
15
19
|
const currentDirectiveContents = tree.read(directiveFileInfo.filePath, 'utf-8');
|
|
16
|
-
let source =
|
|
20
|
+
let source = tsModule.createSourceFile(directiveFileInfo.filePath, currentDirectiveContents, tsModule.ScriptTarget.Latest, true);
|
|
17
21
|
source = (0, ast_utils_1.insertImport)(tree, source, directiveFileInfo.filePath, 'NgModule', '@angular/core');
|
|
18
22
|
source = (0, ast_utils_1.insertImport)(tree, source, directiveFileInfo.filePath, 'CommonModule', '@angular/common');
|
|
19
23
|
let updatedDirectiveSource = source.getText();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-directive-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/convert-directive-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAuE;
|
|
1
|
+
{"version":3,"file":"convert-directive-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/convert-directive-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,uEAAuE;AAIvE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,iBAA2B,EAC3B,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC5C,MAAM,IAAI,KAAK,CACb,mCAAmC,iBAAiB,CAAC,QAAQ,qBAAqB,CACnF,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC;IACrC,MAAM,kBAAkB,GAAG,GAAG,cAAc,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAE/E,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,wBAAwB,GAAG,IAAI,CAAC,IAAI,CACxC,iBAAiB,CAAC,QAAQ,EAC1B,OAAO,CACR,CAAC;QACF,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,iBAAiB,CAAC,QAAQ,EAC1B,wBAAwB,EACxB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,iBAAiB,CAAC,QAAQ,EAC1B,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QAC9C,sBAAsB,GAAG,GAAG,sBAAsB,GAAG,sBAAsB,CACzE,kBAAkB,CACnB,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC;QAC/D,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,iBAAiB,CAAC,SAAS,EAC3B,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AA/DD,wDA+DC;AAED,SAAS,oBAAoB,CAC3B,kBAA0B,EAC1B,iBAAyB;IAEzB,OAAO;;WAEE,kBAAkB,cAAc,iBAAiB;EAC1D,sBAAsB,CAAC,kBAAkB,CAAC,EAAE,CAAC;AAC/C,CAAC;AAED,SAAS,sBAAsB,CAAC,kBAA0B;IACxD,OAAO;;;mBAGU,kBAAkB;cACvB,kBAAkB;;eAEjB,kBAAkB,WAAW,CAAC;AAC7C,CAAC"}
|
|
@@ -2,18 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertPipeToScam = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
5
6
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
6
|
-
|
|
7
|
+
let tsModule;
|
|
7
8
|
function convertPipeToScam(tree, pipeFileInfo, options) {
|
|
8
9
|
if (!tree.exists(pipeFileInfo.filePath)) {
|
|
9
10
|
throw new Error(`Couldn't find pipe at path ${pipeFileInfo.filePath} to add SCAM setup.`);
|
|
10
11
|
}
|
|
12
|
+
if (!tsModule) {
|
|
13
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
14
|
+
}
|
|
11
15
|
const pipeNames = (0, devkit_1.names)(options.name);
|
|
12
16
|
const typeNames = (0, devkit_1.names)('pipe');
|
|
13
17
|
const pipeClassName = `${pipeNames.className}${typeNames.className}`;
|
|
14
18
|
if (options.inlineScam) {
|
|
15
19
|
const currentPipeContents = tree.read(pipeFileInfo.filePath, 'utf-8');
|
|
16
|
-
let source =
|
|
20
|
+
let source = tsModule.createSourceFile(pipeFileInfo.filePath, currentPipeContents, tsModule.ScriptTarget.Latest, true);
|
|
17
21
|
source = (0, ast_utils_1.insertImport)(tree, source, pipeFileInfo.filePath, 'NgModule', '@angular/core');
|
|
18
22
|
source = (0, ast_utils_1.insertImport)(tree, source, pipeFileInfo.filePath, 'CommonModule', '@angular/common');
|
|
19
23
|
let updatedPipeSource = source.getText();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-pipe-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/convert-pipe-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAuE;
|
|
1
|
+
{"version":3,"file":"convert-pipe-to-scam.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/convert-pipe-to-scam.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uFAAmF;AACnF,uEAAuE;AAIvE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,iBAAiB,CAC/B,IAAU,EACV,YAAsB,EACtB,OAAyB;IAEzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,8BAA8B,YAAY,CAAC,QAAQ,qBAAqB,CACzE,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC;IAChC,MAAM,aAAa,GAAG,GAAG,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;IAErE,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACtE,IAAI,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACpC,YAAY,CAAC,QAAQ,EACrB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,UAAU,EACV,eAAe,CAChB,CAAC;QACF,MAAM,GAAG,IAAA,wBAAY,EACnB,IAAI,EACJ,MAAM,EACN,YAAY,CAAC,QAAQ,EACrB,cAAc,EACd,iBAAiB,CAClB,CAAC;QAEF,IAAI,iBAAiB,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,iBAAiB,GAAG,GAAG,iBAAiB,GAAG,sBAAsB,CAC/D,aAAa,CACd,EAAE,CAAC;QAEJ,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACrD,OAAO;KACR;IAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,YAAY,CAAC,SAAS,EACtB,GAAG,SAAS,CAAC,QAAQ,YAAY,CAClC,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,YAAY,EACZ,oBAAoB,CAAC,aAAa,EAAE,YAAY,CAAC,QAAQ,CAAC,CAC3D,CAAC;AACJ,CAAC;AA5DD,8CA4DC;AAED,SAAS,oBAAoB,CAC3B,aAAqB,EACrB,YAAoB;IAEpB,OAAO;;WAEE,aAAa,cAAc,YAAY;EAChD,sBAAsB,CAAC,aAAa,CAAC,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,sBAAsB,CAAC,aAAqB;IACnD,OAAO;;;mBAGU,aAAa;cAClB,aAAa;;eAEZ,aAAa,WAAW,CAAC;AACxC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { Node, SourceFile } from 'typescript';
|
|
1
|
+
import type { Node, SourceFile } from 'typescript';
|
|
2
2
|
import { Tree } from 'nx/src/generators/tree';
|
|
3
3
|
export declare function convertScamToStandalone(componentAST: SourceFile, componentFileContents: string, importsArray: string[], providersArray: string[], moduleNodes: Array<Node>, tree: Tree, normalizedComponentPath: string, componentName: string): void;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertScamToStandalone = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
const path_1 = require("path");
|
|
6
5
|
const path_2 = require("nx/src/utils/path");
|
|
7
6
|
function convertScamToStandalone(componentAST, componentFileContents, importsArray, providersArray, moduleNodes, tree, normalizedComponentPath, componentName) {
|
|
8
7
|
let newComponentContents = '';
|
|
9
8
|
const COMPONENT_PROPERTY_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression';
|
|
10
|
-
const
|
|
9
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
10
|
+
const componentDecoratorMetadataNode = tsquery(componentAST, COMPONENT_PROPERTY_SELECTOR, { visitAllChildren: true })[0];
|
|
11
11
|
newComponentContents = `${componentFileContents.slice(0, componentDecoratorMetadataNode.getStart() - 1)}({
|
|
12
12
|
standalone: true,
|
|
13
13
|
imports: [${importsArray.join(',')}],${providersArray.length > 0 ? `providers: [${providersArray.join(',')}],` : ''}${componentFileContents.slice(componentDecoratorMetadataNode.getStart() + 1, moduleNodes[0].getStart() - 1)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-scam-to-standalone.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.ts"],"names":[],"mappings":";;;AAEA
|
|
1
|
+
{"version":3,"file":"convert-scam-to-standalone.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/convert-scam-to-standalone.ts"],"names":[],"mappings":";;;AAEA,+BAA6B;AAC7B,4CAAsD;AAEtD,SAAgB,uBAAuB,CACrC,YAAwB,EACxB,qBAA6B,EAC7B,YAAsB,EACtB,cAAwB,EACxB,WAAwB,EACxB,IAAU,EACV,uBAA+B,EAC/B,aAAqB;IAErB,IAAI,oBAAoB,GAAG,EAAE,CAAC;IAC9B,MAAM,2BAA2B,GAC/B,uGAAuG,CAAC;IAC1G,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,MAAM,8BAA8B,GAAG,OAAO,CAC5C,YAAY,EACZ,2BAA2B,EAC3B,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAAC,CAAC;IAEL,oBAAoB,GAAG,GAAG,qBAAqB,CAAC,KAAK,CACnD,CAAC,EACD,8BAA8B,CAAC,QAAQ,EAAE,GAAG,CAAC,CAC9C;;gBAEa,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,KAClC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAC5E,GAAG,qBAAqB,CAAC,KAAK,CAC5B,8BAA8B,CAAC,QAAQ,EAAE,GAAG,CAAC,EAC7C,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAC9B,EAAE,CAAC;IAEJ,IAAI,CAAC,KAAK,CAAC,uBAAuB,EAAE,oBAAoB,CAAC,CAAC;IAE1D,MAAM,kBAAkB,GAAG,IAAA,YAAK,EAAC,uBAAuB,CAAC,CAAC;IAC1D,MAAM,mBAAmB,GAAG,IAAA,wBAAiB,EAC3C,kBAAkB,CAAC,GAAG,EACtB,GAAG,EACH,GAAG,kBAAkB,CAAC,IAAI,UAAU,CACrC,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QACpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAEtE,mCAAmC;QACnC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YAC7C,IAAI,wBAAwB,GAAG,qBAAqB,CAAC;YAErD,IAAI,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;gBAChD,wBAAwB,GAAG,wBAAwB,CAAC,OAAO,CACzD,YAAY,EACZ,aAAa,aAAa,IAAI,CAC/B,CAAC;gBACF,wBAAwB,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC;aAC5D;iBAAM;gBACL,wBAAwB,GAAG,wBAAwB,CAAC,OAAO,CACzD,iBAAiB,EACjB,YAAY,CACb,CAAC;aACH;YAED,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,wBAAwB,CAAC,CAAC;SAC3D;KACF;AACH,CAAC;AAhED,0DAgEC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Tree } from 'nx/src/generators/tree';
|
|
1
|
+
import type { Tree } from 'nx/src/generators/tree';
|
|
2
2
|
export declare function getComponentDataFromAST(tree: Tree, normalizedComponentPath: string): {
|
|
3
3
|
componentFileContents: string;
|
|
4
|
-
componentAST:
|
|
5
|
-
componentName:
|
|
4
|
+
componentAST: any;
|
|
5
|
+
componentName: any;
|
|
6
6
|
};
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getComponentDataFromAST = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
function getComponentDataFromAST(tree, normalizedComponentPath) {
|
|
6
5
|
const COMPONENT_CONTENT_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]))';
|
|
7
6
|
const COMPONENT_NAME_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component])) > Identifier';
|
|
8
7
|
const componentFileContents = tree.read(normalizedComponentPath, 'utf-8');
|
|
9
|
-
const
|
|
10
|
-
const
|
|
8
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
9
|
+
const componentAST = tsquery.ast(componentFileContents);
|
|
10
|
+
const componentNode = tsquery(componentAST, COMPONENT_CONTENT_SELECTOR, {
|
|
11
11
|
visitAllChildren: true,
|
|
12
12
|
})[0];
|
|
13
13
|
const componentContents = componentFileContents.slice(componentNode.getStart(), componentNode.getEnd());
|
|
14
|
-
const componentNameNode =
|
|
14
|
+
const componentNameNode = tsquery(tsquery.ast(componentContents), COMPONENT_NAME_SELECTOR, { visitAllChildren: true })[0];
|
|
15
15
|
const componentName = componentNameNode.getText();
|
|
16
16
|
return { componentFileContents, componentAST, componentName };
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-component-data-from-ast.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/get-component-data-from-ast.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"get-component-data-from-ast.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/get-component-data-from-ast.ts"],"names":[],"mappings":";;;AAEA,SAAgB,uBAAuB,CACrC,IAAU,EACV,uBAA+B;IAE/B,MAAM,0BAA0B,GAC9B,kFAAkF,CAAC;IACrF,MAAM,uBAAuB,GAC3B,+FAA+F,CAAC;IAElG,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IAC1E,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAExD,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE,0BAA0B,EAAE;QACtE,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC,CAAC,CAAC,CAAC;IACN,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,KAAK,CACnD,aAAa,CAAC,QAAQ,EAAE,EACxB,aAAa,CAAC,MAAM,EAAE,CACvB,CAAC;IAEF,MAAM,iBAAiB,GAAG,OAAO,CAC/B,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAC9B,uBAAuB,EACvB,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAAC,CAAC;IACL,MAAM,aAAa,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC;IAClD,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;AAChE,CAAC;AA5BD,0DA4BC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { SourceFile } from 'typescript';
|
|
1
|
+
import type { SourceFile } from 'typescript';
|
|
2
2
|
export declare function getModuleMetadataFromAST(componentAST: SourceFile, componentFileContents: string): {
|
|
3
|
-
moduleNodes:
|
|
3
|
+
moduleNodes: any;
|
|
4
4
|
exportsArray: string[];
|
|
5
5
|
importsArray: string[];
|
|
6
6
|
declarationsArray: string[];
|
|
7
7
|
providersArray: string[];
|
|
8
|
-
moduleName:
|
|
8
|
+
moduleName: any;
|
|
9
9
|
};
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getModuleMetadataFromAST = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
function getModuleMetadataFromAST(componentAST, componentFileContents) {
|
|
6
5
|
const NGMODULE_CONTENT_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=NgModule]))';
|
|
7
|
-
const
|
|
6
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
7
|
+
const moduleNodes = tsquery(componentAST, NGMODULE_CONTENT_SELECTOR, {
|
|
8
8
|
visitAllChildren: true,
|
|
9
9
|
});
|
|
10
10
|
const moduleContents = componentFileContents.slice(moduleNodes[0].getStart(), moduleNodes[0].getEnd());
|
|
@@ -14,17 +14,17 @@ function getModuleMetadataFromAST(componentAST, componentFileContents) {
|
|
|
14
14
|
const NGMODULE_IMPORTS_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=imports]) ArrayLiteralExpression';
|
|
15
15
|
const NGMODULE_PROVIDERS_SELECTOR = 'ClassDeclaration > Decorator > CallExpression:has(Identifier[name=NgModule]) ObjectLiteralExpression > PropertyAssignment:has(Identifier[name=providers]) ArrayLiteralExpression';
|
|
16
16
|
const NGMODULE_NAME_SELECTOR = 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=NgModule])) > Identifier';
|
|
17
|
-
const moduleAST =
|
|
18
|
-
const importsNode =
|
|
17
|
+
const moduleAST = tsquery.ast(moduleContents);
|
|
18
|
+
const importsNode = tsquery(moduleAST, NGMODULE_IMPORTS_SELECTOR, {
|
|
19
19
|
visitAllChildren: true,
|
|
20
20
|
})[0];
|
|
21
|
-
const exportsNode =
|
|
21
|
+
const exportsNode = tsquery(moduleAST, NGMODULE_EXPORTS_SELECTOR, {
|
|
22
22
|
visitAllChildren: true,
|
|
23
23
|
})[0];
|
|
24
|
-
const declarationsNode =
|
|
24
|
+
const declarationsNode = tsquery(moduleAST, NGMODULE_DECLARATIONS_SELECTOR, {
|
|
25
25
|
visitAllChildren: true,
|
|
26
26
|
})[0];
|
|
27
|
-
const providersNodes =
|
|
27
|
+
const providersNodes = tsquery(moduleAST, NGMODULE_PROVIDERS_SELECTOR, {
|
|
28
28
|
visitAllChildren: true,
|
|
29
29
|
});
|
|
30
30
|
const exportsArray = moduleContents
|
|
@@ -49,7 +49,7 @@ function getModuleMetadataFromAST(componentAST, componentFileContents) {
|
|
|
49
49
|
.replace(']', '')
|
|
50
50
|
.split(',')
|
|
51
51
|
: [];
|
|
52
|
-
const moduleName =
|
|
52
|
+
const moduleName = tsquery(moduleAST, NGMODULE_NAME_SELECTOR, {
|
|
53
53
|
visitAllChildren: true,
|
|
54
54
|
})[0].getText();
|
|
55
55
|
return {
|