fern-api 0.16.4 → 0.16.6

package/bundle.cjs

@@ -736685,7 +736685,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "0.16.4",
+          version: "0.16.6",
           usingAccessToken: true
         }
       });
@@ -736747,7 +736747,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "0.16.4",
+        version: "0.16.6",
         ...event,
         ...event.properties
       }
@@ -751984,8 +751984,31 @@ function getProperty(object, property2) {
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/v3/converters/endpoint/convertRequest.js
 var import_finalIr9 = __toESM(require_finalIr());
 var import_parseIr11 = __toESM(require_parseIr());
+
+// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/v3/converters/endpoint/getApplicationJsonSchema.js
 var APPLICATION_JSON_CONTENT = "application/json";
-var APPLICATION_JSON_UTF_8_CONTENT = "application/json; charset=utf-8";
+var APPLICATION_JSON_REGEX = /^application.*json$/;
+function getApplicationJsonSchemaFromMedia(media) {
+  for (const contentType of Object.keys(media)) {
+    if (contentType.includes(APPLICATION_JSON_CONTENT) || APPLICATION_JSON_REGEX.test(contentType)) {
+      const schema2 = getSchemaForContentType({
+        contentType,
+        media
+      });
+      if (schema2 != null) {
+        return schema2;
+      }
+    }
+  }
+  return void 0;
+}
+function getSchemaForContentType({ contentType, media }) {
+  var _a2;
+  return (_a2 = media[contentType]) == null ? void 0 : _a2.schema;
+}
+
+// pnp:/home/circleci/project/packages/cli/openapi-parser/lib/v3/converters/endpoint/convertRequest.js
+var APPLICATION_JSON_CONTENT2 = "application/json";
 var MULTIPART_CONTENT = "multipart/form-data";
 var OCTET_STREAM = "application/octet-stream";
 function getMultipartFormDataRequest(requestBody) {
@@ -751997,29 +752020,10 @@ function getOctetStreamRequest(requestBody) {
   return (_a2 = requestBody.content[OCTET_STREAM]) == null ? void 0 : _a2.schema;
 }
 function getApplicationJsonRequest(requestBody) {
-  const applicationJsonSchema = getSchemaForContentType({
-    contentType: APPLICATION_JSON_CONTENT,
-    media: requestBody.content
-  });
-  if (applicationJsonSchema != null) {
-    return {
-      schema: applicationJsonSchema
-    };
-  }
-  const applicationJsonUtf8Schema = getSchemaForContentType({
-    contentType: APPLICATION_JSON_UTF_8_CONTENT,
-    media: requestBody.content
-  });
-  if (applicationJsonUtf8Schema != null) {
-    return {
-      schema: applicationJsonUtf8Schema
-    };
-  }
-  return void 0;
-}
-function getSchemaForContentType({ contentType, media }) {
-  var _a2;
-  return (_a2 = media[contentType]) == null ? void 0 : _a2.schema;
+  const schema2 = getApplicationJsonSchemaFromMedia(requestBody.content);
+  return schema2 != null ? {
+    schema: schema2
+  } : schema2;
 }
 function multipartRequestHasFile(multipartSchema, document4) {
   const resolvedMultipartSchema = isReferenceObject(multipartSchema) ? resolveSchema(multipartSchema, document4) : {
@@ -752160,7 +752164,7 @@ function removeApplicationJsonAndMultipartConflictsFromOperationObject(operation
   };
 }
 function removeApplicationJsonAndMultipartConflictsFromRequestBody(requestBody) {
-  const jsonContent = requestBody.content[APPLICATION_JSON_CONTENT];
+  const jsonContent = requestBody.content[APPLICATION_JSON_CONTENT2];
   const multipartContent = requestBody.content[MULTIPART_CONTENT];
   if (multipartContent != null && jsonContent != null) {
     return {
@@ -752432,11 +752436,8 @@ var HEADERS_TO_SKIP = /* @__PURE__ */ new Set([
 ]);
 
 // pnp:/home/circleci/project/packages/cli/openapi-parser/lib/v3/converters/endpoint/convertResponse.js
-var APPLICATION_JSON_CONTENT2 = "application/json";
-var APPLICATION_JSON_UTF_8_CONTENT2 = "application/json; charset=utf-8";
 var APPLICATION_OCTET_STREAM_CONTENT = "application/octet-stream";
 var APPLICATION_PDF = "application/pdf";
-var APPLICATION_VND_JSON = "application/x-ndjson";
 var AUDIO_MPEG = "audio/mpeg";
 var TEXT_PLAIN_CONTENT = "text/plain";
 var SUCCESSFUL_STATUS_CODES = ["200", "201", "204"];
@@ -752481,37 +752482,37 @@ function convertResponse({ responses, context, responseBreadcrumbs, responseStat
   };
 }
 function convertResolvedResponse({ isStreaming, response, context, responseBreadcrumbs }) {
-  var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+  var _a2, _b2, _c2, _d, _e, _f, _g, _h;
   const resolvedResponse = isReferenceObject(response) ? context.resolveResponseReference(response) : response;
-  const responseSchema = ((_b2 = (_a2 = resolvedResponse.content) == null ? void 0 : _a2[APPLICATION_JSON_CONTENT2]) == null ? void 0 : _b2.schema) ?? ((_d = (_c2 = resolvedResponse.content) == null ? void 0 : _c2[APPLICATION_JSON_UTF_8_CONTENT2]) == null ? void 0 : _d.schema) ?? ((_f = (_e = resolvedResponse.content) == null ? void 0 : _e[APPLICATION_VND_JSON]) == null ? void 0 : _f.schema);
-  if (responseSchema != null) {
+  const jsonResponseSchema = getApplicationJsonResponse(resolvedResponse);
+  if (jsonResponseSchema != null) {
     if (isStreaming) {
       return {
         type: "streamingJson",
         description: resolvedResponse.description,
-        schema: convertSchemaWithExampleToSchema(convertSchema(responseSchema, false, context, responseBreadcrumbs))
+        schema: convertSchemaWithExampleToSchema(convertSchema(jsonResponseSchema, false, context, responseBreadcrumbs))
       };
     }
     return {
       type: "json",
       description: resolvedResponse.description,
-      schema: convertSchema(responseSchema, false, context, responseBreadcrumbs)
+      schema: convertSchema(jsonResponseSchema, false, context, responseBreadcrumbs)
     };
   }
-  if (((_h = (_g = resolvedResponse.content) == null ? void 0 : _g[APPLICATION_OCTET_STREAM_CONTENT]) == null ? void 0 : _h.schema) != null) {
+  if (((_b2 = (_a2 = resolvedResponse.content) == null ? void 0 : _a2[APPLICATION_OCTET_STREAM_CONTENT]) == null ? void 0 : _b2.schema) != null) {
     return {
       type: "file",
       description: resolvedResponse.description
     };
   }
-  if (((_j = (_i = resolvedResponse.content) == null ? void 0 : _i[APPLICATION_PDF]) == null ? void 0 : _j.schema) != null) {
+  if (((_d = (_c2 = resolvedResponse.content) == null ? void 0 : _c2[APPLICATION_PDF]) == null ? void 0 : _d.schema) != null) {
     return {
       type: "file",
       description: resolvedResponse.description
     };
   }
-  if (((_l = (_k = resolvedResponse.content) == null ? void 0 : _k[TEXT_PLAIN_CONTENT]) == null ? void 0 : _l.schema) != null) {
-    const textPlainSchema = (_m = resolvedResponse.content[TEXT_PLAIN_CONTENT]) == null ? void 0 : _m.schema;
+  if (((_f = (_e = resolvedResponse.content) == null ? void 0 : _e[TEXT_PLAIN_CONTENT]) == null ? void 0 : _f.schema) != null) {
+    const textPlainSchema = (_g = resolvedResponse.content[TEXT_PLAIN_CONTENT]) == null ? void 0 : _g.schema;
     if (textPlainSchema == null) {
       return {
         type: "text",
@@ -752530,7 +752531,7 @@ function convertResolvedResponse({ isStreaming, response, context, responseBread
       description: resolvedResponse.description
     };
   }
-  if (((_n = resolvedResponse.content) == null ? void 0 : _n[AUDIO_MPEG]) != null) {
+  if (((_h = resolvedResponse.content) == null ? void 0 : _h[AUDIO_MPEG]) != null) {
     return {
       type: "file",
       description: resolvedResponse.description
@@ -752538,8 +752539,10 @@ function convertResolvedResponse({ isStreaming, response, context, responseBread
   }
   return void 0;
 }
+function getApplicationJsonResponse(response) {
+  return getApplicationJsonSchemaFromMedia(response.content ?? {});
+}
 function markErrorSchemas({ responses, context }) {
-  var _a2, _b2, _c2, _d;
   const errorStatusCodes = [];
   for (const [statusCode, response] of Object.entries(responses)) {
     if (statusCode === "default") {
@@ -752551,7 +752554,7 @@ function markErrorSchemas({ responses, context }) {
     }
     errorStatusCodes.push(parsedStatusCode);
     const resolvedResponse = isReferenceObject(response) ? context.resolveResponseReference(response) : response;
-    const errorSchema = ((_b2 = (_a2 = resolvedResponse.content) == null ? void 0 : _a2[APPLICATION_JSON_CONTENT2]) == null ? void 0 : _b2.schema) ?? ((_d = (_c2 = resolvedResponse.content) == null ? void 0 : _c2[APPLICATION_JSON_UTF_8_CONTENT2]) == null ? void 0 : _d.schema) ?? {};
+    const errorSchema = getApplicationJsonResponse(resolvedResponse) ?? {};
     context.markSchemaForStatusCode(parsedStatusCode, errorSchema);
   }
   return errorStatusCodes;
@@ -761172,10 +761175,10 @@ var CliContext = class {
     return "fern-api";
   }
   getPackageVersion() {
-    if ("0.16.4" == null) {
+    if ("0.16.6" == null) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "0.16.4";
+    return "0.16.6";
   }
   getCliName() {
     if ("fern" == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fern-api",
-  "version": "0.16.4",
+  "version": "0.16.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/fern-api/fern.git",