@scrider/formatter 1.7.2 → 1.8.0

package/dist/index.js

@@ -333,6 +333,20 @@ function cloneDelta(delta) {
   return new Delta(deepClone(delta.ops));
 }
 
+// src/conversion/markdown/table-header-markdown.ts
+function isHeaderDashPlaceholder(text) {
+  const t = text.trim();
+  return t === "-" && t.length === 1;
+}
+function normalizeHeaderCellForParse(text, isHeaderRow) {
+  if (isHeaderRow && isHeaderDashPlaceholder(text)) return "";
+  return text;
+}
+function serializeHeaderCell(text) {
+  if (text.trim() === "") return "-";
+  return text;
+}
+
 // src/conversion/adapters/types.ts
 var NODE_TYPE = {
   ELEMENT_NODE: 1,
@@ -454,19 +468,21 @@ function renderGfmTable(data, context) {
   if (headerRows === 0) {
     const emptyParts = [];
     for (let c = 0; c < cols; c++) {
-      emptyParts.push(" ");
+      emptyParts.push("");
     }
     lines.push("| " + emptyParts.join(" | ") + " |");
     lines.push(renderGfmSeparator(cols, data.colAligns));
   }
   for (let r = 0; r < rows; r++) {
     const parts = [];
+    const isHeaderRow = headerRows > 0 && r < headerRows;
     for (let c = 0; c < cols; c++) {
       const cell = data.cells[`${r}:${c}`];
       let text = "";
       if (cell && context.renderDelta) {
         text = stripCellContent(context.renderDelta(cell.ops));
       }
+      if (isHeaderRow) text = serializeHeaderCell(text);
       parts.push(text.replace(/\|/g, "\\|"));
     }
     lines.push("| " + parts.join(" | ") + " |");
@@ -4432,7 +4448,15 @@ function renderMarkdownTable(tableLines, embedRenderers, useLatexDelimiters = fa
   if (headerRows.length > 0) {
     for (const [, row] of headerRows) {
       mdLines.push(
-        renderMdRow(row.cells, maxCol, embedRenderers, useLatexDelimiters, registry, softBreakStyle)
+        renderMdRow(
+          row.cells,
+          maxCol,
+          embedRenderers,
+          useLatexDelimiters,
+          registry,
+          softBreakStyle,
+          true
+        )
       );
     }
     mdLines.push(renderMdSeparator(maxCol, colAligns));
@@ -4442,22 +4466,38 @@ function renderMarkdownTable(tableLines, embedRenderers, useLatexDelimiters = fa
       emptyRow.set(col, { ops: [] });
     }
     mdLines.push(
-      renderMdRow(emptyRow, maxCol, embedRenderers, useLatexDelimiters, registry, softBreakStyle)
+      renderMdRow(
+        emptyRow,
+        maxCol,
+        embedRenderers,
+        useLatexDelimiters,
+        registry,
+        softBreakStyle,
+        false
+      )
     );
     mdLines.push(renderMdSeparator(maxCol, colAligns));
   }
   for (const [, row] of bodyRows) {
     mdLines.push(
-      renderMdRow(row.cells, maxCol, embedRenderers, useLatexDelimiters, registry, softBreakStyle)
+      renderMdRow(
+        row.cells,
+        maxCol,
+        embedRenderers,
+        useLatexDelimiters,
+        registry,
+        softBreakStyle,
+        false
+      )
     );
   }
   return mdLines.join("\n");
 }
-function renderMdRow(cells, maxCol, embedRenderers, useLatexDelimiters = false, registry, softBreakStyle = "spaces") {
+function renderMdRow(cells, maxCol, embedRenderers, useLatexDelimiters = false, registry, softBreakStyle = "spaces", isHeaderRow = false) {
   const parts = [];
   for (let col = 0; col <= maxCol; col++) {
     const cell = cells.get(col);
-    const content = cell ? renderLineContent2(
+    let content = cell ? renderLineContent2(
       cell.ops,
       embedRenderers,
       false,
@@ -4469,6 +4509,7 @@ function renderMdRow(cells, maxCol, embedRenderers, useLatexDelimiters = false,
       true
       // inTableCell — softBreak must use <br>, never "  \n"
     ) : "";
+    if (isHeaderRow) content = serializeHeaderCell(content);
     parts.push(content.replace(/\|/g, "\\|"));
   }
   return "| " + parts.join(" | ") + " |";
@@ -4733,7 +4774,138 @@ function renderBlockFormat(content, attributes, orderedIndex, _strict) {
 }
 
 // src/conversion/markdown/markdown-to-delta.ts
-import { Delta as Delta10 } from "@scrider/delta";
+import { Delta as Delta10, isInsert as isInsert5 } from "@scrider/delta";
+
+// src/conversion/markdown/table-header-normalize.ts
+import { isInsert as isInsert4 } from "@scrider/delta";
+function isTableCellTerminator(op) {
+  return isInsert4(op) && typeof op.insert === "string" && op.insert === "\n" && op.attributes !== void 0 && typeof op.attributes["table-row"] === "number";
+}
+function normalizeSyntheticEmptyHeaderRow(ops) {
+  const ends = [];
+  let buf = "";
+  const textOpIndicesByCell = [];
+  let currentTextOps = [];
+  for (let i = 0; i < ops.length; i++) {
+    const op = ops[i];
+    if (!isInsert4(op)) continue;
+    if (typeof op.insert === "string" && op.insert !== "\n") {
+      buf += op.insert;
+      currentTextOps.push(i);
+      continue;
+    }
+    if (isTableCellTerminator(op)) {
+      const row = op.attributes["table-row"];
+      const col = op.attributes["table-col"];
+      ends.push({ row, col, newlineIdx: i, text: buf });
+      textOpIndicesByCell.push([...currentTextOps]);
+      buf = "";
+      currentTextOps = [];
+    }
+  }
+  const row0 = ends.filter((e) => e.row === 0);
+  if (row0.length === 0) return [...ops];
+  if (!row0.every((e) => e.text.trim() === "")) return [...ops];
+  if (row0.some((e) => isHeaderDashPlaceholder(e.text))) return [...ops];
+  const remove = /* @__PURE__ */ new Set();
+  for (let j = 0; j < ends.length; j++) {
+    const end = ends[j];
+    if (end.row !== 0) continue;
+    remove.add(end.newlineIdx);
+    for (const ti of textOpIndicesByCell[j] ?? []) remove.add(ti);
+  }
+  const out = [];
+  for (let i = 0; i < ops.length; i++) {
+    if (remove.has(i)) continue;
+    const op = ops[i];
+    if (!isTableCellTerminator(op)) {
+      out.push(op);
+      continue;
+    }
+    const row = op.attributes["table-row"];
+    if (row === 0) continue;
+    const attrs = { ...op.attributes };
+    delete attrs["table-header"];
+    out.push({
+      insert: "\n",
+      attributes: { ...attrs, "table-row": row - 1 }
+    });
+  }
+  return out;
+}
+function normalizeHeaderDashPlaceholders(ops) {
+  const ends = [];
+  let buf = "";
+  let currentTextOps = [];
+  for (let i = 0; i < ops.length; i++) {
+    const op = ops[i];
+    if (!isInsert4(op)) continue;
+    if (typeof op.insert === "string" && op.insert !== "\n") {
+      buf += op.insert;
+      currentTextOps.push(i);
+      continue;
+    }
+    if (isTableCellTerminator(op)) {
+      const row = op.attributes["table-row"];
+      const isHeader = row === 0 && op.attributes["table-header"] === true;
+      ends.push({ isHeader, textOpIndices: [...currentTextOps], text: buf });
+      buf = "";
+      currentTextOps = [];
+    }
+  }
+  const dashHeaderCells = ends.filter(
+    (e) => e.isHeader && e.textOpIndices.length > 0 && isHeaderDashPlaceholder(e.text)
+  );
+  if (dashHeaderCells.length === 0) return [...ops];
+  const replaceIndices = /* @__PURE__ */ new Set();
+  for (const end of dashHeaderCells) {
+    for (const ti of end.textOpIndices) replaceIndices.add(ti);
+  }
+  const out = [];
+  for (let i = 0; i < ops.length; i++) {
+    const op = ops[i];
+    if (!replaceIndices.has(i)) {
+      out.push(op);
+      continue;
+    }
+    if (!isInsert4(op)) {
+      out.push(op);
+      continue;
+    }
+    if (typeof op.insert === "string" && op.insert !== "\n") {
+      const normalized = normalizeHeaderCellForParse(op.insert, true);
+      if (normalized.length === 0) continue;
+      out.push(
+        op.attributes ? { insert: normalized, attributes: op.attributes } : { insert: normalized }
+      );
+    } else {
+      out.push(op);
+    }
+  }
+  return out;
+}
+function normalizeImportedTableOps(ops) {
+  if (ops.length === 0) return [...ops];
+  const ends = [];
+  let buf = "";
+  for (const op of ops) {
+    if (!isInsert4(op)) continue;
+    if (typeof op.insert === "string" && op.insert !== "\n") {
+      buf += op.insert;
+      continue;
+    }
+    if (isTableCellTerminator(op)) {
+      ends.push({ row: op.attributes["table-row"], text: buf });
+      buf = "";
+    }
+  }
+  const row0 = ends.filter((e) => e.row === 0);
+  const headerless = row0.length > 0 && row0.every((e) => e.text.trim() === "") && !row0.some((e) => isHeaderDashPlaceholder(e.text));
+  if (headerless) return normalizeSyntheticEmptyHeaderRow(ops);
+  return normalizeHeaderDashPlaceholders(ops);
+}
+
+// src/conversion/markdown/markdown-to-delta.ts
 var remarkParse = null;
 var remarkGfm = null;
 var remarkMath = null;
@@ -5222,6 +5394,7 @@ function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock
   }
   function processTable(node) {
     if (!node.children) return;
+    const tableStart = delta.ops.length;
     const aligns = node.align || [];
     for (let rowIdx = 0; rowIdx < node.children.length; rowIdx++) {
       const rowNode = node.children[rowIdx];
@@ -5250,6 +5423,15 @@ function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock
         context.pushNewline(cellBlockAttrs);
       }
     }
+    const tableOps = delta.ops.splice(tableStart);
+    for (const op of normalizeImportedTableOps(tableOps)) {
+      if (!isInsert5(op)) continue;
+      if (op.attributes && Object.keys(op.attributes).length > 0) {
+        delta.insert(op.insert, op.attributes);
+      } else {
+        delta.insert(op.insert);
+      }
+    }
   }
   function isBlockLevelHtml(html) {
     return /^\s*<(div|table|section|article|aside|nav|header|footer|figure|pre|hr|ol|ul|dl|details|iframe|video)\b/i.test(
@@ -5431,9 +5613,9 @@ function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock
 }
 
 // src/conversion/markdown/table-region.ts
-import { isInsert as isInsert4, isTextInsert as isTextInsert3 } from "@scrider/delta";
+import { isInsert as isInsert6, isTextInsert as isTextInsert3 } from "@scrider/delta";
 function isTableNewlineOp(op) {
-  if (!op || !isInsert4(op) || !isTextInsert3(op)) return false;
+  if (!op || !isInsert6(op) || !isTextInsert3(op)) return false;
   if (!op.insert.includes("\n")) return false;
   return !!op.attributes && "table-row" in op.attributes;
 }
@@ -5442,7 +5624,7 @@ function extractTableRegion(ops, hintOpIdx) {
   let probeIdx = -1;
   for (let i = hintOpIdx; i < ops.length; i++) {
     const op = ops[i];
-    if (!op || !isInsert4(op)) continue;
+    if (!op || !isInsert6(op)) continue;
     if (isTextInsert3(op) && op.insert.includes("\n")) {
       probeIdx = i;
       break;
@@ -5453,7 +5635,7 @@ function extractTableRegion(ops, hintOpIdx) {
   let endOpIdx = probeIdx;
   for (let i = probeIdx + 1; i < ops.length; i++) {
     const op = ops[i];
-    if (!op || !isInsert4(op)) break;
+    if (!op || !isInsert6(op)) break;
     if (isTextInsert3(op) && op.insert.includes("\n")) {
       if (isTableNewlineOp(op)) {
         endOpIdx = i;
@@ -5465,7 +5647,7 @@ function extractTableRegion(ops, hintOpIdx) {
   let startOpIdx = 0;
   for (let i = probeIdx - 1; i >= 0; i--) {
     const op = ops[i];
-    if (!op || !isInsert4(op)) {
+    if (!op || !isInsert6(op)) {
       startOpIdx = i + 1;
       break;
     }