@yuuvis/client-cli 18.0.1 → 18.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (71) hide show
  1. package/README.md +21 -0
  2. package/cli/commands/add/app.d.ts +6 -0
  3. package/cli/commands/add/app.js +30 -0
  4. package/cli/commands/add/app.js.map +1 -0
  5. package/cli/commands/add.d.ts +4 -0
  6. package/cli/commands/add.js +12 -0
  7. package/cli/commands/add.js.map +1 -0
  8. package/cli/commands/generate/app.js +12 -10
  9. package/cli/commands/generate/app.js.map +1 -1
  10. package/cli/commands/new.js +14 -2
  11. package/cli/commands/new.js.map +1 -1
  12. package/cli/options/options-new.json +5 -1
  13. package/package.json +1 -1
  14. package/schematics/constants.d.ts +1 -0
  15. package/schematics/constants.js +2 -1
  16. package/schematics/constants.js.map +1 -1
  17. package/schematics/factories/add-app/index.d.ts +2 -0
  18. package/schematics/factories/add-app/index.js +43 -0
  19. package/schematics/factories/add-app/index.js.map +1 -0
  20. package/schematics/factories/add-app/schema.json +17 -0
  21. package/schematics/factories/collection.json +6 -2
  22. package/schematics/factories/generate-app/index.js +4 -4
  23. package/schematics/factories/generate-app/index.js.map +1 -1
  24. package/schematics/factories/generate-app/schema.json +2 -3
  25. package/schematics/factories/new/index.js +27 -6
  26. package/schematics/factories/new/index.js.map +1 -1
  27. package/schematics/factories/new/schema.json +4 -0
  28. package/schematics/project-metadata.d.ts +17 -0
  29. package/schematics/project-metadata.js +71 -0
  30. package/schematics/project-metadata.js.map +1 -0
  31. package/schematics/schematics-util.d.ts +4 -1
  32. package/schematics/schematics-util.js +69 -0
  33. package/schematics/schematics-util.js.map +1 -1
  34. package/schematics/tasks/clean-up-ng-app.js +21 -4
  35. package/schematics/tasks/clean-up-ng-app.js.map +1 -1
  36. package/schematics/tasks/copy-extensions-files.d.ts +2 -1
  37. package/schematics/tasks/copy-extensions-files.js +22 -7
  38. package/schematics/tasks/copy-extensions-files.js.map +1 -1
  39. package/schematics/tasks/copy-files.d.ts +2 -1
  40. package/schematics/tasks/copy-files.js +38 -25
  41. package/schematics/tasks/copy-files.js.map +1 -1
  42. package/schematics/tasks/copy-ui-files.d.ts +2 -1
  43. package/schematics/tasks/copy-ui-files.js +22 -7
  44. package/schematics/tasks/copy-ui-files.js.map +1 -1
  45. package/schematics/tasks/create-update-manifest.js +15 -3
  46. package/schematics/tasks/create-update-manifest.js.map +1 -1
  47. package/schematics/tasks/generate-library.js +1 -1
  48. package/schematics/tasks/generate-library.js.map +1 -1
  49. package/schematics/tasks/npm-install.d.ts +1 -1
  50. package/schematics/tasks/npm-install.js +6 -7
  51. package/schematics/tasks/npm-install.js.map +1 -1
  52. package/schematics/tasks/update-angular-json.js +1 -1
  53. package/schematics/tasks/update-angular-json.js.map +1 -1
  54. package/schematics/tasks/update-app-config.d.ts +1 -1
  55. package/schematics/tasks/update-app-config.js +16 -4
  56. package/schematics/tasks/update-app-config.js.map +1 -1
  57. package/schematics/tasks/update-app-routes.d.ts +1 -1
  58. package/schematics/tasks/update-app-routes.js +37 -6
  59. package/schematics/tasks/update-app-routes.js.map +1 -1
  60. package/schematics/tasks/update-library-component.js +16 -3
  61. package/schematics/tasks/update-library-component.js.map +1 -1
  62. package/schematics/tasks/update-library-public-api.js +16 -3
  63. package/schematics/tasks/update-library-public-api.js.map +1 -1
  64. package/schematics/tasks/update-library-tsconfig.js +20 -6
  65. package/schematics/tasks/update-library-tsconfig.js.map +1 -1
  66. package/schematics/tasks/update-package-json.d.ts +1 -1
  67. package/schematics/tasks/update-package-json.js +17 -10
  68. package/schematics/tasks/update-package-json.js.map +1 -1
  69. package/schematics/utils.d.ts +15 -0
  70. package/schematics/utils.js +40 -0
  71. package/schematics/utils.js.map +1 -1
@@ -1,4 +1,13 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
13
  };
@@ -6,7 +15,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
15
  exports.findComponentClassDecorator = findComponentClassDecorator;
7
16
  exports.findDecoratorProperty = findDecoratorProperty;
8
17
  exports.addInlineTemplate = addInlineTemplate;
18
+ exports.fetchManifest = fetchManifest;
19
+ exports.fetchPackageInfo = fetchPackageInfo;
20
+ const schematics_1 = require("@angular-devkit/schematics");
9
21
  const typescript_1 = __importDefault(require("typescript"));
22
+ const https_1 = __importDefault(require("https"));
23
+ const app_manifest_1 = require("./app-manifest");
24
+ const constants_1 = require("./constants");
10
25
  function findComponentClassDecorator(source) {
11
26
  const decorators = source.statements
12
27
  .filter(typescript_1.default.isClassDeclaration)
@@ -30,4 +45,58 @@ function addInlineTemplate(recorder, componentDecorator, newTemplate) {
30
45
  recorder.insertRight(pos, decoratorArgs.properties.length ? `, template: ${newTemplate}` : `template: ${newTemplate}`);
31
46
  }
32
47
  }
48
+ function fetchManifest(packageName, context) {
49
+ return __awaiter(this, void 0, void 0, function* () {
50
+ const manifestStr = yield downloadResource(`https://unpkg.com`, `/${packageName}/${constants_1.APP_MANIFEST_FILE_NAME}`, context);
51
+ return (0, app_manifest_1.parseManifest)(manifestStr);
52
+ });
53
+ }
54
+ function fetchPackageInfo(packageName, context) {
55
+ return __awaiter(this, void 0, void 0, function* () {
56
+ const packageInfoStr = yield downloadResource(`https://registry.npmjs.com`, `/${packageName}`, context);
57
+ if (!packageInfoStr) {
58
+ throw new schematics_1.SchematicsException(`Failed to fetch package info for ${packageName}`);
59
+ }
60
+ try {
61
+ return JSON.parse(packageInfoStr);
62
+ }
63
+ catch (error) {
64
+ throw new schematics_1.SchematicsException(`Failed to parse package info for ${packageName}: ${error}`);
65
+ }
66
+ });
67
+ }
68
+ function downloadResource(host, path, context, redirectCount = 0) {
69
+ const MAX_REDIRECTS = 5;
70
+ if (!path) {
71
+ throw new schematics_1.SchematicsException('Download path is undefined.');
72
+ }
73
+ if (redirectCount > MAX_REDIRECTS) {
74
+ throw new schematics_1.SchematicsException(`Too many redirects while fetching ${path}`);
75
+ }
76
+ const url = `${host}${path}`;
77
+ context.logger.info(`Downloading resource from ${url}...`);
78
+ return new Promise((resolve, reject) => {
79
+ https_1.default.get(new URL(url), (res) => {
80
+ if (res.statusCode === 301 || res.statusCode === 302) {
81
+ const redirectUrl = res.headers.location;
82
+ if (!redirectUrl) {
83
+ res.resume();
84
+ return reject(new schematics_1.SchematicsException(`Redirect received but no 'Location' header found for ${url}`));
85
+ }
86
+ res.resume();
87
+ context.logger.info(`Redirected to ${redirectUrl}`);
88
+ return downloadResource(host, redirectUrl, context, redirectCount + 1).then(resolve).catch(reject);
89
+ }
90
+ if (res.statusCode !== 200) {
91
+ res.resume();
92
+ return reject(new schematics_1.SchematicsException(`Failed to fetch resource from ${url} (Status: ${res.statusCode})`));
93
+ }
94
+ let data = '';
95
+ res.on('data', (chunk) => (data += chunk));
96
+ res.on('end', () => resolve(data));
97
+ }).on('error', (err) => {
98
+ reject(new schematics_1.SchematicsException(`Error downloading resource from ${url}: ${err.message}`));
99
+ });
100
+ });
101
+ }
33
102
  //# sourceMappingURL=schematics-util.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"schematics-util.js","sourceRoot":"","sources":["../../src/schematics/schematics-util.ts"],"names":[],"mappings":";;;;;AAGA,kEAOC;AAED,sDAGC;AAED,8CAUC;AA1BD,4DAA4B;AAE5B,SAAgB,2BAA2B,CAAC,MAAqB;IAC/D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU;SACjC,MAAM,CAAC,oBAAE,CAAC,kBAAkB,CAAC;SAC7B,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,oBAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,oBAAE,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAChF,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,oBAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,WAAW,CAAC,CAAC;IAE/G,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAgC,CAAC,CAAC,CAAC,IAAI,CAAC;AACxF,CAAC;AAED,SAAgB,qBAAqB,CAAC,SAA4B,EAAE,YAAoB;IACtF,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAA+B,CAAC;IACxE,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAE,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,YAAY,CAAiC,CAAC;AACpJ,CAAC;AAED,SAAgB,iBAAiB,CAAC,QAAwB,EAAE,kBAAqC,EAAE,WAAmB;IACpH,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;IAC/E,IAAI,gBAAgB,EAAE,CAAC;QACrB,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,WAAW,CAAC,GAAG,GAAG,gBAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACvH,QAAQ,CAAC,WAAW,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACtE,CAAC;SAAM,CAAC;QACN,MAAM,aAAa,GAAI,kBAAkB,CAAC,UAAgC,CAAC,SAAS,CAAC,CAAC,CAA+B,CAAC;QACtH,MAAM,GAAG,GAAG,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC;QACzC,QAAQ,CAAC,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,WAAW,EAAE,CAAC,CAAC,CAAC,aAAa,WAAW,EAAE,CAAC,CAAC;IACzH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"schematics-util.js","sourceRoot":"","sources":["../../src/schematics/schematics-util.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,28 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  Object.defineProperty(exports, "__esModule", { value: true });
3
12
  exports.default = cleanUpNgApp;
13
+ const utils_1 = require("../utils");
14
+ const project_metadata_1 = require("../project-metadata");
4
15
  function cleanUpNgApp(options) {
5
- return (tree, context) => {
6
- tree.delete('/' + options.name + '/src/app/app.component.html');
7
- tree.delete('/' + options.name + '/src/app/app.component.scss');
16
+ function deleteIfExists(tree, path) {
17
+ if (tree.exists(path)) {
18
+ tree.delete(path);
19
+ }
20
+ }
21
+ return (tree) => __awaiter(this, void 0, void 0, function* () {
22
+ const project = yield project_metadata_1.ProjectMetadata.fromTree(tree, options.name);
23
+ deleteIfExists(tree, (0, utils_1.buildPath)(options.name, project.sourceRoot, 'app', 'app.component.html'));
24
+ deleteIfExists(tree, (0, utils_1.buildPath)(options.name, project.sourceRoot, 'app', 'app.component.scss'));
8
25
  return tree;
9
- };
26
+ });
10
27
  }
11
28
  //# sourceMappingURL=clean-up-ng-app.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"clean-up-ng-app.js","sourceRoot":"","sources":["../../../src/schematics/tasks/clean-up-ng-app.ts"],"names":[],"mappings":";;AAEA,+BAOC;AAPD,SAAwB,YAAY,CAAC,OAAY;IAE/C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,6BAA6B,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,6BAA6B,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"clean-up-ng-app.js","sourceRoot":"","sources":["../../../src/schematics/tasks/clean-up-ng-app.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA,+BAeC;AAlBD,oCAAqC;AACrC,0DAAsD;AAEtD,SAAwB,YAAY,CAAC,OAAY;IAC/C,SAAS,cAAc,CAAC,IAAU,EAAE,IAAY;QAC9C,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnE,cAAc,CAAC,IAAI,EAAE,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAC/F,cAAc,CAAC,IAAI,EAAE,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAE/F,OAAO,IAAI,CAAC;IACd,CAAC,CAAA,CAAA;AACH,CAAC"}
@@ -1 +1,2 @@
1
- export declare function copyExtensionsFiles(options: any): import("@angular-devkit/schematics").Rule[];
1
+ import { Rule } from '@angular-devkit/schematics';
2
+ export declare function copyExtensionsFiles(options: any): Rule;
@@ -1,15 +1,30 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  Object.defineProperty(exports, "__esModule", { value: true });
3
12
  exports.copyExtensionsFiles = copyExtensionsFiles;
4
13
  const schematics_1 = require("@angular-devkit/schematics");
5
14
  const core_1 = require("@angular-devkit/core");
15
+ const utils_1 = require("../utils");
16
+ const project_metadata_1 = require("../project-metadata");
6
17
  function copyExtensionsFiles(options) {
7
- return [
8
- (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_lib_extensions'), [
9
- (0, schematics_1.renameTemplateFiles)(),
10
- (0, schematics_1.template)(Object.assign(Object.assign({}, options), core_1.strings)),
11
- (0, schematics_1.move)(`${options.libraryRoot}/extensions`)
12
- ]))
13
- ];
18
+ return (tree) => __awaiter(this, void 0, void 0, function* () {
19
+ const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
20
+ const libraryRoot = yield project.getLibraryRoot(options.name);
21
+ return (0, schematics_1.chain)([
22
+ (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_lib_extensions'), [
23
+ (0, schematics_1.renameTemplateFiles)(),
24
+ (0, schematics_1.template)(Object.assign(Object.assign({}, options), core_1.strings)),
25
+ (0, schematics_1.move)((0, utils_1.buildPath)(libraryRoot, 'extensions'))
26
+ ]))
27
+ ]);
28
+ });
14
29
  }
15
30
  //# sourceMappingURL=copy-extensions-files.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"copy-extensions-files.js","sourceRoot":"","sources":["../../../src/schematics/tasks/copy-extensions-files.ts"],"names":[],"mappings":";;AAGA,kDAUC;AAbD,2DAAwG;AACxG,+CAA+C;AAE/C,SAAgB,mBAAmB,CAAC,OAAY;IAC9C,OAAO;QACL,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,6BAA6B,CAAC,EAAE;YACxC,IAAA,gCAAmB,GAAE;YACrB,IAAA,qBAAQ,kCAAM,OAAO,GAAK,cAAO,EAAG;YACpC,IAAA,iBAAI,EAAC,GAAG,OAAO,CAAC,WAAW,aAAa,CAAC;SAC1C,CAAC,CACH;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"copy-extensions-files.js","sourceRoot":"","sources":["../../../src/schematics/tasks/copy-extensions-files.ts"],"names":[],"mappings":";;;;;;;;;;;AAKA,kDAeC;AApBD,2DAA2H;AAC3H,+CAA+C;AAC/C,oCAAqC;AACrC,0DAAsD;AAEtD,SAAgB,mBAAmB,CAAC,OAAY;IAC9C,OAAO,CAAO,IAAU,EAAE,EAAE;QACxB,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE/D,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,6BAA6B,CAAC,EAAE;gBACxC,IAAA,gCAAmB,GAAE;gBACrB,IAAA,qBAAQ,kCAAM,OAAO,GAAK,cAAO,EAAG;gBACpC,IAAA,iBAAI,EAAC,IAAA,iBAAS,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;aAC3C,CAAC,CACH;SACF,CAAC,CAAC;IACP,CAAC,CAAA,CAAC;AACJ,CAAC"}
@@ -1 +1,2 @@
1
- export declare function copyFiles(options: any): import("@angular-devkit/schematics").Rule[];
1
+ import { Rule } from '@angular-devkit/schematics';
2
+ export declare function copyFiles(options: any): Rule;
@@ -1,32 +1,45 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  Object.defineProperty(exports, "__esModule", { value: true });
3
12
  exports.copyFiles = copyFiles;
4
- // src/schematics/new/merge-steps.ts
5
13
  const schematics_1 = require("@angular-devkit/schematics");
14
+ const project_metadata_1 = require("../project-metadata");
15
+ const utils_1 = require("../utils");
6
16
  function copyFiles(options) {
7
- return [
8
- (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_root'), [
9
- (0, schematics_1.template)(Object.assign({}, options)),
10
- (0, schematics_1.move)(`${options.name}`)
11
- ]), schematics_1.MergeStrategy.Overwrite),
12
- (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_src'), [
13
- (0, schematics_1.template)(Object.assign({}, options)),
14
- (0, schematics_1.move)(`${options.name}/src`)
15
- ]), schematics_1.MergeStrategy.Overwrite),
16
- (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_src_app'), [
17
- (0, schematics_1.renameTemplateFiles)(),
18
- (0, schematics_1.template)(Object.assign({}, options)),
19
- (0, schematics_1.move)(`${options.name}/src/app`)
20
- ]), schematics_1.MergeStrategy.Overwrite),
21
- (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_src_assets__yuuvis_config'), [
22
- (0, schematics_1.move)(`${options.name}/src/assets/_yuuvis/config`)
23
- ])),
24
- (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_src_assets__yuuvis_theme'), [
25
- (0, schematics_1.move)(`${options.name}/src/assets/_yuuvis/theme`)
26
- ])),
27
- (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_scripts'), [
28
- (0, schematics_1.move)(`${options.name}/scripts`)
29
- ]))
30
- ];
17
+ return (tree) => __awaiter(this, void 0, void 0, function* () {
18
+ const project = yield project_metadata_1.ProjectMetadata.fromTree(tree, options.name);
19
+ return (0, schematics_1.chain)([
20
+ (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_root'), [
21
+ (0, schematics_1.template)(Object.assign({}, options)),
22
+ (0, schematics_1.move)((0, utils_1.buildPath)(options.name))
23
+ ]), schematics_1.MergeStrategy.Overwrite),
24
+ (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_src'), [
25
+ (0, schematics_1.template)(Object.assign({}, options)),
26
+ (0, schematics_1.move)((0, utils_1.buildPath)(options.name, project.sourceRoot))
27
+ ]), schematics_1.MergeStrategy.Overwrite),
28
+ (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_src_app'), [
29
+ (0, schematics_1.renameTemplateFiles)(),
30
+ (0, schematics_1.template)(Object.assign({}, options)),
31
+ (0, schematics_1.move)((0, utils_1.buildPath)(options.name, project.sourceRoot, 'app'))
32
+ ]), schematics_1.MergeStrategy.Overwrite),
33
+ (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_src_assets__yuuvis_config'), [
34
+ (0, schematics_1.move)((0, utils_1.buildPath)(options.name, project.sourceRoot, 'assets', '_yuuvis', 'config'))
35
+ ])),
36
+ (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_src_assets__yuuvis_theme'), [
37
+ (0, schematics_1.move)((0, utils_1.buildPath)(options.name, project.sourceRoot, 'assets', '_yuuvis', 'theme'))
38
+ ])),
39
+ (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_scripts'), [
40
+ (0, schematics_1.move)((0, utils_1.buildPath)(options.name, project.projectRoot, 'scripts'))
41
+ ]))
42
+ ]);
43
+ });
31
44
  }
32
45
  //# sourceMappingURL=copy-files.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"copy-files.js","sourceRoot":"","sources":["../../../src/schematics/tasks/copy-files.ts"],"names":[],"mappings":";;AAGA,8BAwCC;AA3CD,oCAAoC;AACpC,2DAAuH;AAEvH,SAAgB,SAAS,CAAC,OAAY;IACpC,OAAO;QACL,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,mBAAmB,CAAC,EAAE;YAC9B,IAAA,qBAAQ,oBAAM,OAAO,EAAG;YACxB,IAAA,iBAAI,EAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;SACxB,CAAC,EACF,0BAAa,CAAC,SAAS,CACxB;QACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,kBAAkB,CAAC,EAAE;YAC7B,IAAA,qBAAQ,oBAAM,OAAO,EAAG;YACxB,IAAA,iBAAI,EAAC,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;SAC5B,CAAC,EACF,0BAAa,CAAC,SAAS,CACxB;QACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,sBAAsB,CAAC,EAAE;YACjC,IAAA,gCAAmB,GAAE;YACrB,IAAA,qBAAQ,oBAAM,OAAO,EAAG;YACxB,IAAA,iBAAI,EAAC,GAAG,OAAO,CAAC,IAAI,UAAU,CAAC;SAChC,CAAC,EACF,0BAAa,CAAC,SAAS,CACxB;QACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,wCAAwC,CAAC,EAAE;YACnD,IAAA,iBAAI,EAAC,GAAG,OAAO,CAAC,IAAI,4BAA4B,CAAC;SAClD,CAAC,CACH;QACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,uCAAuC,CAAC,EAAE;YAClD,IAAA,iBAAI,EAAC,GAAG,OAAO,CAAC,IAAI,2BAA2B,CAAC;SACjD,CAAC,CACH;QACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,sBAAsB,CAAC,EAAE;YACjC,IAAA,iBAAI,EAAC,GAAG,OAAO,CAAC,IAAI,UAAU,CAAC;SAChC,CAAC,CACH;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"copy-files.js","sourceRoot":"","sources":["../../../src/schematics/tasks/copy-files.ts"],"names":[],"mappings":";;;;;;;;;;;AAIA,8BA4CC;AAhDD,2DAA0I;AAC1I,0DAAsD;AACtD,oCAAqC;AAErC,SAAgB,SAAS,CAAC,OAAY;IACpC,OAAO,CAAO,IAAU,EAAE,EAAE;QACxB,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEnE,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,mBAAmB,CAAC,EAAE;gBAC9B,IAAA,qBAAQ,oBAAM,OAAO,EAAG;gBACxB,IAAA,iBAAI,EAAC,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC9B,CAAC,EACF,0BAAa,CAAC,SAAS,CACxB;YACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,kBAAkB,CAAC,EAAE;gBAC7B,IAAA,qBAAQ,oBAAM,OAAO,EAAG;gBACxB,IAAA,iBAAI,EAAC,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;aAClD,CAAC,EACF,0BAAa,CAAC,SAAS,CACxB;YACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,sBAAsB,CAAC,EAAE;gBACjC,IAAA,gCAAmB,GAAE;gBACrB,IAAA,qBAAQ,oBAAM,OAAO,EAAG;gBACxB,IAAA,iBAAI,EAAC,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;aACzD,CAAC,EACF,0BAAa,CAAC,SAAS,CACxB;YACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,wCAAwC,CAAC,EAAE;gBACnD,IAAA,iBAAI,EAAC,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;aACjF,CAAC,CACH;YACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,uCAAuC,CAAC,EAAE;gBAClD,IAAA,iBAAI,EAAC,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;aAChF,CAAC,CACH;YACD,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,sBAAsB,CAAC,EAAE;gBACjC,IAAA,iBAAI,EAAC,IAAA,iBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;aAC9D,CAAC,CACH;SACF,CAAC,CAAC;IACP,CAAC,CAAA,CAAC;AACJ,CAAC"}
@@ -1 +1,2 @@
1
- export declare function copyUiFiles(options: any): import("@angular-devkit/schematics").Rule[];
1
+ import { Rule } from '@angular-devkit/schematics';
2
+ export declare function copyUiFiles(options: any): Rule;
@@ -1,16 +1,31 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  Object.defineProperty(exports, "__esModule", { value: true });
3
12
  exports.copyUiFiles = copyUiFiles;
4
13
  // src/schematics/new/merge-steps.ts
5
14
  const schematics_1 = require("@angular-devkit/schematics");
6
15
  const core_1 = require("@angular-devkit/core");
16
+ const project_metadata_1 = require("../project-metadata");
17
+ const utils_1 = require("../utils");
7
18
  function copyUiFiles(options) {
8
- return [
9
- (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_lib_ui_src'), [
10
- (0, schematics_1.renameTemplateFiles)(),
11
- (0, schematics_1.template)(Object.assign(Object.assign({}, options), core_1.strings)),
12
- (0, schematics_1.move)(`${options.libraryRoot}/src`)
13
- ]))
14
- ];
19
+ return (tree) => __awaiter(this, void 0, void 0, function* () {
20
+ const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
21
+ const librarySourceRoot = yield project.getLibrarySourceRoot(options.name);
22
+ return (0, schematics_1.chain)([
23
+ (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('../../files/_lib_ui_src'), [
24
+ (0, schematics_1.renameTemplateFiles)(),
25
+ (0, schematics_1.template)(Object.assign(Object.assign({}, options), core_1.strings)),
26
+ (0, schematics_1.move)((0, utils_1.buildPath)(librarySourceRoot))
27
+ ]))
28
+ ]);
29
+ });
15
30
  }
16
31
  //# sourceMappingURL=copy-ui-files.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"copy-ui-files.js","sourceRoot":"","sources":["../../../src/schematics/tasks/copy-ui-files.ts"],"names":[],"mappings":";;AAIA,kCAUC;AAdD,oCAAoC;AACpC,2DAAuH;AACvH,+CAA+C;AAE/C,SAAgB,WAAW,CAAC,OAAY;IACtC,OAAO;QACL,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,yBAAyB,CAAC,EAAE;YACpC,IAAA,gCAAmB,GAAE;YACrB,IAAA,qBAAQ,kCAAM,OAAO,GAAK,cAAO,EAAG;YACpC,IAAA,iBAAI,EAAC,GAAG,OAAO,CAAC,WAAW,MAAM,CAAC;SACnC,CAAC,CACH;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"copy-ui-files.js","sourceRoot":"","sources":["../../../src/schematics/tasks/copy-ui-files.ts"],"names":[],"mappings":";;;;;;;;;;;AAMA,kCAeC;AArBD,oCAAoC;AACpC,2DAA0I;AAC1I,+CAA+C;AAC/C,0DAAsD;AACtD,oCAAqC;AAErC,SAAgB,WAAW,CAAC,OAAY;IACtC,OAAO,CAAO,IAAU,EAAE,EAAE;QACxB,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE3E,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,sBAAS,EACP,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,yBAAyB,CAAC,EAAE;gBACpC,IAAA,gCAAmB,GAAE;gBACrB,IAAA,qBAAQ,kCAAM,OAAO,GAAK,cAAO,EAAG;gBACpC,IAAA,iBAAI,EAAC,IAAA,iBAAS,EAAC,iBAAiB,CAAC,CAAC;aACnC,CAAC,CACH;SACF,CAAC,CAAC;IACP,CAAC,CAAA,CAAC;AACJ,CAAC"}
@@ -1,10 +1,22 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  Object.defineProperty(exports, "__esModule", { value: true });
3
12
  exports.createOrUpdateManifest = createOrUpdateManifest;
4
13
  const constants_1 = require("../constants");
14
+ const project_metadata_1 = require("../project-metadata");
5
15
  function createOrUpdateManifest(options, targetManifest, libMetadata) {
6
- return (tree) => {
7
- const filePath = `${options.libraryRoot}/${constants_1.APP_MANIFEST_FILE_NAME}`;
16
+ return (tree) => __awaiter(this, void 0, void 0, function* () {
17
+ const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
18
+ const libraryRoot = yield project.getLibraryRoot(options.name);
19
+ const filePath = `${libraryRoot}/${constants_1.APP_MANIFEST_FILE_NAME}`;
8
20
  /*
9
21
  if (tree.exists(filePath)) {
10
22
  const content = tree.read(filePath)?.toString('utf-8');
@@ -29,6 +41,6 @@ function createOrUpdateManifest(options, targetManifest, libMetadata) {
29
41
  const jsonData = JSON.stringify(targetManifest, null, 2);
30
42
  tree.create(filePath, jsonData);
31
43
  return tree;
32
- };
44
+ });
33
45
  }
34
46
  //# sourceMappingURL=create-update-manifest.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"create-update-manifest.js","sourceRoot":"","sources":["../../../src/schematics/tasks/create-update-manifest.ts"],"names":[],"mappings":";;AAMA,wDA+BC;AApCD,4CAAsD;AAKtD,SAAgB,sBAAsB,CAAC,OAAY,EAAE,cAA2B,EAAE,WAA4B;IAC5G,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,WAAW,IAAI,kCAAsB,EAAE,CAAC;QAEpE;;;;;;;;;;;;;;;;;;;;UAoBE;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAEhC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"create-update-manifest.js","sourceRoot":"","sources":["../../../src/schematics/tasks/create-update-manifest.ts"],"names":[],"mappings":";;;;;;;;;;;AAOA,wDAiCC;AAvCD,4CAAsD;AAGtD,0DAAsD;AAGtD,SAAgB,sBAAsB,CAAC,OAAY,EAAE,cAA2B,EAAE,WAA4B;IAC5G,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,OAAO,GAAG,MAAM,kCAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/D,MAAM,QAAQ,GAAG,GAAG,WAAW,IAAI,kCAAsB,EAAE,CAAC;QAE5D;;;;;;;;;;;;;;;;;;;;UAoBE;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAEhC,OAAO,IAAI,CAAC;IACd,CAAC,CAAA,CAAC;AACJ,CAAC"}
@@ -4,7 +4,7 @@ exports.generateLibrary = generateLibrary;
4
4
  const schematics_1 = require("@angular-devkit/schematics");
5
5
  const constants_1 = require("../constants");
6
6
  function generateLibrary(options) {
7
- return (tree, context) => {
7
+ return (tree) => {
8
8
  return (0, schematics_1.externalSchematic)('@schematics/angular', 'library', {
9
9
  name: options.name,
10
10
  prefix: options.prefix,
@@ -1 +1 @@
1
- {"version":3,"file":"generate-library.js","sourceRoot":"","sources":["../../../src/schematics/tasks/generate-library.ts"],"names":[],"mappings":";;AAGA,0CAQC;AAXD,2DAA6F;AAC7F,4CAA6C;AAE7C,SAAgB,eAAe,CAAC,OAAY;IAC1C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,OAAO,IAAA,8BAAiB,EAAC,qBAAqB,EAAE,SAAS,EAAE;YACzD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,yBAAa;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"generate-library.js","sourceRoot":"","sources":["../../../src/schematics/tasks/generate-library.ts"],"names":[],"mappings":";;AAGA,0CAQC;AAXD,2DAA2E;AAC3E,4CAA6C;AAE7C,SAAgB,eAAe,CAAC,OAAY;IAC1C,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,OAAO,IAAA,8BAAiB,EAAC,qBAAqB,EAAE,SAAS,EAAE;YACzD,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,yBAAa;SAC1B,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
@@ -1,2 +1,2 @@
1
1
  import { Rule } from "@angular-devkit/schematics";
2
- export default function npmInstall(options: any): Rule;
2
+ export default function npmInstall(cwd: string, packageName?: string): Rule;
@@ -2,14 +2,13 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = npmInstall;
4
4
  const tasks_1 = require("@angular-devkit/schematics/tasks");
5
- function npmInstall(options) {
5
+ function npmInstall(cwd, packageName) {
6
6
  return (tree, context) => {
7
- if (!options.skipInstall) {
8
- context.logger.info('Installing dependencies');
9
- context.addTask(new tasks_1.NodePackageInstallTask({
10
- workingDirectory: options.name
11
- }));
12
- }
7
+ context.logger.info('Installing dependencies');
8
+ context.addTask(new tasks_1.NodePackageInstallTask({
9
+ workingDirectory: cwd,
10
+ packageName: packageName
11
+ }));
13
12
  return tree;
14
13
  };
15
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../src/schematics/tasks/npm-install.ts"],"names":[],"mappings":";;AAGA,6BAYC;AAdD,4DAA0E;AAE1E,SAAwB,UAAU,CAAC,OAAY;IAE7C,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAE/C,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YACvB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAC/C,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,CAAC;gBACzC,gBAAgB,EAAE,OAAO,CAAC,IAAI;aAC/B,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../src/schematics/tasks/npm-install.ts"],"names":[],"mappings":";;AAGA,6BAWC;AAbD,4DAA0E;AAE1E,SAAwB,UAAU,CAAC,GAAW,EAAE,WAAoB;IAElE,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC/C,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,CAAC;YACzC,gBAAgB,EAAE,GAAG;YACrB,WAAW,EAAE,WAAW;SACzB,CAAC,CAAC,CAAC;QAEJ,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;AACH,CAAC"}
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = updateAngularJson;
4
4
  function updateAngularJson(options) {
5
- return (tree, context) => {
5
+ return (tree) => {
6
6
  const angularJsonPath = `/${options.name}/angular.json`;
7
7
  const angularJsonFile = tree.read(angularJsonPath);
8
8
  if (!angularJsonFile) {
@@ -1 +1 @@
1
- {"version":3,"file":"update-angular-json.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-angular-json.ts"],"names":[],"mappings":";;AAGA,oCA6CC;AA7CD,SAAwB,iBAAiB,CAAC,OAAY;IACpD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,IAAI,eAAe,CAAC;QACxD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAEnD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,kBAAkB,eAAe,GAAG,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAe,CAAC;QAEzE,MAAM,QAAQ,GAAQ,WAAW,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;QACjC,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC;YAEvG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC9B,CAAC;YAED,iDAAiD;YACjD,MAAM,SAAS,GAAG;gBAChB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,QAAQ,EAAE,iBAAiB,EAAE;gBACtF,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,8CAA8C,EAAE,QAAQ,EAAE,UAAU,EAAE;gBACjG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mDAAmD,EAAE,QAAQ,EAAE,2BAA2B,EAAE;gBACvH,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mDAAmD,EAAE,QAAQ,EAAE,cAAc,EAAE;gBAC1G,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,wCAAwC,EAAE,QAAQ,EAAE,wBAAwB,EAAE;gBACzG,aAAa;aACd,CAAC;YAEJ,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;YACrE,IAAI,aAAa,EAAE,CAAC;gBAClB,aAAa,CAAC,cAAc,GAAG,KAAK,CAAC;gBACrC,aAAa,CAAC,YAAY,GAAG,KAAK,CAAC;YACrC,CAAC;YAEC,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,gBAAgB,WAAW,uCAAuC,CAAC,CAAC;QACtF,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"update-angular-json.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-angular-json.ts"],"names":[],"mappings":";;AAGA,oCA6CC;AA7CD,SAAwB,iBAAiB,CAAC,OAAY;IACpD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,IAAI,eAAe,CAAC;QACxD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAEnD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,kBAAkB,eAAe,GAAG,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAe,CAAC;QAEzE,MAAM,QAAQ,GAAQ,WAAW,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;QACjC,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,CAAC;YAEvG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAC9B,CAAC;YAED,iDAAiD;YACjD,MAAM,SAAS,GAAG;gBAChB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,QAAQ,EAAE,iBAAiB,EAAE;gBACtF,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,8CAA8C,EAAE,QAAQ,EAAE,UAAU,EAAE;gBACjG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mDAAmD,EAAE,QAAQ,EAAE,2BAA2B,EAAE;gBACvH,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,mDAAmD,EAAE,QAAQ,EAAE,cAAc,EAAE;gBAC1G,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,wCAAwC,EAAE,QAAQ,EAAE,wBAAwB,EAAE;gBACzG,aAAa;aACd,CAAC;YAEJ,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;YACrE,IAAI,aAAa,EAAE,CAAC;gBAClB,aAAa,CAAC,cAAc,GAAG,KAAK,CAAC;gBACrC,aAAa,CAAC,YAAY,GAAG,KAAK,CAAC;YACrC,CAAC;YAEC,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,gBAAgB,WAAW,uCAAuC,CAAC,CAAC;QACtF,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
@@ -1,2 +1,2 @@
1
1
  import { Rule } from "@angular-devkit/schematics";
2
- export declare function updateAppConfig(options: any, extensionsModuleName: string, importPath: string): Rule;
2
+ export declare function updateAppConfig(extensionsModuleName: string, importPath: string): Rule;
@@ -1,4 +1,13 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
13
  };
@@ -8,10 +17,13 @@ const schematics_1 = require("@angular-devkit/schematics");
8
17
  const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
9
18
  const change_1 = require("@schematics/angular/utility/change");
10
19
  const typescript_1 = __importDefault(require("typescript"));
11
- function updateAppConfig(options, extensionsModuleName, importPath) {
12
- return (tree, context) => {
20
+ const project_metadata_1 = require("../project-metadata");
21
+ const utils_1 = require("../utils");
22
+ function updateAppConfig(extensionsModuleName, importPath) {
23
+ return (tree) => __awaiter(this, void 0, void 0, function* () {
13
24
  var _a;
14
- const filePath = "./src/app/app.config.ts";
25
+ const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
26
+ const filePath = (0, utils_1.buildPath)(project.sourceRoot, 'app', 'app.config.ts');
15
27
  if (!tree.exists(filePath)) {
16
28
  throw new schematics_1.SchematicsException(`File ${filePath} not found.`);
17
29
  }
@@ -45,6 +57,6 @@ function updateAppConfig(options, extensionsModuleName, importPath) {
45
57
  }
46
58
  tree.commitUpdate(recorder);
47
59
  return tree;
48
- };
60
+ });
49
61
  }
50
62
  //# sourceMappingURL=update-app-config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"update-app-config.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-app-config.ts"],"names":[],"mappings":";;;;;AAKA,0CAkDC;AAvDD,2DAAwG;AACxG,qEAAgF;AAChF,+DAAyF;AACzF,4DAA4B;AAE5B,SAAgB,eAAe,CAAC,OAAY,EAAE,oBAA4B,EAAE,UAAkB;IAC5F,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;;QAC/C,MAAM,QAAQ,GAAG,yBAAyB,CAAC;QAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,gCAAmB,CAAC,QAAQ,QAAQ,aAAa,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,OAAO,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,gCAAmB,CAAC,kBAAkB,QAAQ,YAAY,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,UAAU,GAAG,oBAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,oBAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxF,MAAM,eAAe,GAAG,IAAA,qBAAS,EAAC,UAAU,EAAE,oBAAE,CAAC,UAAU,CAAC,cAAc,CAAwB,CAAC;QACnG,MAAM,eAAe,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACpD,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,uBAAuB,CACtD,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,gCAAmB,CAAC,kDAAkD,QAAQ,GAAG,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,aAAa,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACnD,IAAI,CAAC,oBAAE,CAAC,wBAAwB,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,gCAAmB,CAAC,8DAA8D,CAAC,CAAC;QAChG,CAAC;QAED,qCAAqC;QACrC,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,oBAAoB,CAAC,CAAC;QAC7F,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC;QAE5C,MAAM,YAAY,GAAG,IAAI,qBAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,oBAA2B,EAAE,CAAC,CAAC;QAC3I,IAAA,8BAAqB,EAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAEhD,uBAAuB;QACvB,MAAM,YAAY,GAAG,IAAA,wBAAY,EAAC,UAAU,EAAE,QAAQ,EAAE,oBAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,UAAU,CAAC,CAAC;QAC5G,IAAI,YAAY,EAAE,CAAC;YACjB,IAAA,8BAAqB,EAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"update-app-config.js","sourceRoot":"","sources":["../../../src/schematics/tasks/update-app-config.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
1
  import { Rule } from "@angular-devkit/schematics";
2
2
  import { AppManifest } from "../app-manifest";
3
- export declare function updateAppRoutes(options: any, appManifest: AppManifest): Rule;
3
+ export declare function updateAppRoutes(appName: string, appManifest: AppManifest): Rule;
@@ -1,4 +1,13 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
13
  };
@@ -8,9 +17,12 @@ const typescript_1 = __importDefault(require("typescript"));
8
17
  const schematics_1 = require("@angular-devkit/schematics");
9
18
  const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
10
19
  const change_1 = require("@schematics/angular/utility/change");
11
- function updateAppRoutes(options, appManifest) {
12
- return (tree) => {
13
- const filePath = `./src/app/app.routes.ts`;
20
+ const project_metadata_1 = require("../project-metadata");
21
+ const utils_1 = require("../utils");
22
+ function updateAppRoutes(appName, appManifest) {
23
+ return (tree, context) => __awaiter(this, void 0, void 0, function* () {
24
+ const project = yield project_metadata_1.ProjectMetadata.fromTree(tree);
25
+ const filePath = (0, utils_1.buildPath)(project.sourceRoot, 'app', 'app.routes.ts');
14
26
  if (!appManifest.ui) {
15
27
  throw new schematics_1.SchematicsException(`App manifest has no ui defined.`);
16
28
  }
@@ -20,11 +32,11 @@ function updateAppRoutes(options, appManifest) {
20
32
  title: '${appManifest.title}',
21
33
  path: '${appManifest.ui.path}',
22
34
  icon: '${appManifest.ui.icon}',
23
- loadChildren: () => import('${options.name}').then((m) => m.${schematics_1.strings.classify(options.componentName)}Routes)
35
+ loadChildren: () => import('${appName}').then((m) => m.${appManifest.ui.routes})
24
36
  }
25
37
  `;
26
38
  if (!tree.exists(filePath)) {
27
- throw new schematics_1.SchematicsException(`Cannot find ${filePath} to register the app ${options.name}.`);
39
+ throw new schematics_1.SchematicsException(`Cannot find ${filePath} to register the app ${appName}.`);
28
40
  }
29
41
  const fileBuffer = tree.read(filePath);
30
42
  if (!fileBuffer) {
@@ -44,11 +56,30 @@ function updateAppRoutes(options, appManifest) {
44
56
  if (!appsArrayNode || !typescript_1.default.isArrayLiteralExpression(appsArrayNode)) {
45
57
  throw new schematics_1.SchematicsException(`'apps' is not an array in ${filePath}`);
46
58
  }
59
+ if (hasAppWithProperty(appsArrayNode, 'id', appManifest.id)) {
60
+ throw new schematics_1.SchematicsException(`App with id '${appManifest.id}' is already registered in ${filePath}`);
61
+ }
62
+ const routeAlreadyRegistered = hasAppWithProperty(appsArrayNode, 'path', appManifest.ui.path);
47
63
  const insertPosition = appsArrayNode.elements.end;
48
64
  const change = new change_1.InsertChange(filePath, insertPosition, `${appsArrayNode.elements.length > 0 ? "," : ""} ${appConfig}`);
49
65
  (0, change_1.applyToUpdateRecorder)(recorder, [change]);
50
66
  tree.commitUpdate(recorder);
67
+ if (routeAlreadyRegistered) {
68
+ context.logger.warn(`Duplicate app path '${appManifest.ui.path}' in ${filePath}. Only one app per path is accessible via the router. Please use unique paths.`);
69
+ }
51
70
  return tree;
52
- };
71
+ });
72
+ }
73
+ function hasAppWithProperty(arrayNode, propertyName, propertyValue) {
74
+ return arrayNode.elements.some((element) => {
75
+ if (!typescript_1.default.isObjectLiteralExpression(element)) {
76
+ return false;
77
+ }
78
+ return element.properties.some((property) => typescript_1.default.isPropertyAssignment(property) &&
79
+ typescript_1.default.isIdentifier(property.name) &&
80
+ property.name.text === propertyName &&
81
+ typescript_1.default.isStringLiteral(property.initializer) &&
82
+ property.initializer.text === propertyValue);
83
+ });
53
84
  }
54
85
  //# sourceMappingURL=update-app-routes.js.map