@fern-api/fern-api-dev 5.65.2 → 5.65.4

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) {
@@ -460376,6 +460375,7 @@ var init_DocsDefinitionResolver = __esm({
       registerApi;
       targetAudiences;
       buildTranslatedApiDefinitions;
+      markdownFilesToPathName = {};
       constructor({ domain: domain3, docsWorkspace, ossWorkspaces, apiWorkspaces, taskContext, editThisPage, uploadFiles: uploadFiles2 = defaultUploadFiles, registerApi: registerApi2 = defaultRegisterApi, targetAudiences, buildTranslatedApiDefinitions = false }) {
         this.domain = domain3;
         this.docsWorkspace = docsWorkspace;
@@ -460503,6 +460503,14 @@ var init_DocsDefinitionResolver = __esm({
       getTranslatedApiSpecs() {
         return this.translatedApiSpecs;
       }
+      /**
+       * Returns the map of absolute file paths to their fully qualified slug pathnames.
+       * Used by translation processing to resolve relative .md/.mdx links.
+       * Must be called after `resolve()`.
+       */
+      getMarkdownFilesToPathName() {
+        return this.markdownFilesToPathName;
+      }
       getDocsTranslationsConfig() {
         const translations = this.parsedDocsConfig.translations;
         if (translations == null || translations.length === 0) {
@@ -460678,6 +460686,7 @@ var init_DocsDefinitionResolver = __esm({
         this.taskContext.logger.debug("Getting fully qualified path names...");
         const pathNameStart = performance.now();
         const markdownFilesToPathName = await this.getMarkdownFilesToFullyQualifiedPathNames(root6);
+        this.markdownFilesToPathName = markdownFilesToPathName;
         const pathNameTime = performance.now() - pathNameStart;
         this.taskContext.logger.debug(`Got path names in ${pathNameTime.toFixed(0)}ms`);
         if (this.pendingApiRegistrations.length > 0) {
@@ -590253,6 +590262,7 @@ __export(buildTranslatedDocsDefinition_exports, {
 async function buildTranslatedDocsDefinition({ docsDefinition, locale, localePages, translationNavigationOverlays, resolver: resolver2, context: context3 }) {
   const collectedFileIds = resolver2.getCollectedFileIds();
   const docsWorkspacePath = resolver2.getDocsWorkspacePath();
+  const markdownFilesToPathName = resolver2.getMarkdownFilesToPathName();
   const resolveLocalePath = async (filepath) => {
     const relPath = relative4(docsWorkspacePath, filepath);
     const translatedPath = resolve6(docsWorkspacePath, RelativeFilePath2.of(`translations/${locale}/${relPath}`));
@@ -590292,7 +590302,7 @@ async function buildTranslatedDocsDefinition({ docsDefinition, locale, localePag
         absolutePathToMarkdownFile
       });
       let processedMarkdown = stripMdxComments(importsResolved);
-      processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, {}, {
+      processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, markdownFilesToPathName, {
         absolutePathToMarkdownFile,
         absolutePathToFernFolder: docsWorkspacePath
       }, context3);
@@ -674551,7 +674561,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")
             });
           }
@@ -674587,6 +674597,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, {
@@ -674642,6 +674672,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":
@@ -674677,7 +674711,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")
     });
   }
@@ -688404,7 +688438,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.65.2",
+          version: "5.65.4",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -688470,7 +688504,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.65.2",
+        version: "5.65.4",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -869566,7 +869600,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.2";
+  const version7 = "5.65.4";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -872445,6 +872479,7 @@ async function getPreviewDocsDefinition({ domain: domain3, project, context: con
         translationNavigationOverlays: previousPreviewResult.translationNavigationOverlays,
         collectedFileIds: previousPreviewResult.collectedFileIds,
         docsWorkspacePath: previousPreviewResult.docsWorkspacePath,
+        markdownFilesToPathName: previousPreviewResult.markdownFilesToPathName,
         translatedApiDefinitions: previousPreviewResult.translatedApiDefinitions
       };
     }
@@ -872518,6 +872553,7 @@ async function getPreviewDocsDefinition({ domain: domain3, project, context: con
   const translationPages = resolver2.getTranslationPages();
   const translationNavigationOverlays = resolver2.getTranslationNavigationOverlays();
   const collectedFileIds = resolver2.getCollectedFileIds();
+  const markdownFilesToPathName = resolver2.getMarkdownFilesToPathName();
   const translatedApiSpecs = resolver2.getTranslatedApiSpecs();
   let translatedApiDefinitions;
   if (translatedApiSpecs.size > 0) {
@@ -872545,6 +872581,7 @@ async function getPreviewDocsDefinition({ domain: domain3, project, context: con
     translationNavigationOverlays,
     collectedFileIds,
     docsWorkspacePath: docsWorkspace.absoluteFilePath,
+    markdownFilesToPathName,
     translatedApiDefinitions
   };
 }
@@ -873190,7 +873227,7 @@ async function runAppPreviewServer({ initialProject, reloadProject, validateProj
   const RELOAD_DEBOUNCE_MS = 500;
   async function computeTranslatedDefinitions(result) {
     const translations = /* @__PURE__ */ new Map();
-    const { docsDefinition, translationPages, translationNavigationOverlays, translatedApiDefinitions, collectedFileIds, docsWorkspacePath } = result;
+    const { docsDefinition, translationPages, translationNavigationOverlays, translatedApiDefinitions, collectedFileIds, docsWorkspacePath, markdownFilesToPathName } = result;
     const hasTranslatedPages = translationPages != null && Object.keys(translationPages).length > 0;
     const hasTranslatedApis = translatedApiDefinitions != null && Object.keys(translatedApiDefinitions).length > 0;
     if (!hasTranslatedPages && !hasTranslatedApis) {
@@ -873252,17 +873289,10 @@ async function runAppPreviewServer({ initialProject, reloadProject, validateProj
               absolutePathToMarkdownFile
             });
             let processedMarkdown = stripMdxComments(importsResolved);
-            processedMarkdown = replaceImagePathsAndUrls(
-              processedMarkdown,
-              collectedFileIds,
-              {},
-              // markdownFilesToPathName not needed for translations
-              {
-                absolutePathToMarkdownFile,
-                absolutePathToFernFolder: docsWorkspacePath
-              },
-              context3
-            );
+            processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, markdownFilesToPathName, {
+              absolutePathToMarkdownFile,
+              absolutePathToFernFolder: docsWorkspacePath
+            }, context3);
             translatedPages[pagePath] = {
               markdown: processedMarkdown,
               rawMarkdown: processedMarkdown,
@@ -873827,7 +873857,7 @@ async function runPreviewServer({ initialProject, reloadProject, validateProject
   const RELOAD_DEBOUNCE_MS = 1e3;
   async function computeTranslatedDefinitions(result) {
     const translations = /* @__PURE__ */ new Map();
-    const { docsDefinition, translationPages, translationNavigationOverlays, collectedFileIds, docsWorkspacePath } = result;
+    const { docsDefinition, translationPages, translationNavigationOverlays, collectedFileIds, docsWorkspacePath, markdownFilesToPathName } = result;
     if (translationPages == null || Object.keys(translationPages).length === 0) {
       return translations;
     }
@@ -873882,17 +873912,10 @@ async function runPreviewServer({ initialProject, reloadProject, validateProject
               absolutePathToMarkdownFile
             });
             let processedMarkdown = stripMdxComments(importsResolved);
-            processedMarkdown = replaceImagePathsAndUrls(
-              processedMarkdown,
-              collectedFileIds,
-              {},
-              // markdownFilesToPathName not needed for translations
-              {
-                absolutePathToMarkdownFile,
-                absolutePathToFernFolder: docsWorkspacePath
-              },
-              context3
-            );
+            processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, markdownFilesToPathName, {
+              absolutePathToMarkdownFile,
+              absolutePathToFernFolder: docsWorkspacePath
+            }, context3);
             translatedPages[pagePath] = {
               markdown: processedMarkdown,
               rawMarkdown: processedMarkdown,
@@ -901287,6 +901310,7 @@ ${JSON.stringify(errorDetails, void 0, 2)}`);
         try {
           const collectedFileIds = resolver2.getCollectedFileIds();
           const docsWorkspacePath = resolver2.getDocsWorkspacePath();
+          const markdownFilesToPathName = resolver2.getMarkdownFilesToPathName();
           const resolveLocalePath = async (filepath) => {
             const relPath = relative4(docsWorkspacePath, filepath);
             const translatedPath = resolve6(docsWorkspacePath, RelativeFilePath2.of(`translations/${locale}/${relPath}`));
@@ -901326,17 +901350,10 @@ ${JSON.stringify(errorDetails, void 0, 2)}`);
                 absolutePathToMarkdownFile
               });
               let processedMarkdown = stripMdxComments(importsResolved);
-              processedMarkdown = replaceImagePathsAndUrls(
-                processedMarkdown,
-                collectedFileIds,
-                {},
-                // markdownFilesToPathName not needed for translations
-                {
-                  absolutePathToMarkdownFile,
-                  absolutePathToFernFolder: docsWorkspacePath
-                },
-                context3
-              );
+              processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, markdownFilesToPathName, {
+                absolutePathToMarkdownFile,
+                absolutePathToFernFolder: docsWorkspacePath
+              }, context3);
               let editThisPageUrl = basePage?.editThisPageUrl;
               if (editThisPageUrl != null) {
                 const fernPathPattern = `/fern/${path119}`;
@@ -902145,7 +902162,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.65.2",
+        cliVersion: "5.65.4",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -941521,8 +941538,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",
@@ -941585,23 +941601,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) {
@@ -941615,15 +941615,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
         }));
       }
@@ -968479,7 +968472,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.2"
+    cli_version: "5.65.4"
   };
 }
 function isAutomationMode() {
@@ -969311,7 +969304,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.65.2";
+    return "5.65.4";
   }
   getCliName() {
     if (false) {

package/package.json

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