@fern-api/fern-api-dev 5.103.0 → 5.104.1

package/cli.cjs

@@ -131007,7 +131007,8 @@ var init_OpenApiSettingsSchema2 = __esm({
       "infer-discriminated-union-base-properties": schemas_exports8.boolean().optional(),
       "disambiguate-request-names": schemas_exports8.boolean().optional(),
       "ignore-tags": schemas_exports8.boolean().optional(),
-      "respect-parameter-content": schemas_exports8.boolean().optional()
+      "respect-parameter-content": schemas_exports8.boolean().optional(),
+      "respect-per-spec-base-path": schemas_exports8.boolean().optional()
     }).extend(BaseApiSettingsSchema);
   }
 });
@@ -152873,7 +152874,8 @@ var init_options2 = __esm({
       shouldInferDiscriminatedUnionBaseProperties: false,
       disambiguateRequestNames: true,
       ignoreTags: false,
-      respectParameterContent: false
+      respectParameterContent: false,
+      respectPerSpecBasePath: false
     };
   }
 });
@@ -168685,6 +168687,7 @@ function generateIr({ openApi, taskContext, options: options2, source: source2,
       taskContext.logger.warn(message);
     }
   }
+  const plainBasePath = options2.respectPerSpecBasePath && fernBasePathParsed != null && fernBasePathParsed.pathParameters.length === 0 ? fernBasePathParsed.basePath : void 0;
   Object.entries(openApi.paths ?? {}).forEach(([path122, pathItem]) => {
     if (pathItem == null) {
       return;
@@ -168697,16 +168700,16 @@ function generateIr({ openApi, taskContext, options: options2, source: source2,
       }
       switch (operation.type) {
         case "async":
-          endpointsWithExample.push(...operation.sync);
-          endpointsWithExample.push(...operation.async);
+          endpointsWithExample.push(...prependBasePathToEndpoints(operation.sync, plainBasePath));
+          endpointsWithExample.push(...prependBasePathToEndpoints(operation.async, plainBasePath));
           break;
         case "http":
-          endpointsWithExample.push(...operation.value);
+          endpointsWithExample.push(...prependBasePathToEndpoints(operation.value, plainBasePath));
           break;
         case "streaming":
-          endpointsWithExample.push(...operation.streaming);
+          endpointsWithExample.push(...prependBasePathToEndpoints(operation.streaming, plainBasePath));
           if (operation.nonStreaming) {
-            endpointsWithExample.push(...operation.nonStreaming);
+            endpointsWithExample.push(...prependBasePathToEndpoints(operation.nonStreaming, plainBasePath));
           }
           break;
         case "webhook":
@@ -168914,17 +168917,8 @@ function generateIr({ openApi, taskContext, options: options2, source: source2,
       document: openApi
     }),
     specVersion: openApi.info.version != null && openApi.info.version.length > 0 ? openApi.info.version : void 0,
-    basePath: (() => {
-      const parsed = getFernBasePath(openApi);
-      return parsed?.basePath;
-    })(),
-    basePathParameters: (() => {
-      const parsed = getFernBasePath(openApi);
-      if (parsed == null || parsed.pathParameters.length === 0) {
-        return void 0;
-      }
-      return parsed.pathParameters;
-    })(),
+    basePath: fernBasePathParsed != null && (!options2.respectPerSpecBasePath || fernBasePathParsed.pathParameters.length > 0) ? fernBasePathParsed.basePath : void 0,
+    basePathParameters: fernBasePathParsed != null && fernBasePathParsed.pathParameters.length > 0 ? fernBasePathParsed.pathParameters : void 0,
     title: openApi.info.title ?? "",
     description: openApi.info.description,
     groups: Object.fromEntries(Object.entries(groupInfo ?? {}).map(([key2, value2]) => {
@@ -169012,6 +169006,26 @@ function maybeRemoveDiscriminantsFromSchemas(schemas, context3, source2) {
   }
   return result;
 }
+function prependBasePath(path122, basePath) {
+  if (basePath == null || basePath === "/") {
+    return path122;
+  }
+  const normalizedBasePath = basePath.replace(/\/+$/, "");
+  if (path122 === normalizedBasePath || path122.startsWith(`${normalizedBasePath}/`)) {
+    return path122;
+  }
+  const normalizedPath = path122.replace(/^\/+/, "");
+  return normalizedPath.length > 0 ? `${normalizedBasePath}/${normalizedPath}` : normalizedBasePath;
+}
+function prependBasePathToEndpoints(endpoints, basePath) {
+  if (basePath == null || basePath === "/") {
+    return endpoints;
+  }
+  return endpoints.map((endpoint3) => ({
+    ...endpoint3,
+    path: prependBasePath(endpoint3.path, basePath)
+  }));
+}
 function getParentSchemaIdsWithNonUnionChildren(schemas, context3) {
   const protectedParents = /* @__PURE__ */ new Set();
   for (const [schemaId, schema] of Object.entries(schemas)) {
@@ -169191,7 +169205,7 @@ function parse8({ context: context3, documents, options: options2 }) {
             source: source2,
             namespace: document4.namespace
           });
-          ir3 = merge6(ir3, openapiIr, getParseOptions({ options: document4.settings, overrides: options2 }));
+          ir3 = merge6(ir3, openapiIr, getParseOptions({ options: document4.settings, overrides: options2 }), context3);
           documentIndex++;
           break;
         }
@@ -169388,7 +169402,17 @@ function extractApiNameFromServers(servers) {
 function hasGroupedServers(servers) {
   return servers.some((server) => server.type === "grouped");
 }
-function merge6(ir1, ir22, options2) {
+function mergeBasePath(ir1, ir22, options2, context3) {
+  if (options2?.respectPerSpecBasePath === true && ir1.basePath != null && ir22.basePath != null && ir1.basePath !== ir22.basePath) {
+    context3.failWithoutThrowing(`Conflicting parameterized x-fern-base-path values: '${ir1.basePath}' and '${ir22.basePath}'.`);
+  }
+  return {
+    basePath: ir1.basePath ?? ir22.basePath,
+    basePathParameters: ir1.basePathParameters ?? ir22.basePathParameters
+  };
+}
+function merge6(ir1, ir22, options2, context3) {
+  const mergedBasePath = mergeBasePath(ir1, ir22, options2, context3);
   const shouldGroupEnvironments = options2?.groupMultiApiEnvironments === true;
   if (!shouldGroupEnvironments) {
     return {
@@ -169396,8 +169420,8 @@ function merge6(ir1, ir22, options2) {
       specVersion: ir1.specVersion ?? ir22.specVersion,
       title: ir1.title ?? ir22.title,
       description: ir1.description ?? ir22.description,
-      basePath: ir1.basePath ?? ir22.basePath,
-      basePathParameters: ir1.basePathParameters ?? ir22.basePathParameters,
+      basePath: mergedBasePath.basePath,
+      basePathParameters: mergedBasePath.basePathParameters,
       servers: [...ir1.servers, ...ir22.servers],
       websocketServers: [...ir1.websocketServers, ...ir22.websocketServers],
       tags: {
@@ -169539,8 +169563,8 @@ function merge6(ir1, ir22, options2) {
       specVersion: ir1.specVersion ?? ir22.specVersion,
       title: ir1.title ?? ir22.title,
       description: ir1.description ?? ir22.description,
-      basePath: ir1.basePath ?? ir22.basePath,
-      basePathParameters: ir1.basePathParameters ?? ir22.basePathParameters,
+      basePath: mergedBasePath.basePath,
+      basePathParameters: mergedBasePath.basePathParameters,
       // Cast grouped servers to Server[] - buildEnvironments.ts handles the grouped structure
       // biome-ignore lint/suspicious/noExplicitAny: Required to preserve grouped server metadata through type system
       servers: mergedServers,
@@ -169594,8 +169618,8 @@ function merge6(ir1, ir22, options2) {
     specVersion: ir1.specVersion ?? ir22.specVersion,
     title: ir1.title ?? ir22.title,
     description: ir1.description ?? ir22.description,
-    basePath: ir1.basePath ?? ir22.basePath,
-    basePathParameters: ir1.basePathParameters ?? ir22.basePathParameters,
+    basePath: mergedBasePath.basePath,
+    basePathParameters: mergedBasePath.basePathParameters,
     servers: dedupeServers([...ir1.servers, ...ir22.servers]),
     websocketServers: [...ir1.websocketServers, ...ir22.websocketServers],
     tags: {
@@ -200071,7 +200095,8 @@ var init_getAPIDefinitionSettings = __esm({
       shouldInferDiscriminatedUnionBaseProperties: "shouldInferDiscriminatedUnionBaseProperties",
       disambiguateRequestNames: "disambiguateRequestNames",
       ignoreTags: "ignoreTags",
-      respectParameterContent: "respectParameterContent"
+      respectParameterContent: "respectParameterContent",
+      respectPerSpecBasePath: "respectPerSpecBasePath"
     };
   }
 });
@@ -264328,7 +264353,8 @@ function parseOpenApiDefinitionSettingsSchema(settings) {
     shouldInferDiscriminatedUnionBaseProperties: settings?.["infer-discriminated-union-base-properties"],
     disambiguateRequestNames: settings?.["disambiguate-request-names"],
     ignoreTags: settings?.["ignore-tags"],
-    respectParameterContent: settings?.["respect-parameter-content"]
+    respectParameterContent: settings?.["respect-parameter-content"],
+    respectPerSpecBasePath: settings?.["respect-per-spec-base-path"]
   };
 }
 function parseAsyncApiDefinitionSettingsSchema(settings) {
@@ -265196,7 +265222,8 @@ var init_convertGeneratorsConfiguration = __esm({
       shouldInferDiscriminatedUnionBaseProperties: void 0,
       disambiguateRequestNames: void 0,
       ignoreTags: void 0,
-      respectParameterContent: void 0
+      respectParameterContent: void 0,
+      respectPerSpecBasePath: void 0
     };
   }
 });
@@ -345486,13 +345513,21 @@ var require_swagger2openapi = __commonJS({
 });
 
 // ../workspace/lazy-fern-workspace/lib/utils/convertOpenAPIV2ToV3.js
-async function convertOpenAPIV2ToV3(openAPI) {
+async function convertOpenAPIV2ToV3(openAPI, options2) {
+  let strictError;
   try {
     const conversionResult = await (0, import_swagger2openapi.convertObj)(openAPI, {});
     return conversionResult.openapi;
-  } catch (e2) {
+  } catch (error50) {
+    strictError = error50;
+  }
+  try {
+    const conversionResult = await (0, import_swagger2openapi.convertObj)(openAPI, { patch: true });
+    options2?.context?.logger.warn(`OpenAPI v2 (Swagger) document is not strictly valid and was converted in lenient (patch) mode: ${strictError instanceof Error ? strictError.message : String(strictError)}`);
+    return conversionResult.openapi;
+  } catch {
     throw new CliError({
-      message: `Failed to convert OpenAPI v2 (Swagger) spec to OpenAPI v3: ${e2 instanceof Error ? e2.message : String(e2)}`,
+      message: `Failed to convert OpenAPI v2 (Swagger) spec to OpenAPI v3: ${strictError instanceof Error ? strictError.message : String(strictError)}`,
       code: CliError.Code.ParseError
     });
   }
@@ -346401,7 +346436,7 @@ var init_OpenAPILoader = __esm({
                 if (!openAPI.schemes || openAPI.schemes.length === 0) {
                   openAPI.schemes = ["https"];
                 }
-                const convertedOpenAPI = await convertOpenAPIV2ToV3(openAPI);
+                const convertedOpenAPI = await convertOpenAPIV2ToV3(openAPI, { context: context3 });
                 return {
                   type: "openapi",
                   value: convertedOpenAPI,
@@ -694858,7 +694893,12 @@ var OpenApiSettingsSchema2 = BaseApiSettingsSchema2.extend({
    * back to a string.
    * Defaults to false.
    */
-  "respect-parameter-content": external_exports.boolean().optional()
+  "respect-parameter-content": external_exports.boolean().optional(),
+  /**
+   * If true, apply each OpenAPI document's plain `x-fern-base-path` to that document's endpoints.
+   * Defaults to false.
+   */
+  "respect-per-spec-base-path": external_exports.boolean().optional()
 });
 
 // ../config/lib/schemas/specs/OpenApiSpecSchema.js
@@ -703447,7 +703487,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.103.0",
+          version: "5.104.1",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -703513,7 +703553,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.103.0",
+        version: "5.104.1",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -710330,7 +710370,8 @@ var LegacyApiSpecAdapter = class {
       shouldInferDiscriminatedUnionBaseProperties: settings.inferDiscriminatedUnionBaseProperties,
       disambiguateRequestNames: settings["disambiguate-request-names"],
       ignoreTags: settings["ignore-tags"],
-      respectParameterContent: settings["respect-parameter-content"]
+      respectParameterContent: settings["respect-parameter-content"],
+      respectPerSpecBasePath: settings["respect-per-spec-base-path"]
     };
     const hasSettings = Object.values(result).some((v3) => v3 != null);
     return hasSettings ? result : void 0;
@@ -884895,7 +884936,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.103.0";
+  const version7 = "5.104.1";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -910981,7 +911022,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.103.0",
+        cliVersion: "5.104.1",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -978352,7 +978393,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.103.0"
+    cli_version: "5.104.1"
   };
 }
 function isAutomationMode() {
@@ -979184,7 +979225,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.103.0";
+    return "5.104.1";
   }
   getCliName() {
     if (false) {

package/package.json

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