@fern-api/generator-cli 0.4.6 → 0.5.0

package/dist/api.cjs

@@ -6088,6 +6088,11 @@ var ClonedRepository = class _ClonedRepository {
     this.clonePath = clonePath;
     this.git = git;
   }
+  async setUserAndEmail({ name, email }) {
+    await this.git.cwd(this.clonePath);
+    await this.git.addConfig("user.name", name);
+    await this.git.addConfig("user.email", email);
+  }
   static createAtPath(clonePath) {
     return new _ClonedRepository({
       clonePath,
@@ -6156,9 +6161,78 @@ var ClonedRepository = class _ClonedRepository {
     await this.git.cwd(this.clonePath);
     await this.git.pull("origin", branch);
   }
+  async pullWithMerge(branch) {
+    await this.git.cwd(this.clonePath);
+    await this.git.raw(["pull", "origin", branch, "--no-rebase"]);
+  }
   async push() {
     await this.git.cwd(this.clonePath);
-    await this.git.push();
+    const currentBranch = await this.getCurrentBranch();
+    try {
+      await this.git.push();
+    } catch (err) {
+      const msg = String(err);
+      const isNoUpstream = msg.includes("has no upstream branch") || msg.includes("no upstream branch");
+      if (isNoUpstream) {
+        await this.pushUpstream(currentBranch);
+        return;
+      }
+      throw err;
+    }
+  }
+  async pushWithMergingRemote() {
+    await this.git.cwd(this.clonePath);
+    const currentBranch = await this.getCurrentBranch();
+    const isRemoteReject = (msg) => msg.includes("fetch first") || msg.includes("Updates were rejected") || msg.includes("non-fast-forward");
+    const isDivergent = (msg) => msg.includes("divergent branches") || msg.includes("You have divergent branches");
+    try {
+      await this.push();
+    } catch (err) {
+      const errMsg = String(err);
+      if (isRemoteReject(errMsg)) {
+        try {
+          await this.pull(currentBranch);
+          await this.push();
+          return;
+        } catch (pullErr) {
+          const pullMsg = String(pullErr);
+          if (isDivergent(pullMsg)) {
+            try {
+              await this.pullWithMerge(currentBranch);
+              await this.push();
+              return;
+            } catch (mergeErr) {
+              throw err;
+            }
+          } else {
+            throw err;
+          }
+        }
+      } else {
+        throw err;
+      }
+    }
+  }
+  async pushWithRebasingRemote() {
+    await this.git.cwd(this.clonePath);
+    const currentBranch = await this.getCurrentBranch();
+    const isRemoteReject = (msg) => msg.includes("fetch first") || msg.includes("Updates were rejected") || msg.includes("non-fast-forward");
+    try {
+      await this.push();
+    } catch (err) {
+      const errMsg = String(err);
+      if (isRemoteReject(errMsg)) {
+        try {
+          await this.git.raw(["pull", "origin", currentBranch, "--rebase"]);
+          await this.push();
+          return;
+        } catch (pullErr) {
+          throw new Error(`Push failed: ${errMsg}. Attempted to rebase but that also failed: ${String(pullErr)}`);
+        }
+      } else {
+        throw err;
+      }
+    }
   }
   async isRemoteEmpty() {
     await this.git.cwd(this.clonePath);
@@ -6177,6 +6251,18 @@ var ClonedRepository = class _ClonedRepository {
       await this.git.checkoutLocalBranch(branch);
     }
   }
+  async checkoutRemoteBranch(branch) {
+    await this.git.cwd(this.clonePath);
+    try {
+      await this.git.checkout(branch);
+    } catch (_error) {
+      try {
+        await this.git.checkout(["-b", branch, `origin/${branch}`]);
+      } catch (_remoteError) {
+        await this.git.checkoutLocalBranch(branch);
+      }
+    }
+  }
   async pushUpstream(branch) {
     await this.git.cwd(this.clonePath);
     await this.git.push("origin", branch, { "--set-upstream": null });
@@ -6781,7 +6867,8 @@ var import_fs = __toESM(require("fs"), 1);
 var Writer = class {
   async writeCodeBlock(language, content) {
     await this.writeLine(`\`\`\`${language}`);
-    await this.write(content);
+    const normalizedContent = content.endsWith("\n") ? content : content + "\n";
+    await this.write(normalizedContent);
     await this.writeLine("```");
   }
   async writeLine(content) {
@@ -7124,7 +7211,23 @@ var ReadmeGenerator = class {
       if (index > 0) {
         await writer.writeLine();
       }
-      await writer.writeCodeBlock(this.readmeConfig.language.type, snippet);
+      if (typeof snippet === "string") {
+        await writer.writeCodeBlock(this.readmeConfig.language.type, snippet);
+      } else {
+        switch (snippet.type) {
+          case "markdown":
+            await writer.writeLine(snippet.content);
+            break;
+          case "code":
+            await writer.writeCodeBlock(
+              snippet.language ?? this.readmeConfig.language.type,
+              snippet.content
+            );
+            break;
+          default:
+            assertNever(snippet);
+        }
+      }
     }
     if (feature.addendum != null) {
       await writer.writeLine(feature.addendum);
@@ -7160,6 +7263,15 @@ var ReadmeGenerator = class {
         githubRepository: this.readmeConfig.remote.repoUrl,
         installationToken: this.readmeConfig.remote.installationToken
       });
+      if (this.readmeConfig.remote.branch != null) {
+        try {
+          await clonedRepository.checkout(this.readmeConfig.remote.branch);
+        } catch (error) {
+          console.warn(
+            `Failed to checkout branch ${this.readmeConfig.remote.branch}, using default branch instead`
+          );
+        }
+      }
       return await clonedRepository.getReadme();
     }
     return void 0;

package/dist/api.d.cts

@@ -158,6 +158,8 @@ interface GithubRemote {
     repoUrl: string;
     /** The token used to clone the GitHub repository. */
     installationToken: string;
+    /** The branch to clone from. If not specified, the default branch will be used. */
+    branch?: string;
 }
 
 /**
@@ -168,7 +170,7 @@ interface GithubRemote {
  * A single feature supported by a generator (e.g. PAGINATION).
  */
 interface ReadmeFeature extends FeatureSpec {
-    snippets?: string[];
+    snippets?: Snippet[];
     /**
      * If true, the feature block should be rendered even if we don't receive a snippet for it.
      * This is useful for features that are always supported, but might not require a snippet
@@ -177,6 +179,44 @@ interface ReadmeFeature extends FeatureSpec {
     snippetsAreOptional: boolean;
 }
 
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+
+/**
+ * A snippet that can be either a plain string (treated as code in the generator's language),
+ * markdown content, or a code block with optional language override.
+ * Plain strings are supported for backwards compatibility.
+ */
+type Snippet = string | MarkdownSnippet | CodeSnippet;
+
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+/**
+ * A markdown snippet that will be rendered as-is without code fences.
+ */
+interface MarkdownSnippet {
+    /** Discriminator field to identify this as a markdown snippet. */
+    type: "markdown";
+    content: string;
+}
+
+/**
+ * This file was auto-generated by Fern from our API Definition.
+ */
+/**
+ * A code snippet that will be wrapped in a code fence with the specified language.
+ * If no language is specified, the generator's language will be used.
+ */
+interface CodeSnippet {
+    /** Discriminator field to identify this as a code snippet. */
+    type: "code";
+    content: string;
+    /** The language for the code fence. If not specified, the generator's language will be used. */
+    language?: string;
+}
+
 /**
  * This file was auto-generated by Fern from our API Definition.
  */

package/dist/cli.cjs

@@ -12227,6 +12227,11 @@ var ClonedRepository = class _ClonedRepository {
     this.clonePath = clonePath;
     this.git = git;
   }
+  async setUserAndEmail({ name, email }) {
+    await this.git.cwd(this.clonePath);
+    await this.git.addConfig("user.name", name);
+    await this.git.addConfig("user.email", email);
+  }
   static createAtPath(clonePath) {
     return new _ClonedRepository({
       clonePath,
@@ -12295,9 +12300,78 @@ var ClonedRepository = class _ClonedRepository {
     await this.git.cwd(this.clonePath);
     await this.git.pull("origin", branch);
   }
+  async pullWithMerge(branch) {
+    await this.git.cwd(this.clonePath);
+    await this.git.raw(["pull", "origin", branch, "--no-rebase"]);
+  }
   async push() {
     await this.git.cwd(this.clonePath);
-    await this.git.push();
+    const currentBranch = await this.getCurrentBranch();
+    try {
+      await this.git.push();
+    } catch (err) {
+      const msg = String(err);
+      const isNoUpstream = msg.includes("has no upstream branch") || msg.includes("no upstream branch");
+      if (isNoUpstream) {
+        await this.pushUpstream(currentBranch);
+        return;
+      }
+      throw err;
+    }
+  }
+  async pushWithMergingRemote() {
+    await this.git.cwd(this.clonePath);
+    const currentBranch = await this.getCurrentBranch();
+    const isRemoteReject = (msg) => msg.includes("fetch first") || msg.includes("Updates were rejected") || msg.includes("non-fast-forward");
+    const isDivergent = (msg) => msg.includes("divergent branches") || msg.includes("You have divergent branches");
+    try {
+      await this.push();
+    } catch (err) {
+      const errMsg = String(err);
+      if (isRemoteReject(errMsg)) {
+        try {
+          await this.pull(currentBranch);
+          await this.push();
+          return;
+        } catch (pullErr) {
+          const pullMsg = String(pullErr);
+          if (isDivergent(pullMsg)) {
+            try {
+              await this.pullWithMerge(currentBranch);
+              await this.push();
+              return;
+            } catch (mergeErr) {
+              throw err;
+            }
+          } else {
+            throw err;
+          }
+        }
+      } else {
+        throw err;
+      }
+    }
+  }
+  async pushWithRebasingRemote() {
+    await this.git.cwd(this.clonePath);
+    const currentBranch = await this.getCurrentBranch();
+    const isRemoteReject = (msg) => msg.includes("fetch first") || msg.includes("Updates were rejected") || msg.includes("non-fast-forward");
+    try {
+      await this.push();
+    } catch (err) {
+      const errMsg = String(err);
+      if (isRemoteReject(errMsg)) {
+        try {
+          await this.git.raw(["pull", "origin", currentBranch, "--rebase"]);
+          await this.push();
+          return;
+        } catch (pullErr) {
+          throw new Error(`Push failed: ${errMsg}. Attempted to rebase but that also failed: ${String(pullErr)}`);
+        }
+      } else {
+        throw err;
+      }
+    }
   }
   async isRemoteEmpty() {
     await this.git.cwd(this.clonePath);
@@ -12316,6 +12390,18 @@ var ClonedRepository = class _ClonedRepository {
       await this.git.checkoutLocalBranch(branch);
     }
   }
+  async checkoutRemoteBranch(branch) {
+    await this.git.cwd(this.clonePath);
+    try {
+      await this.git.checkout(branch);
+    } catch (_error) {
+      try {
+        await this.git.checkout(["-b", branch, `origin/${branch}`]);
+      } catch (_remoteError) {
+        await this.git.checkoutLocalBranch(branch);
+      }
+    }
+  }
   async pushUpstream(branch) {
     await this.git.cwd(this.clonePath);
     await this.git.push("origin", branch, { "--set-upstream": null });
@@ -12920,7 +13006,8 @@ var import_fs5 = __toESM(require("fs"), 1);
 var Writer = class {
   async writeCodeBlock(language, content) {
     await this.writeLine(`\`\`\`${language}`);
-    await this.write(content);
+    const normalizedContent = content.endsWith("\n") ? content : content + "\n";
+    await this.write(normalizedContent);
     await this.writeLine("```");
   }
   async writeLine(content) {
@@ -13263,7 +13350,23 @@ var ReadmeGenerator = class {
       if (index > 0) {
         await writer.writeLine();
       }
-      await writer.writeCodeBlock(this.readmeConfig.language.type, snippet);
+      if (typeof snippet === "string") {
+        await writer.writeCodeBlock(this.readmeConfig.language.type, snippet);
+      } else {
+        switch (snippet.type) {
+          case "markdown":
+            await writer.writeLine(snippet.content);
+            break;
+          case "code":
+            await writer.writeCodeBlock(
+              snippet.language ?? this.readmeConfig.language.type,
+              snippet.content
+            );
+            break;
+          default:
+            assertNever(snippet);
+        }
+      }
     }
     if (feature.addendum != null) {
       await writer.writeLine(feature.addendum);
@@ -13299,6 +13402,15 @@ var ReadmeGenerator = class {
         githubRepository: this.readmeConfig.remote.repoUrl,
         installationToken: this.readmeConfig.remote.installationToken
       });
+      if (this.readmeConfig.remote.branch != null) {
+        try {
+          await clonedRepository.checkout(this.readmeConfig.remote.branch);
+        } catch (error) {
+          console.warn(
+            `Failed to checkout branch ${this.readmeConfig.remote.branch}, using default branch instead`
+          );
+        }
+      }
       return await clonedRepository.getReadme();
     }
     return void 0;

package/package.json

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