@fern-api/fern-api-dev 4.88.0-2-gac5aef39d7f → 4.88.0-3-g87b8f69d721

package/cli.cjs

@@ -615211,7 +615211,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.88.0-2-gac5aef39d7f",
+          version: "4.88.0-3-g87b8f69d721",
           usingAccessToken: true
         }
       });
@@ -615265,7 +615265,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.88.0-2-gac5aef39d7f",
+        version: "4.88.0-3-g87b8f69d721",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -832787,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.88.0-2-gac5aef39d7f";
+  const version7 = "4.88.0-3-g87b8f69d721";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -844535,7 +844535,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.88.0-2-gac5aef39d7f"
+        cliVersion: "4.88.0-3-g87b8f69d721"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -919923,7 +919923,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.88.0-2-gac5aef39d7f";
+    return "4.88.0-3-g87b8f69d721";
   }
   getCliName() {
     if (false) {
@@ -920222,6 +920222,22 @@ function wrapWorkspaceNameForPrefix(workspaceName) {
 // ../project-loader/lib/loadProject.js
 init_lib6();
 var import_promises129 = require("fs/promises");
+
+// ../project-loader/lib/normalizeCommandLineApiWorkspace.js
+function normalizeCommandLineApiWorkspace(input3) {
+  if (input3 == null) {
+    return void 0;
+  }
+  if (!Array.isArray(input3)) {
+    return [input3];
+  }
+  if (input3.length === 0) {
+    return void 0;
+  }
+  return Array.from(new Set(input3));
+}
+
+// ../project-loader/lib/loadProject.js
 async function loadProject({ context: context3, nameOverride, ...args }) {
   const fernDirectory = await getFernDirectory(nameOverride);
   if (fernDirectory == null) {
@@ -920283,6 +920299,7 @@ For more information:
   };
 }
 async function loadApis({ cliName, fernDirectory, context: context3, cliVersion, commandLineApiWorkspace, defaultToAllApiWorkspaces }) {
+  const commandLineApiWorkspaceNames = normalizeCommandLineApiWorkspace(commandLineApiWorkspace);
   const apisDirectory = join8(fernDirectory, RelativeFilePath2.of(APIS_DIRECTORY));
   const apisDirectoryExists = await doesPathExist(apisDirectory);
   if (apisDirectoryExists) {
@@ -920293,11 +920310,10 @@ async function loadApis({ cliName, fernDirectory, context: context3, cliVersion,
       }
       return all9;
     }, []);
-    if (commandLineApiWorkspace != null) {
-      if (!apiWorkspaceDirectoryNames.includes(commandLineApiWorkspace)) {
-        return context3.failAndThrow("API does not exist: " + commandLineApiWorkspace, void 0, {
-          code: CliError.Code.ConfigError
-        });
+    if (commandLineApiWorkspaceNames != null) {
+      const missing = commandLineApiWorkspaceNames.filter((name2) => !apiWorkspaceDirectoryNames.includes(name2));
+      if (missing.length > 0) {
+        return context3.failAndThrow(missing.length === 1 ? "API does not exist: " + missing[0] : "APIs do not exist: " + missing.join(", "), void 0, { code: CliError.Code.ConfigError });
       }
     } else if (apiWorkspaceDirectoryNames.length === 0) {
       return context3.failAndThrow("No APIs found.", void 0, { code: CliError.Code.ConfigError });
@@ -920311,9 +920327,7 @@ async function loadApis({ cliName, fernDirectory, context: context3, cliVersion,
       return context3.failAndThrow(message, void 0, { code: CliError.Code.ConfigError });
     }
     const apiWorkspaces = [];
-    const filteredWorkspaces = commandLineApiWorkspace != null ? apiWorkspaceDirectoryNames.filter((api2) => {
-      return api2 === commandLineApiWorkspace;
-    }) : apiWorkspaceDirectoryNames;
+    const filteredWorkspaces = commandLineApiWorkspaceNames != null ? apiWorkspaceDirectoryNames.filter((api2) => commandLineApiWorkspaceNames.includes(api2)) : apiWorkspaceDirectoryNames;
     await Promise.all(filteredWorkspaces.map(async (workspaceDirectoryName) => {
       const workspace2 = await loadAPIWorkspace({
         absolutePathToWorkspace: join8(apisDirectory, RelativeFilePath2.of(workspaceDirectoryName)),
@@ -921663,148 +921677,6 @@ function expandGroupFilter(groupNames, generatorsConfiguration) {
 // src/commands/generate/generateAPIWorkspace.ts
 init_lib6();
 
-// src/commands/generate/resolveGroupAlias.ts
-function resolveGroupAlias({
-  name: name2,
-  groupAliases,
-  availableGroupNames
-}) {
-  const aliasTargets = groupAliases[name2];
-  if (aliasTargets != null) {
-    for (const target of aliasTargets) {
-      if (!availableGroupNames.includes(target)) {
-        return {
-          type: "alias-references-missing-group",
-          alias: name2,
-          missingGroupName: target,
-          availableGroupNames
-        };
-      }
-    }
-    return { type: "resolved", groupNames: aliasTargets };
-  }
-  if (availableGroupNames.includes(name2)) {
-    return { type: "resolved", groupNames: [name2] };
-  }
-  return {
-    type: "unknown",
-    name: name2,
-    availableGroupNames,
-    availableAliasNames: Object.keys(groupAliases)
-  };
-}
-
-// src/commands/generate/resolveGroupNamesForGeneration.ts
-function resolveGroupNamesForGeneration({
-  groupName,
-  generatorsConfiguration,
-  isAutomation
-}) {
-  if (isAutomation && groupName == null) {
-    return {
-      type: "fan-out",
-      groupNames: generatorsConfiguration.groups.map((g8) => g8.groupName)
-    };
-  }
-  const effective = groupName ?? generatorsConfiguration.defaultGroup;
-  if (effective == null) {
-    return {
-      type: "missing-group",
-      availableGroupNames: generatorsConfiguration.groups.map((g8) => g8.groupName)
-    };
-  }
-  return {
-    type: "targeted",
-    groupName: effective,
-    fromDefaultGroup: groupName == null
-  };
-}
-
-// 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) {
@@ -921879,7 +921751,7 @@ async function generateWorkspace({
   workspace,
   projectConfig,
   context: context3,
-  groupNames,
+  resolvedGroupNames,
   generatorName,
   generatorIndex,
   version: version7,
@@ -921911,12 +921783,6 @@ async function generateWorkspace({
     context3.logger.warn(`This workspace has no groups specified in ${GENERATORS_CONFIGURATION_FILENAME}`);
     return;
   }
-  const resolvedGroupNames = resolveGroupsOrFail({
-    groupNames,
-    generatorsConfiguration: workspace.generatorsConfiguration,
-    isAutomation: automation != null,
-    context: context3
-  });
   const { ai: ai10, replay } = workspace.generatorsConfiguration;
   if (!useLocalDocker && !token) {
     return context3.failAndThrow("Please run fern login", void 0, { code: CliError.Code.AuthError });
@@ -922119,6 +921985,169 @@ function getLanguageFromGeneratorName3(generatorName) {
   return generatorName.replace(/[^a-zA-Z0-9]/g, "-").toLowerCase();
 }
 
+// src/commands/generate/resolveGroupAlias.ts
+function resolveGroupAlias({
+  name: name2,
+  groupAliases,
+  availableGroupNames
+}) {
+  const aliasTargets = groupAliases[name2];
+  if (aliasTargets != null) {
+    for (const target of aliasTargets) {
+      if (!availableGroupNames.includes(target)) {
+        return {
+          type: "alias-references-missing-group",
+          alias: name2,
+          missingGroupName: target,
+          availableGroupNames
+        };
+      }
+    }
+    return { type: "resolved", groupNames: aliasTargets };
+  }
+  if (availableGroupNames.includes(name2)) {
+    return { type: "resolved", groupNames: [name2] };
+  }
+  return {
+    type: "unknown",
+    name: name2,
+    availableGroupNames,
+    availableAliasNames: Object.keys(groupAliases)
+  };
+}
+
+// src/commands/generate/resolveGroupNamesForGeneration.ts
+function resolveGroupNamesForGeneration({
+  groupName,
+  generatorsConfiguration,
+  isAutomation
+}) {
+  if (isAutomation && groupName == null) {
+    return {
+      type: "fan-out",
+      groupNames: generatorsConfiguration.groups.map((g8) => g8.groupName)
+    };
+  }
+  const effective = groupName ?? generatorsConfiguration.defaultGroup;
+  if (effective == null) {
+    return {
+      type: "missing-group",
+      availableGroupNames: generatorsConfiguration.groups.map((g8) => g8.groupName)
+    };
+  }
+  return {
+    type: "targeted",
+    groupName: effective,
+    fromDefaultGroup: groupName == null
+  };
+}
+
+// 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/resolveGroupsForWorkspace.ts
+function resolveGroupsForWorkspace({
+  workspace,
+  groupNames,
+  isAutomation,
+  context: context3
+}) {
+  if (workspace.generatorsConfiguration == null) {
+    return void 0;
+  }
+  if (workspace.generatorsConfiguration.groups.length === 0) {
+    return void 0;
+  }
+  return resolveGroupsOrFail({
+    groupNames,
+    generatorsConfiguration: workspace.generatorsConfiguration,
+    isAutomation,
+    context: context3
+  });
+}
+
 // src/commands/generate/resolvePosthogCommandLabel.ts
 function resolvePosthogCommandLabel(automation) {
   return automation != null ? "fern automations generate" : "fern generate";
@@ -922200,8 +922229,15 @@ async function generateAPIWorkspaces({
       workspaces: buildPosthogWorkspaces({ project, groupNames, generatorName })
     }
   });
+  const resolvedGroupNamesByWorkspace = await resolveGroupsForAllWorkspaces({
+    project,
+    groupNames,
+    automation,
+    cliContext
+  });
   await Promise.all(
     project.apiWorkspaces.map(async (workspace) => {
+      const resolvedGroupNames = resolvedGroupNamesByWorkspace.get(workspace);
       await cliContext.runTaskForWorkspace(workspace, async (context3) => {
         const absolutePathToPreview = preview ? outputDir != null ? AbsoluteFilePath2.of(resolve6(cwd(), outputDir)) : join8(workspace.absoluteFilePath, RelativeFilePath2.of(PREVIEW_DIRECTORY)) : void 0;
         if (absolutePathToPreview != null) {
@@ -922213,7 +922249,7 @@ async function generateAPIWorkspaces({
           projectConfig: project.config,
           context: context3,
           version: version7,
-          groupNames,
+          resolvedGroupNames: resolvedGroupNames ?? [],
           generatorName,
           generatorIndex,
           shouldLogS3Url,
@@ -922240,6 +922276,30 @@ async function generateAPIWorkspaces({
     })
   );
 }
+async function resolveGroupsForAllWorkspaces({
+  project,
+  groupNames,
+  automation,
+  cliContext
+}) {
+  const resolvedGroupNamesByWorkspace = /* @__PURE__ */ new Map();
+  await Promise.all(
+    project.apiWorkspaces.map(async (workspace) => {
+      await cliContext.runTaskForWorkspace(workspace, async (context3) => {
+        const resolved = resolveGroupsForWorkspace({
+          workspace,
+          groupNames,
+          isAutomation: automation != null,
+          context: context3
+        });
+        if (resolved != null) {
+          resolvedGroupNamesByWorkspace.set(workspace, resolved);
+        }
+      });
+    })
+  );
+  return resolvedGroupNamesByWorkspace;
+}
 async function confirmOutputDirectoriesForEligibleGenerators({
   project,
   groupNames,
@@ -939552,8 +939612,9 @@ function addGenerateCommand2(cli, cliContext) {
     ["generate"],
     "Generate all generators in the specified group",
     (yargs) => yargs.option("api", {
-      string: true,
-      description: "If multiple APIs, specify the name with --api <name>. Otherwise, just --api."
+      type: "string",
+      array: true,
+      description: "If multiple APIs, specify the name with --api <name>. Pass --api multiple times to generate for several APIs at once."
     }).option("docs", {
       string: true,
       description: "If multiple docs sites, specify the name with --docs <name>. Otherwise just --docs."
@@ -939661,7 +939722,7 @@ function addGenerateCommand2(cli, cliContext) {
       description: "Skip opening a PR / pushing when the generated output has no diff from the base branch."
     }),
     async (argv) => {
-      if (argv.api != null && argv.docs != null) {
+      if (argv.api != null && argv.api.length > 0 && argv.docs != null) {
         return cliContext.failWithoutThrowing(
           "Cannot specify both --api and --docs. Please choose one.",
           void 0,
@@ -939743,7 +939804,7 @@ function addGenerateCommand2(cli, cliContext) {
       }
       const correctedGeneratorFilter = argv.generator != null ? warnAndCorrectIncorrectDockerOrg(argv.generator, cliContext) : void 0;
       const { generatorName, generatorIndex } = parseGeneratorArg(correctedGeneratorFilter);
-      if (argv.api != null) {
+      if (argv.api != null && argv.api.length > 0) {
         return await generateAPIWorkspaces({
           project: await loadProjectAndRegisterWorkspacesWithContext(cliContext, {
             commandLineApiWorkspace: argv.api,

package/package.json

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