@fern-api/fern-api-dev 4.79.1 → 4.79.2-1-g5b81c6143bc

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,
@@ -600386,6 +600397,42 @@ function isExternalRefValue(value) {
   const ref2 = value["$ref"];
   return typeof ref2 === "string" && ref2.length > 0 && !ref2.startsWith("#") && !isUrlRef(ref2);
 }
+function collectSiblingProperties(record22) {
+  const siblingProperties = {};
+  let hasSiblings = false;
+  for (const [key2, value] of Object.entries(record22)) {
+    if (key2 !== "$ref") {
+      siblingProperties[key2] = value;
+      hasSiblings = true;
+    }
+  }
+  return { siblingProperties, hasSiblings };
+}
+function navigateJsonPointer(root6, pointer2, filePath) {
+  if (pointer2 === "") {
+    return root6;
+  }
+  const segments = pointer2.split("/").filter((k19) => k19 !== "");
+  let current3 = root6;
+  for (const segment of segments) {
+    const decodedKey = segment.replace(/~1/g, "/").replace(/~0/g, "~");
+    if (typeof current3 !== "object" || current3 == null) {
+      throw new Error(`Cannot navigate JSON Pointer "${pointer2}" in "${filePath}": expected an object but found ${typeof current3} at key "${decodedKey}"`);
+    }
+    const next2 = current3[decodedKey];
+    if (next2 === void 0) {
+      throw new Error(`Cannot navigate JSON Pointer "${pointer2}" in "${filePath}": key "${decodedKey}" not found`);
+    }
+    current3 = next2;
+  }
+  return current3;
+}
+function mergeWithSiblings(resolved, siblingProperties, hasSiblings) {
+  if (hasSiblings && resolved != null && typeof resolved === "object" && !Array.isArray(resolved)) {
+    return { ...resolved, ...siblingProperties };
+  }
+  return resolved;
+}
 function findInternalRef(absRefPath, jsonPointer, mainFileAbsPath, registry2) {
   if (absRefPath === mainFileAbsPath) {
     return "#" + jsonPointer;
@@ -600406,24 +600453,37 @@ function findInternalRef(absRefPath, jsonPointer, mainFileAbsPath, registry2) {
   }
   return null;
 }
-async function resolveExternalRefs(obj, baseDir, mainFileAbsPath, registry2, applyRegistry = false, visited = /* @__PURE__ */ new Set(), fileCache = /* @__PURE__ */ new Map()) {
+async function resolveExternalRefs(obj, baseDir, mainFileAbsPath, registry2, applyRegistry = false, visited = /* @__PURE__ */ new Set(), fileCache = /* @__PURE__ */ new Map(), sourceFileAbsPath) {
   if (obj == null || typeof obj !== "object") {
     return obj;
   }
   if (Array.isArray(obj)) {
-    return Promise.all(obj.map((item) => resolveExternalRefs(item, baseDir, mainFileAbsPath, registry2, applyRegistry, visited, fileCache)));
+    return Promise.all(obj.map((item) => resolveExternalRefs(item, baseDir, mainFileAbsPath, registry2, applyRegistry, visited, fileCache, sourceFileAbsPath)));
   }
   const record22 = obj;
   const ref2 = record22["$ref"];
+  if (typeof ref2 === "string" && ref2.startsWith("#") && sourceFileAbsPath != null) {
+    const pointer2 = ref2.substring(1);
+    const { siblingProperties, hasSiblings } = collectSiblingProperties(record22);
+    const internalRef = findInternalRef(sourceFileAbsPath, pointer2, mainFileAbsPath, registry2);
+    if (internalRef !== null) {
+      return hasSiblings ? { $ref: internalRef, ...siblingProperties } : { $ref: internalRef };
+    }
+    const cacheKey = `${sourceFileAbsPath}#${pointer2}`;
+    if (visited.has(cacheKey)) {
+      throw new Error(`Circular $ref detected: "${ref2}" (resolved to "${cacheKey}")`);
+    }
+    const newVisited = new Set(visited);
+    newVisited.add(cacheKey);
+    const fileContent = await readAndParseFile(sourceFileAbsPath, fileCache);
+    const parsed = navigateJsonPointer(fileContent, pointer2, sourceFileAbsPath);
+    const refDir = (0, import_path33.dirname)(sourceFileAbsPath);
+    const resolved = await resolveExternalRefs(parsed, refDir, mainFileAbsPath, registry2, true, newVisited, fileCache, sourceFileAbsPath);
+    return mergeWithSiblings(resolved, siblingProperties, hasSiblings);
+  }
   if (typeof ref2 === "string" && !ref2.startsWith("#") && !isUrlRef(ref2)) {
     const { jsonPointer, absolutePath: absoluteRefPath } = parseExternalRef(ref2, baseDir);
-    const siblingProperties = {};
-    for (const [key2, value] of Object.entries(record22)) {
-      if (key2 !== "$ref") {
-        siblingProperties[key2] = value;
-      }
-    }
-    const hasSiblings = Object.keys(siblingProperties).length > 0;
+    const { siblingProperties, hasSiblings } = collectSiblingProperties(record22);
     if (applyRegistry) {
       const internalRef = findInternalRef(absoluteRefPath, jsonPointer, mainFileAbsPath, registry2);
       if (internalRef !== null) {
@@ -600436,33 +600496,15 @@ async function resolveExternalRefs(obj, baseDir, mainFileAbsPath, registry2, app
     }
     const newVisited = new Set(visited);
     newVisited.add(cacheKey);
-    let parsed = await readAndParseFile(absoluteRefPath, fileCache);
-    if (jsonPointer !== "") {
-      const keys24 = jsonPointer.split("/").filter((k19) => k19 !== "");
-      let current3 = parsed;
-      for (const key2 of keys24) {
-        const decodedKey = key2.replace(/~1/g, "/").replace(/~0/g, "~");
-        if (typeof current3 !== "object" || current3 == null) {
-          throw new Error(`Cannot navigate JSON Pointer "${jsonPointer}" in "${absoluteRefPath}": expected an object but found ${typeof current3} at key "${decodedKey}"`);
-        }
-        const next2 = current3[decodedKey];
-        if (next2 === void 0) {
-          throw new Error(`Cannot navigate JSON Pointer "${jsonPointer}" in "${absoluteRefPath}": key "${decodedKey}" not found`);
-        }
-        current3 = next2;
-      }
-      parsed = current3;
-    }
+    const fileContent = await readAndParseFile(absoluteRefPath, fileCache);
+    const parsed = navigateJsonPointer(fileContent, jsonPointer, absoluteRefPath);
     const refDir = (0, import_path33.dirname)(absoluteRefPath);
-    const resolved = await resolveExternalRefs(parsed, refDir, mainFileAbsPath, registry2, true, newVisited, fileCache);
-    if (hasSiblings && resolved != null && typeof resolved === "object" && !Array.isArray(resolved)) {
-      return { ...resolved, ...siblingProperties };
-    }
-    return resolved;
+    const resolved = await resolveExternalRefs(parsed, refDir, mainFileAbsPath, registry2, true, newVisited, fileCache, absoluteRefPath);
+    return mergeWithSiblings(resolved, siblingProperties, hasSiblings);
   }
   const result = {};
   for (const [key2, value] of Object.entries(record22)) {
-    result[key2] = await resolveExternalRefs(value, baseDir, mainFileAbsPath, registry2, applyRegistry, visited, fileCache);
+    result[key2] = await resolveExternalRefs(value, baseDir, mainFileAbsPath, registry2, applyRegistry, visited, fileCache, sourceFileAbsPath);
   }
   return result;
 }
@@ -601840,6 +601882,7 @@ var extensions_exports = {};
 __export(extensions_exports, {
   AudienceExtension: () => AudienceExtension,
   FernAvailabilityExtension: () => FernAvailabilityExtension,
+  FernDiscriminatorContextExtension: () => FernDiscriminatorContextExtension,
   FernEnumExtension: () => FernEnumExtension,
   FernIgnoreExtension: () => FernIgnoreExtension,
   FernOptionalExtension: () => FernOptionalExtension,
@@ -601907,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(),
@@ -604587,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,
@@ -604597,7 +604662,7 @@ var OneOfSchemaConverter = class extends AbstractConverter {
         extends: extends_,
         types: unionTypes,
         default: void 0,
-        discriminatorContext: void 0
+        discriminatorContext: discriminatorContextExtension.convert()
       }),
       referencedTypes,
       inlinedTypes: {
@@ -622228,7 +622293,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.79.1",
+          version: "4.79.2-1-g5b81c6143bc",
           usingAccessToken: true
         }
       });
@@ -622282,7 +622347,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.79.1",
+        version: "4.79.2-1-g5b81c6143bc",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -839509,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.1";
+  const version7 = "4.79.2-1-g5b81c6143bc";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -850838,7 +850903,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.79.1"
+        cliVersion: "4.79.2-1-g5b81c6143bc"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -925911,7 +925976,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.79.1";
+    return "4.79.2-1-g5b81c6143bc";
   }
   getCliName() {
     if (false) {

package/package.json

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