fix: decouple schema builders from typescript-koa (#113)

this will allow them to be used in client templates (eg: #112)
mnahkies · Dec 2, 2023 · f75a80c · f75a80c
1 parent a232cf1
commit f75a80c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/packages/openapi-code-generator/src/typescript/common/schema-builders/joi-schema-builder.ts b/packages/openapi-code-generator/src/typescript/common/schema-builders/joi-schema-builder.ts
@@ -29,10 +29,6 @@ export class JoiBuilder extends AbstractSchemaBuilder {
     super(filename, input, imports)
 
     this.importHelpers(imports)
-
-    imports
-      .from("@nahkies/typescript-koa-runtime/joi")
-      .add("parseRequestInput", "Params", "responseValidationFactory")
   }
 
   protected importHelpers(imports: ImportBuilder) {

diff --git a/packages/openapi-code-generator/src/typescript/common/schema-builders/zod-schema-builder.ts b/packages/openapi-code-generator/src/typescript/common/schema-builders/zod-schema-builder.ts
@@ -29,12 +29,7 @@ export class ZodBuilder extends AbstractSchemaBuilder {
     imports: ImportBuilder,
   ) {
     super(filename, input, imports)
-
     this.importHelpers(imports)
-
-    imports
-      .from("@nahkies/typescript-koa-runtime/zod")
-      .add("parseRequestInput", "Params", "responseValidationFactory")
   }
 
   protected importHelpers(imports: ImportBuilder) {

diff --git a/packages/openapi-code-generator/src/typescript/typescript-koa/typescript-koa.generator.ts b/packages/openapi-code-generator/src/typescript/typescript-koa/typescript-koa.generator.ts
@@ -9,6 +9,8 @@ import {SchemaBuilder, schemaBuilderFactory} from "../common/schema-builders/sch
 import {buildExport, requestBodyAsParameter, statusStringToType} from "../common/typescript-common"
 import {OpenapiGeneratorConfig} from "../../templates.types"
 import {object} from "../common/type-utils"
+import {ZodBuilder} from "../common/schema-builders/zod-schema-builder"
+import {JoiBuilder} from "../common/schema-builders/joi-schema-builder"
 
 function reduceParamsToOpenApiSchema(parameters: IRParameter[]): IRModelObject {
   return parameters.reduce((acc, parameter) => {
@@ -63,6 +65,16 @@ export class ServerBuilder {
 
     this.imports.addModule("KoaRouter", "@koa/router")
     this.imports.addModule("koaBody", "koa-body")
+
+    if (schemaBuilder instanceof ZodBuilder) {
+      imports
+        .from("@nahkies/typescript-koa-runtime/zod")
+        .add("parseRequestInput", "Params", "responseValidationFactory")
+    } else if (schemaBuilder instanceof JoiBuilder) {
+      imports
+        .from("@nahkies/typescript-koa-runtime/joi")
+        .add("parseRequestInput", "Params", "responseValidationFactory")
+    }
   }
 
   add(operation: IROperation): void {