@ama-sdk/schematics 13.0.0-next.3 → 13.0.0-next.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/package.json +42 -42
  2. package/schematics/migrate/schema.json +2 -1
  3. package/schematics/ng-add/schema.json +2 -1
  4. package/schematics/ng-update/typescript/v12.1/clean-packagejson-exports.d.ts.map +1 -1
  5. package/schematics/ng-update/typescript/v12.1/clean-packagejson-exports.js +6 -0
  6. package/schematics/ng-update/typescript/v12.1/clean-packagejson-exports.js.map +1 -1
  7. package/schematics/ng-update/typescript/v12.3/coverage-ignore.js +1 -1
  8. package/schematics/ng-update/typescript/v12.3/coverage-ignore.js.map +1 -1
  9. package/schematics/typescript/core/helpers/path-extractor.d.ts.map +1 -1
  10. package/schematics/typescript/core/helpers/path-extractor.js +3 -1
  11. package/schematics/typescript/core/helpers/path-extractor.js.map +1 -1
  12. package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator-tests.jar +0 -0
  13. package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator.jar +0 -0
  14. package/schematics/typescript/shell/templates/base/src/fixtures/jest/package.json +2 -2
  15. package/schematics/typescript/shell/templates/base/src/helpers/package.json +2 -2
  16. package/schematics/typescript/shell/templates/base/src/spec/package.json +2 -2
  17. package/schematics/typescript/shell/templates/base/tsconfig.build.json +1 -1
  18. package/schematics/typescript/shell/templates/base/tsconfig.doc.json +3 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ama-sdk/schematics",
3
- "version": "13.0.0-next.3",
3
+ "version": "13.0.0-next.31",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -62,22 +62,22 @@
62
62
  }
63
63
  },
64
64
  "peerDependencies": {
65
- "@ama-sdk/core": "^13.0.0-next.3",
66
- "@angular-devkit/core": "^19.0.0",
67
- "@angular-devkit/schematics-cli": "^19.0.0",
68
- "@angular/cli": "^19.0.0",
69
- "@o3r/schematics": "^13.0.0-next.3",
70
- "@o3r/telemetry": "^13.0.0-next.3",
65
+ "@ama-sdk/core": "^13.0.0-next.31",
66
+ "@angular-devkit/core": "^20.0.0",
67
+ "@angular-devkit/schematics-cli": "^20.0.0",
68
+ "@angular/cli": "^20.0.0",
69
+ "@o3r/schematics": "^13.0.0-next.31",
70
+ "@o3r/telemetry": "^13.0.0-next.31",
71
71
  "@openapitools/openapi-generator-cli": "^2.15.0",
72
72
  "openapi-types": "^12.0.0",
73
73
  "ts-node": "~10.9.2",
74
74
  "type-fest": "^4.30.1",
75
- "typescript": "^5.5.4"
75
+ "typescript": "^5.8.0"
76
76
  },
77
77
  "dependencies": {
78
- "@angular-devkit/core": "~19.2.0",
79
- "@angular-devkit/schematics": "~19.2.0",
80
- "@o3r/schematics": "^13.0.0-next.3",
78
+ "@angular-devkit/core": "~20.0.0",
79
+ "@angular-devkit/schematics": "~20.0.0",
80
+ "@o3r/schematics": "^13.0.0-next.31",
81
81
  "chokidar": "^4.0.3",
82
82
  "globby": "^11.1.0",
83
83
  "js-yaml": "^4.1.0",
@@ -88,77 +88,77 @@
88
88
  "tslib": "^2.6.2"
89
89
  },
90
90
  "devDependencies": {
91
- "@ama-sdk/core": "^13.0.0-next.3",
92
- "@angular-devkit/schematics-cli": "~19.2.0",
93
- "@angular/cli": "~19.2.0",
91
+ "@ama-sdk/core": "^13.0.0-next.31",
92
+ "@angular-devkit/schematics-cli": "~20.0.0",
93
+ "@angular/cli": "~20.0.0",
94
94
  "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
95
- "@nx/eslint-plugin": "~20.8.0",
96
- "@nx/jest": "~20.8.0",
97
- "@o3r/build-helpers": "^13.0.0-next.3",
98
- "@o3r/eslint-plugin": "^13.0.0-next.3",
99
- "@o3r/telemetry": "^13.0.0-next.3",
100
- "@o3r/test-helpers": "^13.0.0-next.3",
95
+ "@nx/eslint-plugin": "~21.3.11",
96
+ "@nx/jest": "~21.3.11",
97
+ "@o3r/build-helpers": "^13.0.0-next.31",
98
+ "@o3r/eslint-plugin": "^13.0.0-next.31",
99
+ "@o3r/telemetry": "^13.0.0-next.31",
100
+ "@o3r/test-helpers": "^13.0.0-next.31",
101
101
  "@openapitools/openapi-generator-cli": "~2.21.0",
102
- "@schematics/angular": "~19.2.0",
103
- "@stylistic/eslint-plugin": "~3.1.0",
102
+ "@schematics/angular": "~20.0.0",
103
+ "@stylistic/eslint-plugin": "~5.2.0",
104
104
  "@types/jest": "~29.5.2",
105
105
  "@types/js-yaml": "^4.0.5",
106
- "@types/minimatch": "^5.1.2",
107
106
  "@types/minimist": "^1.2.2",
108
- "@types/node": "^20.0.0",
107
+ "@types/node": "^22.0.0",
109
108
  "@types/pid-from-port": "^1.1.0",
110
109
  "@types/semver": "^7.3.13",
111
- "@typescript-eslint/parser": "~8.35.0",
112
- "angular-eslint": "~19.4.0",
110
+ "@typescript-eslint/parser": "~8.39.0",
111
+ "angular-eslint": "~20.1.0",
113
112
  "commit-and-tag-version": "^12.0.0",
114
113
  "copyfiles": "^2.4.1",
115
- "cpy-cli": "^5.0.0",
116
- "eslint": "~9.29.0",
114
+ "cpy-cli": "^6.0.0",
115
+ "eslint": "~9.33.0",
117
116
  "eslint-import-resolver-node": "~0.3.9",
118
- "eslint-import-resolver-typescript": "~3.10.0",
117
+ "eslint-import-resolver-typescript": "~4.4.0",
119
118
  "eslint-plugin-import": "~2.32.0",
120
119
  "eslint-plugin-import-newlines": "~1.4.0",
121
- "eslint-plugin-jest": "~28.14.0",
122
- "eslint-plugin-jsdoc": "~50.8.0",
120
+ "eslint-plugin-jest": "~29.0.0",
121
+ "eslint-plugin-jsdoc": "~54.1.0",
123
122
  "eslint-plugin-prefer-arrow": "~1.2.3",
124
- "eslint-plugin-unicorn": "~56.0.0",
123
+ "eslint-plugin-unicorn": "~60.0.0",
125
124
  "eslint-plugin-unused-imports": "~4.1.4",
126
- "globals": "^15.9.0",
125
+ "globals": "^16.0.0",
127
126
  "isomorphic-fetch": "~3.0.0",
128
127
  "jest": "~29.7.0",
129
128
  "jest-junit": "~16.0.0",
129
+ "jest-util": "~29.7.0",
130
130
  "jsonc-eslint-parser": "~2.4.0",
131
131
  "mem-fs": "^4.0.0",
132
- "npm-run-all2": "^7.0.0",
133
- "nx": "~20.8.0",
132
+ "npm-run-all2": "^8.0.0",
133
+ "nx": "~21.3.11",
134
134
  "openapi-types": "^12.0.0",
135
135
  "pid-from-port": "^1.1.3",
136
136
  "semver": "^7.5.2",
137
- "ts-jest": "~29.3.0",
137
+ "ts-jest": "~29.4.0",
138
138
  "ts-node": "~10.9.2",
139
139
  "type-fest": "^4.30.1",
140
140
  "typescript": "~5.8.2",
141
- "typescript-eslint": "~8.35.0"
141
+ "typescript-eslint": "~8.39.0"
142
142
  },
143
143
  "generatorDependencies": {
144
- "@angular-eslint/eslint-plugin": "~19.2.0",
144
+ "@angular-eslint/eslint-plugin": "~20.0.0",
145
145
  "@commitlint/cli": "^19.0.0",
146
146
  "@commitlint/config-conventional": "^19.0.0",
147
147
  "@swc/cli": "~0.7.7",
148
148
  "@swc/core": "~1.12.0",
149
149
  "@swc/helpers": "~0.5.0",
150
- "@typescript-eslint/eslint-plugin": "~8.35.0",
150
+ "@typescript-eslint/eslint-plugin": "~8.39.0",
151
151
  "jest-junit": "~16.0.0",
152
- "lint-staged": "^15.0.0",
152
+ "lint-staged": "^16.0.0",
153
153
  "minimist": "^1.2.6",
154
154
  "rimraf": "^6.0.1",
155
- "tsc-watch": "^6.0.4",
155
+ "tsc-watch": "^7.0.0",
156
156
  "typedoc": "~0.28.0",
157
157
  "yaml-eslint-parser": "^1.2.2"
158
158
  },
159
159
  "openApiSupportedVersion": "^7.11.0",
160
160
  "engines": {
161
- "node": "^20.11.1 || >=22.0.0"
161
+ "node": "^20.19.0 || ^22.17.0 || ^24.0.0"
162
162
  },
163
163
  "preferUnplugged": true,
164
164
  "contributors": [
package/schematics/migrate/schema.json CHANGED
@@ -18,7 +18,8 @@
18
18
  "description": "Project name (in case it is applied to a module from an Angular Project)",
19
19
  "$default": {
20
20
  "$source": "projectName"
21
- }
21
+ },
22
+ "alias": "project"
22
23
  }
23
24
  },
24
25
  "additionalProperties": true,
package/schematics/ng-add/schema.json CHANGED
@@ -9,7 +9,8 @@
9
9
  "description": "Project name",
10
10
  "$default": {
11
11
  "$source": "projectName"
12
- }
12
+ },
13
+ "alias": "project"
13
14
  }
14
15
  },
15
16
  "additionalProperties": true,
package/schematics/ng-update/typescript/v12.1/clean-packagejson-exports.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clean-packagejson-exports.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v12.1/clean-packagejson-exports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAQpC;;;GAGG;AACH,eAAO,MAAM,uBAAuB,EAAE,IA0CrC,CAAC"}
1
+ {"version":3,"file":"clean-packagejson-exports.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v12.1/clean-packagejson-exports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAQpC;;;GAGG;AACH,eAAO,MAAM,uBAAuB,EAAE,IAiDrC,CAAC"}
package/schematics/ng-update/typescript/v12.1/clean-packagejson-exports.js CHANGED
@@ -33,6 +33,12 @@ const clearPackageJsonExports = (tree) => {
33
33
  delete map.es2015;
34
34
  delete map.esm2015;
35
35
  delete map.typings;
36
+ // put default field at the end of the map
37
+ if (map.default) {
38
+ const defaultField = map.default;
39
+ delete map.default;
40
+ map.default = defaultField;
41
+ }
36
42
  return [path, map];
37
43
  }));
38
44
  }
package/schematics/ng-update/typescript/v12.1/clean-packagejson-exports.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clean-packagejson-exports.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v12.1/clean-packagejson-exports.ts"],"names":[],"mappings":";;;AAGA,gDAEyB;AAKzB;;;GAGG;AACI,MAAM,uBAAuB,GAAS,CAAC,IAAI,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,IAAA,4BAAe,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;IAE5E,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAgB,CAAC;QAE5D,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,OAAO,CAAC;QAE7D,OAAO,WAAW,CAAC,MAAM,CAAC;QAC1B,OAAO,WAAW,CAAC,OAAO,CAAC;QAC3B,OAAO,WAAW,CAAC,MAAM,CAAC;QAC1B,OAAO,WAAW,CAAC,OAAO,CAAC;QAC3B,OAAO,WAAW,CAAC,OAAO,CAAC;QAE3B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;iBAChC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE;gBACnB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;oBAClE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACrB,CAAC;gBAED,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;oBAChB,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;oBAChB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC;gBAC1C,CAAC;gBACD,OAAO,GAAG,CAAC,MAAM,CAAC;gBAClB,OAAO,GAAG,CAAC,OAAO,CAAC;gBACnB,OAAO,GAAG,CAAC,MAAM,CAAC;gBAClB,OAAO,GAAG,CAAC,OAAO,CAAC;gBACnB,OAAO,GAAG,CAAC,OAAO,CAAC;gBAEnB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CACL,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA1CW,QAAA,uBAAuB,2BA0ClC"}
1
+ {"version":3,"file":"clean-packagejson-exports.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v12.1/clean-packagejson-exports.ts"],"names":[],"mappings":";;;AAGA,gDAEyB;AAKzB;;;GAGG;AACI,MAAM,uBAAuB,GAAS,CAAC,IAAI,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,IAAA,4BAAe,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;IAE5E,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAgB,CAAC;QAE5D,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,OAAO,CAAC;QAE7D,OAAO,WAAW,CAAC,MAAM,CAAC;QAC1B,OAAO,WAAW,CAAC,OAAO,CAAC;QAC3B,OAAO,WAAW,CAAC,MAAM,CAAC;QAC1B,OAAO,WAAW,CAAC,OAAO,CAAC;QAC3B,OAAO,WAAW,CAAC,OAAO,CAAC;QAE3B,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;iBAChC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE;gBACnB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;oBAClE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACrB,CAAC;gBAED,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;oBAChB,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC;gBAC1B,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;oBAChB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC;gBAC1C,CAAC;gBACD,OAAO,GAAG,CAAC,MAAM,CAAC;gBAClB,OAAO,GAAG,CAAC,OAAO,CAAC;gBACnB,OAAO,GAAG,CAAC,MAAM,CAAC;gBAClB,OAAO,GAAG,CAAC,OAAO,CAAC;gBACnB,OAAO,GAAG,CAAC,OAAO,CAAC;gBAEnB,0CAA0C;gBAC1C,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;oBAChB,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC;oBACjC,OAAO,GAAG,CAAC,OAAO,CAAC;oBACnB,GAAG,CAAC,OAAO,GAAG,YAAY,CAAC;gBAC7B,CAAC;gBAED,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CACL,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAjDW,QAAA,uBAAuB,2BAiDlC"}
package/schematics/ng-update/typescript/v12.3/coverage-ignore.js CHANGED
@@ -51,7 +51,7 @@ const updateJestConfigCoveragePathIgnorePatterns = (tree, context) => {
51
51
  const match = line.match(/^ */);
52
52
  const numberSpaces = match ? match[0].length : 0;
53
53
  const newNumber = (numberSpaces - numberSpaces % 2) / 2;
54
- return line.replace(/^ */, Array.from({ length: newNumber }).fill(' ').join(''));
54
+ return line.replace(/^ */, ' '.repeat(newNumber));
55
55
  })
56
56
  .join('\n');
57
57
  tree.overwrite(filePath, content);
package/schematics/ng-update/typescript/v12.3/coverage-ignore.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"coverage-ignore.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v12.3/coverage-ignore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"coverage-ignore.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v12.3/coverage-ignore.ts"],"names":[],"mappings":"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"}
package/schematics/typescript/core/helpers/path-extractor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"path-extractor.d.ts","sourceRoot":"","sources":["../../../../../schematics/typescript/core/helpers/path-extractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,SAAS,EACT,SAAS,EACT,WAAW,EACZ,MAAM,eAAe,CAAC;AAEvB;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,GAAI,eAAe,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,KAAG,UAAU,EAyB/I,CAAC"}
1
+ {"version":3,"file":"path-extractor.d.ts","sourceRoot":"","sources":["../../../../../schematics/typescript/core/helpers/path-extractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,SAAS,EACT,SAAS,EACT,WAAW,EACZ,MAAM,eAAe,CAAC;AAEvB;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,GAAI,eAAe,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,KAAG,UAAU,EA2B/I,CAAC"}
package/schematics/typescript/core/helpers/path-extractor.js CHANGED
@@ -20,9 +20,11 @@ const generateOperationFinderFromSingleFile = (specification) => {
20
20
  const pathObject = pathObjectOrRef.$ref
21
21
  ? pathObjectOrRef.$ref.replace(/^#\/?/, '').split('/').reduce((acc, ref) => acc[ref], specification)
22
22
  : pathObjectOrRef;
23
+ const urlPattern = `${path.replace(/{[^}]+}/g, '((?:[^/]+?))')}(?:/(?=$))?$`;
23
24
  return {
24
25
  path,
25
- regexp: new RegExp(`^${(basePath + path).replace(/^\/{2,}/, '/').replace(/{[^}]+}/g, '((?:[^/]+?))')}(?:/(?=$))?$`),
26
+ urlPattern,
27
+ regexp: new RegExp(`^${(basePath + urlPattern).replace(/^\/{2,}/, '/')}`),
26
28
  operations: Object.entries(pathObject)
27
29
  .map(([method, reqObject]) => ({
28
30
  method,
package/schematics/typescript/core/helpers/path-extractor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"path-extractor.js","sourceRoot":"","sources":["../../../../../schematics/typescript/core/helpers/path-extractor.ts"],"names":[],"mappings":";;;AASA;;;;GAIG;AACI,MAAM,qCAAqC,GAAG,CAAC,aAA6E,EAAgB,EAAE;IACnJ,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,QAAQ,GAAG,GAAG,CAAC;IACnB,IAAI,UAAU,IAAI,aAAa,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;QAC1D,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;SACvC,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;SACxC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,EAAE;QAC/B,MAAM,UAAU,GAAuH,eAAe,CAAC,IAAI;YACzJ,CAAC,CAAE,eAAe,CAAC,IAAe,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC;YACrH,CAAC,CAAC,eAAe,CAAC;QACpB,OAAO;YACL,IAAI;YACJ,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,cAAc,CAAC;YACnH,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;iBACnC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7B,MAAM;gBACN,WAAW,EAAE,SAAS,CAAC,WAAW;aACnC,CAAC,CAAC;SACN,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAzBW,QAAA,qCAAqC,yCAyBhD"}
1
+ {"version":3,"file":"path-extractor.js","sourceRoot":"","sources":["../../../../../schematics/typescript/core/helpers/path-extractor.ts"],"names":[],"mappings":";;;AASA;;;;GAIG;AACI,MAAM,qCAAqC,GAAG,CAAC,aAA6E,EAAgB,EAAE;IACnJ,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,QAAQ,GAAG,GAAG,CAAC;IACnB,IAAI,UAAU,IAAI,aAAa,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;QAC1D,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;SACvC,MAAM,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;SACxC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,EAAE;QAC/B,MAAM,UAAU,GAAuH,eAAe,CAAC,IAAI;YACzJ,CAAC,CAAE,eAAe,CAAC,IAAe,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,aAAa,CAAC;YACrH,CAAC,CAAC,eAAe,CAAC;QACpB,MAAM,UAAU,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,cAAc,CAAC;QAC7E,OAAO;YACL,IAAI;YACJ,UAAU;YACV,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC;YACzE,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;iBACnC,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7B,MAAM;gBACN,WAAW,EAAE,SAAS,CAAC,WAAW;aACnC,CAAC,CAAC;SACe,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AA3BW,QAAA,qCAAqC,yCA2BhD"}
package/schematics/typescript/shell/templates/base/src/fixtures/jest/package.json CHANGED
@@ -3,6 +3,6 @@
3
3
  "main": "../../cjs/api/fixtures.jest.js",
4
4
  "module": "../../esm2020/api/fixtures.jest.js",
5
5
  "node": "../../cjs/api/fixtures.jest.js",
6
- "default": "../../esm2020/api/fixtures.jest.js",
7
- "types": "./index.d.ts"
6
+ "types": "./index.d.ts",
7
+ "default": "../../esm2020/api/fixtures.jest.js"
8
8
  }
package/schematics/typescript/shell/templates/base/src/helpers/package.json CHANGED
@@ -3,6 +3,6 @@
3
3
  "main": "../cjs/helpers/index.js",
4
4
  "module": "../esm2020/helpers/index.js",
5
5
  "node": "../cjs/helpers/index.js",
6
- "default": "../esm2020/helpers/index.js",
7
- "types": "./index.d.ts"
6
+ "types": "./index.d.ts",
7
+ "default": "../esm2020/helpers/index.js"
8
8
  }
package/schematics/typescript/shell/templates/base/src/spec/package.json CHANGED
@@ -3,6 +3,6 @@
3
3
  "main": "../cjs/spec/index.js",
4
4
  "module": "../esm2020/spec/index.js",
5
5
  "node": "../cjs/spec/index.js",
6
- "default": "../esm2020/spec/index.js",
7
- "types": "./index.d.ts"
6
+ "types": "./index.d.ts",
7
+ "default": "../esm2020/spec/index.js"
8
8
  }
package/schematics/typescript/shell/templates/base/tsconfig.build.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "compilerOptions": {
3
3
  "types": [],
4
- "moduleResolution": "node",
4
+ "moduleResolution": "bundler",
5
5
  "noImplicitAny": true,
6
6
  "emitDecoratorMetadata": true,
7
7
  "experimentalDecorators": true,
package/schematics/typescript/shell/templates/base/tsconfig.doc.json CHANGED
@@ -2,7 +2,9 @@
2
2
  "extends": "./tsconfig.build",
3
3
  "compilerOptions": {
4
4
  "rootDir": ".",
5
- "baseUrl": "."
5
+ "baseUrl": ".",
6
+ "module": "commonjs",
7
+ "moduleResolution": "node10"
6
8
  },
7
9
  "exclude": [
8
10
  "**/*.fixture.ts",