fix recursive thrash

fern-api · Dec 20, 2024 · c156011 · c156011
1 parent 3abdb34
commit c156011
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 21 deletions.
diff --git a/packages/parsers/package.json b/packages/parsers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/docs-parsers",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/fern-api/fern-platform.git",

diff --git a/packages/parsers/src/__test__/__snapshots__/openapi/cohere.json b/packages/parsers/src/__test__/__snapshots__/openapi/cohere.json
@@ -601,7 +601,30 @@
           }
         }
       ],
-      "responses": [],
+      "responses": [
+        {
+          "statusCode": 200,
+          "body": {
+            "type": "alias",
+            "value": {
+              "type": "id",
+              "id": "NonStreamedChatResponse"
+            }
+          },
+          "description": "OK"
+        },
+        {
+          "statusCode": 200,
+          "body": {
+            "type": "alias",
+            "value": {
+              "type": "id",
+              "id": "StreamedChatResponse"
+            }
+          },
+          "description": "OK"
+        }
+      ],
       "errors": [
         {
           "statusCode": 400,
@@ -1621,6 +1644,28 @@
               }
             ]
           }
+        },
+        {
+          "path": "/v1/chat",
+          "responseStatusCode": 200,
+          "responseBody": {
+            "type": "json",
+            "value": {
+              "text": "string"
+            }
+          },
+          "snippets": {}
+        },
+        {
+          "path": "/v1/chat",
+          "responseStatusCode": 200,
+          "responseBody": {
+            "type": "json",
+            "value": {
+              "text": "string"
+            }
+          },
+          "snippets": {}
         }
       ]
     },
@@ -2041,7 +2086,30 @@
           }
         }
       ],
-      "responses": [],
+      "responses": [
+        {
+          "statusCode": 200,
+          "body": {
+            "type": "alias",
+            "value": {
+              "type": "id",
+              "id": "ChatResponse"
+            }
+          },
+          "description": "OK"
+        },
+        {
+          "statusCode": 200,
+          "body": {
+            "type": "alias",
+            "value": {
+              "type": "id",
+              "id": "StreamedChatResponseV2"
+            }
+          },
+          "description": "OK"
+        }
+      ],
       "errors": [
         {
           "statusCode": 400,
@@ -2959,6 +3027,36 @@
               }
             ]
           }
+        },
+        {
+          "path": "/v2/chat",
+          "responseStatusCode": 200,
+          "responseBody": {
+            "type": "json",
+            "value": {
+              "id": "string",
+              "finish_reason": "string",
+              "message": {
+                "role": "string"
+              }
+            }
+          },
+          "snippets": {}
+        },
+        {
+          "path": "/v2/chat",
+          "responseStatusCode": 200,
+          "responseBody": {
+            "type": "json",
+            "value": {
+              "id": "string",
+              "finish_reason": "string",
+              "message": {
+                "role": "string"
+              }
+            }
+          },
+          "snippets": {}
         }
       ]
     },

diff --git a/packages/parsers/src/openapi/3.1/paths/request/RequestMediaTypeObjectConverter.node.ts b/packages/parsers/src/openapi/3.1/paths/request/RequestMediaTypeObjectConverter.node.ts
@@ -138,6 +138,11 @@ export class RequestMediaTypeObjectConverterNode extends BaseOpenApiV3_1Converte
             return undefined;
         }
 
+        const newSeenVariants = new Set(seenVariants);
+        if (shape.type === "alias" && shape.value.type === "id") {
+            newSeenVariants.add(shape.value.id);
+        }
+
         const type = shape.type;
         switch (type) {
             case "alias":
@@ -154,17 +159,10 @@ export class RequestMediaTypeObjectConverterNode extends BaseOpenApiV3_1Converte
                         },
                     },
                 }));
-            case "undiscriminatedUnion": {
-                const newSeenVariants = new Set(seenVariants);
-                shape.variants.forEach((variant) =>
-                    variant.shape.type === "alias" && variant.shape.value.type === "id"
-                        ? newSeenVariants.add(variant.shape.value.id)
-                        : undefined,
-                );
+            case "undiscriminatedUnion":
                 return shape.variants
                     .flatMap((variant) => this.convertTypeShapeToHttpRequestBodyShape(variant.shape, newSeenVariants))
                     .filter(isNonNullish);
-            }
             case "discriminatedUnion":
                 return shape.variants.map((variant) => ({
                     type: "object",

diff --git a/packages/parsers/src/openapi/3.1/paths/response/ResponseMediaTypeObjectConverter.node.ts b/packages/parsers/src/openapi/3.1/paths/response/ResponseMediaTypeObjectConverter.node.ts
@@ -223,25 +223,22 @@ export class ResponseMediaTypeObjectConverterNode extends BaseOpenApiV3_1Convert
             return undefined;
         }
 
+        const newSeenVariants = new Set(seenVariants);
+        if (shape.type === "alias" && shape.value.type === "id") {
+            newSeenVariants.add(shape.value.id);
+        }
+
         const type = shape.type;
         switch (type) {
             case "object":
             case "alias":
                 return [shape];
-            case "undiscriminatedUnion": {
-                const newSeenVariants = new Set(seenVariants);
-                shape.variants.forEach(
-                    (variant) =>
-                        variant.shape.type === "alias" &&
-                        variant.shape.value.type === "id" &&
-                        newSeenVariants.add(variant.shape.value.id),
-                );
+            case "undiscriminatedUnion":
                 return shape.variants
                     .flatMap((variant) =>
                         this.convertTypeShapeIntoHttpResponseBodyShape(variant.shape, newSeenVariants),
                     )
                     .filter(isNonNullish);
-            }
             case "discriminatedUnion":
                 return shape.variants.map((variant) => ({
                     type: "object",

diff --git a/packages/parsers/src/openapi/3.1/paths/response/ResponsesObjectConverter.node.ts b/packages/parsers/src/openapi/3.1/paths/response/ResponsesObjectConverter.node.ts
@@ -101,7 +101,6 @@ export class ResponsesObjectConverterNode extends BaseOpenApiV3_1ConverterNode<
     convertResponseObjectToErrors(): FernRegistry.api.latest.ErrorResponse[] {
         return Object.entries(this.errorsByStatusCode ?? {})
             .flatMap(([statusCode, response]) => {
-                // TODO: resolve reference here, if not done already
                 return response.responses?.map((response) => {
                     const schema = response.schema;
                     const shape = schema?.convert();