Merge pull request #892 from pmcelhaney/fix-recursive-types

fix recursive types (#890)
pmcelhaney · May 6, 2024 · 19c756f · 19c756f
2 parents 84a421d + b731a44
commit 19c756f
Show file tree

Hide file tree

Showing 5 changed files with 155 additions and 148 deletions.
diff --git a/.changeset/little-wolves-play.md b/.changeset/little-wolves-play.md
@@ -0,0 +1,5 @@
+---
+"counterfact": patch
+---
+
+fix invalid TypeScript generated for recursive types
diff --git a/openapi-example.yaml b/openapi-example.yaml
@@ -67,7 +67,7 @@ paths:
           content:
             application/json:
               schema:
-                type: string
+                $ref: "#/components/schemas/Recursive"
         "400":
           $ref: "#/components/responses/BadRequest"
 
@@ -94,6 +94,9 @@ components:
           description: A detailed description of the error
       required:
         - message
+    Recursive:
+      oneOf:
+        - { $ref: "#/components/schemas/Recursive" }
 
   securitySchemes:
     basicAuth:

diff --git a/src/typescript-generator/script.js b/src/typescript-generator/script.js
@@ -27,7 +27,7 @@ export class Script {
 
   firstUniqueName(coder) {
     for (const name of coder.names()) {
-      if (!this.imports.has(name) && !this.exports.has(name)) {
+      if (!this.imports.has(name)) {
         return name;
       }
     }
@@ -36,9 +36,7 @@ export class Script {
   }
 
   export(coder, isType = false, isDefault = false) {
-    const cacheKey = isDefault
-      ? "default"
-      : `${coder.id}@${nodePath}:${isType}`;
+    const cacheKey = isDefault ? "default" : `${coder.id}:${isType}`;
 
     if (this.cache.has(cacheKey)) {
       return this.cache.get(cacheKey);