@o3r/schematics 11.6.0-prerelease.4 → 11.6.0-prerelease.41

Sign up to get free protection for your applications and to get access to all the features.
Files changed (177) hide show
  1. package/cli/environment.js +1 -0
  2. package/package.json +28 -20
  3. package/schematics/ng-add/index.d.ts.map +1 -1
  4. package/schematics/ng-add/index.js +2 -2
  5. package/schematics/ng-add/schema.d.ts.map +1 -1
  6. package/src/interfaces/angular-workspace.d.ts.map +1 -1
  7. package/src/interfaces/index.d.ts +1 -1
  8. package/src/interfaces/index.d.ts.map +1 -1
  9. package/src/interfaces/index.js +1 -1
  10. package/src/interfaces/index.js.map +1 -1
  11. package/src/interfaces/rule-factories.d.ts.map +1 -1
  12. package/src/interfaces/schematic-option.d.ts.map +1 -1
  13. package/src/modules/index.d.ts +1 -1
  14. package/src/modules/index.d.ts.map +1 -1
  15. package/src/modules/index.js +1 -1
  16. package/src/modules/index.js.map +1 -1
  17. package/src/modules/modules.constants.d.ts.map +1 -1
  18. package/src/modules/modules.constants.js.map +1 -1
  19. package/src/modules/modules.display.rule.d.ts.map +1 -1
  20. package/src/modules/modules.display.rule.js +1 -2
  21. package/src/modules/modules.display.rule.js.map +1 -1
  22. package/src/modules/modules.helpers.d.ts +1 -1
  23. package/src/modules/modules.helpers.d.ts.map +1 -1
  24. package/src/modules/modules.helpers.js +5 -6
  25. package/src/modules/modules.helpers.js.map +1 -1
  26. package/src/public_api.d.ts +1 -1
  27. package/src/public_api.d.ts.map +1 -1
  28. package/src/public_api.js +1 -1
  29. package/src/public_api.js.map +1 -1
  30. package/src/rule-factories/add-imports/index.d.ts.map +1 -1
  31. package/src/rule-factories/add-imports/index.js +9 -5
  32. package/src/rule-factories/add-imports/index.js.map +1 -1
  33. package/src/rule-factories/check-packages-peers/index.d.ts.map +1 -1
  34. package/src/rule-factories/check-packages-peers/index.js +13 -12
  35. package/src/rule-factories/check-packages-peers/index.js.map +1 -1
  36. package/src/rule-factories/dev-tools/devtools-registration.d.ts +1 -3
  37. package/src/rule-factories/dev-tools/devtools-registration.d.ts.map +1 -1
  38. package/src/rule-factories/dev-tools/devtools-registration.js +34 -19
  39. package/src/rule-factories/dev-tools/devtools-registration.js.map +1 -1
  40. package/src/rule-factories/eslint-fix/index.d.ts +1 -2
  41. package/src/rule-factories/eslint-fix/index.d.ts.map +1 -1
  42. package/src/rule-factories/eslint-fix/index.js +17 -18
  43. package/src/rule-factories/eslint-fix/index.js.map +1 -1
  44. package/src/rule-factories/get-test-frameworks/index.d.ts.map +1 -1
  45. package/src/rule-factories/get-test-frameworks/index.js +2 -2
  46. package/src/rule-factories/get-test-frameworks/index.js.map +1 -1
  47. package/src/rule-factories/index.d.ts +2 -3
  48. package/src/rule-factories/index.d.ts.map +1 -1
  49. package/src/rule-factories/index.js +2 -3
  50. package/src/rule-factories/index.js.map +1 -1
  51. package/src/rule-factories/ng-add/dependencies.d.ts +16 -1
  52. package/src/rule-factories/ng-add/dependencies.d.ts.map +1 -1
  53. package/src/rule-factories/ng-add/dependencies.js +32 -17
  54. package/src/rule-factories/ng-add/dependencies.js.map +1 -1
  55. package/src/rule-factories/ng-add/index.d.ts +1 -1
  56. package/src/rule-factories/ng-add/index.d.ts.map +1 -1
  57. package/src/rule-factories/ng-add/index.js +1 -1
  58. package/src/rule-factories/ng-add/index.js.map +1 -1
  59. package/src/rule-factories/ng-add/ng-add.helpers.d.ts +1 -1
  60. package/src/rule-factories/ng-add/ng-add.helpers.d.ts.map +1 -1
  61. package/src/rule-factories/ng-add/ng-add.helpers.js +22 -23
  62. package/src/rule-factories/ng-add/ng-add.helpers.js.map +1 -1
  63. package/src/rule-factories/ng-add/schematics-register.d.ts.map +1 -1
  64. package/src/rule-factories/ng-add/schematics-register.js +36 -28
  65. package/src/rule-factories/ng-add/schematics-register.js.map +1 -1
  66. package/src/rule-factories/remove-packages/index.d.ts.map +1 -1
  67. package/src/rule-factories/remove-packages/index.js +9 -9
  68. package/src/rule-factories/remove-packages/index.js.map +1 -1
  69. package/src/rule-factories/update-imports/list-of-vars.js.map +1 -1
  70. package/src/rule-factories/update-imports/update-imports-with-scope.d.ts.map +1 -1
  71. package/src/rule-factories/update-imports/update-imports-with-scope.js +3 -2
  72. package/src/rule-factories/update-imports/update-imports-with-scope.js.map +1 -1
  73. package/src/rule-factories/update-imports/update-ts-imports.d.ts.map +1 -1
  74. package/src/rule-factories/update-imports/update-ts-imports.js +3 -3
  75. package/src/rule-factories/update-imports/update-ts-imports.js.map +1 -1
  76. package/src/rule-factories/vscode-extensions/index.d.ts.map +1 -1
  77. package/src/rule-factories/vscode-extensions/index.js +5 -5
  78. package/src/rule-factories/vscode-extensions/index.js.map +1 -1
  79. package/src/tasks/eslint/index.d.ts +1 -1
  80. package/src/tasks/eslint/index.d.ts.map +1 -1
  81. package/src/tasks/eslint/index.js +2 -2
  82. package/src/tasks/eslint/index.js.map +1 -1
  83. package/src/tasks/link/index.d.ts.map +1 -1
  84. package/src/tasks/link/index.js.map +1 -1
  85. package/src/tasks/ng-add/index.d.ts.map +1 -1
  86. package/src/tasks/package-manager/interfaces.d.ts.map +1 -1
  87. package/src/tasks/package-manager/npm-exec.d.ts.map +1 -1
  88. package/src/tasks/package-manager/npm-exec.js.map +1 -1
  89. package/src/tasks/package-manager/npm-install.d.ts.map +1 -1
  90. package/src/tasks/package-manager/npm-install.js +1 -1
  91. package/src/tasks/package-manager/npm-install.js.map +1 -1
  92. package/src/tasks/package-manager/npm-run.d.ts.map +1 -1
  93. package/src/tasks/package-manager/npm-run.js.map +1 -1
  94. package/src/utility/ast.d.ts.map +1 -1
  95. package/src/utility/ast.js +12 -15
  96. package/src/utility/ast.js.map +1 -1
  97. package/src/utility/builder.d.ts.map +1 -1
  98. package/src/utility/builder.js.map +1 -1
  99. package/src/utility/collection.d.ts.map +1 -1
  100. package/src/utility/collection.js +2 -3
  101. package/src/utility/collection.js.map +1 -1
  102. package/src/utility/component.d.ts.map +1 -1
  103. package/src/utility/component.js +2 -2
  104. package/src/utility/component.js.map +1 -1
  105. package/src/utility/dependencies.d.ts +1 -1
  106. package/src/utility/dependencies.d.ts.map +1 -1
  107. package/src/utility/dependencies.js +4 -5
  108. package/src/utility/dependencies.js.map +1 -1
  109. package/src/utility/environment.d.ts.map +1 -1
  110. package/src/utility/environment.js.map +1 -1
  111. package/src/utility/error.d.ts.map +1 -1
  112. package/src/utility/error.js.map +1 -1
  113. package/src/utility/file-info.d.ts +1 -1
  114. package/src/utility/file-info.d.ts.map +1 -1
  115. package/src/utility/file-info.js +1 -1
  116. package/src/utility/file-info.js.map +1 -1
  117. package/src/utility/generation.d.ts +1 -1
  118. package/src/utility/generation.d.ts.map +1 -1
  119. package/src/utility/generation.js +2 -15
  120. package/src/utility/generation.js.map +1 -1
  121. package/src/utility/gitignore.d.ts.map +1 -1
  122. package/src/utility/gitignore.js +2 -2
  123. package/src/utility/gitignore.js.map +1 -1
  124. package/src/utility/index.d.ts +2 -2
  125. package/src/utility/index.d.ts.map +1 -1
  126. package/src/utility/index.js +2 -2
  127. package/src/utility/index.js.map +1 -1
  128. package/src/utility/loaders.d.ts +1 -1
  129. package/src/utility/loaders.d.ts.map +1 -1
  130. package/src/utility/loaders.js +6 -6
  131. package/src/utility/loaders.js.map +1 -1
  132. package/src/utility/logo.d.ts +1 -1
  133. package/src/utility/logo.d.ts.map +1 -1
  134. package/src/utility/logo.js.map +1 -1
  135. package/src/utility/matching-peers.d.ts +3 -1
  136. package/src/utility/matching-peers.d.ts.map +1 -1
  137. package/src/utility/matching-peers.js +8 -6
  138. package/src/utility/matching-peers.js.map +1 -1
  139. package/src/utility/migration/migration.d.ts.map +1 -1
  140. package/src/utility/migration/migration.js +3 -3
  141. package/src/utility/migration/migration.js.map +1 -1
  142. package/src/utility/modules.d.ts +1 -1
  143. package/src/utility/modules.d.ts.map +1 -1
  144. package/src/utility/modules.js +16 -16
  145. package/src/utility/modules.js.map +1 -1
  146. package/src/utility/monorepo.d.ts +9 -4
  147. package/src/utility/monorepo.d.ts.map +1 -1
  148. package/src/utility/monorepo.js +0 -2
  149. package/src/utility/monorepo.js.map +1 -1
  150. package/src/utility/package-manager-runner.d.ts +2 -3
  151. package/src/utility/package-manager-runner.d.ts.map +1 -1
  152. package/src/utility/package-manager-runner.js +1 -4
  153. package/src/utility/package-manager-runner.js.map +1 -1
  154. package/src/utility/package-version.d.ts +0 -1
  155. package/src/utility/package-version.d.ts.map +1 -1
  156. package/src/utility/package-version.js +3 -4
  157. package/src/utility/package-version.js.map +1 -1
  158. package/src/utility/question.d.ts.map +1 -1
  159. package/src/utility/question.js.map +1 -1
  160. package/src/utility/routes.d.ts.map +1 -1
  161. package/src/utility/routes.js +6 -6
  162. package/src/utility/routes.js.map +1 -1
  163. package/src/utility/sub-entry.d.ts.map +1 -1
  164. package/src/utility/sub-entry.js.map +1 -1
  165. package/src/utility/template-property.helper.d.ts.map +1 -1
  166. package/src/utility/template-property.helper.js +2 -2
  167. package/src/utility/template-property.helper.js.map +1 -1
  168. package/src/utility/update-imports.d.ts +1 -1
  169. package/src/utility/update-imports.d.ts.map +1 -1
  170. package/src/utility/update-imports.js +10 -14
  171. package/src/utility/update-imports.js.map +1 -1
  172. package/src/utility/update-pipes.d.ts.map +1 -1
  173. package/src/utility/update-pipes.js +5 -5
  174. package/src/utility/update-pipes.js.map +1 -1
  175. package/src/utility/wrapper.d.ts.map +1 -1
  176. package/src/utility/wrapper.js +12 -11
  177. package/src/utility/wrapper.js.map +1 -1
@@ -2,13 +2,16 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.registerDevtoolsToApplication = exports.injectServiceInMain = void 0;
4
4
  const schematics_1 = require("@angular-devkit/schematics");
5
- const ts = require("typescript");
6
5
  const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
7
- const index_1 = require("../../utility/index");
8
- const utility_1 = require("../../utility");
9
6
  const change_1 = require("@schematics/angular/utility/change");
7
+ const ts = require("typescript");
8
+ const collection_1 = require("../../utility/collection");
9
+ const file_info_1 = require("../../utility/file-info");
10
+ const loaders_1 = require("../../utility/loaders");
11
+ const modules_1 = require("../../utility/modules");
12
+ const add_imports_1 = require("../add-imports");
10
13
  const registerModule = (options) => (tree, context) => {
11
- const moduleFilePath = (0, index_1.getAppModuleFilePath)(tree, context, options.projectName);
14
+ const moduleFilePath = (0, modules_1.getAppModuleFilePath)(tree, context, options.projectName);
12
15
  if (!moduleFilePath) {
13
16
  return tree;
14
17
  }
@@ -18,8 +21,8 @@ const registerModule = (options) => (tree, context) => {
18
21
  return tree;
19
22
  }
20
23
  let recorder = tree.beginUpdate(moduleFilePath);
21
- const { moduleIndex } = (0, index_1.getModuleIndex)(sourceFile, sourceFileContent);
22
- const addImportToModuleFile = (name, file, moduleFunction) => recorder = (0, utility_1.addImportToModuleFile)(name, file, sourceFile, sourceFileContent, context, recorder, moduleFilePath, moduleIndex, moduleFunction);
24
+ const { moduleIndex } = (0, file_info_1.getModuleIndex)(sourceFile, sourceFileContent);
25
+ const addImportToModuleFile = (name, file, moduleFunction) => recorder = (0, modules_1.addImportToModuleFile)(name, file, sourceFile, sourceFileContent, context, recorder, moduleFilePath, moduleIndex, moduleFunction);
23
26
  addImportToModuleFile(options.moduleName, options.packageName, '.instrument({isActivatedOnBootstrap: true})');
24
27
  tree.commitUpdate(recorder);
25
28
  return tree;
@@ -32,7 +35,7 @@ const injectServiceInMain = (options) => (tree, context) => {
32
35
  if (!options.serviceName) {
33
36
  return tree;
34
37
  }
35
- const mainFilePath = (0, index_1.getMainFilePath)(tree, context, options.projectName);
38
+ const mainFilePath = (0, modules_1.getMainFilePath)(tree, context, options.projectName);
36
39
  if (!mainFilePath || !tree.exists(mainFilePath)) {
37
40
  return tree;
38
41
  }
@@ -44,38 +47,50 @@ const injectServiceInMain = (options) => (tree, context) => {
44
47
  if (!match) {
45
48
  return tree;
46
49
  }
47
- const sourceFile = ts.createSourceFile(mainFilePath, content, ts.ScriptTarget.ES2015, true);
48
50
  const recorder = tree.beginUpdate(mainFilePath);
49
51
  const changes = [];
52
+ changes.push(new change_1.InsertChange(mainFilePath, match.index + match[0].length, `
53
+ .then((m) => {
54
+ runInInjectionContext(m.injector, () => {
55
+ inject(${options.serviceName});
56
+ });
57
+ return m;
58
+ })`));
59
+ (0, change_1.applyToUpdateRecorder)(recorder, changes);
60
+ tree.commitUpdate(recorder);
61
+ const sourceFile = ts.createSourceFile(mainFilePath, content, ts.ScriptTarget.ES2015, true);
62
+ const importsToAdd = new Map();
50
63
  if (!(0, ast_utils_1.isImported)(sourceFile, options.serviceName, options.packageName)) {
51
- changes.push((0, ast_utils_1.insertImport)(sourceFile, mainFilePath, options.serviceName, options.packageName));
64
+ importsToAdd.set(options.packageName, [options.serviceName]);
52
65
  }
53
66
  if (!(0, ast_utils_1.isImported)(sourceFile, 'inject', '@angular/core')) {
54
- changes.push((0, ast_utils_1.insertImport)(sourceFile, mainFilePath, 'inject', '@angular/core'));
67
+ importsToAdd.set('@angular/core', ['inject']);
55
68
  }
56
69
  if (!(0, ast_utils_1.isImported)(sourceFile, 'runInInjectionContext', '@angular/core')) {
57
- changes.push((0, ast_utils_1.insertImport)(sourceFile, mainFilePath, 'runInInjectionContext', '@angular/core'));
70
+ const angularCoreImportsToAdd = importsToAdd.get('@angular/core');
71
+ if (angularCoreImportsToAdd) {
72
+ angularCoreImportsToAdd.push('runInInjectionContext');
73
+ }
74
+ else {
75
+ importsToAdd.set('@angular/core', ['runInInjectionContext']);
76
+ }
58
77
  }
59
- changes.push(new change_1.InsertChange(mainFilePath, match.index + match[0].length, `\n .then((m) => { runInInjectionContext(m.injector, () => { inject(${options.serviceName}); }); return m; })`));
60
- (0, change_1.applyToUpdateRecorder)(recorder, changes);
61
- tree.commitUpdate(recorder);
62
- return tree;
78
+ return (0, add_imports_1.addImportsRule)(mainFilePath, [...importsToAdd.entries()]
79
+ .map(([from, importNames]) => ({ from, importNames })))(tree, context);
63
80
  };
64
81
  exports.injectServiceInMain = injectServiceInMain;
65
82
  /**
66
83
  * Register Devtools to the application
67
- * @param tree
68
- * @param context
69
84
  * @param options
70
85
  */
71
86
  const registerDevtoolsToApplication = (options) => (tree, context) => {
72
- const workspace = (0, index_1.getWorkspaceConfig)(tree);
87
+ const workspace = (0, loaders_1.getWorkspaceConfig)(tree);
73
88
  const project = options.projectName ? workspace?.projects[options.projectName] : undefined;
74
89
  if (!workspace || !project || project.projectType !== 'application') {
75
90
  context.logger.warn(`Failed to determine the application to update, the devtool modules ${options.moduleName}.`);
76
91
  return tree;
77
92
  }
78
- const schematicConfig = (0, index_1.getDefaultOptionsForSchematic)(workspace, options.packageName, 'ng-add', options);
93
+ const schematicConfig = (0, collection_1.getDefaultOptionsForSchematic)(workspace, options.packageName, 'ng-add', options);
79
94
  if (!schematicConfig?.registerDevtool) {
80
95
  return tree;
81
96
  }
@@ -1 +1 @@
1
- {"version":3,"file":"devtools-registration.js","sourceRoot":"","sources":["../../../../src/rule-factories/dev-tools/devtools-registration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"devtools-registration.js","sourceRoot":"","sources":["../../../../src/rule-factories/dev-tools/devtools-registration.ts"],"names":[],"mappings":"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"}
@@ -6,8 +6,7 @@ interface ApplyEslintFixOption extends LinterOptions {
6
6
  }
7
7
  /**
8
8
  * Apply EsLint fix
9
- * @param prootPath Root path
10
- * @param _prootPath
9
+ * @param _prootPath Root path
11
10
  * @param extension List of file extensions to lint
12
11
  * @param options Linter options
13
12
  */
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,IAAI,EAAoB,KAAK,MAAM,EAAa,MAAM,4BAA4B,CAAC;AAEjH,OAAO,EAAiB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEjE,UAAU,oBAAqB,SAAQ,aAAa;IAClD,6CAA6C;IAC7C,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,IAAI,CAqEnH"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,IAAI,EAET,KAAK,MAAM,EAEZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,aAAa,EACd,MAAM,mBAAmB,CAAC;AAE3B,UAAU,oBAAqB,SAAQ,aAAa;IAClD,6CAA6C;IAC7C,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,IAAI,CA+EnH"}
@@ -1,13 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.applyEsLintFix = applyEsLintFix;
4
- const schematics_1 = require("@angular-devkit/schematics");
5
4
  const node_path_1 = require("node:path");
5
+ const schematics_1 = require("@angular-devkit/schematics");
6
6
  const index_1 = require("../../tasks/index");
7
7
  /**
8
8
  * Apply EsLint fix
9
- * @param prootPath Root path
10
- * @param _prootPath
9
+ * @param _prootPath Root path
11
10
  * @param extension List of file extensions to lint
12
11
  * @param options Linter options
13
12
  */
@@ -25,8 +24,12 @@ function applyEsLintFix(_prootPath = '/', extension = ['ts'], options) {
25
24
  };
26
25
  return (tree, context) => {
27
26
  const filesToBeLint = tree.actions
28
- .filter((a) => a.kind !== 'd')
27
+ .filter((a) => a.kind !== 'd' && extension.includes((0, node_path_1.extname)(a.path)))
29
28
  .map((action) => action.path.substring(1));
29
+ if (tree.root.subfiles.some((f) => /eslint\.config\.{m,c,}[jt]s/.test(f))) {
30
+ context.addTask(new index_1.EslintFixTask(Array.from(filesToBeLint), undefined, undefined, linterOptions), options?.dependencyTaskIds);
31
+ return tree;
32
+ }
30
33
  // directory of the deepest file
31
34
  let dir = tree.getDir((0, node_path_1.dirname)(filesToBeLint.reduce((acc, path) => {
32
35
  const level = path.split('/').length;
@@ -35,27 +38,23 @@ function applyEsLintFix(_prootPath = '/', extension = ['ts'], options) {
35
38
  }
36
39
  return acc;
37
40
  }, { level: 0, path: '' }).path));
38
- let eslintFile;
41
+ let eslintRcFile;
39
42
  do {
40
- eslintFile = dir.subfiles.find((f) => f.startsWith('.eslintrc'));
41
- if (eslintFile) {
42
- eslintFile = (0, node_path_1.join)(dir.path.substring(1), eslintFile);
43
+ eslintRcFile = dir.subfiles.find((f) => f.startsWith('.eslintrc'));
44
+ if (eslintRcFile) {
45
+ eslintRcFile = (0, node_path_1.join)(dir.path.substring(1), eslintRcFile);
43
46
  break;
44
47
  }
45
48
  dir = dir.parent;
46
49
  } while (dir !== null);
47
- if (dir === null || !eslintFile) {
50
+ if (dir === null || !eslintRcFile) {
48
51
  context.logger.warn(`Asked to run lint fixes, but could not find a eslintrc config file.
49
- You can consider to run later the following command to add otter linter rules: ng add @o3r/eslint-config-otter`);
52
+ You can consider to run later the following command to add otter linter rules: ng add @o3r/eslint-config`);
53
+ return tree;
50
54
  }
51
- const files = filesToBeLint.reduce((acc, filePath) => {
52
- if (extension.some((ext) => filePath.endsWith(`.${ext}`)) && dir && filePath.startsWith(dir.path.substring(1))) {
53
- acc.add(filePath);
54
- }
55
- return acc;
56
- }, new Set());
57
- if (files.size) {
58
- context.addTask(new index_1.EslintFixTask(Array.from(files), undefined, eslintFile, linterOptions), options?.dependencyTaskIds);
55
+ const files = new Set(filesToBeLint.filter((filePath) => filePath.startsWith(dir.path.substring(1))));
56
+ if (files.size > 0) {
57
+ context.addTask(new index_1.EslintFixTask(Array.from(files), undefined, eslintRcFile, linterOptions), options?.dependencyTaskIds);
59
58
  }
60
59
  return tree;
61
60
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/get-test-frameworks/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AASjF;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,gBAAgB,EAAE,eAAe,GAAG,IAAI,EAAE,OAAO,EAAE,gBAAgB,GAAG,uBAAuB,GAAG,SAAS,CAiBzI"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/get-test-frameworks/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,uBAAuB,EACvB,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAU1B;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,gBAAgB,EAAE,eAAe,GAAG,IAAI,EAAE,OAAO,EAAE,gBAAgB,GAAG,uBAAuB,GAAG,SAAS,CAiBzI"}
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getTestFramework = getTestFramework;
4
4
  const index_1 = require("../../utility/index");
5
5
  const testPackageMaps = {
6
- 'jest': ['jest'],
7
- 'jasmine': ['jasmine-core']
6
+ jest: ['jest'],
7
+ jasmine: ['jasmine-core']
8
8
  };
9
9
  /**
10
10
  * Get the test framework
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/get-test-frameworks/index.ts"],"names":[],"mappings":";;AAeA,4CAiBC;AA9BD,+CAA0D;AAG1D,MAAM,eAAe,GAA8C;IACjE,MAAM,EAAE,CAAC,MAAM,CAAC;IAChB,SAAS,EAAE,CAAC,cAAc,CAAC;CAC5B,CAAC;AAEF;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,gBAAwC,EAAE,OAAyB;IAClG,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC;QACpF,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,eAAe,CAAC,CAAC;YAClD,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC,CAAC,CAA4B,CAAC;AACvC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/get-test-frameworks/index.ts"],"names":[],"mappings":";;AAqBA,4CAiBC;AA/BD,+CAE6B;AAE7B,MAAM,eAAe,GAA8C;IACjE,IAAI,EAAE,CAAC,MAAM,CAAC;IACd,OAAO,EAAE,CAAC,cAAc,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,gBAAwC,EAAE,OAAyB;IAClG,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC;QACpF,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC;SACnC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,IAAI,CAAC;gBACH,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,eAAe,CAAC,CAAC;YAClD,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,EAAE,CAAC,CAAC,CAA4B,CAAC;AACvC,CAAC"}
@@ -1,11 +1,10 @@
1
1
  export * from './add-imports/index';
2
+ export * from './check-packages-peers/index';
3
+ export * from './dev-tools/index';
2
4
  export * from './eslint-fix/index';
3
- export * from '../interfaces/rule-factories';
4
5
  export * from './get-test-frameworks/index';
5
- export * from './check-packages-peers/index';
6
6
  export * from './ng-add/index';
7
7
  export * from './remove-packages/index';
8
8
  export * from './update-imports/index';
9
9
  export * from './vscode-extensions/index';
10
- export * from './dev-tools/index';
11
10
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}
@@ -2,13 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
4
  tslib_1.__exportStar(require("./add-imports/index"), exports);
5
+ tslib_1.__exportStar(require("./check-packages-peers/index"), exports);
6
+ tslib_1.__exportStar(require("./dev-tools/index"), exports);
5
7
  tslib_1.__exportStar(require("./eslint-fix/index"), exports);
6
- tslib_1.__exportStar(require("../interfaces/rule-factories"), exports);
7
8
  tslib_1.__exportStar(require("./get-test-frameworks/index"), exports);
8
- tslib_1.__exportStar(require("./check-packages-peers/index"), exports);
9
9
  tslib_1.__exportStar(require("./ng-add/index"), exports);
10
10
  tslib_1.__exportStar(require("./remove-packages/index"), exports);
11
11
  tslib_1.__exportStar(require("./update-imports/index"), exports);
12
12
  tslib_1.__exportStar(require("./vscode-extensions/index"), exports);
13
- tslib_1.__exportStar(require("./dev-tools/index"), exports);
14
13
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,6DAAmC;AACnC,uEAA6C;AAC7C,sEAA4C;AAC5C,uEAA6C;AAC7C,yDAA+B;AAC/B,kEAAwC;AACxC,iEAAuC;AACvC,oEAA0C;AAC1C,4DAAkC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,uEAA6C;AAC7C,4DAAkC;AAClC,6DAAmC;AACnC,sEAA4C;AAC5C,yDAA+B;AAC/B,kEAAwC;AACxC,iEAAuC;AACvC,oEAA0C"}
@@ -1,6 +1,6 @@
1
1
  import { Rule, type SchematicContext, type TaskId, Tree } from '@angular-devkit/schematics';
2
2
  import { NodeDependencyType } from '@schematics/angular/utility/dependencies';
3
- import { SupportedPackageManagers } from '../../utility';
3
+ import type { SupportedPackageManagers } from '../../utility';
4
4
  /**
5
5
  * Options to be passed to the ng add task
6
6
  */
@@ -34,6 +34,11 @@ export interface DependencyToAdd {
34
34
  ngAddOptions?: NgAddSchematicOptions;
35
35
  /** Determine if the dependency require to be installed */
36
36
  requireInstall?: boolean;
37
+ /**
38
+ * Enforce the usage of tilde instead of caret in a dependency range
39
+ * If not specified, the context option value will be used
40
+ */
41
+ enforceTildeRange?: boolean;
37
42
  }
38
43
  export interface SetupDependenciesOptions {
39
44
  /** Map of dependencies to install */
@@ -61,6 +66,11 @@ export interface SetupDependenciesOptions {
61
66
  scheduleTaskCallback?: (taskIds?: TaskId[]) => void;
62
67
  /** Working directory for the installation process only */
63
68
  workingDirectory?: string;
69
+ /**
70
+ * Enforce the usage of tilde instead of caret in a dependency range
71
+ * @default true
72
+ */
73
+ enforceTildeRange?: boolean;
64
74
  }
65
75
  /** Result of the Setup Dependencies task scheduling process */
66
76
  export interface SetupDependenciesResult {
@@ -84,6 +94,11 @@ export declare const hasSetupInformation: (context: SchematicContext) => context
84
94
  * @param exactO3rVersion Use a pinned version of the o3r package
85
95
  */
86
96
  export declare const getPackageInstallConfig: (packageJsonPath: string, tree: Tree, projectName?: string, devDependencyOnly?: boolean, exactO3rVersion?: boolean) => Record<string, DependencyToAdd>;
97
+ /**
98
+ * Replace the caret ranges by tilde ranges
99
+ * @param range Range to replace
100
+ */
101
+ export declare const enforceTildeRange: (range?: string) => string | undefined;
87
102
  /**
88
103
  * Setup dependency to a repository.
89
104
  * Will run manually the ngAdd schematics according to the parameters and install the packages if required
@@ -1 +1 @@
1
- {"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAAa,KAAK,gBAAgB,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAC9G,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAI9E,OAAO,EAAyE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAIhI;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,gCAAgC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,yEAAyE;IACzE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iDAAiD;IACjD,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,uDAAuD;IACvD,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,0DAA0D;IAC1D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC9C;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACjC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,sCAAsC;IACtC,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,sDAAsD;IACtD,oBAAoB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,+DAA+D;AAC/D,MAAM,WAAW,uBAAuB;IACtC,2DAA2D;IAC3D,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,YAAa,gBAAgB,KAAG,OAAO,IAAI,gBAAgB,GAAG;IAAE,iBAAiB,EAAE,uBAAuB,CAAA;CAEzI,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,MAAM,QAAQ,IAAI,gBAAgB,MAAM,sBAAsB,OAAO,oBAAoB,OAAO,KAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAiBzL,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,YAAa,wBAAwB,KAAG,IAoIrE,CAAC"}
1
+ {"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EAEJ,KAAK,gBAAgB,EACrB,KAAK,MAAM,EACX,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EACL,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAKlD,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,eAAe,CAAC;AASvB;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,gCAAgC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,yEAAyE;IACzE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iDAAiD;IACjD,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,uDAAuD;IACvD,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,0DAA0D;IAC1D,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,wBAAwB;IACvC,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC9C;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACjC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,sCAAsC;IACtC,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,sDAAsD;IACtD,oBAAoB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,+DAA+D;AAC/D,MAAM,WAAW,uBAAuB;IACtC,2DAA2D;IAC3D,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,YAAa,gBAAgB,KAAG,OAAO,IAAI,gBAAgB,GAAG;IAAE,iBAAiB,EAAE,uBAAuB,CAAA;CAEzI,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,MAAM,QAAQ,IAAI,gBAAgB,MAAM,sBAAsB,OAAO,oBAAoB,OAAO,KAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAiBzL,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,WAAY,MAAM,uBAE/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,YAAa,wBAAwB,KAAG,IAwIrE,CAAC"}
@@ -1,13 +1,14 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.setupDependencies = exports.getPackageInstallConfig = exports.hasSetupInformation = void 0;
3
+ exports.setupDependencies = exports.enforceTildeRange = exports.getPackageInstallConfig = exports.hasSetupInformation = void 0;
4
+ const node_fs_1 = require("node:fs");
5
+ const path = require("node:path");
4
6
  const schematics_1 = require("@angular-devkit/schematics");
7
+ const tasks_1 = require("@angular-devkit/schematics/tasks");
5
8
  const dependencies_1 = require("@schematics/angular/utility/dependencies");
6
- const path = require("node:path");
7
9
  const semver = require("semver");
8
- const utility_1 = require("../../utility");
9
- const tasks_1 = require("@angular-devkit/schematics/tasks");
10
- const node_fs_1 = require("node:fs");
10
+ const loaders_1 = require("../../utility/loaders");
11
+ const package_manager_runner_1 = require("../../utility/package-manager-runner");
11
12
  /**
12
13
  * Determine if the context has information regarding the setup dependencies process
13
14
  * @param context Schematic context
@@ -30,12 +31,12 @@ const getPackageInstallConfig = (packageJsonPath, tree, projectName, devDependen
30
31
  return {};
31
32
  }
32
33
  const packageJson = JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, { encoding: 'utf8' }));
33
- const workspaceProject = projectName ? (0, utility_1.getWorkspaceConfig)(tree)?.projects[projectName] : undefined;
34
+ const workspaceProject = projectName ? (0, loaders_1.getWorkspaceConfig)(tree)?.projects[projectName] : undefined;
34
35
  return {
35
36
  [packageJson.name]: {
36
37
  inManifest: [{
37
38
  range: `${exactO3rVersion ? '' : '~'}${packageJson.version}`,
38
- types: devDependencyOnly ? [dependencies_1.NodeDependencyType.Dev] : (0, utility_1.getProjectNewDependenciesTypes)(workspaceProject)
39
+ types: devDependencyOnly ? [dependencies_1.NodeDependencyType.Dev] : (0, loaders_1.getProjectNewDependenciesTypes)(workspaceProject)
39
40
  }],
40
41
  requireInstall: true,
41
42
  ngAddOptions: { exactO3rVersion: exactO3rVersion }
@@ -43,6 +44,14 @@ const getPackageInstallConfig = (packageJsonPath, tree, projectName, devDependen
43
44
  };
44
45
  };
45
46
  exports.getPackageInstallConfig = getPackageInstallConfig;
47
+ /**
48
+ * Replace the caret ranges by tilde ranges
49
+ * @param range Range to replace
50
+ */
51
+ const enforceTildeRange = (range) => {
52
+ return range?.replace(/\^/g, '~');
53
+ };
54
+ exports.enforceTildeRange = enforceTildeRange;
46
55
  /**
47
56
  * Setup dependency to a repository.
48
57
  * Will run manually the ngAdd schematics according to the parameters and install the packages if required
@@ -53,7 +62,7 @@ const setupDependencies = (options) => {
53
62
  const ngAddToRun = new Set(Object.keys(options.dependencies)
54
63
  .filter((dep) => options.ngAddToRun?.some((pattern) => typeof pattern === 'string' ? pattern === dep : pattern.test(dep))));
55
64
  const requiringInstallList = new Set(Object.entries(options.dependencies).filter(([, { requireInstall }]) => requireInstall).map(([dep]) => dep));
56
- const isInstallNeeded = () => options.skipInstall !== undefined ? !options.skipInstall : (ngAddToRun.size > 0 || requiringInstallList.size > 0);
65
+ const isInstallNeeded = () => options.skipInstall === undefined ? (ngAddToRun.size > 0 || requiringInstallList.size > 0) : !options.skipInstall;
57
66
  const editPackageJson = (packageJsonPath, packageToInstall, dependency, updateLists) => {
58
67
  return (tree, context) => {
59
68
  if (!tree.exists(packageJsonPath)) {
@@ -62,6 +71,10 @@ const setupDependencies = (options) => {
62
71
  }
63
72
  const packageJsonContent = tree.readJson(packageJsonPath);
64
73
  dependency.inManifest.forEach(({ range, types }) => {
74
+ const isTildeRangeEnforced = dependency.enforceTildeRange === undefined ? (options.enforceTildeRange === undefined || options.enforceTildeRange) : dependency.enforceTildeRange;
75
+ if (isTildeRangeEnforced) {
76
+ range = (0, exports.enforceTildeRange)(range);
77
+ }
65
78
  (types || [dependencies_1.NodeDependencyType.Default]).forEach((depType) => {
66
79
  if (packageJsonContent[depType]?.[packageToInstall]) {
67
80
  if (range && semver.validRange(range)) {
@@ -85,8 +98,8 @@ const setupDependencies = (options) => {
85
98
  ngAddToRun.delete(packageToInstall);
86
99
  requiringInstallList.delete(packageToInstall);
87
100
  }
88
- context.logger.warn(`The dependency ${packageToInstall} (${depType}) will not added ` +
89
- `because there is already this dependency with a defined range (${packageJsonContent[depType][packageToInstall]}) in targeted ${packageJsonPath}`);
101
+ context.logger.warn(`The dependency ${packageToInstall} (${depType}) will not added `
102
+ + `because there is already this dependency with a defined range (${packageJsonContent[depType][packageToInstall]}) in targeted ${packageJsonPath}`);
90
103
  }
91
104
  }
92
105
  else {
@@ -108,8 +121,8 @@ const setupDependencies = (options) => {
108
121
  };
109
122
  };
110
123
  const addDependencies = (tree) => {
111
- const workspaceConfig = (0, utility_1.getWorkspaceConfig)(tree);
112
- const workspaceProject = options.projectName && workspaceConfig?.projects?.[options.projectName] || undefined;
124
+ const workspaceConfig = (0, loaders_1.getWorkspaceConfig)(tree);
125
+ const workspaceProject = (options.projectName && workspaceConfig?.projects?.[options.projectName]) || undefined;
113
126
  const projectDirectory = workspaceProject?.root;
114
127
  return (0, schematics_1.chain)(Object.entries(options.dependencies)
115
128
  .map(([packageName, dependencyDetails]) => {
@@ -125,12 +138,14 @@ const setupDependencies = (options) => {
125
138
  }));
126
139
  };
127
140
  const runNgAddSchematics = (_, context) => {
128
- const packageManager = options.packageManager || (0, utility_1.getPackageManager)();
129
- const installId = isInstallNeeded() ? [
130
- context.addTask(new tasks_1.NodePackageInstallTask({ packageManager, quiet: true, workingDirectory: options.workingDirectory }), options.runAfterTasks)
131
- ] : undefined;
141
+ const packageManager = options.packageManager || (0, package_manager_runner_1.getPackageManager)();
142
+ const installId = isInstallNeeded()
143
+ ? [
144
+ context.addTask(new tasks_1.NodePackageInstallTask({ packageManager, quiet: true, workingDirectory: options.workingDirectory }), options.runAfterTasks)
145
+ ]
146
+ : undefined;
132
147
  if (installId !== undefined) {
133
- context.logger.debug(`Schedule the installation of the workspace (${ngAddToRun.size > 0 ? 'for: ' + [...ngAddToRun].join(', ') : options.skipInstall ? 'skipped' : 'forced'})`);
148
+ context.logger.debug(`Schedule the installation of the workspace (${ngAddToRun.size > 0 ? 'for: ' + [...ngAddToRun].join(', ') : (options.skipInstall ? 'skipped' : 'forced')})`);
134
149
  }
135
150
  const getOptions = (packageName, schema) => {
136
151
  const schemaOptions = schema?.description.schemaJson?.properties;
@@ -1 +1 @@
1
- {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- export * from './schematics-register';
2
1
  export * from './dependencies';
3
2
  export * from './ng-add.helpers';
3
+ export * from './schematics-register';
4
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
- tslib_1.__exportStar(require("./schematics-register"), exports);
5
4
  tslib_1.__exportStar(require("./dependencies"), exports);
6
5
  tslib_1.__exportStar(require("./ng-add.helpers"), exports);
6
+ tslib_1.__exportStar(require("./schematics-register"), exports);
7
7
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,gEAAsC;AACtC,yDAA+B;AAC/B,2DAAiC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,2DAAiC;AACjC,gEAAsC"}
@@ -1,4 +1,4 @@
1
- import { Rule } from '@angular-devkit/schematics';
1
+ import { type Rule } from '@angular-devkit/schematics';
2
2
  import type { NgAddPackageOptions } from '../../tasks/index';
3
3
  /**
4
4
  * Install via `ng add` a list of npm packages.
@@ -1 +1 @@
1
- {"version":3,"file":"ng-add.helpers.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,EAA+B,MAAM,4BAA4B,CAAC;AAO/G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAA;CAAE,EAAE,eAAe,SAAkB,GAAG,IAAI,CA0HzL"}
1
+ {"version":3,"file":"ng-add.helpers.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add.helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAqB3B;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAA;CAAE,EAAE,eAAe,SAAkB,GAAG,IAAI,CA8GzL"}