@fern-api/fern-api-dev 5.74.0 → 5.74.2

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";
@@ -573335,9 +573414,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.19.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.19.1/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist24 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.19.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.19.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp5 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -575379,6 +575458,47 @@ var require_dist24 = __commonJS({
     }
     var import_promises218 = require("fs/promises");
     var import_node_path45 = require("path");
+    var AUTOVERSION_PLACEHOLDERS = [
+      "v0.0.0-fern-placeholder",
+      // Go -- a superstring of the default; check first
+      "0.0.0-fern-placeholder",
+      // TS/Java/C#/Ruby/PHP/Rust/default
+      "0.0.0.dev0"
+      // Python (PEP 440 -- Poetry rejects hyphens)
+    ];
+    var VERSION_TOKEN = /(?:v)?\d+\.\d+\.\d+[0-9A-Za-z.+-]*/g;
+    var VERSION_MASK = "@@FERN_VERSION@@";
+    function maskVersions(line) {
+      return line.replace(VERSION_TOKEN, VERSION_MASK);
+    }
+    function containsPlaceholder(content5) {
+      if (!content5) return false;
+      return AUTOVERSION_PLACEHOLDERS.some((p6) => content5.includes(p6));
+    }
+    function remapManagedLines(genBase, target, theirs) {
+      if (!containsPlaceholder(genBase)) return theirs;
+      const managedMasks = /* @__PURE__ */ new Set();
+      for (const line of genBase.split("\n")) {
+        if (AUTOVERSION_PLACEHOLDERS.some((p6) => line.includes(p6))) managedMasks.add(maskVersions(line));
+      }
+      if (managedMasks.size === 0) return theirs;
+      const targetByMask = /* @__PURE__ */ new Map();
+      for (const line of target.split("\n")) {
+        const mask2 = maskVersions(line);
+        if (managedMasks.has(mask2) && !targetByMask.has(mask2)) targetByMask.set(mask2, line);
+      }
+      return theirs.split("\n").map((line) => {
+        const mask2 = maskVersions(line);
+        const replacement = managedMasks.has(mask2) ? targetByMask.get(mask2) : void 0;
+        return replacement !== void 0 && replacement !== line ? replacement : line;
+      }).join("\n");
+    }
+    function neutralizeAutoversionTheirs(genBase, theirs) {
+      return remapManagedLines(genBase, genBase, theirs);
+    }
+    function alignAutoversionToOurs(genBase, ours, theirs) {
+      return remapManagedLines(genBase, ours, theirs);
+    }
     async function runMergeAndRecord(args) {
       const { plan, inputs, patch: patch5, accumulator } = args;
       const { resolvedPath, metadata, oursPath, ours } = inputs;
@@ -575409,11 +575529,13 @@ var require_dist24 = __commonJS({
         accumulator.recordMerge(resolvedPath, merged2.content, patch5.base_generation);
         return { file: resolvedPath, status: "merged", ...unreachableFlag };
       }
-      const merged = threeWayMerge(plan.mergeBase, ours, plan.theirs);
+      const mergeBase = inputs.base != null ? alignAutoversionToOurs(inputs.base, ours, plan.mergeBase) : plan.mergeBase;
+      const theirs = inputs.base != null ? alignAutoversionToOurs(inputs.base, ours, plan.theirs) : plan.theirs;
+      const merged = threeWayMerge(mergeBase, ours, theirs);
       await (0, import_promises218.mkdir)((0, import_node_path45.dirname)(oursPath), { recursive: true });
       await (0, import_promises218.writeFile)(oursPath, merged.content);
       if (merged.hasConflicts) {
-        accumulator.recordConflict(resolvedPath, plan.theirs, patch5.base_generation);
+        accumulator.recordConflict(resolvedPath, theirs, patch5.base_generation);
         return {
           file: resolvedPath,
           status: "conflict",
@@ -575422,7 +575544,7 @@ var require_dist24 = __commonJS({
           conflictMetadata: metadata
         };
       }
-      accumulator.recordMerge(resolvedPath, plan.theirs, patch5.base_generation);
+      accumulator.recordMerge(resolvedPath, theirs, patch5.base_generation);
       return {
         file: resolvedPath,
         status: "merged",
@@ -577186,7 +577308,9 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
               if (baseChanged) repointed++;
               continue;
             }
-            const diff2 = await this.git.exec(["diff", currentGenSha, "--", ...patch5.files]).catch(() => null);
+            const rawDiff = await this.git.exec(["diff", currentGenSha, "--", ...patch5.files]).catch(() => null);
+            const neutralizedRebase = rawDiff != null && containsPlaceholder(rawDiff) ? await this.computeAutoversionNeutralizedRebase(patch5.files, currentGenSha) : null;
+            const diff2 = neutralizedRebase ? neutralizedRebase.diff : rawDiff;
             if (diff2 === null) continue;
             if (!diff2.trim()) {
               if (hasProtectedFiles) {
@@ -577242,7 +577366,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             patch5.base_generation = currentGenSha;
             patch5.patch_content = diff2;
             patch5.content_hash = newContentHash;
-            const snapshot = await this.readSnapshotFromDisk(patch5.files);
+            const snapshot = neutralizedRebase ? neutralizedRebase.snapshot : await this.readSnapshotFromDisk(patch5.files);
             const snapshotIsNonEmpty = Object.keys(snapshot).length > 0;
             if (snapshotIsNonEmpty) {
               patch5.theirs_snapshot = snapshot;
@@ -577282,6 +577406,47 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         }
         return snapshot;
       }
+      /**
+       * Autoversion-aware replacement for the naive `git diff currentGen -- files`
+       * + on-disk snapshot used when rebasing a cleanly-applied patch.
+       *
+       * The generation tree (BASE) still carries the placeholder on version lines
+       * (autoversion runs after `[fern-generated]`), but the working tree holds
+       * autoversion's resolved semver. A raw diff/snapshot would fold the
+       * placeholder->semver swap into the customer's patch_content/theirs_snapshot,
+       * pinning a stale version. This re-derives both against a version-neutralized
+       * THEIRS so the pipeline-owned version line never enters the patch.
+       *
+       * Returns null when no file is under autoversion (fixed `--version`, i.e. no
+       * placeholder in the generation tree) — callers keep their existing behavior.
+       */
+      async computeAutoversionNeutralizedRebase(files, currentGenSha) {
+        const genByFile = /* @__PURE__ */ new Map();
+        let anyPlaceholder = false;
+        for (const file4 of files) {
+          const gen = await this.git.showFile(currentGenSha, file4).catch(() => null);
+          genByFile.set(file4, gen);
+          if (containsPlaceholder(gen)) anyPlaceholder = true;
+        }
+        if (!anyPlaceholder) return null;
+        const snapshot = {};
+        const fragments = [];
+        for (const file4 of files) {
+          if (isBinaryFile(file4)) continue;
+          const disk = await (0, import_promises610.readFile)((0, import_node_path92.join)(this.outputDir, file4), "utf-8").catch(() => null);
+          if (disk == null) continue;
+          const gen = genByFile.get(file4) ?? null;
+          const neutralized = gen != null ? neutralizeAutoversionTheirs(gen, disk) : disk;
+          snapshot[file4] = neutralized;
+          if (gen == null) {
+            fragments.push(synthesizeNewFileDiff(file4, neutralized));
+          } else if (gen !== neutralized) {
+            const fileDiff = await unifiedDiff(gen, neutralized, file4);
+            if (fileDiff.trim()) fragments.push(fileDiff);
+          }
+        }
+        return { diff: fragments.join(""), snapshot };
+      }
       /**
        * Detects autoversion contamination — returns true when a
        * `[fern-autoversion]` commit between `fromSha` and `toSha` touched any
@@ -690812,7 +690977,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.74.0",
+          version: "5.74.2",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -690878,7 +691043,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.74.0",
+        version: "5.74.2",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -871979,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.74.0";
+  const version7 = "5.74.2";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -904562,7 +904727,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.74.0",
+        cliVersion: "5.74.2",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -971088,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.74.0"
+    cli_version: "5.74.2"
   };
 }
 function isAutomationMode() {
@@ -971920,7 +972085,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.74.0";
+    return "5.74.2";
   }
   getCliName() {
     if (false) {

package/package.json

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