@fern-api/fern-api-dev 4.86.1 → 4.86.2

package/cli.cjs

@@ -506239,6 +506239,7 @@ __export(generators_yml_exports, {
   Language: () => Language4,
   MessageNamingSettingsSchema: () => MessageNamingSettingsSchema,
   ModelProvider: () => ModelProvider,
+  MultiServerStrategy: () => MultiServerStrategy,
   OPENAPI_LOCATION_KEY: () => OPENAPI_LOCATION_KEY,
   OPENAPI_OVERRIDES_LOCATION_KEY: () => OPENAPI_OVERRIDES_LOCATION_KEY,
   PathParameterOrder: () => PathParameterOrder,
@@ -506419,6 +506420,7 @@ __export(generators_exports, {
   FormParameterEncoding: () => FormParameterEncoding,
   Language: () => Language4,
   MessageNamingSettingsSchema: () => MessageNamingSettingsSchema,
+  MultiServerStrategy: () => MultiServerStrategy,
   PathParameterOrder: () => PathParameterOrder,
   RemoveDiscriminantsFromSchemas: () => RemoveDiscriminantsFromSchemas,
   UnionSettingsSchema: () => UnionSettingsSchema
@@ -506470,6 +506472,12 @@ var MessageNamingSettingsSchema = {
   V2: "v2"
 };
 
+// ../configuration/lib/generators-yml/schemas/api/resources/generators/types/MultiServerStrategy.js
+var MultiServerStrategy = {
+  EnvironmentPerServer: "environment-per-server",
+  UrlsPerEnvironment: "urls-per-environment"
+};
+
 // ../configuration/lib/generators-yml/schemas/api/resources/generators/types/PathParameterOrder.js
 var PathParameterOrder = {
   UrlOrder: "url-order",
@@ -506579,6 +506587,7 @@ __export(serialization_exports4, {
   MessageNamingSettingsSchema: () => MessageNamingSettingsSchema2,
   ModelName: () => ModelName,
   ModelProvider: () => ModelProvider2,
+  MultiServerStrategy: () => MultiServerStrategy2,
   NamespacedApiConfigurationSchema: () => NamespacedApiConfigurationSchema,
   NpmOutputLocationSchema: () => NpmOutputLocationSchema,
   NugetOutputLocationSchema: () => NugetOutputLocationSchema,
@@ -508551,6 +508560,7 @@ __export(generators_exports2, {
   GraphQlSpecSchema: () => GraphQlSpecSchema,
   Language: () => Language5,
   MessageNamingSettingsSchema: () => MessageNamingSettingsSchema2,
+  MultiServerStrategy: () => MultiServerStrategy2,
   NamespacedApiConfigurationSchema: () => NamespacedApiConfigurationSchema,
   OpenApiExampleGenerationSchema: () => OpenApiExampleGenerationSchema,
   OpenApiFilterSchema: () => OpenApiFilterSchema,
@@ -508584,6 +508594,9 @@ var ApiDefinitionPathSchema = schemas_exports8.string();
 // ../configuration/lib/generators-yml/schemas/serialization/resources/generators/types/MessageNamingSettingsSchema.js
 var MessageNamingSettingsSchema2 = schemas_exports8.enum_(["v1", "v2"]);
 
+// ../configuration/lib/generators-yml/schemas/serialization/resources/generators/types/MultiServerStrategy.js
+var MultiServerStrategy2 = schemas_exports8.enum_(["environment-per-server", "urls-per-environment"]);
+
 // ../configuration/lib/generators-yml/schemas/serialization/resources/generators/types/PathParameterOrder.js
 var PathParameterOrder2 = schemas_exports8.enum_(["url-order", "spec-order"]);
 
@@ -508605,6 +508618,7 @@ var ApiDefinitionSettingsSchema = schemas_exports8.object({
   "wrap-references-to-nullable-in-optional": schemas_exports8.boolean().optional(),
   "coerce-optional-schemas-to-nullable": schemas_exports8.boolean().optional(),
   "group-environments-by-host": schemas_exports8.boolean().optional(),
+  "multi-server-strategy": MultiServerStrategy2.optional(),
   "remove-discriminants-from-schemas": RemoveDiscriminantsFromSchemas2.optional(),
   "path-parameter-order": PathParameterOrder2.optional()
 });
@@ -508670,6 +508684,7 @@ var BaseApiSettingsSchema = schemas_exports8.object({
   "wrap-references-to-nullable-in-optional": schemas_exports8.boolean().optional(),
   "coerce-optional-schemas-to-nullable": schemas_exports8.boolean().optional(),
   "group-environments-by-host": schemas_exports8.boolean().optional(),
+  "multi-server-strategy": MultiServerStrategy2.optional(),
   "remove-discriminants-from-schemas": RemoveDiscriminantsFromSchemas2.optional(),
   "path-parameter-order": PathParameterOrder2.optional(),
   "resolve-schema-collisions": schemas_exports8.boolean().optional(),
@@ -509244,6 +509259,7 @@ var DEFAULT_CONVERT_OPENAPI_OPTIONS = {
   wrapReferencesToNullableInOptional: false,
   coerceOptionalSchemasToNullable: false,
   groupEnvironmentsByHost: false,
+  multiServerStrategy: generators_yml_exports.MultiServerStrategy.EnvironmentPerServer,
   removeDiscriminantsFromSchemas: generators_yml_exports.RemoveDiscriminantsFromSchemas.Always,
   inferDefaultEnvironment: true
 };
@@ -517395,7 +517411,8 @@ function getEndpointNamespace(sdkName, namespaceOverride) {
 function buildChannel({ channel: channel3, context: context3, declarationFile }) {
   const firstServer = channel3.servers[0];
   const hasSingleWebsocketServerOnly = context3.ir.servers.length === 0 && context3.ir.websocketServers.length <= 1;
-  const urlId = firstServer != null && !hasSingleWebsocketServerOnly ? context3.options.groupEnvironmentsByHost ? context3.getUrlId(firstServer.url) ?? generateWebsocketUrlId(firstServer.name, firstServer.url, true) : firstServer.name : void 0;
+  const resolvedUrlIdFromMap = firstServer != null ? context3.getUrlId(firstServer.url) : void 0;
+  const urlId = firstServer != null && !hasSingleWebsocketServerOnly ? resolvedUrlIdFromMap ?? (context3.options.groupEnvironmentsByHost ? generateWebsocketUrlId(firstServer.name, firstServer.url, true) : firstServer.name) : void 0;
   context3.logger.debug(`[buildChannel] Channel path="${channel3.path}", server name="${firstServer?.name}", server url="${firstServer?.url}", resolved urlId="${urlId}" (from collision map: ${context3.getUrlId(firstServer?.url ?? "") != null})`);
   let convertedPath = channel3.path;
   for (const pathParameter of channel3.handshake.pathParameters) {
@@ -517568,6 +517585,22 @@ function extractUrlsFromEnvironmentSchema(record22) {
     return acc;
   }, {});
 }
+function mergeWebsocketUrlsWithoutOverwriting(urls, websocketUrls, context3) {
+  for (const [wsName, wsUrl] of Object.entries(websocketUrls)) {
+    if (wsUrl == null) {
+      continue;
+    }
+    if (urls[wsName] != null && urls[wsName] !== wsUrl) {
+      const wsProtocol = getProtocol(wsUrl);
+      const dedupedName = wsProtocol != null ? `${wsName}_${wsProtocol}` : `${wsName}_ws`;
+      urls[dedupedName] = wsUrl;
+      context3.setUrlId(wsUrl, dedupedName);
+    } else {
+      urls[wsName] = wsUrl;
+      context3.setUrlId(wsUrl, wsName);
+    }
+  }
+}
 function buildEnvironments(context3) {
   if (context3.environmentOverrides != null) {
     for (const [environment2, environmentDeclaration] of Object.entries(context3.environmentOverrides.environments ?? {})) {
@@ -517983,7 +518016,7 @@ function buildEnvironments(context3) {
       const endpointServerNamesSet = new Set(apiToUrls.keys());
       const topLevelServerNamesSet = new Set(Object.keys(topLevelServersWithName));
       const endpointServersReferenceTopLevel = endpointServerNamesSet.size > 0 && [...endpointServerNamesSet].every((name2) => topLevelServerNamesSet.has(name2));
-      if (apiToUrls.size > 0 && endpointServersReferenceTopLevel) {
+      if (context3.options.multiServerStrategy === "urls-per-environment" && apiToUrls.size > 0 && endpointServersReferenceTopLevel) {
         const entries23 = Object.entries(topLevelServersWithName);
         const firstEntry = entries23[0];
         if (firstEntry) {
@@ -518007,7 +518040,7 @@ function buildEnvironments(context3) {
             }
           }
           if (hasWebsocketServersWithName) {
-            Object.assign(urls, extractUrlsFromEnvironmentSchema(websocketServersWithName));
+            mergeWebsocketUrlsWithoutOverwriting(urls, extractUrlsFromEnvironmentSchema(websocketServersWithName), context3);
           }
           context3.builder.addEnvironment({
             name: envName,
@@ -523631,6 +523664,7 @@ var BaseOpenAPIWorkspace = class extends AbstractAPIWorkspace {
   inlineAllOfSchemas;
   resolveAliases;
   groupEnvironmentsByHost;
+  multiServerStrategy;
   inferDefaultEnvironment;
   removeDiscriminantsFromSchemas;
   defaultIntegerFormat;
@@ -523653,6 +523687,7 @@ var BaseOpenAPIWorkspace = class extends AbstractAPIWorkspace {
     this.inlineAllOfSchemas = args.inlineAllOfSchemas;
     this.resolveAliases = args.resolveAliases;
     this.groupEnvironmentsByHost = args.groupEnvironmentsByHost;
+    this.multiServerStrategy = args.multiServerStrategy;
     this.inferDefaultEnvironment = args.inferDefaultEnvironment;
     this.removeDiscriminantsFromSchemas = args.removeDiscriminantsFromSchemas;
     this.defaultIntegerFormat = args.defaultIntegerFormat;
@@ -535679,6 +535714,7 @@ var FIELD_MAPPINGS = {
   resolveAliases: "resolveAliases",
   groupMultiApiEnvironments: "groupMultiApiEnvironments",
   groupEnvironmentsByHost: "groupEnvironmentsByHost",
+  multiServerStrategy: "multiServerStrategy",
   inferDefaultEnvironment: "inferDefaultEnvironment",
   wrapReferencesToNullableInOptional: "wrapReferencesToNullableInOptional",
   coerceOptionalSchemasToNullable: "coerceOptionalSchemasToNullable",
@@ -544469,6 +544505,7 @@ var UNDEFINED_API_DEFINITION_SETTINGS = {
   resolveAliases: void 0,
   groupMultiApiEnvironments: void 0,
   groupEnvironmentsByHost: void 0,
+  multiServerStrategy: void 0,
   inferDefaultEnvironment: void 0,
   wrapReferencesToNullableInOptional: void 0,
   coerceOptionalSchemasToNullable: void 0,
@@ -544544,6 +544581,7 @@ function parseOpenApiDefinitionSettingsSchema(settings) {
     resolveAliases: settings?.["resolve-aliases"],
     groupMultiApiEnvironments: settings?.["group-multi-api-environments"],
     groupEnvironmentsByHost: settings?.["group-environments-by-host"],
+    multiServerStrategy: settings?.["multi-server-strategy"],
     defaultIntegerFormat: settings?.["default-integer-format"],
     pathParameterOrder: settings?.["path-parameter-order"]
   };
@@ -544565,6 +544603,7 @@ function parseBaseApiDefinitionSettingsSchema(settings) {
     wrapReferencesToNullableInOptional: settings?.["wrap-references-to-nullable-in-optional"],
     coerceOptionalSchemasToNullable: settings?.["coerce-optional-schemas-to-nullable"],
     groupEnvironmentsByHost: settings?.["group-environments-by-host"],
+    multiServerStrategy: settings?.["multi-server-strategy"],
     inferDefaultEnvironment: settings?.["infer-default-environment"],
     groupMultiApiEnvironments: settings != null && "group-multi-api-environments" in settings ? settings["group-multi-api-environments"] : void 0,
     removeDiscriminantsFromSchemas: parseRemoveDiscriminantsFromSchemas(settings?.["remove-discriminants-from-schemas"]),
@@ -606270,6 +606309,7 @@ var OSSWorkspace = class _OSSWorkspace extends BaseOpenAPIWorkspace {
       })(),
       exampleGeneration: specs[0]?.settings?.exampleGeneration,
       groupEnvironmentsByHost: specs.some((spec) => spec.settings?.groupEnvironmentsByHost),
+      multiServerStrategy: specs.find((spec) => spec.settings?.multiServerStrategy != null)?.settings?.multiServerStrategy,
       inferDefaultEnvironment: collapseSpecBooleanSetting(specs, (s8) => s8?.inferDefaultEnvironment),
       defaultIntegerFormat: specs[0]?.settings?.defaultIntegerFormat,
       pathParameterOrder: specs[0]?.settings?.pathParameterOrder,
@@ -607637,6 +607677,7 @@ __export(schemas_exports13, {
   MessageNamingVersionSchema: () => MessageNamingVersionSchema,
   MetadataConfigSchema: () => MetadataConfigSchema2,
   MetadataSchema: () => MetadataSchema,
+  MultiServerStrategySchema: () => MultiServerStrategySchema,
   MultipleBaseUrlsEnvironmentSchema: () => MultipleBaseUrlsEnvironmentSchema3,
   NavbarLinkSchema: () => NavbarLinkSchema2,
   NavigationConfigSchema: () => NavigationConfigSchema4,
@@ -607701,6 +607742,9 @@ var AiConfigSchema = external_exports.object({
   model: external_exports.string()
 });
 
+// ../config/lib/schemas/settings/MultiServerStrategySchema.js
+var MultiServerStrategySchema = external_exports.enum(["environmentPerServer", "urlsPerEnvironment"]);
+
 // ../config/lib/schemas/settings/PathParameterOrderSchema.js
 var PathParameterOrderSchema = external_exports.enum(["urlOrder", "specOrder"]);
 
@@ -607740,6 +607784,16 @@ var BaseApiSettingsSchema2 = external_exports.object({
    * - Add protocol if still collision (e.g., "prod: wss://api.com/foo" -> "foo_wss", only for non-HTTPS protocols)
    */
   groupEnvironmentsByHost: external_exports.boolean().optional(),
+  /**
+   * Controls how multiple top-level OpenAPI servers are mapped to environments in the generated
+   * Fern definition, when those servers each declare an `x-fern-server-name` and endpoint-level
+   * `servers:` overrides reference those names.
+   * - `environmentPerServer`: emit one environment per top-level server (each `x-fern-server-name`
+   *   becomes its own environment constant in generated SDKs). This is the default.
+   * - `urlsPerEnvironment`: collapse all top-level servers into a single environment with each
+   *   server exposed as a named URL.
+   */
+  multiServerStrategy: MultiServerStrategySchema.optional(),
   /**
    * If `always`, remove discriminant properties from schemas when generating types, unless the schema is also used outside of a discriminated union.
    * If `never`, keep discriminant properties in schemas when generating types.
@@ -614778,7 +614832,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "4.86.1",
+          version: "4.86.2",
           usingAccessToken: true
         }
       });
@@ -614832,7 +614886,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "4.86.1",
+        version: "4.86.2",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -620075,6 +620129,7 @@ var LegacyApiSpecAdapter = class {
       optionalAdditionalProperties: settings.optionalAdditionalProperties,
       shouldUseIdiomaticRequestNames: settings.idiomaticRequestNames,
       groupEnvironmentsByHost: settings.groupEnvironmentsByHost,
+      multiServerStrategy: this.adaptMultiServerStrategy(settings.multiServerStrategy),
       removeDiscriminantsFromSchemas: this.adaptRemoveDiscriminantsFromSchemas(settings.removeDiscriminantsFromSchemas),
       pathParameterOrder: this.adaptPathParameterOrder(settings.pathParameterOrder),
       // OpenAPI-specific settings
@@ -620114,6 +620169,7 @@ var LegacyApiSpecAdapter = class {
       optionalAdditionalProperties: settings.optionalAdditionalProperties,
       shouldUseIdiomaticRequestNames: settings.idiomaticRequestNames,
       groupEnvironmentsByHost: settings.groupEnvironmentsByHost,
+      multiServerStrategy: this.adaptMultiServerStrategy(settings.multiServerStrategy),
       removeDiscriminantsFromSchemas: this.adaptRemoveDiscriminantsFromSchemas(settings.removeDiscriminantsFromSchemas),
       pathParameterOrder: this.adaptPathParameterOrder(settings.pathParameterOrder),
       // AsyncAPI-specific settings
@@ -620136,6 +620192,19 @@ var LegacyApiSpecAdapter = class {
         return void 0;
     }
   }
+  adaptMultiServerStrategy(value2) {
+    if (value2 == null) {
+      return void 0;
+    }
+    switch (value2) {
+      case "environmentPerServer":
+        return generators_yml_exports.MultiServerStrategy.EnvironmentPerServer;
+      case "urlsPerEnvironment":
+        return generators_yml_exports.MultiServerStrategy.UrlsPerEnvironment;
+      default:
+        return void 0;
+    }
+  }
   adaptPathParameterOrder(value2) {
     if (value2 == null) {
       return void 0;
@@ -828907,6 +828976,7 @@ var SETTINGS_KEY_MAP = {
   "optional-additional-properties": "optionalAdditionalProperties",
   "idiomatic-request-names": "idiomaticRequestNames",
   "group-environments-by-host": "groupEnvironmentsByHost",
+  "multi-server-strategy": "multiServerStrategy",
   "remove-discriminants-from-schemas": "removeDiscriminantsFromSchemas",
   "path-parameter-order": "pathParameterOrder",
   "coerce-consts-to": "coerceConstsTo",
@@ -828934,6 +829004,10 @@ var PATH_PARAMETER_ORDER_MAP = {
   "url-order": "urlOrder",
   "spec-order": "specOrder"
 };
+var MULTI_SERVER_STRATEGY_MAP = {
+  "environment-per-server": "environmentPerServer",
+  "urls-per-environment": "urlsPerEnvironment"
+};
 var FORM_ENCODING_MAP = {
   form: "form",
   json: "json"
@@ -828961,6 +829035,10 @@ function convertOpenApiSpecSettings(legacySettings) {
       settings[newKey] = PATH_PARAMETER_ORDER_MAP[value2] ?? value2;
       continue;
     }
+    if (key2 === "multi-server-strategy" && typeof value2 === "string") {
+      settings[newKey] = MULTI_SERVER_STRATEGY_MAP[value2] ?? value2;
+      continue;
+    }
     if (key2 === "default-form-parameter-encoding" && typeof value2 === "string") {
       settings[newKey] = FORM_ENCODING_MAP[value2] ?? value2;
       continue;
@@ -832330,7 +832408,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.86.1";
+  const version7 = "4.86.2";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -843983,7 +844061,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "4.86.1"
+        cliVersion: "4.86.2"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
         return { success: false };
@@ -919371,7 +919449,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "4.86.1";
+    return "4.86.2";
   }
   getCliName() {
     if (false) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.86.1",
+  "version": "4.86.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",