@ama-sdk/schematics 9.6.14 → 9.6.16

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 (8) hide show
  1. package/package.json +7 -7
  2. package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen-tests.jar +0 -0
  3. package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen.jar +0 -0
  4. package/schematics/typescript/core/helpers/path-extractor.d.ts.map +1 -1
  5. package/schematics/typescript/core/helpers/path-extractor.js +5 -1
  6. package/schematics/typescript/core/helpers/path-extractor.js.map +1 -1
  7. package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator-tests.jar +0 -0
  8. package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator.jar +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ama-sdk/schematics",
3
- "version": "9.6.14",
3
+ "version": "9.6.16",
4
4
  "description": "Swagger specification SDK Generator by schematics",
5
5
  "typings": "./src/public_api.d.ts",
6
6
  "scripts": {
@@ -36,7 +36,7 @@
36
36
  }
37
37
  },
38
38
  "peerDependencies": {
39
- "@ama-sdk/core": "^9.6.14",
39
+ "@ama-sdk/core": "^9.6.16",
40
40
  "@angular-devkit/core": "^16.0.5",
41
41
  "@angular-devkit/schematics": "^16.0.5",
42
42
  "@angular-devkit/schematics-cli": "^16.0.5",
@@ -46,7 +46,7 @@
46
46
  "dependencies": {
47
47
  "@angular-devkit/core": "~16.2.0",
48
48
  "@angular-devkit/schematics": "~16.2.0",
49
- "@o3r/dev-tools": "^9.6.14",
49
+ "@o3r/dev-tools": "^9.6.16",
50
50
  "js-yaml": "^4.1.0",
51
51
  "minimatch": "~9.0.3",
52
52
  "rxjs": "^7.8.1",
@@ -54,15 +54,15 @@
54
54
  "tslib": "^2.5.3"
55
55
  },
56
56
  "devDependencies": {
57
- "@ama-sdk/core": "^9.6.14",
57
+ "@ama-sdk/core": "^9.6.16",
58
58
  "@angular-devkit/schematics-cli": "~16.2.0",
59
59
  "@angular-eslint/eslint-plugin": "~16.3.0",
60
60
  "@angular/cli": "~16.2.0",
61
61
  "@nx/eslint-plugin": "~16.10.0",
62
62
  "@nx/jest": "~16.10.0",
63
- "@o3r/build-helpers": "^9.6.14",
64
- "@o3r/eslint-plugin": "^9.6.14",
65
- "@o3r/schematics": "^9.6.14",
63
+ "@o3r/build-helpers": "^9.6.16",
64
+ "@o3r/eslint-plugin": "^9.6.16",
65
+ "@o3r/schematics": "^9.6.16",
66
66
  "@openapitools/openapi-generator-cli": "~2.7.0",
67
67
  "@schematics/angular": "~16.2.0",
68
68
  "@types/jest": "~29.5.2",
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,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvE;;;;GAIG;AAEH,eAAO,MAAM,qCAAqC,kBAAmB,kBAAkB,GAAG,kBAAkB,GAAG,oBAAoB,KAAG,UAAU,EAsB/I,CAAC"}
1
+ {"version":3,"file":"path-extractor.d.ts","sourceRoot":"","sources":["../../../../../schematics/typescript/core/helpers/path-extractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEvE;;;;GAIG;AAEH,eAAO,MAAM,qCAAqC,kBAAmB,kBAAkB,GAAG,kBAAkB,GAAG,oBAAoB,KAAG,UAAU,EA2B/I,CAAC"}
package/schematics/typescript/core/helpers/path-extractor.js CHANGED
@@ -11,6 +11,10 @@ const generateOperationFinderFromSingleFile = (specification) => {
11
11
  if (!specification.paths) {
12
12
  return [];
13
13
  }
14
+ let basePath = '/';
15
+ if ('basePath' in specification && specification.basePath) {
16
+ basePath = specification.basePath.replace(/\/$/, '');
17
+ }
14
18
  return Object.entries(specification.paths)
15
19
  .filter(([, pathObject]) => !!pathObject)
16
20
  .map(([path, pathObjectOrRef]) => {
@@ -20,7 +24,7 @@ const generateOperationFinderFromSingleFile = (specification) => {
20
24
  : pathObjectOrRef;
21
25
  return {
22
26
  path,
23
- regexp: new RegExp(`^${path.replace(/\{[^}]+}/g, '((?:[^/]+?))')}(?:/(?=$))?$`),
27
+ regexp: new RegExp(`^${(basePath + path).replace(/^\/{2,}/, '/').replace(/\{[^}]+}/g, '((?:[^/]+?))')}(?:/(?=$))?$`),
24
28
  operations: Object.entries(pathObject)
25
29
  .map(([method, reqObject]) => ({
26
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":";;;AAIA;;;;GAIG;AACH,qCAAqC;AAC9B,MAAM,qCAAqC,GAAG,CAAC,aAA6E,EAAgB,EAAE;IACnJ,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;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,qCAAqC;QACrC,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,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,cAAc,CAAC;YAC/E,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;AAtBW,QAAA,qCAAqC,yCAsBhD"}
1
+ {"version":3,"file":"path-extractor.js","sourceRoot":"","sources":["../../../../../schematics/typescript/core/helpers/path-extractor.ts"],"names":[],"mappings":";;;AAIA;;;;GAIG;AACH,qCAAqC;AAC9B,MAAM,qCAAqC,GAAG,CAAC,aAA6E,EAAgB,EAAE;IACnJ,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IACD,IAAI,QAAQ,GAAG,GAAG,CAAC;IACnB,IAAI,UAAU,IAAI,aAAa,IAAI,aAAa,CAAC,QAAQ,EAAE;QACzD,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;KAEtD;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,qCAAqC;QACrC,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,WAAW,EAAE,cAAc,CAAC,cAAc,CAAC;YACpH,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;AA3BW,QAAA,qCAAqC,yCA2BhD"}