@scrider/formatter 1.8.0 → 1.8.1

package/dist/index.cjs

@@ -61,6 +61,7 @@ __export(index_exports, {
   codeBlockFormat: () => codeBlockFormat,
   codeFormat: () => codeFormat,
   codeWidgetFormat: () => codeWidgetFormat,
+  collectAdjacentTableLines: () => collectAdjacentTableLines,
   colorFormat: () => colorFormat,
   columnsBlockHandler: () => columnsBlockHandler,
   createDefaultBlockHandlers: () => createDefaultBlockHandlers,
@@ -88,6 +89,7 @@ __export(index_exports, {
   imageFormat: () => imageFormat,
   indentFormat: () => indentFormat,
   isAdapterAvailable: () => isAdapterAvailable,
+  isAdjacentSimpleTableGridBoundary: () => isAdjacentSimpleTableGridBoundary,
   isElement: () => isElement,
   isRemarkAvailable: () => isRemarkAvailable,
   isTableNewlineOp: () => isTableNewlineOp,
@@ -120,6 +122,8 @@ __export(index_exports, {
   subscriptFormat: () => subscriptFormat,
   superscriptFormat: () => superscriptFormat,
   tableBlockHandler: () => tableBlockHandler,
+  tableCellCoordsFromAttributes: () => tableCellCoordsFromAttributes,
+  tableCellCoordsFromOp: () => tableCellCoordsFromOp,
   tableColAlignFormat: () => tableColAlignFormat,
   tableColFormat: () => tableColFormat,
   tableHeaderFormat: () => tableHeaderFormat,
@@ -2778,7 +2782,7 @@ function isAdapterAvailable() {
 }
 
 // src/conversion/html/delta-to-html.ts
-var import_delta7 = require("@scrider/delta");
+var import_delta8 = require("@scrider/delta");
 
 // src/conversion/utils/slugify.ts
 function slugify(text) {
@@ -3001,6 +3005,97 @@ function buildTableCellStyleAttr(params) {
   return ` style="${parts.join("; ")}"`;
 }
 
+// src/conversion/markdown/table-region.ts
+var import_delta7 = require("@scrider/delta");
+function isTableNewlineOp(op) {
+  if (!op || !(0, import_delta7.isInsert)(op) || !(0, import_delta7.isTextInsert)(op)) return false;
+  if (!op.insert.includes("\n")) return false;
+  return !!op.attributes && "table-row" in op.attributes;
+}
+function tableCellCoordsFromAttributes(attrs) {
+  if (!attrs || typeof attrs["table-row"] !== "number" || typeof attrs["table-col"] !== "number") {
+    return null;
+  }
+  return { row: attrs["table-row"], col: attrs["table-col"] };
+}
+function tableCellCoordsFromOp(op) {
+  if (!isTableNewlineOp(op) || !(0, import_delta7.isTextInsert)(op)) return null;
+  return tableCellCoordsFromAttributes(op.attributes);
+}
+function isAdjacentSimpleTableGridBoundary(prev, next) {
+  if (next.row < prev.row) return true;
+  if (next.row === 0 && prev.row === 0 && next.col === 0 && prev.col > 0) return true;
+  return false;
+}
+function collectAdjacentTableLines(lines, startIndex) {
+  const result = [];
+  let prevCoords = null;
+  for (let i = startIndex; i < lines.length; i++) {
+    const line = lines[i];
+    if (line === void 0) break;
+    const coords = tableCellCoordsFromAttributes(line.attributes);
+    if (!coords) break;
+    if (prevCoords && isAdjacentSimpleTableGridBoundary(prevCoords, coords)) break;
+    result.push(line);
+    prevCoords = coords;
+  }
+  return result;
+}
+function extractTableRegion(ops, hintOpIdx) {
+  if (hintOpIdx < 0 || hintOpIdx >= ops.length) return null;
+  let probeIdx = -1;
+  for (let i = hintOpIdx; i < ops.length; i++) {
+    const op = ops[i];
+    if (!op || !(0, import_delta7.isInsert)(op)) continue;
+    if ((0, import_delta7.isTextInsert)(op) && op.insert.includes("\n")) {
+      probeIdx = i;
+      break;
+    }
+  }
+  if (probeIdx < 0) return null;
+  if (!isTableNewlineOp(ops[probeIdx])) return null;
+  const probeCoords = tableCellCoordsFromOp(ops[probeIdx]);
+  if (!probeCoords) return null;
+  let endOpIdx = probeIdx;
+  let prevCoords = probeCoords;
+  for (let i = probeIdx + 1; i < ops.length; i++) {
+    const op = ops[i];
+    if (!op || !(0, import_delta7.isInsert)(op)) break;
+    if (!(0, import_delta7.isTextInsert)(op) || !op.insert.includes("\n")) continue;
+    if (isTableNewlineOp(op)) {
+      const coords = tableCellCoordsFromOp(op);
+      if (isAdjacentSimpleTableGridBoundary(prevCoords, coords)) break;
+      prevCoords = coords;
+      endOpIdx = i;
+    } else {
+      break;
+    }
+  }
+  let startOpIdx = 0;
+  let nextCoords = probeCoords;
+  for (let i = probeIdx - 1; i >= 0; i--) {
+    const op = ops[i];
+    if (!op || !(0, import_delta7.isInsert)(op)) {
+      startOpIdx = i + 1;
+      break;
+    }
+    if (!(0, import_delta7.isTextInsert)(op) || !op.insert.includes("\n")) continue;
+    if (isTableNewlineOp(op)) {
+      const coords = tableCellCoordsFromOp(op);
+      if (isAdjacentSimpleTableGridBoundary(coords, nextCoords)) {
+        startOpIdx = i + 1;
+        break;
+      }
+      nextCoords = coords;
+    } else {
+      startOpIdx = i + 1;
+      break;
+    }
+  }
+  const regionOps = ops.slice(startOpIdx, endOpIdx + 1);
+  return { startOpIdx, endOpIdx, ops: regionOps };
+}
+
 // src/conversion/html/delta-to-html.ts
 function deltaToHtml(delta, options = {}) {
   const lines = splitIntoLines(delta);
@@ -3021,7 +3116,7 @@ function deltaToHtml(delta, options = {}) {
       html += closeAllLists(listStack, pretty);
       listStack = [];
       counters = [];
-      const tableLines = collectTableLines(lines, i);
+      const tableLines = collectAdjacentTableLines(lines, i);
       html += renderTable(tableLines, embedRenderers, pretty, blockHandlers, options);
       i += tableLines.length - 1;
       continue;
@@ -3130,8 +3225,8 @@ function splitIntoLines(delta) {
   const lines = [];
   let currentOps = [];
   for (const op of delta.ops) {
-    if (!(0, import_delta7.isInsert)(op)) continue;
-    if ((0, import_delta7.isEmbedInsert)(op)) {
+    if (!(0, import_delta8.isInsert)(op)) continue;
+    if ((0, import_delta8.isEmbedInsert)(op)) {
       currentOps.push(op);
       continue;
     }
@@ -3168,7 +3263,7 @@ var BLOCK_LEVEL_EMBEDS = /* @__PURE__ */ new Set(["divider", "block"]);
 function isBlockLevelEmbedLine(line) {
   if (line.ops.length !== 1) return false;
   const op = line.ops[0];
-  if (!op || !(0, import_delta7.isEmbedInsert)(op)) return false;
+  if (!op || !(0, import_delta8.isEmbedInsert)(op)) return false;
   const embed = op.insert;
   const embedType = Object.keys(embed)[0];
   if (!!embedType && BLOCK_LEVEL_EMBEDS.has(embedType)) return true;
@@ -3179,15 +3274,6 @@ function isBlockLevelEmbedLine(line) {
 function isTableLine(line) {
   return line.attributes != null && typeof line.attributes["table-row"] === "number" && typeof line.attributes["table-col"] === "number";
 }
-function collectTableLines(lines, startIndex) {
-  const result = [];
-  for (let i = startIndex; i < lines.length; i++) {
-    const line = lines[i];
-    if (!line || !isTableLine(line)) break;
-    result.push(line);
-  }
-  return result;
-}
 function renderTable(tableLines, embedRenderers, pretty, blockHandlers, options) {
   const rows = /* @__PURE__ */ new Map();
   for (const line of tableLines) {
@@ -3458,7 +3544,7 @@ function getBlockStyleAttribute(tag, attributes, resolvedDocumentPresentation) {
 function extractPlainText(ops) {
   let text = "";
   for (const op of ops) {
-    if ((0, import_delta7.isInsert)(op) && typeof op.insert === "string") {
+    if ((0, import_delta8.isInsert)(op) && typeof op.insert === "string") {
       text += op.insert;
     }
   }
@@ -3467,8 +3553,8 @@ function extractPlainText(ops) {
 function renderLineContent(ops, embedRenderers, blockHandlers, options) {
   let html = "";
   for (const op of ops) {
-    if (!(0, import_delta7.isInsert)(op)) continue;
-    if ((0, import_delta7.isEmbedInsert)(op)) {
+    if (!(0, import_delta8.isInsert)(op)) continue;
+    if ((0, import_delta8.isEmbedInsert)(op)) {
       html += renderEmbed(
         op.insert,
         op.attributes,
@@ -3524,7 +3610,7 @@ function renderEmbed(value, attributes, renderers, blockHandlers, options) {
         const context = {
           registry: null,
           options: { pretty: options?.pretty ?? false },
-          renderDelta: (ops) => deltaToHtml(new import_delta7.Delta(ops), options ?? {}),
+          renderDelta: (ops) => deltaToHtml(new import_delta8.Delta(ops), options ?? {}),
           ...attributes ? { opAttributes: attributes } : {}
         };
         return handler.toHtml(blockData, context);
@@ -3549,13 +3635,13 @@ function renderEmbed(value, attributes, renderers, blockHandlers, options) {
 }
 
 // src/conversion/html/html-to-delta.ts
-var import_delta8 = require("@scrider/delta");
+var import_delta9 = require("@scrider/delta");
 function htmlToDelta(html, options = {}) {
   const adapter = options.adapter ?? getAdapter();
   const normalizeWhitespace = options.normalizeWhitespace ?? true;
   const tagHandlers = { ...DEFAULT_TAG_HANDLERS, ...options.tagHandlers };
   const fragment = adapter.parseHTML(html);
-  const delta = new import_delta8.Delta();
+  const delta = new import_delta9.Delta();
   let currentAttributes = {};
   let currentBlockAttributes = {};
   let pendingText = "";
@@ -4265,7 +4351,7 @@ var DEFAULT_TAG_HANDLERS = {
 };
 
 // src/conversion/markdown/delta-to-markdown.ts
-var import_delta9 = require("@scrider/delta");
+var import_delta10 = require("@scrider/delta");
 
 // src/conversion/markdown/config.ts
 var MARKDOWN_ESCAPE_CHARS = /[\\`*_[\]<>#]/g;
@@ -4353,7 +4439,7 @@ function deltaToMarkdown(delta, options = {}) {
     const attrs = line.attributes;
     const isBlockquote = !!attrs.blockquote;
     if (typeof attrs["table-row"] === "number" && typeof attrs["table-col"] === "number") {
-      const tableLines = collectTableLines2(lines, i);
+      const tableLines = collectAdjacentTableLines(lines, i);
       result.push(
         renderMarkdownTable(tableLines, embedRenderers, useLatexDelimiters, registry, softBreakStyle)
       );
@@ -4458,9 +4544,9 @@ function splitIntoLines2(ops) {
   const lines = [];
   let currentOps = [];
   for (const op of ops) {
-    if (!(0, import_delta9.isInsert)(op)) continue;
+    if (!(0, import_delta10.isInsert)(op)) continue;
     const opAttrs = op.attributes ?? {};
-    if ((0, import_delta9.isTextInsert)(op)) {
+    if ((0, import_delta10.isTextInsert)(op)) {
       const text = op.insert;
       const parts = text.split("\n");
       for (let i = 0; i < parts.length; i++) {
@@ -4525,17 +4611,6 @@ function collectCodeBlock(lines, startIndex) {
   }
   return codeLines;
 }
-function collectTableLines2(lines, startIndex) {
-  const result = [];
-  for (let i = startIndex; i < lines.length; i++) {
-    const line = lines[i];
-    if (!line || typeof line.attributes["table-row"] !== "number" || typeof line.attributes["table-col"] !== "number") {
-      break;
-    }
-    result.push(line);
-  }
-  return result;
-}
 function renderMarkdownTable(tableLines, embedRenderers, useLatexDelimiters = false, registry, softBreakStyle = "spaces") {
   const rows = /* @__PURE__ */ new Map();
   for (const line of tableLines) {
@@ -4671,14 +4746,14 @@ function renderLineContent2(ops, embedRenderers, inCodeBlock, useLatexDelimiters
   let result = "";
   for (const op of ops) {
     const attrs = op.attributes;
-    if ((0, import_delta9.isTextInsert)(op)) {
+    if ((0, import_delta10.isTextInsert)(op)) {
       const text = op.insert;
       if (inCodeBlock) {
         result += text;
       } else {
         result += renderInlineText2(text, attrs);
       }
-    } else if ((0, import_delta9.isEmbedInsert)(op)) {
+    } else if ((0, import_delta10.isEmbedInsert)(op)) {
       const embed = op.insert;
       result += renderEmbed2(
         embed,
@@ -4743,7 +4818,7 @@ function renderEmbed2(embed, attributes, customRenderers, useLatexDelimiters = f
         if (handler.toMarkdown) {
           const mdContext = {
             registry: void 0,
-            renderDelta: (ops) => deltaToMarkdown(new import_delta9.Delta(ops), { blockHandlers }),
+            renderDelta: (ops) => deltaToMarkdown(new import_delta10.Delta(ops), { blockHandlers }),
             ...opAttrs
           };
           const md = handler.toMarkdown(blockData, mdContext);
@@ -4752,7 +4827,7 @@ function renderEmbed2(embed, attributes, customRenderers, useLatexDelimiters = f
         const htmlContext = {
           registry: void 0,
           ...prettyHtml ? { options: { pretty: true } } : {},
-          renderDelta: (ops) => deltaToHtml(new import_delta9.Delta(ops), { blockHandlers, pretty: prettyHtml }),
+          renderDelta: (ops) => deltaToHtml(new import_delta10.Delta(ops), { blockHandlers, pretty: prettyHtml }),
           ...opAttrs
         };
         return "\n" + handler.toHtml(blockData, htmlContext) + "\n";
@@ -4900,12 +4975,12 @@ function renderBlockFormat(content, attributes, orderedIndex, _strict) {
 }
 
 // src/conversion/markdown/markdown-to-delta.ts
-var import_delta11 = require("@scrider/delta");
+var import_delta12 = require("@scrider/delta");
 
 // src/conversion/markdown/table-header-normalize.ts
-var import_delta10 = require("@scrider/delta");
+var import_delta11 = require("@scrider/delta");
 function isTableCellTerminator(op) {
-  return (0, import_delta10.isInsert)(op) && typeof op.insert === "string" && op.insert === "\n" && op.attributes !== void 0 && typeof op.attributes["table-row"] === "number";
+  return (0, import_delta11.isInsert)(op) && typeof op.insert === "string" && op.insert === "\n" && op.attributes !== void 0 && typeof op.attributes["table-row"] === "number";
 }
 function normalizeSyntheticEmptyHeaderRow(ops) {
   const ends = [];
@@ -4914,7 +4989,7 @@ function normalizeSyntheticEmptyHeaderRow(ops) {
   let currentTextOps = [];
   for (let i = 0; i < ops.length; i++) {
     const op = ops[i];
-    if (!(0, import_delta10.isInsert)(op)) continue;
+    if (!(0, import_delta11.isInsert)(op)) continue;
     if (typeof op.insert === "string" && op.insert !== "\n") {
       buf += op.insert;
       currentTextOps.push(i);
@@ -4965,7 +5040,7 @@ function normalizeHeaderDashPlaceholders(ops) {
   let currentTextOps = [];
   for (let i = 0; i < ops.length; i++) {
     const op = ops[i];
-    if (!(0, import_delta10.isInsert)(op)) continue;
+    if (!(0, import_delta11.isInsert)(op)) continue;
     if (typeof op.insert === "string" && op.insert !== "\n") {
       buf += op.insert;
       currentTextOps.push(i);
@@ -4994,7 +5069,7 @@ function normalizeHeaderDashPlaceholders(ops) {
       out.push(op);
       continue;
     }
-    if (!(0, import_delta10.isInsert)(op)) {
+    if (!(0, import_delta11.isInsert)(op)) {
       out.push(op);
       continue;
     }
@@ -5015,7 +5090,7 @@ function normalizeImportedTableOps(ops) {
   const ends = [];
   let buf = "";
   for (const op of ops) {
-    if (!(0, import_delta10.isInsert)(op)) continue;
+    if (!(0, import_delta11.isInsert)(op)) continue;
     if (typeof op.insert === "string" && op.insert !== "\n") {
       buf += op.insert;
       continue;
@@ -5168,7 +5243,7 @@ function markdownToDeltaSync(markdown, options = {}) {
   );
 }
 function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock, blockHandlers) {
-  const delta = new import_delta11.Delta();
+  const delta = new import_delta12.Delta();
   let currentInlineAttrs = {};
   let pendingText = "";
   const spanAttrStack = [];
@@ -5551,7 +5626,7 @@ function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock
     }
     const tableOps = delta.ops.splice(tableStart);
     for (const op of normalizeImportedTableOps(tableOps)) {
-      if (!(0, import_delta11.isInsert)(op)) continue;
+      if (!(0, import_delta12.isInsert)(op)) continue;
       if (op.attributes && Object.keys(op.attributes).length > 0) {
         delta.insert(op.insert, op.attributes);
       } else {
@@ -5737,54 +5812,6 @@ function astToDelta(tree, customHandlers, mathBlock, mermaidBlock, plantumlBlock
   }
   return delta;
 }
-
-// src/conversion/markdown/table-region.ts
-var import_delta12 = require("@scrider/delta");
-function isTableNewlineOp(op) {
-  if (!op || !(0, import_delta12.isInsert)(op) || !(0, import_delta12.isTextInsert)(op)) return false;
-  if (!op.insert.includes("\n")) return false;
-  return !!op.attributes && "table-row" in op.attributes;
-}
-function extractTableRegion(ops, hintOpIdx) {
-  if (hintOpIdx < 0 || hintOpIdx >= ops.length) return null;
-  let probeIdx = -1;
-  for (let i = hintOpIdx; i < ops.length; i++) {
-    const op = ops[i];
-    if (!op || !(0, import_delta12.isInsert)(op)) continue;
-    if ((0, import_delta12.isTextInsert)(op) && op.insert.includes("\n")) {
-      probeIdx = i;
-      break;
-    }
-  }
-  if (probeIdx < 0) return null;
-  if (!isTableNewlineOp(ops[probeIdx])) return null;
-  let endOpIdx = probeIdx;
-  for (let i = probeIdx + 1; i < ops.length; i++) {
-    const op = ops[i];
-    if (!op || !(0, import_delta12.isInsert)(op)) break;
-    if ((0, import_delta12.isTextInsert)(op) && op.insert.includes("\n")) {
-      if (isTableNewlineOp(op)) {
-        endOpIdx = i;
-      } else {
-        break;
-      }
-    }
-  }
-  let startOpIdx = 0;
-  for (let i = probeIdx - 1; i >= 0; i--) {
-    const op = ops[i];
-    if (!op || !(0, import_delta12.isInsert)(op)) {
-      startOpIdx = i + 1;
-      break;
-    }
-    if ((0, import_delta12.isTextInsert)(op) && op.insert.includes("\n") && !isTableNewlineOp(op)) {
-      startOpIdx = i + 1;
-      break;
-    }
-  }
-  const regionOps = ops.slice(startOpIdx, endOpIdx + 1);
-  return { startOpIdx, endOpIdx, ops: regionOps };
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ALERT_TYPES,
@@ -5817,6 +5844,7 @@ function extractTableRegion(ops, hintOpIdx) {
   codeBlockFormat,
   codeFormat,
   codeWidgetFormat,
+  collectAdjacentTableLines,
   colorFormat,
   columnsBlockHandler,
   createDefaultBlockHandlers,
@@ -5844,6 +5872,7 @@ function extractTableRegion(ops, hintOpIdx) {
   imageFormat,
   indentFormat,
   isAdapterAvailable,
+  isAdjacentSimpleTableGridBoundary,
   isElement,
   isRemarkAvailable,
   isTableNewlineOp,
@@ -5876,6 +5905,8 @@ function extractTableRegion(ops, hintOpIdx) {
   subscriptFormat,
   superscriptFormat,
   tableBlockHandler,
+  tableCellCoordsFromAttributes,
+  tableCellCoordsFromOp,
   tableColAlignFormat,
   tableColFormat,
   tableHeaderFormat,