@mintlify/cli 4.0.1438 → 4.0.1440

package/bin/vendor/converter.js

@@ -1808,6 +1808,11 @@ function handleHtmlTable(node, ctx, transformNode2, mapJsxChildren2) {
   for (const child of node.children) {
     if (isTableRowJsxNode(child)) {
       rows.push(child);
+    } else if (child.type === "paragraph") {
+      for (const paragraphChild of child.children) {
+        if (isTableRowJsxNode(paragraphChild))
+          rows.push(paragraphChild);
+      }
     } else if (child.type === "mdxJsxFlowElement" && (child.name === "tbody" || child.name === "thead")) {
       for (const rowChild of child.children) {
         if (isTableRowJsxNode(rowChild)) {
@@ -1825,7 +1830,7 @@ function handleHtmlTable(node, ctx, transformNode2, mapJsxChildren2) {
     return { type: "table", content: [] };
   }
   const tableContent = rows.map((row, rowIndex) => {
-    const cells = row.children.filter(isTableCellJsxNode);
+    const cells = collectTableCellJsxNodes(row);
     return {
       type: "tableRow",
       content: cells.map((cell) => {
@@ -1861,6 +1866,20 @@ function flattenPmContent(content) {
 function isTableRowJsxNode(node) {
   return (node.type === "mdxJsxFlowElement" || node.type === "mdxJsxTextElement") && node.name === "tr";
 }
+function collectTableCellJsxNodes(row) {
+  const cells = [];
+  for (const child of row.children) {
+    if (isTableCellJsxNode(child)) {
+      cells.push(child);
+    } else if (child.type === "paragraph") {
+      for (const paragraphChild of child.children) {
+        if (isTableCellJsxNode(paragraphChild))
+          cells.push(paragraphChild);
+      }
+    }
+  }
+  return cells;
+}
 function isTableCellJsxNode(node) {
   return (node.type === "mdxJsxFlowElement" || node.type === "mdxJsxTextElement") && (node.name === "td" || node.name === "th");
 }
@@ -3370,12 +3389,13 @@ function renderTooltip(state, node, renderInline2) {
 function renderStaticHTML(state, node, renderContent2) {
   var _a;
   const inline = state.inTable || node.type.name === BLOCK_TYPES.inlineStaticHTML;
+  const escapeTablePipes = (value) => state.inTable ? value.replace(/\|/g, "|") : value;
   const mdxJsxNode = node.attrs.mdxJsxNode;
   if (mdxJsxNode) {
     try {
       const str = stringifyMdxNode([mdxJsxNode]);
       if (inline) {
-        state.write(str.replace(/\s*\n\s*/g, " ").trim());
+        state.write(escapeTablePipes(str.replace(/\s*\n\s*/g, " ").trim()));
       } else {
         state.write(str);
         state.closeBlock();
@@ -3406,8 +3426,17 @@ function renderStaticHTML(state, node, renderContent2) {
   if (!inline)
     state.closeBlock();
 }
+var isMdxExpressionNode = (value) => typeof value === "object" && value !== null && (value.type === "mdxFlowExpression" || value.type === "mdxTextExpression") && typeof value.value === "string";
 function renderUnknownTag(state, node) {
   const mdxJsxNode = node.attrs.mdxJsxNode;
+  if (isMdxExpressionNode(mdxJsxNode)) {
+    const value = mdxJsxNode.value.split("\n").map((line, index) => index === 0 || line === "" ? line : `  ${line}`).join("\n");
+    state.write(`{${value}}`);
+    if (node.type.name === BLOCK_TYPES.unknownTag) {
+      state.closeBlock();
+    }
+    return;
+  }
   if (mdxJsxNode) {
     try {
       const str = stringifyMdxNode([mdxJsxNode]);
@@ -3858,6 +3887,11 @@ var __rest2 = function(s, e) {
     }
   return t;
 };
+var canonicalPmToMdxOptions = {
+  tightLists: true,
+  indentSize: 2,
+  removeTrailingNewline: true
+};
 var BLOCK_LINE_TYPES = /* @__PURE__ */ new Set([
   "paragraph",
   "heading",
@@ -8966,6 +9000,7 @@ export {
   HTML_ELEMENTS,
   IMAGE_ALIGN_CLASSES,
   attrsEqual,
+  canonicalPmToMdxOptions,
   createSchema,
   deepEqual,
   diffDocs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintlify/cli",
-  "version": "4.0.1438",
+  "version": "4.0.1440",
   "description": "The Mintlify CLI",
   "engines": {
     "node": ">=18.0.0"
@@ -45,11 +45,11 @@
   },
   "dependencies": {
     "@inquirer/prompts": "7.9.0",
-    "@mintlify/common": "1.0.1111",
-    "@mintlify/link-rot": "3.0.1313",
+    "@mintlify/common": "1.0.1112",
+    "@mintlify/link-rot": "3.0.1314",
     "@mintlify/models": "0.0.351",
-    "@mintlify/prebuild": "1.0.1265",
-    "@mintlify/previewing": "4.0.1337",
+    "@mintlify/prebuild": "1.0.1266",
+    "@mintlify/previewing": "4.0.1338",
     "@mintlify/validation": "0.1.842",
     "adm-zip": "0.6.0",
     "chalk": "5.2.0",
@@ -86,7 +86,7 @@
     "keytar": "7.9.0"
   },
   "devDependencies": {
-    "@mintlify/editor": "0.0.328",
+    "@mintlify/editor": "0.0.330",
     "@mintlify/ts-config": "2.0.2",
     "@tsconfig/recommended": "1.0.2",
     "@types/detect-port": "1.3.2",
@@ -105,5 +105,5 @@
     "vitest": "2.1.9",
     "vitest-mock-process": "1.0.4"
   },
-  "gitHead": "a7aa8658185853553564a04b1132bbd9dec768d5"
+  "gitHead": "3f5b891252d91b608b74a6e584e371fa1a7081d1"
 }

package/src/format.tsx

@@ -31,7 +31,7 @@ async function* walk(dir: string, ignores: string[]): AsyncGenerator<string> {
 }
 
 export const formatHandler = async (): Promise<void> => {
-  const { mdxToPm, pmToMdx } = await import('./vendor/converter.js');
+  const { mdxToPm, pmToMdx, canonicalPmToMdxOptions } = await import('./vendor/converter.js');
   const ignores = [...(await getGitIgnore()), ...(await getMintIgnore(CMD_EXEC_PATH))];
   let total = 0;
   let changed = 0;
@@ -42,8 +42,18 @@ export const formatHandler = async (): Promise<void> => {
     const relative = path.relative(CMD_EXEC_PATH, file);
     try {
       const raw = await fs.readFile(file, 'utf-8');
-      const { doc, frontmatter } = mdxToPm(raw, { singleDollarTextMath: false });
-      const formatted = `${pmToMdx(doc, { frontmatter })}\n`;
+      let formatted = raw;
+      let originalFrontmatterKeys = 0;
+      for (let pass = 0; pass < 3; pass++) {
+        const { doc, frontmatter } = mdxToPm(formatted, { singleDollarTextMath: false });
+        if (pass === 0) originalFrontmatterKeys = Object.keys(frontmatter).length;
+        const next = `${pmToMdx(doc, { frontmatter, ...canonicalPmToMdxOptions })}\n`;
+        if (next === formatted) break;
+        formatted = next;
+      }
+      if (originalFrontmatterKeys > 0 && !formatted.startsWith('---')) {
+        throw new Error('formatting would remove frontmatter; file left untouched');
+      }
       if (formatted !== raw) {
         await fs.writeFile(file, formatted);
         changed++;