@rxap/workspace-open-api 0.0.2-dev.6 → 0.0.2-dev.8
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/CHANGELOG.md +11 -0
- package/README.md +1 -1
- package/package.json +9 -9
- package/src/index.d.ts +1 -0
- package/src/index.js +1 -0
- package/src/index.js.map +1 -1
- package/src/lib/generate-data-source.js +4 -4
- package/src/lib/generate-data-source.js.map +1 -1
- package/src/lib/generate-directives.js +8 -8
- package/src/lib/generate-directives.js.map +1 -1
- package/src/lib/generate-operation-command.js +8 -8
- package/src/lib/generate-operation-command.js.map +1 -1
- package/src/lib/generate-remote-method.js +10 -8
- package/src/lib/generate-remote-method.js.map +1 -1
- package/src/lib/utilities/get-request-body-type.d.ts +4 -1
- package/src/lib/utilities/get-request-body-type.js +12 -2
- package/src/lib/utilities/get-request-body-type.js.map +1 -1
- package/src/lib/utilities/get-response-type.d.ts +4 -1
- package/src/lib/utilities/get-response-type.js +12 -2
- package/src/lib/utilities/get-response-type.js.map +1 -1
- package/src/lib/utilities/get-type-parameters.d.ts +3 -0
- package/src/lib/utilities/get-type-parameters.js +33 -0
- package/src/lib/utilities/get-type-parameters.js.map +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.0.2-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@0.0.2-dev.7...@rxap/workspace-open-api@0.0.2-dev.8) (2023-09-27)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rxap/workspace-open-api
|
|
9
|
+
|
|
10
|
+
## [0.0.2-dev.7](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@0.0.2-dev.6...@rxap/workspace-open-api@0.0.2-dev.7) (2023-09-19)
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
- generate correct type for additionallyProperties set to true ([a2976ce](https://gitlab.com/rxap/packages/commit/a2976ce37c224db87d5fdbbd39d0afcd9652c36d))
|
|
15
|
+
- generate generic unknown type ([cad13a4](https://gitlab.com/rxap/packages/commit/cad13a4c32ae120adea3c31329f5d10d97f6b1cb))
|
|
16
|
+
|
|
6
17
|
## [0.0.2-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@0.0.2-dev.5...@rxap/workspace-open-api@0.0.2-dev.6) (2023-09-16)
|
|
7
18
|
|
|
8
19
|
### Bug Fixes
|
package/README.md
CHANGED
|
@@ -17,5 +17,5 @@ yarn add @rxap/workspace-open-api
|
|
|
17
17
|
```
|
|
18
18
|
**Install peer dependencies:**
|
|
19
19
|
```bash
|
|
20
|
-
yarn add @angular-devkit/core@^16.1.4 @rxap/json-schema-to-typescript@^16.0.0-dev.
|
|
20
|
+
yarn add @angular-devkit/core@^16.1.4 @rxap/json-schema-to-typescript@^16.0.0-dev.14 @rxap/utilities@^16.0.0-dev.18 @rxap/workspace-utilities@^0.1.0-dev.15 openapi-types@10.0.0 ts-morph@^18.0.0 tslib@2.6.2
|
|
21
21
|
```
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.0.2-dev.
|
|
2
|
+
"version": "0.0.2-dev.8",
|
|
3
3
|
"name": "@rxap/workspace-open-api",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
@@ -12,13 +12,13 @@
|
|
|
12
12
|
},
|
|
13
13
|
"peerDependencies": {
|
|
14
14
|
"@angular-devkit/core": "^16.1.4",
|
|
15
|
-
"@rxap/json-schema-to-typescript": "^16.0.0-dev.
|
|
16
|
-
"@rxap/utilities": "^16.0.0-dev.
|
|
17
|
-
"@rxap/workspace-utilities": "^0.1.0-dev.
|
|
15
|
+
"@rxap/json-schema-to-typescript": "^16.0.0-dev.14",
|
|
16
|
+
"@rxap/utilities": "^16.0.0-dev.18",
|
|
17
|
+
"@rxap/workspace-utilities": "^0.1.0-dev.15",
|
|
18
18
|
"openapi-types": "10.0.0",
|
|
19
19
|
"ts-morph": "^18.0.0",
|
|
20
20
|
"tslib": "2.6.2",
|
|
21
|
-
"@rxap/node-utilities": "1.1.0-dev.
|
|
21
|
+
"@rxap/node-utilities": "1.1.0-dev.10"
|
|
22
22
|
},
|
|
23
23
|
"author": {
|
|
24
24
|
"name": "Merzough Münker",
|
|
@@ -39,15 +39,15 @@
|
|
|
39
39
|
"packageGroup": [
|
|
40
40
|
{
|
|
41
41
|
"package": "@rxap/json-schema-to-typescript",
|
|
42
|
-
"version": "16.0.0-dev.
|
|
42
|
+
"version": "16.0.0-dev.14"
|
|
43
43
|
},
|
|
44
44
|
{
|
|
45
45
|
"package": "@rxap/utilities",
|
|
46
|
-
"version": "16.0.0-dev.
|
|
46
|
+
"version": "16.0.0-dev.18"
|
|
47
47
|
},
|
|
48
48
|
{
|
|
49
49
|
"package": "@rxap/workspace-utilities",
|
|
50
|
-
"version": "0.1.0-dev.
|
|
50
|
+
"version": "0.1.0-dev.15"
|
|
51
51
|
}
|
|
52
52
|
]
|
|
53
53
|
},
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"directory": "packages/workspace/open-api"
|
|
62
62
|
},
|
|
63
63
|
"type": "commonjs",
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "8d7aeb0f4a5ef9c6476b98d06c6f52f5d79d4a95",
|
|
65
65
|
"main": "./src/index.js",
|
|
66
66
|
"types": "./src/index.d.ts"
|
|
67
67
|
}
|
package/src/index.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export * from './lib/utilities/get-reqeust-body';
|
|
|
4
4
|
export * from './lib/utilities/get-request-body-type';
|
|
5
5
|
export * from './lib/utilities/get-response-type';
|
|
6
6
|
export * from './lib/utilities/get-response';
|
|
7
|
+
export * from './lib/utilities/get-type-parameters';
|
|
7
8
|
export * from './lib/utilities/has-operation-paramters';
|
|
8
9
|
export * from './lib/utilities/has-operation-request-body';
|
|
9
10
|
export * from './lib/utilities/http-request';
|
package/src/index.js
CHANGED
|
@@ -8,6 +8,7 @@ tslib_1.__exportStar(require("./lib/utilities/get-reqeust-body"), exports);
|
|
|
8
8
|
tslib_1.__exportStar(require("./lib/utilities/get-request-body-type"), exports);
|
|
9
9
|
tslib_1.__exportStar(require("./lib/utilities/get-response-type"), exports);
|
|
10
10
|
tslib_1.__exportStar(require("./lib/utilities/get-response"), exports);
|
|
11
|
+
tslib_1.__exportStar(require("./lib/utilities/get-type-parameters"), exports);
|
|
11
12
|
tslib_1.__exportStar(require("./lib/utilities/has-operation-paramters"), exports);
|
|
12
13
|
tslib_1.__exportStar(require("./lib/utilities/has-operation-request-body"), exports);
|
|
13
14
|
tslib_1.__exportStar(require("./lib/utilities/http-request"), exports);
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/workspace/open-api/src/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,4EAAkD;AAClD,6EAAmD;AACnD,2EAAiD;AACjD,gFAAsD;AACtD,4EAAkD;AAClD,uEAA6C;AAC7C,kFAAwD;AACxD,qFAA2D;AAC3D,uEAA6C;AAC7C,2EAAiD;AACjD,iFAAuD;AACvD,yEAA+C;AAC/C,uFAA6D;AAC7D,8EAAoD;AACpD,8EAAoD;AACpD,gFAAsD;AACtD,YAAY;AAEZ,UAAU;AACV,uDAA6B;AAC7B,sDAA4B;AAC5B,iEAAuC;AACvC,oEAA0C;AAC1C,qEAA2C;AAC3C,oEAA0C;AAC1C,uEAA6C;AAC7C,oEAA0C;AAC1C,2EAAiD;AACjD,mEAAyC;AACzC,oEAA0C;AAC1C,uEAA6C;AAC7C,sEAA4C;AAC5C,kEAAwC;AACxC,qEAA2C;AAC3C,wDAA8B;AAC9B,4DAAkC;AAClC,sDAA4B;AAC5B,YAAY"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/workspace/open-api/src/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,4EAAkD;AAClD,6EAAmD;AACnD,2EAAiD;AACjD,gFAAsD;AACtD,4EAAkD;AAClD,uEAA6C;AAC7C,8EAAoD;AACpD,kFAAwD;AACxD,qFAA2D;AAC3D,uEAA6C;AAC7C,2EAAiD;AACjD,iFAAuD;AACvD,yEAA+C;AAC/C,uFAA6D;AAC7D,8EAAoD;AACpD,8EAAoD;AACpD,gFAAsD;AACtD,YAAY;AAEZ,UAAU;AACV,uDAA6B;AAC7B,sDAA4B;AAC5B,iEAAuC;AACvC,oEAA0C;AAC1C,qEAA2C;AAC3C,oEAA0C;AAC1C,uEAA6C;AAC7C,oEAA0C;AAC1C,2EAAiD;AACjD,mEAAyC;AACzC,oEAA0C;AAC1C,uEAA6C;AAC7C,sEAA4C;AAC5C,kEAAwC;AACxC,qEAA2C;AAC3C,wDAA8B;AAC9B,4DAAkC;AAClC,sDAA4B;AAC5B,YAAY"}
|
|
@@ -30,12 +30,12 @@ function GenerateDataSource(parameter) {
|
|
|
30
30
|
namedImports: [{ name: 'Injectable' }],
|
|
31
31
|
},
|
|
32
32
|
];
|
|
33
|
-
const responseType = (0, get_response_type_1.GetResponseType)(parameter);
|
|
33
|
+
const { type: responseType, name: responseName, } = (0, get_response_type_1.GetResponseType)(parameter);
|
|
34
34
|
const parameterType = (0, get_parameter_type_1.GetParameterType)(parameter);
|
|
35
|
-
if (
|
|
35
|
+
if (responseName) {
|
|
36
36
|
importStructures.push({
|
|
37
|
-
moduleSpecifier: (_a = parameter.options.packageName) !== null && _a !== void 0 ? _a : `../responses/${dasherize(
|
|
38
|
-
namedImports: [{ name:
|
|
37
|
+
moduleSpecifier: (_a = parameter.options.packageName) !== null && _a !== void 0 ? _a : `../responses/${dasherize(responseName.replace(/Response$/, ''))}.response`,
|
|
38
|
+
namedImports: [{ name: responseName }],
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
41
|
if (!['void', 'any'].includes(parameterType)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-data-source.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-data-source.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,+BAA4B;AAC5B,uCAKkB;AAClB,mCAGiB;AAEjB,uEAAkE;AAClE,qEAAgE;AAEhE,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,cAAO,CAAC;AAEZ,SAAgB,kBAAkB,CAChC,SAA4B;;IAE5B,IAAI,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE;QAC5C,OAAO;KACR;IAED,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;IAE1C,MAAM,IAAI,GAAG,CAAE,WAAW,EAAE,+BAAuB,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,6BAAqB,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;IAEtE,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAEhE,MAAM,gBAAgB,GAAoD;QACxE;YACE,eAAe,EAAE,4BAA4B;YAC7C,YAAY,EAAE;gBACZ,EAAE,IAAI,EAAE,uBAAuB,EAAE;gBACjC,EAAE,IAAI,EAAE,mBAAmB,EAAE;aAC9B;SACF;QACD;YACE,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,CAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAE;SACzC;KACF,CAAC;IAEF,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"generate-data-source.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-data-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,13 +35,13 @@ function GenerateDirectives(parameter) {
|
|
|
35
35
|
moduleSpecifier: '@rxap/open-api/remote-method',
|
|
36
36
|
namedImports: [{ name: 'OpenApiRemoteMethod' }],
|
|
37
37
|
});
|
|
38
|
-
const responseType = (0, get_response_type_1.GetResponseType)(parameter);
|
|
38
|
+
const { type: responseType, name: responseName, } = (0, get_response_type_1.GetResponseType)(parameter);
|
|
39
39
|
const parameterType = (0, get_parameter_type_1.GetParameterType)(parameter);
|
|
40
|
-
const requestBodyType = (0, get_request_body_type_1.GetRequestBodyType)(parameter);
|
|
41
|
-
if (
|
|
40
|
+
const { type: requestBodyType, name: requestBodyName, } = (0, get_request_body_type_1.GetRequestBodyType)(parameter);
|
|
41
|
+
if (responseName) {
|
|
42
42
|
importStructures.push({
|
|
43
|
-
moduleSpecifier: (_a = parameter.options.packageName) !== null && _a !== void 0 ? _a : `../responses/${(0, utilities_1.dasherize)(
|
|
44
|
-
namedImports: [{ name:
|
|
43
|
+
moduleSpecifier: (_a = parameter.options.packageName) !== null && _a !== void 0 ? _a : `../responses/${(0, utilities_1.dasherize)(responseName.replace(/Response$/, ''))}.response`,
|
|
44
|
+
namedImports: [{ name: responseName }],
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
if (!['void', 'any'].includes(parameterType)) {
|
|
@@ -50,10 +50,10 @@ function GenerateDirectives(parameter) {
|
|
|
50
50
|
namedImports: [{ name: parameterType }],
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
|
-
if (
|
|
53
|
+
if (requestBodyName) {
|
|
54
54
|
importStructures.push({
|
|
55
|
-
moduleSpecifier: (_c = parameter.options.packageName) !== null && _c !== void 0 ? _c : `../request-bodies/${(0, utilities_1.dasherize)(
|
|
56
|
-
namedImports: [{ name:
|
|
55
|
+
moduleSpecifier: (_c = parameter.options.packageName) !== null && _c !== void 0 ? _c : `../request-bodies/${(0, utilities_1.dasherize)(requestBodyName.replace(/RequestBody$/, ''))}.request-body`,
|
|
56
|
+
namedImports: [{ name: requestBodyName }],
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
const withoutParameters = (0, is_without_parameters_1.IsWithoutParameters)(parameter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-directives.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-directives.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AACzB,+BAA4B;AAK5B,mCAIiB;AACjB,yDAAqD;AAKrD,uEAAkE;AAClE,6EAAuE;AACvE,qEAAgE;AAChE,+EAA0E;AAC1E,6EAAwE;AAExE,SAAgB,kBAAkB,CAAC,SAA+C;;IAChF,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;IAE1C,MAAM,IAAI,GAAG,CAAE,WAAW,EAAE,6BAAqB,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,2BAAmB,EAAE,IAAA,qBAAS,EAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAEhE,MAAM,gBAAgB,GAAoD;QACxE;YACE,eAAe,EAAE,8BAA8B;YAC/C,YAAY,EAAE;gBACZ,EAAE,IAAI,EAAE,yBAAyB,EAAE,EAAE,EAAE,IAAI,EAAE,8BAA8B,EAAE;aAC9E;SACF,EAAE;YACD,eAAe,EAAE,eAAe;YAChC,YAAY,EAAE,CAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAE;SACzC;QACD;YACE,eAAe,EAAE,qBAAsB,IAAA,qBAAS,EAAC,WAAW,CAAE,IAAK,iCAA0B,EAAE;YAC/F,YAAY,EAAE,CAAE,IAAA,oBAAQ,EAAC,CAAE,WAAW,EAAE,iCAAyB,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE;SACjF;KACF,CAAC;IAEF,gBAAgB,CAAC,IAAI,CAAC;QACpB,eAAe,EAAE,8BAA8B;QAC/C,YAAY,EAAE,CAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAE;KAClD,CAAC,CAAC;IAEH,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"generate-directives.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-directives.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,13 +30,13 @@ function GenerateOperationCommand(parameter) {
|
|
|
30
30
|
namedImports: [{ name: 'Injectable' }],
|
|
31
31
|
},
|
|
32
32
|
];
|
|
33
|
-
const responseType = (0, get_response_type_1.GetResponseType)(parameter);
|
|
33
|
+
const { type: responseType, name: responseName, } = (0, get_response_type_1.GetResponseType)(parameter);
|
|
34
34
|
const parameterType = (0, get_parameter_type_1.GetParameterType)(parameter);
|
|
35
|
-
const requestBodyType = (0, get_request_body_type_1.GetRequestBodyType)(parameter);
|
|
36
|
-
if (
|
|
35
|
+
const { type: requestBodyType, name: requestBodyName, } = (0, get_request_body_type_1.GetRequestBodyType)(parameter);
|
|
36
|
+
if (responseName) {
|
|
37
37
|
importStructures.push({
|
|
38
|
-
moduleSpecifier: (_a = parameter.options.packageName) !== null && _a !== void 0 ? _a : `../responses/${(0, utilities_1.dasherize)(
|
|
39
|
-
namedImports: [{ name:
|
|
38
|
+
moduleSpecifier: (_a = parameter.options.packageName) !== null && _a !== void 0 ? _a : `../responses/${(0, utilities_1.dasherize)(responseName.replace(/Response$/, ''))}.response`,
|
|
39
|
+
namedImports: [{ name: responseName }],
|
|
40
40
|
});
|
|
41
41
|
}
|
|
42
42
|
if (!['void', 'any'].includes(parameterType)) {
|
|
@@ -45,10 +45,10 @@ function GenerateOperationCommand(parameter) {
|
|
|
45
45
|
namedImports: [{ name: parameterType }],
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
|
-
if (
|
|
48
|
+
if (requestBodyName) {
|
|
49
49
|
importStructures.push({
|
|
50
|
-
moduleSpecifier: (_c = parameter.options.packageName) !== null && _c !== void 0 ? _c : `../request-bodies/${(0, utilities_1.dasherize)(
|
|
51
|
-
namedImports: [{ name:
|
|
50
|
+
moduleSpecifier: (_c = parameter.options.packageName) !== null && _c !== void 0 ? _c : `../request-bodies/${(0, utilities_1.dasherize)(requestBodyName.replace(/RequestBody$/, ''))}.request-body`,
|
|
51
|
+
namedImports: [{ name: requestBodyName }],
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
const callMethodParameters = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-operation-command.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-operation-command.ts"],"names":[],"mappings":";;;;AAAA,+CAGyB;AACzB,+BAA4B;AAC5B,uCAOkB;AAClB,mCAGiB;AACjB,mCAIiB;AACjB,uEAAkE;AAClE,6EAAuE;AACvE,qEAAgE;AAEhE,SAAsB,wBAAwB,CAC5C,SAA+C;;;QAE/C,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;QAE1C,MAAM,IAAI,GAAG,CAAE,WAAW,EAAE,2BAAmB,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE5D,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,yBAAiB,EAAE,IAAA,qBAAS,EAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAElE,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAEhE,MAAM,gBAAgB,GAAoD;YACxE;gBACE,eAAe,EAAE,qBAAqB;gBACtC,YAAY,EAAE;oBACZ,EAAE,IAAI,EAAE,yBAAyB,EAAE;oBACnC,EAAE,IAAI,EAAE,kBAAkB,EAAE;iBAC7B;aACF;YACD;gBACE,eAAe,EAAE,gBAAgB;gBACjC,YAAY,EAAE,CAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAE;aACzC;SACF,CAAC;QAEF,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"generate-operation-command.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-operation-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ const types_1 = require("./types");
|
|
|
9
9
|
const get_parameter_type_1 = require("./utilities/get-parameter-type");
|
|
10
10
|
const get_request_body_type_1 = require("./utilities/get-request-body-type");
|
|
11
11
|
const get_response_type_1 = require("./utilities/get-response-type");
|
|
12
|
+
const get_type_parameters_1 = require("./utilities/get-type-parameters");
|
|
12
13
|
const { dasherize, classify, } = core_1.strings;
|
|
13
14
|
function GenerateRemoteMethod(parameter) {
|
|
14
15
|
var _a, _b, _c;
|
|
@@ -31,13 +32,13 @@ function GenerateRemoteMethod(parameter) {
|
|
|
31
32
|
moduleSpecifier: '@rxap/open-api/remote-method',
|
|
32
33
|
namedImports: [{ name: 'OpenApiRemoteMethod' }],
|
|
33
34
|
});
|
|
34
|
-
const responseType = (0, get_response_type_1.GetResponseType)(parameter);
|
|
35
|
+
const { type: responseType, name: responseName, } = (0, get_response_type_1.GetResponseType)(parameter);
|
|
35
36
|
const parameterType = (0, get_parameter_type_1.GetParameterType)(parameter);
|
|
36
|
-
const requestBodyType = (0, get_request_body_type_1.GetRequestBodyType)(parameter);
|
|
37
|
-
if (
|
|
37
|
+
const { type: requestBodyType, name: requestBodyName, } = (0, get_request_body_type_1.GetRequestBodyType)(parameter);
|
|
38
|
+
if (responseName) {
|
|
38
39
|
importStructures.push({
|
|
39
|
-
moduleSpecifier: (_a = parameter.options.packageName) !== null && _a !== void 0 ? _a : `../responses/${dasherize(
|
|
40
|
-
namedImports: [{ name:
|
|
40
|
+
moduleSpecifier: (_a = parameter.options.packageName) !== null && _a !== void 0 ? _a : `../responses/${dasherize(responseName.replace(/Response$/, ''))}.response`,
|
|
41
|
+
namedImports: [{ name: responseName }],
|
|
41
42
|
});
|
|
42
43
|
}
|
|
43
44
|
if (!['void', 'any'].includes(parameterType)) {
|
|
@@ -46,10 +47,10 @@ function GenerateRemoteMethod(parameter) {
|
|
|
46
47
|
namedImports: [{ name: parameterType }],
|
|
47
48
|
});
|
|
48
49
|
}
|
|
49
|
-
if (
|
|
50
|
+
if (requestBodyName) {
|
|
50
51
|
importStructures.push({
|
|
51
|
-
moduleSpecifier: (_c = parameter.options.packageName) !== null && _c !== void 0 ? _c : `../request-bodies/${dasherize(
|
|
52
|
-
namedImports: [{ name:
|
|
52
|
+
moduleSpecifier: (_c = parameter.options.packageName) !== null && _c !== void 0 ? _c : `../request-bodies/${dasherize(requestBodyName.replace(/RequestBody$/, ''))}.request-body`,
|
|
53
|
+
namedImports: [{ name: requestBodyName }],
|
|
53
54
|
});
|
|
54
55
|
}
|
|
55
56
|
const callMethodParameters = [];
|
|
@@ -62,6 +63,7 @@ function GenerateRemoteMethod(parameter) {
|
|
|
62
63
|
}
|
|
63
64
|
const classStructure = {
|
|
64
65
|
name: classify(name.replace(/\./g, '-')),
|
|
66
|
+
typeParameters: (0, get_type_parameters_1.GetTypeParameters)(parameter),
|
|
65
67
|
decorators: [
|
|
66
68
|
{
|
|
67
69
|
name: 'Injectable',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-remote-method.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-remote-method.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,+BAA4B;AAC5B,uCAOkB;AAClB,mCAGiB;AACjB,mCAIiB;AACjB,uEAAkE;AAClE,6EAAuE;AACvE,qEAAgE;
|
|
1
|
+
{"version":3,"file":"generate-remote-method.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-remote-method.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,21 +5,31 @@ const utilities_1 = require("@rxap/utilities");
|
|
|
5
5
|
const config_1 = require("../config");
|
|
6
6
|
const any_schema_object_1 = require("./any-schema-object");
|
|
7
7
|
const get_reqeust_body_1 = require("./get-reqeust-body");
|
|
8
|
+
const is_reference_object_1 = require("./is-reference-object");
|
|
8
9
|
function GetRequestBodyType(operation) {
|
|
9
10
|
let requestBodyType = 'void';
|
|
11
|
+
let name = null;
|
|
10
12
|
if (operation.operationId) {
|
|
11
13
|
const requestBody = (0, get_reqeust_body_1.GetRequestBody)(operation);
|
|
12
14
|
if (requestBody === null) {
|
|
13
15
|
requestBodyType = 'void';
|
|
14
16
|
}
|
|
15
17
|
else if (!(0, any_schema_object_1.IsAnySchemaObject)(requestBody)) {
|
|
16
|
-
requestBodyType = (0, utilities_1.classify)([operation.operationId, config_1.REQUEST_BODY_FILE_SUFFIX].join('-'));
|
|
18
|
+
name = requestBodyType = (0, utilities_1.classify)([operation.operationId, config_1.REQUEST_BODY_FILE_SUFFIX].join('-'));
|
|
19
|
+
if (!(0, is_reference_object_1.IsReferenceObject)(requestBody)) {
|
|
20
|
+
if (requestBody.additionalProperties === true || requestBody.type === undefined) {
|
|
21
|
+
requestBodyType += `<TRequestBody>`;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
17
24
|
}
|
|
18
25
|
else {
|
|
19
26
|
requestBodyType = 'any';
|
|
20
27
|
}
|
|
21
28
|
}
|
|
22
|
-
return
|
|
29
|
+
return {
|
|
30
|
+
type: requestBodyType,
|
|
31
|
+
name,
|
|
32
|
+
};
|
|
23
33
|
}
|
|
24
34
|
exports.GetRequestBodyType = GetRequestBodyType;
|
|
25
35
|
//# sourceMappingURL=get-request-body-type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-request-body-type.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/open-api/src/lib/utilities/get-request-body-type.ts"],"names":[],"mappings":";;;AAAA,+CAA2C;AAC3C,sCAAqD;AAErD,2DAAwD;AACxD,yDAAoD;
|
|
1
|
+
{"version":3,"file":"get-request-body-type.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/open-api/src/lib/utilities/get-request-body-type.ts"],"names":[],"mappings":";;;AAAA,+CAA2C;AAC3C,sCAAqD;AAErD,2DAAwD;AACxD,yDAAoD;AACpD,+DAA0D;AAE1D,SAAgB,kBAAkB,CAAC,SAAiC;IAElE,IAAI,eAAe,GAAG,MAAM,CAAC;IAC7B,IAAI,IAAI,GAAkB,IAAI,CAAC;IAE/B,IAAI,SAAS,CAAC,WAAW,EAAE;QAEzB,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,SAAS,CAAC,CAAC;QAE9C,IAAI,WAAW,KAAK,IAAI,EAAE;YACxB,eAAe,GAAG,MAAM,CAAC;SAC1B;aAAM,IAAI,CAAC,IAAA,qCAAiB,EAAC,WAAW,CAAC,EAAE;YAC1C,IAAI,GAAG,eAAe,GAAG,IAAA,oBAAQ,EAAC,CAAE,SAAS,CAAC,WAAW,EAAE,iCAAwB,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACjG,IAAI,CAAC,IAAA,uCAAiB,EAAC,WAAW,CAAC,EAAE;gBACnC,IAAI,WAAW,CAAC,oBAAoB,KAAK,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE;oBAC/E,eAAe,IAAI,gBAAgB,CAAC;iBACrC;aACF;SACF;aAAM;YACL,eAAe,GAAG,KAAK,CAAC;SACzB;KAEF;IAED,OAAO;QACL,IAAI,EAAE,eAAe;QACrB,IAAI;KACL,CAAC;AAEJ,CAAC;AA7BD,gDA6BC"}
|
|
@@ -5,19 +5,29 @@ const utilities_1 = require("@rxap/utilities");
|
|
|
5
5
|
const config_1 = require("../config");
|
|
6
6
|
const any_schema_object_1 = require("./any-schema-object");
|
|
7
7
|
const get_response_1 = require("./get-response");
|
|
8
|
+
const is_reference_object_1 = require("./is-reference-object");
|
|
8
9
|
function GetResponseType(operation) {
|
|
9
10
|
let responseType = 'void';
|
|
11
|
+
let name = null;
|
|
10
12
|
if (operation.operationId) {
|
|
11
13
|
const response = (0, get_response_1.GetResponse)(operation);
|
|
12
14
|
// only generate the response interface if the type is not any
|
|
13
15
|
if (response && !(0, any_schema_object_1.IsAnySchemaObject)(response)) {
|
|
14
|
-
responseType = (0, utilities_1.classify)([operation.operationId, config_1.RESPONSE_FILE_SUFFIX].join('-'));
|
|
16
|
+
name = responseType = (0, utilities_1.classify)([operation.operationId, config_1.RESPONSE_FILE_SUFFIX].join('-'));
|
|
17
|
+
if (!(0, is_reference_object_1.IsReferenceObject)(response)) {
|
|
18
|
+
if (response.additionalProperties === true || response.type === undefined) {
|
|
19
|
+
responseType += `<TResponse>`;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
15
22
|
}
|
|
16
23
|
else {
|
|
17
24
|
responseType = 'void';
|
|
18
25
|
}
|
|
19
26
|
}
|
|
20
|
-
return
|
|
27
|
+
return {
|
|
28
|
+
type: responseType,
|
|
29
|
+
name,
|
|
30
|
+
};
|
|
21
31
|
}
|
|
22
32
|
exports.GetResponseType = GetResponseType;
|
|
23
33
|
//# sourceMappingURL=get-response-type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-response-type.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/open-api/src/lib/utilities/get-response-type.ts"],"names":[],"mappings":";;;AAAA,+CAA2C;AAE3C,sCAAiD;AACjD,2DAAwD;AACxD,iDAA6C;
|
|
1
|
+
{"version":3,"file":"get-response-type.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/open-api/src/lib/utilities/get-response-type.ts"],"names":[],"mappings":";;;AAAA,+CAA2C;AAE3C,sCAAiD;AACjD,2DAAwD;AACxD,iDAA6C;AAC7C,+DAA0D;AAE1D,SAAgB,eAAe,CAAC,SAAoC;IAElE,IAAI,YAAY,GAAG,MAAM,CAAC;IAC1B,IAAI,IAAI,GAAkB,IAAI,CAAC;IAE/B,IAAI,SAAS,CAAC,WAAW,EAAE;QAEzB,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAAC,SAAS,CAAC,CAAC;QAExC,8DAA8D;QAC9D,IAAI,QAAQ,IAAI,CAAC,IAAA,qCAAiB,EAAC,QAAQ,CAAC,EAAE;YAC5C,IAAI,GAAG,YAAY,GAAG,IAAA,oBAAQ,EAAC,CAAE,SAAS,CAAC,WAAW,EAAE,6BAAoB,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1F,IAAI,CAAC,IAAA,uCAAiB,EAAC,QAAQ,CAAC,EAAE;gBAChC,IAAI,QAAQ,CAAC,oBAAoB,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;oBACzE,YAAY,IAAI,aAAa,CAAC;iBAC/B;aACF;SACF;aAAM;YACL,YAAY,GAAG,MAAM,CAAC;SACvB;KAEF;IAED,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,IAAI;KACL,CAAC;AAEJ,CAAC;AA5BD,0CA4BC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GetTypeParameters = void 0;
|
|
4
|
+
const any_schema_object_1 = require("./any-schema-object");
|
|
5
|
+
const get_reqeust_body_1 = require("./get-reqeust-body");
|
|
6
|
+
const get_response_1 = require("./get-response");
|
|
7
|
+
const is_reference_object_1 = require("./is-reference-object");
|
|
8
|
+
function GetTypeParameters(operation) {
|
|
9
|
+
const typeParameters = [];
|
|
10
|
+
if (operation.operationId) {
|
|
11
|
+
const response = (0, get_response_1.GetResponse)(operation);
|
|
12
|
+
const requestBody = (0, get_reqeust_body_1.GetRequestBody)(operation);
|
|
13
|
+
if (response && !(0, any_schema_object_1.IsAnySchemaObject)(response) && !(0, is_reference_object_1.IsReferenceObject)(response)) {
|
|
14
|
+
if (response.additionalProperties === true || response.type === undefined) {
|
|
15
|
+
typeParameters.push({
|
|
16
|
+
name: 'TResponse',
|
|
17
|
+
default: 'unknown',
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
if (requestBody && !(0, any_schema_object_1.IsAnySchemaObject)(requestBody) && !(0, is_reference_object_1.IsReferenceObject)(requestBody)) {
|
|
22
|
+
if (requestBody.additionalProperties === true || requestBody.type === undefined) {
|
|
23
|
+
typeParameters.push({
|
|
24
|
+
name: 'TRequestBody',
|
|
25
|
+
default: 'unknown',
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return typeParameters;
|
|
31
|
+
}
|
|
32
|
+
exports.GetTypeParameters = GetTypeParameters;
|
|
33
|
+
//# sourceMappingURL=get-type-parameters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-type-parameters.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/open-api/src/lib/utilities/get-type-parameters.ts"],"names":[],"mappings":";;;AAKA,2DAAwD;AACxD,yDAAoD;AACpD,iDAA6C;AAC7C,+DAA0D;AAE1D,SAAgB,iBAAiB,CAAC,SAAoC;IAEpE,MAAM,cAAc,GAA2D,EAAE,CAAC;IAElF,IAAI,SAAS,CAAC,WAAW,EAAE;QAEzB,MAAM,QAAQ,GAAG,IAAA,0BAAW,EAAC,SAAS,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,SAAS,CAAC,CAAC;QAE9C,IAAI,QAAQ,IAAI,CAAC,IAAA,qCAAiB,EAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,uCAAiB,EAAC,QAAQ,CAAC,EAAE;YAC5E,IAAI,QAAQ,CAAC,oBAAoB,KAAK,IAAI,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE;gBACzE,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,SAAS;iBACnB,CAAC,CAAC;aACJ;SACF;QAED,IAAI,WAAW,IAAI,CAAC,IAAA,qCAAiB,EAAC,WAAW,CAAC,IAAI,CAAC,IAAA,uCAAiB,EAAC,WAAW,CAAC,EAAE;YACrF,IAAI,WAAW,CAAC,oBAAoB,KAAK,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE;gBAC/E,cAAc,CAAC,IAAI,CAAC;oBAClB,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,SAAS;iBACnB,CAAC,CAAC;aACJ;SACF;KAEF;IAED,OAAO,cAAc,CAAC;AAExB,CAAC;AA/BD,8CA+BC"}
|