@o3r/schematics 11.6.0-prerelease.7 → 11.6.0-prerelease.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (173) hide show
  1. package/cli/environment.js +1 -0
  2. package/package.json +19 -14
  3. package/schematics/ng-add/index.d.ts.map +1 -1
  4. package/schematics/ng-add/index.js +6 -6
  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 +0 -2
  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 +1 -1
  52. package/src/rule-factories/ng-add/dependencies.d.ts.map +1 -1
  53. package/src/rule-factories/ng-add/dependencies.js +19 -16
  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.map +1 -1
  60. package/src/rule-factories/ng-add/ng-add.helpers.js +21 -21
  61. package/src/rule-factories/ng-add/ng-add.helpers.js.map +1 -1
  62. package/src/rule-factories/ng-add/schematics-register.d.ts.map +1 -1
  63. package/src/rule-factories/ng-add/schematics-register.js +36 -28
  64. package/src/rule-factories/ng-add/schematics-register.js.map +1 -1
  65. package/src/rule-factories/remove-packages/index.d.ts.map +1 -1
  66. package/src/rule-factories/remove-packages/index.js +9 -9
  67. package/src/rule-factories/remove-packages/index.js.map +1 -1
  68. package/src/rule-factories/update-imports/list-of-vars.js.map +1 -1
  69. package/src/rule-factories/update-imports/update-imports-with-scope.d.ts.map +1 -1
  70. package/src/rule-factories/update-imports/update-imports-with-scope.js +3 -2
  71. package/src/rule-factories/update-imports/update-imports-with-scope.js.map +1 -1
  72. package/src/rule-factories/update-imports/update-ts-imports.d.ts.map +1 -1
  73. package/src/rule-factories/update-imports/update-ts-imports.js +3 -3
  74. package/src/rule-factories/update-imports/update-ts-imports.js.map +1 -1
  75. package/src/rule-factories/vscode-extensions/index.d.ts.map +1 -1
  76. package/src/rule-factories/vscode-extensions/index.js +5 -5
  77. package/src/rule-factories/vscode-extensions/index.js.map +1 -1
  78. package/src/tasks/eslint/index.d.ts +1 -1
  79. package/src/tasks/eslint/index.d.ts.map +1 -1
  80. package/src/tasks/eslint/index.js +2 -2
  81. package/src/tasks/eslint/index.js.map +1 -1
  82. package/src/tasks/link/index.d.ts.map +1 -1
  83. package/src/tasks/link/index.js.map +1 -1
  84. package/src/tasks/ng-add/index.d.ts.map +1 -1
  85. package/src/tasks/package-manager/interfaces.d.ts.map +1 -1
  86. package/src/tasks/package-manager/npm-exec.d.ts.map +1 -1
  87. package/src/tasks/package-manager/npm-exec.js.map +1 -1
  88. package/src/tasks/package-manager/npm-install.d.ts.map +1 -1
  89. package/src/tasks/package-manager/npm-install.js +1 -1
  90. package/src/tasks/package-manager/npm-install.js.map +1 -1
  91. package/src/tasks/package-manager/npm-run.d.ts.map +1 -1
  92. package/src/tasks/package-manager/npm-run.js.map +1 -1
  93. package/src/utility/ast.d.ts.map +1 -1
  94. package/src/utility/ast.js +12 -15
  95. package/src/utility/ast.js.map +1 -1
  96. package/src/utility/builder.d.ts.map +1 -1
  97. package/src/utility/builder.js.map +1 -1
  98. package/src/utility/collection.d.ts.map +1 -1
  99. package/src/utility/collection.js +2 -3
  100. package/src/utility/collection.js.map +1 -1
  101. package/src/utility/component.d.ts.map +1 -1
  102. package/src/utility/component.js +2 -2
  103. package/src/utility/component.js.map +1 -1
  104. package/src/utility/dependencies.d.ts +1 -1
  105. package/src/utility/dependencies.d.ts.map +1 -1
  106. package/src/utility/dependencies.js +4 -5
  107. package/src/utility/dependencies.js.map +1 -1
  108. package/src/utility/environment.d.ts.map +1 -1
  109. package/src/utility/environment.js.map +1 -1
  110. package/src/utility/error.d.ts.map +1 -1
  111. package/src/utility/error.js.map +1 -1
  112. package/src/utility/file-info.d.ts +1 -1
  113. package/src/utility/file-info.d.ts.map +1 -1
  114. package/src/utility/file-info.js +1 -1
  115. package/src/utility/file-info.js.map +1 -1
  116. package/src/utility/generation.d.ts.map +1 -1
  117. package/src/utility/generation.js +2 -15
  118. package/src/utility/generation.js.map +1 -1
  119. package/src/utility/gitignore.d.ts.map +1 -1
  120. package/src/utility/gitignore.js +2 -2
  121. package/src/utility/gitignore.js.map +1 -1
  122. package/src/utility/index.d.ts +2 -2
  123. package/src/utility/index.d.ts.map +1 -1
  124. package/src/utility/index.js +2 -2
  125. package/src/utility/index.js.map +1 -1
  126. package/src/utility/loaders.d.ts +1 -1
  127. package/src/utility/loaders.d.ts.map +1 -1
  128. package/src/utility/loaders.js +6 -6
  129. package/src/utility/loaders.js.map +1 -1
  130. package/src/utility/logo.d.ts.map +1 -1
  131. package/src/utility/logo.js.map +1 -1
  132. package/src/utility/matching-peers.d.ts.map +1 -1
  133. package/src/utility/matching-peers.js +3 -3
  134. package/src/utility/matching-peers.js.map +1 -1
  135. package/src/utility/migration/migration.d.ts.map +1 -1
  136. package/src/utility/migration/migration.js +3 -3
  137. package/src/utility/migration/migration.js.map +1 -1
  138. package/src/utility/modules.d.ts +1 -1
  139. package/src/utility/modules.d.ts.map +1 -1
  140. package/src/utility/modules.js +16 -16
  141. package/src/utility/modules.js.map +1 -1
  142. package/src/utility/monorepo.d.ts +0 -1
  143. package/src/utility/monorepo.d.ts.map +1 -1
  144. package/src/utility/monorepo.js +0 -2
  145. package/src/utility/monorepo.js.map +1 -1
  146. package/src/utility/package-manager-runner.d.ts +2 -3
  147. package/src/utility/package-manager-runner.d.ts.map +1 -1
  148. package/src/utility/package-manager-runner.js +1 -4
  149. package/src/utility/package-manager-runner.js.map +1 -1
  150. package/src/utility/package-version.d.ts +0 -1
  151. package/src/utility/package-version.d.ts.map +1 -1
  152. package/src/utility/package-version.js +3 -4
  153. package/src/utility/package-version.js.map +1 -1
  154. package/src/utility/question.d.ts.map +1 -1
  155. package/src/utility/question.js.map +1 -1
  156. package/src/utility/routes.d.ts.map +1 -1
  157. package/src/utility/routes.js +6 -6
  158. package/src/utility/routes.js.map +1 -1
  159. package/src/utility/sub-entry.d.ts.map +1 -1
  160. package/src/utility/sub-entry.js.map +1 -1
  161. package/src/utility/template-property.helper.d.ts.map +1 -1
  162. package/src/utility/template-property.helper.js +2 -2
  163. package/src/utility/template-property.helper.js.map +1 -1
  164. package/src/utility/update-imports.d.ts +1 -1
  165. package/src/utility/update-imports.d.ts.map +1 -1
  166. package/src/utility/update-imports.js +10 -14
  167. package/src/utility/update-imports.js.map +1 -1
  168. package/src/utility/update-pipes.d.ts.map +1 -1
  169. package/src/utility/update-pipes.js +5 -5
  170. package/src/utility/update-pipes.js.map +1 -1
  171. package/src/utility/wrapper.d.ts.map +1 -1
  172. package/src/utility/wrapper.js +12 -11
  173. package/src/utility/wrapper.js.map +1 -1
package/src/rule-factories/ng-add/schematics-register.js CHANGED
@@ -37,26 +37,30 @@ function setupSchematicsParamsForProject(schematicsDefaultParams, projectName, o
37
37
  }
38
38
  Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
39
39
  workspace.schematics ||= {};
40
- workspace.schematics[schematicName] = overrideValue ? {
41
- ...workspace.schematics[schematicName],
42
- ...defaultParams
43
- } : {
44
- ...defaultParams,
45
- ...workspace.schematics[schematicName]
46
- };
40
+ workspace.schematics[schematicName] = overrideValue
41
+ ? {
42
+ ...workspace.schematics[schematicName],
43
+ ...defaultParams
44
+ }
45
+ : {
46
+ ...defaultParams,
47
+ ...workspace.schematics[schematicName]
48
+ };
47
49
  });
48
50
  if (projectName && workspace.projects[projectName]) {
49
51
  const project = workspace.projects[projectName];
50
52
  Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
51
53
  project.schematics ||= {};
52
54
  if (project.schematics[schematicName]) {
53
- project.schematics[schematicName] = overrideValue ? {
54
- ...project.schematics[schematicName],
55
- ...defaultParams
56
- } : {
57
- ...defaultParams,
58
- ...project.schematics[schematicName]
59
- };
55
+ project.schematics[schematicName] = overrideValue
56
+ ? {
57
+ ...project.schematics[schematicName],
58
+ ...defaultParams
59
+ }
60
+ : {
61
+ ...defaultParams,
62
+ ...project.schematics[schematicName]
63
+ };
60
64
  }
61
65
  });
62
66
  }
@@ -79,24 +83,28 @@ function setupSchematicsDefaultParams(schematicsDefaultParams, overrideValue = f
79
83
  }
80
84
  workspace.schematics ||= {};
81
85
  Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
82
- workspace.schematics[schematicName] = overrideValue ? {
83
- ...workspace.schematics[schematicName],
84
- ...defaultParams
85
- } : {
86
- ...defaultParams,
87
- ...workspace.schematics[schematicName]
88
- };
86
+ workspace.schematics[schematicName] = overrideValue
87
+ ? {
88
+ ...workspace.schematics[schematicName],
89
+ ...defaultParams
90
+ }
91
+ : {
92
+ ...defaultParams,
93
+ ...workspace.schematics[schematicName]
94
+ };
89
95
  });
90
96
  Object.values(workspace.projects).forEach((project) => {
91
97
  Object.entries(schematicsDefaultParams).forEach(([schematicName, defaultParams]) => {
92
98
  if (project.schematics?.[schematicName]) {
93
- project.schematics[schematicName] = overrideValue ? {
94
- ...project.schematics[schematicName],
95
- ...defaultParams
96
- } : {
97
- ...defaultParams,
98
- ...project.schematics[schematicName]
99
- };
99
+ project.schematics[schematicName] = overrideValue
100
+ ? {
101
+ ...project.schematics[schematicName],
102
+ ...defaultParams
103
+ }
104
+ : {
105
+ ...defaultParams,
106
+ ...project.schematics[schematicName]
107
+ };
100
108
  }
101
109
  });
102
110
  });
package/src/rule-factories/ng-add/schematics-register.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schematics-register.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/schematics-register.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schematics-register.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/schematics-register.ts"],"names":[],"mappings":"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"}
package/src/rule-factories/remove-packages/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/remove-packages/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAGzE;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE,eAAe,SAAkB,UAC5E,IAAI,YAAY,gBAAgB,kEAqB/C"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/remove-packages/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE,eAAe,SAAkB,UAQ5E,IAAI,YAAY,gBAAgB,kEAa/C"}
package/src/rule-factories/remove-packages/index.js CHANGED
@@ -7,18 +7,18 @@ exports.removePackages = removePackages;
7
7
  * @param packageJsonPath The path of the package json file from which the deps will be removed
8
8
  */
9
9
  function removePackages(packagesToRemove, packageJsonPath = '/package.json') {
10
+ const filterDeps = (acc = {}, [pName, pVersion]) => {
11
+ if (!packagesToRemove.includes(pName)) {
12
+ acc[pName] = pVersion;
13
+ }
14
+ return acc;
15
+ };
10
16
  return (tree, _context) => {
11
- const filterDeps = (acc = {}, [pName, pVersion]) => {
12
- if (!packagesToRemove.includes(pName)) {
13
- acc[pName] = pVersion;
14
- }
15
- return acc;
16
- };
17
17
  if (tree.exists(packageJsonPath)) {
18
18
  const packageJson = JSON.parse(tree.read(packageJsonPath).toString());
19
- packageJson.dependencies &&= Object.entries(packageJson.dependencies).reduce(filterDeps, {});
20
- packageJson.devDependencies &&= Object.entries(packageJson.devDependencies).reduce(filterDeps, {});
21
- packageJson.peerDependencies &&= Object.entries(packageJson.peerDependencies).reduce(filterDeps, {});
19
+ packageJson.dependencies &&= Object.entries(packageJson.dependencies).reduce((acc, dep) => filterDeps(acc, dep), {});
20
+ packageJson.devDependencies &&= Object.entries(packageJson.devDependencies).reduce((acc, dep) => filterDeps(acc, dep), {});
21
+ packageJson.peerDependencies &&= Object.entries(packageJson.peerDependencies).reduce((acc, dep) => filterDeps(acc, dep), {});
22
22
  tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
23
23
  }
24
24
  return tree;
package/src/rule-factories/remove-packages/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/remove-packages/index.ts"],"names":[],"mappings":";;AAQA,wCAsBC;AA3BD;;;;GAIG;AACH,SAAgB,cAAc,CAAC,gBAA0B,EAAE,eAAe,GAAG,eAAe;IAC1F,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAEhD,MAAM,UAAU,GAAG,CAAC,MAA0C,EAAE,EAAE,CAAC,KAAK,EAAE,QAAQ,CAA+B,EAAE,EAAE;YACnH,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtC,GAAG,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;YACxB,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,MAAM,WAAW,GAAgB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEpF,WAAW,CAAC,YAAY,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC7F,WAAW,CAAC,eAAe,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACnG,WAAW,CAAC,gBAAgB,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAErG,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/remove-packages/index.ts"],"names":[],"mappings":";;AAaA,wCAqBC;AA1BD;;;;GAIG;AACH,SAAgB,cAAc,CAAC,gBAA0B,EAAE,eAAe,GAAG,eAAe;IAC1F,MAAM,UAAU,GAAG,CAAC,MAA0C,EAAE,EAAE,CAAC,KAAK,EAAE,QAAQ,CAA+B,EAAE,EAAE;QACnH,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,GAAG,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;QACxB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,MAAM,WAAW,GAAgB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEpF,WAAW,CAAC,YAAY,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YACrH,WAAW,CAAC,eAAe,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3H,WAAW,CAAC,gBAAgB,KAAK,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAE7H,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
package/src/rule-factories/update-imports/list-of-vars.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"list-of-vars.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/list-of-vars.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"list-of-vars.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/list-of-vars.ts"],"names":[],"mappings":";;;AAYa,QAAA,qBAAqB,GAA+B;IAC/D,QAAQ;IACR,EAAE,KAAK,EAAE,oBAAoB,EAAE,IAAI,EAAE,KAAK,EAAE;IAC5C,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE;IACpC,EAAE,KAAK,EAAE,8BAA8B,EAAE,IAAI,EAAE,KAAK,EAAE;IACtD,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE;IAC5C,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,UAAU,EAAE;IAC9C,EAAE,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,KAAK,EAAE;IAC3C,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE;IAChC,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE;IAC3C,iBAAiB;IACjB,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE;IAC1C,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE;IAC7C,oBAAoB;IACpB,EAAE,KAAK,EAAE,0BAA0B,EAAE,IAAI,EAAE,UAAU,EAAE;IACvD,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE;IAC7C,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,UAAU,EAAE;IAC7C,EAAE,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,UAAU,EAAE;IAClD,EAAE,KAAK,EAAE,wBAAwB,EAAE,IAAI,EAAE,UAAU,EAAE;IACrD,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE;IAC/D,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE;IAC1D,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE;IAC9D,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE;IACpE,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE;IAC1E,mBAAmB;IACnB,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,wBAAwB,EAAE;IAC9E,EAAE,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,0BAA0B,EAAE;IAClF,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE;IAC5E,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE;IACxE,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE;IAChF,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,sBAAsB,EAAE;IAC1E,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE;IAC5E,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE;IACtE,sBAAsB;IACtB,EAAE,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,UAAU,EAAE;IACnD,EAAE,KAAK,EAAE,2BAA2B,EAAE,IAAI,EAAE,UAAU,EAAE;IACxD,qBAAqB;IACrB,EAAE,KAAK,EAAE,uBAAuB,EAAE,IAAI,EAAE,KAAK,EAAE;IAC/C,EAAE,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,KAAK,EAAE;CAC9C,CAAC"}
package/src/rule-factories/update-imports/update-imports-with-scope.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-imports-with-scope.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-imports-with-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAE1E,OAAO,EAAyB,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAIjF;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,SAAiB,EAAE,eAAe,GAAE,wBAAwB,EAA0B,EAAE,QAAQ,UAAQ,GAAG,IAAI,CAmB7K"}
1
+ {"version":3,"file":"update-imports-with-scope.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-imports-with-scope.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAEL,wBAAwB,EACzB,MAAM,gBAAgB,CAAC;AAIxB;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,SAAiB,EAAE,eAAe,GAAE,wBAAwB,EAA0B,EAAE,QAAQ,UAAQ,GAAG,IAAI,CAmB7K"}
package/src/rule-factories/update-imports/update-imports-with-scope.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateSassImports = updateSassImports;
4
4
  const index_1 = require("../../utility/index");
5
5
  const list_of_vars_1 = require("./list-of-vars");
6
- const imports = new RegExp(/^@import\s+['"]~?@(o3r|otter)\/styling.*\s*/, 'gm');
6
+ const imports = new RegExp(/^@import\s+["']~?@(o3r|otter)\/styling.*\s*/, 'gm');
7
7
  /**
8
8
  * Update SASS imports to use a scoped dependency
9
9
  * @param alias The name of the otter styling package
@@ -16,10 +16,11 @@ function updateSassImports(alias, dependencyName = '@o3r/styling', exposedElemen
16
16
  const files = fromRoot ? (0, index_1.getFilesWithExtensionFromTree)(tree, 'scss') : (0, index_1.getFilesFromRootOfWorkspaceProjects)(tree, 'scss');
17
17
  files.forEach((file) => {
18
18
  let content = tree.read(file).toString();
19
+ // eslint-disable-next-line unicorn/prefer-regexp-test -- regexp with `g` flag should not use `RegExp.test` in a loop
19
20
  if (content.match(imports)) {
20
21
  const contentWithoutImports = content.replace(imports, '');
21
22
  content = `@use '${dependencyName}' as ${alias};\n${contentWithoutImports}`;
22
- exposedElements.forEach(elem => {
23
+ exposedElements.forEach((elem) => {
23
24
  const elemRegex = new RegExp(`(?<![\\w\\d-]|o3r\\.)${elem.type === 'var' ? '\\' : ''}${elem.value}((?![\\w\\d-])(?!(\\s*\\:)))`, 'g');
24
25
  content = content.replace(elemRegex, `${alias}.${(elem.replacement || elem.value)}`);
25
26
  });
package/src/rule-factories/update-imports/update-imports-with-scope.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-imports-with-scope.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-imports-with-scope.ts"],"names":[],"mappings":";;AAaA,8CAmBC;AA/BD,+CAAyG;AACzG,iDAAiF;AAEjF,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,6CAA6C,EAAE,IAAI,CAAC,CAAC;AAEhF;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,KAAa,EAAE,cAAc,GAAG,cAAc,EAAE,kBAA8C,oCAAqB,EAAE,QAAQ,GAAG,KAAK;IACrK,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAEhD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,qCAA6B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,2CAAmC,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzH,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,QAAQ,EAAE,CAAC;YAC1C,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3D,OAAO,GAAG,SAAS,cAAc,QAAQ,KAAK,MAAM,qBAAqB,EAAE,CAAC;gBAC5E,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;oBAC7B,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,wBAAwB,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,8BAA8B,EAAE,GAAG,CAAC,CAAC;oBACtI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvF,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"update-imports-with-scope.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-imports-with-scope.ts"],"names":[],"mappings":";;AAuBA,8CAmBC;AArCD,+CAG6B;AAC7B,iDAGwB;AAExB,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,6CAA6C,EAAE,IAAI,CAAC,CAAC;AAEhF;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,KAAa,EAAE,cAAc,GAAG,cAAc,EAAE,kBAA8C,oCAAqB,EAAE,QAAQ,GAAG,KAAK;IACrK,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,qCAA6B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,2CAAmC,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzH,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,QAAQ,EAAE,CAAC;YAC1C,qHAAqH;YACrH,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC3D,OAAO,GAAG,SAAS,cAAc,QAAQ,KAAK,MAAM,qBAAqB,EAAE,CAAC;gBAC5E,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC/B,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,wBAAwB,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,8BAA8B,EAAE,GAAG,CAAC,CAAC;oBACtI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvF,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
package/src/rule-factories/update-imports/update-ts-imports.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-ts-imports.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,OAAO,EAAsE,cAAc,EAAuB,MAAM,qBAAqB,CAAC;AAE9I;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,GAAE,cAAmB,EAAE,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EAAE,QAAQ,UAAQ,GAAG,IAAI,CA4BnI"}
1
+ {"version":3,"file":"update-ts-imports.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAGL,cAAc,EAEf,MAAM,qBAAqB,CAAC;AAI7B;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,GAAE,cAAmB,EAAE,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EAAE,QAAQ,UAAQ,GAAG,IAAI,CA0BnI"}
package/src/rule-factories/update-imports/update-ts-imports.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateImports = updateImports;
4
4
  const ts = require("typescript");
5
5
  const index_1 = require("../../utility/index");
6
+ const escapeRegExp = (str) => str.replace(/[$()*+./?[\\\]^{|}-]/g, '\\$&');
6
7
  /**
7
8
  * Update imports based on mapping
8
9
  * @param mapImports Map of the import to replace
@@ -13,10 +14,9 @@ function updateImports(mapImports = {}, renamedPackages = {}, fromRoot = false)
13
14
  return (tree, context) => {
14
15
  const files = fromRoot ? (0, index_1.getFilesWithExtensionFromTree)(tree, 'ts') : (0, index_1.getSourceFilesFromWorkspaceProjects)(tree);
15
16
  // exact match on import path
16
- const escapeRegExp = (str) => str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
17
- const importsRegexp = new RegExp(`^(${Object.keys(mapImports).map(escapeRegExp).join('|')})$`);
17
+ const importsRegexp = new RegExp(`^(${Object.keys(mapImports).map((str) => escapeRegExp(str)).join('|')})$`);
18
18
  // match the import path starting with the package to be renamed
19
- const renamePackagesRegexp = new RegExp(`^(${Object.keys(renamedPackages).map(escapeRegExp).join('|')})`);
19
+ const renamePackagesRegexp = new RegExp(`^(${Object.keys(renamedPackages).map((str) => escapeRegExp(str)).join('|')})`);
20
20
  let nbOfUnResolvedImports = 0;
21
21
  files.forEach((file) => {
22
22
  const sourceFile = ts.createSourceFile(file, tree.readText(file), ts.ScriptTarget.ES2015, true);
package/src/rule-factories/update-imports/update-ts-imports.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-ts-imports.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":";;AAUA,sCA4BC;AArCD,iCAAiC;AACjC,+CAA8I;AAE9I;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,aAA6B,EAAE,EAAE,kBAA0C,EAAE,EAAE,QAAQ,GAAG,KAAK;IAE3H,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,qCAA6B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,2CAAmC,EAAC,IAAI,CAAC,CAAC;QAE/G,6BAA6B;QAC7B,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;QACnF,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/F,gEAAgE;QAChE,MAAM,oBAAoB,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1G,IAAI,qBAAqB,GAAG,CAAC,CAAC;QAE9B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,IAAI,EACJ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EACnB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;YACF,qBAAqB,IAAI,IAAA,2BAAmB,EAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,oBAAoB,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;QACnJ,CAAC,CAAC,CAAC;QAEH,IAAI,qBAAqB,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,qBAAqB,yEAAyE,CAAC,CAAC;QACzK,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"update-ts-imports.js","sourceRoot":"","sources":["../../../../src/rule-factories/update-imports/update-ts-imports.ts"],"names":[],"mappings":";;AAmBA,sCA0BC;AA1CD,iCAAiC;AACjC,+CAK6B;AAE7B,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AAEnF;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,aAA6B,EAAE,EAAE,kBAA0C,EAAE,EAAE,QAAQ,GAAG,KAAK;IAC3H,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,qCAA6B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,2CAAmC,EAAC,IAAI,CAAC,CAAC;QAE/G,6BAA6B;QAC7B,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC7G,gEAAgE;QAChE,MAAM,oBAAoB,GAAG,IAAI,MAAM,CAAC,KAAK,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxH,IAAI,qBAAqB,GAAG,CAAC,CAAC;QAE9B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,IAAI,EACJ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EACnB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;YACF,qBAAqB,IAAI,IAAA,2BAAmB,EAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,oBAAoB,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;QACnJ,CAAC,CAAC,CAAC;QAEH,IAAI,qBAAqB,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,qBAAqB,yEAAyE,CAAC,CAAC;QACzK,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
package/src/rule-factories/vscode-extensions/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/vscode-extensions/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAE/E;;;GAGG;AACH,eAAO,MAAM,wBAAwB,oBAAqB,MAAM,EAAE,KAAG,IAepE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/vscode-extensions/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,wBAAwB,oBAAqB,MAAM,EAAE,KAAG,IAepE,CAAC"}
package/src/rule-factories/vscode-extensions/index.js CHANGED
@@ -8,16 +8,16 @@ exports.addVsCodeRecommendations = void 0;
8
8
  const addVsCodeRecommendations = (recommendations) => {
9
9
  const extensionFile = '/.vscode/extensions.json';
10
10
  return (tree, context) => {
11
- if (!tree.exists(extensionFile)) {
12
- tree.create(extensionFile, JSON.stringify({ recommendations }, null, 2));
13
- context.logger.debug(`Create ${extensionFile} with recommendations: ${recommendations.join(', ')}`);
14
- }
15
- else {
11
+ if (tree.exists(extensionFile)) {
16
12
  const extensions = tree.readJson(extensionFile);
17
13
  extensions.recommendations = Array.from(new Set([...(extensions.recommendations || []), ...recommendations]));
18
14
  tree.overwrite(extensionFile, JSON.stringify(extensions, null, 2));
19
15
  context.logger.debug(`Updated ${extensionFile} with recommendations: ${recommendations.join(', ')}`);
20
16
  }
17
+ else {
18
+ tree.create(extensionFile, JSON.stringify({ recommendations }, null, 2));
19
+ context.logger.debug(`Create ${extensionFile} with recommendations: ${recommendations.join(', ')}`);
20
+ }
21
21
  return tree;
22
22
  };
23
23
  };
package/src/rule-factories/vscode-extensions/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/vscode-extensions/index.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACI,MAAM,wBAAwB,GAAG,CAAC,eAAyB,EAAQ,EAAE;IAC1E,MAAM,aAAa,GAAG,0BAA0B,CAAC;IAEjD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACzE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,aAAa,0BAA0B,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAkC,CAAC;YACjF,UAAU,CAAC,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YAC9G,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACnE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,aAAa,0BAA0B,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvG,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,wBAAwB,4BAenC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/vscode-extensions/index.ts"],"names":[],"mappings":";;;AAMA;;;GAGG;AACI,MAAM,wBAAwB,GAAG,CAAC,eAAyB,EAAQ,EAAE;IAC1E,MAAM,aAAa,GAAG,0BAA0B,CAAC;IAEjD,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAkC,CAAC;YACjF,UAAU,CAAC,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;YAC9G,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACnE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,aAAa,0BAA0B,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvG,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACzE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,aAAa,0BAA0B,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,wBAAwB,4BAenC"}
package/src/tasks/eslint/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { TaskConfiguration, TaskConfigurationGenerator } from '@angular-devkit/schematics';
2
- import { NodePackageTaskOptions } from '@angular-devkit/schematics/tasks/package-manager/options';
3
2
  import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
3
+ import { NodePackageTaskOptions } from '@angular-devkit/schematics/tasks/package-manager/options';
4
4
  import type { WorkspaceSchema } from '../../interfaces';
5
5
  /**
6
6
  * Linter options
package/src/tasks/eslint/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAEnH,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,mCAAmC;IACnC,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,2BAA2B;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,aAAc,SAAQ,sBAAuB,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAGlG,KAAK,EAAE,MAAM,EAAE;IAAS,gBAAgB,CAAC,EAAE,MAAM;IAAS,UAAU,CAAC,EAAE,MAAM;IAFzF,aAAa,EAAE,aAAa,CAAC;gBAEjB,KAAK,EAAE,MAAM,EAAE,EAAS,gBAAgB,CAAC,EAAE,MAAM,YAAA,EAAS,UAAU,CAAC,EAAE,MAAM,YAAA,EAAE,OAAO,CAAC,EAAE,aAAa;IAWzH,kBAAkB;IACX,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAqBpE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,sBAAsB,EACvB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAEL,sBAAsB,EACvB,MAAM,0DAA0D,CAAC;AAClE,OAAO,KAAK,EACV,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAK1B;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,mCAAmC;IACnC,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,2BAA2B;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,aAAc,SAAQ,sBAAuB,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAGlG,KAAK,EAAE,MAAM,EAAE;IAAS,gBAAgB,CAAC,EAAE,MAAM;IAAS,UAAU,CAAC,EAAE,MAAM;IAFzF,aAAa,EAAE,aAAa,CAAC;gBAEjB,KAAK,EAAE,MAAM,EAAE,EAAS,gBAAgB,CAAC,EAAE,MAAM,YAAA,EAAS,UAAU,CAAC,EAAE,MAAM,YAAA,EAAE,OAAO,CAAC,EAAE,aAAa;IAWzH,kBAAkB;IACX,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAqBpE"}
package/src/tasks/eslint/index.js CHANGED
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.EslintFixTask = void 0;
4
+ const tasks_1 = require("@angular-devkit/schematics/tasks");
4
5
  const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
5
6
  const package_manager_runner_1 = require("../../utility/package-manager-runner");
6
- const tasks_1 = require("@angular-devkit/schematics/tasks");
7
7
  class EslintFixTask extends tasks_1.NodePackageInstallTask {
8
8
  constructor(files, workingDirectory, configFile, options) {
9
9
  super({
@@ -30,7 +30,7 @@ class EslintFixTask extends tasks_1.NodePackageInstallTask {
30
30
  'exec',
31
31
  'eslint',
32
32
  ...this.files,
33
- ...(this.packageName !== 'npm' ? [] : ['--']),
33
+ ...(this.packageName === 'npm' ? ['--'] : []),
34
34
  '--fix',
35
35
  ...(this.linterOptions?.hideWarnings ? ['--quiet'] : []),
36
36
  ...(this.configFile ? ['--config', this.configFile] : []),
package/src/tasks/eslint/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,iFAAyE;AACzE,4DAA0E;AAyB1E,MAAa,aAAc,SAAQ,8BAAsB;IAGvD,YAAmB,KAAe,EAAS,gBAAyB,EAAS,UAAmB,EAAE,OAAuB;QACvH,KAAK,CAAC;YACJ,cAAc,EAAE,IAAA,0CAAiB,EAAC,OAAO,CAAC;SAC3C,CAAC,CAAC;QAHc,UAAK,GAAL,KAAK,CAAU;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAAS,eAAU,GAAV,UAAU,CAAS;QAI9F,IAAI,CAAC,aAAa,GAAG;YACnB,eAAe,EAAE,IAAI;YACrB,YAAY,EAAE,IAAI;YAClB,GAAG,OAAO;SACX,CAAC;IACJ,CAAC;IAED,kBAAkB;IACX,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,KAAK;gBACZ,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE;oBACX,MAAM;oBACN,QAAQ;oBACR,GAAG,IAAI,CAAC,KAAK;oBACb,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBAC7C,OAAO;oBACP,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzD,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9D,CAAC,IAAI,CAAC,GAAG,CAAC;gBACX,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AApCD,sCAoCC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":";;;AAIA,4DAE0C;AAC1C,sFAGkE;AAIlE,iFAE8C;AAwB9C,MAAa,aAAc,SAAQ,8BAAsB;IAGvD,YAAmB,KAAe,EAAS,gBAAyB,EAAS,UAAmB,EAAE,OAAuB;QACvH,KAAK,CAAC;YACJ,cAAc,EAAE,IAAA,0CAAiB,EAAC,OAAO,CAAC;SAC3C,CAAC,CAAC;QAHc,UAAK,GAAL,KAAK,CAAU;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAAS,eAAU,GAAV,UAAU,CAAS;QAI9F,IAAI,CAAC,aAAa,GAAG;YACnB,eAAe,EAAE,IAAI;YACrB,YAAY,EAAE,IAAI;YAClB,GAAG,OAAO;SACX,CAAC;IACJ,CAAC;IAED,kBAAkB;IACX,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,KAAK;gBACZ,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE;oBACX,MAAM;oBACN,QAAQ;oBACR,GAAG,IAAI,CAAC,KAAK;oBACb,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC7C,OAAO;oBACP,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzD,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9D,CAAC,IAAI,CAAC,GAAG,CAAC;gBACX,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AApCD,sCAoCC"}
package/src/tasks/link/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAGnH,qBAAa,mBAAoB,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAGzE,WAAW,CAAC,EAAE,MAAM;IAAS,gBAAgB,CAAC,EAAE,MAAM;IAFlE,KAAK,UAAQ;gBAED,WAAW,CAAC,EAAE,MAAM,YAAA,EAAS,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAElE,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAYpE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,sBAAsB,EACvB,MAAM,0DAA0D,CAAC;AAKlE,qBAAa,mBAAoB,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAGzE,WAAW,CAAC,EAAE,MAAM;IAAS,gBAAgB,CAAC,EAAE,MAAM;IAFlE,KAAK,UAAQ;gBAED,WAAW,CAAC,EAAE,MAAM,YAAA,EAAS,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAElE,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAYpE"}
package/src/tasks/link/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,iFAAyE;AAEzE,MAAa,mBAAmB;IAG9B,YAAmB,WAAoB,EAAS,gBAAyB;QAAtD,gBAAW,GAAX,WAAW,CAAS;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAFlE,UAAK,GAAG,IAAI,CAAC;IAEwD,CAAC;IAEtE,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE,QAAQ,IAAI,CAAC,WAAY,EAAE;gBACxC,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SAC2C,CAAC;IACjD,CAAC;CACF;AAjBD,kDAiBC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/link/index.ts"],"names":[],"mappings":";;;AAIA,sFAGkE;AAClE,iFAE8C;AAE9C,MAAa,mBAAmB;IAG9B,YAAmB,WAAoB,EAAS,gBAAyB;QAAtD,gBAAW,GAAX,WAAW,CAAS;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAFlE,UAAK,GAAG,IAAI,CAAC;IAEwD,CAAC;IAEtE,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE,QAAQ,IAAI,CAAC,WAAY,EAAE;gBACxC,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SAC2C,CAAC;IACjD,CAAC;CACF;AAjBD,kDAiBC"}
package/src/tasks/ng-add/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAEnF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,yBAAyB;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,kBAAkB;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,gEAAgE;IAChE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B;;OAEG;IACH,cAAc,CAAC,EAAE,kBAAkB,CAAC;IAEpC,2GAA2G;IAC3G,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,yBAAyB;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,kBAAkB;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,gEAAgE;IAChE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B;;OAEG;IACH,cAAc,CAAC,EAAE,kBAAkB,CAAC;IAEpC,2GAA2G;IAC3G,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC"}
package/src/tasks/package-manager/interfaces.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,WAAW;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,sBAAsB;IACtB,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,EAAE,CAAC;IACrC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,wCAAwC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oBAAoB;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB"}
1
+ {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,WAAW;IACX,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,sBAAsB;IACtB,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,EAAE,CAAC;IACrC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gDAAgD;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,wCAAwC;IACxC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,oBAAoB;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB"}
package/src/tasks/package-manager/npm-exec.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm-exec.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAGnH;;;GAGG;AACH,qBAAa,WAAY,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAExE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAiB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAAxF,MAAM,EAAE,MAAM,EAAmB,IAAI,GAAE,MAAM,EAAO,EAAmB,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAEtH,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAYpE"}
1
+ {"version":3,"file":"npm-exec.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,sBAAsB,EACvB,MAAM,0DAA0D,CAAC;AAKlE;;;GAGG;AACH,qBAAa,WAAY,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IACxE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAiB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAAxF,MAAM,EAAE,MAAM,EAAmB,IAAI,GAAE,MAAM,EAAO,EAAmB,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAEtH,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAYpE"}
package/src/tasks/package-manager/npm-exec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm-exec.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-exec.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,iFAAyE;AAEzE;;;GAGG;AACH,MAAa,WAAW;IAEtB,YAA6B,MAAc,EAAmB,OAAiB,EAAE,EAAmB,gBAAyB;QAAhG,WAAM,GAAN,MAAM,CAAQ;QAAmB,SAAI,GAAJ,IAAI,CAAe;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAS;IAAG,CAAC;IAE1H,eAAe;QACpB,MAAM,cAAc,GAAG,IAAA,0CAAiB,GAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,WAAW,EAAE,QAAQ,IAAI,CAAC,MAAM,IAAI,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAC1H,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,cAAc;aACf;SACF,CAAC;IACJ,CAAC;CACF;AAhBD,kCAgBC"}
1
+ {"version":3,"file":"npm-exec.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-exec.ts"],"names":[],"mappings":";;;AAIA,sFAGkE;AAClE,iFAE8C;AAE9C;;;GAGG;AACH,MAAa,WAAW;IACtB,YAA6B,MAAc,EAAmB,OAAiB,EAAE,EAAmB,gBAAyB;QAAhG,WAAM,GAAN,MAAM,CAAQ;QAAmB,SAAI,GAAJ,IAAI,CAAe;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAS;IAAG,CAAC;IAE1H,eAAe;QACpB,MAAM,cAAc,GAAG,IAAA,0CAAiB,GAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM;gBACf,WAAW,EAAE,QAAQ,IAAI,CAAC,MAAM,IAAI,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAC1H,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,cAAc;aACf;SACF,CAAC;IACJ,CAAC;CACF;AAfD,kCAeC"}
package/src/tasks/package-manager/npm-install.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm-install.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAIlE;;GAEG;AACH,qBAAa,UAAW,SAAQ,sBAAsB;IAC7C,KAAK,UAAS;IACd,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IASnD,kBAAkB;IACX,eAAe;;;;;;;;;;;;;CAavB"}
1
+ {"version":3,"file":"npm-install.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACvB,MAAM,kCAAkC,CAAC;AAQ1C,OAAO,KAAK,EACV,6BAA6B,EAC9B,MAAM,cAAc,CAAC;AAEtB;;GAEG;AACH,qBAAa,UAAW,SAAQ,sBAAsB;IAC7C,KAAK,UAAS;IACd,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IASnD,kBAAkB;IACX,eAAe;;;;;;;;;;;;;CAavB"}
package/src/tasks/package-manager/npm-install.js CHANGED
@@ -2,8 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.NpmInstall = void 0;
4
4
  const tasks_1 = require("@angular-devkit/schematics/tasks");
5
- const index_1 = require("../../utility/index");
6
5
  const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
6
+ const index_1 = require("../../utility/index");
7
7
  /**
8
8
  * Run NPM Install
9
9
  */
package/src/tasks/package-manager/npm-install.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAE1E,+CAA4E;AAC5E,sFAA2F;AAE3F;;GAEG;AACH,MAAa,UAAW,SAAQ,8BAAsB;IAIpD,YAAY,OAAuC;QACjD,KAAK,CAAC,OAAc,CAAC,CAAC;QAJjB,UAAK,GAAG,KAAK,CAAC;QACd,UAAK,GAAG,KAAK,CAAC;QAInB,IAAI,CAAC,cAAc,GAAG,IAAA,yBAAiB,EAAC;YACtC,eAAe,EAAE,OAAO,EAAE,IAAI,IAAI,IAAA,0BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC;YAClE,kBAAkB,EAAE,OAAO,EAAE,WAAW;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC;IAChC,CAAC;IAED,kBAAkB;IACX,eAAe;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QACvC,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,GAAG,MAAM,CAAC,OAAO;gBACjB,OAAO,EAAE,SAAS;gBAClB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,cAAc,EAAE,GAAG,IAAI,CAAC,cAAe,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE;aAC1G;SACF,CAAC;IACJ,CAAC;CACF;AA3BD,gCA2BC"}
1
+ {"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":";;;AAAA,4DAE0C;AAC1C,sFAEkE;AAClE,+CAG6B;AAK7B;;GAEG;AACH,MAAa,UAAW,SAAQ,8BAAsB;IAIpD,YAAY,OAAuC;QACjD,KAAK,CAAC,OAAc,CAAC,CAAC;QAJjB,UAAK,GAAG,KAAK,CAAC;QACd,UAAK,GAAG,KAAK,CAAC;QAInB,IAAI,CAAC,cAAc,GAAG,IAAA,yBAAiB,EAAC;YACtC,eAAe,EAAE,OAAO,EAAE,IAAI,IAAI,IAAA,0BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC;YAClE,kBAAkB,EAAE,OAAO,EAAE,WAAW;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC;IAChC,CAAC;IAED,kBAAkB;IACX,eAAe;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QACvC,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,GAAG,MAAM,CAAC,OAAO;gBACjB,OAAO,EAAE,SAAS;gBAClB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,cAAc,EAAE,GAAG,IAAI,CAAC,cAAe,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE;aAC1G;SACF,CAAC;IACJ,CAAC;CACF;AA3BD,gCA2BC"}
package/src/tasks/package-manager/npm-run.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm-run.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAGnH;;;GAGG;AACH,qBAAa,UAAW,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAEvE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAAlD,MAAM,EAAE,MAAM,EAAmB,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAEhF,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAWpE"}
1
+ {"version":3,"file":"npm-run.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-run.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,sBAAsB,EACvB,MAAM,0DAA0D,CAAC;AAKlE;;;GAGG;AACH,qBAAa,UAAW,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAAlD,MAAM,EAAE,MAAM,EAAmB,gBAAgB,CAAC,EAAE,MAAM,YAAA;IAEhF,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAWpE"}
package/src/tasks/package-manager/npm-run.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm-run.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-run.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,iFAAyE;AAEzE;;;GAGG;AACH,MAAa,UAAU;IAErB,YAA6B,MAAc,EAAmB,gBAAyB;QAA1D,WAAM,GAAN,MAAM,CAAQ;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAS;IAAG,CAAC;IAEpF,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,WAAW,EAAE,OAAO,IAAI,CAAC,MAAM,EAAE;gBACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AAfD,gCAeC"}
1
+ {"version":3,"file":"npm-run.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-run.ts"],"names":[],"mappings":";;;AAIA,sFAGkE;AAClE,iFAE8C;AAE9C;;;GAGG;AACH,MAAa,UAAU;IACrB,YAA6B,MAAc,EAAmB,gBAAyB;QAA1D,WAAM,GAAN,MAAM,CAAQ;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAS;IAAG,CAAC;IAEpF,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,WAAW,EAAE,OAAO,IAAI,CAAC,MAAM,EAAE;gBACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AAdD,gCAcC"}
package/src/utility/ast.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAGjC;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAa/I;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAc9I;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU;;;;IAc7D;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,eAajF;AAED;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC,SAAS,GAAG;IAC5C,UAAU,EAAE,EAAE,CAAC,cAAc,GAAG;QAC9B,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,SAAU,EAAE,CAAC,IAAI,KAAG,IAAI,IAAI,gBAGX,CAAC;AAEjD;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,cAAe,gBAAgB,WAAW,MAAM,8BAUjG,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,6CAA6C,QAAS,MAAM,qCAQxE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,+BAA+B,QAAS,MAAM,sBAW1D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iCAAiC,QAAS,MAAM,mBAU5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,uCAAuC,QAAS,MAAM,8BAQlE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,kBAAmB,EAAE,CAAC,YAAY,iBAAiB,EAAE,CAAC,YAAY,WAyB9F,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,mBAChC,MAAM,oBACL,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,KAAK,OAAO,uBACnC,GAAG,CAAC,MAAM,CAAC,KAC9B,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,IAAI,CA0C/B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,kBACxB,EAAE,CAAC,YAAY,EAAE,YACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,SAiBjC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,EAAE,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAS5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,eAAgB,MAAM,oBAAoB,EAAE,CAAC,YAAY,KAAG,YAAY,IAAI,EAAE,CAAC,iBAGhD,CAAC;AAE7D;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,SAAU,EAAE,CAAC,gBAAgB,WAAW,EAAE,CAAC,WAAW,cAAc,MAAM,mBAAmB,EAAE,CAAC,SAAS,EAAE,yBA2B7I,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,SAAU,EAAE,CAAC,IAAI,KAAG,IAAI,IAAI,EAAE,CAAC,mBAAmB,GAAG;IAAE,UAAU,EAAE,EAAE,CAAC,cAAc,GAAG;QAAE,UAAU,EAAE,EAAE,CAAC,wBAAwB,CAAA;KAAE,CAAA;CAOzF,CAAC;AAE7E;;;;GAIG;AACH,eAAO,MAAM,qEAAqE,YACvE,CAAC,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,EAAE,SAC5B,MAAM,KACZ,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,IAAI,CAmD7B,CAAC"}
1
+ {"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"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"}
package/src/utility/ast.js CHANGED
@@ -5,8 +5,8 @@ exports.findFirstNodeOfKind = findFirstNodeOfKind;
5
5
  exports.findLastNodeOfKind = findLastNodeOfKind;
6
6
  exports.parseImportsFromFile = parseImportsFromFile;
7
7
  exports.getExportedSymbolsFromFile = getExportedSymbolsFromFile;
8
- const ts = require("typescript");
9
8
  const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
9
+ const ts = require("typescript");
10
10
  /**
11
11
  * Find the first node with the specific syntax kind
12
12
  * @param sourceFile Typescript file
@@ -18,12 +18,7 @@ function findFirstNodeOfKind(sourceFile, searchKind, node) {
18
18
  let ret = null;
19
19
  currentNode.forEachChild((n) => {
20
20
  if (!ret) {
21
- if (n.kind === searchKind) {
22
- ret = n;
23
- }
24
- else {
25
- ret = findFirstNodeOfKind(sourceFile, searchKind, n);
26
- }
21
+ ret = n.kind === searchKind ? n : findFirstNodeOfKind(sourceFile, searchKind, n);
27
22
  }
28
23
  });
29
24
  return ret;
@@ -44,7 +39,7 @@ function findLastNodeOfKind(sourceFile, searchKind, node) {
44
39
  else {
45
40
  const found = findLastNodeOfKind(sourceFile, searchKind, n);
46
41
  if (found) {
47
- ret = !ret ? found : (found.pos > ret.pos ? found : ret);
42
+ ret = ret ? (found.pos > ret.pos ? found : ret) : found;
48
43
  }
49
44
  }
50
45
  });
@@ -58,12 +53,12 @@ function parseImportsFromFile(sourceFile) {
58
53
  // First we look for all imports lines targeting an Otter package for which we know a mapping
59
54
  return (0, ast_utils_1.findNodes)(sourceFile, ts.SyntaxKind.ImportDeclaration).map((nodeImp) => {
60
55
  const imp = nodeImp;
61
- const importFrom = imp.moduleSpecifier.getText().replace(/['"]/g, '');
56
+ const importFrom = imp.moduleSpecifier.getText().replace(/["']/g, '');
62
57
  // We retrieve all the symbols listed in the import statement
63
58
  const namedImport = imp.importClause && imp.importClause.getChildAt(0);
64
- const imports = namedImport && ts.isNamedImports(namedImport) ?
65
- namedImport.elements.map((element) => element.getText()) :
66
- [];
59
+ const imports = namedImport && ts.isNamedImports(namedImport)
60
+ ? namedImport.elements.map((element) => element.getText())
61
+ : [];
67
62
  return { node: imp, symbols: imports, module: importFrom };
68
63
  });
69
64
  }
@@ -193,7 +188,7 @@ const addInterfaceToClassTransformerFactory = (interfaceToAdd, classIdentifier =
193
188
  const interfaceToImplements = (0, exports.generateImplementsExpressionWithTypeArguments)(interfaceToAdd);
194
189
  const newImplementsClauses = implementsClauses
195
190
  ? factory.updateHeritageClause(implementsClauses, [
196
- ...implementsClauses.types.filter((interfaceNode) => !interfacesToRemove.size
191
+ ...implementsClauses.types.filter((interfaceNode) => interfacesToRemove.size === 0
197
192
  || (ts.isIdentifier(interfaceNode.expression)
198
193
  && !interfacesToRemove.has(interfaceNode.expression.escapedText.toString()))),
199
194
  ...interfaceToImplements
@@ -263,7 +258,9 @@ const getSimpleUpdatedMethod = (node, factory, methodName, blockStatements) => {
263
258
  const originalMethod = node.members.find((0, exports.findMethodByName)(methodName));
264
259
  return originalMethod
265
260
  ? factory.updateMethodDeclaration(originalMethod, ts.getModifiers(originalMethod), originalMethod.asteriskToken, originalMethod.name, originalMethod.questionToken, originalMethod.typeParameters, originalMethod.parameters, originalMethod.type, originalMethod.body
266
- ? factory.updateBlock(originalMethod.body, originalMethod.body.statements.concat(blockStatements)) : factory.createBlock(blockStatements, true)) : factory.createMethodDeclaration([factory.createToken(ts.SyntaxKind.PublicKeyword)], undefined, factory.createIdentifier(methodName), undefined, undefined, [], undefined, factory.createBlock(blockStatements, true));
261
+ ? factory.updateBlock(originalMethod.body, originalMethod.body.statements.concat(blockStatements))
262
+ : factory.createBlock(blockStatements, true))
263
+ : factory.createMethodDeclaration([factory.createToken(ts.SyntaxKind.PublicKeyword)], undefined, factory.createIdentifier(methodName), undefined, undefined, [], undefined, factory.createBlock(blockStatements, true));
267
264
  };
268
265
  exports.getSimpleUpdatedMethod = getSimpleUpdatedMethod;
269
266
  /**
@@ -286,7 +283,7 @@ exports.isTestBedConfiguration = isTestBedConfiguration;
286
283
  const addImportsAndCodeBlockStatementAtSpecInitializationTransformerFactory = (imports, code) => (ctx) => (rootNode) => {
287
284
  const { factory } = ctx;
288
285
  const visit = (node) => {
289
- if (ts.isBlock(node) && !!node.statements.find(exports.isTestBedConfiguration)) {
286
+ if (ts.isBlock(node) && node.statements.some((statement) => (0, exports.isTestBedConfiguration)(statement))) {
290
287
  return factory.updateBlock(node, node.statements
291
288
  .reduce((acc, statement) => {
292
289
  if ((0, exports.isTestBedConfiguration)(statement)) {
package/src/utility/ast.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"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"}
package/src/utility/builder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/utility/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE7E;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,KAAK,UAAQ,GAAG,gBAAgB,CAO5J"}
1
+ {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/utility/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,KAAK,UAAQ,GAAG,gBAAgB,CAO5J"}
package/src/utility/builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/utility/builder.ts"],"names":[],"mappings":";;AAUA,0CAOC;AAfD;;;;;;;GAOG;AACH,SAAgB,eAAe,CAAC,gBAAkC,EAAE,QAAgB,EAAE,cAAqC,EAAE,KAAK,GAAG,KAAK;IACxI,gBAAgB,CAAC,SAAS,KAAK,EAAE,CAAC;IAClC,IAAI,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,gBAAgB,CAAC,CAAC;IAChE,CAAC;IACD,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC;IACtD,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/utility/builder.ts"],"names":[],"mappings":";;AAaA,0CAOC;AAfD;;;;;;;GAOG;AACH,SAAgB,eAAe,CAAC,gBAAkC,EAAE,QAAgB,EAAE,cAAqC,EAAE,KAAK,GAAG,KAAK;IACxI,gBAAgB,CAAC,SAAS,KAAK,EAAE,CAAC;IAClC,IAAI,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,gBAAgB,CAAC,CAAC;IAChE,CAAC;IACD,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC;IACtD,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
package/src/utility/collection.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAE1E;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAO5G;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAC1C,CAAC,SAAS,mBAAmB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,eAAe,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,CAAC,CAoBrM;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,mBAAmB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS,CAUxK"}
1
+ {"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAEvB;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAO5G;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,mBAAmB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAC7G,SAAS,EAAE,eAAe,GAAG,IAAI,EACjC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC7C,CAAC,CAoBH;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,mBAAmB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS,CASxK"}