@fern-api/fern-api-dev 5.32.0 → 5.32.1

package/cli.cjs

@@ -360347,9 +360347,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.16.1/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.16.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -360917,6 +360917,7 @@ var require_dist14 = __commonJS({
     }
     var import_node_fs32 = require("fs");
     var import_node_path42 = require("path");
+    var import_minimatch8 = require_commonjs3();
     var import_yaml18 = require_dist11();
     var LOCKFILE_HEADER = "# DO NOT EDIT MANUALLY - Managed by Fern Replay\n";
     var LockfileNotFoundError = class extends Error {
@@ -360928,10 +360929,23 @@ var require_dist14 = __commonJS({
     var LockfileManager = class {
       outputDir;
       lock = null;
+      fernignorePatterns = [];
       warnings = [];
       constructor(outputDir) {
         this.outputDir = outputDir;
       }
+      /**
+       * Inform the lockfile of the customer's `.fernignore` patterns so that
+       * `save()` can suppress its "Patch X removed from lockfile" warning when
+       * every file in the stripped patch is already `.fernignore`-protected.
+       * The strip itself still happens (credentials never persist); only the
+       * customer-visible warning is suppressed in that case, because the
+       * protected files survive the generator wipe regardless of whether the
+       * lockfile tracks them, so there's nothing for the customer to action.
+       */
+      setFernignorePatterns(patterns) {
+        this.fernignorePatterns = patterns;
+      }
       get lockfilePath() {
         return (0, import_node_path42.join)(this.outputDir, ".fern", "replay.lock");
       }
@@ -361000,9 +361014,14 @@ var require_dist14 = __commonJS({
             if (sensitiveFiles.length > 0) {
               reasons.push(`sensitive files: ${sensitiveFiles.join(", ")}`);
             }
-            this.warnings.push(
-              `Patch ${patch5.id} removed from lockfile: ${reasons.join("; ")}. This prevents credential exposure in committed lockfiles.`
+            const allProtected = patch5.files.length > 0 && patch5.files.every(
+              (f4) => this.fernignorePatterns.some((p14) => f4 === p14 || (0, import_minimatch8.minimatch)(f4, p14))
             );
+            if (!allProtected) {
+              this.warnings.push(
+                `Patch ${patch5.id} removed from lockfile: ${reasons.join("; ")}. This prevents credential exposure in committed lockfiles.`
+              );
+            }
           } else {
             cleanPatches.push(patch5);
           }
@@ -361875,7 +361894,7 @@ var require_dist14 = __commonJS({
     var import_promises310 = require("fs/promises");
     var import_node_os15 = require("os");
     var import_node_path52 = require("path");
-    var import_minimatch8 = require_commonjs3();
+    var import_minimatch22 = require_commonjs3();
     var MergeAccumulator = class {
       constructor(mode, sharedFiles) {
         this.mode = mode;
@@ -362579,13 +362598,13 @@ var require_dist14 = __commonJS({
       isExcluded(patch5) {
         const config5 = this.lockManager.getCustomizationsConfig();
         if (!config5.exclude) return false;
-        return patch5.files.some((file4) => config5.exclude.some((pattern) => (0, import_minimatch8.minimatch)(file4, pattern)));
+        return patch5.files.some((file4) => config5.exclude.some((pattern) => (0, import_minimatch22.minimatch)(file4, pattern)));
       }
       async resolveFilePath(filePath, baseTreeHash, currentTreeHash) {
         const config5 = this.lockManager.getCustomizationsConfig();
         if (config5.moves) {
           for (const move of config5.moves) {
-            if ((0, import_minimatch8.minimatch)(filePath, move.from) || filePath === move.from) {
+            if ((0, import_minimatch22.minimatch)(filePath, move.from) || filePath === move.from) {
               if (filePath === move.from) {
                 return move.to;
               }
@@ -362872,7 +362891,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
     var import_node_fs210 = require("fs");
     var import_promises610 = require("fs/promises");
     var import_node_path82 = require("path");
-    var import_minimatch32 = require_commonjs3();
+    var import_minimatch42 = require_commonjs3();
     init_GitClient();
     var import_promises410 = require("fs/promises");
     var import_node_os22 = require("os");
@@ -362981,12 +363000,23 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           unlocatableFiles.push(file4);
           continue;
         }
-        const locInCurrentGen = locInCurrentGenRaw.map(
-          (l9) => resolveSpan(l9, currentGenLines, "old")
-        );
-        const locInWorkingTree = locInWorkingTreeRaw.map(
-          (l9) => resolveSpan(l9, workingTreeLines, "new")
-        );
+        const locInCurrentGen = [];
+        const locInWorkingTree = [];
+        let spanResolutionFailed = false;
+        for (let i9 = 0; i9 < locInCurrentGenRaw.length; i9++) {
+          const cg = resolveSpan(locInCurrentGenRaw[i9], currentGenLines, "old");
+          const wt10 = resolveSpan(locInWorkingTreeRaw[i9], workingTreeLines, "new");
+          if (cg === null || wt10 === null) {
+            spanResolutionFailed = true;
+            break;
+          }
+          locInCurrentGen.push(cg);
+          locInWorkingTree.push(wt10);
+        }
+        if (spanResolutionFailed) {
+          unlocatableFiles.push(file4);
+          continue;
+        }
         const overlay = overlayRegions(
           currentGenLines,
           locInCurrentGen,
@@ -363048,11 +363078,11 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       if (prefer === "old") {
         if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
         if (newFits) return { ...loc, oursSpan: hunk.newCount };
-      } else {
-        if (newFits) return { ...loc, oursSpan: hunk.newCount };
-        if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
+        return loc;
       }
-      return loc;
+      if (newFits) return { ...loc, oursSpan: hunk.newCount };
+      if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
+      return null;
     }
     function sequenceMatches(needle, haystack, offset2) {
       if (offset2 + needle.length > haystack.length) return false;
@@ -363164,7 +363194,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       const trailer = hasTrailingNewline ? "" : "\n\";
       return header + "\n" + body + trailer + "\n";
     }
-    var import_minimatch22 = require_commonjs3();
+    var import_minimatch32 = require_commonjs3();
     var FileOwnership = class {
       constructor(git) {
         this.git = git;
@@ -363188,7 +363218,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         const { file: file4, originalFileName, patch: patch5, currentGenSha, fernignorePatterns, warnedGens, warnings } = ctx;
         if (patch5.user_owned) return true;
         if (file4 === ".fernignore") return true;
-        if (fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch22.minimatch)(file4, p14))) return true;
+        if (fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))) return true;
         if (fileIsCreationInPatchContent(patch5.patch_content, originalFileName ?? file4)) {
           return true;
         }
@@ -363265,6 +363295,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         };
       }
       async apply(_prep) {
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         return firstGenerationReport();
       }
@@ -363321,6 +363352,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         };
       }
       async apply(_prep, options2) {
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         const credentialWarnings = [...this.service.lockManager.warnings];
         if (!options2?.stageOnly) {
@@ -363442,6 +363474,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             this.service.lockManager.addPatch(patch5);
           }
         }
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         this.service.warnings.push(...this.service.lockManager.warnings);
         if (newPatches.length > 0) {
@@ -363602,6 +363635,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             }
           }
         }
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         this.service.warnings.push(...this.service.lockManager.warnings);
         if (options2?.stageOnly) {
@@ -363833,7 +363867,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
               )
             );
             const hasProtectedFiles = patch5.files.some(
-              (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))
+              (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
             );
             const allUserOwned = isUserOwnedPerFile.every(Boolean);
             if (allUserOwned && patch5.files.length > 0) {
@@ -364273,7 +364307,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
                 );
                 if (snapHasStaleMarkers) continue;
                 const isProtectedSnap = patch5.files.some(
-                  (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))
+                  (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
                 );
                 if (isProtectedSnap) continue;
                 const snapHash = this.detector.computeContentHash(snapshotDiff);
@@ -364293,6 +364327,11 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
                 (files) => this.git.exec(["diff", currentGen, "HEAD", "--", ...files]).catch(() => null)
               );
               if (ppResult === null) continue;
+              if (ppResult.hadFallback) {
+                this.warnings.push(
+                  `Patch ${patch5.id}: couldn't fully isolate ${ppResult.fallbackFiles.join(", ")} \u2014 customization preserved, attribution may have merged with another patch.`
+                );
+              }
               const diff2 = ppResult.diff;
               if (!diff2.trim()) {
                 if (await allPatchFilesUserOwned(patch5)) continue;
@@ -364308,7 +364347,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
                 continue;
               }
               const isProtected = patch5.files.some(
-                (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))
+                (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
               );
               if (isProtected) {
                 continue;
@@ -364380,6 +364419,11 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
               (files) => this.git.exec(["diff", currentGen, "HEAD", "--", ...files]).catch(() => null)
             );
             if (ppResult === null) continue;
+            if (ppResult.hadFallback) {
+              this.warnings.push(
+                `Patch ${patch5.id}: couldn't fully isolate ${ppResult.fallbackFiles.join(", ")} \u2014 customization preserved, attribution may have merged with another patch.`
+              );
+            }
             const diff2 = ppResult.diff;
             if (!diff2.trim()) {
               if (await allPatchFilesUserOwned(patch5)) {
@@ -364467,13 +364511,14 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         if (files.length === 0) return;
         const fernignorePatterns = this.readFernignorePatterns();
         for (const file4 of files) {
-          if (fernignorePatterns.some((pattern) => (0, import_minimatch32.minimatch)(file4, pattern))) continue;
+          if (fernignorePatterns.some((pattern) => (0, import_minimatch42.minimatch)(file4, pattern))) continue;
           try {
             await this.git.exec(["checkout", "HEAD", "--", file4]);
           } catch {
           }
         }
       }
+      /** @internal Used by Flow implementations in `src/flows/`. */
       readFernignorePatterns() {
         const fernignorePath = (0, import_node_path82.join)(this.outputDir, ".fernignore");
         if (!(0, import_node_fs210.existsSync)(fernignorePath)) return [];
@@ -364554,7 +364599,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
     var import_node_crypto22 = require("crypto");
     var import_node_fs33 = require("fs");
     var import_node_path92 = require("path");
-    var import_minimatch42 = require_commonjs3();
+    var import_minimatch52 = require_commonjs3();
     var import_yaml22 = require_dist11();
     var FernignoreMigrator = class {
       git;
@@ -364586,7 +364631,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         const commitsOnly = [];
         const syntheticPatches = [];
         for (const pattern of patterns) {
-          const matchingPatch = patches.find((p14) => p14.files.some((f4) => (0, import_minimatch42.minimatch)(f4, pattern) || f4 === pattern));
+          const matchingPatch = patches.find((p14) => p14.files.some((f4) => (0, import_minimatch52.minimatch)(f4, pattern) || f4 === pattern));
           if (matchingPatch) {
             trackedByBoth.push({
               file: pattern,
@@ -364659,7 +364704,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           fernignoreOnly.push(...remainingFernignoreOnly);
         }
         for (const patch5 of patches) {
-          const hasUnprotectedFiles = patch5.files.some((f4) => !patterns.some((p14) => (0, import_minimatch42.minimatch)(f4, p14) || f4 === p14));
+          const hasUnprotectedFiles = patch5.files.some((f4) => !patterns.some((p14) => (0, import_minimatch52.minimatch)(f4, p14) || f4 === p14));
           if (hasUnprotectedFiles) {
             commitsOnly.push(patch5);
           }
@@ -364671,7 +364716,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         const results = [];
         for (const pattern of patterns) {
           const matching = allFiles.filter(
-            (f4) => (0, import_minimatch42.minimatch)(f4, pattern) || f4 === pattern || f4.startsWith(pattern + "/")
+            (f4) => (0, import_minimatch52.minimatch)(f4, pattern) || f4 === pattern || f4.startsWith(pattern + "/")
           );
           results.push({ pattern, files: matching.length > 0 ? matching : [pattern] });
         }
@@ -364980,7 +365025,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       const normalized = relevantLines.filter((line) => !line.startsWith("index ")).join("\n").replace(/\n-- \n[\d]+\.[\d]+[^\n]*\s*$/, "");
       return `sha256:${(0, import_node_crypto32.createHash)("sha256").update(normalized).digest("hex")}`;
     }
-    var import_minimatch52 = require_commonjs3();
+    var import_minimatch62 = require_commonjs3();
     function parseDiffStat(patchContent) {
       let additions = 0;
       let deletions = 0;
@@ -365010,7 +365055,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
     }
     function matchesPatch(patch5, pattern) {
       const fileMatch = patch5.files.some(
-        (file4) => file4 === pattern || (0, import_minimatch52.minimatch)(file4, pattern)
+        (file4) => file4 === pattern || (0, import_minimatch62.minimatch)(file4, pattern)
       );
       if (fileMatch) return true;
       return patch5.original_message.toLowerCase().includes(pattern.toLowerCase());
@@ -668398,7 +668443,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.32.0",
+          version: "5.32.1",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -668462,7 +668507,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.32.0",
+        version: "5.32.1",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -860238,7 +860283,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.32.0";
+  const version7 = "5.32.1";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -879070,7 +879115,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.32.0",
+        cliVersion: "5.32.1",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -953480,7 +953525,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.32.0"
+    cli_version: "5.32.1"
   };
 }
 function isAutomationMode() {
@@ -954306,7 +954351,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.32.0";
+    return "5.32.1";
   }
   getCliName() {
     if (false) {

package/package.json

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