@rxap/workspace-open-api 19.1.0-dev.6 → 19.1.0-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 +12 -0
- package/package.json +2 -2
- package/src/lib/create-directive.d.ts +1 -1
- package/src/lib/create-directive.js +2 -1
- package/src/lib/create-directive.js.map +1 -1
- package/src/lib/generate-data-source.js +2 -0
- package/src/lib/generate-data-source.js.map +1 -1
- package/src/lib/generate-directives.js +5 -0
- package/src/lib/generate-directives.js.map +1 -1
- package/src/lib/generate-http-resource.js +5 -5
- package/src/lib/generate-http-resource.js.map +1 -1
- package/src/lib/generate-operation-command.js +2 -0
- package/src/lib/generate-operation-command.js.map +1 -1
- package/src/lib/options.d.ts +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
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
|
+
# [19.1.0-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@19.1.0-dev.7...@rxap/workspace-open-api@19.1.0-dev.8) (2025-05-08)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- **open-api:** add support for type parameters in generated structures ([f65fa9a](https://gitlab.com/rxap/packages/commit/f65fa9ab7c2655bbc7ff925a8c610055b308cd05))
|
|
11
|
+
|
|
12
|
+
# [19.1.0-dev.7](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@19.1.0-dev.6...@rxap/workspace-open-api@19.1.0-dev.7) (2025-05-08)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- **open-api:** add type parameters for responses with additional properties ([fb84d37](https://gitlab.com/rxap/packages/commit/fb84d3720dd22724ef5c680ab73b180c0115cbab))
|
|
17
|
+
|
|
6
18
|
# [19.1.0-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/workspace-open-api@19.1.0-dev.5...@rxap/workspace-open-api@19.1.0-dev.6) (2025-05-08)
|
|
7
19
|
|
|
8
20
|
### Features
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "19.1.0-dev.
|
|
2
|
+
"version": "19.1.0-dev.8",
|
|
3
3
|
"name": "@rxap/workspace-open-api",
|
|
4
4
|
"description": "This package provides utilities and generators for working with OpenAPI specifications in a workspace. It includes functionality for generating TypeScript interfaces, data sources, directives, remote methods, and operation commands based on an OpenAPI schema. The package also offers tools for loading OpenAPI configurations and resolving references within the schema.\n",
|
|
5
5
|
"license": "GPL-3.0-or-later",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
},
|
|
42
42
|
"schematics": "./generators.json",
|
|
43
43
|
"type": "commonjs",
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "edbb7581a9c25d55880cf6a6c49502f644a2bc82",
|
|
45
45
|
"types": "./src/index.d.ts",
|
|
46
46
|
"main": "./src/index.js"
|
|
47
47
|
}
|
|
@@ -30,4 +30,4 @@ import { CreateDirectiveOptions } from './options';
|
|
|
30
30
|
* Finally, the newly created directive class is added to the source file along with necessary Angular and custom imports.
|
|
31
31
|
*
|
|
32
32
|
*/
|
|
33
|
-
export declare function CreateDirective({ filePath, sourceFile, name, prefix, parametersType, returnType, template, collection, withoutParameters, }: CreateDirectiveOptions): void;
|
|
33
|
+
export declare function CreateDirective({ filePath, sourceFile, name, prefix, parametersType, returnType, template, collection, withoutParameters, typeParameters, }: CreateDirectiveOptions): void;
|
|
@@ -48,7 +48,7 @@ function AssertImportSpecifierStructureArray(obj) {
|
|
|
48
48
|
* Finally, the newly created directive class is added to the source file along with necessary Angular and custom imports.
|
|
49
49
|
*
|
|
50
50
|
*/
|
|
51
|
-
function CreateDirective({ filePath, sourceFile, name, prefix, parametersType, returnType, template, collection, withoutParameters, }) {
|
|
51
|
+
function CreateDirective({ filePath, sourceFile, name, prefix, parametersType, returnType, template, collection, withoutParameters, typeParameters, }) {
|
|
52
52
|
const remoteMethodName = (0, utilities_1.classify)([name, const_1.REMOTE_METHOD_FILE_SUFFIX].join('-'));
|
|
53
53
|
const directiveNameParts = [remoteMethodName];
|
|
54
54
|
if (template) {
|
|
@@ -309,6 +309,7 @@ function CreateDirective({ filePath, sourceFile, name, prefix, parametersType, r
|
|
|
309
309
|
setAccessors: directiveClassSetAccessors,
|
|
310
310
|
properties: directiveClassProperties,
|
|
311
311
|
isExported: true,
|
|
312
|
+
typeParameters,
|
|
312
313
|
};
|
|
313
314
|
sourceFile.addClass(directiveClassStructure);
|
|
314
315
|
sourceFile.addImportDeclarations(importStructure);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-directive.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/create-directive.ts"],"names":[],"mappings":";;AAgEA,
|
|
1
|
+
{"version":3,"file":"create-directive.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/create-directive.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const ts_morph_1 = require("ts-morph");
|
|
|
7
7
|
const const_1 = require("./const");
|
|
8
8
|
const get_parameter_type_1 = require("./utilities/get-parameter-type");
|
|
9
9
|
const get_response_type_1 = require("./utilities/get-response-type");
|
|
10
|
+
const get_type_parameters_1 = require("./utilities/get-type-parameters");
|
|
10
11
|
/**
|
|
11
12
|
* Generates a TypeScript source file for an OpenAPI data source class based on the provided parameters.
|
|
12
13
|
* This function only processes GET methods and creates a new source file in a specified base path with necessary imports and a class definition.
|
|
@@ -66,6 +67,7 @@ function GenerateDataSource(parameter) {
|
|
|
66
67
|
}
|
|
67
68
|
const classStructure = {
|
|
68
69
|
name: (0, utilities_1.classify)(name.replace(/\./g, '-')),
|
|
70
|
+
typeParameters: (0, get_type_parameters_1.GetTypeParameters)(parameter),
|
|
69
71
|
decorators: [
|
|
70
72
|
{
|
|
71
73
|
name: 'Injectable',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-data-source.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-data-source.ts"],"names":[],"mappings":";;
|
|
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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"}
|
|
@@ -8,6 +8,7 @@ const create_directive_1 = require("./create-directive");
|
|
|
8
8
|
const get_parameter_type_1 = require("./utilities/get-parameter-type");
|
|
9
9
|
const get_request_body_type_1 = require("./utilities/get-request-body-type");
|
|
10
10
|
const get_response_type_1 = require("./utilities/get-response-type");
|
|
11
|
+
const get_type_parameters_1 = require("./utilities/get-type-parameters");
|
|
11
12
|
const is_collection_response_1 = require("./utilities/is-collection-response");
|
|
12
13
|
const is_without_parameters_1 = require("./utilities/is-without-parameters");
|
|
13
14
|
/**
|
|
@@ -80,6 +81,7 @@ function GenerateDirectives(parameter) {
|
|
|
80
81
|
});
|
|
81
82
|
}
|
|
82
83
|
const withoutParameters = (0, is_without_parameters_1.IsWithoutParameters)(parameter);
|
|
84
|
+
const typeParameters = (0, get_type_parameters_1.GetTypeParameters)(parameter);
|
|
83
85
|
if ((0, is_collection_response_1.IsCollectionResponse)(parameter)) {
|
|
84
86
|
importStructures.push({
|
|
85
87
|
moduleSpecifier: '@rxap/utilities',
|
|
@@ -95,6 +97,7 @@ function GenerateDirectives(parameter) {
|
|
|
95
97
|
collection: true,
|
|
96
98
|
sourceFile,
|
|
97
99
|
withoutParameters,
|
|
100
|
+
typeParameters,
|
|
98
101
|
});
|
|
99
102
|
}
|
|
100
103
|
(0, create_directive_1.CreateDirective)({
|
|
@@ -107,6 +110,7 @@ function GenerateDirectives(parameter) {
|
|
|
107
110
|
collection: false,
|
|
108
111
|
sourceFile,
|
|
109
112
|
withoutParameters,
|
|
113
|
+
typeParameters,
|
|
110
114
|
});
|
|
111
115
|
(0, create_directive_1.CreateDirective)({
|
|
112
116
|
filePath: fileName,
|
|
@@ -118,6 +122,7 @@ function GenerateDirectives(parameter) {
|
|
|
118
122
|
collection: false,
|
|
119
123
|
sourceFile,
|
|
120
124
|
withoutParameters,
|
|
125
|
+
typeParameters,
|
|
121
126
|
});
|
|
122
127
|
sourceFile.addImportDeclarations(importStructures);
|
|
123
128
|
sourceFile.organizeImports({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-directives.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-directives.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generate-directives.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-directives.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ const workspace_open_api_1 = require("@rxap/workspace-open-api");
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const ts_morph_1 = require("ts-morph");
|
|
8
8
|
const const_1 = require("./const");
|
|
9
|
-
const has_response_additional_properties_1 = require("./utilities/has-response-additional-properties");
|
|
10
9
|
function GenerateHttpResource(parameter) {
|
|
11
10
|
var _a, _b, _c, _d, _e;
|
|
12
11
|
if (parameter.method.toUpperCase() !== 'GET') {
|
|
@@ -105,6 +104,7 @@ function GenerateHttpResource(parameter) {
|
|
|
105
104
|
name: 'options',
|
|
106
105
|
type: `HttpResourceOptions<${responseType}, unknown> & { defaultValue: NoInfer<${responseType}> }`,
|
|
107
106
|
};
|
|
107
|
+
const typeParameters = (0, workspace_open_api_1.GetTypeParameters)(parameter);
|
|
108
108
|
const structure = {
|
|
109
109
|
isExported: true,
|
|
110
110
|
name: (0, utilities_1.camelize)([parameter.operationId, 'http-resource'].join('_')),
|
|
@@ -124,16 +124,16 @@ function GenerateHttpResource(parameter) {
|
|
|
124
124
|
{
|
|
125
125
|
parameters: [...parameters.map(p => (Object.assign(Object.assign({}, p), { initializer: undefined }))), optionsParameterNoInfer],
|
|
126
126
|
returnType: `HttpResourceRef<${responseType}>`,
|
|
127
|
+
typeParameters,
|
|
127
128
|
},
|
|
128
129
|
{
|
|
129
130
|
parameters: [...parameters.map(p => (Object.assign(Object.assign({}, p), { initializer: undefined, hasQuestionToken: !!p.initializer }))), optionsParameter],
|
|
130
131
|
returnType: `HttpResourceRef<${responseType} | undefined>`,
|
|
132
|
+
typeParameters,
|
|
131
133
|
}
|
|
132
|
-
]
|
|
134
|
+
],
|
|
135
|
+
typeParameters,
|
|
133
136
|
};
|
|
134
|
-
if ((0, has_response_additional_properties_1.hasResponseAdditionalProperties)(parameter)) {
|
|
135
|
-
structure.typeParameters = [{ name: 'TResponse' }];
|
|
136
|
-
}
|
|
137
137
|
sourceFile.addFunction(structure);
|
|
138
138
|
sourceFile.addImportDeclarations(importStructures);
|
|
139
139
|
sourceFile.organizeImports({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-http-resource.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-http-resource.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generate-http-resource.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-http-resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const types_1 = require("./types");
|
|
|
10
10
|
const get_parameter_type_1 = require("./utilities/get-parameter-type");
|
|
11
11
|
const get_request_body_type_1 = require("./utilities/get-request-body-type");
|
|
12
12
|
const get_response_type_1 = require("./utilities/get-response-type");
|
|
13
|
+
const get_type_parameters_1 = require("./utilities/get-type-parameters");
|
|
13
14
|
/**
|
|
14
15
|
*
|
|
15
16
|
*
|
|
@@ -105,6 +106,7 @@ function GenerateOperationCommand(parameter) {
|
|
|
105
106
|
}
|
|
106
107
|
const classStructure = {
|
|
107
108
|
name: (0, utilities_1.classify)(name.replace(/\./g, '-')),
|
|
109
|
+
typeParameters: (0, get_type_parameters_1.GetTypeParameters)(parameter),
|
|
108
110
|
decorators: [
|
|
109
111
|
{
|
|
110
112
|
name: 'Injectable',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-operation-command.js","sourceRoot":"","sources":["../../../../../../packages/workspace/open-api/src/lib/generate-operation-command.ts"],"names":[],"mappings":";;
|
|
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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"}
|
package/src/lib/options.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SourceFile } from 'ts-morph';
|
|
1
|
+
import { OptionalKind, SourceFile, TypeParameterDeclarationStructure } from 'ts-morph';
|
|
2
2
|
export interface CreateDirectiveRuleOptions {
|
|
3
3
|
filePath: string;
|
|
4
4
|
name: string;
|
|
@@ -11,4 +11,5 @@ export interface CreateDirectiveRuleOptions {
|
|
|
11
11
|
export interface CreateDirectiveOptions extends CreateDirectiveRuleOptions {
|
|
12
12
|
sourceFile: SourceFile;
|
|
13
13
|
withoutParameters: boolean;
|
|
14
|
+
typeParameters?: (OptionalKind<TypeParameterDeclarationStructure> | string)[];
|
|
14
15
|
}
|