@fern-api/fern-api-dev 4.107.0-5-g8e65b2fdec8 → 4.107.0-65-g0230cd2035f

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.107.0-5-g8e65b2fdec8",
+          version: "4.107.0-65-g0230cd2035f",
           usingAccessToken: true
         }
       });
@@ -621319,7 +621359,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.107.0-5-g8e65b2fdec8",
+        version: "4.107.0-65-g0230cd2035f",
         ...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.107.0-5-g8e65b2fdec8";
+  const version7 = "4.107.0-65-g0230cd2035f";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -845371,7 +845411,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.107.0-5-g8e65b2fdec8",
+        cliVersion: "4.107.0-65-g0230cd2035f",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -873709,28 +873749,28 @@ var STRING_TYPE_REFERENCE = {
   type: "primitive",
   value: "STRING"
 };
-function unwrapOptionalFromListItems(typeReference2) {
+function stripOptionalAndNullable(item) {
+  let current3 = item;
+  while (current3.type === "optional" || current3.type === "nullable") {
+    current3 = current3.value;
+  }
+  return current3;
+}
+function stripListItemWrappers(typeReference2) {
   if (typeReference2.type === "optional" && typeReference2.value.type === "list") {
-    const listType = typeReference2.value;
-    const itemType = listType.value;
-    if (itemType.type === "optional") {
-      return {
-        type: "optional",
-        value: {
-          type: "list",
-          value: itemType.value
-        }
-      };
+    const itemType = typeReference2.value.value;
+    const stripped = stripOptionalAndNullable(itemType);
+    if (stripped === itemType) {
+      return typeReference2;
     }
+    return { type: "optional", value: { type: "list", value: stripped } };
   }
   if (typeReference2.type === "list") {
-    const itemType = typeReference2.value;
-    if (itemType.type === "optional") {
-      return {
-        type: "list",
-        value: itemType.value
-      };
+    const stripped = stripOptionalAndNullable(typeReference2.value);
+    if (stripped === typeReference2.value) {
+      return typeReference2;
     }
+    return { type: "list", value: stripped };
   }
   return typeReference2;
 }
@@ -874246,9 +874286,7 @@ var EndpointSnippetGenerator4 = class {
     const queryParameterFields = sortedQueryParameters.map((queryParameter) => ({
       name: this.context.getMethodName(queryParameter.name.name),
       value: this.context.dynamicTypeLiteralMapper.convert({
-        // Unwrap optional from list items for allow-multiple query params.
-        // Java SDK builders have convenience overloads that accept List<T>.
-        typeReference: unwrapOptionalFromListItems(queryParameter.typeReference),
+        typeReference: stripListItemWrappers(queryParameter.typeReference),
         value: queryParameter.value,
         as: "request"
       })
@@ -881458,7 +881496,8 @@ var Comment6 = class extends AstNode6 {
       this.docs.split("\n").forEach((line) => {
         const wrappedLines = this.wrapLine(line, writer2);
         wrappedLines.forEach((wrappedLine) => {
-          writer2.writeLine(`# ${wrappedLine}`);
+          const trimmed2 = wrappedLine.trimEnd();
+          writer2.writeLine(trimmed2 === "" ? "#" : `# ${trimmed2}`);
         });
       });
     }
@@ -919602,7 +919641,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.107.0-5-g8e65b2fdec8";
+    return "4.107.0-65-g0230cd2035f";
   }
   getCliName() {
     if (false) {
@@ -931028,6 +931067,7 @@ async function formatWorkspaces({
 }
 
 // src/commands/generate/generateDocsWorkspace.ts
+init_lib4();
 init_js();
 
 // src/utils/environment.ts
@@ -931229,27 +931269,35 @@ ${source_default.yellow("?")} Are you sure you want to continue?`,
       errorOnBrokenLinks: strictBrokenLinks,
       excludeRules: getExcludeRules(brokenLinks, strictBrokenLinks)
     });
+    const skippedWorkspacePaths = /* @__PURE__ */ new Set();
     const ossWorkspacesForValidation = await filterOssWorkspaces(project);
     for (const ossWorkspace of ossWorkspacesForValidation) {
-      const violations = await validateOSSWorkspace(ossWorkspace, context3);
-      const errors4 = violations.filter((v9) => v9.severity === "fatal" || v9.severity === "error");
-      if (errors4.length > 0) {
-        for (const error50 of errors4) {
-          context3.logger.error(`${error50.relativeFilepath}: ${error50.message}`);
+      try {
+        const violations = await validateOSSWorkspace(ossWorkspace, context3);
+        const errors4 = violations.filter((v9) => v9.severity === "fatal" || v9.severity === "error");
+        if (errors4.length > 0) {
+          for (const error50 of errors4) {
+            context3.logger.warn(`${error50.relativeFilepath}: ${error50.message}`);
+          }
+          context3.logger.warn(
+            `Skipping API workspace at ${ossWorkspace.absoluteFilePath} due to ${errors4.length} validation error${errors4.length !== 1 ? "s" : ""}. Run fern check for details.`
+          );
+          skippedWorkspacePaths.add(ossWorkspace.absoluteFilePath);
         }
-        context3.failAndThrow(
-          `OpenAPI spec validation failed with ${errors4.length} error${errors4.length !== 1 ? "s" : ""}. Fix the errors above before generating docs.`,
-          void 0,
-          { code: CliError.Code.ValidationError }
+      } catch (error50) {
+        context3.logger.warn(
+          `Skipping API workspace at ${ossWorkspace.absoluteFilePath}: ${extractErrorMessage(error50)}`
         );
+        skippedWorkspacePaths.add(ossWorkspace.absoluteFilePath);
       }
     }
     context3.logger.info("Validation complete, starting remote docs generation...");
     const filterStart = performance.now();
-    const ossWorkspaces = await filterOssWorkspaces(project);
+    const allOssWorkspaces = await filterOssWorkspaces(project);
+    const ossWorkspaces = allOssWorkspaces.filter((ws5) => !skippedWorkspacePaths.has(ws5.absoluteFilePath));
     const filterTime = performance.now() - filterStart;
     context3.logger.debug(
-      `Filtered OSS workspaces (${ossWorkspaces.length} workspaces) in ${filterTime.toFixed(0)}ms`
+      `Filtered OSS workspaces (${ossWorkspaces.length} workspaces, ${skippedWorkspacePaths.size} skipped) in ${filterTime.toFixed(0)}ms`
     );
     const generationStart = performance.now();
     await runRemoteGenerationForDocsWorkspace({

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.107.0-5-g8e65b2fdec8",
+  "version": "4.107.0-65-g0230cd2035f",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",