@abp/ng.schematics 6.0.0-rc.4 → 6.0.0

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 (167) hide show
  1. package/collection.json +5 -0
  2. package/commands/api/index.js +38 -28
  3. package/commands/api/index.js.map +1 -1
  4. package/commands/api/schema.json +9 -0
  5. package/commands/create-lib/files-package/__libraryName@kebab__/.eslintrc.json.template +44 -0
  6. package/commands/create-lib/files-package/__libraryName@kebab__/config/ng-package.json.template +7 -0
  7. package/commands/create-lib/files-package/__libraryName@kebab__/config/src/__libraryName@kebab__-config.module.ts.template +12 -0
  8. package/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/index.ts.template +1 -0
  9. package/commands/create-lib/files-package/__libraryName@kebab__/config/src/enums/route-names.ts.template +3 -0
  10. package/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/index.ts.template +1 -0
  11. package/commands/create-lib/files-package/__libraryName@kebab__/config/src/providers/route.provider.ts.template +26 -0
  12. package/commands/create-lib/files-package/__libraryName@kebab__/config/src/public-api.ts.template +3 -0
  13. package/commands/create-lib/files-package/__libraryName@kebab__/karma.conf.js.template +44 -0
  14. package/commands/create-lib/files-package/__libraryName@kebab__/ng-package.json.template +7 -0
  15. package/commands/create-lib/files-package/__libraryName@kebab__/package.json.template +11 -0
  16. package/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__-routing.module.ts.template +18 -0
  17. package/commands/create-lib/files-package/__libraryName@kebab__/src/lib/__libraryName@kebab__.module.ts.template +22 -0
  18. package/commands/create-lib/files-package/__libraryName@kebab__/src/public-api.ts.template +4 -0
  19. package/commands/create-lib/files-package/__libraryName@kebab__/src/test.ts.template +26 -0
  20. package/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.json.template +20 -0
  21. package/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.lib.prod.json.template +10 -0
  22. package/commands/create-lib/files-package/__libraryName@kebab__/tsconfig.spec.json.template +17 -0
  23. package/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/ng-package.json.template +7 -0
  24. package/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/__target@kebab__-__libraryName@kebab__.module.ts.template +11 -0
  25. package/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/lib/index.ts.template +1 -0
  26. package/commands/create-lib/files-secondary-entrypoint/__libraryName@kebab__/src/public-api.ts.template +1 -0
  27. package/commands/create-lib/index.d.ts +6 -0
  28. package/commands/create-lib/index.js +124 -0
  29. package/commands/create-lib/index.js.map +1 -0
  30. package/commands/create-lib/models/generate-lib-schema.d.ts +13 -0
  31. package/commands/create-lib/models/generate-lib-schema.js +3 -0
  32. package/commands/create-lib/models/generate-lib-schema.js.map +1 -0
  33. package/commands/create-lib/models/index.d.ts +1 -0
  34. package/commands/create-lib/models/index.js +18 -0
  35. package/commands/create-lib/models/index.js.map +1 -0
  36. package/commands/create-lib/schema.json +36 -0
  37. package/commands/proxy-add/index.js +15 -15
  38. package/commands/proxy-add/index.js.map +1 -1
  39. package/commands/proxy-add/schema.json +9 -0
  40. package/commands/proxy-index/index.d.ts +3 -2
  41. package/commands/proxy-index/index.js +5 -5
  42. package/commands/proxy-index/index.js.map +1 -1
  43. package/commands/proxy-index/schema.json +9 -0
  44. package/commands/proxy-refresh/index.d.ts +2 -2
  45. package/commands/proxy-refresh/index.js +13 -13
  46. package/commands/proxy-refresh/index.js.map +1 -1
  47. package/commands/proxy-refresh/schema.json +10 -0
  48. package/commands/proxy-remove/index.d.ts +2 -2
  49. package/commands/proxy-remove/index.js +13 -13
  50. package/commands/proxy-remove/index.js.map +1 -1
  51. package/commands/proxy-remove/schema.json +9 -0
  52. package/constants/index.js +6 -2
  53. package/constants/index.js.map +1 -1
  54. package/constants/symbols.d.ts +1 -0
  55. package/constants/symbols.js +5 -0
  56. package/constants/symbols.js.map +1 -0
  57. package/enums/exception.d.ts +2 -1
  58. package/enums/index.js +6 -2
  59. package/enums/index.js.map +1 -1
  60. package/models/generate-proxy-schema.d.ts +4 -0
  61. package/models/index.js +6 -2
  62. package/models/index.js.map +1 -1
  63. package/models/method.js +3 -3
  64. package/models/method.js.map +1 -1
  65. package/package.json +6 -5
  66. package/test-setup.js +2 -2
  67. package/test-setup.js.map +1 -1
  68. package/utils/angular/ast-utils.d.ts +1 -14
  69. package/utils/angular/ast-utils.js +45 -117
  70. package/utils/angular/ast-utils.js.map +1 -1
  71. package/utils/angular/change.d.ts +6 -4
  72. package/utils/angular/change.js +29 -4
  73. package/utils/angular/change.js.map +1 -1
  74. package/utils/angular/dependencies.d.ts +1 -1
  75. package/utils/angular/dependencies.js +7 -9
  76. package/utils/angular/dependencies.js.map +1 -1
  77. package/utils/angular/dependency.d.ts +96 -0
  78. package/utils/angular/dependency.js +123 -0
  79. package/utils/angular/dependency.js.map +1 -0
  80. package/utils/angular/find-module.d.ts +2 -4
  81. package/utils/angular/find-module.js +22 -22
  82. package/utils/angular/find-module.js.map +1 -1
  83. package/utils/angular/generate-from-files.d.ts +17 -0
  84. package/utils/angular/generate-from-files.js +37 -0
  85. package/utils/angular/generate-from-files.js.map +1 -0
  86. package/utils/angular/index.d.ts +1 -5
  87. package/utils/angular/index.js +7 -7
  88. package/utils/angular/index.js.map +1 -1
  89. package/utils/angular/json-file.d.ts +4 -4
  90. package/utils/angular/json-file.js +24 -17
  91. package/utils/angular/json-file.js.map +1 -1
  92. package/utils/angular/ng-ast-utils.d.ts +7 -0
  93. package/utils/angular/ng-ast-utils.js +13 -21
  94. package/utils/angular/ng-ast-utils.js.map +1 -1
  95. package/utils/angular/parse-name.d.ts +1 -1
  96. package/utils/angular/parse-name.js +6 -6
  97. package/utils/angular/parse-name.js.map +1 -1
  98. package/utils/angular/paths.d.ts +1 -1
  99. package/utils/angular/paths.js +2 -2
  100. package/utils/angular/paths.js.map +1 -1
  101. package/utils/angular/project-targets.d.ts +1 -1
  102. package/utils/angular/project-targets.js +1 -1
  103. package/utils/angular/validation.d.ts +8 -2
  104. package/utils/angular/validation.js +10 -55
  105. package/utils/angular/validation.js.map +1 -1
  106. package/utils/angular/workspace-models.d.ts +16 -15
  107. package/utils/angular/workspace-models.js +9 -4
  108. package/utils/angular/workspace-models.js.map +1 -1
  109. package/utils/angular/workspace.d.ts +40 -5
  110. package/utils/angular/workspace.js +96 -38
  111. package/utils/angular/workspace.js.map +1 -1
  112. package/utils/angular-schematic/generate-lib.d.ts +3 -0
  113. package/utils/angular-schematic/generate-lib.js +54 -0
  114. package/utils/angular-schematic/generate-lib.js.map +1 -0
  115. package/utils/angular-schematic/index.d.ts +1 -0
  116. package/utils/angular-schematic/index.js +18 -0
  117. package/utils/angular-schematic/index.js.map +1 -0
  118. package/utils/api.js +1 -1
  119. package/utils/api.js.map +1 -1
  120. package/utils/ast.js +3 -3
  121. package/utils/ast.js.map +1 -1
  122. package/utils/barrel.js +1 -1
  123. package/utils/barrel.js.map +1 -1
  124. package/utils/common.js +1 -1
  125. package/utils/common.js.map +1 -1
  126. package/utils/enum.js +2 -2
  127. package/utils/enum.js.map +1 -1
  128. package/utils/generics.js +1 -2
  129. package/utils/generics.js.map +1 -1
  130. package/utils/index.js +6 -2
  131. package/utils/index.js.map +1 -1
  132. package/utils/methods.js +2 -1
  133. package/utils/methods.js.map +1 -1
  134. package/utils/model.js +17 -19
  135. package/utils/model.js.map +1 -1
  136. package/utils/namespace.js +1 -1
  137. package/utils/namespace.js.map +1 -1
  138. package/utils/path.js +1 -1
  139. package/utils/path.js.map +1 -1
  140. package/utils/rule.js +3 -3
  141. package/utils/rule.js.map +1 -1
  142. package/utils/service.js +15 -11
  143. package/utils/service.js.map +1 -1
  144. package/utils/source.js +19 -19
  145. package/utils/source.js.map +1 -1
  146. package/utils/text.js +18 -9
  147. package/utils/text.js.map +1 -1
  148. package/utils/type.js +6 -6
  149. package/utils/type.js.map +1 -1
  150. package/utils/workspace.d.ts +9 -1
  151. package/utils/workspace.js +51 -9
  152. package/utils/workspace.js.map +1 -1
  153. package/utils/angular/config.d.ts +0 -455
  154. package/utils/angular/config.js +0 -71
  155. package/utils/angular/config.js.map +0 -1
  156. package/utils/angular/json-utils.d.ts +0 -14
  157. package/utils/angular/json-utils.js +0 -159
  158. package/utils/angular/json-utils.js.map +0 -1
  159. package/utils/angular/latest-versions.d.ts +0 -18
  160. package/utils/angular/latest-versions.js +0 -27
  161. package/utils/angular/latest-versions.js.map +0 -1
  162. package/utils/angular/lint-fix.d.ts +0 -9
  163. package/utils/angular/lint-fix.js +0 -42
  164. package/utils/angular/lint-fix.js.map +0 -1
  165. package/utils/angular/tsconfig.d.ts +0 -16
  166. package/utils/angular/tsconfig.js +0 -63
  167. package/utils/angular/tsconfig.js.map +0 -1
package/utils/source.js CHANGED
@@ -12,7 +12,7 @@ function createApiDefinitionGetter(params) {
12
12
  const apiName = params.apiName || 'default';
13
13
  let sourceUrl = params.url;
14
14
  return async (host) => {
15
- const source = await workspace_1.resolveProject(host, params.source);
15
+ const source = await (0, workspace_1.resolveProject)(host, params.source);
16
16
  if (!sourceUrl) {
17
17
  sourceUrl = getSourceUrl(host, source, apiName);
18
18
  }
@@ -24,7 +24,7 @@ async function getApiDefinition(sourceUrl) {
24
24
  const url = sourceUrl + constants_1.API_DEFINITION_ENDPOINT;
25
25
  let body;
26
26
  try {
27
- ({ body } = await got_1.default(url, {
27
+ ({ body } = await (0, got_1.default)(url, {
28
28
  responseType: 'json',
29
29
  searchParams: { includeTypes: true },
30
30
  https: { rejectUnauthorized: false },
@@ -32,8 +32,8 @@ async function getApiDefinition(sourceUrl) {
32
32
  }
33
33
  catch ({ response }) {
34
34
  // handle redirects
35
- if (!(response === null || response === void 0 ? void 0 : response.body) || response.statusCode >= 400)
36
- throw new schematics_1.SchematicsException(common_1.interpolate("[API Not Available] Request to {0} is unsuccessful. Please double-check the URL in the source project environment and make sure your application is up and running." /* NoApi */, url));
35
+ if (!response?.body || response.statusCode >= 400)
36
+ throw new schematics_1.SchematicsException((0, common_1.interpolate)("[API Not Available] Request to {0} is unsuccessful. Please double-check the URL in the source project environment and make sure your application is up and running." /* Exception.NoApi */, url));
37
37
  body = response.body;
38
38
  }
39
39
  return body;
@@ -41,36 +41,36 @@ async function getApiDefinition(sourceUrl) {
41
41
  function createRootNamespaceGetter(params) {
42
42
  const apiName = params.apiName || 'default';
43
43
  return async (tree) => {
44
- const project = await workspace_1.resolveProject(tree, params.source);
45
- const environmentExpr = workspace_1.readEnvironment(tree, project.definition);
44
+ const project = await (0, workspace_1.resolveProject)(tree, params.source);
45
+ const environmentExpr = (0, workspace_1.readEnvironment)(tree, project.definition);
46
46
  if (!environmentExpr)
47
- throw new schematics_1.SchematicsException(common_1.interpolate("[Environment Not Found] An environment file cannot be located in \"{0}\" project." /* NoEnvironment */, project.name));
48
- let assignment = ast_1.getAssignedPropertyFromObjectliteral(environmentExpr, [
47
+ throw new schematics_1.SchematicsException((0, common_1.interpolate)("[Environment Not Found] An environment file cannot be located in \"{0}\" project." /* Exception.NoEnvironment */, project.name));
48
+ let assignment = (0, ast_1.getAssignedPropertyFromObjectliteral)(environmentExpr, [
49
49
  'apis',
50
50
  apiName,
51
51
  'rootNamespace',
52
52
  ]);
53
53
  if (!assignment)
54
- assignment = ast_1.getAssignedPropertyFromObjectliteral(environmentExpr, [
54
+ assignment = (0, ast_1.getAssignedPropertyFromObjectliteral)(environmentExpr, [
55
55
  'apis',
56
56
  'default',
57
57
  'rootNamespace',
58
58
  ]);
59
59
  if (!assignment)
60
- throw new schematics_1.SchematicsException(common_1.interpolate("[Root Namespace Not Found] Cannot resolve root namespace for \"{1}\" api from \"{0}\" project." /* NoRootNamespace */, project.name, apiName));
60
+ throw new schematics_1.SchematicsException((0, common_1.interpolate)("[Root Namespace Not Found] Cannot resolve root namespace for \"{1}\" api from \"{0}\" project." /* Exception.NoRootNamespace */, project.name, apiName));
61
61
  return assignment.replace(/[`'"]/g, '');
62
62
  };
63
63
  }
64
64
  exports.createRootNamespaceGetter = createRootNamespaceGetter;
65
65
  function getSourceUrl(tree, project, apiName) {
66
- const environmentExpr = workspace_1.readEnvironment(tree, project.definition);
66
+ const environmentExpr = (0, workspace_1.readEnvironment)(tree, project.definition);
67
67
  if (!environmentExpr)
68
- throw new schematics_1.SchematicsException(common_1.interpolate("[Environment Not Found] An environment file cannot be located in \"{0}\" project." /* NoEnvironment */, project.name));
69
- let assignment = ast_1.getAssignedPropertyFromObjectliteral(environmentExpr, ['apis', apiName, 'url']);
68
+ throw new schematics_1.SchematicsException((0, common_1.interpolate)("[Environment Not Found] An environment file cannot be located in \"{0}\" project." /* Exception.NoEnvironment */, project.name));
69
+ let assignment = (0, ast_1.getAssignedPropertyFromObjectliteral)(environmentExpr, ['apis', apiName, 'url']);
70
70
  if (!assignment)
71
- assignment = ast_1.getAssignedPropertyFromObjectliteral(environmentExpr, ['apis', 'default', 'url']);
71
+ assignment = (0, ast_1.getAssignedPropertyFromObjectliteral)(environmentExpr, ['apis', 'default', 'url']);
72
72
  if (!assignment)
73
- throw new schematics_1.SchematicsException(common_1.interpolate("[API URL Not Found] Cannot resolve API URL for \"{1}\" remote service name from \"{0}\" project." /* NoApiUrl */, project.name, apiName));
73
+ throw new schematics_1.SchematicsException((0, common_1.interpolate)("[API URL Not Found] Cannot resolve API URL for \"{1}\" remote service name from \"{0}\" project." /* Exception.NoApiUrl */, project.name, apiName));
74
74
  return assignment.replace(/[`'"]/g, '');
75
75
  }
76
76
  exports.getSourceUrl = getSourceUrl;
@@ -82,7 +82,7 @@ function createProxyConfigReader(targetPath) {
82
82
  return JSON.parse(buffer.toString());
83
83
  }
84
84
  catch (_) { }
85
- throw new schematics_1.SchematicsException(common_1.interpolate("[Proxy Config Not Found] There is no JSON file at \"{0}\"." /* NoProxyConfig */, targetPath));
85
+ throw new schematics_1.SchematicsException((0, common_1.interpolate)("[Proxy Config Not Found] There is no JSON file at \"{0}\"." /* Exception.NoProxyConfig */, targetPath));
86
86
  };
87
87
  }
88
88
  exports.createProxyConfigReader = createProxyConfigReader;
@@ -101,7 +101,7 @@ function createProxyClearer(targetPath) {
101
101
  return tree;
102
102
  }
103
103
  catch (_) {
104
- throw new schematics_1.SchematicsException(common_1.interpolate("[Directory Remove Failed] Cannot remove \"{0}\"." /* DirRemoveFailed */, targetPath));
104
+ throw new schematics_1.SchematicsException((0, common_1.interpolate)("[Directory Remove Failed] Cannot remove \"{0}\"." /* Exception.DirRemoveFailed */, targetPath));
105
105
  }
106
106
  };
107
107
  }
@@ -151,12 +151,12 @@ function createFileWriterCreator(targetPath) {
151
151
  return tree;
152
152
  }
153
153
  catch (_) { }
154
- throw new schematics_1.SchematicsException(common_1.interpolate("[File Write Failed] Cannot write file at \"{0}\"." /* FileWriteFailed */, targetPath));
154
+ throw new schematics_1.SchematicsException((0, common_1.interpolate)("[File Write Failed] Cannot write file at \"{0}\"." /* Exception.FileWriteFailed */, targetPath));
155
155
  };
156
156
  }
157
157
  exports.createFileWriterCreator = createFileWriterCreator;
158
158
  function createProxyConfigJsonCreator(apiDefinition) {
159
- return (generated) => generateProxyConfigJson(Object.assign({ generated }, apiDefinition));
159
+ return (generated) => generateProxyConfigJson({ generated, ...apiDefinition });
160
160
  }
161
161
  exports.createProxyConfigJsonCreator = createProxyConfigJsonCreator;
162
162
  function generateProxyConfigJson(proxyConfig) {
@@ -1 +1 @@
1
- {"version":3,"file":"source.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/source.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"source.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/source.ts"],"names":[],"mappings":"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"}
package/utils/text.js CHANGED
@@ -3,15 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.camelizeHyphen = exports.quote = exports.dir = exports.macro = exports.snake = exports.kebab = exports.pascal = exports.camel = exports.upper = exports.lower = void 0;
4
4
  /* eslint-disable no-useless-escape */
5
5
  const core_1 = require("@angular-devkit/core");
6
- exports.lower = (text) => text.toLowerCase();
7
- exports.upper = (text) => text.toUpperCase();
8
- exports.camel = (text) => toCamelCase(_(text));
9
- exports.pascal = (text) => core_1.strings.classify(_(text));
10
- exports.kebab = (text) => core_1.strings.dasherize(_(text));
11
- exports.snake = (text) => core_1.strings.underscore(_(text));
12
- exports.macro = (text) => exports.upper(exports.snake(text));
13
- exports.dir = (text) => core_1.strings.dasherize(text.replace(/\./g, '/').replace(/\/\//g, '/'));
14
- exports.quote = (value) => typeof value === 'string' ? `'${value.replace(/'/g, "\\'")}'` : value;
6
+ const lower = (text) => text.toLowerCase();
7
+ exports.lower = lower;
8
+ const upper = (text) => text.toUpperCase();
9
+ exports.upper = upper;
10
+ const camel = (text) => toCamelCase(_(text));
11
+ exports.camel = camel;
12
+ const pascal = (text) => core_1.strings.classify(_(text));
13
+ exports.pascal = pascal;
14
+ const kebab = (text) => core_1.strings.dasherize(_(text));
15
+ exports.kebab = kebab;
16
+ const snake = (text) => core_1.strings.underscore(_(text));
17
+ exports.snake = snake;
18
+ const macro = (text) => (0, exports.upper)((0, exports.snake)(text));
19
+ exports.macro = macro;
20
+ const dir = (text) => core_1.strings.dasherize(text.replace(/\./g, '/').replace(/\/\//g, '/'));
21
+ exports.dir = dir;
22
+ const quote = (value) => typeof value === 'string' ? `'${value.replace(/'/g, "\\'")}'` : value;
23
+ exports.quote = quote;
15
24
  function _(text) {
16
25
  return text.replace(/\./g, '_');
17
26
  }
package/utils/text.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/text.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"text.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/text.ts"],"names":[],"mappings":"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"}
package/utils/type.js CHANGED
@@ -10,9 +10,9 @@ const path_1 = require("./path");
10
10
  const tree_1 = require("./tree");
11
11
  function createTypeSimplifier() {
12
12
  const parseType = createTypeParser(t => {
13
- let type = t.replace(/(?<![^<, ])System\.([0-9A-Za-z.]+)/g, (_, match) => { var _a; return (_a = constants_1.SYSTEM_TYPES.get(match)) !== null && _a !== void 0 ? _a : 'any'; });
13
+ let type = t.replace(/(?<![^<, ])System\.([0-9A-Za-z.]+)/g, (_, match) => constants_1.SYSTEM_TYPES.get(match) ?? 'any');
14
14
  type = /any</.test(type) ? 'any' : type;
15
- const { identifier, generics } = generics_1.extractSimpleGenerics(type);
15
+ const { identifier, generics } = (0, generics_1.extractSimpleGenerics)(type);
16
16
  return generics.length ? `${identifier}<${generics.join(', ')}>` : identifier;
17
17
  });
18
18
  return (type) => {
@@ -78,21 +78,21 @@ function createTypeToImportMapper(solution, namespace) {
78
78
  return (type, isEnum) => {
79
79
  if (!type || type.startsWith('System'))
80
80
  return;
81
- const modelNamespace = namespace_1.parseNamespace(solution, type);
81
+ const modelNamespace = (0, namespace_1.parseNamespace)(solution, type);
82
82
  const refs = [removeTypeModifiers(type)];
83
83
  const specifiers = [adaptType(simplifyType(refs[0]).split('<')[0])];
84
84
  const path = constants_1.VOLO_REGEX.test(type)
85
85
  ? '@abp/ng.core'
86
86
  : isEnum
87
- ? path_1.relativePathToEnum(namespace, modelNamespace, specifiers[0])
88
- : path_1.relativePathToModel(namespace, modelNamespace);
87
+ ? (0, path_1.relativePathToEnum)(namespace, modelNamespace, specifiers[0])
88
+ : (0, path_1.relativePathToModel)(namespace, modelNamespace);
89
89
  return new models_1.Import({ keyword: enums_1.eImportKeyword.Type, path, refs, specifiers });
90
90
  };
91
91
  }
92
92
  exports.createTypeToImportMapper = createTypeToImportMapper;
93
93
  function createTypeAdapter() {
94
94
  const simplifyType = createTypeSimplifier();
95
- return (type) => tree_1.parseGenerics(type, node => simplifyType(node.data)).toString();
95
+ return (type) => (0, tree_1.parseGenerics)(type, node => simplifyType(node.data)).toString();
96
96
  }
97
97
  exports.createTypeAdapter = createTypeAdapter;
98
98
  // naming here is depictive only
package/utils/type.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/type.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/type.ts"],"names":[],"mappings":"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"}
@@ -5,4 +5,12 @@ import { WorkspaceSchema } from './angular';
5
5
  export declare function isLibrary(project: workspaces.ProjectDefinition): boolean;
6
6
  export declare function readEnvironment(tree: Tree, project: workspaces.ProjectDefinition): import("typescript").ObjectLiteralExpression | undefined;
7
7
  export declare function readWorkspaceSchema(tree: Tree): WorkspaceSchema;
8
- export declare function resolveProject(tree: Tree, name: string): Promise<Project>;
8
+ export declare function resolveProject<T = any>(tree: Tree, name: string, notFoundValue?: T): Promise<Project | T>;
9
+ export declare function getWorkspaceSchema(host: Tree): WorkspaceSchema;
10
+ export declare function getWorkspacePath(host: Tree): string;
11
+ /**
12
+ * Build a default project path for generating.
13
+ * @param project The project which will have its default path generated.
14
+ * @param entryPoint The secondary-entry-point.
15
+ */
16
+ export declare function buildTargetPath(project: workspaces.ProjectDefinition, entryPoint?: string): string;
@@ -1,12 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.resolveProject = exports.readWorkspaceSchema = exports.readEnvironment = exports.isLibrary = void 0;
3
+ exports.buildTargetPath = exports.getWorkspacePath = exports.getWorkspaceSchema = exports.resolveProject = exports.readWorkspaceSchema = exports.readEnvironment = exports.isLibrary = void 0;
4
4
  /* eslint-disable no-empty */
5
5
  const core_1 = require("@angular-devkit/core");
6
6
  const schematics_1 = require("@angular-devkit/schematics");
7
7
  const angular_1 = require("./angular");
8
8
  const ast_1 = require("./ast");
9
9
  const common_1 = require("./common");
10
+ const symbols_1 = require("../constants/symbols");
11
+ const json_file_1 = require("@angular/cli/src/utilities/json-file");
10
12
  function isLibrary(project) {
11
13
  return project.extensions['projectType'] === angular_1.ProjectType.Library;
12
14
  }
@@ -16,26 +18,31 @@ function readEnvironment(tree, project) {
16
18
  return undefined;
17
19
  const srcPath = project.sourceRoot || `${project.root}/src`;
18
20
  const envPath = srcPath + '/environments/environment.ts';
19
- const source = common_1.readFileInTree(tree, envPath);
20
- return ast_1.findEnvironmentExpression(source);
21
+ const source = (0, common_1.readFileInTree)(tree, envPath);
22
+ return (0, ast_1.findEnvironmentExpression)(source);
21
23
  }
22
24
  exports.readEnvironment = readEnvironment;
23
25
  function readWorkspaceSchema(tree) {
24
26
  if (!tree.exists('/angular.json'))
25
- throw new schematics_1.SchematicsException("[Workspace Not Found] Make sure you are running schematics at the root directory of your workspace and it has an angular.json file." /* NoWorkspace */);
27
+ throw new schematics_1.SchematicsException("[Workspace Not Found] Make sure you are running schematics at the root directory of your workspace and it has an angular.json file." /* Exception.NoWorkspace */);
26
28
  let workspaceSchema;
27
29
  try {
28
- workspaceSchema = angular_1.getWorkspaceSchema(tree);
30
+ workspaceSchema = getWorkspaceSchema(tree);
29
31
  }
30
32
  catch (_) {
31
- throw new schematics_1.SchematicsException("[Invalid Workspace] The angular.json should be a valid JSON file." /* InvalidWorkspace */);
33
+ throw new schematics_1.SchematicsException("[Invalid Workspace] The angular.json should be a valid JSON file." /* Exception.InvalidWorkspace */);
32
34
  }
33
35
  return workspaceSchema;
34
36
  }
35
37
  exports.readWorkspaceSchema = readWorkspaceSchema;
36
- async function resolveProject(tree, name) {
38
+ // eslint-disable-next-line
39
+ // @typescript-eslint/no-explicit-any
40
+ async function resolveProject(tree, name,
41
+ // eslint-disable-next-line
42
+ // @typescript-eslint/no-explicit-any
43
+ notFoundValue = symbols_1.NOT_FOUND_VALUE) {
37
44
  name = name || readWorkspaceSchema(tree).defaultProject;
38
- const workspace = await angular_1.getWorkspace(tree);
45
+ const workspace = await (0, angular_1.getWorkspace)(tree);
39
46
  let definition;
40
47
  try {
41
48
  definition = workspace.projects.get(name);
@@ -59,9 +66,44 @@ async function resolveProject(tree, name) {
59
66
  definition = workspace.projects.get(name);
60
67
  }
61
68
  catch (_) { }
69
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
70
+ // @ts-ignore
71
+ if (!definition && notFoundValue !== symbols_1.NOT_FOUND_VALUE) {
72
+ return notFoundValue;
73
+ }
62
74
  if (!definition)
63
- throw new schematics_1.SchematicsException("[Project Not Found] Either define a default project in your workspace or specify the project name in schematics options." /* NoProject */);
75
+ throw new schematics_1.SchematicsException("[Project Not Found] Either define a default project in your workspace or specify the project name in schematics options." /* Exception.NoProject */);
64
76
  return { name, definition };
65
77
  }
66
78
  exports.resolveProject = resolveProject;
79
+ function getWorkspaceSchema(host) {
80
+ const path = getWorkspacePath(host);
81
+ const configBuffer = host.read(path);
82
+ if (configBuffer === null) {
83
+ throw new schematics_1.SchematicsException(`Could not find (${path})`);
84
+ }
85
+ const content = configBuffer.toString();
86
+ // eslint-disable-next-line
87
+ // @typescript-eslint/no-explicit-any
88
+ return (0, json_file_1.parseJson)(content);
89
+ }
90
+ exports.getWorkspaceSchema = getWorkspaceSchema;
91
+ function getWorkspacePath(host) {
92
+ const possibleFiles = ['/angular.json', '/.angular.json'];
93
+ const path = possibleFiles.filter(path => host.exists(path))[0];
94
+ return path;
95
+ }
96
+ exports.getWorkspacePath = getWorkspacePath;
97
+ /**
98
+ * Build a default project path for generating.
99
+ * @param project The project which will have its default path generated.
100
+ * @param entryPoint The secondary-entry-point.
101
+ */
102
+ function buildTargetPath(project, entryPoint) {
103
+ if (entryPoint) {
104
+ return `${project.root}/${entryPoint}/src`;
105
+ }
106
+ return (0, angular_1.buildDefaultPath)(project);
107
+ }
108
+ exports.buildTargetPath = buildTargetPath;
67
109
  //# sourceMappingURL=workspace.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/workspace.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+CAA2D;AAC3D,2DAAuE;AAGvE,uCAA2F;AAC3F,+BAAkD;AAClD,qCAA0C;AAE1C,SAAgB,SAAS,CAAC,OAAqC;IAC7D,OAAO,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,qBAAW,CAAC,OAAO,CAAC;AACnE,CAAC;AAFD,8BAEC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAqC;IAC/E,IAAI,SAAS,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IAEzC,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,IAAI,GAAG,OAAO,CAAC,IAAI,MAAM,CAAC;IAC5D,MAAM,OAAO,GAAG,OAAO,GAAG,8BAA8B,CAAC;IACzD,MAAM,MAAM,GAAG,uBAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,+BAAyB,CAAC,MAAM,CAAC,CAAC;AAC3C,CAAC;AAPD,0CAOC;AAED,SAAgB,mBAAmB,CAAC,IAAU;IAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QAAE,MAAM,IAAI,gCAAmB,yJAAuB,CAAC;IAExF,IAAI,eAAgC,CAAC;IAErC,IAAI;QACF,eAAe,GAAG,4BAAkB,CAAC,IAAI,CAAC,CAAC;KAC5C;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,gCAAmB,4FAA4B,CAAC;KAC3D;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAZD,kDAYC;AAEM,KAAK,UAAU,cAAc,CAAC,IAAU,EAAE,IAAY;IAC3D,IAAI,GAAG,IAAI,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,cAAe,CAAC;IACzD,MAAM,SAAS,GAAG,MAAM,sBAAY,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,UAA6C,CAAC;IAElD,IAAI;QACF,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KAC3C;IAAC,OAAO,CAAC,EAAE,GAAE;IAEd,IAAI,CAAC,UAAU;QACb,IAAI;YACF,IAAI,GAAG,cAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/B,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC3C;QAAC,OAAO,CAAC,EAAE,GAAE;IAEhB,IAAI,CAAC,UAAU;QACb,IAAI;YACF,IAAI,GAAG,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC9B,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC3C;QAAC,OAAO,CAAC,EAAE,GAAE;IAEhB,IAAI,CAAC,UAAU;QACb,IAAI;YACF,IAAI,GAAG,cAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC9B,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC3C;QAAC,OAAO,CAAC,EAAE,GAAE;IAEhB,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,gCAAmB,4IAAqB,CAAC;IAEpE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;AAC9B,CAAC;AA9BD,wCA8BC"}
1
+ {"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../packages/schematics/src/utils/workspace.ts"],"names":[],"mappings":"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"}