@rxap/schematics-open-api 16.0.0-dev.13 → 16.0.0-dev.15
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 +12 -0
- package/README.md +1 -1
- package/package.json +16 -15
- package/src/index.js +29 -26
- package/src/index.js.map +1 -1
- package/src/lib/clear-operation.js +9 -5
- package/src/lib/clear-operation.js.map +1 -1
- package/src/lib/config.js +10 -7
- package/src/lib/config.js.map +1 -1
- package/src/lib/generate-components.js +9 -8
- package/src/lib/generate-components.js.map +1 -1
- package/src/lib/generate-index-exports.js +7 -3
- package/src/lib/generate-index-exports.js.map +1 -1
- package/src/lib/generate-operation.js +26 -24
- package/src/lib/generate-operation.js.map +1 -1
- package/src/lib/generate-parameters.js +18 -16
- package/src/lib/generate-parameters.js.map +1 -1
- package/src/lib/generate-request-body.js +14 -13
- package/src/lib/generate-request-body.js.map +1 -1
- package/src/lib/generate-response.js +14 -13
- package/src/lib/generate-response.js.map +1 -1
- package/src/lib/load-open-api-config.js +23 -16
- package/src/lib/load-open-api-config.js.map +1 -1
- package/src/lib/types.js +9 -3
- package/src/lib/types.js.map +1 -1
- package/src/lib/utilities/any-schema-object.js +5 -1
- package/src/lib/utilities/any-schema-object.js.map +1 -1
- package/src/lib/utilities/get-parameter-type.js +8 -4
- package/src/lib/utilities/get-parameter-type.js.map +1 -1
- package/src/lib/utilities/get-reqeust-body.js +10 -6
- package/src/lib/utilities/get-reqeust-body.js.map +1 -1
- package/src/lib/utilities/get-request-body-type.js +12 -8
- package/src/lib/utilities/get-request-body-type.js.map +1 -1
- package/src/lib/utilities/get-response-type.js +12 -8
- package/src/lib/utilities/get-response-type.js.map +1 -1
- package/src/lib/utilities/get-response.js +7 -3
- package/src/lib/utilities/get-response.js.map +1 -1
- package/src/lib/utilities/has-operation-paramters.js +5 -1
- package/src/lib/utilities/has-operation-paramters.js.map +1 -1
- package/src/lib/utilities/has-operation-request-body.js +5 -1
- package/src/lib/utilities/has-operation-request-body.js.map +1 -1
- package/src/lib/utilities/http-request.js +7 -3
- package/src/lib/utilities/http-request.js.map +1 -1
- package/src/lib/utilities/ignore-operation.js +7 -2
- package/src/lib/utilities/ignore-operation.js.map +1 -1
- package/src/lib/utilities/is-collection-response.js +11 -7
- package/src/lib/utilities/is-collection-response.js.map +1 -1
- package/src/lib/utilities/is-http-method.js +5 -1
- package/src/lib/utilities/is-http-method.js.map +1 -1
- package/src/lib/utilities/is-open-api-schema-from-path.js +7 -3
- package/src/lib/utilities/is-open-api-schema-from-path.js.map +1 -1
- package/src/lib/utilities/is-operation-object.js +5 -1
- package/src/lib/utilities/is-operation-object.js.map +1 -1
- package/src/lib/utilities/is-reference-object.js +5 -1
- package/src/lib/utilities/is-reference-object.js.map +1 -1
- package/src/lib/utilities/is-without-parameters.js +5 -1
- package/src/lib/utilities/is-without-parameters.js.map +1 -1
- package/src/schematics/generate/const.js +8 -5
- package/src/schematics/generate/const.js.map +1 -1
- package/src/schematics/generate/create-directive.js +14 -10
- package/src/schematics/generate/create-directive.js.map +1 -1
- package/src/schematics/generate/generate-data-source.js +17 -13
- package/src/schematics/generate/generate-data-source.js.map +1 -1
- package/src/schematics/generate/generate-openapi-provider.js +13 -9
- package/src/schematics/generate/generate-openapi-provider.js.map +1 -1
- package/src/schematics/generate/generate-operation-command.js +112 -105
- package/src/schematics/generate/generate-operation-command.js.map +1 -1
- package/src/schematics/generate/generate-remote-method.js +31 -27
- package/src/schematics/generate/generate-remote-method.js.map +1 -1
- package/src/schematics/generate/index.js +43 -38
- package/src/schematics/generate/index.js.map +1 -1
- package/src/schematics/generate/options.js +2 -1
|
@@ -1,24 +1,28 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
+
const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
|
|
6
|
+
const schematics_utilities_1 = require("@rxap/schematics-utilities");
|
|
7
|
+
const path_1 = require("path");
|
|
8
|
+
const ts_morph_1 = require("ts-morph");
|
|
9
|
+
const clear_operation_1 = require("../../lib/clear-operation");
|
|
10
|
+
const config_1 = require("../../lib/config");
|
|
11
|
+
const generate_operation_1 = require("../../lib/generate-operation");
|
|
12
|
+
const load_open_api_config_1 = require("../../lib/load-open-api-config");
|
|
13
|
+
const const_1 = require("./const");
|
|
14
|
+
const generate_data_source_1 = require("./generate-data-source");
|
|
15
|
+
const generate_operation_command_1 = require("./generate-operation-command");
|
|
16
|
+
const generate_remote_method_1 = require("./generate-remote-method");
|
|
14
17
|
function resolveRef(openApiSpec, node, parent, key) {
|
|
18
|
+
var _a;
|
|
15
19
|
if (typeof node !== 'object' || node === null) {
|
|
16
20
|
return;
|
|
17
21
|
}
|
|
18
22
|
if (node['$ref']) {
|
|
19
23
|
if (node.$ref.startsWith('#/components/schemas')) {
|
|
20
24
|
const name = node.$ref.replace('#/components/schemas/', '');
|
|
21
|
-
if (parent && key && openApiSpec.components
|
|
25
|
+
if (parent && key && ((_a = openApiSpec.components) === null || _a === void 0 ? void 0 : _a.schemas)) {
|
|
22
26
|
parent[key] = openApiSpec.components.schemas[name];
|
|
23
27
|
}
|
|
24
28
|
}
|
|
@@ -29,16 +33,16 @@ function resolveRef(openApiSpec, node, parent, key) {
|
|
|
29
33
|
}
|
|
30
34
|
}
|
|
31
35
|
}
|
|
32
|
-
|
|
33
|
-
return
|
|
36
|
+
function default_1(options) {
|
|
37
|
+
return (host) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
34
38
|
console.log('loading openapi config');
|
|
35
|
-
const openapi =
|
|
39
|
+
const openapi = yield (0, load_open_api_config_1.LoadOpenApiConfig)(host, options);
|
|
36
40
|
console.log('resolve all schema refs');
|
|
37
41
|
resolveRef(openapi, openapi.paths);
|
|
38
|
-
const project = new Project({
|
|
42
|
+
const project = new ts_morph_1.Project({
|
|
39
43
|
manipulationSettings: {
|
|
40
|
-
indentationText: IndentationText.TwoSpaces,
|
|
41
|
-
quoteKind: QuoteKind.Single,
|
|
44
|
+
indentationText: ts_morph_1.IndentationText.TwoSpaces,
|
|
45
|
+
quoteKind: ts_morph_1.QuoteKind.Single,
|
|
42
46
|
useTrailingCommas: true,
|
|
43
47
|
},
|
|
44
48
|
useInMemoryFileSystem: true,
|
|
@@ -50,11 +54,11 @@ export default function (options) {
|
|
|
50
54
|
options.project = 'open-api';
|
|
51
55
|
}
|
|
52
56
|
if (options.directory) {
|
|
53
|
-
options.directory = options.directory.split('/').map(item => dasherize(item)).join('/');
|
|
57
|
+
options.directory = options.directory.split('/').map(item => (0, schematics_utilities_1.dasherize)(item)).join('/');
|
|
54
58
|
}
|
|
55
59
|
const projectName = options.project;
|
|
56
|
-
const projectSourceRoot = GetProjectSourceRoot(host, projectName);
|
|
57
|
-
const basePath = join(projectSourceRoot, 'lib');
|
|
60
|
+
const projectSourceRoot = (0, schematics_utilities_1.GetProjectSourceRoot)(host, projectName);
|
|
61
|
+
const basePath = (0, path_1.join)(projectSourceRoot, 'lib');
|
|
58
62
|
// if (!options.debug) {
|
|
59
63
|
// // TODO : reset the hack after the schematic execution is finished
|
|
60
64
|
// // eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
@@ -63,29 +67,29 @@ export default function (options) {
|
|
|
63
67
|
const generatorFunctionList = [];
|
|
64
68
|
const clearPathList = [];
|
|
65
69
|
if (!options.skipRemoteMethod) {
|
|
66
|
-
generatorFunctionList.push(GenerateRemoteMethod);
|
|
67
|
-
clearPathList.push(REMOTE_METHOD_BASE_PATH);
|
|
70
|
+
generatorFunctionList.push(generate_remote_method_1.GenerateRemoteMethod);
|
|
71
|
+
clearPathList.push(const_1.REMOTE_METHOD_BASE_PATH);
|
|
68
72
|
}
|
|
69
73
|
if (!options.skipDataSource) {
|
|
70
|
-
generatorFunctionList.push(GenerateDataSource);
|
|
71
|
-
clearPathList.push(DATA_SOURCE_BASE_PATH);
|
|
74
|
+
generatorFunctionList.push(generate_data_source_1.GenerateDataSource);
|
|
75
|
+
clearPathList.push(const_1.DATA_SOURCE_BASE_PATH);
|
|
72
76
|
}
|
|
73
77
|
if (!options.skipCommand) {
|
|
74
|
-
generatorFunctionList.push(GenerateOperationCommand);
|
|
75
|
-
clearPathList.push(COMMAND_BASE_PATH);
|
|
78
|
+
generatorFunctionList.push(generate_operation_command_1.GenerateOperationCommand);
|
|
79
|
+
clearPathList.push(const_1.COMMAND_BASE_PATH);
|
|
76
80
|
}
|
|
77
81
|
let start = Date.now();
|
|
78
|
-
return chain([
|
|
82
|
+
return (0, schematics_1.chain)([
|
|
79
83
|
() => {
|
|
80
84
|
console.log(`+${Date.now() - start}ms`);
|
|
81
85
|
console.log(`remove old files`);
|
|
82
86
|
start = Date.now();
|
|
83
87
|
},
|
|
84
|
-
ClearOperation([
|
|
85
|
-
COMPONENTS_BASE_PATH,
|
|
86
|
-
PARAMETER_BASE_PATH,
|
|
87
|
-
RESPONSE_BASE_PATH,
|
|
88
|
-
REQUEST_BODY_BASE_PATH,
|
|
88
|
+
(0, clear_operation_1.ClearOperation)([
|
|
89
|
+
config_1.COMPONENTS_BASE_PATH,
|
|
90
|
+
config_1.PARAMETER_BASE_PATH,
|
|
91
|
+
config_1.RESPONSE_BASE_PATH,
|
|
92
|
+
config_1.REQUEST_BODY_BASE_PATH,
|
|
89
93
|
...clearPathList,
|
|
90
94
|
], basePath),
|
|
91
95
|
() => {
|
|
@@ -93,18 +97,19 @@ export default function (options) {
|
|
|
93
97
|
console.log(`generate code for operations`);
|
|
94
98
|
start = Date.now();
|
|
95
99
|
},
|
|
96
|
-
() => GenerateOperation(openapi, project, options, generatorFunctionList),
|
|
100
|
+
() => (0, generate_operation_1.GenerateOperation)(openapi, project, options, generatorFunctionList),
|
|
97
101
|
() => {
|
|
98
102
|
console.log(`+${Date.now() - start}ms`);
|
|
99
103
|
console.log('apply changed to tree');
|
|
100
104
|
start = Date.now();
|
|
101
105
|
},
|
|
102
|
-
ApplyTsMorphProjectRule(project, basePath, true, true),
|
|
106
|
+
(0, schematics_ts_morph_1.ApplyTsMorphProjectRule)(project, basePath, true, true),
|
|
103
107
|
() => {
|
|
104
108
|
console.log(`+${Date.now() - start}ms`);
|
|
105
109
|
console.log('DONE');
|
|
106
110
|
},
|
|
107
111
|
]);
|
|
108
|
-
};
|
|
112
|
+
});
|
|
109
113
|
}
|
|
114
|
+
exports.default = default_1;
|
|
110
115
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/open-api/src/schematics/generate/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/open-api/src/schematics/generate/index.ts"],"names":[],"mappings":"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"}
|