Skip to content

Commit eee7c85

Browse files
committed
refactor: renaming
1 parent 6ffbc6b commit eee7c85

5 files changed

Lines changed: 13 additions & 16 deletions

File tree

packages/openapi-code-generator/src/typescript/client/client-builder.ts renamed to packages/openapi-code-generator/src/typescript/client/abstract-client-builder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {union} from "../common/type-utils"
88
import {ClientOperationBuilder} from "./client-operation-builder"
99
import {ClientServersBuilder} from "./client-servers-builder"
1010

11-
export abstract class TypescriptClientBuilder implements ICompilable {
11+
export abstract class AbstractClientBuilder implements ICompilable {
1212
private readonly operations: string[] = []
1313

1414
protected readonly clientServersBuilder: ClientServersBuilder

packages/openapi-code-generator/src/typescript/client/typescript-angular/angular-service-builder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import {
44
buildMethod,
55
routeToTemplateString,
66
} from "../../common/typescript-common"
7-
import {TypescriptClientBuilder} from "../client-builder"
7+
import {AbstractClientBuilder} from "../abstract-client-builder"
88
import type {ClientOperationBuilder} from "../client-operation-builder"
99

10-
export class AngularServiceBuilder extends TypescriptClientBuilder {
10+
export class AngularServiceBuilder extends AbstractClientBuilder {
1111
protected buildImports(imports: ImportBuilder): void {
1212
imports.from("@angular/core").add("Injectable")
1313

packages/openapi-code-generator/src/typescript/client/typescript-axios/typescript-axios-client-builder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import {
44
asyncMethod,
55
routeToTemplateString,
66
} from "../../common/typescript-common"
7-
import {TypescriptClientBuilder} from "../client-builder"
7+
import {AbstractClientBuilder} from "../abstract-client-builder"
88
import type {ClientOperationBuilder} from "../client-operation-builder"
99

10-
export class TypescriptAxiosClientBuilder extends TypescriptClientBuilder {
10+
export class TypescriptAxiosClientBuilder extends AbstractClientBuilder {
1111
protected buildImports(imports: ImportBuilder): void {
1212
imports
1313
.from("@nahkies/typescript-axios-runtime/main")

packages/openapi-code-generator/src/typescript/client/typescript-fetch/typescript-fetch-client-builder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import {
66
asyncMethod,
77
routeToTemplateString,
88
} from "../../common/typescript-common"
9-
import {TypescriptClientBuilder} from "../client-builder"
9+
import {AbstractClientBuilder} from "../abstract-client-builder"
1010
import type {ClientOperationBuilder} from "../client-operation-builder"
1111

12-
export class TypescriptFetchClientBuilder extends TypescriptClientBuilder {
12+
export class TypescriptFetchClientBuilder extends AbstractClientBuilder {
1313
protected buildImports(imports: ImportBuilder): void {
1414
imports
1515
.from("@nahkies/typescript-fetch-runtime/main")

packages/openapi-code-generator/src/typescript/server/typescript-koa/typescript-koa.generator.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import type {ServerOperationBuilder} from "../server-operation-builder"
2222

2323
export type ServerSymbols = {
2424
implPropName: string
25-
typeName: string
25+
implTypeName: string
2626
responderName: string
2727
paramSchema: string
2828
querySchema: string
@@ -120,7 +120,7 @@ export class KoaServerRouterBuilder extends AbstractServerRouterBuilder {
120120
kind: "type",
121121
}),
122122
buildExport({
123-
name: symbols.typeName,
123+
name: symbols.implTypeName,
124124
value: `(
125125
params: ${params.type},
126126
respond: ${symbols.responderName},
@@ -168,7 +168,7 @@ router.${builder.method.toLowerCase()}('${symbols.implPropName}','${route(builde
168168
private operationSymbolNames(operationId: string): ServerSymbols {
169169
return {
170170
implPropName: operationId,
171-
typeName: titleCase(operationId),
171+
implTypeName: titleCase(operationId),
172172
responderName: `${titleCase(operationId)}Responder`,
173173
paramSchema: `${operationId}ParamSchema`,
174174
querySchema: `${operationId}QuerySchema`,
@@ -187,7 +187,7 @@ router.${builder.method.toLowerCase()}('${symbols.implPropName}','${route(builde
187187
value: object(
188188
this.operationTypes
189189
.map((it) => this.operationSymbolNames(it.operationId))
190-
.map((it) => `${it.implPropName}: ${it.typeName}`)
190+
.map((it) => `${it.implPropName}: ${it.implTypeName}`)
191191
.join(","),
192192
),
193193
kind: this.implementationMethod,
@@ -200,7 +200,7 @@ router.${builder.method.toLowerCase()}('${symbols.implPropName}','${route(builde
200200
value: object(
201201
this.operationTypes
202202
.map((it) => this.operationSymbolNames(it.operationId))
203-
.map((it) => `abstract ${it.implPropName}: ${it.typeName}`)
203+
.map((it) => `abstract ${it.implPropName}: ${it.implTypeName}`)
204204
.join("\n"),
205205
),
206206
kind: "abstract-class",
@@ -254,7 +254,6 @@ export class KoaServerBuilder implements ICompilable {
254254
private readonly input: Input,
255255
private readonly imports: ImportBuilder = new ImportBuilder(),
256256
) {
257-
// todo: unsure why, but adding an export at `.` of index.ts doesn't work properly
258257
this.imports
259258
.from("@nahkies/typescript-koa-runtime/server")
260259
.add(
@@ -272,11 +271,9 @@ export class KoaServerBuilder implements ICompilable {
272271
}
273272

274273
toString(): string {
275-
const {name} = this
276-
277274
return `
278275
export async function bootstrap(config: ServerConfig) {
279-
// ${name}
276+
// ${this.name}
280277
return startServer(config)
281278
}
282279
`

0 commit comments

Comments
 (0)