@nrwl/angular 13.1.1 → 13.1.5

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/angular",
3
- "version": "13.1.1",
3
+ "version": "13.1.5",
4
4
  "description": "Angular Plugin for Nx",
5
5
  "repository": {
6
6
  "type": "git",
@@ -35,11 +35,11 @@
35
35
  },
36
36
  "dependencies": {
37
37
  "@angular-devkit/schematics": "~12.2.0",
38
- "@nrwl/cypress": "13.1.1",
39
- "@nrwl/devkit": "13.1.1",
40
- "@nrwl/jest": "13.1.1",
41
- "@nrwl/linter": "13.1.1",
42
- "@nrwl/storybook": "13.1.1",
38
+ "@nrwl/cypress": "13.1.5",
39
+ "@nrwl/devkit": "13.1.5",
40
+ "@nrwl/jest": "13.1.5",
41
+ "@nrwl/linter": "13.1.5",
42
+ "@nrwl/storybook": "13.1.5",
43
43
  "@schematics/angular": "~12.2.0",
44
44
  "@phenomnomnominal/tsquery": "4.1.1",
45
45
  "ignore": "^5.0.4",
@@ -19,6 +19,7 @@ const devkit_1 = require("@nrwl/devkit");
19
19
  * @returns Function to run to add Cypres config after intial app files have been moved to correct location
20
20
  */
21
21
  function addE2e(tree, options, e2eProjectRoot) {
22
+ var _a;
22
23
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
23
24
  if (options.e2eTestRunner === "protractor" /* Protractor */) {
24
25
  yield add_protractor_1.addProtractor(tree, options);
@@ -38,8 +39,8 @@ function addE2e(tree, options, e2eProjectRoot) {
38
39
  }
39
40
  if (options.e2eTestRunner === "protractor" /* Protractor */) {
40
41
  update_e2e_project_1.updateE2eProject(tree, options);
41
- if (options.standaloneConfig) {
42
- workspace_1.convertToNxProjectGenerator(tree, {
42
+ if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : devkit_1.getWorkspaceLayout(tree).standaloneAsDefault) {
43
+ yield workspace_1.convertToNxProjectGenerator(tree, {
43
44
  project: `${options.e2eProjectName}`,
44
45
  });
45
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAiD;AAEjD;;;;;;;;GAQG;AACH,SAAsB,MAAM,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAsB;;QAEtB,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,8BAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,2CAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,iCAAuB,CAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,qCAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IAAI,OAAO,CAAC,gBAAgB,EAAE;gBAC5B,uCAA2B,CAAC,IAAI,EAAE;oBAChC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,6BAAoB,CAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;iBACzD,CAAC,CAAC;aACJ;SACF;IACH,CAAC;CAAA;AAzCD,wBAyCC"}
1
+ {"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAqE;AAErE;;;;;;;;GAQG;AACH,SAAsB,MAAM,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAsB;;;QAEtB,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,8BAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,2CAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,iCAAuB,CAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,qCAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,2BAAkB,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;gBACA,MAAM,uCAA2B,CAAC,IAAI,EAAE;oBACtC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,6BAAoB,CAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;iBACzD,CAAC,CAAC;aACJ;SACF;;CACF;AA5CD,wBA4CC"}
@@ -3,23 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addProtractor = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
- const devkit_2 = require("@nrwl/devkit");
7
6
  const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
8
- const workspace_1 = require("@nrwl/workspace");
9
7
  function addProtractor(host, options) {
10
- var _a;
11
8
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
12
9
  const protractorSchematic = ngcli_adapter_1.wrapAngularDevkitSchematic('@schematics/angular', 'e2e');
13
10
  yield protractorSchematic(host, {
14
11
  relatedAppName: options.name,
15
12
  rootSelector: `${options.prefix}-root`,
16
13
  });
17
- if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : devkit_1.getWorkspaceLayout(host).standaloneAsDefault) {
18
- yield workspace_1.convertToNxProjectGenerator(host, {
19
- project: options.e2eProjectName,
20
- });
21
- }
22
- devkit_2.moveFilesToNewDirectory(host, devkit_2.joinPathFragments(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
14
+ devkit_1.moveFilesToNewDirectory(host, devkit_1.joinPathFragments(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
23
15
  });
24
16
  }
25
17
  exports.addProtractor = addProtractor;
@@ -1 +1 @@
1
- {"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAAA,yCAAwD;AAGxD,yCAA0E;AAC1E,8DAAwE;AACxE,+CAA8D;AAE9D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;;QACvE,MAAM,mBAAmB,GAAG,0CAA0B,CACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,2BAAkB,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;YACA,MAAM,uCAA2B,CAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,cAAc;aAChC,CAAC,CAAC;SACJ;QAED,gCAAuB,CACrB,IAAI,EACJ,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;;CACH;AAzBD,sCAyBC"}
1
+ {"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,8DAAwE;AAGxE,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;QACvE,MAAM,mBAAmB,GAAG,0CAA0B,CACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,gCAAuB,CACrB,IAAI,EACJ,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;IACJ,CAAC;CAAA;AAhBD,sCAgBC"}
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
6
6
  const workspace_1 = require("@nrwl/workspace");
7
7
  function updateConfigFiles(host, options) {
8
8
  addProjectToNx(host, options);
9
- updateTsConfigCompilerOptions(host, options);
9
+ updateTsConfigOptions(host, options);
10
10
  updateAppAndE2EProjectConfigurations(host, options);
11
11
  }
12
12
  exports.updateConfigFiles = updateConfigFiles;
@@ -16,9 +16,11 @@ function addProjectToNx(host, options) {
16
16
  const resultJson = Object.assign(Object.assign({}, projectConfig), { tags: options.parsedTags });
17
17
  devkit_1.updateProjectConfiguration(host, options.name, resultJson);
18
18
  }
19
- function updateTsConfigCompilerOptions(host, options) {
19
+ function updateTsConfigOptions(host, options) {
20
20
  // tsconfig.app.json
21
- devkit_1.updateJson(host, `${options.appProjectRoot}/tsconfig.app.json`, (json) => (Object.assign(Object.assign({}, json), { extends: './tsconfig.json', compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${devkit_1.offsetFromRoot(options.appProjectRoot)}dist/out-tsc` }) })));
21
+ devkit_1.updateJson(host, `${options.appProjectRoot}/tsconfig.app.json`, (json) => (Object.assign(Object.assign({}, json), { extends: './tsconfig.json', compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${devkit_1.offsetFromRoot(options.appProjectRoot)}dist/out-tsc` }), exclude: [
22
+ ...new Set([...(json.exclude || []), '**/*.test.ts', '**/*.spec.ts']),
23
+ ] })));
22
24
  }
23
25
  function updateAppAndE2EProjectConfigurations(host, options) {
24
26
  // workspace.json
@@ -1 +1 @@
1
- {"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,9 @@ function updateRootConfig(host, options) {
19
19
  function updateProjectConfig(host, options) {
20
20
  devkit_1.updateJson(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
21
21
  json.include = ['**/*.ts'];
22
+ json.exclude = [
23
+ ...new Set([...(json.exclude || []), '**/*.test.ts', '**/*.spec.ts']),
24
+ ];
22
25
  return json;
23
26
  });
24
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AAGpE,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,mBAAU,CAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9C,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,IACjC,OAAO,CAAC,gBACV,eAAe;SAChB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,mBAAU,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,OAAO,mBAAU,CACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;YAChD,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAJD,wCAIC"}
1
+ {"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AAGpE,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IAC7D,mBAAU,CAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC9C,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,IACjC,OAAO,CAAC,gBACV,eAAe;SAChB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAU,EAAE,OAAyB;IAChE,mBAAU,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACpE,IAAI,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;SACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,OAAO,mBAAU,CACf,IAAI,EACJ,GAAG,OAAO,CAAC,WAAW,yBAAyB,EAC/C,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;YAChD,OAAO,IAAI,CAAC;QACd,CAAC,CACF,CAAC;KACH;AACH,CAAC;AAED,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAyB;IAClE,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAJD,wCAIC"}
@@ -68,7 +68,8 @@ function getComponentInfoFromDir(tree, dir, componentName, moduleFolderPath) {
68
68
  for (const candidateFile of componentImportPathChildren) {
69
69
  if (candidateFile.endsWith('.ts')) {
70
70
  const content = tree.read(candidateFile, 'utf-8');
71
- if (content.indexOf(`class ${componentName}`) > -1) {
71
+ const classAndComponentRegex = new RegExp(`@Component[\\s\\S\n]*?\\bclass ${componentName}\\b`, 'g');
72
+ if (content.match(classAndComponentRegex)) {
72
73
  path = candidateFile
73
74
  .slice(0, candidateFile.lastIndexOf('/'))
74
75
  .replace(moduleFolderPath, '.');
@@ -1 +1 @@
1
- {"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":"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"}
@@ -29,13 +29,49 @@ function getModuleFilePaths(tree, projectPath) {
29
29
  }
30
30
  exports.getModuleFilePaths = getModuleFilePaths;
31
31
  function getDeclaredComponentsInDeclarations(declarationsArray) {
32
- return declarationsArray
32
+ return getDeclaredComponentNodes(declarationsArray)
33
+ .map((node) => node.getText())
34
+ .filter((name) => name.endsWith('Component'));
35
+ }
36
+ function getDeclaredComponentNodes(declarationsArray) {
37
+ const cmps = declarationsArray
33
38
  .getChildren()
34
39
  .find((node) => node.kind === typescript_2.SyntaxKind.SyntaxList)
35
40
  .getChildren()
36
- .filter((node) => node.kind === typescript_2.SyntaxKind.Identifier)
37
- .map((node) => node.getText())
38
- .filter((name) => name.endsWith('Component'));
41
+ .map((node) => {
42
+ if (node.kind === typescript_2.SyntaxKind.Identifier) {
43
+ return node;
44
+ }
45
+ // if the node is a destructuring, follow the variable
46
+ if (node.kind === typescript_2.SyntaxKind.SpreadElement) {
47
+ const declarationVariableNode = node
48
+ .getChildren()
49
+ .find((node) => node.kind === typescript_2.SyntaxKind.Identifier);
50
+ // try to find the variable declaration in the same component
51
+ const declarationVariable = getVariableDeclaration(declarationVariableNode.getText(), declarationVariableNode.getSourceFile());
52
+ if (declarationVariable &&
53
+ declarationVariable.initializer.kind ===
54
+ typescript_2.SyntaxKind.ArrayLiteralExpression) {
55
+ const nodes = getDeclaredComponentNodes(declarationVariable.initializer);
56
+ return nodes;
57
+ }
58
+ }
59
+ return null;
60
+ })
61
+ .filter((node) => !!node);
62
+ return flatten(cmps);
63
+ }
64
+ function flatten(arr) {
65
+ let flattened = [];
66
+ for (const entry of arr) {
67
+ if (Array.isArray(entry)) {
68
+ flattened.push(...flatten(entry));
69
+ }
70
+ else {
71
+ flattened.push(entry);
72
+ }
73
+ }
74
+ return flattened;
39
75
  }
40
76
  function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePath, projectName) {
41
77
  let declarationArray = declarationsPropertyAssignment
@@ -1 +1 @@
1
- {"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/module-info.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"module-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/module-info.ts"],"names":[],"mappings":"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"}
@@ -98,6 +98,45 @@ const COMPONENTS = [
98
98
  exports: COMPONENTS
99
99
  })
100
100
  export class VariableDeclareModule {}`);
101
+ // create a module with components that get Angular exported and declared by variable
102
+ yield moduleGenerator(tree, {
103
+ name: 'variable-spread-declare',
104
+ project: libName,
105
+ });
106
+ yield componentGenerator(tree, {
107
+ name: 'variable-spread-declare-button',
108
+ project: libName,
109
+ path: `libs/${libName}/src/lib/variable-spread-declare`,
110
+ module: 'variable-spread-declare',
111
+ });
112
+ yield componentGenerator(tree, {
113
+ name: 'variable-spread-declare-view',
114
+ project: libName,
115
+ path: `libs/${libName}/src/lib/variable-spread-declare`,
116
+ module: 'variable-spread-declare',
117
+ });
118
+ yield componentGenerator(tree, {
119
+ name: 'variable-spread-declare-anotherview',
120
+ project: libName,
121
+ path: `libs/${libName}/src/lib/variable-spread-declare`,
122
+ module: 'variable-spread-declare',
123
+ });
124
+ tree.write(`libs/${libName}/src/lib/variable-spread-declare/variable-spread-declare.module.ts`, `import { NgModule } from '@angular/core';
125
+ import { CommonModule } from '@angular/common';
126
+ import { VariableSpreadDeclareButtonComponent } from './variable-spread-declare-button/variable-spread-declare-button.component';
127
+ import { VariableSpreadDeclareViewComponent } from './variable-spread-declare-view/variable-spread-declare-view.component';
128
+ import { VariableSpreadDeclareAnotherviewComponent } from './variable-spread-declare-anotherview/variable-spread-declare-anotherview.component';
129
+
130
+ const COMPONENTS = [
131
+ VariableSpreadDeclareButtonComponent,
132
+ VariableSpreadDeclareViewComponent
133
+ ]
134
+
135
+ @NgModule({
136
+ imports: [CommonModule],
137
+ declarations: [...COMPONENTS, VariableSpreadDeclareAnotherviewComponent],
138
+ })
139
+ export class VariableSpreadDeclareModule {}`);
101
140
  // create a module where declared components are pulled from a static member of the module
102
141
  yield moduleGenerator(tree, {
103
142
  name: 'static-member-declarations',
@@ -1 +1 @@
1
- {"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/testing.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.webpackVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '13.1.1';
4
+ exports.nxVersion = '13.1.5';
5
5
  exports.angularVersion = '^12.2.0';
6
6
  exports.angularDevkitVersion = '~12.2.0';
7
7
  exports.angularJsVersion = '1.7.9';