@rxap/plugin-open-api 20.0.1-dev.8 → 20.0.1
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 +56 -0
- package/package.json +11 -10
- package/src/executors/copy-open-api-sdk/executor.js +1 -1
- package/src/executors/copy-open-api-sdk/schema.d.ts +10 -3
- package/src/executors/generate/executor.js +1 -1
- package/src/executors/generate/executor.js.map +1 -1
- package/src/executors/generate/schema.d.ts +2 -14
- package/src/generators/generate/generator.js +23 -1
- package/src/generators/generate/generator.js.map +1 -1
- package/src/generators/init/schema.d.ts +4 -2
- package/src/generators/init-library/init-project.js +6 -9
- package/src/generators/init-library/init-project.js.map +1 -1
- package/src/plugin.js +1 -1
- package/src/plugin.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,62 @@
|
|
|
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
|
+
## [20.0.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.19...@rxap/plugin-open-api@20.0.1) (2025-02-13)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rxap/plugin-open-api
|
|
9
|
+
|
|
10
|
+
## [20.0.1-dev.19](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.18...@rxap/plugin-open-api@20.0.1-dev.19) (2025-02-13)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @rxap/plugin-open-api
|
|
13
|
+
|
|
14
|
+
## [20.0.1-dev.18](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.17...@rxap/plugin-open-api@20.0.1-dev.18) (2025-02-11)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @rxap/plugin-open-api
|
|
17
|
+
|
|
18
|
+
## [20.0.1-dev.17](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.16...@rxap/plugin-open-api@20.0.1-dev.17) (2025-02-11)
|
|
19
|
+
|
|
20
|
+
**Note:** Version bump only for package @rxap/plugin-open-api
|
|
21
|
+
|
|
22
|
+
## [20.0.1-dev.16](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.15...@rxap/plugin-open-api@20.0.1-dev.16) (2025-02-10)
|
|
23
|
+
|
|
24
|
+
**Note:** Version bump only for package @rxap/plugin-open-api
|
|
25
|
+
|
|
26
|
+
## [20.0.1-dev.15](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.14...@rxap/plugin-open-api@20.0.1-dev.15) (2025-02-07)
|
|
27
|
+
|
|
28
|
+
**Note:** Version bump only for package @rxap/plugin-open-api
|
|
29
|
+
|
|
30
|
+
## [20.0.1-dev.14](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.13...@rxap/plugin-open-api@20.0.1-dev.14) (2025-01-30)
|
|
31
|
+
|
|
32
|
+
### Bug Fixes
|
|
33
|
+
|
|
34
|
+
- cleanup openapi library after setup ([c411a10](https://gitlab.com/rxap/packages/commit/c411a108a791078eb8c498a83cac697a03a0f59d))
|
|
35
|
+
|
|
36
|
+
## [20.0.1-dev.13](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.12...@rxap/plugin-open-api@20.0.1-dev.13) (2025-01-30)
|
|
37
|
+
|
|
38
|
+
**Note:** Version bump only for package @rxap/plugin-open-api
|
|
39
|
+
|
|
40
|
+
## [20.0.1-dev.12](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.11...@rxap/plugin-open-api@20.0.1-dev.12) (2025-01-29)
|
|
41
|
+
|
|
42
|
+
### Bug Fixes
|
|
43
|
+
|
|
44
|
+
- define entry points for index export ([ddf57c4](https://gitlab.com/rxap/packages/commit/ddf57c4b1d7d1c2094d5c97921c3310aa18ad7ab))
|
|
45
|
+
|
|
46
|
+
## [20.0.1-dev.11](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.10...@rxap/plugin-open-api@20.0.1-dev.11) (2025-01-29)
|
|
47
|
+
|
|
48
|
+
**Note:** Version bump only for package @rxap/plugin-open-api
|
|
49
|
+
|
|
50
|
+
## [20.0.1-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.9...@rxap/plugin-open-api@20.0.1-dev.10) (2025-01-29)
|
|
51
|
+
|
|
52
|
+
### Bug Fixes
|
|
53
|
+
|
|
54
|
+
- use correct package name ([edcd11f](https://gitlab.com/rxap/packages/commit/edcd11f729df64fac68ca6ec0b1a1338edc44f95))
|
|
55
|
+
|
|
56
|
+
## [20.0.1-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.8...@rxap/plugin-open-api@20.0.1-dev.9) (2025-01-29)
|
|
57
|
+
|
|
58
|
+
### Bug Fixes
|
|
59
|
+
|
|
60
|
+
- use correct package name ([26530d2](https://gitlab.com/rxap/packages/commit/26530d2c21d1e74795f036c873c5f9e7bfd01321))
|
|
61
|
+
|
|
6
62
|
## [20.0.1-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/plugin-open-api@20.0.1-dev.7...@rxap/plugin-open-api@20.0.1-dev.8) (2025-01-29)
|
|
7
63
|
|
|
8
64
|
### Bug Fixes
|
package/package.json
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "20.0.1
|
|
2
|
+
"version": "20.0.1",
|
|
3
3
|
"name": "@rxap/plugin-open-api",
|
|
4
|
+
"description": "This plugin provides generators and executors for generating code from OpenAPI specifications within an Nx workspace. It allows you to initialize libraries, generate code for Angular and NestJS, and copy OpenAPI SDKs. The plugin simplifies the process of integrating OpenAPI definitions into your projects.\n",
|
|
4
5
|
"license": "GPL-3.0-or-later",
|
|
5
6
|
"dependencies": {
|
|
6
|
-
"@nx/devkit": "20.4.
|
|
7
|
-
"@rxap/node-utilities": "^1.3.8
|
|
8
|
-
"@rxap/plugin-library": "^20.1.0
|
|
9
|
-
"@rxap/plugin-utilities": "^20.0.1
|
|
10
|
-
"@rxap/utilities": "^16.4.2
|
|
11
|
-
"@rxap/workspace-open-api": "^19.0.11
|
|
12
|
-
"@rxap/workspace-ts-morph": "^19.1.9
|
|
13
|
-
"@rxap/workspace-utilities": "^19.6.1
|
|
7
|
+
"@nx/devkit": "20.4.2",
|
|
8
|
+
"@rxap/node-utilities": "^1.3.8",
|
|
9
|
+
"@rxap/plugin-library": "^20.1.0",
|
|
10
|
+
"@rxap/plugin-utilities": "^20.0.1",
|
|
11
|
+
"@rxap/utilities": "^16.4.2",
|
|
12
|
+
"@rxap/workspace-open-api": "^19.0.11",
|
|
13
|
+
"@rxap/workspace-ts-morph": "^19.1.9",
|
|
14
|
+
"@rxap/workspace-utilities": "^19.6.1",
|
|
14
15
|
"tslib": "2.6.2",
|
|
15
16
|
"yaml": "2.3.1"
|
|
16
17
|
},
|
|
@@ -44,7 +45,7 @@
|
|
|
44
45
|
},
|
|
45
46
|
"schematics": "./generators.json",
|
|
46
47
|
"type": "commonjs",
|
|
47
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "753c877fe1a5c2fcfa737310f6e99fd1371f9b4d",
|
|
48
49
|
"exports": {
|
|
49
50
|
"./package.json": "./package.json",
|
|
50
51
|
".": {
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
export interface CopyOpenApiSdkExecutorSchema {
|
|
2
|
+
/** The name of the client SDK project to copy */
|
|
2
3
|
clientSdkProject: string;
|
|
4
|
+
/** Whether to copy the files for an Angular project */
|
|
3
5
|
angular?: boolean;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
6
|
+
/** Whether to copy the files for a NestJS project */
|
|
7
|
+
nestjs?: boolean;
|
|
8
|
+
/** The directory to copy the files to */
|
|
9
|
+
outputDir?: string;
|
|
10
|
+
/** Whether to skip copying the directives */
|
|
7
11
|
skipDirectives?: boolean;
|
|
12
|
+
/** Whether to skip copying the data sources */
|
|
13
|
+
skipDataSources?: boolean;
|
|
14
|
+
/** Whether to skip copying the remote methods */
|
|
8
15
|
skipRemoteMethods?: boolean;
|
|
9
16
|
}
|
|
@@ -6,7 +6,7 @@ const plugin_library_1 = require("@rxap/plugin-library");
|
|
|
6
6
|
const runExecutor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
7
7
|
console.log('Executor ran for Generate', options);
|
|
8
8
|
return (0, plugin_library_1.RunGenerator)({
|
|
9
|
-
generator: '@rxap/plugin-
|
|
9
|
+
generator: '@rxap/plugin-open-api:generate',
|
|
10
10
|
options: (0, utilities_1.DeleteEmptyProperties)(Object.assign({}, options))
|
|
11
11
|
}, context);
|
|
12
12
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/open-api/src/executors/generate/executor.ts"],"names":[],"mappings":";;;AACA,+CAAwD;AACxD,yDAE8B;AAG9B,MAAM,WAAW,GAA4C,CAC3D,OAAO,EAAE,OAAO,EAChB,EAAE;IACF,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;IAClD,OAAO,IAAA,6BAAY,EAAC;QAClB,SAAS,EAAE
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/open-api/src/executors/generate/executor.ts"],"names":[],"mappings":";;;AACA,+CAAwD;AACxD,yDAE8B;AAG9B,MAAM,WAAW,GAA4C,CAC3D,OAAO,EAAE,OAAO,EAChB,EAAE;IACF,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,CAAC,CAAC;IAClD,OAAO,IAAA,6BAAY,EAAC;QAClB,SAAS,EAAE,gCAAgC;QAC3C,OAAO,EAAE,IAAA,iCAAqB,oBACzB,OAAO,EACV;KACH,EAAE,OAAO,CAAC,CAAC;AACd,CAAC,CAAA,CAAC;AAEF,kBAAe,WAAW,CAAC"}
|
|
@@ -1,16 +1,4 @@
|
|
|
1
1
|
export interface GenerateExecutorSchema {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
prefix: string;
|
|
5
|
-
export?: boolean;
|
|
6
|
-
serverId?: string;
|
|
7
|
-
inline?: boolean;
|
|
8
|
-
directory?: string;
|
|
9
|
-
skipRemoteMethod: boolean;
|
|
10
|
-
skipCommand: boolean;
|
|
11
|
-
skipProvider: boolean;
|
|
12
|
-
skipDirectives: boolean;
|
|
13
|
-
skipDataSource: boolean;
|
|
14
|
-
skipFormat?: boolean;
|
|
15
|
-
path: string;
|
|
2
|
+
properties?: unknown;
|
|
3
|
+
required?: unknown;
|
|
16
4
|
}
|
|
@@ -68,7 +68,29 @@ function generateGenerator(tree, options) {
|
|
|
68
68
|
project: options.project,
|
|
69
69
|
}, project => (0, workspace_open_api_1.GenerateOperation)(openapi, project, options, nestGeneratorFunctionList));
|
|
70
70
|
if (options.export) {
|
|
71
|
-
|
|
71
|
+
const additionalEntryPoints = [
|
|
72
|
+
`${projectRoot}/src/lib/components/index.ts`,
|
|
73
|
+
`${projectRoot}/src/lib/parameters/index.ts`,
|
|
74
|
+
`${projectRoot}/src/lib/responses/index.ts`,
|
|
75
|
+
`${projectRoot}/src/lib/request-bodies/index.ts`,
|
|
76
|
+
];
|
|
77
|
+
if (!options.skipRemoteMethod) {
|
|
78
|
+
additionalEntryPoints.push(`${projectRoot}/src/lib/remote-methods/index.ts`);
|
|
79
|
+
}
|
|
80
|
+
if (!options.skipDataSource) {
|
|
81
|
+
additionalEntryPoints.push(`${projectRoot}/src/lib/data-sources/index.ts`);
|
|
82
|
+
}
|
|
83
|
+
if (!options.skipDirectives) {
|
|
84
|
+
additionalEntryPoints.push(`${projectRoot}/src/lib/directives/index.ts`);
|
|
85
|
+
}
|
|
86
|
+
if (!options.skipCommand) {
|
|
87
|
+
additionalEntryPoints.push(`${projectRoot}/src/lib/commands/index.ts`);
|
|
88
|
+
}
|
|
89
|
+
yield (0, plugin_library_1.LibraryIndexExportGenerator)(tree, {
|
|
90
|
+
project: options.project,
|
|
91
|
+
generateRootExport: false,
|
|
92
|
+
additionalEntryPoints
|
|
93
|
+
});
|
|
72
94
|
}
|
|
73
95
|
else {
|
|
74
96
|
(0, workspace_utilities_1.CoerceFile)(tree, (0, path_1.join)((0, workspace_utilities_1.GetProjectSourceRoot)(tree, projectName), 'index.ts'), 'export {};', true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/open-api/src/generators/generate/generator.ts"],"names":[],"mappings":";;AA4BA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/open-api/src/generators/generate/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
export interface InitGeneratorSchema {
|
|
2
2
|
project?: string;
|
|
3
|
-
projects?: string
|
|
3
|
+
projects?: Array<string>;
|
|
4
|
+
skipFormat?: boolean;
|
|
5
|
+
/** Whether to overwrite existing files */
|
|
4
6
|
overwrite?: boolean;
|
|
7
|
+
/** Whether to skip executing project specific initialization */
|
|
5
8
|
skipProjects?: boolean;
|
|
6
|
-
skipFormat?: boolean;
|
|
7
9
|
}
|
|
@@ -8,6 +8,7 @@ const path_1 = require("path");
|
|
|
8
8
|
const yaml_1 = require("yaml");
|
|
9
9
|
function initProject(tree, projectName, project, options) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
var _a, _b;
|
|
11
12
|
yield (0, plugin_library_1.LibraryInitProject)(tree, projectName, project, options);
|
|
12
13
|
const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, options.project);
|
|
13
14
|
const projectSourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, options.project);
|
|
@@ -20,19 +21,15 @@ function initProject(tree, projectName, project, options) {
|
|
|
20
21
|
(0, workspace_utilities_1.CoerceIgnorePattern)(tree, (0, path_1.join)(projectRoot, '.gitignore'), ['src/lib/**']);
|
|
21
22
|
(0, workspace_utilities_1.CoerceIgnorePattern)(tree, '.nxignore', ['!/open-api/**/src/lib/**']);
|
|
22
23
|
}
|
|
24
|
+
if ((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a['build']) === null || _b === void 0 ? void 0 : _b.executor) {
|
|
25
|
+
delete project.targets['build'];
|
|
26
|
+
}
|
|
23
27
|
if (options.external) {
|
|
24
28
|
(0, workspace_utilities_1.CoerceTarget)(project, 'generate-open-api', {
|
|
25
29
|
inputs: [(0, path_1.join)('{projectRoot}', 'src', 'openapi.yaml')],
|
|
26
|
-
outputs: [
|
|
27
|
-
(0, path_1.join)('{projectRoot}', 'src', 'lib'),
|
|
28
|
-
(0, path_1.join)('{projectRoot}', 'src', 'index.ts'),
|
|
29
|
-
],
|
|
30
30
|
options: {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
path: (0, path_1.join)(projectSourceRoot, 'openapi.yaml'),
|
|
34
|
-
serverId: apiProjectName
|
|
35
|
-
}
|
|
31
|
+
path: (0, path_1.join)(projectSourceRoot, 'openapi.yaml'),
|
|
32
|
+
serverId: apiProjectName
|
|
36
33
|
}
|
|
37
34
|
}, workspace_utilities_1.Strategy.OVERWRITE);
|
|
38
35
|
(0, workspace_utilities_1.CoerceFile)(tree, (0, path_1.join)(projectSourceRoot, 'openapi.yaml'), (0, yaml_1.stringify)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/open-api/src/generators/init-library/init-project.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"init-project.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/open-api/src/generators/init-library/init-project.ts"],"names":[],"mappings":"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"}
|
package/src/plugin.js
CHANGED
|
@@ -114,7 +114,7 @@ function createGenerateOpenApiTarget(serviceProjectName, serviceProjectRoot) {
|
|
|
114
114
|
target: 'swagger-generate',
|
|
115
115
|
},
|
|
116
116
|
],
|
|
117
|
-
executor: '@rxap/plugin-
|
|
117
|
+
executor: '@rxap/plugin-open-api:generate',
|
|
118
118
|
outputs: ['{projectRoot}/src'],
|
|
119
119
|
cache: true,
|
|
120
120
|
inputs: [`{workspaceRoot}/swagger/${serviceProjectRoot}/openapi.json`],
|
package/src/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../packages/plugin/open-api/src/plugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../../packages/plugin/open-api/src/plugin.ts"],"names":[],"mappings":"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"}
|