mokkenstorm.dev
fork of hey-api/openapi-ts because I need some additional things
Merge pull request #3101 from hey-api/refactor/sdk-class-name
refactor: clean up class name logic
+29
-92
+4
-4
dev/openapi-ts.config.ts
+4
-4
dev/openapi-ts.config.ts
···
38
38
// },
39
39
path: path.resolve(
40
40
getSpecsPath(),
41
-
// '3.0.x',
42
-
'3.1.x',
41
+
'3.0.x',
42
+
// '3.1.x',
43
43
// 'circular.yaml',
44
44
// 'dutchie.json',
45
45
// 'enum-names-values.yaml',
···
52
52
// 'pagination-ref.yaml',
53
53
// 'schema-const.yaml',
54
54
// 'sdk-instance.yaml',
55
-
// 'sdk-method-class-conflict.yaml',
55
+
'sdk-method-class-conflict.yaml',
56
56
// 'sdk-nested-classes.yaml',
57
-
'sdk-nested-conflict.yaml',
57
+
// 'sdk-nested-conflict.yaml',
58
58
// 'string-with-format.yaml',
59
59
// 'transformers.json',
60
60
// 'transformers-recursive.json',
+1
-5
packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts
+1
-5
packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts
···
38
38
operation,
39
39
});
40
40
41
-
const classes = operationClasses({
42
-
context: plugin.context,
43
-
operation,
44
-
plugin: sdkPlugin,
45
-
});
41
+
const classes = operationClasses({ operation, plugin: sdkPlugin });
46
42
47
43
for (const entry of classes.values()) {
48
44
entry.path.forEach((currentClassName, index) => {
+2
-10
packages/openapi-ts/src/plugins/@angular/common/httpResources.ts
+2
-10
packages/openapi-ts/src/plugins/@angular/common/httpResources.ts
···
38
38
operation,
39
39
});
40
40
41
-
const classes = operationClasses({
42
-
context: plugin.context,
43
-
operation,
44
-
plugin: sdkPlugin,
45
-
});
41
+
const classes = operationClasses({ operation, plugin: sdkPlugin });
46
42
47
43
for (const entry of classes.values()) {
48
44
entry.path.forEach((currentClassName, index) => {
···
216
212
217
213
if (plugin.config.httpRequests.asClass) {
218
214
// For class-based request methods, use inject and class hierarchy
219
-
const classes = operationClasses({
220
-
context: plugin.context,
221
-
operation,
222
-
plugin: sdkPlugin,
223
-
});
215
+
const classes = operationClasses({ operation, plugin: sdkPlugin });
224
216
225
217
const firstEntry = Array.from(classes.values())[0];
226
218
if (firstEntry) {
+1
-5
packages/openapi-ts/src/plugins/@pinia/colada/v0/plugin.ts
+1
-5
packages/openapi-ts/src/plugins/@pinia/colada/v0/plugin.ts
···
59
59
'operation',
60
60
({ operation }) => {
61
61
const classes = sdkPlugin.config.asClass
62
-
? operationClasses({
63
-
context: plugin.context,
64
-
operation,
65
-
plugin: sdkPlugin,
66
-
})
62
+
? operationClasses({ operation, plugin: sdkPlugin })
67
63
: undefined;
68
64
const entry = classes ? classes.values().next().value : undefined;
69
65
// TODO: this should use class graph to determine correct path string
+1
-5
packages/openapi-ts/src/plugins/@tanstack/query-core/v5/plugin.ts
+1
-5
packages/openapi-ts/src/plugins/@tanstack/query-core/v5/plugin.ts
···
83
83
'operation',
84
84
({ operation }) => {
85
85
const classes = sdkPlugin.config.asClass
86
-
? operationClasses({
87
-
context: plugin.context,
88
-
operation,
89
-
plugin: sdkPlugin,
90
-
})
86
+
? operationClasses({ operation, plugin: sdkPlugin })
91
87
: undefined;
92
88
const entry = classes ? classes.values().next().value : undefined;
93
89
// TODO: this should use class graph to determine correct path string
+1
-5
packages/openapi-ts/src/plugins/swr/v2/plugin.ts
+1
-5
packages/openapi-ts/src/plugins/swr/v2/plugin.ts
···
24
24
'operation',
25
25
({ operation }) => {
26
26
const classes = sdkPlugin.config.asClass
27
-
? operationClasses({
28
-
context: plugin.context,
29
-
operation,
30
-
plugin: sdkPlugin,
31
-
})
27
+
? operationClasses({ operation, plugin: sdkPlugin })
32
28
: undefined;
33
29
const entry = classes ? classes.values().next().value : undefined;
34
30
// TODO: this should use class graph to determine correct path string
+1
-1
packages/openapi-ts/src/utils/__tests__/stringCase.test.ts
+1
-1
packages/openapi-ts/src/utils/__tests__/stringCase.test.ts
···
136
136
SCREAMING_SNAKE_CASE: 'IO_K8S_APIMACHINERY_PKG_APIS_META_V1_DELETE_OPTIONS',
137
137
camelCase: 'ioK8sApimachineryPkgApisMetaV1DeleteOptions',
138
138
snake_case: 'io_k8s_apimachinery_pkg_apis_meta_v1_delete_options',
139
-
value: 'io.k8sApimachinery.pkg.apis.meta.v1.DeleteOptions',
139
+
value: 'io.k8sApimachinery.pkg.apis.meta:v1.DeleteOptions',
140
140
},
141
141
{
142
142
PascalCase: 'GenericSchemaDuplicateIssue1SystemBoolean',
+1
-1
packages/openapi-ts/src/utils/stringCase.ts
+1
-1
packages/openapi-ts/src/utils/stringCase.ts
···
3
3
const uppercaseRegExp = /[\p{Lu}]/u;
4
4
const lowercaseRegExp = /[\p{Ll}]/u;
5
5
const identifierRegExp = /([\p{Alpha}\p{N}_]|$)/u;
6
-
const separatorsRegExp = /[_.\- `\\[\]{}\\/]+/;
6
+
const separatorsRegExp = /[_.:\- `\\[\]{}\\/]+/;
7
7
8
8
const leadingSeparatorsRegExp = new RegExp(`^${separatorsRegExp.source}`);
9
9
const separatorsAndIdentifierRegExp = new RegExp(
-24
packages/openapi-ts/src/utils/transform.ts
-24
packages/openapi-ts/src/utils/transform.ts
···
1
-
import type { Config } from '~/types/config';
2
-
3
-
export const transformClassName = ({
4
-
config,
5
-
name,
6
-
}: {
7
-
config: Config;
8
-
name: string;
9
-
}) => {
10
-
const plugin = config.plugins['@hey-api/sdk'];
11
-
if (plugin?.config.classNameBuilder) {
12
-
let customName = '';
13
-
14
-
if (typeof plugin.config.classNameBuilder === 'function') {
15
-
customName = plugin.config.classNameBuilder(name);
16
-
} else {
17
-
customName = plugin.config.classNameBuilder.replace('{{name}}', name);
18
-
}
19
-
20
-
return customName;
21
-
}
22
-
23
-
return name;
24
-
};