@mintlify/cli 4.0.1484 → 4.0.1486

package/bin/vendor/converter.js

@@ -588,11 +588,11 @@ var nodes = {
   },
   tableHeader: {
     content: "block*",
-    attrs: attrs({ align: null })
+    attrs: attrs({ align: null, colwidth: null })
   },
   tableCell: {
     content: "block*",
-    attrs: attrs({ align: null })
+    attrs: attrs({ align: null, colwidth: null })
   },
   [BLOCK_TYPES.codeBlock]: {
     content: "text*",
@@ -1923,13 +1923,15 @@ function handleHtmlTable(node, ctx, transformNode2, mapJsxChildren2) {
   if (rows.length === 0) {
     return { type: "table", content: [] };
   }
+  const colWidths = collectColWidths(node);
   const tableContent = rows.map((row, rowIndex) => {
     const cells = collectTableCellJsxNodes(row);
     return {
       type: "tableRow",
-      content: cells.map((cell) => {
+      content: cells.map((cell, cellIndex) => {
         var _a;
         const isHeader = cell.name === "th" || rowIndex === 0;
+        const colwidth = colWidths[cellIndex];
         const attrs2 = parseMdxAttributes(cell.attributes);
         const style = attrs2.style;
         const styleString = typeof style === "string" ? style : style && typeof style === "object" ? Object.entries(style).map(([key, value]) => `${key}: ${String(value)}`).join("; ") : "";
@@ -1937,7 +1939,7 @@ function handleHtmlTable(node, ctx, transformNode2, mapJsxChildren2) {
         const content = convertHtmlTableCellChildren(cell, ctx, transformNode2, mapJsxChildren2);
         return {
           type: isHeader ? "tableHeader" : "tableCell",
-          attrs: { align: (_a = alignMatch === null || alignMatch === void 0 ? void 0 : alignMatch[1]) !== null && _a !== void 0 ? _a : null },
+          attrs: { align: (_a = alignMatch === null || alignMatch === void 0 ? void 0 : alignMatch[1]) !== null && _a !== void 0 ? _a : null, colwidth: colwidth ? [colwidth] : null },
           content: content.length > 0 ? content : [{ type: "paragraph" }]
         };
       })
@@ -1945,6 +1947,48 @@ function handleHtmlTable(node, ctx, transformNode2, mapJsxChildren2) {
   });
   return { type: "table", content: tableContent };
 }
+function isJsxElementNamed(node, name) {
+  return (node.type === "mdxJsxFlowElement" || node.type === "mdxJsxTextElement") && node.name === name;
+}
+function collectJsxElementsNamed(children, name) {
+  const found = [];
+  for (const child of children) {
+    if (isJsxElementNamed(child, name)) {
+      found.push(child);
+    } else if (child.type === "paragraph") {
+      for (const paragraphChild of child.children) {
+        if (isJsxElementNamed(paragraphChild, name))
+          found.push(paragraphChild);
+      }
+    }
+  }
+  return found;
+}
+function parseColWidth(col) {
+  var _a, _b;
+  const attrs2 = parseMdxAttributes(col.attributes);
+  const style = attrs2.style;
+  const styleWidth = typeof style === "string" ? (_a = style.match(/(?:^|;)\s*width:\s*([^;]+)/i)) === null || _a === void 0 ? void 0 : _a[1] : style && typeof style === "object" ? style.width : void 0;
+  const raw = (_b = attrs2.width) !== null && _b !== void 0 ? _b : styleWidth;
+  if (typeof raw === "number")
+    return raw > 0 ? raw : null;
+  if (typeof raw !== "string")
+    return null;
+  const match = raw.trim().match(/^(\d+(?:\.\d+)?)(?:px)?$/);
+  const width = (match === null || match === void 0 ? void 0 : match[1]) ? Number(match[1]) : NaN;
+  return width > 0 ? width : null;
+}
+function parseColSpan(col) {
+  const span = Number(parseMdxAttributes(col.attributes).span);
+  return Number.isInteger(span) && span > 0 ? span : 1;
+}
+function collectColWidths(table) {
+  const cols = collectJsxElementsNamed(table.children, "col");
+  for (const colgroup of collectJsxElementsNamed(table.children, "colgroup")) {
+    cols.push(...collectJsxElementsNamed(colgroup.children, "col"));
+  }
+  return cols.flatMap((col) => Array(parseColSpan(col)).fill(parseColWidth(col)));
+}
 function flattenPmContent(content) {
   return Array.isArray(content) ? content.filter(Boolean) : [content];
 }
@@ -10135,6 +10179,7 @@ var SerializerState = class {
     this.delim = "";
     this.closed = false;
     this.inTable = false;
+    this.inHtmlTable = false;
     this.inCodeSection = false;
     this.hasReferenceDefinitions = false;
     this.indentSize = 2;
@@ -10369,8 +10414,11 @@ var SerializerState = class {
     }
     this.write(str2);
   }
+  get escapesPipes() {
+    return this.inTable && !this.inHtmlTable;
+  }
   escCodeText(str2) {
-    return this.inTable ? str2.replace(/\|/g, "\\|") : str2;
+    return this.escapesPipes ? str2.replace(/\|/g, "\\|") : str2;
   }
   /** Escapes special Markdown characters in the input string. */
   esc(str2, options = {}) {
@@ -10395,7 +10443,7 @@ var SerializerState = class {
       return true;
     switch (ch) {
       case "|":
-        return this.inTable;
+        return this.escapesPipes;
       case "_":
         return !(isWordChar(prev) && isWordChar(next));
       case "[":
@@ -10657,6 +10705,13 @@ function renderTable(state, node, renderInline2, renderNode2) {
     state.inTable = false;
     return;
   }
+  if (getColumnWidths(node).some((width) => width !== null)) {
+    state.inHtmlTable = true;
+    renderHtmlTable(state, node, renderInline2, renderNode2);
+    state.inHtmlTable = false;
+    state.inTable = false;
+    return;
+  }
   for (let rowIndex = 0; rowIndex < node.childCount; rowIndex++) {
     const row = node.child(rowIndex);
     state.write("|");
@@ -10686,48 +10741,102 @@ function renderTable(state, node, renderInline2, renderNode2) {
   state.closeBlock();
   state.inTable = false;
 }
-function renderTableCellContent(cell, options, renderInline2, renderNode2) {
+function getColumnWidths(table) {
+  var _a;
+  const widths = [];
+  (_a = table.firstChild) === null || _a === void 0 ? void 0 : _a.forEach((cell) => {
+    var _a2;
+    const colwidth = cell.attrs.colwidth;
+    const colspan = (_a2 = cell.attrs.colspan) !== null && _a2 !== void 0 ? _a2 : 1;
+    for (let i = 0; i < colspan; i++) {
+      const width = colwidth === null || colwidth === void 0 ? void 0 : colwidth[i];
+      widths.push(typeof width === "number" && width > 0 ? width : null);
+    }
+  });
+  return widths;
+}
+function renderHtmlTable(state, node, renderInline2, renderNode2) {
+  const writeLine = (line) => {
+    state.write(line);
+    state.ensureNewLine();
+  };
+  const writeRow = (row, indent) => {
+    writeLine(`${indent}<tr>`);
+    row.forEach((cell) => {
+      const tag = cell.type.name === "tableHeader" ? "th" : "td";
+      const align = cell.attrs.align;
+      const attrs2 = align && align !== "left" ? ` style={{ textAlign: "${align}" }}` : "";
+      const content = renderTableCellContent(cell, state.options, renderInline2, renderNode2, true);
+      writeLine(`${indent}  <${tag}${attrs2}>${content}</${tag}>`);
+    });
+    writeLine(`${indent}</tr>`);
+  };
+  writeLine("<table>");
+  writeLine("  <colgroup>");
+  for (const width of getColumnWidths(node)) {
+    writeLine(width === null ? "    <col />" : `    <col width="${Math.round(width)}" />`);
+  }
+  writeLine("  </colgroup>");
+  const headerRow = node.firstChild;
+  if (headerRow) {
+    writeLine("  <thead>");
+    writeRow(headerRow, "    ");
+    writeLine("  </thead>");
+  }
+  if (node.childCount > 1) {
+    writeLine("  <tbody>");
+    for (let rowIndex = 1; rowIndex < node.childCount; rowIndex++) {
+      writeRow(node.child(rowIndex), "    ");
+    }
+    writeLine("  </tbody>");
+  }
+  writeLine("</table>");
+  state.closeBlock();
+}
+function renderTableCellContent(cell, options, renderInline2, renderNode2, htmlTable = false) {
   const parts = [];
   cell.forEach((child) => {
     if (child.type.name === "paragraph") {
-      const text = renderTableInlineContent(child, options, renderInline2);
+      const text = renderTableInlineContent(child, options, renderInline2, htmlTable);
       if (text)
         parts.push(text);
       return;
     }
     if (child.type.name === "heading") {
-      const text = renderTableInlineContent(child, options, renderInline2);
+      const text = renderTableInlineContent(child, options, renderInline2, htmlTable);
       const level = child.attrs.level || 1;
       if (text)
         parts.push(`<h${level}>${text}</h${level}>`);
       return;
     }
-    const block = renderTableBlockContent(child, options, renderInline2, renderNode2);
+    const block = renderTableBlockContent(child, options, renderInline2, renderNode2, htmlTable);
     if (block)
       parts.push(block);
   });
   return parts.join(" ");
 }
-function renderTableInlineContent(node, options, renderInline2) {
+function renderTableInlineContent(node, options, renderInline2, htmlTable = false) {
   const childState = new SerializerState(options);
   childState.inTable = true;
+  childState.inHtmlTable = htmlTable;
   renderInline2(childState, node);
   return childState.out.replace(/\n/g, " ").trim();
 }
-function renderTableNodeContent(node, options, renderNode2) {
+function renderTableNodeContent(node, options, renderNode2, htmlTable = false) {
   const childState = new SerializerState(options);
   childState.inTable = true;
+  childState.inHtmlTable = htmlTable;
   renderNode2(childState, node, node, 0);
   return childState.out.replace(/\n+/g, " ").replace(/\s+/g, " ").trim();
 }
-function renderTableBlockContent(node, options, renderInline2, renderNode2) {
+function renderTableBlockContent(node, options, renderInline2, renderNode2, htmlTable = false) {
   if (node.type.name === "image" || node.type.name === BLOCK_TYPES.image) {
     return renderImageInTableCell(node);
   }
   if (node.type.name === BLOCK_TYPES.frame) {
     const innerParts = [];
     node.forEach((frameChild) => {
-      const rendered = renderTableBlockContent(frameChild, options, renderInline2, renderNode2);
+      const rendered = renderTableBlockContent(frameChild, options, renderInline2, renderNode2, htmlTable);
       if (rendered)
         innerParts.push(rendered);
     });
@@ -10743,19 +10852,19 @@ function renderTableBlockContent(node, options, renderInline2, renderNode2) {
       const itemParts = [];
       listItem.forEach((itemChild) => {
         if (itemChild.type.name === "paragraph") {
-          const text = renderTableInlineContent(itemChild, options, renderInline2);
+          const text = renderTableInlineContent(itemChild, options, renderInline2, htmlTable);
           if (text)
             itemParts.push(text);
           return;
         }
         if (itemChild.type.name === "heading") {
-          const text = renderTableInlineContent(itemChild, options, renderInline2);
+          const text = renderTableInlineContent(itemChild, options, renderInline2, htmlTable);
           const level = itemChild.attrs.level || 1;
           if (text)
             itemParts.push(`<h${level}>${text}</h${level}>`);
           return;
         }
-        const block = renderTableBlockContent(itemChild, options, renderInline2, renderNode2);
+        const block = renderTableBlockContent(itemChild, options, renderInline2, renderNode2, htmlTable);
         if (block)
           itemParts.push(block);
       });
@@ -10763,7 +10872,7 @@ function renderTableBlockContent(node, options, renderInline2, renderNode2) {
     });
     return `<${tag}>${items.join("")}</${tag}>`;
   }
-  return renderTableNodeContent(node, options, renderNode2);
+  return renderTableNodeContent(node, options, renderNode2, htmlTable);
 }
 function renderImageInTableCell(node) {
   var _a;
@@ -11025,7 +11134,7 @@ 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, "&#124;") : value;
+  const escapeTablePipes = (value) => state.escapesPipes ? value.replace(/\|/g, "&#124;") : value;
   const mdxJsxNode = node.attrs.mdxJsxNode;
   if (mdxJsxNode) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintlify/cli",
-  "version": "4.0.1484",
+  "version": "4.0.1486",
   "description": "The Mintlify CLI",
   "engines": {
     "node": ">=18.0.0"
@@ -45,12 +45,12 @@
   },
   "dependencies": {
     "@inquirer/prompts": "7.9.0",
-    "@mintlify/common": "1.0.1136",
-    "@mintlify/link-rot": "3.0.1338",
-    "@mintlify/models": "0.0.353",
-    "@mintlify/prebuild": "1.0.1290",
-    "@mintlify/previewing": "4.0.1362",
-    "@mintlify/validation": "0.1.850",
+    "@mintlify/common": "1.0.1137",
+    "@mintlify/link-rot": "3.0.1339",
+    "@mintlify/models": "0.0.354",
+    "@mintlify/prebuild": "1.0.1291",
+    "@mintlify/previewing": "4.0.1363",
+    "@mintlify/validation": "0.1.851",
     "adm-zip": "0.6.0",
     "chalk": "5.2.0",
     "color": "4.2.3",
@@ -86,7 +86,7 @@
     "keytar": "7.9.0"
   },
   "devDependencies": {
-    "@mintlify/editor": "0.0.368",
+    "@mintlify/editor": "0.0.370",
     "@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": "cca94796d22a66c041b4d6a62ab9ce2a9ad7297b"
+  "gitHead": "b5aaa27069f02a73c2029bbf0f8340de6b4bb149"
 }