@nrwl/angular 15.8.0-beta.7 → 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-module-metadata-from-ast.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"get-module-metadata-from-ast.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/get-module-metadata-from-ast.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { SourceFile } from 'typescript';
|
|
1
|
+
import type { SourceFile } from 'typescript';
|
|
2
2
|
export declare function selectorExistsInAST(selector: string, ast: SourceFile): boolean;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.selectorExistsInAST = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
function selectorExistsInAST(selector, ast) {
|
|
6
|
-
|
|
5
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
6
|
+
return tsquery(ast, selector, { visitAllChildren: true }).length > 0;
|
|
7
7
|
}
|
|
8
8
|
exports.selectorExistsInAST = selectorExistsInAST;
|
|
9
9
|
//# sourceMappingURL=selector-exists-in-ast.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selector-exists-in-ast.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/selector-exists-in-ast.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"selector-exists-in-ast.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-to-standalone/lib/selector-exists-in-ast.ts"],"names":[],"mappings":";;;AAEA,SAAgB,mBAAmB,CAAC,QAAgB,EAAE,GAAe;IACnE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACzD,OAAO,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AACvE,CAAC;AAHD,kDAGC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { SourceFile } from 'typescript';
|
|
1
|
+
import type { SourceFile } from 'typescript';
|
|
2
2
|
export declare function verifyIsInlineScam(componentAST: SourceFile): boolean;
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addRemoteToHost = exports.checkIsCommaNeeded = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
6
5
|
const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
|
|
7
6
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
8
7
|
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
@@ -46,8 +45,9 @@ function addRemoteToStaticHost(tree, options, hostProject) {
|
|
|
46
45
|
throw new Error(`The selected host application, ${options.host}, does not contain a module-federation.config.js or module-federation.manifest.json file. Are you sure it has been set up as a host application?`);
|
|
47
46
|
}
|
|
48
47
|
const hostMFConfig = tree.read(hostMFConfigPath, 'utf-8');
|
|
49
|
-
const
|
|
50
|
-
const
|
|
48
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
49
|
+
const webpackAst = tsquery.ast(hostMFConfig);
|
|
50
|
+
const mfRemotesNode = tsquery(webpackAst, 'Identifier[name=remotes] ~ ArrayLiteralExpression', { visitAllChildren: true })[0];
|
|
51
51
|
const endOfPropertiesPos = mfRemotesNode.getEnd() - 1;
|
|
52
52
|
const isCommaNeeded = checkIsCommaNeeded(mfRemotesNode.getText());
|
|
53
53
|
const updatedConfig = `${hostMFConfig.slice(0, endOfPropertiesPos)}${isCommaNeeded ? ',' : ''}'${options.appName}',${hostMFConfig.slice(endOfPropertiesPos)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;
|
|
1
|
+
{"version":3,"file":"add-remote-to-host.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updateHostAppRoutes = void 0;
|
|
4
4
|
const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const
|
|
6
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
7
7
|
const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
|
|
8
|
+
let tsModule;
|
|
8
9
|
function updateHostAppRoutes(tree, options) {
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
|
+
}
|
|
9
13
|
const { sourceRoot } = (0, project_configuration_1.readProjectConfiguration)(tree, options.appName);
|
|
10
14
|
const remoteRoutes = options.remotes && Array.isArray(options.remotes)
|
|
11
15
|
? options.remotes.reduce((routes, remote) => `${routes}\n<li><a routerLink='${remote}'>${(0, devkit_1.names)(remote).className}</a></li>`, '')
|
|
@@ -18,7 +22,7 @@ ${remoteRoutes}
|
|
|
18
22
|
`);
|
|
19
23
|
const pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.ts');
|
|
20
24
|
const hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
|
|
21
|
-
let sourceFile =
|
|
25
|
+
let sourceFile = tsModule.createSourceFile(pathToHostRootRoutingFile, hostRootRoutingFile, tsModule.ScriptTarget.Latest, true);
|
|
22
26
|
(0, route_utils_1.addRoute)(tree, pathToHostRootRoutingFile, `{
|
|
23
27
|
path: '',
|
|
24
28
|
component: NxWelcomeComponent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-host-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/update-host-app-routes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"update-host-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/update-host-app-routes.ts"],"names":[],"mappings":";;;AACA,yFAAyF;AACzF,yCAAuE;AACvE,uFAAmF;AACnF,sEAAgE;AAGhE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAe;IAC7D,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,gDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvE,MAAM,YAAY,GAChB,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/C,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CACpB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CACjB,GAAG,MAAM,wBAAwB,MAAM,KACrC,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC,SAChB,WAAW,EACb,EAAE,CACH;QACH,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,UAAU,EAAE,wBAAwB,CAAC,EACvD;;EAEF,YAAY;;;CAGb,CACE,CAAC;IAEF,MAAM,yBAAyB,GAAG,IAAA,0BAAiB,EACjD,UAAU,EACV,mBAAmB,CACpB,CAAC;IAEF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;IAE1E,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,yBAAyB,EACzB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,IAAA,sBAAQ,EACN,IAAI,EACJ,yBAAyB,EACzB;;;MAGE,CACH,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,yBAAyB,EACzB;MACE,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,EAAE,CAClD,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,qBAAqB,CAAC,EACnD,IAAA,0BAAiB,EAAC,UAAU,EAAE,KAAK,CAAC,EACpC;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AAlED,kDAkEC"}
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getStandaloneComponentsInfo = exports.getComponentsInfo = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
|
-
const
|
|
5
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const typescript_1 = require("typescript");
|
|
8
7
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
9
8
|
const module_info_1 = require("./module-info");
|
|
10
9
|
const tree_utilities_1 = require("./tree-utilities");
|
|
10
|
+
let tsModule;
|
|
11
|
+
let tsquery;
|
|
11
12
|
function getComponentsInfo(tree, entryPoint, moduleFilePaths, projectName) {
|
|
12
13
|
return moduleFilePaths.flatMap((moduleFilePath) => {
|
|
13
14
|
const file = (0, ast_utils_1.getTsSourceFile)(tree, moduleFilePath);
|
|
@@ -15,7 +16,10 @@ function getComponentsInfo(tree, entryPoint, moduleFilePaths, projectName) {
|
|
|
15
16
|
if (declaredComponents.length === 0) {
|
|
16
17
|
return undefined;
|
|
17
18
|
}
|
|
18
|
-
|
|
19
|
+
if (!tsModule) {
|
|
20
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
21
|
+
}
|
|
22
|
+
const imports = file.statements.filter((statement) => statement.kind === tsModule.SyntaxKind.ImportDeclaration);
|
|
19
23
|
const componentsInfo = declaredComponents.map((componentName) => getComponentInfo(tree, entryPoint, file, imports, moduleFilePath, componentName));
|
|
20
24
|
return componentsInfo;
|
|
21
25
|
});
|
|
@@ -51,40 +55,51 @@ function getStandaloneComponentsInfo(tree, entryPoint) {
|
|
|
51
55
|
}
|
|
52
56
|
exports.getStandaloneComponentsInfo = getStandaloneComponentsInfo;
|
|
53
57
|
function getStandaloneComponents(tree, filePath) {
|
|
58
|
+
if (!tsquery) {
|
|
59
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
60
|
+
tsquery = require('@phenomnomnominal/tsquery').tsquery;
|
|
61
|
+
}
|
|
54
62
|
const fileContent = tree.read(filePath, 'utf-8');
|
|
55
|
-
const ast =
|
|
56
|
-
const components =
|
|
63
|
+
const ast = tsquery.ast(fileContent);
|
|
64
|
+
const components = tsquery(ast, 'ClassDeclaration:has(Decorator > CallExpression:has(Identifier[name=Component]) ObjectLiteralExpression PropertyAssignment Identifier[name=standalone] ~ TrueKeyword) > Identifier', { visitAllChildren: true });
|
|
57
65
|
return components.map((component) => component.getText());
|
|
58
66
|
}
|
|
59
67
|
function getComponentImportPath(componentName, imports) {
|
|
68
|
+
if (!tsModule) {
|
|
69
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
70
|
+
}
|
|
60
71
|
const componentImportStatement = imports.find((statement) => {
|
|
61
72
|
const namedImports = statement
|
|
62
73
|
.getChildren()
|
|
63
|
-
.find((node) => node.kind ===
|
|
74
|
+
.find((node) => node.kind === tsModule.SyntaxKind.ImportClause)
|
|
64
75
|
.getChildren()
|
|
65
|
-
.find((node) => node.kind ===
|
|
76
|
+
.find((node) => node.kind === tsModule.SyntaxKind.NamedImports);
|
|
66
77
|
if (namedImports === undefined)
|
|
67
78
|
return false;
|
|
68
79
|
const importedIdentifiers = namedImports
|
|
69
80
|
.getChildren()
|
|
70
|
-
.find((node) => node.kind ===
|
|
81
|
+
.find((node) => node.kind === tsModule.SyntaxKind.SyntaxList)
|
|
71
82
|
.getChildren()
|
|
72
|
-
.filter((node) => node.kind ===
|
|
83
|
+
.filter((node) => node.kind === tsModule.SyntaxKind.ImportSpecifier)
|
|
73
84
|
.map((node) => node.getText());
|
|
74
85
|
return importedIdentifiers.includes(componentName);
|
|
75
86
|
});
|
|
76
87
|
const importPath = componentImportStatement
|
|
77
88
|
.getChildren()
|
|
78
|
-
.find((node) => node.kind ===
|
|
89
|
+
.find((node) => node.kind === tsModule.SyntaxKind.StringLiteral)
|
|
79
90
|
.getText()
|
|
80
91
|
.slice(1, -1);
|
|
81
92
|
return importPath;
|
|
82
93
|
}
|
|
83
94
|
function getComponentInfo(tree, entryPoint, sourceFile, imports, moduleFilePath, componentName) {
|
|
84
95
|
try {
|
|
96
|
+
if (!tsquery) {
|
|
97
|
+
(0, ensure_typescript_1.ensureTypescript)();
|
|
98
|
+
tsquery = require('@phenomnomnominal/tsquery').tsquery;
|
|
99
|
+
}
|
|
85
100
|
const moduleFolderPath = (0, path_1.dirname)(moduleFilePath);
|
|
86
101
|
// try to get the component from the same file (inline scam)
|
|
87
|
-
const node =
|
|
102
|
+
const node = tsquery(sourceFile, `ClassDeclaration:has(Decorator > CallExpression > Identifier[name=Component]):has(Identifier[name=${componentName}])`, { visitAllChildren: true })[0];
|
|
88
103
|
if (node) {
|
|
89
104
|
return {
|
|
90
105
|
componentFileName: (0, path_1.basename)(moduleFilePath, '.ts'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/component-info.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,
|
|
1
|
+
{"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/component-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,9 @@ exports.getModuleFilePaths = exports.getModuleDeclaredComponents = void 0;
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const typescript_2 = require("typescript");
|
|
8
7
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
9
8
|
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
9
|
+
let tsModule;
|
|
10
10
|
function getModuleDeclaredComponents(file, moduleFilePath, projectName) {
|
|
11
11
|
const ngModuleDecorator = getNgModuleDecorator(file, moduleFilePath);
|
|
12
12
|
const declarationsPropertyAssignment = getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFilePath, projectName);
|
|
@@ -51,24 +51,27 @@ function getDeclaredComponentsInDeclarations(declarationsArray) {
|
|
|
51
51
|
.filter((name) => name.endsWith('Component'));
|
|
52
52
|
}
|
|
53
53
|
function getDeclaredComponentNodes(declarationsArray) {
|
|
54
|
+
if (!tsModule) {
|
|
55
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
56
|
+
}
|
|
54
57
|
const cmps = declarationsArray
|
|
55
58
|
.getChildren()
|
|
56
|
-
.find((node) => node.kind ===
|
|
59
|
+
.find((node) => node.kind === tsModule.SyntaxKind.SyntaxList)
|
|
57
60
|
.getChildren()
|
|
58
61
|
.map((node) => {
|
|
59
|
-
if (node.kind ===
|
|
62
|
+
if (node.kind === tsModule.SyntaxKind.Identifier) {
|
|
60
63
|
return node;
|
|
61
64
|
}
|
|
62
65
|
// if the node is a destructuring, follow the variable
|
|
63
|
-
if (node.kind ===
|
|
66
|
+
if (node.kind === tsModule.SyntaxKind.SpreadElement) {
|
|
64
67
|
const declarationVariableNode = node
|
|
65
68
|
.getChildren()
|
|
66
|
-
.find((node) => node.kind ===
|
|
69
|
+
.find((node) => node.kind === tsModule.SyntaxKind.Identifier);
|
|
67
70
|
// try to find the variable declaration in the same component
|
|
68
71
|
const declarationVariable = getVariableDeclaration(declarationVariableNode.getText(), declarationVariableNode.getSourceFile());
|
|
69
72
|
if (declarationVariable &&
|
|
70
73
|
declarationVariable.initializer.kind ===
|
|
71
|
-
|
|
74
|
+
tsModule.SyntaxKind.ArrayLiteralExpression) {
|
|
72
75
|
const nodes = getDeclaredComponentNodes(declarationVariable.initializer);
|
|
73
76
|
return nodes;
|
|
74
77
|
}
|
|
@@ -91,9 +94,12 @@ function flatten(arr) {
|
|
|
91
94
|
return flattened;
|
|
92
95
|
}
|
|
93
96
|
function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePath, projectName) {
|
|
97
|
+
if (!tsModule) {
|
|
98
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
99
|
+
}
|
|
94
100
|
let declarationArray = declarationsPropertyAssignment
|
|
95
101
|
.getChildren()
|
|
96
|
-
.find((node) => node.kind ===
|
|
102
|
+
.find((node) => node.kind === tsModule.SyntaxKind.ArrayLiteralExpression);
|
|
97
103
|
if (declarationArray) {
|
|
98
104
|
return declarationArray;
|
|
99
105
|
}
|
|
@@ -113,9 +119,12 @@ function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePa
|
|
|
113
119
|
* Try to get declared components like `declarations: someComponentsArrayConst`
|
|
114
120
|
*/
|
|
115
121
|
function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssignment) {
|
|
122
|
+
if (!tsModule) {
|
|
123
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
124
|
+
}
|
|
116
125
|
let declarationsVariable = declarationsPropertyAssignment
|
|
117
126
|
.getChildren()
|
|
118
|
-
.filter((node) => node.kind ===
|
|
127
|
+
.filter((node) => node.kind === tsModule.SyntaxKind.Identifier)[1];
|
|
119
128
|
if (!declarationsVariable) {
|
|
120
129
|
return undefined;
|
|
121
130
|
}
|
|
@@ -126,7 +135,7 @@ function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssig
|
|
|
126
135
|
}
|
|
127
136
|
const declarationArray = variableDeclaration
|
|
128
137
|
.getChildren()
|
|
129
|
-
.find((node) => node.kind ===
|
|
138
|
+
.find((node) => node.kind === tsModule.SyntaxKind.ArrayLiteralExpression);
|
|
130
139
|
return declarationArray;
|
|
131
140
|
}
|
|
132
141
|
/**
|
|
@@ -134,16 +143,19 @@ function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssig
|
|
|
134
143
|
* https://github.com/nrwl/nx/issues/7276.
|
|
135
144
|
*/
|
|
136
145
|
function getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignment) {
|
|
146
|
+
if (!tsModule) {
|
|
147
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
148
|
+
}
|
|
137
149
|
const propertyAccessExpression = declarationsPropertyAssignment
|
|
138
150
|
.getChildren()
|
|
139
|
-
.filter((node) => node.kind ===
|
|
151
|
+
.filter((node) => node.kind === tsModule.SyntaxKind.PropertyAccessExpression)[0];
|
|
140
152
|
if (!propertyAccessExpression) {
|
|
141
153
|
return undefined;
|
|
142
154
|
}
|
|
143
155
|
// Should contain 2 identifiers [SomeClass, components]
|
|
144
156
|
const [clazz, componentsProperty] = propertyAccessExpression
|
|
145
157
|
.getChildren()
|
|
146
|
-
.filter((node) => node.kind ===
|
|
158
|
+
.filter((node) => node.kind === tsModule.SyntaxKind.Identifier);
|
|
147
159
|
if (!clazz || !componentsProperty) {
|
|
148
160
|
return undefined;
|
|
149
161
|
}
|
|
@@ -153,35 +165,46 @@ function getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignme
|
|
|
153
165
|
return undefined;
|
|
154
166
|
}
|
|
155
167
|
const declarationArray = classDeclaration.members
|
|
156
|
-
.filter((node) => node.kind ===
|
|
168
|
+
.filter((node) => node.kind === tsModule.SyntaxKind.PropertyDeclaration)
|
|
157
169
|
.find((propertyDeclaration) => propertyDeclaration
|
|
158
170
|
.getChildren()
|
|
159
|
-
.find((node) => node.kind ===
|
|
171
|
+
.find((node) => node.kind === tsModule.SyntaxKind.Identifier &&
|
|
160
172
|
node.getText() === componentsProperty.getText()))
|
|
161
173
|
.getChildren()
|
|
162
|
-
.find((node) => node.kind ===
|
|
174
|
+
.find((node) => node.kind === tsModule.SyntaxKind.ArrayLiteralExpression);
|
|
163
175
|
return declarationArray;
|
|
164
176
|
}
|
|
165
177
|
function getClassDeclaration(className, file) {
|
|
166
|
-
|
|
178
|
+
if (!tsModule) {
|
|
179
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
180
|
+
}
|
|
181
|
+
const classDeclaration = (0, typescript_1.findNodes)(file, tsModule.SyntaxKind.ClassDeclaration).find((classDeclaration) => classDeclaration
|
|
167
182
|
.getChildren()
|
|
168
|
-
.find((node) => node.kind ===
|
|
183
|
+
.find((node) => node.kind === tsModule.SyntaxKind.Identifier &&
|
|
184
|
+
node.getText() === className));
|
|
169
185
|
return classDeclaration;
|
|
170
186
|
}
|
|
171
187
|
function getVariableDeclaration(variableName, file) {
|
|
172
|
-
|
|
188
|
+
if (!tsModule) {
|
|
189
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
190
|
+
}
|
|
191
|
+
const variableDeclaration = (0, typescript_1.findNodes)(file, tsModule.SyntaxKind.VariableDeclaration).find((variableDeclaration) => variableDeclaration
|
|
173
192
|
.getChildren()
|
|
174
|
-
.find((node) => node.kind ===
|
|
193
|
+
.find((node) => node.kind === tsModule.SyntaxKind.Identifier &&
|
|
194
|
+
node.getText() === variableName));
|
|
175
195
|
return variableDeclaration;
|
|
176
196
|
}
|
|
177
197
|
function getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFilePath, projectName) {
|
|
198
|
+
if (!tsModule) {
|
|
199
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
200
|
+
}
|
|
178
201
|
const syntaxList = ngModuleDecorator.getChildren().find((node) => {
|
|
179
|
-
return node.kind ===
|
|
202
|
+
return node.kind === tsModule.SyntaxKind.SyntaxList;
|
|
180
203
|
});
|
|
181
204
|
const declarationsPropertyAssignment = syntaxList
|
|
182
205
|
.getChildren()
|
|
183
206
|
.find((node) => {
|
|
184
|
-
return (node.kind ===
|
|
207
|
+
return (node.kind === tsModule.SyntaxKind.PropertyAssignment &&
|
|
185
208
|
node.getChildren()[0].getText() === 'declarations');
|
|
186
209
|
});
|
|
187
210
|
if (!declarationsPropertyAssignment) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/module-info.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,wDAAoD;AACpD,+BAA+B;AAO/B,
|
|
1
|
+
{"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/module-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,19 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getArgsDefaultValue = exports.getKnobType = exports.getComponentProps = exports.getInputPropertyDeclarations = void 0;
|
|
4
4
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
5
5
|
const typescript_2 = require("@nrwl/workspace/src/utilities/typescript");
|
|
6
|
-
const typescript_3 = require("typescript");
|
|
7
6
|
const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
|
|
7
|
+
const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
|
|
8
|
+
let tsModule;
|
|
8
9
|
function getInputPropertyDeclarations(tree, path) {
|
|
10
|
+
if (!tsModule) {
|
|
11
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
12
|
+
}
|
|
9
13
|
const file = (0, ast_utils_1.getTsSourceFile)(tree, path);
|
|
10
|
-
const decorators = (0, typescript_2.getSourceNodes)(file).filter((node) => node.kind ===
|
|
14
|
+
const decorators = (0, typescript_2.getSourceNodes)(file).filter((node) => node.kind === tsModule.SyntaxKind.Decorator);
|
|
11
15
|
return decorators
|
|
12
|
-
.filter((decorator) => (0, typescript_1.findNodes)(decorator,
|
|
16
|
+
.filter((decorator) => (0, typescript_1.findNodes)(decorator, tsModule.SyntaxKind.Identifier).some((node) => node.getText() === 'Input'))
|
|
13
17
|
.map((node) => node.parent);
|
|
14
18
|
}
|
|
15
19
|
exports.getInputPropertyDeclarations = getInputPropertyDeclarations;
|
|
16
20
|
function getComponentProps(tree, componentPath, getArgsDefaultValueFn = getArgsDefaultValue, useDecoratorName = true) {
|
|
21
|
+
if (!tsModule) {
|
|
22
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
23
|
+
}
|
|
17
24
|
const props = getInputPropertyDeclarations(tree, componentPath).map((node) => {
|
|
18
|
-
const decoratorContent = (0, typescript_1.findNodes)((0, typescript_1.findNodes)(node,
|
|
25
|
+
const decoratorContent = (0, typescript_1.findNodes)((0, typescript_1.findNodes)(node, tsModule.SyntaxKind.Decorator).find((n) => n.getText().startsWith('@Input')), tsModule.SyntaxKind.StringLiteral);
|
|
19
26
|
const name = useDecoratorName && decoratorContent.length
|
|
20
27
|
? !decoratorContent[0].getText().includes('.')
|
|
21
28
|
? decoratorContent[0].getText().slice(1, -1)
|
|
@@ -33,6 +40,9 @@ function getComponentProps(tree, componentPath, getArgsDefaultValueFn = getArgsD
|
|
|
33
40
|
}
|
|
34
41
|
exports.getComponentProps = getComponentProps;
|
|
35
42
|
function getKnobType(property) {
|
|
43
|
+
if (!tsModule) {
|
|
44
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
45
|
+
}
|
|
36
46
|
if (property.type) {
|
|
37
47
|
const typeName = property.type.getText();
|
|
38
48
|
const typeNameToKnobType = {
|
|
@@ -44,10 +54,10 @@ function getKnobType(property) {
|
|
|
44
54
|
}
|
|
45
55
|
if (property.initializer) {
|
|
46
56
|
const initializerKindToKnobType = {
|
|
47
|
-
[
|
|
48
|
-
[
|
|
49
|
-
[
|
|
50
|
-
[
|
|
57
|
+
[tsModule.SyntaxKind.StringLiteral]: 'text',
|
|
58
|
+
[tsModule.SyntaxKind.NumericLiteral]: 'number',
|
|
59
|
+
[tsModule.SyntaxKind.TrueKeyword]: 'boolean',
|
|
60
|
+
[tsModule.SyntaxKind.FalseKeyword]: 'boolean',
|
|
51
61
|
};
|
|
52
62
|
return initializerKindToKnobType[property.initializer.kind] || 'text';
|
|
53
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storybook-inputs.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts"],"names":[],"mappings":";;;AACA,wDAAoD;AACpD,yEAA0E;AAE1E,
|
|
1
|
+
{"version":3,"file":"storybook-inputs.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/utils/storybook-ast/storybook-inputs.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.getMFProjects = void 0;
|
|
4
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
5
4
|
const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
|
|
6
5
|
function getMFProjects(tree, { legacy } = { legacy: false }) {
|
|
7
6
|
const NRWL_WEBPACK_BROWSER_BUILDER = '@nrwl/angular:webpack-browser';
|
|
@@ -17,8 +16,9 @@ function getMFProjects(tree, { legacy } = { legacy: false }) {
|
|
|
17
16
|
return;
|
|
18
17
|
}
|
|
19
18
|
const webpackConfig = tree.read(webpackPath, 'utf-8');
|
|
20
|
-
const
|
|
21
|
-
const
|
|
19
|
+
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
20
|
+
const ast = tsquery.ast(webpackConfig);
|
|
21
|
+
const moduleFederationWebpackConfig = tsquery(ast, MODULE_FEDERATION_IDENTIFIER, {
|
|
22
22
|
visitAllChildren: true,
|
|
23
23
|
});
|
|
24
24
|
if (!moduleFederationWebpackConfig ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-mf-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"get-mf-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":";;;AACA,iGAA8F;AAE9F,SAAgB,aAAa,CAC3B,IAAU,EACV,EAAE,MAAM,KAA0B,EAAE,MAAM,EAAE,KAAK,EAAE;IAEnD,MAAM,4BAA4B,GAAG,+BAA+B,CAAC;IACrE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC;IACpD,MAAM,4BAA4B,GAAG,MAAM;QACzC,CAAC,CAAC,yCAAyC;QAC3C,CAAC,CAAC,uCAAuC,CAAC;IAE5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAA,+CAAsB,EACpB,IAAI,EACJ,4BAA4B,EAC5B,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;;QACpB,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,qBAAqB,CAAC,0CAAE,IAAI,CAAC;QACtD,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC7C,OAAO;SACR;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,6BAA6B,GAAG,OAAO,CAC3C,GAAG,EACH,4BAA4B,EAC5B;YACE,gBAAgB,EAAE,IAAI;SACvB,CACF,CAAC;QACF,IACE,CAAC,6BAA6B;YAC9B,6BAA6B,CAAC,MAAM,KAAK,CAAC,EAC1C;YACA,OAAO;SACR;QAED,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAzCD,sCAyCC"}
|
|
@@ -10,9 +10,8 @@ function addRoute(tree, routesFile, route, lazy = true, routesConst, importPath)
|
|
|
10
10
|
throw new Error(`Path to parent routing declaration (${routesFile}) does not exist. Please ensure path is correct.`);
|
|
11
11
|
}
|
|
12
12
|
if (!tsModule) {
|
|
13
|
-
tsModule =
|
|
13
|
+
tsModule = (0, ensure_typescript_1.ensureTypescript)();
|
|
14
14
|
}
|
|
15
|
-
(0, ensure_typescript_1.ensureTypescript)();
|
|
16
15
|
const { tsquery } = require('@phenomnomnominal/tsquery');
|
|
17
16
|
let routesFileContents = tree.read(routesFile, 'utf-8');
|
|
18
17
|
if (!lazy) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/route-utils.ts"],"names":[],"mappings":";;;AACA,uEAAuE;AACvE,2CAAiD;AACjD,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,QAAQ,CACtB,IAAU,EACV,UAAkB,EAClB,KAAa,EACb,OAAgB,IAAI,EACpB,WAAoB,EACpB,UAAmB;IAEnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,kDAAkD,CACpG,CAAC;KACH;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/route-utils.ts"],"names":[],"mappings":"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"}
|