@fern-api/fern-api-dev 5.98.2 → 5.98.3

package/cli.cjs

@@ -453619,13 +453619,16 @@ var init_micromark_extension_mdxjs = __esm({
 });
 
 // ../docs-markdown-utils/lib/parseMarkdownToTree.js
-function parseMarkdownToTree(markdown) {
-  const { content: content5 } = (0, import_gray_matter2.default)(markdown);
-  return fromMarkdown(content5, {
+function parseMarkdownBodyToTree(body) {
+  return fromMarkdown(body, {
     extensions: [mdxjs(), gfm(), math()],
     mdastExtensions: [mdxFromMarkdown(), gfmFromMarkdown(), mathFromMarkdown()]
   });
 }
+function parseMarkdownToTree(markdown) {
+  const { content: content5 } = (0, import_gray_matter2.default)(markdown);
+  return parseMarkdownBodyToTree(content5);
+}
 var import_gray_matter2;
 var init_parseMarkdownToTree = __esm({
   "../docs-markdown-utils/lib/parseMarkdownToTree.js"() {
@@ -455055,10 +455058,39 @@ var init_stripMdxComments = __esm({
 });
 
 // ../docs-markdown-utils/lib/transformAtPrefixImports.js
-function transformAtPrefixImports({ markdown, absolutePathToFernFolder, absolutePathToMarkdownFile }) {
-  const importRegex = /(import\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+)\s+from\s+)?['"])@\/([^'"]+)(['"])/g;
+function getCodeRanges(markdown, context3) {
+  try {
+    const { content: content5 } = (0, import_gray_matter5.default)(markdown);
+    if (!markdown.endsWith(content5)) {
+      return void 0;
+    }
+    const bodyOffset = markdown.length - content5.length;
+    const tree = parseMarkdownBodyToTree(content5);
+    const ranges = [];
+    visit3(tree, ["code", "inlineCode"], (node4) => {
+      const start2 = node4.position?.start.offset;
+      const end = node4.position?.end.offset;
+      if (start2 != null && end != null) {
+        ranges.push({ start: start2 + bodyOffset, end: end + bodyOffset });
+      }
+      return CONTINUE;
+    });
+    return ranges;
+  } catch (error50) {
+    context3?.logger.debug(`Failed to locate code blocks while resolving "@/" imports; imports inside code samples may be rewritten: ${error50 instanceof Error ? error50.message : String(error50)}`);
+    return void 0;
+  }
+}
+function transformAtPrefixImports({ markdown, absolutePathToFernFolder, absolutePathToMarkdownFile, context: context3 }) {
+  if (!markdown.includes("@/")) {
+    return markdown;
+  }
   const mdxDir = dirname6(absolutePathToMarkdownFile);
-  return markdown.replace(importRegex, (match3, prefix2, importPath, suffix) => {
+  const codeRanges = getCodeRanges(markdown, context3);
+  return markdown.replace(IMPORT_REGEX, (match3, prefix2, importPath, suffix, offset2) => {
+    if (codeRanges?.some((range2) => offset2 >= range2.start && offset2 < range2.end)) {
+      return match3;
+    }
     const absoluteImportPath = AbsoluteFilePath2.of(`${absolutePathToFernFolder}/${importPath}`);
     let relativePath = relative4(mdxDir, absoluteImportPath);
     if (!relativePath.startsWith(".") && !relativePath.startsWith("/")) {
@@ -455067,10 +455099,15 @@ function transformAtPrefixImports({ markdown, absolutePathToFernFolder, absolute
     return `${prefix2}${relativePath}${suffix}`;
   });
 }
+var import_gray_matter5, IMPORT_REGEX;
 var init_transformAtPrefixImports = __esm({
   "../docs-markdown-utils/lib/transformAtPrefixImports.js"() {
     "use strict";
     init_lib8();
+    import_gray_matter5 = __toESM(require_gray_matter(), 1);
+    init_unist_util_visit();
+    init_parseMarkdownToTree();
+    IMPORT_REGEX = /(import\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+)\s+from\s+)?['"])@\/([^'"]+)(['"])/g;
   }
 });
 
@@ -455088,6 +455125,7 @@ __export(lib_exports10, {
   isMdxJsxExpressionAttribute: () => isMdxJsxExpressionAttribute,
   isValidRelativeSlug: () => isValidRelativeSlug,
   parseImagePaths: () => parseImagePaths,
+  parseMarkdownBodyToTree: () => parseMarkdownBodyToTree,
   parseMarkdownToTree: () => parseMarkdownToTree,
   prefetchCodeSrcUrls: () => prefetchCodeSrcUrls,
   replaceImagePathsAndUrls: () => replaceImagePathsAndUrls,
@@ -455351,7 +455389,7 @@ var init_applyTranslatedApiTitlesToNavTree = __esm({
 // ../docs-resolver/lib/applyTranslatedFrontmatterToNavTree.js
 function parseFrontmatterOverrides(markdown) {
   try {
-    const { data: data2 } = (0, import_gray_matter5.default)(markdown);
+    const { data: data2 } = (0, import_gray_matter6.default)(markdown);
     const result = {};
     const sidebarTitle = data2["sidebar-title"];
     if (typeof sidebarTitle === "string" && sidebarTitle.trim().length > 0) {
@@ -455409,11 +455447,11 @@ function walkNode(node4, overrides) {
   }
   return updated;
 }
-var import_gray_matter5;
+var import_gray_matter6;
 var init_applyTranslatedFrontmatterToNavTree = __esm({
   "../docs-resolver/lib/applyTranslatedFrontmatterToNavTree.js"() {
     "use strict";
-    import_gray_matter5 = __toESM(require_gray_matter(), 1);
+    import_gray_matter6 = __toESM(require_gray_matter(), 1);
   }
 });
 
@@ -472316,7 +472354,7 @@ function convertAvailability5(availability) {
       assertNever(availability);
   }
 }
-var import_dayjs3, import_utc3, import_fs26, import_promises80, import_gray_matter6, defaultUploadFiles, apiCounter, defaultRegisterApi, DocsDefinitionResolver;
+var import_dayjs3, import_utc3, import_fs26, import_promises80, import_gray_matter7, defaultUploadFiles, apiCounter, defaultRegisterApi, DocsDefinitionResolver;
 var init_DocsDefinitionResolver = __esm({
   "../docs-resolver/lib/DocsDefinitionResolver.js"() {
     "use strict";
@@ -472336,7 +472374,7 @@ var init_DocsDefinitionResolver = __esm({
     import_utc3 = __toESM(require_utc(), 1);
     import_fs26 = require("fs");
     import_promises80 = require("fs/promises");
-    import_gray_matter6 = __toESM(require_gray_matter(), 1);
+    import_gray_matter7 = __toESM(require_gray_matter(), 1);
     init_js_yaml();
     init_lodash();
     init_ApiReferenceNodeConverter();
@@ -472645,7 +472683,8 @@ var init_DocsDefinitionResolver = __esm({
           const newMarkdown = transformAtPrefixImports({
             markdown: codeReplacedMarkdown,
             absolutePathToFernFolder: this.docsWorkspace.absoluteFilePath,
-            absolutePathToMarkdownFile: this.resolveFilepath(relativePath)
+            absolutePathToMarkdownFile: this.resolveFilepath(relativePath),
+            context: this.taskContext
           });
           this.parsedDocsConfig.pages[RelativeFilePath2.of(relativePath)] = newMarkdown;
         }
@@ -472849,7 +472888,7 @@ var init_DocsDefinitionResolver = __esm({
        */
       extractAllFrontmatterData(pages) {
         for (const [relativePath, markdown] of Object.entries(pages)) {
-          const frontmatter = (0, import_gray_matter6.default)(markdown);
+          const frontmatter = (0, import_gray_matter7.default)(markdown);
           const absolutePath = this.resolveFilepath(relativePath);
           const slug = frontmatter.data.slug;
           if (typeof slug === "string" && slug.trim().length > 0) {
@@ -603506,7 +603545,8 @@ async function buildTranslatedDocsDefinition({ docsDefinition, locale, localePag
       const importsResolved = transformAtPrefixImports({
         markdown: codeResolved,
         absolutePathToFernFolder: docsWorkspacePath,
-        absolutePathToMarkdownFile
+        absolutePathToMarkdownFile,
+        context: context3
       });
       let processedMarkdown = stripMdxComments(importsResolved);
       processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, markdownFilesToPathName, {
@@ -702844,7 +702884,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.98.2",
+          version: "5.98.3",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -702910,7 +702950,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.98.2",
+        version: "5.98.3",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -861490,7 +861530,7 @@ var getViolationsForFile = async (absoluteFilepath) => {
 
 // ../yaml/docs-validator/lib/rules/valid-frontmatter/valid-frontmatter.js
 var import_promises88 = require("fs/promises");
-var import_gray_matter7 = __toESM(require_gray_matter(), 1);
+var import_gray_matter8 = __toESM(require_gray_matter(), 1);
 var ValidFrontmatter = {
   name: "valid-frontmatter",
   create: () => {
@@ -861501,7 +861541,7 @@ var ValidFrontmatter = {
         }
         try {
           const fileContents = await (0, import_promises88.readFile)(absoluteFilepath, "utf-8");
-          (0, import_gray_matter7.default)(fileContents);
+          (0, import_gray_matter8.default)(fileContents);
           return [];
         } catch (error50) {
           return [
@@ -878530,7 +878570,7 @@ async function parseMarkdown({ markdown, absoluteFilepath, absolutePathToFernFol
 init_lib64();
 init_lib8();
 var import_promises89 = require("fs/promises");
-var import_gray_matter8 = __toESM(require_gray_matter(), 1);
+var import_gray_matter9 = __toESM(require_gray_matter(), 1);
 init_unist_util_visit();
 var ValidMarkdownFileReferences = {
   name: "valid-markdown-file-references",
@@ -878542,7 +878582,7 @@ var ValidMarkdownFileReferences = {
         }
         try {
           const fileContents = await (0, import_promises89.readFile)(absoluteFilepath, "utf-8");
-          const { content: content5 } = (0, import_gray_matter8.default)(fileContents, {});
+          const { content: content5 } = (0, import_gray_matter9.default)(fileContents, {});
           const tree = parseMarkdownToTree(content5);
           const errors4 = [];
           visit3(tree, (node4) => {
@@ -879651,7 +879691,7 @@ var ValidTranslationsConfigRule = {
 // ../yaml/docs-validator/lib/rules/valid-well-known-skills/valid-well-known-skills.js
 init_lib8();
 var import_promises91 = require("fs/promises");
-var import_gray_matter9 = __toESM(require_gray_matter(), 1);
+var import_gray_matter10 = __toESM(require_gray_matter(), 1);
 var ValidWellKnownSkillsRule = {
   name: "valid-well-known-skills",
   create: ({ workspace }) => {
@@ -879721,7 +879761,7 @@ async function validateWellKnownSkillsDirectory({ absolutePathToFernFolder, well
 function validateSkillMarkdown({ skillDirectoryName, skillMarkdownRelativePath, skillMarkdownContents }) {
   let frontmatter;
   try {
-    frontmatter = (0, import_gray_matter9.default)(skillMarkdownContents).data;
+    frontmatter = (0, import_gray_matter10.default)(skillMarkdownContents).data;
   } catch (error50) {
     return [
       {
@@ -884291,7 +884331,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.98.2";
+  const version7 = "5.98.3";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -886994,14 +887034,14 @@ init_lib22();
 init_lib68();
 init_lib6();
 var import_promises105 = require("fs/promises");
-var import_gray_matter10 = __toESM(require_gray_matter(), 1);
+var import_gray_matter11 = __toESM(require_gray_matter(), 1);
 init_dist_node6();
 var frontmatterPositionCache = /* @__PURE__ */ new Map();
 var frontmatterSidebarTitleCache = /* @__PURE__ */ new Map();
 var frontmatterSlugCache = /* @__PURE__ */ new Map();
 function extractFrontmatterPosition(markdown) {
   try {
-    const { data: data2 } = (0, import_gray_matter10.default)(markdown);
+    const { data: data2 } = (0, import_gray_matter11.default)(markdown);
     if (data2.position == null) {
       return void 0;
     }
@@ -887016,7 +887056,7 @@ function extractFrontmatterPosition(markdown) {
 }
 function extractFrontmatterSidebarTitle(markdown) {
   try {
-    const { data: data2 } = (0, import_gray_matter10.default)(markdown);
+    const { data: data2 } = (0, import_gray_matter11.default)(markdown);
     if (data2["sidebar-title"] == null) {
       return void 0;
     }
@@ -887031,7 +887071,7 @@ function extractFrontmatterSidebarTitle(markdown) {
 }
 function extractFrontmatterSlug(markdown) {
   try {
-    const { data: data2 } = (0, import_gray_matter10.default)(markdown);
+    const { data: data2 } = (0, import_gray_matter11.default)(markdown);
     if (data2.slug == null) {
       return void 0;
     }
@@ -887105,7 +887145,8 @@ async function getPreviewDocsDefinition({ domain: domain3, project, context: con
       const markdownReplacedMdAndCode = transformAtPrefixImports({
         markdown: markdownReplacedCode,
         absolutePathToFernFolder: docsWorkspace.absoluteFilePath,
-        absolutePathToMarkdownFile: absoluteFilePath
+        absolutePathToMarkdownFile: absoluteFilePath,
+        context: context3
       });
       let markdownWithAbsPaths;
       let filepaths;
@@ -888038,7 +888079,8 @@ async function runAppPreviewServer({ initialProject, reloadProject, validateProj
             const importsResolved = transformAtPrefixImports({
               markdown: codeResolved,
               absolutePathToFernFolder: docsWorkspacePath,
-              absolutePathToMarkdownFile
+              absolutePathToMarkdownFile,
+              context: context3
             });
             let processedMarkdown = stripMdxComments(importsResolved);
             processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, markdownFilesToPathName, {
@@ -888667,7 +888709,8 @@ async function runPreviewServer({ initialProject, reloadProject, validateProject
             const importsResolved = transformAtPrefixImports({
               markdown: codeResolved,
               absolutePathToFernFolder: docsWorkspacePath,
-              absolutePathToMarkdownFile
+              absolutePathToMarkdownFile,
+              context: context3
             });
             let processedMarkdown = stripMdxComments(importsResolved);
             processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, markdownFilesToPathName, {
@@ -908793,7 +908836,8 @@ ${JSON.stringify(errorDetails, void 0, 2)}`);
               const importsResolved = transformAtPrefixImports({
                 markdown: codeResolved,
                 absolutePathToFernFolder: docsWorkspacePath,
-                absolutePathToMarkdownFile
+                absolutePathToMarkdownFile,
+                context: context3
               });
               let processedMarkdown = stripMdxComments(importsResolved);
               processedMarkdown = replaceImagePathsAndUrls(processedMarkdown, collectedFileIds, markdownFilesToPathName, {
@@ -909607,7 +909651,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.98.2",
+        cliVersion: "5.98.3",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -968934,7 +968978,7 @@ init_lib8();
 // ../docs-importers/mintlify/lib/convertMarkdown.js
 init_lib8();
 var import_promises156 = require("fs/promises");
-var import_gray_matter11 = __toESM(require_gray_matter(), 1);
+var import_gray_matter12 = __toESM(require_gray_matter(), 1);
 async function convertMarkdown({ absolutePathToMintJson, absoluteFilepathToMarkdown, relativeFilepathFromRoot, builder }) {
   const text9 = await (0, import_promises156.readFile)(absoluteFilepathToMarkdown, "utf-8");
   const { data: data2, content: content5 } = parseMintlifyFrontmatter(text9);
@@ -968999,7 +969043,7 @@ async function convertMarkdown({ absolutePathToMintJson, absoluteFilepathToMarkd
   };
 }
 function parseMintlifyFrontmatter(mdContent) {
-  const { data: data2, content: content5 } = (0, import_gray_matter11.default)(mdContent);
+  const { data: data2, content: content5 } = (0, import_gray_matter12.default)(mdContent);
   return { data: data2, content: content5 };
 }
 function isExternalUrl3(url3) {
@@ -976840,7 +976884,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.98.2"
+    cli_version: "5.98.3"
   };
 }
 function isAutomationMode() {
@@ -977672,7 +977716,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.98.2";
+    return "5.98.3";
   }
   getCliName() {
     if (false) {
@@ -993226,7 +993270,7 @@ init_lib20();
 init_lib64();
 init_source();
 var import_fs44 = require("fs");
-var import_gray_matter12 = __toESM(require_gray_matter(), 1);
+var import_gray_matter13 = __toESM(require_gray_matter(), 1);
 var import_path123 = __toESM(require("path"), 1);
 function calculateVisualColumn(text9, charIndex, tabWidth = 4) {
   let visualColumn = 0;
@@ -993305,7 +993349,7 @@ async function validateMdxFiles({
     try {
       parseMarkdownToTree(content5);
     } catch (error50) {
-      const { content: contentWithoutFrontmatter } = (0, import_gray_matter12.default)(content5);
+      const { content: contentWithoutFrontmatter } = (0, import_gray_matter13.default)(content5);
       const totalLines = content5.split("\n").length;
       const contentLines = contentWithoutFrontmatter.split("\n").length;
       const frontmatterLineCount = totalLines - contentLines;

package/package.json

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