@ama-sdk/schematics 10.3.0-prerelease.58 → 10.3.0-prerelease.59

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 +8 -8
  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": "10.3.0-prerelease.58",
3
+ "version": "10.3.0-prerelease.59",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -48,12 +48,12 @@
48
48
  }
49
49
  },
50
50
  "peerDependencies": {
51
- "@ama-sdk/core": "^10.3.0-prerelease.58",
51
+ "@ama-sdk/core": "^10.3.0-prerelease.59",
52
52
  "@angular-devkit/core": "~17.3.0",
53
53
  "@angular-devkit/schematics": "~17.3.0",
54
54
  "@angular-devkit/schematics-cli": "^17.0.1",
55
55
  "@angular/cli": "^17.0.1",
56
- "@o3r/schematics": "^10.3.0-prerelease.58",
56
+ "@o3r/schematics": "^10.3.0-prerelease.59",
57
57
  "@openapitools/openapi-generator-cli": "~2.13.0",
58
58
  "@schematics/angular": "~17.3.0"
59
59
  },
@@ -67,16 +67,16 @@
67
67
  "tslib": "^2.6.2"
68
68
  },
69
69
  "devDependencies": {
70
- "@ama-sdk/core": "^10.3.0-prerelease.58",
70
+ "@ama-sdk/core": "^10.3.0-prerelease.59",
71
71
  "@angular-devkit/schematics-cli": "~17.3.0",
72
72
  "@angular-eslint/eslint-plugin": "~17.3.0",
73
73
  "@angular/cli": "~17.3.0",
74
74
  "@nx/eslint-plugin": "~18.3.0",
75
75
  "@nx/jest": "~18.3.0",
76
- "@o3r/build-helpers": "^10.3.0-prerelease.58",
77
- "@o3r/eslint-plugin": "^10.3.0-prerelease.58",
78
- "@o3r/schematics": "^10.3.0-prerelease.58",
79
- "@o3r/test-helpers": "^10.3.0-prerelease.58",
76
+ "@o3r/build-helpers": "^10.3.0-prerelease.59",
77
+ "@o3r/eslint-plugin": "^10.3.0-prerelease.59",
78
+ "@o3r/schematics": "^10.3.0-prerelease.59",
79
+ "@o3r/test-helpers": "^10.3.0-prerelease.59",
80
80
  "@openapitools/openapi-generator-cli": "~2.13.0",
81
81
  "@schematics/angular": "~17.3.0",
82
82
  "@stylistic/eslint-plugin-ts": "^1.5.4",
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,CAAC;QACzB,OAAO,EAAE,CAAC;IACZ,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,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,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;IAEvD,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,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"}