@podlite/schema 0.0.36 → 0.0.38

package/esm/helpers/config.d.ts

@@ -4,6 +4,7 @@ export declare type Context = {
 export interface Attr {
     getAllValues: (name: any) => any;
     getFirstValue: (name: any) => any;
+    getMapValue: (name: string) => Record<string, string | number | boolean> | undefined;
     asHash: () => {};
     (): {};
     exists(name: string): boolean;

package/esm/helpers/config.js

@@ -40,6 +40,14 @@ export const makeAttrs = (node, ctx = {}) => {
     resfn.getFirstValue = name => {
         return resfn.exists(name) ? resfn.getAllValues(name)[0] : undefined;
     };
+    /**
+     * return first map-typed value (from `:attr{ k=>v, ... }` syntax) or
+     * undefined when the attribute is absent or not a map value
+     */
+    resfn.getMapValue = name => {
+        const first = resfn.getFirstValue(name);
+        return first && typeof first === 'object' && !Array.isArray(first) ? first : undefined;
+    };
     /**
      * return key: val
      *

package/esm/helpers/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/helpers/config.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,MAAe,EAAE,EAAQ,EAAE;IACzD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9D,wBAAwB;IACxB,IAAI,UAAU,GAAG,EAAE,CAAA;IACnB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACtD,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACnC;IACD,IAAI,MAAM,GAAG,EAAE,CACd;IAAA,CAAC,GAAG,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAClC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;YAClC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;SACpB;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;YACtB,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAA;SAChC;aAAM;YACL,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAC,CAAA;IACF,IAAI,KAAK,GAAG,cAAa,CAAS,CAAA;IAClC;;;;OAIG;IACH,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;IAElD;;;;OAIG;IACH,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC/C,CAAC,CAAA;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,EAAE;QAC3B,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACrE,CAAC,CAAA;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC,MAAM,CAAA;IAE3B,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AACD,eAAe,SAAS,CAAA"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/helpers/config.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,MAAe,EAAE,EAAQ,EAAE;IACzD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9D,wBAAwB;IACxB,IAAI,UAAU,GAAG,EAAE,CAAA;IACnB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACtD,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACnC;IACD,IAAI,MAAM,GAAG,EAAE,CACd;IAAA,CAAC,GAAG,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAClC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;YAClC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;SACpB;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE;YACtB,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAA;SAChC;aAAM;YACL,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SAC7B;IACH,CAAC,CAAC,CAAA;IACF,IAAI,KAAK,GAAG,cAAa,CAAS,CAAA;IAClC;;;;OAIG;IACH,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;IAElD;;;;OAIG;IACH,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC/C,CAAC,CAAA;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,EAAE;QAC3B,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACrE,CAAC,CAAA;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE;QACzB,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QACvC,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;IACxF,CAAC,CAAA;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC,MAAM,CAAA;IAE3B,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AACD,eAAe,SAAS,CAAA"}

package/esm/plugin-tables.d.ts

@@ -1,5 +1,2 @@
 declare const _default: () => (tree: any) => any;
-/**
- *  Main transforms
- */
 export default _default;

package/esm/plugin-tables.js

@@ -77,9 +77,35 @@ const extractColumnsByTemplate = (text, template) => {
 /**
  *  Main transforms
  */
+const wrapImplicitCells = rowNode => {
+    if (!Array.isArray(rowNode.content) || rowNode.content.length === 0)
+        return rowNode;
+    const hasNonCell = rowNode.content.some(c => c && c.type === 'block' && c.name !== 'cell' && c.name !== 'blankline');
+    if (!hasNonCell)
+        return rowNode;
+    const wrapped = rowNode.content.map(c => {
+        if (!c || c.type !== 'block')
+            return c;
+        if (c.name === 'cell' || c.name === 'blankline')
+            return c;
+        return { type: 'block', name: 'cell', content: [c], margin: c.margin || '' };
+    });
+    return { ...rowNode, content: wrapped };
+};
+const isStructured = tableNode => Array.isArray(tableNode.content) &&
+    tableNode.content.some(c => c && c.type === 'block' && (c.name === 'row' || c.name === 'cell'));
 export default () => tree => {
     const transformer = makeTransformer({
         table: node => {
+            // structured mode: transform row children (wrap implicit cells)
+            if (isStructured(node)) {
+                const transformedContent = (node.content || []).map(c => {
+                    if (c && c.name === 'row')
+                        return wrapImplicitCells(c);
+                    return c;
+                });
+                return { ...node, content: transformedContent };
+            }
             let rows = [];
             const collectValues = row => {
                 rows.push(row.value);
@@ -111,9 +137,12 @@ export default () => tree => {
                 },
             })(node);
             const columnTemplate = makeMask(lines, separators);
-            const makeBlock = (name, content, ...attr) => {
-                return { ...attr, name, type: 'block', content: Array.isArray(content) ? content : [content] };
+            const makeBlock = (name, content, extra = {}) => {
+                return { ...extra, name, type: 'block', content: Array.isArray(content) ? content : [content] };
             };
+            const makeRow = cells => makeBlock('row', cells);
+            const makeHeaderRow = cells => makeBlock('row', cells, { config: [{ name: 'header', value: true, type: 'boolean' }] });
+            const makeCell = text => makeBlock('cell', { type: 'text', value: text });
             // make columns
             const res = makeTransformer({
                 'row:text': row => {
@@ -121,16 +150,16 @@ export default () => tree => {
                         // split each text row into lines
                         const textRowsLines = flattenDeep([row.value].map(splitToLines));
                         return textRowsLines.map(rowValue => {
-                            const res = extractColumnsByTemplate(rowValue, columnTemplate);
-                            return makeBlock('table_row', res.map(col => makeBlock('table_cell', { type: 'text', value: col })));
+                            const cols = extractColumnsByTemplate(rowValue, columnTemplate);
+                            return makeRow(cols.map(makeCell));
                         });
                     }
-                    const res = extractColumnsByTemplate(row.value, columnTemplate);
-                    return makeBlock('table_row', res.map(col => makeBlock('table_cell', { type: 'text', value: col })));
+                    const cols = extractColumnsByTemplate(row.value, columnTemplate);
+                    return makeRow(cols.map(makeCell));
                 },
                 'head:text': head => {
-                    const res = extractColumnsByTemplate(head.value, columnTemplate);
-                    return makeBlock('table_head', res.map(col => makeBlock('table_cell', { type: 'text', value: col })));
+                    const cols = extractColumnsByTemplate(head.value, columnTemplate);
+                    return makeHeaderRow(cols.map(makeCell));
                 },
             })(node);
             return res;

package/esm/plugin-tables.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-tables.js","sourceRoot":"","sources":["../src/plugin-tables.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-tables.js","sourceRoot":"","sources":["../src/plugin-tables.ts"],"names":[],"mappings":"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"}

package/esm/types.d.ts

@@ -24,7 +24,9 @@ export interface RulesStrict {
     'D<>': RuleHandler<FormattingCodeD>;
     'E<>': RuleHandler<FormattingCodeE>;
     'F<>': RuleHandler<FormattingCodeF>;
+    'H<>': RuleHandler<FormattingCodeAny>;
     'I<>': RuleHandler<FormattingCodeI>;
+    'J<>': RuleHandler<FormattingCodeAny>;
     'K<>': RuleHandler<FormattingCodeAny>;
     'R<>': RuleHandler<FormattingCodeAny>;
     'T<>': RuleHandler<FormattingCodeAny>;
@@ -35,7 +37,7 @@ export interface RulesStrict {
     'L<>': RuleHandler<FormattingCodeL>;
     'U<>': RuleHandler<FormattingCodeAny>;
     'Z<>': RuleHandler<FormattingCodeAny>;
-    'Delete<>': RuleHandler<FormattingCodeAny>;
+    'O<>': RuleHandler<FormattingCodeAny>;
     pod: RuleHandler<Para>;
     root: RuleHandler<RootBlock>;
     ':para': RuleHandler<Para>;
@@ -68,9 +70,8 @@ export interface RulesStrict {
     'table:block': RuleHandler<BlockTable>;
     table: RuleHandler<BlockTable>;
     ':separator': RuleHandler<Separator>;
-    table_row: RuleHandler<TableRow>;
-    table_cell: RuleHandler<TableCell>;
-    table_head: RuleHandler<TableHead>;
+    row: RuleHandler<TableRow>;
+    cell: RuleHandler<TableCell>;
     toc: RuleHandler<BlockToc>;
     ':toc': RuleHandler<Toc>;
     ':toc-list': RuleHandler<TocList>;
@@ -100,6 +101,7 @@ export interface Image {
 export interface Toc {
     type: 'toc';
     title?: string;
+    folded?: boolean;
     foldedLevels?: Record<number, boolean>;
     content: TocList;
 }
@@ -342,17 +344,17 @@ export interface BlockTable extends Omit<Block, 'content'> {
     text?: string;
 }
 export interface TableCell {
-    name: 'table_cell';
+    name: 'cell';
     type: 'block';
     content: Array<string>;
 }
 export interface TableRow {
-    name: 'table_row';
+    name: 'row';
     type: 'block';
     content: Array<TableCell>;
 }
 export interface TableHead {
-    name: 'table_head';
+    name: 'row';
     type: 'block';
     content: Array<TableCell>;
 }

package/lib/blocks-helpers.d.ts

@@ -7,7 +7,7 @@ export declare const mkBlankline: () => {
 };
 export declare const mkFomattingCode: (attrs: any, content: any) => any;
 export declare const mkFomattingCodeL: (attrs: any, content: any) => FormattingCodeL;
-export declare const mkFomattingCodeDelete: (content: any) => {
+export declare const mkFomattingCodeO: (content: any) => {
     type: string;
     name: string;
     content: any[];
@@ -17,7 +17,7 @@ export declare const mkVerbatim: (text: any) => {
     type: string;
     value: any;
 };
-export declare const mkToc: (content: TocList, title?: string, location?: Location, foldedLevels?: Record<number, boolean>) => Toc;
+export declare const mkToc: (content: TocList, title?: string, location?: Location, foldedLevels?: Record<number, boolean>, folded?: boolean) => Toc;
 export declare const mkTocList: (content: Array<TocItem | TocList>, level: number) => TocList;
 export declare const mkTocItem: (content: PodNode) => TocItem;
 export declare const mkCaption: (content: Array<Node>) => BlockCaption;

package/lib/blocks-helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mkFormulaBlock = exports.mkItemBlock = exports.mkRootBlock = exports.mkImage = exports.mkCaption = exports.mkTocItem = exports.mkTocList = exports.mkToc = exports.mkVerbatim = exports.mkMarkupCodeF = exports.mkFomattingCodeDelete = exports.mkFomattingCodeL = exports.mkFomattingCode = exports.mkBlankline = exports.mkBlock = exports.filterNulls = exports.mkNode = void 0;
+exports.mkFormulaBlock = exports.mkItemBlock = exports.mkRootBlock = exports.mkImage = exports.mkCaption = exports.mkTocItem = exports.mkTocList = exports.mkToc = exports.mkVerbatim = exports.mkMarkupCodeF = exports.mkFomattingCodeO = exports.mkFomattingCodeL = exports.mkFomattingCode = exports.mkBlankline = exports.mkBlock = exports.filterNulls = exports.mkNode = void 0;
 const nanoid_1 = require("nanoid");
 const mkNode = (attr) => {
     return { ...attr };
@@ -33,10 +33,10 @@ const mkFomattingCodeL = (attrs, content) => {
     return (0, exports.mkNode)({ ...attrs, type: 'fcode', name: 'L', content: (0, exports.filterNulls)(content) });
 };
 exports.mkFomattingCodeL = mkFomattingCodeL;
-const mkFomattingCodeDelete = content => {
-    return (0, exports.mkNode)({ type: 'fcode', name: 'Delete', content: (0, exports.filterNulls)(content) });
+const mkFomattingCodeO = content => {
+    return (0, exports.mkNode)({ type: 'fcode', name: 'O', content: (0, exports.filterNulls)(content) });
 };
-exports.mkFomattingCodeDelete = mkFomattingCodeDelete;
+exports.mkFomattingCodeO = mkFomattingCodeO;
 const mkMarkupCodeF = (formula) => {
     return (0, exports.mkNode)({ type: 'fcode', name: 'F', content: [{ type: 'text', value: formula }] });
 };
@@ -46,8 +46,15 @@ const mkVerbatim = text => {
 };
 exports.mkVerbatim = mkVerbatim;
 // Table of contents helpers
-const mkToc = (content, title, location, foldedLevels) => {
-    return (0, exports.mkNode)({ type: 'toc', title, content, location, ...(foldedLevels ? { foldedLevels } : {}) });
+const mkToc = (content, title, location, foldedLevels, folded) => {
+    return (0, exports.mkNode)({
+        type: 'toc',
+        title,
+        content,
+        location,
+        ...(foldedLevels ? { foldedLevels } : {}),
+        ...(folded !== undefined ? { folded } : {}),
+    });
 };
 exports.mkToc = mkToc;
 const mkTocList = (content, level) => {

package/lib/exportHtml.js

@@ -59,6 +59,9 @@ const rules = {
     'I<>': (0, handlers_1.wrapContent)('<em>', '</em>'),
     'R<>': (0, handlers_1.wrapContent)('<var>', '</var>'),
     'K<>': (0, handlers_1.wrapContent)('<kbd>', '</kbd>'),
+    'O<>': (0, handlers_1.wrapContent)('<del>', '</del>'),
+    'H<>': (0, handlers_1.wrapContent)('<sup>', '</sup>'),
+    'J<>': (0, handlers_1.wrapContent)('<sub>', '</sub>'),
     'L<>': (0, handlers_1.setFn)((node, ctx) => {
         let { meta } = node;
         if (meta === null) {
@@ -226,15 +229,63 @@ const rules = {
             writer.write(conf.getFirstValue('caption'));
             writer.writeRaw('</caption>');
         }
-        interator(node.content, ctx);
+        const innerCtx = { ...ctx, ...(node.align && { 'table.align': node.align }) };
+        const content = node.content || [];
+        const isHeaderRow = c => c && c.name === 'row' && Array.isArray(c.config) && c.config.some(a => a.name === 'header' && a.value !== false);
+        const hasHeader = content.some(isHeaderRow);
+        if (!hasHeader) {
+            interator(content, innerCtx);
+            writer.writeRaw('</table>');
+            return;
+        }
+        const rowNodes = content.filter(c => c && c.name === 'row');
+        const nonRowContent = content.filter(c => !c || c.name !== 'row');
+        let headerEnd = 0;
+        while (headerEnd < rowNodes.length && isHeaderRow(rowNodes[headerEnd]))
+            headerEnd++;
+        const headerRows = rowNodes.slice(0, headerEnd);
+        const bodyRows = rowNodes.slice(headerEnd);
+        interator(nonRowContent, innerCtx);
+        writer.writeRaw('<thead>');
+        interator(headerRows, innerCtx);
+        writer.writeRaw('</thead>');
+        if (bodyRows.length > 0) {
+            writer.writeRaw('<tbody>');
+            interator(bodyRows, innerCtx);
+            writer.writeRaw('</tbody>');
+        }
         writer.writeRaw('</table>');
     }),
     ':separator': handlers_1.emptyContent,
-    table_row: (0, handlers_1.wrapContent)('<tr>', '</tr>'),
-    table_cell: (0, handlers_1.wrapContent)('<td>', '</td>'),
-    table_head: (0, handlers_1.subUse)({
-        table_cell: (0, handlers_1.wrapContent)('<th>', '</th>'),
-    }, (0, handlers_1.wrapContent)('<tr>', '</tr>')),
+    row: (writer, processor) => (node, ctx, interator) => {
+        const conf = (0, config_1.default)(node, ctx);
+        const isHeader = conf.exists('header') && conf.getFirstValue('header') !== false;
+        writer.writeRaw('<tr>');
+        interator(node.content, { ...ctx, __row_header: isHeader, cellinRow: 0 });
+        writer.writeRaw('</tr>');
+    },
+    cell: (writer, processor) => (node, ctx, interator) => {
+        const tag = ctx.__row_header ? 'th' : 'td';
+        const conf = (0, config_1.default)(node, ctx);
+        const colspan = conf.exists('colspan') ? conf.getFirstValue('colspan') : null;
+        const rowspan = conf.exists('rowspan') ? conf.getFirstValue('rowspan') : null;
+        const colAlign = (alignMap => {
+            if (!Array.isArray(alignMap))
+                return null;
+            const num = ctx['cellinRow']++;
+            return alignMap[num] || null;
+        })(ctx['table.align']);
+        let attrs = '';
+        if (colspan !== null && Number(colspan) > 1)
+            attrs += ` colspan="${colspan}"`;
+        if (rowspan !== null && Number(rowspan) > 1)
+            attrs += ` rowspan="${rowspan}"`;
+        if (colAlign && ['left', 'right', 'center', 'justify'].includes(colAlign))
+            attrs += ` style="text-align:${colAlign}"`;
+        writer.writeRaw(`<${tag}${attrs}>`);
+        interator(node.content, ctx);
+        writer.writeRaw(`</${tag}>`);
+    },
     // Toc
     ':toc': (writer, processor) => (node, ctx, interator) => {
         writer.writeRaw('<div className="toc">');

package/lib/exportMarkdown.js

@@ -49,6 +49,9 @@ const rules = {
     'I<>': (0, handlers_1.wrapContent)('*', '*'),
     'R<>': (0, handlers_1.wrapContent)('*', '*'),
     'K<>': (0, handlers_1.wrapContent)('`', '`'),
+    'O<>': (0, handlers_1.wrapContent)('~~', '~~'),
+    'H<>': (0, handlers_1.wrapContent)('<sup>', '</sup>'),
+    'J<>': (0, handlers_1.wrapContent)('<sub>', '</sub>'),
     'L<>': (0, handlers_1.setFn)((node, ctx) => {
         let { meta } = node;
         if (meta === null) {
@@ -265,13 +268,57 @@ const rules = {
             writer.writeRaw('**\n\n');
         }
         // collect rows data for proper Markdown table rendering
-        const rows = (node.content || []).filter(child => child.name === 'table_row' || child.name === 'table_head');
+        const rows = (node.content || []).filter(child => child.name === 'row');
         if (rows.length === 0)
             return;
-        const hasHeader = rows[0].name === 'table_head';
+        const isRowHeader = row => Array.isArray(row.config) && row.config.some(c => c.name === 'header' && c.value !== false);
+        const cellSpan = (cell, name) => {
+            if (!Array.isArray(cell.config))
+                return 0;
+            const entry = cell.config.find(c => c.name === name);
+            if (!entry)
+                return 0;
+            const n = Number(entry.value);
+            return Number.isFinite(n) && n > 1 ? n : 0;
+        };
+        // GFM pipe-tables don't support colspan/rowspan — fall back to inline HTML
+        const hasSpans = rows.some(row => (row.content || []).some(c => c.name === 'cell' && (cellSpan(c, 'colspan') || cellSpan(c, 'rowspan'))));
+        const hasHeader = isRowHeader(rows[0]);
+        if (hasSpans) {
+            writer.writeRaw('<table>\n');
+            rows.forEach(row => {
+                const tag = isRowHeader(row) ? 'th' : 'td';
+                writer.writeRaw('<tr>');
+                const cells = (row.content || []).filter(c => c.name === 'cell');
+                cells.forEach(cell => {
+                    const colspan = cellSpan(cell, 'colspan');
+                    const rowspan = cellSpan(cell, 'rowspan');
+                    let attrs = '';
+                    if (colspan)
+                        attrs += ` colspan="${colspan}"`;
+                    if (rowspan)
+                        attrs += ` rowspan="${rowspan}"`;
+                    writer.writeRaw(`<${tag}${attrs}>`);
+                    if (cell.content) {
+                        cell.content.forEach(c => {
+                            if (typeof c === 'string') {
+                                writer.write(c.trim());
+                            }
+                            else {
+                                interator([c], ctx);
+                            }
+                        });
+                    }
+                    writer.writeRaw(`</${tag}>`);
+                });
+                writer.writeRaw('</tr>\n');
+            });
+            writer.writeRaw('</table>\n');
+            return;
+        }
         // render each row
         rows.forEach((row, rowIndex) => {
-            const cells = (row.content || []).filter(c => c.name === 'table_cell');
+            const cells = (row.content || []).filter(c => c.name === 'cell');
             writer.writeRaw('|');
             cells.forEach(cell => {
                 writer.writeRaw(' ');
@@ -308,9 +355,8 @@ const rules = {
         writer.writeRaw('\n');
     }),
     ':separator': handlers_1.emptyContent,
-    table_row: handlers_1.emptyContent,
-    table_cell: handlers_1.emptyContent,
-    table_head: handlers_1.emptyContent,
+    row: handlers_1.emptyContent,
+    cell: handlers_1.emptyContent,
     // Toc
     ':toc': handlers_1.emptyContent,
     ':toc-list': handlers_1.emptyContent,