fix missing component definitions

inkognitro · Apr 1, 2024 · b5c31f7 · b5c31f7
1 parent 83af4ae
commit b5c31f7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/oas3/codegen/ts/core.ts b/src/oas3/codegen/ts/core.ts
@@ -13,7 +13,6 @@ export interface CodeGenerator {
   createOperationOutputPath(operationId: string): OutputPath;
   createOutputPathByComponentRef(componentRef: string): OutputPath;
   addOutput(output: Output): void;
-  addComponentOutputByComponentRef(componentRef: string): void;
 }
 
 export enum OutputType {

diff --git a/src/oas3/codegen/ts/generator.ts b/src/oas3/codegen/ts/generator.ts
@@ -221,10 +221,16 @@ export class DefaultCodeGenerator implements CodeGenerator {
     return contentParts.join('\n\n');
   }
 
-  addComponentOutputByComponentRef(componentRef: string) {
+  private addComponentOutputByComponentRef(componentRef: string) {
     const components = this.oas3Specs.components;
     const outputPath = this.createOutputPathByComponentRef(componentRef);
-    if (this.outputs.find(o => areOutputPathsEqual(o.path, outputPath))) {
+    if (
+      this.outputs.find(
+        o =>
+          o.type !== OutputType.COMPONENT_REF &&
+          areOutputPathsEqual(o.path, outputPath)
+      )
+    ) {
       return;
     }
     if (
@@ -563,6 +569,7 @@ export class DefaultCodeGenerator implements CodeGenerator {
           );
         }
         this.outputs.push(output);
+        this.addComponentOutputByComponentRef(output.componentRef);
         break;
       case OutputType.DEFINITION:
         // eslint-disable-next-line no-case-declarations

diff --git a/src/oas3/codegen/ts/schema.ts b/src/oas3/codegen/ts/schema.ts
@@ -163,7 +163,6 @@ export function applyComponentRefSchema(
       codeGenerator.createOutputPathByComponentRef(schema.$ref),
     ],
   });
-  codeGenerator.addComponentOutputByComponentRef(schema.$ref);
   return {
     createCode: referencingPath =>
       codeGenerator.createComponentTypeName(schema.$ref, referencingPath),