@ama-sdk/schematics 10.1.8 → 10.1.10
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.
- package/package.json +9 -9
- package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen-tests.jar +0 -0
- package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen.jar +0 -0
- package/schematics/typescript/core/helpers/path-extractor.d.ts +9 -0
- package/schematics/typescript/core/helpers/path-extractor.d.ts.map +1 -0
- package/schematics/typescript/core/helpers/path-extractor.js +33 -0
- package/schematics/typescript/core/helpers/path-extractor.js.map +1 -0
- package/schematics/typescript/core/index.d.ts.map +1 -1
- package/schematics/typescript/core/index.js +15 -15
- package/schematics/typescript/core/index.js.map +1 -1
- package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator-tests.jar +0 -0
- 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.1.
|
|
3
|
+
"version": "10.1.10",
|
|
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.1.
|
|
51
|
+
"@ama-sdk/core": "^10.1.10",
|
|
52
52
|
"@angular-devkit/core": "~17.2.0",
|
|
53
53
|
"@angular-devkit/schematics": "~17.2.0",
|
|
54
54
|
"@angular-devkit/schematics-cli": "^17.0.1",
|
|
55
55
|
"@angular/cli": "^17.0.1",
|
|
56
|
-
"@o3r/schematics": "^10.1.
|
|
56
|
+
"@o3r/schematics": "^10.1.10",
|
|
57
57
|
"@openapitools/openapi-generator-cli": "~2.10.0",
|
|
58
58
|
"@schematics/angular": "~17.2.0"
|
|
59
59
|
},
|
|
@@ -64,20 +64,19 @@
|
|
|
64
64
|
"minimatch": "~9.0.3",
|
|
65
65
|
"rxjs": "^7.8.1",
|
|
66
66
|
"semver": "^7.5.2",
|
|
67
|
-
"sway": "^2.0.6",
|
|
68
67
|
"tslib": "^2.5.3"
|
|
69
68
|
},
|
|
70
69
|
"devDependencies": {
|
|
71
|
-
"@ama-sdk/core": "^10.1.
|
|
70
|
+
"@ama-sdk/core": "^10.1.10",
|
|
72
71
|
"@angular-devkit/schematics-cli": "~17.2.0",
|
|
73
72
|
"@angular-eslint/eslint-plugin": "~17.2.0",
|
|
74
73
|
"@angular/cli": "~17.2.0",
|
|
75
74
|
"@nx/eslint-plugin": "~18.0.2",
|
|
76
75
|
"@nx/jest": "~18.0.2",
|
|
77
|
-
"@o3r/build-helpers": "^10.1.
|
|
78
|
-
"@o3r/eslint-plugin": "^10.1.
|
|
79
|
-
"@o3r/schematics": "^10.1.
|
|
80
|
-
"@o3r/test-helpers": "^10.1.
|
|
76
|
+
"@o3r/build-helpers": "^10.1.10",
|
|
77
|
+
"@o3r/eslint-plugin": "^10.1.10",
|
|
78
|
+
"@o3r/schematics": "^10.1.10",
|
|
79
|
+
"@o3r/test-helpers": "^10.1.10",
|
|
81
80
|
"@openapitools/openapi-generator-cli": "~2.10.0",
|
|
82
81
|
"@schematics/angular": "~17.2.0",
|
|
83
82
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
@@ -106,6 +105,7 @@
|
|
|
106
105
|
"npm-run-all2": "^6.0.0",
|
|
107
106
|
"nx": "~18.0.2",
|
|
108
107
|
"onchange": "^7.0.2",
|
|
108
|
+
"openapi-types": "^12.0.0",
|
|
109
109
|
"pid-from-port": "^1.1.3",
|
|
110
110
|
"semver": "^7.5.2",
|
|
111
111
|
"ts-jest": "~29.1.1",
|
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { PathObject } from '@ama-sdk/core';
|
|
2
|
+
import type { OpenAPIV2, OpenAPIV3, OpenAPIV3_1 } from 'openapi-types';
|
|
3
|
+
/**
|
|
4
|
+
* Parse a single specification to retrieve the Operation Finder information
|
|
5
|
+
* This function is properly working to a specification that does not include external references in the Paths object
|
|
6
|
+
* @param specification Specification single object to parse
|
|
7
|
+
*/
|
|
8
|
+
export declare const generateOperationFinderFromSingleFile: (specification: OpenAPIV2.Document | OpenAPIV3.Document | OpenAPIV3_1.Document) => PathObject[];
|
|
9
|
+
//# sourceMappingURL=path-extractor.d.ts.map
|
|
@@ -0,0 +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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.generateOperationFinderFromSingleFile = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Parse a single specification to retrieve the Operation Finder information
|
|
6
|
+
* This function is properly working to a specification that does not include external references in the Paths object
|
|
7
|
+
* @param specification Specification single object to parse
|
|
8
|
+
*/
|
|
9
|
+
// eslint-disable-next-line camelcase
|
|
10
|
+
const generateOperationFinderFromSingleFile = (specification) => {
|
|
11
|
+
if (!specification.paths) {
|
|
12
|
+
return [];
|
|
13
|
+
}
|
|
14
|
+
return Object.entries(specification.paths)
|
|
15
|
+
.filter(([, pathObject]) => !!pathObject)
|
|
16
|
+
.map(([path, pathObjectOrRef]) => {
|
|
17
|
+
// eslint-disable-next-line camelcase
|
|
18
|
+
const pathObject = pathObjectOrRef.$ref
|
|
19
|
+
? pathObjectOrRef.$ref.replace(/^#\/?/, '').split('/').reduce((acc, ref) => acc[ref], specification)
|
|
20
|
+
: pathObjectOrRef;
|
|
21
|
+
return {
|
|
22
|
+
path,
|
|
23
|
+
regexp: new RegExp(`^${path.replace(/\{[^}]+}/g, '((?:[^/]+?))')}(?:/(?=$))?$`),
|
|
24
|
+
operations: Object.entries(pathObject)
|
|
25
|
+
.map(([method, reqObject]) => ({
|
|
26
|
+
method,
|
|
27
|
+
operationId: reqObject.operationId
|
|
28
|
+
}))
|
|
29
|
+
};
|
|
30
|
+
});
|
|
31
|
+
};
|
|
32
|
+
exports.generateOperationFinderFromSingleFile = generateOperationFinderFromSingleFile;
|
|
33
|
+
//# sourceMappingURL=path-extractor.js.map
|
|
@@ -0,0 +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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAgOvE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,gEAAmE,CAAC"}
|
|
@@ -6,9 +6,9 @@ const schematics_2 = require("@o3r/schematics");
|
|
|
6
6
|
const node_fs_1 = require("node:fs");
|
|
7
7
|
const path = require("node:path");
|
|
8
8
|
const semver = require("semver");
|
|
9
|
-
const sway = require("sway");
|
|
10
9
|
const tree_glob_1 = require("../../helpers/tree-glob");
|
|
11
10
|
const open_api_cli_generator_1 = require("../../code-generator/open-api-cli-generator/open-api-cli.generator");
|
|
11
|
+
const path_extractor_1 = require("./helpers/path-extractor");
|
|
12
12
|
const JAVA_OPTIONS = ['specPath', 'specConfigPath', 'globalProperty', 'outputPath'];
|
|
13
13
|
const OPEN_API_TOOLS_OPTIONS = ['generatorName', 'output', 'inputSpec', 'config', 'globalProperty'];
|
|
14
14
|
const getRegexpTemplate = (regexp) => `new RegExp('${regexp.toString().replace(/\/(.*)\//, '$1').replace(/\\\//g, '/')}')`;
|
|
@@ -106,8 +106,21 @@ const getGeneratorOptions = (tree, context, options) => {
|
|
|
106
106
|
*/
|
|
107
107
|
function ngGenerateTypescriptSDKFn(options) {
|
|
108
108
|
return (tree, context) => {
|
|
109
|
-
const targetPath = options.directory || '';
|
|
110
109
|
const generatorOptions = getGeneratorOptions(tree, context, options);
|
|
110
|
+
const specPath = path.resolve(process.cwd(), generatorOptions.specPath);
|
|
111
|
+
const targetPath = options.directory || '';
|
|
112
|
+
const specContent = (0, node_fs_1.readFileSync)(specPath).toString();
|
|
113
|
+
let jsonSpecContent;
|
|
114
|
+
try {
|
|
115
|
+
jsonSpecContent = JSON.parse(specContent);
|
|
116
|
+
}
|
|
117
|
+
catch (e) {
|
|
118
|
+
}
|
|
119
|
+
const generateOperationFinder = async () => {
|
|
120
|
+
const specification = jsonSpecContent || (await Promise.resolve().then(() => require('js-yaml'))).load(specContent);
|
|
121
|
+
const extraction = (0, path_extractor_1.generateOperationFinderFromSingleFile)(specification);
|
|
122
|
+
return extraction || [];
|
|
123
|
+
};
|
|
111
124
|
/**
|
|
112
125
|
* rule to clear previous SDK generation
|
|
113
126
|
*/
|
|
@@ -117,18 +130,6 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
117
130
|
(0, tree_glob_1.treeGlob)(tree, path.posix.join(targetPath, 'src', 'spec', '!(operation-adapter|index).ts')).forEach((file) => tree.delete(file));
|
|
118
131
|
return tree;
|
|
119
132
|
};
|
|
120
|
-
const generateOperationFinder = async () => {
|
|
121
|
-
const swayOptions = {
|
|
122
|
-
definition: path.resolve(generatorOptions.specPath)
|
|
123
|
-
};
|
|
124
|
-
const swayApi = await sway.create(swayOptions);
|
|
125
|
-
const extraction = swayApi.getPaths().map((obj) => ({
|
|
126
|
-
path: obj.path,
|
|
127
|
-
regexp: obj.regexp,
|
|
128
|
-
operations: obj.getOperations().map((op) => ({ method: op.method, operationId: op.operationId }))
|
|
129
|
-
}));
|
|
130
|
-
return extraction || [];
|
|
131
|
-
};
|
|
132
133
|
/**
|
|
133
134
|
* rule to update readme and generate mandatory code source
|
|
134
135
|
*/
|
|
@@ -150,7 +151,6 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
150
151
|
*/
|
|
151
152
|
const updateSpec = () => {
|
|
152
153
|
const readmeFile = path.posix.join(targetPath, 'readme.md');
|
|
153
|
-
const specContent = (0, node_fs_1.readFileSync)(generatorOptions.specPath).toString();
|
|
154
154
|
if (tree.exists(readmeFile)) {
|
|
155
155
|
const specVersion = /version: *([0-9]+\.[0-9]+\.[0-9]+(?:-[^ ]+)?)/.exec(specContent);
|
|
156
156
|
if (specVersion) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":";;;AAAA,2DAYoC;AAEpC,gDAAwE;AACxE,qCAAuC;AACvC,kCAAkC;AAClC,iCAAiC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|