@ai-matrx/print 0.8.8 → 0.8.9

package/dist/markdown.js

@@ -22,6 +22,7 @@ function openPrintWindow(htmlDocument, filename = "print", windowFeatures = "wid
 
 // src/markdown.ts
 import { escapeHtml as escapeHtml2 } from "@ai-matrx/kit/html-escape";
+import { findTableEnd, rowCells, tableStartsAt, unescapeCellPipes } from "@ai-matrx/content-ir/source";
 
 // src/safe-html.ts
 import { fromHtml } from "hast-util-from-html";
@@ -1531,12 +1532,6 @@ var LINK_RE = new RegExp(String.raw`\[([^\]]+)\]\(` + LINK_URL + String.raw`\)`,
 function convertRules(html, g) {
   return html.replace(/^\s{0,3}#\s*={3,}\s*$/gm, `<hr${cls(g.hr, "matrx-hr-heavy")}>`).replace(/^\s{0,3}\*(?:\s*\*){2,}\s*$/gm, `<hr${cls(g.hr, "matrx-hr-accent")}>`).replace(/^\s{0,3}(?:-\s*){3,}$/gm, `<hr${cls(g.hr)}>`).replace(/^\s{0,3}(?:_\s*){3,}$/gm, `<hr${cls(g.hr)}>`);
 }
-function splitTableRow(row) {
-  let r = row.trim();
-  if (r.startsWith("|")) r = r.slice(1);
-  if (r.endsWith("|") && !r.endsWith("\\|")) r = r.slice(0, -1);
-  return r.split(/(?<!\\)\|/).map((c) => c.trim().replace(/\\\|/g, "|"));
-}
 function cellAlign2(separator) {
   const s = separator.trim();
   const left = s.startsWith(":");
@@ -1546,40 +1541,48 @@ function cellAlign2(separator) {
   return "";
 }
 function convertTables(html, g) {
-  const tableRegex = /^(\|.*\|)\s*\n(\|[-\s:|]*\|)\s*\n((?:\|.*\|\s*\n?)*)/gm;
-  return html.replace(
-    tableRegex,
-    (_m, headerRow, separatorRow, bodyRows) => {
-      const headers = splitTableRow(headerRow);
-      const aligns = splitTableRow(separatorRow).map(cellAlign2);
-      const rows = bodyRows.trim().split("\n").filter((r) => r.trim()).map(splitTableRow);
-      let t = `<table${cls(g.table)}>
+  const lines = html.split("\n");
+  const out = [];
+  for (let i = 0; i < lines.length; i += 1) {
+    if (!tableStartsAt(lines, i)) {
+      out.push(lines[i] ?? "");
+      continue;
+    }
+    const end = findTableEnd(lines, i);
+    const cellsOf = (line) => rowCells(line).map(unescapeCellPipes);
+    const headers = cellsOf(lines[i] ?? "");
+    const aligns = rowCells(lines[i + 1] ?? "").map(cellAlign2);
+    const rows = lines.slice(i + 2, end).map((line) => {
+      const cells = cellsOf(line);
+      return headers.map((_h, k) => cells[k] ?? "");
+    });
+    let t = `<table${cls(g.table)}>
 <thead${cls(g.thead)}>
 <tr${cls(g.tr)}>
 `;
-      headers.forEach((h, i) => {
-        t += `<th${cls(g.th)}${aligns[i] ?? ""}>${h}</th>
+    headers.forEach((h, k) => {
+      t += `<th${cls(g.th)}${aligns[k] ?? ""}>${h}</th>
 `;
-      });
-      t += "</tr>\n</thead>\n";
-      if (rows.length > 0) {
-        t += `<tbody${cls(g.tbody)}>
+    });
+    t += "</tr>\n</thead>\n";
+    if (rows.length > 0) {
+      t += `<tbody${cls(g.tbody)}>
 `;
-        for (const row of rows) {
-          t += `<tr${cls(g.tr)}>
+      for (const row of rows) {
+        t += `<tr${cls(g.tr)}>
 `;
-          row.forEach((c, i) => {
-            t += `<td${cls(g.td)}${aligns[i] ?? ""}>${c}</td>
+        row.forEach((c, k) => {
+          t += `<td${cls(g.td)}${aligns[k] ?? ""}>${c}</td>
 `;
-          });
-          t += "</tr>\n";
-        }
-        t += "</tbody>\n";
+        });
+        t += "</tr>\n";
       }
-      return `${t}</table>
-`;
+      t += "</tbody>\n";
     }
-  );
+    out.push(`${t}</table>`);
+    i = end - 1;
+  }
+  return out.join("\n");
 }
 function convertLists(html, g) {
   const lines = html.split("\n");