@fern-api/fern-api-dev 4.49.0 → 4.50.1-7-g45d7cf07027

package/cli.cjs

@@ -518167,11 +518167,105 @@ function convertAvailability2(propertySchema) {
   return void 0;
 }
 
+// ../api-importers/openapi/openapi-ir-parser/lib/schema/inferDiscriminatorContext.js
+var SSE_SPEC_FIELDS = /* @__PURE__ */ new Set(["event", "data", "id", "retry"]);
+function collectAllProperties(schema2, context3) {
+  let allProperties = {
+    ...schema2.properties ?? {}
+  };
+  for (const allOfElement of schema2.allOf ?? []) {
+    if (isReferenceObject(allOfElement)) {
+      const resolved = context3.resolveSchemaReference(allOfElement);
+      const inheritedProperties = collectAllProperties(resolved, context3);
+      allProperties = { ...inheritedProperties, ...allProperties };
+    } else {
+      const inheritedProperties = collectAllProperties(allOfElement, context3);
+      allProperties = { ...inheritedProperties, ...allProperties };
+    }
+  }
+  return allProperties;
+}
+function resolvePropertySchema(schema2, context3) {
+  if (isReferenceObject(schema2)) {
+    return context3.resolveSchemaReference(schema2);
+  }
+  return schema2;
+}
+function variantMatchesSseSpec(schema2, context3) {
+  const allProperties = collectAllProperties(schema2, context3);
+  const propertyEntries = Object.entries(allProperties);
+  if (propertyEntries.length === 0) {
+    return false;
+  }
+  let hasEvent = false;
+  for (const [propName, propSchema] of propertyEntries) {
+    if (!SSE_SPEC_FIELDS.has(propName)) {
+      return false;
+    }
+    const resolved = resolvePropertySchema(propSchema, context3);
+    switch (propName) {
+      case "event":
+        hasEvent = true;
+        if (resolved.type !== "string") {
+          return false;
+        }
+        break;
+      case "id":
+        if (resolved.type !== "string") {
+          return false;
+        }
+        break;
+      case "retry":
+        if (resolved.type !== "integer") {
+          return false;
+        }
+        break;
+      case "data":
+        break;
+    }
+  }
+  return hasEvent;
+}
+function inferDiscriminatorContext({ discriminator, context: context3 }) {
+  const mapping = discriminator.mapping;
+  if (mapping == null || Object.keys(mapping).length === 0) {
+    return "data";
+  }
+  for (const schema2 of Object.values(mapping)) {
+    try {
+      const resolved = context3.resolveSchemaReference({ $ref: schema2 });
+      if (!variantMatchesSseSpec(resolved, context3)) {
+        return "data";
+      }
+    } catch {
+      return "data";
+    }
+  }
+  return "protocol";
+}
+function inferDiscriminatorContextFromVariants({ variants, context: context3 }) {
+  const variantEntries = Object.values(variants);
+  if (variantEntries.length === 0) {
+    return "data";
+  }
+  for (const variantSchema of variantEntries) {
+    try {
+      const resolved = isReferenceObject(variantSchema) ? context3.resolveSchemaReference(variantSchema) : variantSchema;
+      if (!variantMatchesSseSpec(resolved, context3)) {
+        return "data";
+      }
+    } catch {
+      return "data";
+    }
+  }
+  return "protocol";
+}
+
 // ../api-importers/openapi/openapi-ir-parser/lib/schema/convertDiscriminatedOneOf.js
 function convertDiscriminatedOneOf({ nameOverride, generatedName, title: title3, breadcrumbs, properties: properties7, description, availability, required: required6, wrapAsOptional, wrapAsNullable, discriminator, context: context3, namespace, groupName, encoding, source: source2 }) {
   const discriminant19 = discriminator.propertyName;
   const discriminantNameOverride = getExtension(discriminator, FernOpenAPIExtension.FERN_PROPERTY_NAME);
-  const discriminatorContext = getExtension(discriminator, FernOpenAPIExtension.DISCRIMINATOR_CONTEXT) ?? "data";
+  const discriminatorContext = getExtension(discriminator, FernOpenAPIExtension.DISCRIMINATOR_CONTEXT) ?? inferDiscriminatorContext({ discriminator, context: context3 });
   const unionSubTypes = Object.fromEntries(Object.entries(discriminator.mapping ?? {}).map(([discriminantValue, schema2]) => {
     const subtypeReference = convertReferenceObject({
       $ref: schema2
@@ -518243,8 +518337,7 @@ function convertDiscriminatedOneOfWithVariants({ nameOverride, generatedName, ti
     availability,
     discriminant: discriminant19,
     discriminantNameOverride: void 0,
-    discriminatorContext: "data",
-    // variants don't have discriminator object, default to data
+    discriminatorContext: inferDiscriminatorContextFromVariants({ variants, context: context3 }),
     subtypes: unionSubTypes,
     namespace,
     groupName,
@@ -519187,13 +519280,7 @@ function convertObject3({ nameOverride, generatedName, title: title3, breadcrumb
       });
     }
   }
-  const filteredPropertiesToConvert = Object.fromEntries(Object.entries(propertiesToConvert).filter(([_16, propertySchema]) => {
-    if (!isReferenceObject(propertySchema) && propertySchema.type === "null") {
-      return false;
-    }
-    return true;
-  }));
-  const convertedProperties = Object.entries(filteredPropertiesToConvert).map(([propertyName, propertySchema]) => {
+  const convertedProperties = Object.entries(propertiesToConvert).map(([propertyName, propertySchema]) => {
     const audiences = getExtension(propertySchema, FernOpenAPIExtension.AUDIENCES) ?? [];
     const availability2 = convertAvailability2(propertySchema);
     const resolvedPropertySchema = isReferenceObject(propertySchema) ? context3.resolveSchemaReference(propertySchema) : propertySchema;
@@ -519783,6 +519870,9 @@ function isInlinable(schema2, context3) {
     case void 0:
       return false;
     default:
+      if (resolvedSchema.type === "null") {
+        return true;
+      }
       context3.logger.warn("Unhandled schema type. Will not inline this schema", JSON.stringify(resolvedSchema));
       return false;
   }
@@ -520687,6 +520777,42 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
         maxProperties: schema2.maxProperties
       });
     }
+    if (schema2.type === "null") {
+      let result2 = SchemaWithExample.nullable({
+        availability,
+        namespace,
+        groupName,
+        description,
+        generatedName,
+        inline: void 0,
+        nameOverride,
+        title: title3,
+        value: SchemaWithExample.unknown({
+          nameOverride,
+          generatedName,
+          title: title3,
+          description: void 0,
+          availability: void 0,
+          namespace,
+          groupName,
+          example: void 0
+        })
+      });
+      if (wrapAsOptional) {
+        result2 = SchemaWithExample.optional({
+          availability,
+          namespace,
+          groupName,
+          description,
+          generatedName,
+          inline: void 0,
+          nameOverride,
+          title: title3,
+          value: result2
+        });
+      }
+      return result2;
+    }
     if (schema2.type === "object" && hasNoOneOf(schema2) && hasNoAllOf(schema2) && hasNoProperties(schema2)) {
       return wrapMap({
         nameOverride,
@@ -602182,7 +602308,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.49.0",
+          version: "4.50.1-7-g45d7cf07027",
           usingAccessToken: true
         }
       });
@@ -602233,7 +602359,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.49.0",
+        version: "4.50.1-7-g45d7cf07027",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -826088,7 +826214,7 @@ var import_path54 = __toESM(require("path"), 1);
 var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 function getCliSource() {
-  const version7 = "4.49.0";
+  const version7 = "4.50.1-7-g45d7cf07027";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -837090,7 +837216,7 @@ var LegacyDocsPublisher = class {
         previewId: void 0,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.49.0"
+        cliVersion: "4.50.1-7-g45d7cf07027"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -910205,7 +910331,7 @@ var CliContext = class {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.49.0";
+    return "4.50.1-7-g45d7cf07027";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.49.0",
+  "version": "4.50.1-7-g45d7cf07027",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",