@fern-api/fern-api-dev 5.65.3 → 5.65.5

package/cli.cjs

@@ -145267,7 +145267,6 @@ function buildEndpoint({ endpoint: endpoint3, declarationFile, context: context3
       fileContainingReference: declarationFile,
       namespace: maybeEndpointNamespace
     });
-    names2.add(pathParameter.name);
   }
   const queryParameters = {};
   for (const queryParameter of endpoint3.queryParameters) {
@@ -450039,6 +450038,13 @@ function parseImagePaths(markdown, metadata, context3) {
   }
   visitFrontmatterImages(data2, ["image", "og:image", "og:logo", "twitter:image"], mapImage);
   replaceFrontmatterImagesforLogo(data2, mapImage);
+  const hasImageIndicators = content5.includes("![") || content5.includes("src=") || content5.includes("icon=");
+  if (!hasImageIndicators) {
+    return {
+      filepaths: [...filepaths],
+      markdown: requoteLeadingZeroValues(import_gray_matter3.default.stringify(content5, data2))
+    };
+  }
   const contentBytes = Buffer.byteLength(content5, "utf8");
   const isLargeFile = contentBytes > getLargeFileBytes();
   let replacedContent;
@@ -450238,142 +450244,208 @@ function replaceImagePathsAndUrls(markdown, fileIdsMap, markdownFilesToPathName,
   }
   visitFrontmatterImages(data2, ["image", "og:image", "og:logo", "twitter:image"], mapImage);
   replaceFrontmatterImagesforLogo(data2, mapImage);
-  const contentBytes = Buffer.byteLength(content5, "utf8");
-  const isLargeFile = contentBytes > getLargeFileBytes();
-  let replacedContent;
-  if (isLargeFile) {
-    context3.logger.debug(`Using streaming parser for large file replacement: ${metadata.absolutePathToMarkdownFile} (${(contentBytes / 1024 / 1024).toFixed(2)} MB)`);
-    const streamingStart = performance.now();
-    const edits = [];
-    let i5 = 0;
-    const len = content5.length;
-    while (i5 < len) {
-      if (content5[i5] === "!" && content5[i5 + 1] === "[") {
-        const result = parseMarkdownImage(content5, i5, metadata);
-        if (result) {
-          const imageSrc = mapImage(result.src);
-          if (imageSrc) {
-            edits.push({
-              start: result.edit.start,
-              end: result.edit.end,
-              replacement: result.originalUrl.replace(result.rawSrc, imageSrc)
-            });
-          }
-          i5 = result.nextIndex;
-          continue;
+  const edits = [];
+  let hasUnhandledExpressions = false;
+  let i5 = 0;
+  const len = content5.length;
+  while (i5 < len) {
+    if (content5[i5] === "!" && content5[i5 + 1] === "[") {
+      const result = parseMarkdownImage(content5, i5, metadata);
+      if (result) {
+        const imageSrc = mapImage(result.src);
+        if (imageSrc) {
+          edits.push({
+            start: result.edit.start,
+            end: result.edit.end,
+            replacement: result.originalUrl.replace(result.rawSrc, imageSrc)
+          });
         }
-      } else if (content5[i5] === "[" && content5[i5 - 1] !== "!") {
-        const linkStart = i5;
-        let j5 = i5 + 1;
-        while (j5 < len && content5[j5] !== "]") {
+        i5 = result.nextIndex;
+        continue;
+      }
+    } else if (content5[i5] === "[" && content5[i5 - 1] !== "!") {
+      let j5 = i5 + 1;
+      while (j5 < len && content5[j5] !== "]") {
+        if (content5[j5] === "\\") {
+          j5 += 2;
+        } else {
+          j5++;
+        }
+      }
+      if (j5 < len && content5[j5] === "]" && content5[j5 + 1] === "(") {
+        j5 += 2;
+        const urlStart = j5;
+        let parenDepth = 1;
+        while (j5 < len && parenDepth > 0) {
           if (content5[j5] === "\\") {
             j5 += 2;
+          } else if (content5[j5] === "(") {
+            parenDepth++;
+            j5++;
+          } else if (content5[j5] === ")") {
+            parenDepth--;
+            j5++;
           } else {
             j5++;
           }
         }
-        if (j5 < len && content5[j5] === "]" && content5[j5 + 1] === "(") {
-          j5 += 2;
-          const urlStart = j5;
-          let parenDepth = 1;
-          while (j5 < len && parenDepth > 0) {
-            if (content5[j5] === "\\") {
-              j5 += 2;
-            } else if (content5[j5] === "(") {
-              parenDepth++;
-              j5++;
-            } else if (content5[j5] === ")") {
-              parenDepth--;
-              j5++;
-            } else {
+        const urlEnd = j5 - 1;
+        const href = content5.slice(urlStart, urlEnd).trim();
+        const trimmedHref = trimAnchor(href) ?? href;
+        const hrefAnchor = trimmedHref !== href ? href.slice(trimmedHref.length) : "";
+        const replacedHref = getReplacedHref({
+          href: trimmedHref,
+          markdownFilesToPathName,
+          metadata
+        });
+        if (replacedHref && replacedHref.type === "replace") {
+          edits.push({
+            start: urlStart,
+            end: urlEnd,
+            replacement: replacedHref.slug + hrefAnchor
+          });
+        }
+        i5 = j5;
+        continue;
+      }
+    } else if (content5[i5] === "<") {
+      let j5 = i5 + 1;
+      while (j5 < len && content5[j5] !== ">" && content5[j5] !== " " && content5[j5] !== "\n") {
+        j5++;
+      }
+      while (j5 < len && content5[j5] !== ">") {
+        while (j5 < len && (content5[j5] === " " || content5[j5] === "\n")) {
+          j5++;
+        }
+        const attrStart = j5;
+        while (j5 < len && content5[j5] !== "=" && content5[j5] !== ">" && content5[j5] !== " " && content5[j5] !== "\n") {
+          j5++;
+        }
+        const attrName = content5.slice(attrStart, j5).trim();
+        if (attrName.startsWith("{")) {
+          hasUnhandledExpressions = true;
+          let braceDepth = 0;
+          j5 = attrStart;
+          while (j5 < len) {
+            if (content5[j5] === "{") {
+              braceDepth++;
+            } else if (content5[j5] === "}") {
+              braceDepth--;
+              if (braceDepth === 0) {
+                j5++;
+                break;
+              }
+            } else if (content5[j5] === '"' || content5[j5] === "'") {
+              const q5 = content5[j5];
               j5++;
+              while (j5 < len && content5[j5] !== q5) {
+                if (content5[j5] === "\\") {
+                  j5++;
+                }
+                j5++;
+              }
             }
+            j5++;
           }
-          const urlEnd = j5 - 1;
-          const href = content5.slice(urlStart, urlEnd).trim();
-          const replacedHref = getReplacedHref({ href, markdownFilesToPathName, metadata });
-          if (replacedHref && replacedHref.type === "replace") {
-            edits.push({ start: urlStart, end: urlEnd, replacement: replacedHref.slug });
-          }
-          i5 = j5;
           continue;
         }
-      } else if (content5[i5] === "<") {
-        let j5 = i5 + 1;
-        while (j5 < len && content5[j5] !== ">" && content5[j5] !== " " && content5[j5] !== "\n") {
+        if (content5[j5] === "=") {
           j5++;
-        }
-        while (j5 < len && content5[j5] !== ">") {
           while (j5 < len && (content5[j5] === " " || content5[j5] === "\n")) {
             j5++;
           }
-          const attrStart = j5;
-          while (j5 < len && content5[j5] !== "=" && content5[j5] !== ">" && content5[j5] !== " " && content5[j5] !== "\n") {
-            j5++;
-          }
-          const attrName = content5.slice(attrStart, j5).trim();
-          if (content5[j5] === "=") {
+          const isCurlyWrapped = content5[j5] === "{";
+          if (isCurlyWrapped) {
             j5++;
             while (j5 < len && (content5[j5] === " " || content5[j5] === "\n")) {
               j5++;
             }
-            if (content5[j5] === '"' || content5[j5] === "'") {
-              const quote2 = content5[j5];
-              j5++;
-              const valueStart = j5;
-              while (j5 < len && content5[j5] !== quote2) {
-                if (content5[j5] === "\\") {
-                  j5 += 2;
-                } else {
-                  j5++;
-                }
+          }
+          if (content5[j5] === '"' || content5[j5] === "'") {
+            const quote2 = content5[j5];
+            j5++;
+            const valueStart = j5;
+            while (j5 < len && content5[j5] !== quote2) {
+              if (content5[j5] === "\\") {
+                j5 += 2;
+              } else {
+                j5++;
               }
-              const value2 = content5.slice(valueStart, j5);
-              j5++;
-              if (attrName === "src" || attrName === "icon" && isLocalIconReference(value2)) {
-                const imageSrc = mapImage(value2);
-                if (imageSrc) {
-                  edits.push({
-                    start: valueStart,
-                    end: valueStart + value2.length,
-                    replacement: imageSrc
-                  });
-                }
-              } else if (attrName === "href") {
-                const replacedHref = getReplacedHref({
-                  href: value2,
-                  markdownFilesToPathName,
-                  metadata
+            }
+            const value2 = content5.slice(valueStart, j5);
+            j5++;
+            if (isCurlyWrapped) {
+              while (j5 < len && (content5[j5] === " " || content5[j5] === "\n")) {
+                j5++;
+              }
+              if (j5 < len && content5[j5] === "}") {
+                j5++;
+              }
+            }
+            if (attrName === "src" || attrName === "icon" && isLocalIconReference(value2)) {
+              const trimmedValue = trimAnchor(value2);
+              const anchor = trimmedValue && value2 !== trimmedValue ? value2.slice(trimmedValue.length) : "";
+              const imageSrc = mapImage(trimmedValue ?? value2);
+              if (imageSrc) {
+                edits.push({
+                  start: valueStart,
+                  end: valueStart + value2.length,
+                  replacement: imageSrc + anchor
                 });
-                if (replacedHref && replacedHref.type === "replace") {
-                  edits.push({
-                    start: valueStart,
-                    end: valueStart + value2.length,
-                    replacement: replacedHref.slug
-                  });
+              }
+            } else if (attrName === "href") {
+              const trimmedHrefValue = trimAnchor(value2) ?? value2;
+              const hrefAnchorSuffix = trimmedHrefValue !== value2 ? value2.slice(trimmedHrefValue.length) : "";
+              const replacedHref = getReplacedHref({
+                href: trimmedHrefValue,
+                markdownFilesToPathName,
+                metadata
+              });
+              if (replacedHref && replacedHref.type === "replace") {
+                edits.push({
+                  start: valueStart,
+                  end: valueStart + value2.length,
+                  replacement: replacedHref.slug + hrefAnchorSuffix
+                });
+              }
+            }
+          } else if (isCurlyWrapped && (attrName === "src" || attrName === "icon" || attrName === "href")) {
+            hasUnhandledExpressions = true;
+            let braceDepth = 1;
+            while (j5 < len && braceDepth > 0) {
+              if (content5[j5] === "{") {
+                braceDepth++;
+              } else if (content5[j5] === "}") {
+                braceDepth--;
+              } else if (content5[j5] === '"' || content5[j5] === "'") {
+                const q5 = content5[j5];
+                j5++;
+                while (j5 < len && content5[j5] !== q5) {
+                  if (content5[j5] === "\\") {
+                    j5++;
+                  }
+                  j5++;
                 }
               }
+              j5++;
             }
           }
         }
-        if (j5 < len && content5[j5] === ">") {
-          j5++;
-        }
-        i5 = j5;
-        continue;
       }
-      i5++;
+      if (j5 < len && content5[j5] === ">") {
+        j5++;
+      }
+      i5 = j5;
+      continue;
     }
-    replacedContent = applyEdits(content5, edits);
-    const streamingTime = performance.now() - streamingStart;
-    context3.logger.debug(`Streaming replacement completed in ${streamingTime.toFixed(0)}ms: ${edits.length} edits applied`);
-  } else {
+    i5++;
+  }
+  if (hasUnhandledExpressions) {
     const tree = parseMarkdownToTree(content5);
     const lineStarts = precomputeLineStarts(content5);
-    const edits = [];
     const nodeTypeFilter = (node4) => {
       const n2 = node4;
-      return n2.type === "image" || n2.type === "link" || n2.type === "mdxJsxFlowElement" || n2.type === "mdxJsxTextElement" || n2.type === "mdxFlowExpression" || n2.type === "mdxTextExpression";
+      return n2.type === "mdxJsxFlowElement" || n2.type === "mdxJsxTextElement" || n2.type === "mdxFlowExpression" || n2.type === "mdxTextExpression";
     };
     visit3(tree, nodeTypeFilter, (node4) => {
       if (node4.position == null) {
@@ -450406,25 +450478,12 @@ function replaceImagePathsAndUrls(markdown, fileIdsMap, markdownFilesToPathName,
           href: (attr) => replaceHref(trimAnchor(extractSingleLiteral(attr.value)))
         });
       }
-      if (node4.type === "image") {
-        const src = trimAnchor(node4.url);
-        replaceSrc(trimAnchor(src));
-      }
-      if (node4.type === "link") {
-        replaceHref(trimAnchor(node4.url));
-      }
       if (isMdxJsxElement(node4)) {
-        const srcAttr = node4.attributes.filter(isMdxJsxAttribute).find((attr) => attr.name === "src");
-        replaceSrc(trimAnchor(extractAttributeValueLiteral(srcAttr?.value)));
-        const iconAttr = node4.attributes.filter(isMdxJsxAttribute).find((attr) => attr.name === "icon");
-        const iconValue = trimAnchor(extractAttributeValueLiteral(iconAttr?.value));
-        if (isLocalIconReference(iconValue)) {
-          replaceSrc(iconValue);
-        }
-        const hrefAttr = node4.attributes.find((attr) => attr.type === "mdxJsxAttribute" && attr.name === "href");
-        replaceHref(trimAnchor(extractAttributeValueLiteral(hrefAttr?.value)));
         node4.attributes.forEach((attr) => {
           if (isMdxJsxAttribute(attr) && typeof attr.value !== "string" && attr.value != null && attr.value.data?.estree) {
+            if (extractSingleLiteral(attr.value.data.estree) != null) {
+              return;
+            }
             walkEstreeForSrcAndHref(attr.value.data.estree);
           } else if (isMdxJsxExpressionAttribute(attr) && attr.data?.estree) {
             walkEstreeForSrcAndHref(attr.data.estree);
@@ -450439,8 +450498,8 @@ function replaceImagePathsAndUrls(markdown, fileIdsMap, markdownFilesToPathName,
       }
       return CONTINUE;
     });
-    replacedContent = applyEdits(content5, edits);
   }
+  const replacedContent = applyEdits(content5, edits);
   return requoteLeadingZeroValues(import_gray_matter3.default.stringify(replacedContent, data2));
 }
 function trimAnchor(text9) {
@@ -450571,18 +450630,56 @@ function extractLines(content5, linesParam) {
   const extractedLines = sortedIndices.filter((idx) => idx >= 0 && idx < allLines.length).map((idx) => allLines[idx] ?? "");
   return extractedLines.join("\n");
 }
+function collectCodeSrcUrls(markdown) {
+  if (!markdown.includes("<Code")) {
+    return [];
+  }
+  const urls = [];
+  const regex6 = new RegExp(CODE_TAG_REGEX.source, CODE_TAG_REGEX.flags);
+  let match3;
+  while ((match3 = regex6.exec(markdown)) != null) {
+    const src = match3[2];
+    if (src && isUrl(src)) {
+      urls.push(src);
+    }
+  }
+  return urls;
+}
+async function prefetchCodeSrcUrls(urls, context3) {
+  const cache2 = /* @__PURE__ */ new Map();
+  const unique = [...new Set(urls)];
+  if (unique.length === 0) {
+    return cache2;
+  }
+  const results = await Promise.allSettled(unique.map(async (url3) => {
+    const response = await fetch(url3);
+    if (!response.ok) {
+      context3.logger.warn(`Failed to prefetch code from URL "${url3}" (status ${response.status})`);
+      return { url: url3, content: void 0 };
+    }
+    const content5 = await response.text();
+    return { url: url3, content: content5 };
+  }));
+  for (const result of results) {
+    if (result.status === "fulfilled" && result.value.content !== void 0) {
+      cache2.set(result.value.url, result.value.content);
+    }
+  }
+  return cache2;
+}
 async function replaceReferencedCode({
   markdown,
   absolutePathToFernFolder,
   absolutePathToMarkdownFile,
   context: context3,
   // allow for custom markdown loader for testing
-  fileLoader = defaultFileLoader
+  fileLoader = defaultFileLoader,
+  urlCache
 }) {
   if (!markdown.includes("<Code")) {
     return markdown;
   }
-  const regex6 = /([ \t]*)<Code(?:\s+[^>]*?)?\s+src={?['"]([^'"]+)['"](?! \+)}?((?:\s+[^>]*)?)\/>/g;
+  const regex6 = new RegExp(CODE_TAG_REGEX.source, CODE_TAG_REGEX.flags);
   let newMarkdown = markdown;
   let match3;
   while ((match3 = regex6.exec(markdown)) != null) {
@@ -450597,21 +450694,26 @@ async function replaceReferencedCode({
       let language;
       let title2;
       if (isUrl(src)) {
-        try {
-          const response = await fetch(src);
-          if (!response.ok) {
-            context3.logger.warn(`Failed to fetch code from URL "${src}" (status ${response.status}) referenced in ${absolutePathToMarkdownFile}`);
+        const cached2 = urlCache?.get(src);
+        if (cached2 !== void 0) {
+          replacement = cached2;
+        } else {
+          try {
+            const response = await fetch(src);
+            if (!response.ok) {
+              context3.logger.warn(`Failed to fetch code from URL "${src}" (status ${response.status}) referenced in ${absolutePathToMarkdownFile}`);
+              break;
+            }
+            replacement = await response.text();
+          } catch (e2) {
+            context3.logger.warn(`Failed to fetch code from URL "${src}" referenced in ${absolutePathToMarkdownFile}: ${e2}`);
             break;
           }
-          replacement = await response.text();
-          const url3 = new URL(src);
-          const pathname = url3.pathname;
-          language = pathname.split(".").pop();
-          title2 = pathname.split("/").pop();
-        } catch (e2) {
-          context3.logger.warn(`Failed to fetch code from URL "${src}" referenced in ${absolutePathToMarkdownFile}: ${e2}`);
-          break;
         }
+        const url3 = new URL(src);
+        const pathname = url3.pathname;
+        language = pathname.split(".").pop();
+        title2 = pathname.split("/").pop();
       } else {
         const filepath = resolve6(src.startsWith("/") ? absolutePathToFernFolder : dirname6(absolutePathToMarkdownFile), RelativeFilePath2.of(src.replace(/^\//, "")));
         replacement = await fileLoader(filepath);
@@ -450694,12 +450796,13 @@ ${replacement}
   }
   return newMarkdown;
 }
-var import_promises68;
+var import_promises68, CODE_TAG_REGEX;
 var init_replaceReferencedCode = __esm({
   "../docs-markdown-utils/lib/replaceReferencedCode.js"() {
     "use strict";
     init_lib8();
     import_promises68 = require("fs/promises");
+    CODE_TAG_REGEX = /([ \t]*)<Code(?:\s+[^>]*?)?\s+src={?['"]([^'"]+)['"](?! \+)}?((?:\s+[^>]*)?)\/>/g;
   }
 });
 
@@ -450917,6 +451020,7 @@ var init_transformAtPrefixImports = __esm({
 // ../docs-markdown-utils/lib/index.js
 var lib_exports10 = {};
 __export(lib_exports10, {
+  collectCodeSrcUrls: () => collectCodeSrcUrls,
   extractAttributeValueLiteral: () => extractAttributeValueLiteral,
   extractSingleLiteral: () => extractSingleLiteral,
   getMarkdownFormat: () => getMarkdownFormat,
@@ -450928,6 +451032,7 @@ __export(lib_exports10, {
   isValidRelativeSlug: () => isValidRelativeSlug,
   parseImagePaths: () => parseImagePaths,
   parseMarkdownToTree: () => parseMarkdownToTree,
+  prefetchCodeSrcUrls: () => prefetchCodeSrcUrls,
   replaceImagePathsAndUrls: () => replaceImagePathsAndUrls,
   replaceReferencedCode: () => replaceReferencedCode,
   replaceReferencedMarkdown: () => replaceReferencedMarkdown,
@@ -460602,7 +460707,18 @@ var init_DocsDefinitionResolver = __esm({
         this.taskContext.logger.debug("Replacing referenced markdown and code files...");
         const refStart = performance.now();
         const seenReferencedFiles = /* @__PURE__ */ new Set();
-        for (const [relativePath, markdown] of Object.entries(this.parsedDocsConfig.pages)) {
+        const pageEntries = Object.entries(this.parsedDocsConfig.pages);
+        const allCodeSrcUrls = [];
+        for (const [, markdown] of pageEntries) {
+          allCodeSrcUrls.push(...collectCodeSrcUrls(markdown));
+        }
+        const prefetchStart = Date.now();
+        const urlCache = await prefetchCodeSrcUrls(allCodeSrcUrls, this.taskContext);
+        if (urlCache.size > 0) {
+          const uniqueCount = new Set(allCodeSrcUrls).size;
+          this.taskContext.logger.info(`Prefetched ${uniqueCount} external code URLs in ${Date.now() - prefetchStart}ms`);
+        }
+        for (const [relativePath, markdown] of pageEntries) {
           const result = await replaceReferencedMarkdown({
             markdown,
             absolutePathToFernFolder: this.docsWorkspace.absoluteFilePath,
@@ -460619,7 +460735,8 @@ var init_DocsDefinitionResolver = __esm({
             markdown: result.markdown,
             absolutePathToFernFolder: this.docsWorkspace.absoluteFilePath,
             absolutePathToMarkdownFile: this.resolveFilepath(relativePath),
-            context: this.taskContext
+            context: this.taskContext,
+            urlCache
           });
           const newMarkdown = transformAtPrefixImports({
             markdown: codeReplacedMarkdown,
@@ -582009,7 +582126,9 @@ var require_ReplayStep = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ReplayStep = void 0;
+    var child_process_1 = require("child_process");
     var replay_run_1 = require_replay_run();
+    var constants_1 = require_constants8();
     var BaseStep_1 = require_BaseStep();
     var ReplayStep = class extends BaseStep_1.BaseStep {
       config;
@@ -582051,17 +582170,21 @@ var require_ReplayStep = __commonJS({
             patchesWithConflicts: 0
           };
         }
+        const stageOnly = this.config.stageOnly ?? false;
         const result = prepared != null ? await (0, replay_run_1.replayApply)(prepared, {
-          stageOnly: this.config.stageOnly ?? false,
+          stageOnly,
           logger: this.logger
         }) : await (0, replay_run_1.replayRun)({
           outputDir: this.outputDir,
           cliVersion: this.cliVersion,
           generatorVersions: this.generatorVersions,
-          stageOnly: this.config.stageOnly ?? false,
+          stageOnly,
           skipApplication: this.config.skipApplication,
           logger: this.logger
         });
+        if (!stageOnly) {
+          this.commitLockfileIfUncommitted();
+        }
         if (result.failureReason != null) {
           return {
             executed: true,
@@ -582125,6 +582248,40 @@ var require_ReplayStep = __commonJS({
           warnings: report.warnings
         };
       }
+      /**
+       * Commits `.fern/replay.lock` when replay saved the lockfile to disk but
+       * didn't create a `[fern-replay]` commit (e.g. no-patches flow with zero
+       * new patches). Without this, `skipCommit = true` in GithubStep drops the
+       * lockfile advance, freezing `previousGenerationSha` across runs.
+       */
+      commitLockfileIfUncommitted() {
+        try {
+          const status = (0, child_process_1.execFileSync)("git", ["status", "--porcelain", "--", ".fern/replay.lock"], {
+            cwd: this.outputDir,
+            encoding: "utf-8",
+            stdio: ["pipe", "pipe", "pipe"]
+          }).trim();
+          if (status.length === 0) {
+            return;
+          }
+          (0, child_process_1.execFileSync)("git", ["add", "--", ".fern/replay.lock"], {
+            cwd: this.outputDir,
+            stdio: "pipe"
+          });
+          (0, child_process_1.execFileSync)("git", [
+            "-c",
+            `user.name=${constants_1.FERN_BOT_NAME}`,
+            "-c",
+            `user.email=${constants_1.FERN_BOT_EMAIL}`,
+            "commit",
+            "-m",
+            "[fern-replay] advance lockfile"
+          ], { cwd: this.outputDir, stdio: "pipe" });
+          this.logger.debug("ReplayStep: committed uncommitted lockfile advance.");
+        } catch (error50) {
+          this.logger.debug("ReplayStep: failed to commit lockfile advance: " + String(error50));
+        }
+      }
     };
     exports2.ReplayStep = ReplayStep;
   }
@@ -674562,7 +674719,7 @@ var NoConflictingRequestWrapperPropertiesRule = {
             }
             violations.push({
               severity: "fatal",
-              message: `Multiple request properties have the name ${source_default.bold(name2)}. This is not suitable for code generation. Use the "name" property to deconflict.
+              message: `Multiple request properties have the name ${source_default.bold(name2)}. This is not suitable for code generation. Use the "name" property (or "x-fern-parameter-name" in OpenAPI) to deconflict.
 ` + propertiesWithName.map((property24) => `  - ${convertRequestWrapperPropertyToString(property24)}`).join("\n")
             });
           }
@@ -674598,6 +674755,26 @@ function getRequestWrapperPropertiesByName({ endpoint: endpoint3, service, relat
       });
     }
   }
+  if (service["path-parameters"] != null) {
+    for (const [pathParameterKey, pathParameter] of Object.entries(service["path-parameters"])) {
+      if (isVariablePathParameter(pathParameter)) {
+        continue;
+      }
+      addProperty3(pathParameterKey, {
+        type: "service-path-parameter",
+        pathParameterKey
+      });
+    }
+  }
+  for (const [pathParameterKey, pathParameter] of Object.entries(getEndpointPathParameters(endpoint3))) {
+    if (isVariablePathParameter(pathParameter)) {
+      continue;
+    }
+    addProperty3(pathParameterKey, {
+      type: "endpoint-path-parameter",
+      pathParameterKey
+    });
+  }
   if (service.headers != null) {
     for (const [headerKey, header] of Object.entries(service.headers)) {
       addProperty3(getHeaderName3({ headerKey, header }).name, {
@@ -674653,6 +674830,10 @@ function convertRequestWrapperPropertyToString(property24) {
   switch (property24.type) {
     case "service-header":
       return `Service header "${property24.headerKey}"`;
+    case "service-path-parameter":
+      return `Service path parameter "${property24.pathParameterKey}"`;
+    case "endpoint-path-parameter":
+      return `Path parameter "${property24.pathParameterKey}"`;
     case "endpoint-header":
       return `Endpoint header "${property24.headerKey}"`;
     case "endpoint-query-parameter":
@@ -674688,7 +674869,7 @@ function getCamelCaseNormalizedCollisions(nameToProperties) {
     }
     violations.push({
       severity: "fatal",
-      message: `Multiple request properties resolve to the same generated name ${source_default.bold(normalizedName)} after camelCase normalization. This causes broken generated code. Use the "name" property to disambiguate.
+      message: `Multiple request properties resolve to the same generated name ${source_default.bold(normalizedName)} after camelCase normalization. This causes broken generated code. Use the "name" property (or "x-fern-parameter-name" in OpenAPI) to disambiguate.
 ` + entries24.map((entry) => `  - ${convertRequestWrapperPropertyToString(entry.property)} (name: "${entry.rawName}")`).join("\n")
     });
   }
@@ -688415,7 +688596,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.65.3",
+          version: "5.65.5",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -688481,7 +688662,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.65.3",
+        version: "5.65.5",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -869577,7 +869758,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.65.3";
+  const version7 = "5.65.5";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -902139,7 +902320,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.65.3",
+        cliVersion: "5.65.5",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -941515,8 +941696,7 @@ var EndpointSnippetGenerator6 = class {
     args.push(...this.getNamedParameterArgs({
       kind: "PathParameters",
       namedParameters: pathParameters,
-      values: snippet.pathParameters,
-      reservedNames: this.getInlinedBodyPropertyNames({ request: request7 })
+      values: snippet.pathParameters
     }));
     args.push(...this.getNamedParameterArgs({
       kind: "QueryParameters",
@@ -941579,23 +941759,7 @@ var EndpointSnippetGenerator6 = class {
     }
     return args;
   }
-  /**
-   * Property names of an inlined request body (both Ruby names and wire values). Path
-   * parameters that collide with these are renamed in the generated SDK, so snippets
-   * must rename them the same way.
-   */
-  getInlinedBodyPropertyNames({ request: request7 }) {
-    const names2 = /* @__PURE__ */ new Set();
-    if (request7.body?.type !== "properties") {
-      return names2;
-    }
-    for (const property24 of request7.body.value) {
-      names2.add(this.context.getPropertyName(property24.name.name));
-      names2.add(property24.name.wireValue);
-    }
-    return names2;
-  }
-  getNamedParameterArgs({ kind, namedParameters, values: values2, reservedNames }) {
+  getNamedParameterArgs({ kind, namedParameters, values: values2 }) {
     const args = [];
     this.context.errors.scope(kind);
     if (namedParameters != null) {
@@ -941609,15 +941773,8 @@ var EndpointSnippetGenerator6 = class {
         if (ruby_exports.TypeLiteral.isNop(value2)) {
           continue;
         }
-        let name2 = this.context.getPropertyName(parameter6.name.name);
-        if (reservedNames != null && reservedNames.has(name2)) {
-          name2 = `${name2}_path_param`;
-          while (reservedNames.has(name2)) {
-            name2 = `${name2}_`;
-          }
-        }
         args.push(ruby_exports.keywordArgument({
-          name: name2,
+          name: this.context.getPropertyName(parameter6.name.name),
           value: value2
         }));
       }
@@ -968473,7 +968630,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.65.3"
+    cli_version: "5.65.5"
   };
 }
 function isAutomationMode() {
@@ -969305,7 +969462,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.65.3";
+    return "5.65.5";
   }
   getCliName() {
     if (false) {

package/package.json

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