@fern-api/fern-api-dev 4.87.0 → 4.88.0-2-gac5aef39d7f

package/cli.cjs

@@ -58626,6 +58626,46 @@ var init_ClonedRepository = __esm({
         const result = await this.git.raw(["rev-parse", "HEAD^{tree}"]);
         return result.trim();
       }
+      async getHeadCommitMessage() {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["log", "-1", "--format=%B", "HEAD"]);
+        return result.replace(/\n$/, "");
+      }
+      async getHeadParents() {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["rev-list", "--parents", "-n", "1", "HEAD"]);
+        const parts = result.trim().split(/\s+/);
+        return parts.slice(1);
+      }
+      /**
+       * Pushes a specific object (commit SHA) to a remote ref.
+       * Used to upload tree and blob objects to the remote without moving a branch.
+       *
+       * Pass `force: true` when overwriting a ref that may already point to an
+       * unrelated commit (e.g. retrying a temp ref after a local rebase rewrites
+       * history so the new SHA is not a descendant of the previous one).
+       */
+      async pushObjectToRef(localSha, remoteRef, { force = false } = {}) {
+        await this.git.cwd(this.clonePath);
+        const spec = force ? `+${localSha}:${remoteRef}` : `${localSha}:${remoteRef}`;
+        await this.git.raw(["push", "origin", spec]);
+      }
+      /**
+       * Resets the current branch HEAD to the given SHA. After fetching a newly-created remote
+       * signed commit, use this to align the local branch so subsequent operations (tag push,
+       * getHeadSha(), etc.) see the signed SHA.
+       */
+      async resetHardToSha(sha) {
+        await this.git.cwd(this.clonePath);
+        await this.git.raw(["reset", "--hard", sha]);
+      }
+      /**
+       * Rebases the current branch onto the given remote branch (`git pull --rebase origin <branch>`).
+       */
+      async pullWithRebase(branch) {
+        await this.git.cwd(this.clonePath);
+        await this.git.raw(["pull", "origin", branch, "--rebase"]);
+      }
       async getCommitTreeHash(commitSha) {
         await this.git.cwd(this.clonePath);
         const result = await this.git.raw(["rev-parse", `${commitSha}^{tree}`]);
@@ -330797,6 +330837,113 @@ ${prBody}`;
   }
 });
 
+// ../../generator-cli/lib/pipeline/github/pushSignedCommit.js
+var require_pushSignedCommit = __commonJS({
+  "../../generator-cli/lib/pipeline/github/pushSignedCommit.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.pushSignedCommit = pushSignedCommit;
+    exports2.isNonFastForwardError = isNonFastForwardError;
+    var core_utils_1 = (init_lib4(), __toCommonJS(lib_exports));
+    var MAX_CONCURRENT_PUSH_RETRIES = 3;
+    async function pushSignedCommit({ repository, octokit, owner, repo, branch, force, rebaseOnConflict = false, logger: logger4 }) {
+      const tempRef = `refs/temp/fern-${Date.now()}`;
+      let tempRefPushed = false;
+      try {
+        let [localHeadSha, treeSha, message, parents] = await Promise.all([
+          repository.getHeadSha(),
+          repository.getHeadTreeHash(),
+          repository.getHeadCommitMessage(),
+          repository.getHeadParents()
+        ]);
+        await repository.pushObjectToRef(localHeadSha, tempRef);
+        tempRefPushed = true;
+        for (let attempt = 0; attempt < MAX_CONCURRENT_PUSH_RETRIES; attempt++) {
+          const { data: signedCommit } = await octokit.git.createCommit({
+            owner,
+            repo,
+            message,
+            tree: treeSha,
+            parents
+          });
+          const signedSha = signedCommit.sha;
+          try {
+            await upsertBranchRef({ octokit, owner, repo, branch, sha: signedSha, force });
+            logger4.debug(`Updated refs/heads/${branch} to signed commit ${signedSha}`);
+            await syncLocalToSignedCommit({ repository, branch, signedSha });
+            return signedSha;
+          } catch (err) {
+            if (!isNonFastForwardError(err) || force || attempt >= MAX_CONCURRENT_PUSH_RETRIES - 1) {
+              throw err;
+            }
+            if (rebaseOnConflict) {
+              logger4.warn(`Non-fast-forward on refs/heads/${branch} (attempt ${attempt + 1}/${MAX_CONCURRENT_PUSH_RETRIES}); rebasing locally and retrying.`);
+              await repository.pullWithRebase(branch);
+              [localHeadSha, treeSha, message, parents] = await Promise.all([
+                repository.getHeadSha(),
+                repository.getHeadTreeHash(),
+                repository.getHeadCommitMessage(),
+                repository.getHeadParents()
+              ]);
+              await repository.pushObjectToRef(localHeadSha, tempRef, { force: true });
+            } else {
+              throw err;
+            }
+          }
+        }
+        throw new Error(`Failed to push signed commit to refs/heads/${branch} after ${MAX_CONCURRENT_PUSH_RETRIES} attempts`);
+      } finally {
+        if (tempRefPushed) {
+          try {
+            await octokit.git.deleteRef({ owner, repo, ref: tempRef.replace(/^refs\//, "") });
+          } catch (err) {
+            logger4.debug(`Failed to delete temp ref ${tempRef}: ${(0, core_utils_1.extractErrorMessage)(err)}`);
+          }
+        }
+      }
+    }
+    async function upsertBranchRef({ octokit, owner, repo, branch, sha, force }) {
+      try {
+        await octokit.git.updateRef({
+          owner,
+          repo,
+          ref: `heads/${branch}`,
+          sha,
+          force
+        });
+      } catch (err) {
+        if (isNotFoundError(err)) {
+          await octokit.git.createRef({
+            owner,
+            repo,
+            ref: `refs/heads/${branch}`,
+            sha
+          });
+          return;
+        }
+        throw err;
+      }
+    }
+    async function syncLocalToSignedCommit({ repository, branch, signedSha }) {
+      await repository.fetch(["origin", branch]);
+      await repository.resetHardToSha(signedSha);
+    }
+    function hasNumericStatus(err) {
+      return typeof err === "object" && err != null && "status" in err && typeof err.status === "number";
+    }
+    function isNotFoundError(err) {
+      return hasNumericStatus(err) && err.status === 404;
+    }
+    function isNonFastForwardError(err) {
+      if (!hasNumericStatus(err) || err.status !== 422) {
+        return false;
+      }
+      const message = (0, core_utils_1.extractErrorMessage)(err).toLowerCase();
+      return message.includes("not a fast forward") || message.includes("not a fast-forward") || message.includes("update is not a fast forward");
+    }
+  }
+});
+
 // ../../generator-cli/lib/pipeline/replay-summary.js
 var require_replay_summary = __commonJS({
   "../../generator-cli/lib/pipeline/replay-summary.js"(exports2) {
@@ -330942,6 +331089,7 @@ var require_GithubStep = __commonJS({
     var createReplayBranch_1 = require_createReplayBranch();
     var findExistingUpdatablePR_1 = require_findExistingUpdatablePR();
     var parseCommitMessage_1 = require_parseCommitMessage();
+    var pushSignedCommit_1 = require_pushSignedCommit();
     var replay_summary_1 = require_replay_summary();
     var BaseStep_1 = require_BaseStep();
     var GithubStep = class extends BaseStep_1.BaseStep {
@@ -331049,11 +331197,15 @@ var require_GithubStep = __commonJS({
           updatedExistingPr: isUpdatingExistingPR
         };
         if (!this.config.previewMode) {
-          if (isUpdatingExistingPR) {
-            await repository.forcePush();
-          } else {
-            await repository.push();
-          }
+          await (0, pushSignedCommit_1.pushSignedCommit)({
+            repository,
+            octokit,
+            owner,
+            repo,
+            branch: prBranch,
+            force: isUpdatingExistingPR,
+            logger: this.logger
+          });
           const pushedBranch = await repository.getCurrentBranch();
           result.branchUrl = `https://github.com/${this.config.uri}/tree/${pushedBranch}`;
           this.logger.info(`Pushed branch: ${result.branchUrl}`);
@@ -331154,7 +331306,18 @@ var require_GithubStep = __commonJS({
           success: true
         };
         if (!this.config.previewMode) {
-          await repository.pushWithRebasingRemote();
+          const octokit = new rest_1.Octokit({ auth: this.config.token });
+          const { owner, repo } = (0, github_1.parseRepository)(this.config.uri);
+          await (0, pushSignedCommit_1.pushSignedCommit)({
+            repository,
+            octokit,
+            owner,
+            repo,
+            branch: baseBranch,
+            force: false,
+            rebaseOnConflict: true,
+            logger: this.logger
+          });
           const pushedBranch = await repository.getCurrentBranch();
           result.branchUrl = `https://github.com/${this.config.uri}/tree/${pushedBranch}`;
           this.logger.info(`Pushed branch: ${result.branchUrl}`);
@@ -615048,7 +615211,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.87.0",
+          version: "4.88.0-2-gac5aef39d7f",
           usingAccessToken: true
         }
       });
@@ -615102,7 +615265,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.87.0",
+        version: "4.88.0-2-gac5aef39d7f",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -832624,7 +832787,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 = "4.87.0";
+  const version7 = "4.88.0-2-gac5aef39d7f";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -844372,7 +844535,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.87.0"
+        cliVersion: "4.88.0-2-gac5aef39d7f"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -849036,6 +849199,80 @@ var NopFormatter = class extends AbstractFormatter {
   }
 };
 
+// ../../../generators/browser-compatible-base/lib/utils/NameHelpers.js
+function getWireValue2(input3) {
+  if (typeof input3 === "string") {
+    return input3;
+  }
+  return input3.wireValue;
+}
+
+// ../../../generators/browser-compatible-base/lib/utils/CaseConverter.js
+var CaseConverter = class _CaseConverter {
+  casingsGenerator;
+  constructor(opts) {
+    this.casingsGenerator = constructFullCasingsGenerator(opts);
+  }
+  /**
+   * Creates a CaseConverter for a known generation language.
+   * Keywords are derived automatically from the language's reserved word list.
+   * Use `smartCasing: true` for initialisms (e.g. HTTP → HTTP), `false` for standard casing.
+   */
+  static fromLanguage(language, smartCasing) {
+    return new _CaseConverter({ generationLanguage: language, keywords: void 0, smartCasing });
+  }
+  // --- Name resolution ---
+  resolve(input3) {
+    return this.casingsGenerator.generateName(input3);
+  }
+  resolveNameOrString(nameOrString) {
+    return this.casingsGenerator.generateName(nameOrString);
+  }
+  resolveNameAndWireValue(input3) {
+    return this.casingsGenerator.generateNameAndWireValue(input3);
+  }
+  // --- camel ---
+  camel(input3) {
+    return this.resolve(input3).camelCase;
+  }
+  camelSafe(input3) {
+    return this.camel(input3).safeName;
+  }
+  camelUnsafe(input3) {
+    return this.camel(input3).unsafeName;
+  }
+  // --- pascal ---
+  pascal(input3) {
+    return this.resolve(input3).pascalCase;
+  }
+  pascalSafe(input3) {
+    return this.pascal(input3).safeName;
+  }
+  pascalUnsafe(input3) {
+    return this.pascal(input3).unsafeName;
+  }
+  // --- snake ---
+  snake(input3) {
+    return this.resolve(input3).snakeCase;
+  }
+  snakeSafe(input3) {
+    return this.snake(input3).safeName;
+  }
+  snakeUnsafe(input3) {
+    return this.snake(input3).unsafeName;
+  }
+  // --- screamingSnake ---
+  screamingSnake(input3) {
+    return this.resolve(input3).screamingSnakeCase;
+  }
+  screamingSnakeSafe(input3) {
+    return this.screamingSnake(input3).safeName;
+  }
+  screamingSnakeUnsafe(input3) {
+    return this.screamingSnake(input3).unsafeName;
+  }
+};
+
 // ../../../generators/browser-compatible-base/lib/utils/getSdkVersion.js
 function getSdkVersion(config5) {
   return config5.output.mode._visit({
@@ -860899,80 +861136,6 @@ function sortMethodName(a4, b7) {
   return 0;
 }
 
-// ../../../generators/base/lib/utils/NameHelpers.js
-function getWireValue2(input3) {
-  if (typeof input3 === "string") {
-    return input3;
-  }
-  return input3.wireValue;
-}
-
-// ../../../generators/base/lib/utils/CaseConverter.js
-var CaseConverter = class _CaseConverter {
-  casingsGenerator;
-  constructor(opts) {
-    this.casingsGenerator = constructFullCasingsGenerator(opts);
-  }
-  /**
-   * Creates a CaseConverter for a known generation language.
-   * Keywords are derived automatically from the language's reserved word list.
-   * Use `smartCasing: true` for initialisms (e.g. HTTP → HTTP), `false` for standard casing.
-   */
-  static fromLanguage(language, smartCasing) {
-    return new _CaseConverter({ generationLanguage: language, keywords: void 0, smartCasing });
-  }
-  // --- Name resolution ---
-  resolve(input3) {
-    return this.casingsGenerator.generateName(input3);
-  }
-  resolveNameOrString(nameOrString) {
-    return this.casingsGenerator.generateName(nameOrString);
-  }
-  resolveNameAndWireValue(input3) {
-    return this.casingsGenerator.generateNameAndWireValue(input3);
-  }
-  // --- camel ---
-  camel(input3) {
-    return this.resolve(input3).camelCase;
-  }
-  camelSafe(input3) {
-    return this.camel(input3).safeName;
-  }
-  camelUnsafe(input3) {
-    return this.camel(input3).unsafeName;
-  }
-  // --- pascal ---
-  pascal(input3) {
-    return this.resolve(input3).pascalCase;
-  }
-  pascalSafe(input3) {
-    return this.pascal(input3).safeName;
-  }
-  pascalUnsafe(input3) {
-    return this.pascal(input3).unsafeName;
-  }
-  // --- snake ---
-  snake(input3) {
-    return this.resolve(input3).snakeCase;
-  }
-  snakeSafe(input3) {
-    return this.snake(input3).safeName;
-  }
-  snakeUnsafe(input3) {
-    return this.snake(input3).unsafeName;
-  }
-  // --- screamingSnake ---
-  screamingSnake(input3) {
-    return this.resolve(input3).screamingSnakeCase;
-  }
-  screamingSnakeSafe(input3) {
-    return this.screamingSnake(input3).safeName;
-  }
-  screamingSnakeUnsafe(input3) {
-    return this.screamingSnake(input3).unsafeName;
-  }
-};
-
 // ../../../generators/csharp/codegen/lib/ast/types/Enum.js
 var Enum = class extends Node5 {
   get name() {
@@ -919760,7 +919923,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.87.0";
+    return "4.88.0-2-gac5aef39d7f";
   }
   getCliName() {
     if (false) {
@@ -921480,6 +921643,23 @@ async function checkOutputDirectory(outputPath, cliContext, force) {
   };
 }
 
+// src/commands/generate/expandGroupFilter.ts
+function expandGroupFilter(groupNames, generatorsConfiguration) {
+  if (groupNames == null || groupNames.length === 0) {
+    return null;
+  }
+  const expanded = [];
+  for (const name2 of groupNames) {
+    const aliasGroups = generatorsConfiguration?.groupAliases[name2];
+    for (const resolved of aliasGroups ?? [name2]) {
+      if (!expanded.includes(resolved)) {
+        expanded.push(resolved);
+      }
+    }
+  }
+  return expanded;
+}
+
 // src/commands/generate/generateAPIWorkspace.ts
 init_lib6();
 
@@ -921540,6 +921720,91 @@ function resolveGroupNamesForGeneration({
   };
 }
 
+// src/commands/generate/resolveGroupsOrFail.ts
+function resolveGroupsOrFail({
+  groupNames,
+  generatorsConfiguration,
+  isAutomation,
+  context: context3
+}) {
+  if (groupNames == null || groupNames.length === 0) {
+    return resolveSingleGroupOrFail({
+      groupName: void 0,
+      generatorsConfiguration,
+      isAutomation,
+      context: context3
+    });
+  }
+  const resolved = [];
+  for (const groupName of groupNames) {
+    for (const name2 of resolveSingleGroupOrFail({
+      groupName,
+      generatorsConfiguration,
+      isAutomation,
+      context: context3
+    })) {
+      if (!resolved.includes(name2)) {
+        resolved.push(name2);
+      }
+    }
+  }
+  return resolved;
+}
+function resolveSingleGroupOrFail({
+  groupName,
+  generatorsConfiguration,
+  isAutomation,
+  context: context3
+}) {
+  const resolution = resolveGroupNamesForGeneration({ groupName, generatorsConfiguration, isAutomation });
+  if (resolution.type === "fan-out") {
+    return resolution.groupNames;
+  }
+  if (resolution.type === "missing-group") {
+    const longestGroupName = Math.max(...resolution.availableGroupNames.map((name2) => name2.length));
+    const currentArgs = process.argv.slice(2).join(" ");
+    const suggestions = resolution.availableGroupNames.map((name2) => {
+      const suggestedCommand = `fern ${currentArgs} --${GROUP_CLI_OPTION} ${name2}`;
+      return ` \u203A ${source_default.bold(name2.padEnd(longestGroupName))}  ${source_default.dim(suggestedCommand)}`;
+    }).join("\n");
+    context3.failAndThrow(
+      `No group specified. Use the --${GROUP_CLI_OPTION} option, or set "${DEFAULT_GROUP_GENERATORS_CONFIG_KEY}" in ${GENERATORS_CONFIGURATION_FILENAME}:
+${suggestions}`,
+      void 0,
+      { code: CliError.Code.NetworkError }
+    );
+    return [];
+  }
+  if (resolution.fromDefaultGroup) {
+    context3.logger.info(
+      source_default.dim(`Using default group '${resolution.groupName}' from ${GENERATORS_CONFIGURATION_FILENAME}`)
+    );
+  }
+  const aliasResult = resolveGroupAlias({
+    name: resolution.groupName,
+    groupAliases: generatorsConfiguration.groupAliases,
+    availableGroupNames: generatorsConfiguration.groups.map((g8) => g8.groupName)
+  });
+  if (aliasResult.type === "alias-references-missing-group") {
+    context3.failAndThrow(
+      `Group alias '${aliasResult.alias}' references non-existent group '${aliasResult.missingGroupName}'. Available groups: ${aliasResult.availableGroupNames.join(", ")}`,
+      void 0,
+      { code: CliError.Code.NetworkError }
+    );
+    return [];
+  }
+  if (aliasResult.type === "unknown") {
+    const aliasesSuffix = aliasResult.availableAliasNames.length > 0 ? `. Available aliases: ${aliasResult.availableAliasNames.join(", ")}` : "";
+    context3.failAndThrow(
+      `'${aliasResult.name}' is not a valid group or alias. Available groups: ${aliasResult.availableGroupNames.join(", ")}${aliasesSuffix}`,
+      void 0,
+      { code: CliError.Code.NetworkError }
+    );
+    return [];
+  }
+  return aliasResult.groupNames;
+}
+
 // src/commands/generate/describeSkipReason.ts
 function describeSkipReason(generator, rootAutorelease) {
   if (!generator.automation.generate) {
@@ -921614,7 +921879,7 @@ async function generateWorkspace({
   workspace,
   projectConfig,
   context: context3,
-  groupName,
+  groupNames,
   generatorName,
   generatorIndex,
   version: version7,
@@ -921647,7 +921912,7 @@ async function generateWorkspace({
     return;
   }
   const resolvedGroupNames = resolveGroupsOrFail({
-    groupName,
+    groupNames,
     generatorsConfiguration: workspace.generatorsConfiguration,
     isAutomation: automation != null,
     context: context3
@@ -921790,60 +922055,6 @@ function resolveRunnableGroup({
   }
   return group;
 }
-function resolveGroupsOrFail({
-  groupName,
-  generatorsConfiguration,
-  isAutomation,
-  context: context3
-}) {
-  const resolution = resolveGroupNamesForGeneration({ groupName, generatorsConfiguration, isAutomation });
-  if (resolution.type === "fan-out") {
-    return resolution.groupNames;
-  }
-  if (resolution.type === "missing-group") {
-    const longestGroupName = Math.max(...resolution.availableGroupNames.map((name2) => name2.length));
-    const currentArgs = process.argv.slice(2).join(" ");
-    const suggestions = resolution.availableGroupNames.map((name2) => {
-      const suggestedCommand = `fern ${currentArgs} --${GROUP_CLI_OPTION} ${name2}`;
-      return ` \u203A ${source_default.bold(name2.padEnd(longestGroupName))}  ${source_default.dim(suggestedCommand)}`;
-    }).join("\n");
-    context3.failAndThrow(
-      `No group specified. Use the --${GROUP_CLI_OPTION} option, or set "${DEFAULT_GROUP_GENERATORS_CONFIG_KEY}" in ${GENERATORS_CONFIGURATION_FILENAME}:
-${suggestions}`,
-      void 0,
-      { code: CliError.Code.NetworkError }
-    );
-    return [];
-  }
-  if (resolution.fromDefaultGroup) {
-    context3.logger.info(
-      source_default.dim(`Using default group '${resolution.groupName}' from ${GENERATORS_CONFIGURATION_FILENAME}`)
-    );
-  }
-  const aliasResult = resolveGroupAlias({
-    name: resolution.groupName,
-    groupAliases: generatorsConfiguration.groupAliases,
-    availableGroupNames: generatorsConfiguration.groups.map((g8) => g8.groupName)
-  });
-  if (aliasResult.type === "alias-references-missing-group") {
-    context3.failAndThrow(
-      `Group alias '${aliasResult.alias}' references non-existent group '${aliasResult.missingGroupName}'. Available groups: ${aliasResult.availableGroupNames.join(", ")}`,
-      void 0,
-      { code: CliError.Code.NetworkError }
-    );
-    return [];
-  }
-  if (aliasResult.type === "unknown") {
-    const aliasesSuffix = aliasResult.availableAliasNames.length > 0 ? `. Available aliases: ${aliasResult.availableAliasNames.join(", ")}` : "";
-    context3.failAndThrow(
-      `'${aliasResult.name}' is not a valid group or alias. Available groups: ${aliasResult.availableGroupNames.join(", ")}${aliasesSuffix}`,
-      void 0,
-      { code: CliError.Code.NetworkError }
-    );
-    return [];
-  }
-  return aliasResult.groupNames;
-}
 function applyLfsOverride(group, lfsOverridePath, context3) {
   const baseAbsolutePath = AbsoluteFilePath2.of(resolve6(cwd(), lfsOverridePath));
   const languageCount = {};
@@ -921933,7 +922144,7 @@ async function generateAPIWorkspaces({
   project,
   cliContext,
   version: version7,
-  groupName,
+  groupNames,
   generatorName,
   generatorIndex,
   shouldLogS3Url,
@@ -921975,7 +922186,7 @@ async function generateAPIWorkspaces({
   }
   await confirmOutputDirectoriesForEligibleGenerators({
     project,
-    groupName,
+    groupNames,
     generatorName,
     generatorIndex,
     automation,
@@ -921986,7 +922197,7 @@ async function generateAPIWorkspaces({
     orgId: project.config.organization,
     command: resolvePosthogCommandLabel(automation),
     properties: {
-      workspaces: buildPosthogWorkspaces({ project, groupName, generatorName })
+      workspaces: buildPosthogWorkspaces({ project, groupNames, generatorName })
     }
   });
   await Promise.all(
@@ -922002,7 +922213,7 @@ async function generateAPIWorkspaces({
           projectConfig: project.config,
           context: context3,
           version: version7,
-          groupName,
+          groupNames,
           generatorName,
           generatorIndex,
           shouldLogS3Url,
@@ -922031,7 +922242,7 @@ async function generateAPIWorkspaces({
 }
 async function confirmOutputDirectoriesForEligibleGenerators({
   project,
-  groupName,
+  groupNames,
   generatorName,
   generatorIndex,
   automation,
@@ -922039,7 +922250,7 @@ async function confirmOutputDirectoriesForEligibleGenerators({
   force
 }) {
   for (const workspace of project.apiWorkspaces) {
-    const resolvedGroupNames = expandGroupFilter(groupName, workspace.generatorsConfiguration);
+    const resolvedGroupNames = expandGroupFilter(groupNames, workspace.generatorsConfiguration);
     const rootAutorelease = workspace.generatorsConfiguration?.rawConfiguration.autorelease;
     const groupsInScope = workspace.generatorsConfiguration?.groups.filter(
       (group) => resolvedGroupNames == null || resolvedGroupNames.includes(group.groupName)
@@ -922072,14 +922283,14 @@ async function confirmOutputDirectoriesForEligibleGenerators({
 }
 function buildPosthogWorkspaces({
   project,
-  groupName,
+  groupNames,
   generatorName
 }) {
   return project.apiWorkspaces.map((workspace) => {
-    const resolvedGroupNames = expandGroupFilter(groupName, workspace.generatorsConfiguration);
+    const resolvedGroupNames = expandGroupFilter(groupNames, workspace.generatorsConfiguration);
     return {
       name: workspace.workspaceName,
-      group: groupName,
+      group: groupNames != null && groupNames.length === 1 ? groupNames[0] : groupNames,
       generators: workspace.generatorsConfiguration?.groups.filter((group) => resolvedGroupNames == null || resolvedGroupNames.includes(group.groupName)).map(
         (group) => group.generators.filter((generator) => generatorName == null || generator.name === generatorName).map((generator) => ({
           name: generator.name,
@@ -922091,19 +922302,6 @@ function buildPosthogWorkspaces({
     };
   });
 }
-function expandGroupFilter(groupName, generatorsConfiguration) {
-  if (groupName == null) {
-    return null;
-  }
-  if (generatorsConfiguration == null) {
-    return [groupName];
-  }
-  const aliasGroups = generatorsConfiguration.groupAliases[groupName];
-  if (aliasGroups != null) {
-    return aliasGroups;
-  }
-  return [groupName];
-}
 
 // src/commands/automations/generate/GeneratorRunResult.ts
 function countResults(results) {
@@ -922296,7 +922494,7 @@ async function executeAutomationsGenerate({
         }),
         cliContext,
         version: options2.version,
-        groupName: options2.group,
+        groupNames: options2.group != null ? [options2.group] : void 0,
         generatorName,
         generatorIndex,
         shouldLogS3Url: false,
@@ -939371,7 +939569,8 @@ function addGenerateCommand2(cli, cliContext) {
       description: "A stable identifier for the preview. Reusing the same ID overwrites the previous preview, keeping the URL stable."
     }).option("group", {
       type: "string",
-      description: "The group to generate"
+      array: true,
+      description: "The group to generate. Pass --group multiple times to generate for several groups at once."
     }).option("generator", {
       type: "string",
       description: "The name of a specific generator to run"
@@ -939552,7 +939751,7 @@ function addGenerateCommand2(cli, cliContext) {
           }),
           cliContext,
           version: argv.version,
-          groupName: argv.group,
+          groupNames: argv.group,
           generatorName,
           generatorIndex,
           shouldLogS3Url: argv.printZipUrl,
@@ -939575,7 +939774,7 @@ function addGenerateCommand2(cli, cliContext) {
         });
       }
       if (argv.docs != null) {
-        if (argv.group != null) {
+        if (argv.group != null && argv.group.length > 0) {
           cliContext.logger.warn("--group is ignored when generating docs");
         }
         if (argv.generator != null) {
@@ -939612,7 +939811,7 @@ function addGenerateCommand2(cli, cliContext) {
         }),
         cliContext,
         version: argv.version,
-        groupName: argv.group,
+        groupNames: argv.group,
         generatorName,
         generatorIndex,
         shouldLogS3Url: argv.printZipUrl,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.87.0",
+  "version": "4.88.0-2-gac5aef39d7f",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",