@ai-matrx/print 0.8.8 → 0.8.10

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 { codeSpanText, findTableEnd, mapCodeRanges, rowCells, tableStartsAt, unescapeCellPipes } from "@ai-matrx/content-ir/source";
 
 // src/safe-html.ts
 import { fromHtml } from "hast-util-from-html";
@@ -1444,6 +1445,12 @@ function protectRegions(markdown, g, stash, ctx) {
       i = j;
       continue;
     }
+    if (tableStartsAt(lines, i)) {
+      const end = findTableEnd(lines, i);
+      out.push(stash.block(tableHtml(lines.slice(i, end), g, stash)));
+      i = end - 1;
+      continue;
+    }
     out.push(line);
   }
   let text = out.join("\n");
@@ -1451,6 +1458,7 @@ function protectRegions(markdown, g, stash, ctx) {
     /`([^`\n]+)`/g,
     (_m, code) => stash.inline(`<code${cls(g.inlineCode)}>${escapeHtml2(code)}</code>`)
   );
+  text = resolveEscapes(text, stash);
   text = text.replace(/<!--[\s\S]*?-->/g, "");
   const before = text;
   for (let pass = 0; pass < 8; pass++) {
@@ -1531,12 +1539,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(":");
@@ -1545,41 +1547,58 @@ function cellAlign2(separator) {
   if (right) return ' style="text-align:right"';
   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)}>
+var ESCAPE_RE = /\\([!-\/:-@[-`{-~])/g;
+function resolveEscapes(text, stash) {
+  return text.replace(ESCAPE_RE, (_m, ch) => stash.inline(escapeHtml2(ch)));
+}
+function cellInlineHtml(cell, g, stash) {
+  let t = mapCodeRanges(
+    unescapeCellPipes(cell),
+    (range, raw) => range.kind === "span" ? stash.inline(`<code${cls(g.inlineCode)}>${escapeHtml2(codeSpanText(raw))}</code>`) : raw
+  );
+  t = resolveEscapes(t, stash);
+  t = t.replace(
+    IMAGE_RE,
+    (_m, alt, url) => stash.inline(`<img class="${g.skin === "document" ? "matrx-image" : "print-image"}" src="${safeUrl(url)}" alt="${escapeHtml2(alt)}" />`)
+  );
+  t = t.replace(
+    LINK_RE,
+    (_m, text, url) => stash.inline(`<a${g.skin === "document" ? ' class="matrx-link"' : ""} href="${safeUrl(url)}">${convertEmphasis(text, g)}</a>`)
+  );
+  return convertEmphasis(t, g);
+}
+function tableHtml(lines, g, stash) {
+  const cellsOf = (line) => rowCells(line).map((cell) => cellInlineHtml(cell, g, stash));
+  const headers = cellsOf(lines[0] ?? "");
+  const aligns = rowCells(lines[1] ?? "").map(cellAlign2);
+  const rows = lines.slice(2).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>
-`;
-          });
-          t += "</tr>\n";
-        }
-        t += "</tbody>\n";
-      }
-      return `${t}</table>
+      row.forEach((c, k) => {
+        t += `<td${cls(g.td)}${aligns[k] ?? ""}>${c}</td>
 `;
+      });
+      t += "</tr>\n";
     }
-  );
+    t += "</tbody>\n";
+  }
+  return `${t}</table>`;
 }
 function convertLists(html, g) {
   const lines = html.split("\n");
@@ -1686,7 +1705,6 @@ function documentBody(markdown, ctx) {
   html = convertLists(html, g);
   html = convertEmphasis(html, g);
   html = html.replace(/^> ?(.+)$/gm, '<blockquote class="matrx-blockquote">$1</blockquote>');
-  html = convertTables(html, g);
   html = html.replace(/<table>/g, '<table class="matrx-table">').replace(/<thead>/g, '<thead class="matrx-table-head">').replace(/<tbody>/g, '<tbody class="matrx-table-body">').replace(/<tr>/g, '<tr class="matrx-table-row">').replace(/<th>/g, '<th class="matrx-table-header">').replace(/<td>/g, '<td class="matrx-table-cell">');
   html = html.replace(/<img(?![^>]*class=)([^>]*)>/g, '<img class="matrx-image"$1>');
   html = html.replace(/<div\b([^>]*)>/g, (m, attrs) => {
@@ -1743,7 +1761,6 @@ function articleBody(markdown, ctx) {
   const g = ARTICLE_GRAMMAR;
   const stash = new Stash();
   let html = protectRegions(markdown, g, stash, ctx);
-  html = convertTables(html, g);
   html = convertRules(html, g);
   html = html.replace(
     IMAGE_RE,