@fern-api/fern-api-dev 5.30.4 → 5.32.0

package/cli.cjs

@@ -537109,6 +537109,7 @@ var Package = schemas_exports3.objectWithoutOptionalProperties({
   websocket: WebSocketChannelId.optional(),
   subpackages: schemas_exports3.list(SubpackageId),
   hasEndpointsInTree: schemas_exports3.boolean(),
+  hasWebSocketInTree: schemas_exports3.boolean().optional(),
   navigationConfig: PackageNavigationConfig.optional()
 }).extend(WithDocs);
 
@@ -567334,6 +567335,7 @@ var OpenApiIntermediateRepresentation = schemas_exports9.objectWithoutOptionalPr
   title: schemas_exports9.string().optional(),
   description: schemas_exports9.string().optional(),
   basePath: schemas_exports9.string().optional(),
+  basePathParameters: schemas_exports9.list(PathParameter2).optional(),
   servers: schemas_exports9.list(Server),
   websocketServers: schemas_exports9.list(Server),
   groups: schemas_exports9.record(schemas_exports9.string(), SdkGroupInfo),
@@ -571543,8 +571545,20 @@ function buildEndpointExample({ endpointExample, context: context3 }) {
   if (endpointExample.description != null) {
     example.docs = endpointExample.description;
   }
+  const pathParametersForExample = {};
+  if (context3.ir.basePathParameters != null) {
+    for (const param of context3.ir.basePathParameters) {
+      const value2 = param.clientDefault ?? param.name;
+      if (typeof value2 === "string" || typeof value2 === "number" || typeof value2 === "boolean") {
+        pathParametersForExample[param.name] = value2;
+      }
+    }
+  }
   if (endpointExample.pathParameters != null && endpointExample.pathParameters.length > 0) {
-    example["path-parameters"] = convertPathParameterExample(endpointExample.pathParameters);
+    Object.assign(pathParametersForExample, convertPathParameterExample(endpointExample.pathParameters));
+  }
+  if (Object.keys(pathParametersForExample).length > 0) {
+    example["path-parameters"] = pathParametersForExample;
   }
   if (endpointExample.queryParameters != null && endpointExample.queryParameters.length > 0) {
     example["query-parameters"] = convertQueryParameterExample2(endpointExample.queryParameters);
@@ -572135,34 +572149,35 @@ function getRequest({ endpoint: endpoint3, declarationFile, context: context3, r
         declarationDepth: 0,
         variant
       });
-      const convertedRequest = {
-        schemaIdsToExclude: [],
-        value: {
-          body: requestTypeReference
-        }
+      const requestValue = {
+        body: requestTypeReference
       };
       const hasPathParams = Object.keys(pathParameters ?? {}).length > 0;
       const hasQueryParams = Object.keys(queryParameters ?? {}).length > 0;
       const hasHeaders = Object.keys(headers2 ?? {}).length > 0;
       if (hasPathParams) {
-        convertedRequest.value["path-parameters"] = pathParameters;
+        requestValue["path-parameters"] = pathParameters;
       }
       if (hasQueryParams) {
-        convertedRequest.value["query-parameters"] = queryParameters;
+        requestValue["query-parameters"] = queryParameters;
       }
       if (hasHeaders) {
-        convertedRequest.value.headers = headers2;
+        requestValue.headers = headers2;
       }
       if (hasPathParams || hasQueryParams || hasHeaders) {
-        convertedRequest.value.name = requestNameOverride ?? generatedRequestName;
+        requestValue.name = requestNameOverride ?? generatedRequestName;
       }
       if (request7.contentType != null) {
-        convertedRequest.value["content-type"] = request7.contentType;
+        requestValue["content-type"] = request7.contentType;
       }
       if (request7.description != null) {
-        convertedRequest.value.docs = request7.description;
+        requestValue.docs = request7.description;
       }
-      return convertedRequest;
+      const canCollapse = typeof requestValue.body === "string" && requestValue["path-parameters"] == null && requestValue["query-parameters"] == null && requestValue.headers == null && requestValue.name == null && requestValue.docs == null && (requestValue["content-type"] == null || requestValue["content-type"] === "application/json");
+      return {
+        schemaIdsToExclude: [],
+        value: canCollapse ? requestValue.body : requestValue
+      };
     }
     const propertyToDeclarationFile = /* @__PURE__ */ new Map();
     for (const allOfRef of resolvedSchema.allOf) {
@@ -573242,6 +573257,22 @@ function buildFernDefinition(context3) {
   if (context3.ir.basePath != null) {
     context3.builder.setBasePath(context3.ir.basePath);
   }
+  if (context3.ir.basePathParameters != null && context3.ir.basePathParameters.length > 0) {
+    const params2 = {};
+    for (const p14 of context3.ir.basePathParameters) {
+      const entry = {
+        type: "string"
+      };
+      if (p14.description != null) {
+        entry.docs = p14.description;
+      }
+      if (p14.clientDefault != null) {
+        entry["client-default"] = p14.clientDefault;
+      }
+      params2[p14.name] = entry;
+    }
+    context3.builder.setRootPathParameters(params2);
+  }
   if (context3.ir.hasEndpointsMarkedInternal) {
     context3.builder.addAudience(EXTERNAL_AUDIENCE);
   }
@@ -573366,6 +573397,7 @@ var FernDefinitionBuilderImpl = class {
   rootApiFile;
   packageMarkerFile = {};
   basePath = void 0;
+  rootPathParameters = void 0;
   constructor(enableUniqueErrorsPerEndpoint) {
     this.enableUniqueErrorsPerEndpoint = enableUniqueErrorsPerEndpoint;
     this.root = new FernDefinitionDirectory();
@@ -573430,6 +573462,12 @@ var FernDefinitionBuilderImpl = class {
   setBasePath(basePath) {
     this.basePath = basePath;
   }
+  setRootPathParameters(parameters2) {
+    if (Object.keys(parameters2).length === 0) {
+      return;
+    }
+    this.rootPathParameters = parameters2;
+  }
   setApiVersion(apiVersionScheme) {
     this.rootApiFile.version = apiVersionScheme;
   }
@@ -573662,7 +573700,9 @@ var FernDefinitionBuilderImpl = class {
   build() {
     const definitionFiles = this.root.getAllFiles();
     const basePath = this.basePath;
-    if (basePath != null) {
+    const rootPathParameters = this.rootPathParameters;
+    const shouldInline = basePath != null && rootPathParameters == null && !basePath.includes("{");
+    if (basePath != null && shouldInline) {
       if (this.packageMarkerFile.service != null) {
         this.packageMarkerFile.service = {
           ...this.packageMarkerFile.service,
@@ -573693,6 +573733,11 @@ var FernDefinitionBuilderImpl = class {
           };
         }
       }
+    } else if (basePath != null) {
+      this.rootApiFile["base-path"] = basePath;
+      if (rootPathParameters != null) {
+        this.rootApiFile["path-parameters"] = rootPathParameters;
+      }
     }
     const definition3 = {
       rootApiFile: this.rootApiFile,
@@ -574779,6 +574824,161 @@ var FernOpenAPIExtension = {
   FERN_DEFAULT: "x-fern-default"
 };
 
+// ../api-importers/openapi/openapi-ir-parser/lib/getExtension.js
+init_lodash();
+function getExtension(object23, extension4) {
+  const extensions2 = Array.isArray(extension4) ? extension4 : [extension4];
+  for (const extension5 of extensions2) {
+    const extensionValue = object23[extension5];
+    if (extensionValue != null) {
+      return extensionValue;
+    }
+  }
+  return void 0;
+}
+function getExtensionAndValidate(object23, extension4, schema2, logger4, breadcrumbs = []) {
+  try {
+    const extensionValue = getExtension(object23, extension4);
+    if (extensionValue != null) {
+      return schema2.parse(extensionValue);
+    }
+  } catch (e8) {
+    const breadcrumb = compact_default(breadcrumbs).join(" -> ");
+    logger4.error(`${breadcrumb.length > 0 ? `${breadcrumb}: ` : ""}Failed to parse ${extension4}`);
+  }
+  return void 0;
+}
+
+// ../api-importers/openapi/openapi-ir-parser/lib/openapi/v3/extensions/getFernBasePath.js
+var PLACEHOLDER_REGEX = /\{([^}]+)\}/g;
+function getFernBasePath(document4) {
+  const raw = getExtension(document4, FernOpenAPIExtension.BASE_PATH);
+  if (raw == null) {
+    return void 0;
+  }
+  if (typeof raw === "string") {
+    if (!raw.startsWith("/")) {
+      return void 0;
+    }
+    return { basePath: raw, pathParameters: [], pathsIncludeBasePath: false };
+  }
+  if (typeof raw !== "object" || Array.isArray(raw)) {
+    return void 0;
+  }
+  const obj = raw;
+  const path113 = obj["path"];
+  if (typeof path113 !== "string" || !path113.startsWith("/")) {
+    return void 0;
+  }
+  const placeholders = extractPlaceholders(path113);
+  const rawParameters = obj["parameters"];
+  const parametersMap = rawParameters != null && typeof rawParameters === "object" && !Array.isArray(rawParameters) ? rawParameters : {};
+  const pathParameters = [];
+  for (const name2 of placeholders) {
+    const entry = parametersMap[name2];
+    const docs2 = typeof entry === "object" && entry != null && !Array.isArray(entry) ? typeof entry["docs"] === "string" ? entry["docs"] : void 0 : void 0;
+    const clientDefault = typeof entry === "object" && entry != null && !Array.isArray(entry) ? entry["default"] : void 0;
+    pathParameters.push({
+      name: name2,
+      schema: Schema.primitive({
+        description: docs2,
+        availability: void 0,
+        schema: PrimitiveSchemaValue.string({
+          default: void 0,
+          pattern: void 0,
+          format: void 0,
+          minLength: void 0,
+          maxLength: void 0
+        }),
+        generatedName: name2,
+        nameOverride: void 0,
+        title: void 0,
+        namespace: void 0,
+        groupName: void 0
+      }),
+      description: docs2,
+      availability: void 0,
+      source: void 0,
+      variableReference: void 0,
+      parameterNameOverride: void 0,
+      clientDefault
+    });
+  }
+  const pathsIncludeBasePath = obj["paths-include-base-path"] === true;
+  return { basePath: path113, pathParameters, pathsIncludeBasePath };
+}
+function extractPlaceholders(path113) {
+  const result = [];
+  const regex5 = new RegExp(PLACEHOLDER_REGEX.source, "g");
+  let match3;
+  while ((match3 = regex5.exec(path113)) != null) {
+    if (match3[1] != null && !result.includes(match3[1])) {
+      result.push(match3[1]);
+    }
+  }
+  return result;
+}
+function stripBasePathFromPaths({ openApi, basePath, rootPathParameterNames }) {
+  if (openApi.paths == null) {
+    return [];
+  }
+  const trimmedBasePath = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
+  const errors4 = [];
+  const newPaths = {};
+  for (const [path113, pathItem] of Object.entries(openApi.paths)) {
+    if (pathItem == null) {
+      newPaths[path113] = pathItem;
+      continue;
+    }
+    if (!path113.startsWith(trimmedBasePath)) {
+      errors4.push(`Expected path '${path113}' to start with base path '${trimmedBasePath}'`);
+      newPaths[path113] = pathItem;
+      continue;
+    }
+    const stripped = path113.slice(trimmedBasePath.length) || "/";
+    const newPathItem = stripPathParametersFromPathItem({
+      pathItem,
+      rootPathParameterNames
+    });
+    newPaths[stripped] = newPathItem;
+  }
+  openApi.paths = newPaths;
+  return errors4;
+}
+function stripPathParametersFromPathItem({ pathItem, rootPathParameterNames }) {
+  const result = { ...pathItem };
+  if (Array.isArray(result.parameters)) {
+    result.parameters = result.parameters.filter((p14) => !isStrippablePathParameter(p14, rootPathParameterNames));
+  }
+  const operationKeys = [
+    "get",
+    "put",
+    "post",
+    "delete",
+    "options",
+    "head",
+    "patch",
+    "trace"
+  ];
+  for (const opKey of operationKeys) {
+    const op4 = result[opKey];
+    if (op4 == null || !Array.isArray(op4.parameters)) {
+      continue;
+    }
+    result[opKey] = {
+      ...op4,
+      parameters: op4.parameters.filter((p14) => !isStrippablePathParameter(p14, rootPathParameterNames))
+    };
+  }
+  return result;
+}
+function isStrippablePathParameter(parameter6, rootPathParameterNames) {
+  if ("$ref" in parameter6) {
+    return false;
+  }
+  return parameter6.in === "path" && rootPathParameterNames.has(parameter6.name);
+}
+
 // ../api-importers/openapi/openapi-ir-parser/lib/options.js
 var DEFAULT_PARSE_OPENAPI_SETTINGS = {
   disableExamples: false,
@@ -574863,31 +575063,6 @@ init_lib6();
 init_lib6();
 init_lodash();
 
-// ../api-importers/openapi/openapi-ir-parser/lib/getExtension.js
-init_lodash();
-function getExtension(object23, extension4) {
-  const extensions2 = Array.isArray(extension4) ? extension4 : [extension4];
-  for (const extension5 of extensions2) {
-    const extensionValue = object23[extension5];
-    if (extensionValue != null) {
-      return extensionValue;
-    }
-  }
-  return void 0;
-}
-function getExtensionAndValidate(object23, extension4, schema2, logger4, breadcrumbs = []) {
-  try {
-    const extensionValue = getExtension(object23, extension4);
-    if (extensionValue != null) {
-      return schema2.parse(extensionValue);
-    }
-  } catch (e8) {
-    const breadcrumb = compact_default(breadcrumbs).join(" -> ");
-    logger4.error(`${breadcrumb.length > 0 ? `${breadcrumb}: ` : ""}Failed to parse ${extension4}`);
-  }
-  return void 0;
-}
-
 // ../api-importers/openapi/openapi-ir-parser/lib/openapi/v3/extensions/getExamples.js
 function getExamples(schema2) {
   const examples = getExtension(schema2, "examples");
@@ -585163,11 +585338,6 @@ function getScopes(oauthSecurityScheme, source2) {
   return void 0;
 }
 
-// ../api-importers/openapi/openapi-ir-parser/lib/openapi/v3/extensions/getFernBasePath.js
-function getFernBasePath(parameter6) {
-  return getExtension(parameter6, FernOpenAPIExtension.BASE_PATH);
-}
-
 // ../api-importers/openapi/openapi-ir-parser/lib/openapi/v3/extensions/getFernGroups.js
 init_zod();
 var XFernGroupsSchema = external_exports2.record(external_exports2.string(), external_exports2.object({
@@ -585478,6 +585648,17 @@ function generateIr({ openApi, taskContext, options: options2, source: source2,
   if (context3.filter.hasEndpoints()) {
     taskContext.logger.debug("Endpoint filter applied...");
   }
+  const fernBasePathParsed = getFernBasePath(openApi);
+  if (fernBasePathParsed?.pathsIncludeBasePath) {
+    const stripErrors = stripBasePathFromPaths({
+      openApi,
+      basePath: fernBasePathParsed.basePath,
+      rootPathParameterNames: new Set(fernBasePathParsed.pathParameters.map((p14) => p14.name))
+    });
+    for (const message of stripErrors) {
+      taskContext.logger.warn(message);
+    }
+  }
   Object.entries(openApi.paths ?? {}).forEach(([path113, pathItem]) => {
     if (pathItem == null) {
       return;
@@ -585705,7 +585886,17 @@ function generateIr({ openApi, taskContext, options: options2, source: source2,
       context: context3,
       document: openApi
     }),
-    basePath: getFernBasePath(openApi),
+    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;
+    })(),
     title: openApi.info.title ?? "",
     description: openApi.info.description,
     groups: Object.fromEntries(Object.entries(groupInfo ?? {}).map(([key2, value2]) => {
@@ -585897,6 +586088,7 @@ function parse8({ context: context3, documents, options: options2 }) {
     title: void 0,
     description: void 0,
     basePath: void 0,
+    basePathParameters: void 0,
     servers: [],
     websocketServers: [],
     tags: {
@@ -586112,6 +586304,7 @@ function merge7(ir1, ir23, options2) {
       title: ir1.title ?? ir23.title,
       description: ir1.description ?? ir23.description,
       basePath: ir1.basePath ?? ir23.basePath,
+      basePathParameters: ir1.basePathParameters ?? ir23.basePathParameters,
       servers: [...ir1.servers, ...ir23.servers],
       websocketServers: [...ir1.websocketServers, ...ir23.websocketServers],
       tags: {
@@ -586242,6 +586435,7 @@ function merge7(ir1, ir23, options2) {
       title: ir1.title ?? ir23.title,
       description: ir1.description ?? ir23.description,
       basePath: ir1.basePath ?? ir23.basePath,
+      basePathParameters: ir1.basePathParameters ?? ir23.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,
@@ -586294,6 +586488,7 @@ function merge7(ir1, ir23, options2) {
     title: ir1.title ?? ir23.title,
     description: ir1.description ?? ir23.description,
     basePath: ir1.basePath ?? ir23.basePath,
+    basePathParameters: ir1.basePathParameters ?? ir23.basePathParameters,
     servers: [...ir1.servers, ...ir23.servers],
     websocketServers: [...ir1.websocketServers, ...ir23.websocketServers],
     tags: {
@@ -602931,6 +603126,7 @@ function mergeIntermediateRepresentation(ir1, ir23, casingsGenerator) {
       webhooks: ir1.rootPackage.webhooks ?? ir23.rootPackage.webhooks,
       websocket: ir1.rootPackage.websocket ?? ir23.rootPackage.websocket,
       hasEndpointsInTree: ir1.rootPackage.hasEndpointsInTree || ir23.rootPackage.hasEndpointsInTree,
+      hasWebSocketInTree: (ir1.rootPackage.hasWebSocketInTree ?? false) || (ir23.rootPackage.hasWebSocketInTree ?? false) || void 0,
       navigationConfig: ir1.rootPackage.navigationConfig ?? ir23.rootPackage.navigationConfig,
       docs: ir1.rootPackage.docs ?? ir23.rootPackage.docs
     },
@@ -602963,6 +603159,7 @@ function mergeSubpackages(subpackages1, subpackages2) {
         displayName: subpackage.displayName,
         fernFilepath: subpackage.fernFilepath,
         hasEndpointsInTree: mergedSubpackages[subpackageId].hasEndpointsInTree || subpackage.hasEndpointsInTree,
+        hasWebSocketInTree: (mergedSubpackages[subpackageId].hasWebSocketInTree ?? false) || (subpackage.hasWebSocketInTree ?? false) || void 0,
         navigationConfig: mergedSubpackages[subpackageId].navigationConfig ?? subpackage.navigationConfig,
         docs: mergedSubpackages[subpackageId].docs ?? subpackage.docs,
         service: mergedSubpackages[subpackageId].service ?? subpackage.service,
@@ -606416,17 +606613,16 @@ function convertExampleResponseBody({ endpoint: endpoint3, example, typeResolver
     workspace
   });
 }
-function buildUrl({ file: file4, service, endpoint: endpoint3, example, pathParams }) {
+function buildUrl({ file: file4, service, endpoint: endpoint3, pathParams }) {
   let url3 = (0, import_url_join6.default)(file4.rootApiFile["base-path"] ?? "", service["base-path"], endpoint3.path);
-  if (example["path-parameters"] != null) {
-    for (const parameter6 of [
-      ...pathParams.endpointPathParameters,
-      ...pathParams.servicePathParameters,
-      ...pathParams.rootPathParameters
-    ]) {
-      url3 = url3.replaceAll(`{${getOriginalName(parameter6.name)}}`, encodeURIComponent(`${parameter6.value.jsonExample}`));
-    }
+  for (const parameter6 of [
+    ...pathParams.endpointPathParameters,
+    ...pathParams.servicePathParameters,
+    ...pathParams.rootPathParameters
+  ]) {
+    url3 = url3.replaceAll(`{${getOriginalName(parameter6.name)}}`, encodeURIComponent(`${parameter6.value.jsonExample}`));
   }
+  url3 = url3.replace(/\{([^}]+)\}/g, (_7, name2) => encodeURIComponent(name2));
   url3 = url3.replaceAll("//", "/");
   if (!url3.startsWith("/")) {
     url3 = `/${url3}`;
@@ -610163,14 +610359,17 @@ var PackageTreeGenerator = class {
       };
     }
     const allSubpackagesWithEndpoints = new Set(this.getAllChildrenWithEndpoints(this.rootPackage));
+    const allSubpackagesWithWebSocket = new Set(this.getAllChildrenWithWebSocket(this.rootPackage));
     return {
       subpackages: mapValues_default(this.subpackages, (subpackage, subpackageId) => ({
         ...subpackage,
-        hasEndpointsInTree: allSubpackagesWithEndpoints.has(subpackageId)
+        hasEndpointsInTree: allSubpackagesWithEndpoints.has(subpackageId),
+        hasWebSocketInTree: allSubpackagesWithWebSocket.has(subpackageId) || subpackage.websocket != null
       })),
       rootPackage: {
         ...this.rootPackage,
-        hasEndpointsInTree: allSubpackagesWithEndpoints.size > 0 || this.rootPackage.service != null
+        hasEndpointsInTree: allSubpackagesWithEndpoints.size > 0 || this.rootPackage.service != null,
+        hasWebSocketInTree: allSubpackagesWithWebSocket.size > 0 || this.rootPackage.websocket != null || Object.values(this.subpackages).some((s9) => s9.websocket != null)
       }
     };
   }
@@ -610215,6 +610414,22 @@ var PackageTreeGenerator = class {
       return [...this.getAllSubpackagesWithEndpoints(child)];
     });
   }
+  getAllSubpackagesWithWebSocket(root6) {
+    const subpackage = this.subpackages[root6];
+    if (subpackage == null) {
+      throw new CliError({ message: "Subpackage does not exist: " + root6, code: CliError.Code.ResolutionError });
+    }
+    const subpackagesWithWebSocket = this.getAllChildrenWithWebSocket(subpackage);
+    if (subpackagesWithWebSocket.length > 0 || subpackage.websocket != null) {
+      subpackagesWithWebSocket.push(root6);
+    }
+    return subpackagesWithWebSocket;
+  }
+  getAllChildrenWithWebSocket(package_) {
+    return package_.subpackages.flatMap((child) => {
+      return [...this.getAllSubpackagesWithWebSocket(child)];
+    });
+  }
   getPackageForFernFilepath(fernFilepath, index3 = 0, parent = this.rootPackage) {
     const nextPart = fernFilepath.allParts[index3];
     if (nextPart == null) {
@@ -647779,6 +647994,7 @@ var AbstractSpecConverter = class extends AbstractConverter {
       webhooks: void 0,
       websocket: void 0,
       hasEndpointsInTree: false,
+      hasWebSocketInTree: void 0,
       navigationConfig: void 0
     };
   }
@@ -653715,6 +653931,7 @@ init_lib8();
 var import_openapi_types2 = __toESM(require_dist10(), 1);
 
 // ../api-importers/openapi-to-ir/lib/extensions/x-fern-base-path.js
+var PLACEHOLDER_REGEX2 = /\{([^}]+)\}/g;
 var FernBasePathExtension = class extends AbstractExtension {
   document;
   key = "x-fern-base-path";
@@ -653723,20 +653940,108 @@ var FernBasePathExtension = class extends AbstractExtension {
     this.document = document4;
   }
   convert() {
-    const extensionValue = this.getExtensionValue(this.document);
-    if (extensionValue == null) {
+    const value2 = this.getExtensionValue(this.document);
+    if (value2 == null) {
       return void 0;
     }
-    if (typeof extensionValue !== "string") {
+    if (typeof value2 === "string") {
+      return this.parseString(value2);
+    }
+    if (typeof value2 === "object" && !Array.isArray(value2)) {
+      return this.parseStructured(value2);
+    }
+    this.context.errorCollector.collect({
+      message: "Expected `x-fern-base-path` to be a string or object",
+      path: this.breadcrumbs
+    });
+    return void 0;
+  }
+  parseString(path113) {
+    if (!this.validatePath(path113)) {
+      return void 0;
+    }
+    return { path: path113, parameters: [], pathsIncludeBasePath: false };
+  }
+  parseStructured(obj) {
+    const path113 = obj["path"];
+    if (typeof path113 !== "string") {
       this.context.errorCollector.collect({
-        message: "Received unexpected non-string value for x-fern-base-path",
+        message: "`x-fern-base-path.path` must be a string",
         path: this.breadcrumbs
       });
       return void 0;
     }
-    return extensionValue;
+    if (!this.validatePath(path113)) {
+      return void 0;
+    }
+    const placeholders = extractPlaceholders2(path113);
+    const rawParameters = obj["parameters"];
+    if (rawParameters != null && (typeof rawParameters !== "object" || Array.isArray(rawParameters))) {
+      this.context.errorCollector.collect({
+        message: "`x-fern-base-path.parameters` must be an object map",
+        path: [...this.breadcrumbs, "parameters"]
+      });
+      return void 0;
+    }
+    const parametersMap = rawParameters ?? {};
+    for (const name2 of Object.keys(parametersMap)) {
+      if (!placeholders.has(name2)) {
+        this.context.errorCollector.collect({
+          message: `Parameter '${name2}' does not appear in the base path '${path113}'`,
+          path: [...this.breadcrumbs, "parameters", name2]
+        });
+        return void 0;
+      }
+    }
+    const parameters2 = [];
+    for (const name2 of placeholders) {
+      const raw = parametersMap[name2];
+      if (raw == null) {
+        parameters2.push({ name: name2, type: "string", default: void 0, docs: void 0 });
+        continue;
+      }
+      if (typeof raw !== "object" || Array.isArray(raw)) {
+        this.context.errorCollector.collect({
+          message: `Parameter '${name2}' must be an object`,
+          path: [...this.breadcrumbs, "parameters", name2]
+        });
+        return void 0;
+      }
+      const entry = raw;
+      const type8 = typeof entry["type"] === "string" ? entry["type"] : "string";
+      const docs2 = typeof entry["docs"] === "string" ? entry["docs"] : void 0;
+      parameters2.push({
+        name: name2,
+        type: type8,
+        default: entry["default"],
+        docs: docs2
+      });
+    }
+    const pathsIncludeBasePath = obj["paths-include-base-path"] === true;
+    return { path: path113, parameters: parameters2, pathsIncludeBasePath };
+  }
+  validatePath(path113) {
+    if (!path113.startsWith("/")) {
+      this.context.errorCollector.collect({
+        message: "`x-fern-base-path` path must start with '/'",
+        path: this.breadcrumbs
+      });
+      return false;
+    }
+    return true;
   }
 };
+function extractPlaceholders2(path113) {
+  const result = /* @__PURE__ */ new Set();
+  let match3;
+  const regex5 = new RegExp(PLACEHOLDER_REGEX2.source, "g");
+  while ((match3 = regex5.exec(path113)) != null) {
+    if (match3[1] != null) {
+      result.add(match3[1]);
+    }
+  }
+  return result;
+}
 
 // ../api-importers/openapi-to-ir/lib/extensions/x-fern-global-headers.js
 var FernGlobalHeadersExtension = class extends AbstractExtension {
@@ -657000,9 +657305,44 @@ var OpenAPIConverter = class extends AbstractSpecConverter {
       document: this.context.spec,
       context: this.context
     });
-    const basePath = basePathExtension.convert();
-    if (basePath != null) {
-      this.ir.basePath = constructHttpPath(basePath);
+    const parsed = basePathExtension.convert();
+    if (parsed == null) {
+      return;
+    }
+    this.ir.basePath = constructHttpPath(parsed.path);
+    for (const param of parsed.parameters) {
+      if (param.type !== "string") {
+        this.context.errorCollector.collect({
+          message: `x-fern-base-path parameter '${param.name}' uses type '${param.type}' which is not yet supported; treating as string`,
+          path: ["x-fern-base-path", "parameters", param.name]
+        });
+      }
+      this.ir.pathParameters.push({
+        name: this.context.casingsGenerator.generateName(param.name),
+        valueType: AbstractConverter.STRING,
+        docs: param.docs,
+        location: api_exports.PathParameterLocation.Root,
+        variable: void 0,
+        clientDefault: convertExtensionDefaultToLiteral(param.default),
+        v2Examples: {
+          userSpecifiedExamples: {},
+          autogeneratedExamples: {}
+        },
+        explode: void 0
+      });
+    }
+    if (parsed.pathsIncludeBasePath) {
+      const stripErrors = stripBasePathFromPaths({
+        openApi: this.context.spec,
+        basePath: parsed.path,
+        rootPathParameterNames: new Set(parsed.parameters.map((p14) => p14.name))
+      });
+      for (const message of stripErrors) {
+        this.context.errorCollector.collect({
+          message,
+          path: ["x-fern-base-path", "paths-include-base-path"]
+        });
+      }
     }
   }
   convertSecuritySchemes() {
@@ -657241,6 +657581,18 @@ var OpenAPIConverter = class extends AbstractSpecConverter {
     }
   }
 };
+function convertExtensionDefaultToLiteral(value2) {
+  if (value2 == null) {
+    return void 0;
+  }
+  if (typeof value2 === "string") {
+    return Literal.string(value2);
+  }
+  if (typeof value2 === "boolean") {
+    return Literal.boolean(value2);
+  }
+  return void 0;
+}
 
 // ../api-importers/openapi-to-ir/lib/extensions/x-display-name.js
 var DisplayNameExtension2 = class extends AbstractExtension {
@@ -668046,7 +668398,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.30.4",
+          version: "5.32.0",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -668110,7 +668462,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.30.4",
+        version: "5.32.0",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -812494,10 +812846,10 @@ var V67_TO_V66_MIGRATION = {
   laterVersion: "v67",
   earlierVersion: "v66",
   firstGeneratorVersionToConsumeNewIR: {
-    [GeneratorName.TYPESCRIPT_NODE_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.TYPESCRIPT_BROWSER_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.TYPESCRIPT]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.TYPESCRIPT_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
+    [GeneratorName.TYPESCRIPT_NODE_SDK]: "3.70.9-rc.0",
+    [GeneratorName.TYPESCRIPT_BROWSER_SDK]: "3.70.9-rc.0",
+    [GeneratorName.TYPESCRIPT]: "3.70.9-rc.0",
+    [GeneratorName.TYPESCRIPT_SDK]: "3.70.9-rc.0",
     [GeneratorName.TYPESCRIPT_EXPRESS]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.JAVA]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.JAVA_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
@@ -812507,7 +812859,7 @@ var V67_TO_V66_MIGRATION = {
     [GeneratorName.OPENAPI]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.PYTHON_FASTAPI]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.PYTHON_PYDANTIC]: GeneratorWasNeverUpdatedToConsumeNewIR,
-    [GeneratorName.PYTHON_SDK]: GeneratorWasNeverUpdatedToConsumeNewIR,
+    [GeneratorName.PYTHON_SDK]: "5.13.1-rc.0",
     [GeneratorName.STOPLIGHT]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.POSTMAN]: GeneratorWasNeverUpdatedToConsumeNewIR,
     [GeneratorName.GO_MODEL]: GeneratorWasNeverUpdatedToConsumeNewIR,
@@ -859886,7 +860238,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.30.4";
+  const version7 = "5.32.0";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -878718,7 +879070,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.30.4",
+        cliVersion: "5.32.0",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -953128,7 +953480,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.30.4"
+    cli_version: "5.32.0"
   };
 }
 function isAutomationMode() {
@@ -953954,7 +954306,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.30.4";
+    return "5.32.0";
   }
   getCliName() {
     if (false) {

package/package.json

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