@scrider/formatter 1.8.5 → 1.8.7

package/dist/index.d.cts

@@ -482,6 +482,8 @@ declare class BlockHandlerRegistry {
 
 /** Block-level float on extended table host (4.2.10). */
 type TableBlockFloat = 'left' | 'center' | 'right';
+/** Block position when width is narrower than the line (margin-based, no float). */
+type TableBlockAlign = 'left' | 'center' | 'right' | 'justify';
 /**
  * Column alignment options (GFM column-level subset).
  */
@@ -531,6 +533,8 @@ interface TableBlockData {
     width?: number;
     /** Block-level float on host wrapper (4.2.10). */
     float?: TableBlockFloat;
+    /** Block position when width is set (margin-based, no float). */
+    blockAlign?: TableBlockAlign;
     /** Column alignments */
     colAligns?: (CellAlign | null)[];
     /** Cells indexed by "row:col" */

package/dist/index.d.ts

@@ -482,6 +482,8 @@ declare class BlockHandlerRegistry {
 
 /** Block-level float on extended table host (4.2.10). */
 type TableBlockFloat = 'left' | 'center' | 'right';
+/** Block position when width is narrower than the line (margin-based, no float). */
+type TableBlockAlign = 'left' | 'center' | 'right' | 'justify';
 /**
  * Column alignment options (GFM column-level subset).
  */
@@ -531,6 +533,8 @@ interface TableBlockData {
     width?: number;
     /** Block-level float on host wrapper (4.2.10). */
     float?: TableBlockFloat;
+    /** Block position when width is set (margin-based, no float). */
+    blockAlign?: TableBlockAlign;
     /** Column alignments */
     colAligns?: (CellAlign | null)[];
     /** Cells indexed by "row:col" */

package/dist/index.js

@@ -627,6 +627,7 @@ function toCodeWidgetEmbedUrl(url) {
 var EXT_TABLE_HOST_ATTR = "data-scrider-ext-table";
 var EXT_TABLE_HOST_CLASS = "scrider-ext-table-host";
 var VALID_TABLE_BLOCK_FLOATS = ["left", "center", "right"];
+var VALID_TABLE_BLOCK_ALIGNS = ["left", "center", "right", "justify"];
 var VALID_CELL_HORIZONTAL_ALIGNS = [
   "left",
   "center",
@@ -653,6 +654,18 @@ function getGridDimensions(cells) {
   if (maxRow < 0 || maxCol < 0) return null;
   return [maxRow + 1, maxCol + 1];
 }
+function rowspanCrossesHeaderBoundary(cells, headerRows) {
+  if (headerRows <= 0) return false;
+  for (const [key, cell] of Object.entries(cells)) {
+    if (cell === null) continue;
+    const parsed = parseCellKey(key);
+    if (!parsed) continue;
+    const [row] = parsed;
+    const rowspan = cell.rowspan ?? 1;
+    if (row < headerRows && row + rowspan > headerRows) return true;
+  }
+  return false;
+}
 function isValidCellData(cell) {
   if (typeof cell !== "object" || cell === null || !Array.isArray(cell.ops) || cell.ops.length === 0) {
     return false;
@@ -818,6 +831,12 @@ function parseTableBlockFloat(value) {
   if (value === "left" || value === "center" || value === "right") return value;
   return void 0;
 }
+function parseTableBlockAlign(value) {
+  if (value === "left" || value === "center" || value === "right" || value === "justify") {
+    return value;
+  }
+  return void 0;
+}
 function extractHostBlockWidthPx(host) {
   const style = host.getAttribute("style") || "";
   const widthMatch = style.match(/(?:^|;\s*)width:\s*([\d.]+)px/i);
@@ -828,25 +847,32 @@ function extractHostBlockWidthPx(host) {
 }
 function enrichTableBlockFromHost(data, host) {
   const float = parseTableBlockFloat(host.getAttribute("data-float"));
+  const blockAlign = parseTableBlockAlign(host.getAttribute("data-block-align"));
   const width = extractHostBlockWidthPx(host);
-  if (float == null && width == null) return data;
+  if (float == null && blockAlign == null && width == null) return data;
   const next = { ...data };
   if (float != null) next.float = float;
+  if (blockAlign != null && float == null) next.blockAlign = blockAlign;
   if (width != null) next.width = width;
   return next;
 }
 function tableNeedsHostWrapper(data) {
-  return data.float != null && VALID_TABLE_BLOCK_FLOATS.includes(data.float) || data.width != null && data.width > 0;
+  return data.float != null && VALID_TABLE_BLOCK_FLOATS.includes(data.float) || data.width != null && data.width > 0 || data.float == null && data.blockAlign != null && VALID_TABLE_BLOCK_ALIGNS.includes(data.blockAlign);
 }
 function renderTableHostWrapperOpen(data, pretty) {
   const nl = pretty ? "\n" : "";
   const ind = pretty ? "  " : "";
   const attrs = [`class="${EXT_TABLE_HOST_CLASS}"`, EXT_TABLE_HOST_ATTR];
   if (data.float) attrs.push(`data-float="${escapeHtml(data.float)}"`);
+  if (data.blockAlign && !data.float) {
+    attrs.push(`data-block-align="${escapeHtml(data.blockAlign)}"`);
+  }
   const styleParts = [];
   if (data.width != null && data.width > 0) {
     styleParts.push(`width: ${Math.round(data.width)}px`);
     styleParts.push("max-width: 100%");
+  } else if (data.blockAlign === "justify" && !data.float) {
+    styleParts.push("width: 100%");
   }
   if (styleParts.length > 0) attrs.push(`style="${styleParts.join("; ")}"`);
   return `<div ${attrs.join(" ")}>${nl}${ind}`;
@@ -867,6 +893,9 @@ function isGfmCompatible(data) {
   if (data.float != null) {
     return false;
   }
+  if (data.blockAlign != null) {
+    return false;
+  }
   for (const cell of Object.values(data.cells)) {
     if (cell !== null && cell.align !== void 0) return false;
   }
@@ -955,6 +984,26 @@ function collectTableRows(table) {
   }
   return { rows, headerRowCount };
 }
+function inferHeaderRowsFromThPrefix(rows) {
+  let count = 0;
+  for (const row of rows) {
+    let hasCell = false;
+    let allTh = true;
+    const cellChildren = row.childNodes;
+    for (let i = 0; i < cellChildren.length; i++) {
+      const cell = cellChildren[i];
+      if (!cell || !isElement(cell)) continue;
+      const tag = cell.tagName.toLowerCase();
+      if (tag !== "td" && tag !== "th") continue;
+      hasCell = true;
+      if (tag !== "th") allTh = false;
+    }
+    if (!hasCell) continue;
+    if (!allTh) break;
+    count++;
+  }
+  return count;
+}
 function extractColWidths(table) {
   const children = table.childNodes;
   for (let i = 0; i < children.length; i++) {
@@ -1042,7 +1091,13 @@ function extractInlineHorizontalAlign(element) {
   return null;
 }
 function parseTableElement(table, context) {
-  const { rows, headerRowCount } = collectTableRows(table);
+  const collected = collectTableRows(table);
+  const { rows } = collected;
+  let headerRowCount = collected.headerRowCount;
+  if (headerRowCount === 0) {
+    const inferred = inferHeaderRowsFromThPrefix(rows);
+    if (inferred > 0) headerRowCount = inferred;
+  }
   if (rows.length === 0) return null;
   const cells = {};
   const colAligns = [];
@@ -1225,6 +1280,9 @@ var tableBlockHandler = {
     if (data.float !== void 0 && !VALID_TABLE_BLOCK_FLOATS.includes(data.float)) {
       return false;
     }
+    if (data.blockAlign !== void 0 && !VALID_TABLE_BLOCK_ALIGNS.includes(data.blockAlign)) {
+      return false;
+    }
     if (data.colAligns !== void 0) {
       if (!Array.isArray(data.colAligns) || data.colAligns.length !== cols) {
         return false;
@@ -1260,14 +1318,15 @@ var tableBlockHandler = {
       }
       html += `${ind(1)}</colgroup>${nl}`;
     }
-    if (headerRows > 0) {
+    const splitHeaderSection = headerRows > 0 && !rowspanCrossesHeaderBoundary(data.cells, headerRows);
+    if (splitHeaderSection) {
       html += `${ind(1)}<thead>${nl}`;
       for (let r = 0; r < headerRows; r++) {
         html += renderExtendedRow(data, r, cols, "th", context, pretty);
       }
       html += `${ind(1)}</thead>${nl}`;
     }
-    const bodyStart = headerRows;
+    const bodyStart = splitHeaderSection ? headerRows : 0;
     if (bodyStart < rows) {
       html += `${ind(1)}<tbody>${nl}`;
       for (let r = bodyStart; r < rows; r++) {