Merge branch 'main' into niels/fix-typos

fern-api · Jan 29, 2025 · 873c947 · 873c947
2 parents 52ffbcd + ebb97be
commit 873c947
Show file tree

Hide file tree

Showing 242 changed files with 8,997 additions and 65 deletions.
diff --git a/generators/typescript/sdk/CHANGELOG.md b/generators/typescript/sdk/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.48.5] - 2025-01-28
+
+- Fix: Don't double wrap a blob if a user uploads a blob to a multi-part form.
+  Otherwise file's content-type is lost in Deno.
+
 ## [0.48.4] - 2025-01-21
 
 - Fix: When custom config `useBigInt` is `true`, generate examples and snippets with `BigInt("123")`.

diff --git a/generators/typescript/sdk/VERSION b/generators/typescript/sdk/VERSION
@@ -1 +1 @@
-0.48.4
+0.48.5
diff --git a/generators/typescript/utils/core-utilities/fetcher/src/form-data-utils/FormDataWrapper.ts b/generators/typescript/utils/core-utilities/fetcher/src/form-data-utils/FormDataWrapper.ts
@@ -165,6 +165,10 @@ export class WebFormData implements CrossPlatformFormData {
         if (fileName == null && isNamedValue(value)) {
             fileName = value.name;
         }
+        if (value instanceof Blob) {
+            this.fd?.append(key, value, fileName);
+            return;
+        }
         this.fd?.append(key, new Blob([value]), fileName);
     }
 

diff --git a/...importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertResponse.ts b/...importers/openapi/openapi-ir-parser/src/openapi/v3/converters/endpoint/convertResponse.ts
@@ -5,7 +5,6 @@ import { FernOpenapiIr, ResponseWithExample, Source } from "@fern-api/openapi-ir
 
 import { getExtension } from "../../../../getExtension";
 import { convertSchema } from "../../../../schema/convertSchemas";
-import { convertSchemaWithExampleToSchema } from "../../../../schema/utils/convertSchemaWithExampleToSchema";
 import { isReferenceObject } from "../../../../schema/utils/isReferenceObject";
 import { AbstractOpenAPIV3ParserContext } from "../../AbstractOpenAPIV3ParserContext";
 import { FernOpenAPIExtension } from "../../extensions/fernExtensions";
@@ -65,7 +64,8 @@ export function convertResponse({
                 responseBreadcrumbs,
                 streamFormat,
                 source,
-                namespace: context.namespace
+                namespace: context.namespace,
+                statusCode: typeof statusCode === "string" ? parseInt(statusCode) : statusCode
             });
         }
     }
@@ -121,7 +121,8 @@ function convertResolvedResponse({
     context,
     responseBreadcrumbs,
     source,
-    namespace
+    namespace,
+    statusCode
 }: {
     operationContext: OperationContext;
     streamFormat: "sse" | "json" | undefined;
@@ -130,6 +131,7 @@ function convertResolvedResponse({
     responseBreadcrumbs: string[];
     source: Source;
     namespace: string | undefined;
+    statusCode?: number;
 }): ResponseWithExample | undefined {
     const resolvedResponse = isReferenceObject(response) ? context.resolveResponseReference(response) : response;
 
@@ -144,7 +146,7 @@ function convertResolvedResponse({
             return resolvedSchema.type === "string" && resolvedSchema.format === "binary";
         });
         if (isDownloadFile) {
-            return ResponseWithExample.file({ description: resolvedResponse.description, source });
+            return ResponseWithExample.file({ description: resolvedResponse.description, source, statusCode });
         }
     }
 
@@ -153,6 +155,7 @@ function convertResolvedResponse({
         switch (streamFormat) {
             case "json":
                 return ResponseWithExample.streamingJson({
+                    statusCode,
                     description: resolvedResponse.description,
                     responseProperty: getExtension<string>(
                         operationContext.operation,
@@ -182,7 +185,8 @@ function convertResolvedResponse({
                         source,
                         namespace
                     ),
-                    source
+                    source,
+                    statusCode
                 });
         }
     }
@@ -204,7 +208,8 @@ function convertResolvedResponse({
                             source,
                             namespace
                         ),
-                        source
+                        source,
+                        statusCode
                     });
                 case "sse":
                     return ResponseWithExample.streamingSse({
@@ -219,7 +224,8 @@ function convertResolvedResponse({
                             source,
                             namespace
                         ),
-                        source
+                        source,
+                        statusCode
                     });
             }
         }
@@ -228,7 +234,8 @@ function convertResolvedResponse({
             schema: convertSchema(jsonMediaObject.schema, false, context, responseBreadcrumbs, source, namespace),
             responseProperty: getExtension<string>(operationContext.operation, FernOpenAPIExtension.RESPONSE_PROPERTY),
             fullExamples: jsonMediaObject.examples,
-            source
+            source,
+            statusCode
         });
     }
 
@@ -245,21 +252,21 @@ function convertResolvedResponse({
             mimeType.isImage() ||
             mimeType.isVideo()
         ) {
-            return ResponseWithExample.file({ description: resolvedResponse.description, source });
+            return ResponseWithExample.file({ description: resolvedResponse.description, source, statusCode });
         }
 
         if (mimeType.isPlainText()) {
             const textPlainSchema = mediaObject.schema;
             if (textPlainSchema == null) {
-                return ResponseWithExample.text({ description: resolvedResponse.description, source });
+                return ResponseWithExample.text({ description: resolvedResponse.description, source, statusCode });
             }
             const resolvedTextPlainSchema = isReferenceObject(textPlainSchema)
                 ? context.resolveSchemaReference(textPlainSchema)
                 : textPlainSchema;
             if (resolvedTextPlainSchema.type === "string" && resolvedTextPlainSchema.format === "byte") {
-                return ResponseWithExample.file({ description: resolvedResponse.description, source });
+                return ResponseWithExample.file({ description: resolvedResponse.description, source, statusCode });
             }
-            return ResponseWithExample.text({ description: resolvedResponse.description, source });
+            return ResponseWithExample.text({ description: resolvedResponse.description, source, statusCode });
         }
     }
 

diff --git a/...porters/openapi/openapi-ir-to-fern-tests/src/__test__/__snapshots__/openapi-docs/ada.json b/...porters/openapi/openapi-ir-to-fern-tests/src/__test__/__snapshots__/openapi-docs/ada.json
@@ -967,6 +967,7 @@ types:
               },
               "response": {
                 "docs": "OK",
+                "status-code": 200,
                 "type": "root.EndUser",
               },
               "source": {
@@ -1055,6 +1056,7 @@ types:
               },
               "response": {
                 "docs": "OK",
+                "status-code": 200,
                 "type": "root.EndUsers",
               },
               "source": {
@@ -1151,6 +1153,7 @@ types:
               },
               "response": {
                 "docs": "OK",
+                "status-code": 200,
                 "type": "root.EndUser",
               },
               "source": {
@@ -1215,6 +1218,7 @@ service:
       response:
         docs: OK
         type: root.EndUser
+        status-code: 200
       errors:
         - root.GetEndUserByIdRequestUnauthorizedError
         - root.GetEndUserByIdRequestNotFoundError
@@ -1276,6 +1280,7 @@ service:
       response:
         docs: OK
         type: root.EndUser
+        status-code: 200
       errors:
         - root.UpdateEndUserByIdRequestBadRequestError
         - root.UpdateEndUserByIdRequestUnauthorizedError
@@ -1351,6 +1356,7 @@ service:
       response:
         docs: OK
         type: root.EndUsers
+        status-code: 200
       errors:
         - root.GetEndUsersRequestBadRequestError
         - root.GetEndUsersRequestUnauthorizedError

diff --git a/...rters/openapi/openapi-ir-to-fern-tests/src/__test__/__snapshots__/openapi-docs/anyOf.json b/...rters/openapi/openapi-ir-to-fern-tests/src/__test__/__snapshots__/openapi-docs/anyOf.json
@@ -43,6 +43,7 @@
               },
               "response": {
                 "docs": "A simple API response.",
+                "status-code": 200,
                 "type": "Response",
               },
               "source": {
@@ -94,6 +95,7 @@
       response:
         docs: A simple API response.
         type: Response
+        status-code: 200
       examples:
         - request: {}
           response: