@rxap/schematics-open-api 16.0.0-dev.8 → 16.0.0-dev.9
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 +6 -0
- package/package.json +2 -2
- package/src/schematics/generate/generate-data-source.d.ts +2 -0
- package/src/schematics/generate/generate-data-source.js +74 -0
- package/src/schematics/generate/generate-data-source.js.map +1 -0
- package/src/schematics/generate/index.js +5 -0
- package/src/schematics/generate/index.js.map +1 -1
- package/src/schematics/generate/schema.d.ts +1 -0
- package/src/schematics/generate/schema.json +8 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
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
|
+
# [16.0.0-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/schematics-open-api@16.0.0-dev.8...@rxap/schematics-open-api@16.0.0-dev.9) (2023-08-05)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- add data source generator ([b8fe938](https://gitlab.com/rxap/packages/commit/b8fe93845c23bf37fa6fe92194105fc97c0c6710))
|
|
11
|
+
|
|
6
12
|
# [16.0.0-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/schematics-open-api@16.0.0-dev.7...@rxap/schematics-open-api@16.0.0-dev.8) (2023-08-05)
|
|
7
13
|
|
|
8
14
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rxap/schematics-open-api",
|
|
3
|
-
"version": "16.0.0-dev.
|
|
3
|
+
"version": "16.0.0-dev.9",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@apidevtools/json-schema-ref-parser": "9.0.9",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
}
|
|
69
69
|
]
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "724544e2cbf11b07930433a088326e96b21c2651",
|
|
72
72
|
"main": "./src/index.js",
|
|
73
73
|
"types": "./src/index.d.ts"
|
|
74
74
|
}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GenerateDataSource = void 0;
|
|
4
|
+
const core_1 = require("@angular-devkit/core");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const ts_morph_1 = require("ts-morph");
|
|
7
|
+
const get_parameter_type_1 = require("../../lib/utilities/get-parameter-type");
|
|
8
|
+
const get_response_type_1 = require("../../lib/utilities/get-response-type");
|
|
9
|
+
const const_1 = require("./const");
|
|
10
|
+
const { dasherize, classify, } = core_1.strings;
|
|
11
|
+
function GenerateDataSource(parameter) {
|
|
12
|
+
if (parameter.method.toUpperCase() !== 'GET') {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
const operationId = parameter.operationId;
|
|
16
|
+
const name = [operationId, const_1.DATA_SOURCE_FILE_SUFFIX].join('.');
|
|
17
|
+
const fileName = (0, path_1.join)(const_1.DATA_SOURCE_BASE_PATH, dasherize(name) + '.ts');
|
|
18
|
+
const sourceFile = parameter.project.createSourceFile(fileName);
|
|
19
|
+
const importStructures = [
|
|
20
|
+
{
|
|
21
|
+
moduleSpecifier: '@rxap/open-api/data-source',
|
|
22
|
+
namedImports: [
|
|
23
|
+
{ name: 'RxapOpenApiDataSource' },
|
|
24
|
+
{ name: 'OpenApiDataSource' },
|
|
25
|
+
],
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
moduleSpecifier: '@angular/core',
|
|
29
|
+
namedImports: [{ name: 'Injectable' }],
|
|
30
|
+
},
|
|
31
|
+
];
|
|
32
|
+
const responseType = (0, get_response_type_1.GetResponseType)(parameter);
|
|
33
|
+
const parameterType = (0, get_parameter_type_1.GetParameterType)(parameter);
|
|
34
|
+
if (!['void', 'any'].includes(responseType)) {
|
|
35
|
+
importStructures.push({
|
|
36
|
+
moduleSpecifier: `../responses/${dasherize(responseType.replace(/Response$/, ''))}.response`,
|
|
37
|
+
namedImports: [{ name: responseType }],
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
if (!['void', 'any'].includes(parameterType)) {
|
|
41
|
+
importStructures.push({
|
|
42
|
+
moduleSpecifier: `../parameters/${dasherize(parameterType.replace(/Parameter$/, ''))}.parameter`,
|
|
43
|
+
namedImports: [{ name: parameterType }],
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
const classStructure = {
|
|
47
|
+
name: classify(name.replace(/\./g, '-')),
|
|
48
|
+
decorators: [
|
|
49
|
+
{
|
|
50
|
+
name: 'Injectable',
|
|
51
|
+
arguments: ts_morph_1.Writers.object({
|
|
52
|
+
providedIn: (writer) => writer.quote('root'),
|
|
53
|
+
}),
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
name: 'RxapOpenApiDataSource',
|
|
57
|
+
arguments: (writer) => writer.quote(operationId),
|
|
58
|
+
},
|
|
59
|
+
],
|
|
60
|
+
extends: (writer) => {
|
|
61
|
+
writer.write('OpenApiDataSource');
|
|
62
|
+
writer.write('<');
|
|
63
|
+
writer.write(responseType);
|
|
64
|
+
writer.write(', ');
|
|
65
|
+
writer.write(parameterType);
|
|
66
|
+
writer.write('>');
|
|
67
|
+
},
|
|
68
|
+
isExported: true,
|
|
69
|
+
};
|
|
70
|
+
sourceFile.addImportDeclarations(importStructures);
|
|
71
|
+
sourceFile.addClass(classStructure);
|
|
72
|
+
}
|
|
73
|
+
exports.GenerateDataSource = GenerateDataSource;
|
|
74
|
+
//# sourceMappingURL=generate-data-source.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate-data-source.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/open-api/src/schematics/generate/generate-data-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const config_1 = require("../../lib/config");
|
|
|
11
11
|
const generate_operation_1 = require("../../lib/generate-operation");
|
|
12
12
|
const load_open_api_config_1 = require("../../lib/load-open-api-config");
|
|
13
13
|
const const_1 = require("./const");
|
|
14
|
+
const generate_data_source_1 = require("./generate-data-source");
|
|
14
15
|
const generate_operation_command_1 = require("./generate-operation-command");
|
|
15
16
|
const generate_remote_method_1 = require("./generate-remote-method");
|
|
16
17
|
function resolveRef(openApiSpec, node, parent, key) {
|
|
@@ -66,6 +67,10 @@ function default_1(options) {
|
|
|
66
67
|
generatorFunctionList.push(generate_remote_method_1.GenerateRemoteMethod);
|
|
67
68
|
clearPathList.push(const_1.REMOTE_METHOD_BASE_PATH);
|
|
68
69
|
}
|
|
70
|
+
if (!options.skipDataSource) {
|
|
71
|
+
generatorFunctionList.push(generate_data_source_1.GenerateDataSource);
|
|
72
|
+
clearPathList.push(const_1.DATA_SOURCE_BASE_PATH);
|
|
73
|
+
}
|
|
69
74
|
if (!options.skipCommand) {
|
|
70
75
|
generatorFunctionList.push(generate_operation_command_1.GenerateOperationCommand);
|
|
71
76
|
clearPathList.push(const_1.COMMAND_BASE_PATH);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/open-api/src/schematics/generate/index.ts"],"names":[],"mappings":";;;AAAA,2DAIoC;AACpC,mEAAoE;AACpE,qEAGoC;AAEpC,+BAA4B;AAC5B,uCAIkB;AAClB,+DAA2D;AAC3D,6CAK0B;AAC1B,qEAAiE;AACjE,yEAAmE;AAEnE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/open-api/src/schematics/generate/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,10 @@
|
|
|
43
43
|
"type": "boolean",
|
|
44
44
|
"default": false
|
|
45
45
|
},
|
|
46
|
+
"skipDataSource": {
|
|
47
|
+
"type": "boolean",
|
|
48
|
+
"default": false
|
|
49
|
+
},
|
|
46
50
|
"skipProvider": {
|
|
47
51
|
"type": "boolean",
|
|
48
52
|
"default": false
|
|
@@ -96,6 +100,10 @@
|
|
|
96
100
|
"type": "boolean",
|
|
97
101
|
"default": false
|
|
98
102
|
},
|
|
103
|
+
"skipDataSource": {
|
|
104
|
+
"type": "boolean",
|
|
105
|
+
"default": false
|
|
106
|
+
},
|
|
99
107
|
"inline": {
|
|
100
108
|
"type": "boolean",
|
|
101
109
|
"default": false
|