@fern-api/fern-api-dev 4.106.3-6-ga791f2f555d → 4.107.0-11-g58f57e9e0ec

package/cli.cjs

@@ -340394,9 +340394,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.12.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.13.0/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.12.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.13.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -341136,17 +341136,57 @@ var require_dist14 = __commonJS({
         }
         const isAncestor = await this.git.isAncestor(lastGen.commit_sha, "HEAD");
         if (!isAncestor) {
+          return this.detectPatchesViaMergeBase(lastGen, lock);
+        }
+        return this.detectPatchesInRange(lastGen.commit_sha, lastGen, lock);
+      }
+      /**
+       * FER-10201 — Non-linear-history detection via `merge-base(prevGen, HEAD)`.
+       *
+       * After a squash-merge of a Fern-bot PR, `lastGen.commit_sha` (the previous
+       * `[fern-generated]`) is orphaned but still in git's object database. The
+       * merge-base is the commit on main from which the bot's branch was created —
+       * a reachable ancestor of HEAD. Walking that range and classifying each
+       * commit via `isGenerationCommit` mirrors the linear path and eliminates
+       * the bug class where pipeline-driven changes (autoversion, replay,
+       * generation) get bundled as customer customizations.
+       *
+       * Falls through to the legacy composite path when no common ancestor exists
+       * (truly disjoint history — orphan branches with no shared root).
+       */
+      async detectPatchesViaMergeBase(lastGen, lock) {
+        let mergeBase = "";
+        try {
+          mergeBase = (await this.git.exec(["merge-base", lastGen.commit_sha, "HEAD"])).trim();
+        } catch {
+        }
+        if (!mergeBase) {
+          this.warnings.push(
+            `No common ancestor between previous generation ${lastGen.commit_sha.slice(0, 7)} and HEAD. Falling back to composite tree-diff detection.`
+          );
           return this.detectPatchesViaTreeDiff(
             lastGen,
             /* commitKnownMissing */
             false
           );
         }
+        return this.detectPatchesInRange(mergeBase, lastGen, lock);
+      }
+      /**
+       * FER-10201 — Walk `${rangeStart}..HEAD`, classify each commit, emit one
+       * `StoredPatch` per customer commit. Body shared by the linear path
+       * (rangeStart = lastGen.commit_sha) and the merge-base path.
+       *
+       * Patch `base_generation` is always `lastGen.commit_sha` — the
+       * lockfile-tracked reference the applicator uses to fetch base file
+       * content, regardless of where the walk actually started.
+       */
+      async detectPatchesInRange(rangeStart, lastGen, lock) {
         const log4 = await this.git.exec([
           "log",
           "--first-parent",
           "--format=%H%x00%an%x00%ae%x00%s",
-          `${lastGen.commit_sha}..HEAD`,
+          `${rangeStart}..HEAD`,
           "--",
           this.sdkOutputDir
         ]);
@@ -621265,7 +621305,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.106.3-6-ga791f2f555d",
+          version: "4.107.0-11-g58f57e9e0ec",
           usingAccessToken: true
         }
       });
@@ -621319,7 +621359,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.106.3-6-ga791f2f555d",
+        version: "4.107.0-11-g58f57e9e0ec",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -832962,7 +833002,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.106.3-6-ga791f2f555d";
+  const version7 = "4.107.0-11-g58f57e9e0ec";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -845371,7 +845411,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.106.3-6-ga791f2f555d",
+        cliVersion: "4.107.0-11-g58f57e9e0ec",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -881444,52 +881484,6 @@ var Begin = class extends AstNode6 {
   }
 };
 
-// ../../../generators/ruby-v2/ast/lib/ast/IfElse.js
-var IfElse = class extends AstNode6 {
-  ifBranch;
-  elseIfs;
-  elseBody;
-  constructor({ if: ifBranch, elseIf, elseBody }) {
-    super();
-    this.ifBranch = ifBranch;
-    this.elseIfs = elseIf ?? [];
-    this.elseBody = elseBody ? Array.isArray(elseBody) ? elseBody : [elseBody] : void 0;
-  }
-  write(writer2) {
-    writer2.write("if ");
-    this.ifBranch.condition.write(writer2);
-    writer2.writeLine();
-    writer2.indent();
-    for (const stmt of this.ifBranch.thenBody) {
-      stmt.write(writer2);
-      writer2.writeNewLineIfLastLineNot();
-    }
-    writer2.dedent();
-    for (const elseIf of this.elseIfs) {
-      writer2.write("elsif ");
-      elseIf.condition.write(writer2);
-      writer2.writeLine();
-      writer2.indent();
-      for (const stmt of elseIf.thenBody) {
-        stmt.write(writer2);
-        writer2.writeNewLineIfLastLineNot();
-      }
-      writer2.dedent();
-    }
-    if (this.elseBody && this.elseBody.length > 0) {
-      writer2.writeLine("else");
-      writer2.indent();
-      for (const stmt of this.elseBody) {
-        stmt.write(writer2);
-        writer2.writeNewLineIfLastLineNot();
-      }
-      writer2.dedent();
-    }
-    writer2.write("end");
-    writer2.writeNewLineIfLastLineNot();
-  }
-};
-
 // ../../../generators/ruby-v2/ast/lib/ast/Comment.js
 var MAX_LINE_LENGTH2 = 120;
 var COMMENT_PREFIX_LENGTH = 2;
@@ -882136,19 +882130,20 @@ var Class_ = class extends Module_ {
       writer2.writeLine("; end");
       return;
     }
-    if (this.statements.length) {
+    if (this.statements.length || this.methods.length) {
       writer2.newLine();
       writer2.indent();
       this.statements.forEach((statement, index3) => {
         statement.write(writer2);
-        writer2.newLine();
+        writer2.writeNewLineIfLastLineNot();
+        if (index3 < this.statements.length - 1) {
+          writer2.newLine();
+        }
       });
-      writer2.dedent();
-    }
-    if (this.methods.length) {
-      writer2.newLine();
-      writer2.indent();
-      this.methods.forEach((method8) => {
+      this.methods.forEach((method8, index3) => {
+        if (index3 > 0 || this.statements.length > 0) {
+          writer2.newLine();
+        }
         method8.write(writer2);
       });
       writer2.dedent();
@@ -882186,6 +882181,112 @@ var Class_ = class extends Module_ {
   }
 };
 
+// ../../../generators/ruby-v2/ast/lib/ast/IfElse.js
+var IfElse = class extends AstNode6 {
+  ifBranch;
+  elseIfs;
+  elseBody;
+  constructor({ if: ifBranch, elseIf, elseBody }) {
+    super();
+    this.ifBranch = ifBranch;
+    this.elseIfs = elseIf ?? [];
+    this.elseBody = elseBody ? Array.isArray(elseBody) ? elseBody : [elseBody] : void 0;
+  }
+  write(writer2) {
+    const modifier = this.renderAsModifier(writer2);
+    if (modifier != null) {
+      writer2.write(modifier);
+      writer2.writeNewLineIfLastLineNot();
+      return;
+    }
+    writer2.write("if ");
+    this.ifBranch.condition.write(writer2);
+    writer2.writeLine();
+    writer2.indent();
+    for (const stmt of this.ifBranch.thenBody) {
+      stmt.write(writer2);
+      writer2.writeNewLineIfLastLineNot();
+    }
+    writer2.dedent();
+    for (const elseIf of this.elseIfs) {
+      writer2.write("elsif ");
+      elseIf.condition.write(writer2);
+      writer2.writeLine();
+      writer2.indent();
+      for (const stmt of elseIf.thenBody) {
+        stmt.write(writer2);
+        writer2.writeNewLineIfLastLineNot();
+      }
+      writer2.dedent();
+    }
+    if (this.elseBody && this.elseBody.length > 0) {
+      writer2.writeLine("else");
+      writer2.indent();
+      for (const stmt of this.elseBody) {
+        stmt.write(writer2);
+        writer2.writeNewLineIfLastLineNot();
+      }
+      writer2.dedent();
+    }
+    writer2.write("end");
+    writer2.writeNewLineIfLastLineNot();
+  }
+  /**
+   * Returns the modifier-form rendering (`stmt if cond`) when this if is
+   * eligible:
+   *   - exactly one statement in the then-body
+   *   - no elsif and no else
+   *   - the single statement is not an intrinsically multi-line AST node
+   *     (Class, Module, Method, Begin, IfElse)
+   *   - the rendered statement and condition each fit on a single line
+   *
+   * Returns undefined when the shape isn't eligible, in which case the caller
+   * falls back to explicit if/end form.
+   *
+   * The generator's .rubocop.yml disables Layout/LineLength, so rubocop's
+   * Style/IfUnlessModifier accepts modifier form at any line length. Shape
+   * eligibility is therefore sufficient; we don't gate on a max-line-length
+   * budget here.
+   */
+  renderAsModifier(writer2) {
+    if (this.ifBranch.thenBody.length !== 1) {
+      return void 0;
+    }
+    if (this.elseIfs.length > 0) {
+      return void 0;
+    }
+    if (this.elseBody != null && this.elseBody.length > 0) {
+      return void 0;
+    }
+    const stmt = this.ifBranch.thenBody[0];
+    if (stmt == null) {
+      return void 0;
+    }
+    if (isKnownMultiLineNode(stmt) || isKnownMultiLineNode(this.ifBranch.condition)) {
+      return void 0;
+    }
+    const stmtRendered = renderNode(stmt, writer2);
+    const conditionRendered = renderNode(this.ifBranch.condition, writer2);
+    if (stmtRendered.length === 0 || conditionRendered.length === 0) {
+      return void 0;
+    }
+    if (stmtRendered.includes("\n") || conditionRendered.includes("\n")) {
+      return void 0;
+    }
+    return `${stmtRendered} if ${conditionRendered}`;
+  }
+};
+function isKnownMultiLineNode(node4) {
+  return node4 instanceof Class_ || node4 instanceof Module_ || node4 instanceof Method6 || node4 instanceof Begin || node4 instanceof IfElse;
+}
+function renderNode(node4, parentWriter) {
+  const rendered = node4.toString({
+    customConfig: parentWriter.customConfig,
+    formatter: parentWriter.formatter
+  });
+  return rendered.replace(/\n+$/, "");
+}
+
 // ../../../generators/ruby-v2/ast/lib/ast/ClassInstantiation.js
 var ClassInstantiation5 = class extends AstNode6 {
   classReference;
@@ -882446,9 +882547,36 @@ var TypeLiteral3 = class _TypeLiteral extends AstNode6 {
     super();
     this.internalType = internalType;
   }
+  /**
+   * Returns a stable string representation of this literal suitable for
+   * deduplicating hash keys (see Lint/DuplicateHashKey). Returns undefined
+   * for compound/dynamic shapes where value equality isn't decidable at
+   * emit time.
+   */
+  getDedupKey() {
+    switch (this.internalType.type) {
+      case "str":
+        return `str:${this.internalType.value}`;
+      case "interpolatedStr":
+        return `istr:${this.internalType.value}`;
+      case "int":
+        return `int:${this.internalType.value}`;
+      case "float":
+        return `float:${this.internalType.value}`;
+      case "bool":
+        return `bool:${this.internalType.value}`;
+      case "nil":
+        return "nil";
+      default:
+        return void 0;
+    }
+  }
   static string(value2) {
     return new this({ type: "str", value: value2 });
   }
+  static interpolatedString(value2) {
+    return new this({ type: "interpolatedStr", value: value2 });
+  }
   static integer(value2) {
     return new this({ type: "int", value: value2 });
   }
@@ -882485,6 +882613,11 @@ var TypeLiteral3 = class _TypeLiteral extends AstNode6 {
   write(writer2) {
     switch (this.internalType.type) {
       case "str": {
+        const value2 = this.internalType.value.replaceAll("\r\n", "\n");
+        writer2.write(`"${value2.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replace(/#(?=[{$@])/g, "\\#")}"`);
+        break;
+      }
+      case "interpolatedStr": {
         const value2 = this.internalType.value.replaceAll("\r\n", "\n");
         writer2.write(`"${value2.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`);
         break;
@@ -882502,7 +882635,21 @@ var TypeLiteral3 = class _TypeLiteral extends AstNode6 {
         break;
       }
       case "hash": {
-        const entries23 = this.internalType.entries.filter((entry) => !_TypeLiteral.isNop(entry.key) && !_TypeLiteral.isNop(entry.value));
+        const filteredEntries = this.internalType.entries.filter((entry) => !_TypeLiteral.isNop(entry.key) && !_TypeLiteral.isNop(entry.value));
+        const seenKeys = /* @__PURE__ */ new Map();
+        filteredEntries.forEach((entry, index3) => {
+          const rendered = renderKeyForDedup(entry.key);
+          if (rendered != null) {
+            seenKeys.set(rendered, index3);
+          }
+        });
+        const entries23 = filteredEntries.filter((entry, index3) => {
+          const rendered = renderKeyForDedup(entry.key);
+          if (rendered == null) {
+            return true;
+          }
+          return seenKeys.get(rendered) === index3;
+        });
         if (entries23.length === 0) {
           writer2.write("{}");
           break;
@@ -882582,6 +882729,12 @@ var TypeLiteral3 = class _TypeLiteral extends AstNode6 {
     }
   }
 };
+function renderKeyForDedup(key2) {
+  if (!(key2 instanceof TypeLiteral3)) {
+    return void 0;
+  }
+  return key2.getDedupKey();
+}
 
 // ../../../generators/ruby-v2/ast/lib/ast/TypeParameter.js
 var Variance;
@@ -883544,6 +883697,7 @@ var EndpointSnippetGenerator7 = class {
       invokeMethodArgs.keywordArguments = invokeMethodArgs.keywordArguments ?? [];
       invokeMethodArgs.keywordArguments.push(requestOptions);
     }
+    invokeMethodArgs.keywordArguments = dedupeKeywordArguments(invokeMethodArgs.keywordArguments);
     return ruby_exports.invokeMethod(invokeMethodArgs);
   }
   /**
@@ -883577,6 +883731,7 @@ var EndpointSnippetGenerator7 = class {
       invokeMethodArgs.keywordArguments = invokeMethodArgs.keywordArguments ?? [];
       invokeMethodArgs.keywordArguments.push(requestOptions);
     }
+    invokeMethodArgs.keywordArguments = dedupeKeywordArguments(invokeMethodArgs.keywordArguments);
     return ruby_exports.invokeMethod(invokeMethodArgs);
   }
   /**
@@ -883913,6 +884068,21 @@ var EndpointSnippetGenerator7 = class {
     return this.context.getMethodName(endpoint3.declaration.name);
   }
 };
+function dedupeKeywordArguments(kwargs) {
+  if (kwargs == null || kwargs.length <= 1) {
+    return kwargs;
+  }
+  const lastIndexByName = /* @__PURE__ */ new Map();
+  kwargs.forEach((arg, index3) => {
+    lastIndexByName.set(arg.name, index3);
+  });
+  const deduped = kwargs.filter((arg, index3) => lastIndexByName.get(arg.name) === index3);
+  if (deduped.length !== kwargs.length) {
+    const droppedNames = Array.from(new Set(kwargs.map((arg) => arg.name).filter((name2, index3) => lastIndexByName.get(name2) !== index3)));
+    console.warn(`[ruby-v2 dynamic-snippets] duplicate keyword argument name(s) [${droppedNames.join(", ")}] in a generated snippet; keeping last occurrence to match **params runtime behavior. This indicates a latent name collision in the Ruby SDK method signature that should be disambiguated at the generator level.`);
+  }
+  return deduped;
+}
 
 // ../../../generators/ruby-v2/dynamic-snippets/lib/DynamicSnippetsGenerator.js
 var DynamicSnippetsGenerator6 = class extends AbstractDynamicSnippetsGenerator {
@@ -919472,7 +919642,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.106.3-6-ga791f2f555d";
+    return "4.107.0-11-g58f57e9e0ec";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.106.3-6-ga791f2f555d",
+  "version": "4.107.0-11-g58f57e9e0ec",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",