@fern-api/fern-api-dev 4.72.0 → 4.73.0-2-g7adbd47c733

package/cli.cjs

@@ -621394,7 +621394,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.72.0",
+          version: "4.73.0-2-g7adbd47c733",
           usingAccessToken: true
         }
       });
@@ -621448,7 +621448,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.72.0",
+        version: "4.73.0-2-g7adbd47c733",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -624684,7 +624684,8 @@ var YamlConfigLoader = class {
       data: parseResult.data,
       sourced: sourceResolver.toSourced(parseResult.data),
       absoluteFilePath,
-      relativeFilePath: RelativeFilePath2.of(relative4(this.cwd, absoluteFilePath))
+      relativeFilePath: RelativeFilePath2.of(relative4(this.cwd, absoluteFilePath)),
+      pathMappings: resolved.pathMappings
     };
   }
   async parseDocument(absoluteFilePath) {
@@ -624747,6 +624748,17 @@ var YamlConfigLoader = class {
       case "unrecognized_keys":
         return `unknown key(s): ${issue2.keys.join(", ")}`;
       case "invalid_union": {
+        const unknownKeys = [];
+        for (const errorGroup of issue2.errors) {
+          for (const err of errorGroup) {
+            if (err.code === "unrecognized_keys") {
+              unknownKeys.push(...err.keys);
+            }
+          }
+        }
+        if (unknownKeys.length > 0) {
+          return `unknown key(s): ${[...new Set(unknownKeys)].join(", ")}`;
+        }
         const expectedTypes = /* @__PURE__ */ new Set();
         for (const errorGroup of issue2.errors) {
           for (const err of errorGroup) {
@@ -625075,7 +625087,7 @@ var ApiDefinitionConverter = class {
     let result = {};
     if (api != null && !isNullish2(sourced.api)) {
       result = await this.convertApi({
-        absoluteFernYmlPath: fernYml.absoluteFilePath,
+        absoluteFernYmlPath: this.resolveBasePathForKey("api", fernYml),
         api,
         sourcedApi: sourced.api
       });
@@ -625083,6 +625095,7 @@ var ApiDefinitionConverter = class {
     if (apis != null && !isNullish2(sourced.apis)) {
       result = await this.convertApis({
         absoluteFernYmlPath: fernYml.absoluteFilePath,
+        pathMappings: fernYml.pathMappings,
         apis,
         sourcedApis: sourced.apis
       });
@@ -625120,14 +625133,15 @@ var ApiDefinitionConverter = class {
       [DEFAULT_API_NAME]: apiDefinition
     };
   }
-  async convertApis({ absoluteFernYmlPath, apis, sourcedApis }) {
+  async convertApis({ absoluteFernYmlPath, pathMappings, apis, sourcedApis }) {
     if (isNullish2(sourcedApis)) {
       return {};
     }
     const apiEntries = Object.entries(apis).filter(([apiName]) => !isNullish2(sourcedApis[apiName])).map(([apiName, apiDef]) => ({ apiName, apiDef, sourcedApiDef: sourcedApis[apiName] })).filter((entry) => !isNullish2(entry.sourcedApiDef));
     const convertedEntries = await Promise.all(apiEntries.map(async ({ apiName, apiDef, sourcedApiDef }) => {
+      const entryBasePath = this.findBasePathInMappings(["apis", apiName], pathMappings) ?? this.findBasePathInMappings(["apis"], pathMappings) ?? absoluteFernYmlPath;
       const specs = await this.convertSpecs({
-        absoluteFernYmlPath,
+        absoluteFernYmlPath: entryBasePath,
         specs: apiDef.specs,
         sourced: sourcedApiDef.specs
       });
@@ -625423,9 +625437,33 @@ var ApiDefinitionConverter = class {
       }
     }
   }
+  /**
+   * Returns the file path of the document that provided the content at the
+   * given YAML path prefix (via a `$ref`), or `undefined` if no mapping matches.
+   *
+   * Used to resolve spec paths relative to the correct source file when a
+   * config section (e.g. `api`, `apis`, `apis.my-api`) was loaded via `$ref`.
+   */
+  findBasePathInMappings(yamlPath, pathMappings) {
+    for (const mapping of pathMappings) {
+      if (mapping.yamlPath.length === yamlPath.length && yamlPath.every((seg, i11) => seg === mapping.yamlPath[i11])) {
+        return mapping.document.absoluteFilePath;
+      }
+    }
+    return void 0;
+  }
+  /**
+   * Returns the base file path to use for resolving paths in the given top-level
+   * key (e.g. "api"). If the key was `$ref`'d, returns the path of the referenced
+   * file; otherwise falls back to the fern.yml path.
+   */
+  resolveBasePathForKey(key2, fernYml) {
+    return this.findBasePathInMappings([key2], fernYml.pathMappings) ?? fernYml.absoluteFilePath;
+  }
 };
 
 // ../cli-v2/lib/docs/config/converter/DocsConfigConverter.js
+var DOCS_YAML_PATH = "docs";
 var DocsConfigConverter = class {
   issues = [];
   convert({ fernYml }) {
@@ -625437,10 +625475,13 @@ var DocsConfigConverter = class {
     if (this.issues.length > 0) {
       return { success: false, issues: this.issues };
     }
+    const docsPathMapping = fernYml.pathMappings.find((m11) => m11.yamlPath.length === 1 && m11.yamlPath[0] === DOCS_YAML_PATH);
+    const absoluteFilePath = docsPathMapping != null ? docsPathMapping.document.absoluteFilePath : fernYml.absoluteFilePath;
     return {
       success: true,
       config: {
-        raw: docs
+        raw: docs,
+        absoluteFilePath
       }
     };
   }
@@ -753732,8 +753773,13 @@ var IrCompiler = class {
 var CompileCommand = class {
   async handle(context3, args) {
     const workspace = await context3.loadWorkspaceOrThrow();
-    const { apiName, definition: definition3 } = this.resolveApi(args, workspace);
-    await this.checkOrThrow({ context: context3, workspace, apiName });
+    const entries23 = this.resolveApiEntries(args, workspace);
+    if (args.output != null && entries23.length > 1) {
+      throw new CliError({
+        message: `--output requires --api when multiple APIs are configured`,
+        code: CliError.Code.ConfigError
+      });
+    }
     const compiler2 = new IrCompiler({
       context: context3,
       cliVersion: workspace.cliVersion
@@ -753745,43 +753791,35 @@ var CompileCommand = class {
       disableExamples: args["disable-examples"],
       irVersion: args["ir-version"]
     };
-    const result = args.dynamic ? await compiler2.compileDynamic({ apiName, definition: definition3, options: options2 }) : await compiler2.compile({ apiName, definition: definition3, options: options2 });
-    await this.writeOutput(context3, args, result.object);
+    for (const { apiName, definition: definition3 } of entries23) {
+      await this.checkOrThrow({ context: context3, workspace, apiName });
+      const result = args.dynamic ? await compiler2.compileDynamic({ apiName, definition: definition3, options: options2 }) : await compiler2.compile({ apiName, definition: definition3, options: options2 });
+      await this.writeOutput(context3, args, result.object);
+    }
   }
-  resolveApi(args, workspace) {
-    const apiNames = Object.keys(workspace.apis);
+  /**
+   * Resolves the set of APIs to compile.
+   *
+   * - If `--api` is provided, returns only that API (throws if not found).
+   * - Otherwise returns all APIs in the workspace, matching the behavior of
+   *   `check`, `merge`, and `split` which also run on all APIs by default.
+   */
+  resolveApiEntries(args, workspace) {
+    const allApiNames = Object.keys(workspace.apis);
     if (args.api != null) {
       const definition3 = workspace.apis[args.api];
       if (definition3 == null) {
-        const available2 = apiNames.join(", ");
+        const available = allApiNames.join(", ");
         throw new CliError({
-          message: `API '${args.api}' not found. Available APIs: ${available2}`,
+          message: `API '${args.api}' not found. Available APIs: ${available}`,
           code: CliError.Code.ConfigError
         });
       }
-      return { apiName: args.api, definition: definition3 };
+      return [{ apiName: args.api, definition: definition3 }];
     }
-    if (apiNames.length === 1) {
-      const apiName = apiNames[0];
-      if (apiName == null) {
-        throw new CliError({
-          message: "Internal error; no APIs found in workspace",
-          code: CliError.Code.InternalError
-        });
-      }
+    return allApiNames.flatMap((apiName) => {
       const definition3 = workspace.apis[apiName];
-      if (definition3 == null) {
-        throw new CliError({
-          message: `Internal error; API '${apiName}' not found in workspace`,
-          code: CliError.Code.InternalError
-        });
-      }
-      return { apiName, definition: definition3 };
-    }
-    const available = apiNames.join(", ");
-    throw new CliError({
-      message: `Multiple APIs found: ${available}. Use --api to select one.`,
-      code: CliError.Code.ConfigError
+      return definition3 != null ? [{ apiName, definition: definition3 }] : [];
     });
   }
   async checkOrThrow({ context: context3, workspace, apiName }) {
@@ -834698,13 +834736,15 @@ async function runRulesOnDocsWorkspace({ workspace, rules: selectedRules, contex
 }
 
 // ../cli-v2/lib/docs/adapter/LegacyDocsWorkspaceAdapter.js
+init_lib6();
 var LegacyDocsWorkspaceAdapter = class {
   adapt({ docsConfig, absoluteFilePath }) {
+    const docsFilePath = docsConfig.absoluteFilePath ?? absoluteFilePath;
     return {
       type: "docs",
       workspaceName: void 0,
-      absoluteFilePath,
-      absoluteFilepathToDocsConfig: absoluteFilePath,
+      absoluteFilePath: dirname6(docsFilePath),
+      absoluteFilepathToDocsConfig: docsFilePath,
       config: docsConfig.raw
     };
   }
@@ -834721,9 +834761,9 @@ var LegacyProjectAdapter = class {
   }
   adapt(workspace) {
     const apiWorkspaces = this.buildApiWorkspaces(workspace);
-    const docsWorkspace = workspace.docs != null && workspace.absoluteFilePath != null ? this.docsAdapter.adapt({
+    const docsWorkspace = workspace.docs != null ? this.docsAdapter.adapt({
       docsConfig: workspace.docs,
-      absoluteFilePath: workspace.absoluteFilePath
+      absoluteFilePath: workspace.docs.absoluteFilePath ?? workspace.absoluteFilePath ?? this.context.cwd
     }) : void 0;
     return {
       config: {
@@ -838618,7 +838658,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.72.0";
+  const version7 = "4.73.0-2-g7adbd47c733";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -849865,7 +849905,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.72.0"
+        cliVersion: "4.73.0-2-g7adbd47c733"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -850434,6 +850474,36 @@ var DocsTaskGroup = class {
   }
 };
 
+// ../cli-v2/lib/ui/promptSelect.js
+async function promptSelect({ isTTY, message, choices, nonInteractiveError, flagHint }) {
+  if (choices.length === 0) {
+    throw new CliError({
+      message: "No options available to select from.",
+      code: CliError.Code.InternalError
+    });
+  }
+  if (!isTTY) {
+    throw new CliError({ message: nonInteractiveError, code: CliError.Code.ConfigError });
+  }
+  const maxNameLen = Math.max(...choices.map((c16) => c16.name.length));
+  const { selected } = await lib_default4.prompt([
+    {
+      type: "list",
+      name: "selected",
+      message,
+      choices: choices.map((c16) => {
+        if (flagHint == null) {
+          return { name: c16.name, value: c16.value };
+        }
+        const hint = flagHint(c16.value);
+        const label = hint != null ? `${c16.name.padEnd(maxNameLen)}   ${source_default.dim(hint)}` : c16.name;
+        return { name: label, value: c16.value };
+      })
+    }
+  ]);
+  return selected;
+}
+
 // ../cli-v2/lib/commands/docs/publish/command.js
 var PublishCommand = class {
   async handle(context3, args) {
@@ -850462,7 +850532,8 @@ var PublishCommand = class {
         code: CliError.Code.ConfigError
       });
     }
-    const instanceUrl = this.resolveInstanceUrl({
+    const instanceUrl = await this.resolveInstanceUrl({
+      context: context3,
       instances: workspace.docs.raw.instances,
       instance: args.instance
     });
@@ -850544,7 +850615,7 @@ var PublishCommand = class {
       throw new CliError({ code: CliError.Code.ContainerError });
     }
   }
-  resolveInstanceUrl({ instances: instances2, instance }) {
+  async resolveInstanceUrl({ context: context3, instances: instances2, instance }) {
     if (instances2.length === 0) {
       throw new CliError({
         message: "No docs instances configured.\n\n  Add an instance to the 'docs:' section of your fern.yml.",
@@ -850569,14 +850640,17 @@ ${available}
     }
     if (instances2.length > 1) {
       const available = instances2.map((i11) => `  - ${i11.url}`).join("\n");
-      throw new CliError({
-        message: `Multiple docs instances configured. Please specify which instance to publish.
+      return await promptSelect({
+        isTTY: context3.isTTY,
+        message: "Multiple docs instances configured. Select one:",
+        choices: instances2.map((i11) => ({ name: i11.url, value: i11.url })),
+        nonInteractiveError: `Multiple docs instances configured. Please specify which instance to publish.
 
 Available instances:
 ${available}
 
   Use --instance <url> to select one.`,
-        code: CliError.Code.ConfigError
+        flagHint: (value) => `--instance ${value}`
       });
     }
     const first3 = instances2[0];
@@ -904037,7 +904111,8 @@ var GenerateCommand = class {
         org: args.org
       };
     }
-    const targets2 = this.getTargets({
+    const targets2 = await this.getTargets({
+      context: context3,
       workspace: workspaceWithOverrides,
       args,
       groupName: args.target != null ? void 0 : args.group ?? workspaceWithOverrides.sdks?.defaultGroup
@@ -904070,10 +904145,13 @@ var GenerateCommand = class {
         code: CliError.Code.ConfigError
       });
     }
-    const api = args.api;
-    const target = args.target;
-    const org = args.org;
-    const output2 = args.output;
+    if (args.api == null || args.target == null || args.org == null || args.output == null) {
+      throw new CliError({
+        message: "Internal error: required flags missing",
+        code: CliError.Code.InternalError
+      });
+    }
+    const { api, target, org, output: output2 } = args;
     const resolver2 = new ApiSpecResolver({ context: context3 });
     const resolvedSpec = await resolver2.resolve({
       reference: api
@@ -904322,19 +904400,70 @@ Example:
     }
     return { path: args.output };
   }
-  getTargets({ workspace, args, groupName }) {
+  async getTargets({ context: context3, workspace, args, groupName }) {
     let matched = workspace.sdks != null ? this.filterTargetsByGroup(workspace.sdks.targets, groupName) : [];
     if (args.target != null) {
       matched = matched.filter((t3) => t3.name === args.target);
       if (matched.length === 0) {
-        throw new Error(`Target '${args.target}' not found`);
+        const allTargets = workspace.sdks?.targets ?? [];
+        const available = allTargets.map((t3) => t3.name);
+        if (available.length > 0) {
+          throw new CliError({
+            message: `Target '${args.target}' not found. Available targets: ${available.join(", ")}`,
+            code: CliError.Code.ConfigError
+          });
+        } else {
+          throw new CliError({
+            message: `Target '${args.target}' not found`,
+            code: CliError.Code.ConfigError
+          });
+        }
       }
     }
     if (matched.length === 0) {
       if (groupName != null) {
-        throw new Error(`No targets found for group '${groupName}'`);
+        throw new CliError({
+          message: `No targets found for group '${groupName}'`,
+          code: CliError.Code.ConfigError
+        });
+      }
+      throw new CliError({
+        message: "No targets configured in fern.yml",
+        code: CliError.Code.ConfigError
+      });
+    }
+    if (groupName == null && args.target == null && matched.length > 1) {
+      const allGroups = this.collectGroups(matched);
+      if (allGroups.length > 1) {
+        const selectedGroup = await promptSelect({
+          isTTY: context3.isTTY,
+          message: "Multiple SDK groups found. Select one:",
+          choices: [
+            { name: `all (${matched.length} targets)`, value: void 0 },
+            ...allGroups.map((g19) => ({ name: g19, value: g19 }))
+          ],
+          nonInteractiveError: `Multiple SDK groups found: ${allGroups.join(", ")}. Use --group to select one.`,
+          flagHint: (value) => value != null ? `--group ${value}` : void 0
+        });
+        if (selectedGroup != null) {
+          matched = this.filterTargetsByGroup(matched, selectedGroup);
+        }
+      } else {
+        const targetNames = matched.map((t3) => t3.name);
+        const selectedTarget = await promptSelect({
+          isTTY: context3.isTTY,
+          message: "Multiple SDK targets found. Select one:",
+          choices: [
+            { name: `all (${matched.length} targets)`, value: void 0 },
+            ...targetNames.map((name2) => ({ name: name2, value: name2 }))
+          ],
+          nonInteractiveError: `Multiple SDK targets found: ${targetNames.join(", ")}. Use --target to select one.`,
+          flagHint: (value) => value != null ? `--target ${value}` : void 0
+        });
+        if (selectedTarget != null) {
+          matched = matched.filter((t3) => t3.name === selectedTarget);
+        }
       }
-      throw new Error("No targets configured in fern.yml");
     }
     return matched.map((target) => ({
       ...target,
@@ -904342,6 +904471,17 @@ Example:
       output: args.output != null ? this.parseTargetOutput(args) : target.output
     }));
   }
+  collectGroups(targets2) {
+    const groups2 = /* @__PURE__ */ new Set();
+    for (const target of targets2) {
+      if (target.groups != null) {
+        for (const group of target.groups) {
+          groups2.add(group);
+        }
+      }
+    }
+    return [...groups2].sort();
+  }
   async checkOutputDirectory({ context: context3, args, outputPath }) {
     if (args.force || !context3.isTTY) {
       return { shouldProceed: true };
@@ -904371,11 +904511,13 @@ Example:
     return targets2.filter((target) => target.groups?.includes(groupName));
   }
   resolveLanguage(target) {
-    const lang = target;
-    if (LANGUAGES.includes(lang)) {
-      return lang;
+    if (isLanguage(target)) {
+      return target;
     }
-    throw new Error(`"${target}" is not a supported language. Supported: ${LANGUAGES.join(", ")}`);
+    throw new CliError({
+      message: `"${target}" is not a supported language. Supported: ${LANGUAGES.join(", ")}`,
+      code: CliError.Code.ConfigError
+    });
   }
   parseAudiences(audiences) {
     if (audiences == null || audiences.length === 0) {
@@ -904427,6 +904569,9 @@ Example:
     return text9.trimEnd().split("\n").map((line) => line.length > 0 ? `  ${line}` : line).join("\n");
   }
 };
+function isLanguage(target) {
+  return LANGUAGES.includes(target);
+}
 function addGenerateCommand(cli) {
   const cmd = new GenerateCommand();
   command2(cli, "generate", "Generate SDKs from fern.yml or directly from an API spec", async (context3, args) => {
@@ -924218,7 +924363,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.72.0";
+    return "4.73.0-2-g7adbd47c733";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.72.0",
+  "version": "4.73.0-2-g7adbd47c733",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",