@fern-api/fern-api-dev 4.85.0-2-g64f36e25155 → 4.85.0-3-g23b453e2191

package/cli.cjs

@@ -527298,8 +527298,8 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
         maxProperties: schema2.maxProperties
       });
     }
+    const isDiscriminated = getExtension(schema2, FernOpenAPIExtension.IS_DISCRIMINATED);
     if (schema2.oneOf != null && schema2.oneOf.length > 0) {
-      const isDiscriminated = getExtension(schema2, FernOpenAPIExtension.IS_DISCRIMINATED);
       if (isDiscriminated === false) {
         return convertUndiscriminatedOneOf({
           nameOverride,
@@ -527324,7 +527324,7 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
         discriminator: schema2.discriminator,
         context: context3
       });
-      if (!context3.options.discriminatedUnionV2 || objectDiscriminatorContext === "protocol") {
+      if (isDiscriminated === true || !context3.options.discriminatedUnionV2 || objectDiscriminatorContext === "protocol") {
         return convertDiscriminatedOneOf({
           nameOverride,
           generatedName,
@@ -527368,7 +527368,7 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
           discriminator: schema2.discriminator,
           context: context3
         });
-        if ((context3.options.discriminatedUnionV2 || isUndiscriminated) && discriminatorContext !== "protocol") {
+        if (isDiscriminated !== true && (context3.options.discriminatedUnionV2 || isUndiscriminated) && discriminatorContext !== "protocol") {
           return convertUndiscriminatedOneOfWithDiscriminant({
             nameOverride,
             generatedName,
@@ -527461,7 +527461,7 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
           });
         }
         const maybeDiscriminant = getDiscriminant({ schemas: schema2.oneOf, context: context3 });
-        if (maybeDiscriminant != null && !context3.options.discriminatedUnionV2 && !isUndiscriminated) {
+        if (maybeDiscriminant != null && (isDiscriminated === true || !context3.options.discriminatedUnionV2 && !isUndiscriminated)) {
           return convertDiscriminatedOneOfWithVariants({
             nameOverride,
             generatedName,
@@ -614772,7 +614772,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.85.0-2-g64f36e25155",
+          version: "4.85.0-3-g23b453e2191",
           usingAccessToken: true
         }
       });
@@ -614826,7 +614826,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.85.0-2-g64f36e25155",
+        version: "4.85.0-3-g23b453e2191",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -832324,7 +832324,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 = "4.85.0-2-g64f36e25155";
+  const version7 = "4.85.0-3-g23b453e2191";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -843971,7 +843971,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.85.0-2-g64f36e25155"
+        cliVersion: "4.85.0-3-g23b453e2191"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -919356,7 +919356,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.85.0-2-g64f36e25155";
+    return "4.85.0-3-g23b453e2191";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.85.0-2-g64f36e25155",
+  "version": "4.85.0-3-g23b453e2191",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",