@fern-api/generator-cli 0.9.31 → 0.9.33

package/dist/cli.js

@@ -2021,7 +2021,7 @@ var init_esm = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/brace-expansion@5.0.5/node_modules/brace-expansion/dist/esm/index.js
+// ../../node_modules/.pnpm/brace-expansion@5.0.6/node_modules/brace-expansion/dist/esm/index.js
 function numeric(str) {
   return !isNaN(str) ? parseInt(str, 10) : str.charCodeAt(0);
 }
@@ -2124,7 +2124,7 @@ function expand_(str, max, isTop) {
       }
       const pad = n.some(isPadded);
       N2 = [];
-      for (let i2 = x2; test(i2, y2); i2 += incr) {
+      for (let i2 = x2; test(i2, y2) && N2.length < max; i2 += incr) {
         let c3;
         if (isAlphaSequence) {
           c3 = String.fromCharCode(i2);
@@ -2166,7 +2166,7 @@ function expand_(str, max, isTop) {
 }
 var escSlash, escOpen, escClose, escComma, escPeriod, escSlashPattern, escOpenPattern, escClosePattern, escCommaPattern, escPeriodPattern, slashPattern, openPattern, closePattern, commaPattern, periodPattern, EXPANSION_MAX;
 var init_esm2 = __esm({
-  "../../node_modules/.pnpm/brace-expansion@5.0.5/node_modules/brace-expansion/dist/esm/index.js"() {
+  "../../node_modules/.pnpm/brace-expansion@5.0.6/node_modules/brace-expansion/dist/esm/index.js"() {
     "use strict";
     init_esm();
     escSlash = "\0SLASH" + Math.random() + "\0";
@@ -22126,7 +22126,7 @@ var init_diff3 = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.js
+// ../../node_modules/.pnpm/@fern-api+replay@0.16.1/node_modules/@fern-api/replay/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
   CREDENTIAL_PATTERNS: () => CREDENTIAL_PATTERNS,
@@ -23123,12 +23123,23 @@ async function computePerPatchDiff(patch, getCurrentGenContent, getWorkingTreeCo
       unlocatableFiles.push(file);
       continue;
     }
-    const locInCurrentGen = locInCurrentGenRaw.map(
-      (l) => resolveSpan(l, currentGenLines, "old")
-    );
-    const locInWorkingTree = locInWorkingTreeRaw.map(
-      (l) => resolveSpan(l, workingTreeLines, "new")
-    );
+    const locInCurrentGen = [];
+    const locInWorkingTree = [];
+    let spanResolutionFailed = false;
+    for (let i2 = 0; i2 < locInCurrentGenRaw.length; i2++) {
+      const cg = resolveSpan(locInCurrentGenRaw[i2], currentGenLines, "old");
+      const wt = resolveSpan(locInWorkingTreeRaw[i2], workingTreeLines, "new");
+      if (cg === null || wt === null) {
+        spanResolutionFailed = true;
+        break;
+      }
+      locInCurrentGen.push(cg);
+      locInWorkingTree.push(wt);
+    }
+    if (spanResolutionFailed) {
+      unlocatableFiles.push(file);
+      continue;
+    }
     const overlay = overlayRegions(
       currentGenLines,
       locInCurrentGen,
@@ -23190,11 +23201,11 @@ function resolveSpan(loc, oursLines, prefer) {
   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, offset) {
   if (offset + needle.length > haystack.length) return false;
@@ -23947,7 +23958,7 @@ function status(outputDir) {
 }
 var import_promises3, import_os, import_path7, import_fs6, import_path8, import_yaml, import_crypto, import_path9, import_promises4, import_os2, import_path10, import_promises5, import_path11, import_promises6, import_path12, import_fs7, import_promises7, import_path13, import_promises8, import_os3, import_path14, import_child_process3, import_crypto2, import_fs8, import_path15, import_yaml2, import_crypto3, import_fs9, import_path16, import_fs10, import_promises9, import_path17, __defProp3, __getOwnPropNames3, __esm3, __export3, GitClient_exports, GitClient, init_GitClient, HybridReconstruction_exports, init_HybridReconstruction, PatchApplyTheirs_exports, init_PatchApplyTheirs, CREDENTIAL_PATTERNS, SENSITIVE_FILE_PATTERNS, FERN_BOT_NAME, FERN_BOT_EMAIL, FERN_BOT_LOGIN, FERN_SUPPORT_NAMES, LOCKFILE_HEADER, LockfileNotFoundError, LockfileManager, BINARY_EXTENSIONS, INFRASTRUCTURE_FILES, ReplayDetector, MergeAccumulator, CONFLICT_OPENER, CONFLICT_SEPARATOR, CONFLICT_CLOSER, ReplayApplicator, ReplayCommitter, FileOwnership, FirstGenerationFlow, SkipApplicationFlow, NoPatchesFlow, NormalRegenerationFlow, ReplayService, FernignoreMigrator, REPLAY_FERNIGNORE_ENTRIES, GITATTRIBUTES_ENTRIES, EMPTY_RESULT;
 var init_dist3 = __esm({
-  "../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.js"() {
+  "../../node_modules/.pnpm/@fern-api+replay@0.16.1/node_modules/@fern-api/replay/dist/index.js"() {
     "use strict";
     init_esm4();
     import_promises3 = require("fs/promises");
@@ -23955,6 +23966,7 @@ var init_dist3 = __esm({
     import_path7 = require("path");
     import_fs6 = require("fs");
     import_path8 = require("path");
+    init_esm3();
     import_yaml = __toESM(require_dist3(), 1);
     import_crypto = require("crypto");
     import_path9 = require("path");
@@ -24187,10 +24199,23 @@ var init_dist3 = __esm({
     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_path8.join)(this.outputDir, ".fern", "replay.lock");
       }
@@ -24259,9 +24284,14 @@ var init_dist3 = __esm({
             if (sensitiveFiles.length > 0) {
               reasons.push(`sensitive files: ${sensitiveFiles.join(", ")}`);
             }
-            this.warnings.push(
-              `Patch ${patch.id} removed from lockfile: ${reasons.join("; ")}. This prevents credential exposure in committed lockfiles.`
+            const allProtected = patch.files.length > 0 && patch.files.every(
+              (f) => this.fernignorePatterns.some((p2) => f === p2 || minimatch(f, p2))
             );
+            if (!allProtected) {
+              this.warnings.push(
+                `Patch ${patch.id} removed from lockfile: ${reasons.join("; ")}. This prevents credential exposure in committed lockfiles.`
+              );
+            }
           } else {
             cleanPatches.push(patch);
           }
@@ -25665,6 +25695,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         };
       }
       async apply(_prep) {
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         return firstGenerationReport();
       }
@@ -25711,6 +25742,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         };
       }
       async apply(_prep, options) {
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         const credentialWarnings = [...this.service.lockManager.warnings];
         if (!options?.stageOnly) {
@@ -25832,6 +25864,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             this.service.lockManager.addPatch(patch);
           }
         }
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         this.service.warnings.push(...this.service.lockManager.warnings);
         if (newPatches.length > 0) {
@@ -25992,6 +26025,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 (options?.stageOnly) {
@@ -26676,6 +26710,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 ${patch.id}: couldn't fully isolate ${ppResult.fallbackFiles.join(", ")} \u2014 customization preserved, attribution may have merged with another patch.`
+                );
+              }
               const diff = ppResult.diff;
               if (!diff.trim()) {
                 if (await allPatchFilesUserOwned(patch)) continue;
@@ -26763,6 +26802,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 ${patch.id}: couldn't fully isolate ${ppResult.fallbackFiles.join(", ")} \u2014 customization preserved, attribution may have merged with another patch.`
+              );
+            }
             const diff = ppResult.diff;
             if (!diff.trim()) {
               if (await allPatchFilesUserOwned(patch)) {
@@ -26857,6 +26901,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           }
         }
       }
+      /** @internal Used by Flow implementations in `src/flows/`. */
       readFernignorePatterns() {
         const fernignorePath = (0, import_path13.join)(this.outputDir, ".fernignore");
         if (!(0, import_fs7.existsSync)(fernignorePath)) return [];
@@ -41617,18 +41662,16 @@ async function pushSignedCommit({
     await repository.pushObjectToRef(localHeadSha, tempRef);
     tempRefPushed = true;
     for (let attempt2 = 0; attempt2 < MAX_CONCURRENT_PUSH_RETRIES; attempt2++) {
-      const commitAuthor = {
-        name: author?.name ?? FERN_BOT_NAME2,
-        email: author?.email ?? FERN_BOT_EMAIL2
-      };
+      const resolvedAuthor = author ?? { name: FERN_BOT_NAME2, email: FERN_BOT_EMAIL2 };
+      const committerField = author != null ? { committer: author } : {};
       const { data: signedCommit } = await octokit.git.createCommit({
         owner,
         repo,
         message,
         tree: treeSha,
         parents,
-        author: commitAuthor,
-        committer: commitAuthor
+        author: resolvedAuthor,
+        ...committerField
       });
       const signedSha = signedCommit.sha;
       try {
@@ -41860,6 +41903,8 @@ var GithubStep = class extends BaseStep {
           );
         case "push":
           return await this.executePushMode(repository, resolvedPrFields);
+        case "commit-and-release":
+          return await this.executeCommitAndReleaseMode(repository, resolvedPrFields);
         default: {
           const exhaustive = mode;
           throw new Error(`Unexpected GitHub mode: ${String(exhaustive)}`);
@@ -42086,6 +42131,71 @@ var GithubStep = class extends BaseStep {
     }
     return result;
   }
+  async executeCommitAndReleaseMode(repository, resolved) {
+    const baseBranch = this.config.branch ?? await repository.getDefaultBranch();
+    if (this.config.branch != null) {
+      this.logger.debug(`Checking out branch ${this.config.branch}`);
+      await repository.checkout(this.config.branch);
+    }
+    await this.ensureFernignore();
+    this.logger.debug("Committing changes...");
+    await repository.commitAllChanges(resolved.commitMessage);
+    this.logger.debug(`Committed changes to local copy of GitHub repository at ${this.outputDir}`);
+    if (shouldCheckNoDiff(this.config)) {
+      const noDiff = await repository.treeHashEquals(`origin/${baseBranch}`);
+      if (noDiff) {
+        this.logger.info("No changes detected after generation \u2014 skipping commit-and-release");
+        return { executed: true, success: true, skippedNoDiff: true };
+      }
+    }
+    const result = {
+      executed: true,
+      success: true
+    };
+    if (!this.config.previewMode) {
+      const octokit = this.createOctokit();
+      const { owner, repo, remote } = parseRepository(this.config.uri);
+      await pushSignedCommit({
+        repository,
+        octokit,
+        owner,
+        repo,
+        branch: baseBranch,
+        force: false,
+        rebaseOnConflict: true,
+        author: this.config.author,
+        logger: this.logger
+      });
+      const pushedBranch = await repository.getCurrentBranch();
+      result.branchUrl = `https://${remote}/${owner}/${repo}/tree/${pushedBranch}`;
+      this.logger.info(`Pushed branch: ${result.branchUrl}`);
+      if (resolved.newVersion == null) {
+        this.logger.warn(
+          "No new version available \u2014 skipping release tag creation. Pass --version <semver> or --version AUTO to fern generate to enable release tagging."
+        );
+      } else {
+        try {
+          const tagName = resolved.newVersion;
+          const headSha = await repository.getHeadSha();
+          await octokit.repos.createRelease({
+            owner,
+            repo,
+            tag_name: tagName,
+            target_commitish: headSha,
+            name: tagName,
+            body: resolved.changelogEntry ?? resolved.commitMessage,
+            draft: false,
+            prerelease: false
+          });
+          this.logger.info(`Created GitHub release ${tagName}`);
+          result.releaseUrl = `https://${remote}/${owner}/${repo}/releases/tag/${tagName}`;
+        } catch (error) {
+          this.logger.warn(`Could not create GitHub release: ${extractErrorMessage(error)}`);
+        }
+      }
+    }
+    return result;
+  }
   createOctokit() {
     const opts = { auth: this.config.token };
     if (this.config.apiBaseUrl != null) {
@@ -42530,9 +42640,9 @@ var PostGenerationPipeline = class {
     this.logger = logger;
     let replayEnabled = config.replay?.enabled ?? false;
     let autoVersionEnabled = config.autoVersion?.enabled ?? false;
-    if (replayEnabled && config.github?.mode === "push") {
+    if (replayEnabled && (config.github?.mode === "push" || config.github?.mode === "commit-and-release")) {
       this.logger.warn(
-        "Replay is not supported with GitHub push mode. Disabling replay to prevent force push to base branch."
+        `Replay is not supported with GitHub ${config.github.mode} mode. Disabling replay to prevent push to base branch.`
       );
       replayEnabled = false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.9.31",
+  "version": "0.9.33",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@boundaryml/baml": "^0.219.0",
-    "@fern-api/replay": "0.16.0",
+    "@fern-api/replay": "0.16.1",
     "@octokit/rest": "^22.0.1",
     "es-toolkit": "^1.45.1",
     "semver": "^7.6.3",