fork of hey-api/openapi-ts because I need some additional things
chore: port asClass functionality
+139
-420
+2
-2
dev/openapi-ts.config.ts
+2
-2
dev/openapi-ts.config.ts
···
54
54
// 'sdk-instance.yaml',
55
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',
···
274
274
// },
275
275
},
276
276
{
277
-
// asClass: true,
277
+
asClass: true,
278
278
// auth: false,
279
279
// classNameBuilder: '{{name}}',
280
280
classNameBuilder: '{{name}}Service',
+56
-34
packages/openapi-ts/src/plugins/@hey-api/sdk/model/class.ts
+56
-34
packages/openapi-ts/src/plugins/@hey-api/sdk/model/class.ts
···
1
+
import type { SymbolMeta } from '@hey-api/codegen-core';
2
+
1
3
import type { IR } from '~/ir/types';
2
4
import { getClientPlugin } from '~/plugins/@hey-api/client-core/utils';
3
5
import {
···
66
68
}
67
69
68
70
/**
71
+
* Gets the full path of this class in the hierarchy.
72
+
*
73
+
* @returns An array of class names from the root to this class
74
+
*/
75
+
getPath(): ReadonlyArray<string> {
76
+
const path: Array<string> = [];
77
+
// eslint-disable-next-line @typescript-eslint/no-this-alias
78
+
let cursor: SdkClassModel | undefined = this;
79
+
while (cursor) {
80
+
path.unshift(cursor.name);
81
+
cursor = cursor.parent;
82
+
}
83
+
return path;
84
+
}
85
+
86
+
/**
69
87
* Inserts an operation into the class tree.
70
88
*
71
89
* Parses the operation ID and creates the class hierarchy.
···
107
125
meta: {
108
126
category: 'utility',
109
127
resource: 'class',
110
-
resourceId: this.name,
128
+
resourceId: this.getPath().join('.'),
111
129
tool: 'sdk',
112
130
},
113
131
},
114
132
);
133
+
const metaClient: SymbolMeta = {
134
+
category: 'utility',
135
+
resource: 'class',
136
+
resourceId: 'HeyApiClient',
137
+
tool: 'sdk',
138
+
};
115
139
const node = $.class(symbolClass)
116
140
.export()
117
-
.extends(
118
-
plugin.referenceSymbol({
119
-
category: 'utility',
120
-
resource: 'class',
121
-
resourceId: 'HeyApiClient',
122
-
tool: 'sdk',
123
-
}),
141
+
.$if(plugin.config.instance, (c) =>
142
+
c.extends(plugin.referenceSymbol(metaClient)),
124
143
)
125
144
.$if(isAngularClient && this.isRoot, (c) =>
126
145
c.decorator(
···
132
151
),
133
152
);
134
153
135
-
if (this.isRoot) {
136
-
const symbolClient = plugin.symbol('HeyApiClient', {
137
-
meta: {
138
-
category: 'utility',
139
-
resource: 'class',
140
-
resourceId: 'HeyApiClient',
141
-
tool: 'sdk',
142
-
},
143
-
});
154
+
if (this.isRoot && plugin.config.instance) {
155
+
const symbolClient = plugin.symbol('HeyApiClient', { meta: metaClient });
144
156
const clientNode = createClientClass({ plugin, symbol: symbolClient });
145
157
dependencies.push(clientNode);
146
158
const symbolRegistry = plugin.symbol('HeyApiRegistry', {
···
272
284
const refChild = plugin.referenceSymbol({
273
285
category: 'utility',
274
286
resource: 'class',
275
-
resourceId: child.name,
287
+
resourceId: child.getPath().join('.'),
276
288
tool: 'sdk',
277
289
});
278
290
const memberName = toCase(refChild.name, 'camelCase');
279
-
const privateName = plugin.symbol(`_${memberName}`);
280
-
const getterName = plugin.symbol(memberName);
281
-
node.field(privateName, (f) => f.private().optional().type(refChild));
282
-
node.do(
283
-
$.getter(getterName, (g) =>
284
-
g.returns(refChild).do(
285
-
$('this')
286
-
.attr(privateName)
287
-
.nullishAssign(
288
-
$.new(refChild).args(
289
-
$.object().prop('client', $('this').attr('client')),
290
-
),
291
-
)
292
-
.return(),
291
+
if (plugin.config.instance) {
292
+
const privateName = plugin.symbol(`_${memberName}`);
293
+
const getterName = plugin.symbol(memberName);
294
+
node.field(privateName, (f) => f.private().optional().type(refChild));
295
+
node.do(
296
+
$.getter(getterName, (g) =>
297
+
g.returns(refChild).do(
298
+
$('this')
299
+
.attr(privateName)
300
+
.nullishAssign(
301
+
$.new(refChild).args(
302
+
$.object().prop('client', $('this').attr('client')),
303
+
),
304
+
)
305
+
.return(),
306
+
),
293
307
),
294
-
),
295
-
);
308
+
);
309
+
} else {
310
+
node.do(
311
+
plugin.isSymbolRegistered(refChild.id)
312
+
? $.field(memberName, (f) => f.static().assign($(refChild)))
313
+
: $.getter(memberName, (g) =>
314
+
g.public().static().do($.return(refChild)),
315
+
),
316
+
);
317
+
}
296
318
}
297
319
298
320
return { dependencies, node };
+59
packages/openapi-ts/src/plugins/@hey-api/sdk/model/structure.ts
+59
packages/openapi-ts/src/plugins/@hey-api/sdk/model/structure.ts
···
1
+
import type { IR } from '~/ir/types';
2
+
3
+
import type { HeyApiSdkPlugin } from '../types';
4
+
import { SdkClassModel } from './class';
5
+
6
+
export class SdkStructureModel {
7
+
/** Name of the SDK. If empty, we fallback to operation tags. */
8
+
private _name: string;
9
+
10
+
/** Root classes mapped by their names. */
11
+
roots: Map<string, SdkClassModel> = new Map();
12
+
13
+
constructor(name: string) {
14
+
this._name = name;
15
+
}
16
+
17
+
/**
18
+
* Inserts an operation into the structure.
19
+
*
20
+
* Parses the operation ID and organizes it into classes based on tags.
21
+
*/
22
+
insert(
23
+
operation: IR.OperationObject,
24
+
plugin: HeyApiSdkPlugin['Instance'],
25
+
): void {
26
+
const roots = this._name ? [this._name] : (operation.tags ?? ['default']);
27
+
28
+
for (const name of roots) {
29
+
const model = this.root(name);
30
+
model.insert(operation, plugin);
31
+
}
32
+
}
33
+
34
+
/**
35
+
* Gets or creates a root class by name.
36
+
*
37
+
* If the root doesn't exist, it's created automatically.
38
+
*
39
+
* @param name - The name of the root class
40
+
* @returns The root class instance
41
+
*/
42
+
root(name: string): SdkClassModel {
43
+
if (!this.roots.has(name)) {
44
+
this.roots.set(name, new SdkClassModel(name));
45
+
}
46
+
return this.roots.get(name)!;
47
+
}
48
+
49
+
/**
50
+
* Recursively walks the structure.
51
+
*
52
+
* Yields all classes in the structure.
53
+
*/
54
+
*walk(): Generator<SdkClassModel> {
55
+
for (const model of this.roots.values()) {
56
+
yield* model.walk();
57
+
}
58
+
}
59
+
}