@fern-api/fern-api-dev 5.23.3-1439-g54567d57062 → 5.23.3-1448-g4a0a3bde837

package/cli.cjs

@@ -153418,12 +153418,23 @@ function convertDiscriminatedOneOf({ nameOverride, generatedName, title: title2,
   const discriminantNameOverride = getExtension(discriminator, FernOpenAPIExtension.FERN_PROPERTY_NAME);
   const discriminatorContext = resolveDiscriminatorContext({ discriminator, context: context3 });
   const unionSubTypes = Object.fromEntries(Object.entries(discriminator.mapping ?? {}).map(([discriminantValue, schema]) => {
-    const subtypeReference = convertReferenceObject({
-      $ref: schema
-    }, false, false, context3, [schema], encoding, source2, namespace);
-    context3.markReferencedByDiscriminatedUnion({
-      $ref: schema
-    }, discriminant22, 1);
+    const ref2 = { $ref: schema };
+    const resolvedSchema = context3.resolveSchemaReference(ref2);
+    const nestedVariants = resolvedSchema.oneOf ?? resolvedSchema.anyOf;
+    if (nestedVariants != null && nestedVariants.length > 0 && resolvedSchema.discriminator == null && resolvedSchema.properties == null && resolvedSchema.allOf == null) {
+      const mergedSchema = mergeOneOfVariantsIntoObject({
+        variants: nestedVariants,
+        context: context3,
+        discriminant: discriminant22
+      });
+      if (mergedSchema != null) {
+        const variantSchema = convertSchemaObject(mergedSchema, false, false, context3, [...breadcrumbs, discriminantValue], encoding, source2, namespace, /* @__PURE__ */ new Set([discriminant22]));
+        context3.markReferencedByDiscriminatedUnion(ref2, discriminant22, 1);
+        return [discriminantValue, variantSchema];
+      }
+    }
+    const subtypeReference = convertReferenceObject(ref2, false, false, context3, [schema], encoding, source2, namespace);
+    context3.markReferencedByDiscriminatedUnion(ref2, discriminant22, 1);
     return [discriminantValue, subtypeReference];
   }));
   const convertedProperties = Object.entries(properties7).filter(([propertyName]) => {
@@ -153638,6 +153649,74 @@ function getAllRequiredPropertyNames({ schema, context: context3, visited }) {
   }
   return result;
 }
+function collectAllRawProperties({ schema, context: context3, visited }) {
+  const properties7 = {};
+  const required6 = /* @__PURE__ */ new Set();
+  let resolved;
+  if (isReferenceObject(schema)) {
+    if (visited.has(schema.$ref)) {
+      return { properties: properties7, required: required6 };
+    }
+    visited.add(schema.$ref);
+    resolved = context3.resolveSchemaReference(schema);
+  } else {
+    resolved = schema;
+  }
+  for (const allOfElement of resolved.allOf ?? []) {
+    const child = collectAllRawProperties({ schema: allOfElement, context: context3, visited: new Set(visited) });
+    for (const [name2, prop] of Object.entries(child.properties)) {
+      if (!(name2 in properties7)) {
+        properties7[name2] = prop;
+      }
+    }
+    for (const name2 of child.required) {
+      required6.add(name2);
+    }
+  }
+  for (const [name2, prop] of Object.entries(resolved.properties ?? {})) {
+    if (!(name2 in properties7)) {
+      properties7[name2] = prop;
+    }
+  }
+  for (const name2 of resolved.required ?? []) {
+    required6.add(name2);
+  }
+  return { properties: properties7, required: required6 };
+}
+function mergeOneOfVariantsIntoObject({ variants, context: context3, discriminant: discriminant22 }) {
+  const variantData = [];
+  for (const variant of variants) {
+    const resolved = isReferenceObject(variant) ? context3.resolveSchemaReference(variant) : variant;
+    if (resolved.properties == null && resolved.allOf == null && resolved.type !== "object") {
+      return void 0;
+    }
+    const collected = collectAllRawProperties({ schema: variant, context: context3, visited: /* @__PURE__ */ new Set() });
+    variantData.push(collected);
+  }
+  const mergedProperties = {};
+  const propertyPresenceCount = {};
+  const requiredInAllCount = {};
+  for (const { properties: properties7, required: required6 } of variantData) {
+    for (const [name2, prop] of Object.entries(properties7)) {
+      if (name2 === discriminant22) {
+        continue;
+      }
+      if (!(name2 in mergedProperties)) {
+        mergedProperties[name2] = prop;
+      }
+      propertyPresenceCount[name2] = (propertyPresenceCount[name2] ?? 0) + 1;
+      if (required6.has(name2)) {
+        requiredInAllCount[name2] = (requiredInAllCount[name2] ?? 0) + 1;
+      }
+    }
+  }
+  const mergedRequired = Object.keys(mergedProperties).filter((name2) => propertyPresenceCount[name2] === variants.length && requiredInAllCount[name2] === variants.length);
+  return {
+    type: "object",
+    properties: mergedProperties,
+    required: mergedRequired.length > 0 ? mergedRequired : void 0
+  };
+}
 var init_convertDiscriminatedOneOf = __esm({
   "../api-importers/openapi/openapi-ir-parser/lib/schema/convertDiscriminatedOneOf.js"() {
     "use strict";
@@ -690898,7 +690977,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-1439-g54567d57062",
+          version: "5.23.3-1448-g4a0a3bde837",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -690964,7 +691043,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-1439-g54567d57062",
+        version: "5.23.3-1448-g4a0a3bde837",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -872065,7 +872144,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.23.3-1439-g54567d57062";
+  const version7 = "5.23.3-1448-g4a0a3bde837";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -904648,7 +904727,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-1439-g54567d57062",
+        cliVersion: "5.23.3-1448-g4a0a3bde837",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -971174,7 +971253,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.23.3-1439-g54567d57062"
+    cli_version: "5.23.3-1448-g4a0a3bde837"
   };
 }
 function isAutomationMode() {
@@ -972006,7 +972085,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-1439-g54567d57062";
+    return "5.23.3-1448-g4a0a3bde837";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-1439-g54567d57062",
+  "version": "5.23.3-1448-g4a0a3bde837",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",