@fern-api/fern-api-dev 5.23.3-146-g1ff699af452 → 5.23.3-148-g81022d2f988

package/cli.cjs

@@ -369996,6 +369996,8 @@ var require_GithubStep = __commonJS({
               return await this.executePullRequestMode(repository, newPrBranch, skipCommit, replayConflictInfo, replayResult, resolvedPrFields);
             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)}`);
@@ -370200,6 +370202,69 @@ var require_GithubStep = __commonJS({
         }
         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 } = (0, github_1.parseRepository)(this.config.uri);
+          await (0, pushSignedCommit_1.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 (error50) {
+              this.logger.warn(`Could not create GitHub release: ${(0, core_utils_1.extractErrorMessage)(error50)}`);
+            }
+          }
+        }
+        return result;
+      }
       createOctokit() {
         const opts = { auth: this.config.token };
         if (this.config.apiBaseUrl != null) {
@@ -370779,8 +370844,8 @@ var require_PostGenerationPipeline = __commonJS({
         this.logger = logger4;
         let replayEnabled = config5.replay?.enabled ?? false;
         let autoVersionEnabled = config5.autoVersion?.enabled ?? false;
-        if (replayEnabled && config5.github?.mode === "push") {
-          this.logger.warn("Replay is not supported with GitHub push mode. Disabling replay to prevent force push to base branch.");
+        if (replayEnabled && (config5.github?.mode === "push" || config5.github?.mode === "commit-and-release")) {
+          this.logger.warn(`Replay is not supported with GitHub ${config5.github.mode} mode. Disabling replay to prevent push to base branch.`);
           replayEnabled = false;
         }
         if (autoVersionEnabled && !replayEnabled) {
@@ -559469,7 +559534,8 @@ var GithubCommitAndReleaseMode = {
 // ../configuration/lib/generators-yml/schemas/api/resources/group/types/GithubSelfhostedMode.js
 var GithubSelfhostedMode = {
   PullRequest: "pull-request",
-  Push: "push"
+  Push: "push",
+  CommitAndRelease: "commit-and-release"
 };
 
 // ../configuration/lib/generators-yml/schemas/api/resources/license/index.js
@@ -561972,7 +562038,7 @@ var GithubPushSchema = schemas_exports8.object({
 });
 
 // ../configuration/lib/generators-yml/schemas/serialization/resources/group/types/GithubSelfhostedMode.js
-var GithubSelfhostedMode2 = schemas_exports8.enum_(["pull-request", "push"]);
+var GithubSelfhostedMode2 = schemas_exports8.enum_(["pull-request", "push", "commit-and-release"]);
 
 // ../configuration/lib/generators-yml/schemas/serialization/resources/group/types/GithubSelfhostedSchema.js
 var GithubSelfhostedSchema = schemas_exports8.object({
@@ -596150,7 +596216,8 @@ async function convertOutputMode({ absolutePathToGeneratorsConfiguration, genera
     const mode = generator.github.mode ?? "release";
     switch (mode) {
       case "commit":
-      case "release": {
+      case "release":
+      case "commit-and-release": {
         const releaseConfig = generator.github;
         const commitAndReleaseValue = {
           owner,
@@ -661061,7 +661128,7 @@ var GitHubRepositoryOutputSchema = external_exports.object({
 }).strict();
 
 // ../config/lib/schemas/GitSelfHostedOutputModeSchema.js
-var GitSelfHostedOutputModeSchema = external_exports.enum(["pr", "push"]);
+var GitSelfHostedOutputModeSchema = external_exports.enum(["pr", "push", "release"]);
 
 // ../config/lib/schemas/GitSelfHostedOutputSchema.js
 var GitSelfHostedOutputSchema = external_exports.object({
@@ -667959,7 +668026,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-146-g1ff699af452",
+          version: "5.23.3-148-g81022d2f988",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -668023,7 +668090,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-146-g1ff699af452",
+        version: "5.23.3-148-g81022d2f988",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -859734,7 +859801,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.23.3-146-g1ff699af452";
+  const version7 = "5.23.3-148-g81022d2f988";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -876385,8 +876452,13 @@ function extractRepoUriFromGenerator(generatorInvocation) {
 }
 function extractGithubModeFromGenerator(generatorInvocation) {
   const github = generatorInvocation.raw?.github;
-  if (github != null && "mode" in github && github.mode === "pull-request") {
-    return "pull-request";
+  if (github != null && "mode" in github) {
+    if (github.mode === "pull-request") {
+      return "pull-request";
+    }
+    if (github.mode === "commit-and-release") {
+      return "commit-and-release";
+    }
   }
   return "push";
 }
@@ -878470,7 +878542,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-146-g1ff699af452",
+        cliVersion: "5.23.3-148-g81022d2f988",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -931241,7 +931313,7 @@ generators:
             // 30 seconds timeout for credential/network issues
           });
           const mode = selfhostedGithubConfig.mode ?? "push";
-          if ((mode === "push" || mode === "pull-request") && selfhostedGithubConfig.branch != null) {
+          if ((mode === "push" || mode === "pull-request" || mode === "commit-and-release") && selfhostedGithubConfig.branch != null) {
             interactiveTaskContext.logger.debug(`Checking out branch ${selfhostedGithubConfig.branch} before generation`);
             if (mode === "pull-request") {
               const branchExists = await repo.remoteBranchExists(selfhostedGithubConfig.branch);
@@ -931322,7 +931394,7 @@ generators:
             prDescription: autoVersioningPrDescription,
             versionBumpReason: autoVersioningVersionBumpReason,
             previousVersion: autoVersioningPreviousVersion,
-            newVersion: autoVersioningNewVersion,
+            newVersion: autoVersioningNewVersion ?? version7,
             versionBump: autoVersioningVersionBump,
             previewMode: selfhostedGithubConfig.previewMode,
             generatorName: generatorInvocation.name,
@@ -931803,6 +931875,8 @@ var LegacyGeneratorInvocationAdapter = class {
         return generators_yml_exports.GithubSelfhostedMode.PullRequest;
       case "push":
         return generators_yml_exports.GithubSelfhostedMode.Push;
+      case "release":
+        return generators_yml_exports.GithubSelfhostedMode.CommitAndRelease;
       default:
         assertNever(mode);
     }
@@ -931877,6 +931951,14 @@ var LegacyGeneratorInvocationAdapter = class {
           license,
           publishInfo
         }));
+      case "release":
+        return api_exports4.remoteGen.OutputMode.githubV2(api_exports4.GithubOutputModeV2.commitAndRelease({
+          owner: repository.owner,
+          repo: repository.repo,
+          branch: git.branch,
+          license,
+          publishInfo
+        }));
       default:
         assertNever(mode);
     }
@@ -952870,7 +952952,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.23.3-146-g1ff699af452"
+    cli_version: "5.23.3-148-g81022d2f988"
   };
 }
 function isAutomationMode() {
@@ -953696,7 +953778,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-146-g1ff699af452";
+    return "5.23.3-148-g81022d2f988";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.23.3-146-g1ff699af452",
+  "version": "5.23.3-148-g81022d2f988",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",