fix componentRef import statements

inkognitro · Apr 21, 2024 · daed546 · daed546
1 parent 49bb323
commit daed546
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 13 deletions.
diff --git a/src/oas3/codegen/ts/generate.petstore.test.ts b/src/oas3/codegen/ts/generate.petstore.test.ts
@@ -2,12 +2,14 @@ import {generateOas3ToTs} from './generate';
 const petStoreSpecification = require('./generate.petstore.test.specs.json');
 
 test('can generate files from petstore specification', () => {
-  generateOas3ToTs({
-    getSpecification: () => {
-      return new Promise<object>(resolve => {
-        resolve(petStoreSpecification);
-      });
-    },
-    outputFolderPath: './generated-files-petstore',
-  });
+  expect(() => {
+    generateOas3ToTs({
+      getSpecification: () => {
+        return new Promise<object>(resolve => {
+          resolve(petStoreSpecification);
+        });
+      },
+      outputFolderPath: './generated-files-petstore',
+    });
+  }).not.toThrow();
 });
diff --git a/src/oas3/codegen/ts/generator.ts b/src/oas3/codegen/ts/generator.ts
@@ -512,13 +512,40 @@ export class DefaultCodeGenerator implements CodeGenerator {
       if (!requiredOutput) {
         return;
       }
-      if (this.isSameOutputFile(requiredOutput.path, output.path)) {
+
+      if (
+        output.type !== OutputType.COMPONENT_REF &&
+        this.isSameOutputFile(requiredOutput.path, output.path)
+      ) {
         return;
       }
-      const importAsset: ImportAsset = {
-        name: requiredOutput.createName(requiredOutput.path),
-        importAsName: requiredOutput.createName(output.path),
-      };
+
+      if (output.type === OutputType.COMPONENT_REF) {
+        const componentOutputPath = this.createOutputPathByComponentRef(
+          output.componentRef
+        );
+        requiredOutput = availableOutputs.find(o =>
+          areOutputPathsEqual(o.path, componentOutputPath)
+        );
+        if (!requiredOutput) {
+          return;
+        }
+        if (this.isSameOutputFile(requiredOutput.path, output.path)) {
+          return;
+        }
+      }
+
+      const importAsset: ImportAsset =
+        output.type === OutputType.COMPONENT_REF
+          ? {
+              name: output.createName(requiredOutput.path),
+              importAsName: output.createName(output.path),
+            }
+          : {
+              name: requiredOutput.createName(requiredOutput.path),
+              importAsName: requiredOutput.createName(output.path),
+            };
+
       const importPath = this.createImportPath(
         requiredOutput.path,
         output.path,