@fern-api/fern-api-dev 5.31.0 → 5.32.1

package/cli.cjs

@@ -360347,9 +360347,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.16.1/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.16.0/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.16.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -360917,6 +360917,7 @@ var require_dist14 = __commonJS({
     }
     var import_node_fs32 = require("fs");
     var import_node_path42 = require("path");
+    var import_minimatch8 = require_commonjs3();
     var import_yaml18 = require_dist11();
     var LOCKFILE_HEADER = "# DO NOT EDIT MANUALLY - Managed by Fern Replay\n";
     var LockfileNotFoundError = class extends Error {
@@ -360928,10 +360929,23 @@ var require_dist14 = __commonJS({
     var LockfileManager = class {
       outputDir;
       lock = null;
+      fernignorePatterns = [];
       warnings = [];
       constructor(outputDir) {
         this.outputDir = outputDir;
       }
+      /**
+       * Inform the lockfile of the customer's `.fernignore` patterns so that
+       * `save()` can suppress its "Patch X removed from lockfile" warning when
+       * every file in the stripped patch is already `.fernignore`-protected.
+       * The strip itself still happens (credentials never persist); only the
+       * customer-visible warning is suppressed in that case, because the
+       * protected files survive the generator wipe regardless of whether the
+       * lockfile tracks them, so there's nothing for the customer to action.
+       */
+      setFernignorePatterns(patterns) {
+        this.fernignorePatterns = patterns;
+      }
       get lockfilePath() {
         return (0, import_node_path42.join)(this.outputDir, ".fern", "replay.lock");
       }
@@ -361000,9 +361014,14 @@ var require_dist14 = __commonJS({
             if (sensitiveFiles.length > 0) {
               reasons.push(`sensitive files: ${sensitiveFiles.join(", ")}`);
             }
-            this.warnings.push(
-              `Patch ${patch5.id} removed from lockfile: ${reasons.join("; ")}. This prevents credential exposure in committed lockfiles.`
+            const allProtected = patch5.files.length > 0 && patch5.files.every(
+              (f4) => this.fernignorePatterns.some((p14) => f4 === p14 || (0, import_minimatch8.minimatch)(f4, p14))
             );
+            if (!allProtected) {
+              this.warnings.push(
+                `Patch ${patch5.id} removed from lockfile: ${reasons.join("; ")}. This prevents credential exposure in committed lockfiles.`
+              );
+            }
           } else {
             cleanPatches.push(patch5);
           }
@@ -361875,7 +361894,7 @@ var require_dist14 = __commonJS({
     var import_promises310 = require("fs/promises");
     var import_node_os15 = require("os");
     var import_node_path52 = require("path");
-    var import_minimatch8 = require_commonjs3();
+    var import_minimatch22 = require_commonjs3();
     var MergeAccumulator = class {
       constructor(mode, sharedFiles) {
         this.mode = mode;
@@ -362579,13 +362598,13 @@ var require_dist14 = __commonJS({
       isExcluded(patch5) {
         const config5 = this.lockManager.getCustomizationsConfig();
         if (!config5.exclude) return false;
-        return patch5.files.some((file4) => config5.exclude.some((pattern) => (0, import_minimatch8.minimatch)(file4, pattern)));
+        return patch5.files.some((file4) => config5.exclude.some((pattern) => (0, import_minimatch22.minimatch)(file4, pattern)));
       }
       async resolveFilePath(filePath, baseTreeHash, currentTreeHash) {
         const config5 = this.lockManager.getCustomizationsConfig();
         if (config5.moves) {
           for (const move of config5.moves) {
-            if ((0, import_minimatch8.minimatch)(filePath, move.from) || filePath === move.from) {
+            if ((0, import_minimatch22.minimatch)(filePath, move.from) || filePath === move.from) {
               if (filePath === move.from) {
                 return move.to;
               }
@@ -362872,7 +362891,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
     var import_node_fs210 = require("fs");
     var import_promises610 = require("fs/promises");
     var import_node_path82 = require("path");
-    var import_minimatch32 = require_commonjs3();
+    var import_minimatch42 = require_commonjs3();
     init_GitClient();
     var import_promises410 = require("fs/promises");
     var import_node_os22 = require("os");
@@ -362981,12 +363000,23 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
           unlocatableFiles.push(file4);
           continue;
         }
-        const locInCurrentGen = locInCurrentGenRaw.map(
-          (l9) => resolveSpan(l9, currentGenLines, "old")
-        );
-        const locInWorkingTree = locInWorkingTreeRaw.map(
-          (l9) => resolveSpan(l9, workingTreeLines, "new")
-        );
+        const locInCurrentGen = [];
+        const locInWorkingTree = [];
+        let spanResolutionFailed = false;
+        for (let i9 = 0; i9 < locInCurrentGenRaw.length; i9++) {
+          const cg = resolveSpan(locInCurrentGenRaw[i9], currentGenLines, "old");
+          const wt10 = resolveSpan(locInWorkingTreeRaw[i9], workingTreeLines, "new");
+          if (cg === null || wt10 === null) {
+            spanResolutionFailed = true;
+            break;
+          }
+          locInCurrentGen.push(cg);
+          locInWorkingTree.push(wt10);
+        }
+        if (spanResolutionFailed) {
+          unlocatableFiles.push(file4);
+          continue;
+        }
         const overlay = overlayRegions(
           currentGenLines,
           locInCurrentGen,
@@ -363048,11 +363078,11 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       if (prefer === "old") {
         if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
         if (newFits) return { ...loc, oursSpan: hunk.newCount };
-      } else {
-        if (newFits) return { ...loc, oursSpan: hunk.newCount };
-        if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
+        return loc;
       }
-      return loc;
+      if (newFits) return { ...loc, oursSpan: hunk.newCount };
+      if (oldFits) return { ...loc, oursSpan: hunk.oldCount };
+      return null;
     }
     function sequenceMatches(needle, haystack, offset2) {
       if (offset2 + needle.length > haystack.length) return false;
@@ -363164,7 +363194,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       const trailer = hasTrailingNewline ? "" : "\n\";
       return header + "\n" + body + trailer + "\n";
     }
-    var import_minimatch22 = require_commonjs3();
+    var import_minimatch32 = require_commonjs3();
     var FileOwnership = class {
       constructor(git) {
         this.git = git;
@@ -363188,7 +363218,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         const { file: file4, originalFileName, patch: patch5, currentGenSha, fernignorePatterns, warnedGens, warnings } = ctx;
         if (patch5.user_owned) return true;
         if (file4 === ".fernignore") return true;
-        if (fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch22.minimatch)(file4, p14))) return true;
+        if (fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))) return true;
         if (fileIsCreationInPatchContent(patch5.patch_content, originalFileName ?? file4)) {
           return true;
         }
@@ -363265,6 +363295,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         };
       }
       async apply(_prep) {
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         return firstGenerationReport();
       }
@@ -363321,6 +363352,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         };
       }
       async apply(_prep, options2) {
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         const credentialWarnings = [...this.service.lockManager.warnings];
         if (!options2?.stageOnly) {
@@ -363442,6 +363474,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             this.service.lockManager.addPatch(patch5);
           }
         }
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         this.service.warnings.push(...this.service.lockManager.warnings);
         if (newPatches.length > 0) {
@@ -363602,6 +363635,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
             }
           }
         }
+        this.service.lockManager.setFernignorePatterns(this.service.readFernignorePatterns());
         this.service.lockManager.save();
         this.service.warnings.push(...this.service.lockManager.warnings);
         if (options2?.stageOnly) {
@@ -363833,7 +363867,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
               )
             );
             const hasProtectedFiles = patch5.files.some(
-              (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))
+              (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
             );
             const allUserOwned = isUserOwnedPerFile.every(Boolean);
             if (allUserOwned && patch5.files.length > 0) {
@@ -364273,7 +364307,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
                 );
                 if (snapHasStaleMarkers) continue;
                 const isProtectedSnap = patch5.files.some(
-                  (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))
+                  (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
                 );
                 if (isProtectedSnap) continue;
                 const snapHash = this.detector.computeContentHash(snapshotDiff);
@@ -364293,6 +364327,11 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
                 (files) => this.git.exec(["diff", currentGen, "HEAD", "--", ...files]).catch(() => null)
               );
               if (ppResult === null) continue;
+              if (ppResult.hadFallback) {
+                this.warnings.push(
+                  `Patch ${patch5.id}: couldn't fully isolate ${ppResult.fallbackFiles.join(", ")} \u2014 customization preserved, attribution may have merged with another patch.`
+                );
+              }
               const diff2 = ppResult.diff;
               if (!diff2.trim()) {
                 if (await allPatchFilesUserOwned(patch5)) continue;
@@ -364308,7 +364347,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
                 continue;
               }
               const isProtected = patch5.files.some(
-                (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))
+                (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
               );
               if (isProtected) {
                 continue;
@@ -364380,6 +364419,11 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
               (files) => this.git.exec(["diff", currentGen, "HEAD", "--", ...files]).catch(() => null)
             );
             if (ppResult === null) continue;
+            if (ppResult.hadFallback) {
+              this.warnings.push(
+                `Patch ${patch5.id}: couldn't fully isolate ${ppResult.fallbackFiles.join(", ")} \u2014 customization preserved, attribution may have merged with another patch.`
+              );
+            }
             const diff2 = ppResult.diff;
             if (!diff2.trim()) {
               if (await allPatchFilesUserOwned(patch5)) {
@@ -364467,13 +364511,14 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         if (files.length === 0) return;
         const fernignorePatterns = this.readFernignorePatterns();
         for (const file4 of files) {
-          if (fernignorePatterns.some((pattern) => (0, import_minimatch32.minimatch)(file4, pattern))) continue;
+          if (fernignorePatterns.some((pattern) => (0, import_minimatch42.minimatch)(file4, pattern))) continue;
           try {
             await this.git.exec(["checkout", "HEAD", "--", file4]);
           } catch {
           }
         }
       }
+      /** @internal Used by Flow implementations in `src/flows/`. */
       readFernignorePatterns() {
         const fernignorePath = (0, import_node_path82.join)(this.outputDir, ".fernignore");
         if (!(0, import_node_fs210.existsSync)(fernignorePath)) return [];
@@ -364554,7 +364599,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
     var import_node_crypto22 = require("crypto");
     var import_node_fs33 = require("fs");
     var import_node_path92 = require("path");
-    var import_minimatch42 = require_commonjs3();
+    var import_minimatch52 = require_commonjs3();
     var import_yaml22 = require_dist11();
     var FernignoreMigrator = class {
       git;
@@ -364586,7 +364631,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         const commitsOnly = [];
         const syntheticPatches = [];
         for (const pattern of patterns) {
-          const matchingPatch = patches.find((p14) => p14.files.some((f4) => (0, import_minimatch42.minimatch)(f4, pattern) || f4 === pattern));
+          const matchingPatch = patches.find((p14) => p14.files.some((f4) => (0, import_minimatch52.minimatch)(f4, pattern) || f4 === pattern));
           if (matchingPatch) {
             trackedByBoth.push({
               file: pattern,
@@ -364659,7 +364704,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           fernignoreOnly.push(...remainingFernignoreOnly);
         }
         for (const patch5 of patches) {
-          const hasUnprotectedFiles = patch5.files.some((f4) => !patterns.some((p14) => (0, import_minimatch42.minimatch)(f4, p14) || f4 === p14));
+          const hasUnprotectedFiles = patch5.files.some((f4) => !patterns.some((p14) => (0, import_minimatch52.minimatch)(f4, p14) || f4 === p14));
           if (hasUnprotectedFiles) {
             commitsOnly.push(patch5);
           }
@@ -364671,7 +364716,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         const results = [];
         for (const pattern of patterns) {
           const matching = allFiles.filter(
-            (f4) => (0, import_minimatch42.minimatch)(f4, pattern) || f4 === pattern || f4.startsWith(pattern + "/")
+            (f4) => (0, import_minimatch52.minimatch)(f4, pattern) || f4 === pattern || f4.startsWith(pattern + "/")
           );
           results.push({ pattern, files: matching.length > 0 ? matching : [pattern] });
         }
@@ -364980,7 +365025,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       const normalized = relevantLines.filter((line) => !line.startsWith("index ")).join("\n").replace(/\n-- \n[\d]+\.[\d]+[^\n]*\s*$/, "");
       return `sha256:${(0, import_node_crypto32.createHash)("sha256").update(normalized).digest("hex")}`;
     }
-    var import_minimatch52 = require_commonjs3();
+    var import_minimatch62 = require_commonjs3();
     function parseDiffStat(patchContent) {
       let additions = 0;
       let deletions = 0;
@@ -365010,7 +365055,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
     }
     function matchesPatch(patch5, pattern) {
       const fileMatch = patch5.files.some(
-        (file4) => file4 === pattern || (0, import_minimatch52.minimatch)(file4, pattern)
+        (file4) => file4 === pattern || (0, import_minimatch62.minimatch)(file4, pattern)
       );
       if (fileMatch) return true;
       return patch5.original_message.toLowerCase().includes(pattern.toLowerCase());
@@ -567335,6 +567380,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),
@@ -571544,8 +571590,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);
@@ -572136,34 +572194,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) {
@@ -573243,6 +573302,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);
   }
@@ -573367,6 +573442,7 @@ var FernDefinitionBuilderImpl = class {
   rootApiFile;
   packageMarkerFile = {};
   basePath = void 0;
+  rootPathParameters = void 0;
   constructor(enableUniqueErrorsPerEndpoint) {
     this.enableUniqueErrorsPerEndpoint = enableUniqueErrorsPerEndpoint;
     this.root = new FernDefinitionDirectory();
@@ -573431,6 +573507,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;
   }
@@ -573663,7 +573745,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,
@@ -573694,6 +573778,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,
@@ -574780,6 +574869,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,
@@ -574864,31 +575108,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");
@@ -585164,11 +585383,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({
@@ -585479,6 +585693,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;
@@ -585706,7 +585931,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]) => {
@@ -585898,6 +586133,7 @@ function parse8({ context: context3, documents, options: options2 }) {
     title: void 0,
     description: void 0,
     basePath: void 0,
+    basePathParameters: void 0,
     servers: [],
     websocketServers: [],
     tags: {
@@ -586113,6 +586349,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: {
@@ -586243,6 +586480,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,
@@ -586295,6 +586533,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: {
@@ -606419,17 +606658,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}`;
@@ -653738,6 +653976,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";
@@ -653746,20 +653985,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 {
@@ -657023,9 +657350,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() {
@@ -657264,6 +657626,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 {
@@ -668069,7 +668443,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.31.0",
+          version: "5.32.1",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -668133,7 +668507,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.31.0",
+        version: "5.32.1",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -859909,7 +860283,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.31.0";
+  const version7 = "5.32.1";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -878741,7 +879115,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.31.0",
+        cliVersion: "5.32.1",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -953151,7 +953525,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.31.0"
+    cli_version: "5.32.1"
   };
 }
 function isAutomationMode() {
@@ -953977,7 +954351,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.31.0";
+    return "5.32.1";
   }
   getCliName() {
     if (false) {

package/package.json

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