@fern-api/generator-cli 0.6.4 → 0.6.5

package/dist/api.js

@@ -9666,16 +9666,19 @@ var consolePipelineLogger = {
 `)
 };
 
-// src/pipeline/steps/GithubStep.ts
-var import_rest2 = require("@octokit/rest");
-var import_promises2 = require("fs/promises");
-var import_path3 = require("path");
+// src/pipeline/PostGenerationPipeline.ts
+var import_child_process4 = require("child_process");
 
 // src/pipeline/github/constants.ts
 var FERN_BOT_NAME = "fern-api";
 var FERN_BOT_EMAIL = "115122769+fern-api[bot]@users.noreply.github.com";
 var FERN_BOT_LOGIN = "fern-api[bot]";
 
+// src/pipeline/steps/GithubStep.ts
+var import_rest2 = require("@octokit/rest");
+var import_promises2 = require("fs/promises");
+var import_path3 = require("path");
+
 // src/pipeline/github/createReplayBranch.ts
 async function createReplayBranch(repository, branchName, commitMessage, replayConflictInfo, logger) {
   if (replayConflictInfo?.hasConflicts) {
@@ -9835,10 +9838,10 @@ function logReplaySummary(result, logger) {
     `Replay: flow=${result.flow}, detected=${result.patchesDetected ?? 0}, applied=${applied}, absorbed=${absorbed}, conflicts=${conflicts2}`
   );
   if (preserved > 0) {
-    const absorbedNote = absorbed > 0 ? ` (${plural(absorbed, "customization")} now part of generated code)` : "";
-    logger.info(`Replay: ${plural(preserved, "customization")} preserved${absorbedNote}`);
+    const absorbedNote = absorbed > 0 ? ` (some customizations now part of generated code)` : "";
+    logger.info(`Replay: customizations preserved${absorbedNote}`);
   } else if (absorbed > 0) {
-    logger.info(`Replay: ${plural(absorbed, "customization")} now part of generated code`);
+    logger.info(`Replay: customizations now part of generated code`);
   }
   if (conflicts2 > 0) {
     const totalFiles = (result.conflictDetails ?? []).reduce((sum, d) => sum + d.files.length, 0);
@@ -9869,10 +9872,10 @@ function formatReplayPrBody(result, options) {
   }
   const parts = [];
   if (preserved > 0 && conflicts2 === 0) {
-    parts.push(`\u2705 ${plural(preserved, "customization")} automatically preserved in this update.`);
+    parts.push(`\u2705 Customizations automatically preserved in this update.`);
   } else if (preserved > 0) {
     parts.push(
-      `\u2705 ${plural(preserved, "customization")} automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
+      `\u2705 Customizations automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
     );
   }
   if (conflicts2 > 0) {
@@ -10034,13 +10037,6 @@ var GithubStep = class extends BaseStep {
       const now = /* @__PURE__ */ new Date();
       const formattedDate = now.toISOString().replace("T", "_").replace(/:/g, "-").replace("Z", "").replace(".", "_");
       const newPrBranch = `fern-bot/${formattedDate}`;
-      try {
-        await repository.setUserAndEmail({
-          name: FERN_BOT_NAME,
-          email: FERN_BOT_EMAIL
-        });
-      } catch {
-      }
       const mode = this.config.mode;
       switch (mode) {
         case "pull-request":
@@ -10728,6 +10724,13 @@ var PostGenerationPipeline = class {
   }
   steps = [];
   async run() {
+    if (this.config.github?.enabled) {
+      try {
+        (0, import_child_process4.execFileSync)("git", ["config", "user.name", FERN_BOT_NAME], { cwd: this.config.outputDir });
+        (0, import_child_process4.execFileSync)("git", ["config", "user.email", FERN_BOT_EMAIL], { cwd: this.config.outputDir });
+      } catch {
+      }
+    }
     const result = {
       success: true,
       steps: {}

package/dist/cli.js

@@ -30827,15 +30827,18 @@ var consolePipelineLogger = {
 `)
 };
 
-// src/pipeline/steps/GithubStep.ts
-var import_promises3 = require("fs/promises");
-var import_path7 = require("path");
+// src/pipeline/PostGenerationPipeline.ts
+var import_child_process4 = require("child_process");
 
 // src/pipeline/github/constants.ts
 var FERN_BOT_NAME = "fern-api";
 var FERN_BOT_EMAIL = "115122769+fern-api[bot]@users.noreply.github.com";
 var FERN_BOT_LOGIN = "fern-api[bot]";
 
+// src/pipeline/steps/GithubStep.ts
+var import_promises3 = require("fs/promises");
+var import_path7 = require("path");
+
 // src/pipeline/github/createReplayBranch.ts
 async function createReplayBranch(repository, branchName, commitMessage, replayConflictInfo, logger) {
   if (replayConflictInfo?.hasConflicts) {
@@ -30996,10 +30999,10 @@ function formatReplayPrBody(result, options) {
   }
   const parts = [];
   if (preserved > 0 && conflicts2 === 0) {
-    parts.push(`\u2705 ${plural(preserved, "customization")} automatically preserved in this update.`);
+    parts.push(`\u2705 Customizations automatically preserved in this update.`);
   } else if (preserved > 0) {
     parts.push(
-      `\u2705 ${plural(preserved, "customization")} automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
+      `\u2705 Customizations automatically preserved, but ${plural(conflicts2, "file")} ${conflicts2 === 1 ? "needs" : "need"} your attention.`
     );
   }
   if (conflicts2 > 0) {
@@ -31161,13 +31164,6 @@ var GithubStep = class extends BaseStep {
       const now = /* @__PURE__ */ new Date();
       const formattedDate = now.toISOString().replace("T", "_").replace(/:/g, "-").replace("Z", "").replace(".", "_");
       const newPrBranch = `fern-bot/${formattedDate}`;
-      try {
-        await repository.setUserAndEmail({
-          name: FERN_BOT_NAME,
-          email: FERN_BOT_EMAIL
-        });
-      } catch {
-      }
       const mode = this.config.mode;
       switch (mode) {
         case "pull-request":
@@ -31855,6 +31851,13 @@ var PostGenerationPipeline = class {
   }
   steps = [];
   async run() {
+    if (this.config.github?.enabled) {
+      try {
+        (0, import_child_process4.execFileSync)("git", ["config", "user.name", FERN_BOT_NAME], { cwd: this.config.outputDir });
+        (0, import_child_process4.execFileSync)("git", ["config", "user.email", FERN_BOT_EMAIL], { cwd: this.config.outputDir });
+      } catch {
+      }
+    }
     const result = {
       success: true,
       steps: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",