@fern-api/fern-api-dev 4.79.2 → 4.79.3-1-g4698bff6df4

package/cli.cjs

@@ -529060,6 +529060,9 @@ function variantMatchesSseSpec(schema2, context3) {
   }
   return hasEvent;
 }
+function resolveDiscriminatorContext({ discriminator, context: context3 }) {
+  return getExtension(discriminator, FernOpenAPIExtension.DISCRIMINATOR_CONTEXT) ?? inferDiscriminatorContext({ discriminator, context: context3 });
+}
 function inferDiscriminatorContext({ discriminator, context: context3 }) {
   const mapping = discriminator.mapping;
   if (mapping == null || Object.keys(mapping).length === 0) {
@@ -529099,7 +529102,7 @@ function inferDiscriminatorContextFromVariants({ variants, context: context3 })
 function convertDiscriminatedOneOf({ nameOverride, generatedName, title: title3, breadcrumbs, properties: properties7, description, availability, required: required6, wrapAsOptional, wrapAsNullable, discriminator, context: context3, namespace, groupName, encoding, source: source2 }) {
   const discriminant21 = discriminator.propertyName;
   const discriminantNameOverride = getExtension(discriminator, FernOpenAPIExtension.FERN_PROPERTY_NAME);
-  const discriminatorContext = getExtension(discriminator, FernOpenAPIExtension.DISCRIMINATOR_CONTEXT) ?? inferDiscriminatorContext({ discriminator, context: context3 });
+  const discriminatorContext = resolveDiscriminatorContext({ discriminator, context: context3 });
   const unionSubTypes = Object.fromEntries(Object.entries(discriminator.mapping ?? {}).map(([discriminantValue, schema2]) => {
     const subtypeReference = convertReferenceObject({
       $ref: schema2
@@ -531309,7 +531312,11 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
       }
     }
     if (schema2.type === "object" && schema2.discriminator != null && schema2.discriminator.mapping != null) {
-      if (!context3.options.discriminatedUnionV2) {
+      const objectDiscriminatorContext = resolveDiscriminatorContext({
+        discriminator: schema2.discriminator,
+        context: context3
+      });
+      if (!context3.options.discriminatedUnionV2 || objectDiscriminatorContext === "protocol") {
         return convertDiscriminatedOneOf({
           nameOverride,
           generatedName,
@@ -531349,7 +531356,11 @@ function convertSchemaObject(schema2, wrapAsOptional, wrapAsNullable, context3,
     if (schema2.oneOf != null && schema2.oneOf.length > 0) {
       const isUndiscriminated = getExtension(schema2, FernOpenAPIExtension.IS_UNDISCRIMINATED);
       if (schema2.discriminator != null && schema2.discriminator.mapping != null && Object.keys(schema2.discriminator.mapping).length > 0) {
-        if (context3.options.discriminatedUnionV2 || isUndiscriminated) {
+        const discriminatorContext = resolveDiscriminatorContext({
+          discriminator: schema2.discriminator,
+          context: context3
+        });
+        if ((context3.options.discriminatedUnionV2 || isUndiscriminated) && discriminatorContext !== "protocol") {
           return convertUndiscriminatedOneOfWithDiscriminant({
             nameOverride,
             generatedName,
@@ -601871,6 +601882,7 @@ var extensions_exports = {};
 __export(extensions_exports, {
   AudienceExtension: () => AudienceExtension,
   FernAvailabilityExtension: () => FernAvailabilityExtension,
+  FernDiscriminatorContextExtension: () => FernDiscriminatorContextExtension,
   FernEnumExtension: () => FernEnumExtension,
   FernIgnoreExtension: () => FernIgnoreExtension,
   FernOptionalExtension: () => FernOptionalExtension,
@@ -601938,6 +601950,23 @@ var FernAvailabilityExtension = class extends AbstractExtension {
   }
 };
 
+// ../api-importers/v3-importer-commons/lib/extensions/x-fern-discriminator-context.js
+var FernDiscriminatorContextExtension = class extends AbstractExtension {
+  node;
+  key = "x-fern-discriminator-context";
+  constructor({ breadcrumbs, node: node4, context: context3 }) {
+    super({ breadcrumbs, context: context3 });
+    this.node = node4;
+  }
+  convert() {
+    const extensionValue = this.getExtensionValue(this.node);
+    if (extensionValue === "data" || extensionValue === "protocol") {
+      return extensionValue;
+    }
+    return void 0;
+  }
+};
+
 // ../api-importers/v3-importer-commons/lib/schemas/EnumSchema.js
 var CasingConfigSchema = external_exports2.object({
   snake: external_exports2.string().optional(),
@@ -604618,6 +604647,11 @@ var OneOfSchemaConverter = class extends AbstractConverter {
     for (const typeId of Object.keys({ ...inlinedTypes, ...inlinedTypesFromProperties })) {
       referencedTypes.add(typeId);
     }
+    const discriminatorContextExtension = new FernDiscriminatorContextExtension({
+      context: this.context,
+      breadcrumbs: [...this.breadcrumbs, "discriminator"],
+      node: this.schema.discriminator
+    });
     return {
       type: Type.union({
         baseProperties,
@@ -604628,7 +604662,7 @@ var OneOfSchemaConverter = class extends AbstractConverter {
         extends: extends_,
         types: unionTypes,
         default: void 0,
-        discriminatorContext: void 0
+        discriminatorContext: discriminatorContextExtension.convert()
       }),
       referencedTypes,
       inlinedTypes: {
@@ -622259,7 +622293,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.79.2",
+          version: "4.79.3-1-g4698bff6df4",
           usingAccessToken: true
         }
       });
@@ -622313,7 +622347,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.79.2",
+        version: "4.79.3-1-g4698bff6df4",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -839540,7 +839574,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.79.2";
+  const version7 = "4.79.3-1-g4698bff6df4";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -850869,7 +850903,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.79.2"
+        cliVersion: "4.79.3-1-g4698bff6df4"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -925942,7 +925976,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.79.2";
+    return "4.79.3-1-g4698bff6df4";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.79.2",
+  "version": "4.79.3-1-g4698bff6df4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",