@yozora/tokenizer-table 1.2.2 → 2.0.0-alpha.2

package/README.md

@@ -84,14 +84,14 @@ so you can use `YozoraParser` / `GfmExParser` directly.
 registered in *YastParser* as a plugin-in before it can be used.
 
 ```typescript {4,9}
-import { DefaultYastParser } from '@yozora/core-parser'
+import { DefaultParser } from '@yozora/core-parser'
 import ParagraphTokenizer from '@yozora/tokenizer-paragraph'
 import TextTokenizer from '@yozora/tokenizer-text'
 import TableTokenizer from '@yozora/tokenizer-table'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new TableTokenizer())
 
 // parse source markdown content
@@ -227,7 +227,6 @@ Name              | Type        | Required  | Default
 [@yozora/tokenizer-link]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/link#readme
 [@yozora/tokenizer-link-reference]:           https://github.com/yozorajs/yozora/tree/main/tokenizers/link-reference#readme
 [@yozora/tokenizer-list]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/list#readme
-[@yozora/tokenizer-list-item]:                https://github.com/yozorajs/yozora/tree/main/tokenizers/list-item#readme
 [@yozora/tokenizer-math]:                     https://github.com/yozorajs/yozora/tree/main/tokenizers/math#readme
 [@yozora/tokenizer-paragraph]:                https://github.com/yozorajs/yozora/tree/main/tokenizers/paragraph#readme
 [@yozora/tokenizer-setext-heading]:           https://github.com/yozorajs/yozora/tree/main/tokenizers/setext-heading#readme
@@ -287,7 +286,6 @@ Name              | Type        | Required  | Default
 [doc-@yozora/tokenizer-definition]:           https://yozora.guanghechen.com/docs/package/tokenizer-definition
 [doc-@yozora/tokenizer-link-reference]:       https://yozora.guanghechen.com/docs/package/tokenizer-link-reference
 [doc-@yozora/tokenizer-list]:                 https://yozora.guanghechen.com/docs/package/tokenizer-list
-[doc-@yozora/tokenizer-list-item]:            https://yozora.guanghechen.com/docs/package/tokenizer-list-item
 [doc-@yozora/tokenizer-math]:                 https://yozora.guanghechen.com/docs/package/tokenizer-math
 [doc-@yozora/tokenizer-paragraph]:            https://yozora.guanghechen.com/docs/package/tokenizer-paragraph
 [doc-@yozora/tokenizer-setext-heading]:       https://yozora.guanghechen.com/docs/package/tokenizer-setext-heading

package/lib/cjs/index.js

@@ -6,21 +6,18 @@ var ast = require('@yozora/ast');
 var character = require('@yozora/character');
 var coreTokenizer = require('@yozora/core-tokenizer');
 
-const uniqueName = '@yozora/tokenizer-table';
-
-class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
-    constructor(props = {}) {
-        var _a, _b;
-        super({
-            name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
-            priority: (_b = props.priority) !== null && _b !== void 0 ? _b : coreTokenizer.TokenizerPriority.INTERRUPTABLE_BLOCK,
-        });
-        this.isContainingBlock = false;
-    }
-    eatOpener() {
+const match = function (api) {
+    const { name: _tokenizer } = this;
+    return {
+        isContainingBlock: false,
+        eatOpener,
+        eatAndInterruptPreviousSibling,
+        eatLazyContinuationText,
+    };
+    function eatOpener() {
         return null;
     }
-    eatAndInterruptPreviousSibling(line, prevSiblingToken, parentToken, api) {
+    function eatAndInterruptPreviousSibling(line, prevSiblingToken) {
         if (line.countOfPrecedeSpaces >= 4)
             return null;
         const { nodePoints, endIndex, firstNonWhitespaceIndex } = line;
@@ -28,9 +25,7 @@ class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
             return null;
         const columns = [];
         let c = nodePoints[firstNonWhitespaceIndex].codePoint;
-        let cIndex = c === character.AsciiCodePoint.VERTICAL_SLASH
-            ? firstNonWhitespaceIndex + 1
-            : firstNonWhitespaceIndex;
+        let cIndex = c === character.AsciiCodePoint.VERTICAL_SLASH ? firstNonWhitespaceIndex + 1 : firstNonWhitespaceIndex;
         for (; cIndex < endIndex;) {
             for (; cIndex < endIndex; ++cIndex) {
                 c = nodePoints[cIndex].codePoint;
@@ -103,7 +98,7 @@ class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
             cellCount += 1;
         if (cellCount !== columns.length)
             return null;
-        const row = this.calcTableRow(api, previousLine, columns);
+        const row = calcTableRow(previousLine, columns);
         const nextIndex = endIndex;
         const token = {
             nodeType: ast.TableType,
@@ -112,7 +107,7 @@ class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
                 end: coreTokenizer.calcEndYastNodePoint(nodePoints, nextIndex - 1),
             },
             columns,
-            children: [row],
+            rows: [row],
         };
         return {
             token,
@@ -120,149 +115,17 @@ class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
             remainingSibling: api.rollbackPhrasingLines(lines.slice(0, lines.length - 1), prevSiblingToken),
         };
     }
-    eatLazyContinuationText(line, token, parentToken, api) {
+    function eatLazyContinuationText(line, token) {
         if (line.firstNonWhitespaceIndex >= line.endIndex) {
             return { status: 'notMatched' };
         }
-        const tableToken = token;
-        const row = this.calcTableRow(api, line, tableToken.columns);
+        const row = calcTableRow(line, token.columns);
         if (row == null)
             return { status: 'notMatched' };
-        tableToken.children.push(row);
+        token.rows.push(row);
         return { status: 'opening', nextIndex: line.endIndex };
     }
-    parseBlock(token, children, api) {
-        let node;
-        switch (token.nodeType) {
-            case ast.TableType: {
-                node = {
-                    type: ast.TableType,
-                    columns: token.columns,
-                    children: (children || []),
-                };
-                break;
-            }
-            case ast.TableRowType: {
-                node = {
-                    type: ast.TableRowType,
-                    children: (children || []),
-                };
-                break;
-            }
-            case ast.TableCellType: {
-                node = {
-                    type: ast.TableCellType,
-                    children: children,
-                };
-                for (const phrasingContent of node.children) {
-                    if (phrasingContent.type !== coreTokenizer.PhrasingContentType)
-                        continue;
-                    const nextContents = [];
-                    const endIndex = phrasingContent.contents.length;
-                    for (let i = 0; i < endIndex; ++i) {
-                        const p = phrasingContent.contents[i];
-                        if (p.codePoint === character.AsciiCodePoint.BACKSLASH && i + 1 < endIndex) {
-                            const q = phrasingContent.contents[i + 1];
-                            if (q.codePoint !== character.AsciiCodePoint.VERTICAL_SLASH)
-                                nextContents.push(p);
-                            nextContents.push(q);
-                            i += 1;
-                            continue;
-                        }
-                        nextContents.push(p);
-                    }
-                    phrasingContent.contents = nextContents;
-                }
-                break;
-            }
-            default:
-                return null;
-        }
-        return node;
-    }
-    calcTableColumn(nodePoints, currentLine, previousLine) {
-        if (previousLine.firstNonWhitespaceIndex >= previousLine.endIndex) {
-            return null;
-        }
-        if (currentLine.firstNonWhitespaceIndex - currentLine.startIndex >= 4)
-            return null;
-        const columns = [];
-        let p = nodePoints[currentLine.firstNonWhitespaceIndex];
-        let cIndex = p.codePoint === character.AsciiCodePoint.VERTICAL_SLASH
-            ? currentLine.firstNonWhitespaceIndex + 1
-            : currentLine.firstNonWhitespaceIndex;
-        for (; cIndex < currentLine.endIndex;) {
-            for (; cIndex < currentLine.endIndex; ++cIndex) {
-                p = nodePoints[cIndex];
-                if (!character.isWhitespaceCharacter(p.codePoint))
-                    break;
-            }
-            if (cIndex >= currentLine.endIndex)
-                break;
-            let leftColon = false;
-            if (p.codePoint === character.AsciiCodePoint.COLON) {
-                leftColon = true;
-                cIndex += 1;
-            }
-            let hyphenCount = 0;
-            for (; cIndex < currentLine.endIndex; ++cIndex) {
-                p = nodePoints[cIndex];
-                if (p.codePoint !== character.AsciiCodePoint.MINUS_SIGN)
-                    break;
-                hyphenCount += 1;
-            }
-            if (hyphenCount <= 0)
-                return null;
-            let rightColon = false;
-            if (cIndex < currentLine.endIndex &&
-                p.codePoint === character.AsciiCodePoint.COLON) {
-                rightColon = true;
-                cIndex += 1;
-            }
-            for (; cIndex < currentLine.endIndex; ++cIndex) {
-                p = nodePoints[cIndex];
-                if (character.isWhitespaceCharacter(p.codePoint))
-                    continue;
-                if (p.codePoint === character.AsciiCodePoint.VERTICAL_SLASH) {
-                    cIndex += 1;
-                    break;
-                }
-                return null;
-            }
-            let align = null;
-            if (leftColon && rightColon)
-                align = 'center';
-            else if (leftColon)
-                align = 'left';
-            else if (rightColon)
-                align = 'right';
-            const column = { align };
-            columns.push(column);
-        }
-        if (columns.length <= 0)
-            return null;
-        let cellCount = 0, hasNonWhitespaceBeforePipe = false;
-        for (let pIndex = previousLine.startIndex; pIndex < previousLine.endIndex; ++pIndex) {
-            const p = nodePoints[pIndex];
-            if (character.isWhitespaceCharacter(p.codePoint))
-                continue;
-            if (p.codePoint === character.AsciiCodePoint.VERTICAL_SLASH) {
-                if (hasNonWhitespaceBeforePipe || cellCount > 0)
-                    cellCount += 1;
-                hasNonWhitespaceBeforePipe = false;
-                continue;
-            }
-            hasNonWhitespaceBeforePipe = true;
-            if (p.codePoint === character.AsciiCodePoint.BACKSLASH)
-                pIndex += 1;
-        }
-        if (hasNonWhitespaceBeforePipe && columns.length > 1)
-            cellCount += 1;
-        if (cellCount !== columns.length)
-            return null;
-        return columns;
-    }
-    calcTableRow(api, line, columns) {
+    function calcTableRow(line, columns) {
         const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex } = line;
         let p = nodePoints[firstNonWhitespaceIndex];
         let i = p.codePoint === character.AsciiCodePoint.VERTICAL_SLASH
@@ -295,9 +158,9 @@ class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
                     break;
             }
             const endPoint = coreTokenizer.calcEndYastNodePoint(nodePoints, i - 1);
-            const phrasingContent = cellFirstNonWhitespaceIndex >= cellEndIndex
-                ? null
-                : api.buildPhrasingContentToken([
+            const lines = cellFirstNonWhitespaceIndex >= cellEndIndex
+                ? []
+                : [
                     {
                         nodePoints,
                         startIndex: cellStartIndex,
@@ -305,12 +168,12 @@ class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
                         firstNonWhitespaceIndex: cellFirstNonWhitespaceIndex,
                         countOfPrecedeSpaces: cellFirstNonWhitespaceIndex - cellStartIndex,
                     },
-                ]);
+                ];
             const cell = {
-                _tokenizer: this.name,
+                _tokenizer,
                 nodeType: ast.TableCellType,
                 position: { start: startPoint, end: endPoint },
-                children: phrasingContent == null ? [] : [phrasingContent],
+                lines: lines,
             };
             cells.push(cell);
             if (cells.length >= columns.length)
@@ -320,23 +183,78 @@ class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
         const endPoint = coreTokenizer.calcEndYastNodePoint(nodePoints, endIndex - 1);
         for (let c = cells.length; c < columns.length; ++c) {
             const cell = {
-                _tokenizer: this.name,
+                _tokenizer,
                 nodeType: ast.TableCellType,
                 position: { start: Object.assign({}, endPoint), end: Object.assign({}, endPoint) },
-                children: [],
+                lines: [],
             };
             cells.push(cell);
         }
         const row = {
-            _tokenizer: this.name,
+            _tokenizer,
             nodeType: ast.TableRowType,
             position: { start: startPoint, end: endPoint },
-            children: cells,
+            cells,
         };
         return row;
     }
+};
+
+const parse = api => ({
+    parse: tokens => tokens.map(token => {
+        const tableRows = token.rows.map((row) => {
+            const tableCells = row.cells.map((cell) => {
+                const contents = [];
+                {
+                    const nodePoints = coreTokenizer.mergeAndStripContentLines(cell.lines);
+                    for (let i = 0, endIndex = nodePoints.length; i < endIndex; ++i) {
+                        const p = nodePoints[i];
+                        if (p.codePoint === character.AsciiCodePoint.BACKSLASH && i + 1 < endIndex) {
+                            const q = nodePoints[i + 1];
+                            if (q.codePoint !== character.AsciiCodePoint.VERTICAL_SLASH)
+                                contents.push(p);
+                            contents.push(q);
+                            i += 1;
+                        }
+                        else {
+                            contents.push(p);
+                        }
+                    }
+                }
+                const children = api.processInlines(contents);
+                const tableCell = api.shouldReservePosition
+                    ? { type: ast.TableCellType, position: cell.position, children }
+                    : { type: ast.TableCellType, children };
+                return tableCell;
+            });
+            const tableRow = api.shouldReservePosition
+                ? { type: ast.TableRowType, position: row.position, children: tableCells }
+                : { type: ast.TableRowType, children: tableCells };
+            return tableRow;
+        });
+        const table = api.shouldReservePosition
+            ? { type: ast.TableType, position: token.position, columns: token.columns, children: tableRows }
+            : { type: ast.TableType, columns: token.columns, children: tableRows };
+        return table;
+    }),
+});
+
+const uniqueName = '@yozora/tokenizer-table';
+
+class TableTokenizer extends coreTokenizer.BaseBlockTokenizer {
+    constructor(props = {}) {
+        var _a, _b;
+        super({
+            name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
+            priority: (_b = props.priority) !== null && _b !== void 0 ? _b : coreTokenizer.TokenizerPriority.INTERRUPTABLE_BLOCK,
+        });
+        this.match = match;
+        this.parse = parse;
+    }
 }
 
 exports.TableTokenizer = TableTokenizer;
 exports.TableTokenizerName = uniqueName;
-exports['default'] = TableTokenizer;
+exports["default"] = TableTokenizer;
+exports.tableMatch = match;
+exports.tableParse = parse;

package/lib/esm/index.js

@@ -1,22 +1,19 @@
 import { TableType, TableCellType, TableRowType } from '@yozora/ast';
 import { AsciiCodePoint, isWhitespaceCharacter } from '@yozora/character';
-import { BaseBlockTokenizer, TokenizerPriority, calcStartYastNodePoint, calcEndYastNodePoint, PhrasingContentType } from '@yozora/core-tokenizer';
+import { calcStartYastNodePoint, calcEndYastNodePoint, mergeAndStripContentLines, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
-const uniqueName = '@yozora/tokenizer-table';
-
-class TableTokenizer extends BaseBlockTokenizer {
-    constructor(props = {}) {
-        var _a, _b;
-        super({
-            name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
-            priority: (_b = props.priority) !== null && _b !== void 0 ? _b : TokenizerPriority.INTERRUPTABLE_BLOCK,
-        });
-        this.isContainingBlock = false;
-    }
-    eatOpener() {
+const match = function (api) {
+    const { name: _tokenizer } = this;
+    return {
+        isContainingBlock: false,
+        eatOpener,
+        eatAndInterruptPreviousSibling,
+        eatLazyContinuationText,
+    };
+    function eatOpener() {
         return null;
     }
-    eatAndInterruptPreviousSibling(line, prevSiblingToken, parentToken, api) {
+    function eatAndInterruptPreviousSibling(line, prevSiblingToken) {
         if (line.countOfPrecedeSpaces >= 4)
             return null;
         const { nodePoints, endIndex, firstNonWhitespaceIndex } = line;
@@ -24,9 +21,7 @@ class TableTokenizer extends BaseBlockTokenizer {
             return null;
         const columns = [];
         let c = nodePoints[firstNonWhitespaceIndex].codePoint;
-        let cIndex = c === AsciiCodePoint.VERTICAL_SLASH
-            ? firstNonWhitespaceIndex + 1
-            : firstNonWhitespaceIndex;
+        let cIndex = c === AsciiCodePoint.VERTICAL_SLASH ? firstNonWhitespaceIndex + 1 : firstNonWhitespaceIndex;
         for (; cIndex < endIndex;) {
             for (; cIndex < endIndex; ++cIndex) {
                 c = nodePoints[cIndex].codePoint;
@@ -99,7 +94,7 @@ class TableTokenizer extends BaseBlockTokenizer {
             cellCount += 1;
         if (cellCount !== columns.length)
             return null;
-        const row = this.calcTableRow(api, previousLine, columns);
+        const row = calcTableRow(previousLine, columns);
         const nextIndex = endIndex;
         const token = {
             nodeType: TableType,
@@ -108,7 +103,7 @@ class TableTokenizer extends BaseBlockTokenizer {
                 end: calcEndYastNodePoint(nodePoints, nextIndex - 1),
             },
             columns,
-            children: [row],
+            rows: [row],
         };
         return {
             token,
@@ -116,149 +111,17 @@ class TableTokenizer extends BaseBlockTokenizer {
             remainingSibling: api.rollbackPhrasingLines(lines.slice(0, lines.length - 1), prevSiblingToken),
         };
     }
-    eatLazyContinuationText(line, token, parentToken, api) {
+    function eatLazyContinuationText(line, token) {
         if (line.firstNonWhitespaceIndex >= line.endIndex) {
             return { status: 'notMatched' };
         }
-        const tableToken = token;
-        const row = this.calcTableRow(api, line, tableToken.columns);
+        const row = calcTableRow(line, token.columns);
         if (row == null)
             return { status: 'notMatched' };
-        tableToken.children.push(row);
+        token.rows.push(row);
         return { status: 'opening', nextIndex: line.endIndex };
     }
-    parseBlock(token, children, api) {
-        let node;
-        switch (token.nodeType) {
-            case TableType: {
-                node = {
-                    type: TableType,
-                    columns: token.columns,
-                    children: (children || []),
-                };
-                break;
-            }
-            case TableRowType: {
-                node = {
-                    type: TableRowType,
-                    children: (children || []),
-                };
-                break;
-            }
-            case TableCellType: {
-                node = {
-                    type: TableCellType,
-                    children: children,
-                };
-                for (const phrasingContent of node.children) {
-                    if (phrasingContent.type !== PhrasingContentType)
-                        continue;
-                    const nextContents = [];
-                    const endIndex = phrasingContent.contents.length;
-                    for (let i = 0; i < endIndex; ++i) {
-                        const p = phrasingContent.contents[i];
-                        if (p.codePoint === AsciiCodePoint.BACKSLASH && i + 1 < endIndex) {
-                            const q = phrasingContent.contents[i + 1];
-                            if (q.codePoint !== AsciiCodePoint.VERTICAL_SLASH)
-                                nextContents.push(p);
-                            nextContents.push(q);
-                            i += 1;
-                            continue;
-                        }
-                        nextContents.push(p);
-                    }
-                    phrasingContent.contents = nextContents;
-                }
-                break;
-            }
-            default:
-                return null;
-        }
-        return node;
-    }
-    calcTableColumn(nodePoints, currentLine, previousLine) {
-        if (previousLine.firstNonWhitespaceIndex >= previousLine.endIndex) {
-            return null;
-        }
-        if (currentLine.firstNonWhitespaceIndex - currentLine.startIndex >= 4)
-            return null;
-        const columns = [];
-        let p = nodePoints[currentLine.firstNonWhitespaceIndex];
-        let cIndex = p.codePoint === AsciiCodePoint.VERTICAL_SLASH
-            ? currentLine.firstNonWhitespaceIndex + 1
-            : currentLine.firstNonWhitespaceIndex;
-        for (; cIndex < currentLine.endIndex;) {
-            for (; cIndex < currentLine.endIndex; ++cIndex) {
-                p = nodePoints[cIndex];
-                if (!isWhitespaceCharacter(p.codePoint))
-                    break;
-            }
-            if (cIndex >= currentLine.endIndex)
-                break;
-            let leftColon = false;
-            if (p.codePoint === AsciiCodePoint.COLON) {
-                leftColon = true;
-                cIndex += 1;
-            }
-            let hyphenCount = 0;
-            for (; cIndex < currentLine.endIndex; ++cIndex) {
-                p = nodePoints[cIndex];
-                if (p.codePoint !== AsciiCodePoint.MINUS_SIGN)
-                    break;
-                hyphenCount += 1;
-            }
-            if (hyphenCount <= 0)
-                return null;
-            let rightColon = false;
-            if (cIndex < currentLine.endIndex &&
-                p.codePoint === AsciiCodePoint.COLON) {
-                rightColon = true;
-                cIndex += 1;
-            }
-            for (; cIndex < currentLine.endIndex; ++cIndex) {
-                p = nodePoints[cIndex];
-                if (isWhitespaceCharacter(p.codePoint))
-                    continue;
-                if (p.codePoint === AsciiCodePoint.VERTICAL_SLASH) {
-                    cIndex += 1;
-                    break;
-                }
-                return null;
-            }
-            let align = null;
-            if (leftColon && rightColon)
-                align = 'center';
-            else if (leftColon)
-                align = 'left';
-            else if (rightColon)
-                align = 'right';
-            const column = { align };
-            columns.push(column);
-        }
-        if (columns.length <= 0)
-            return null;
-        let cellCount = 0, hasNonWhitespaceBeforePipe = false;
-        for (let pIndex = previousLine.startIndex; pIndex < previousLine.endIndex; ++pIndex) {
-            const p = nodePoints[pIndex];
-            if (isWhitespaceCharacter(p.codePoint))
-                continue;
-            if (p.codePoint === AsciiCodePoint.VERTICAL_SLASH) {
-                if (hasNonWhitespaceBeforePipe || cellCount > 0)
-                    cellCount += 1;
-                hasNonWhitespaceBeforePipe = false;
-                continue;
-            }
-            hasNonWhitespaceBeforePipe = true;
-            if (p.codePoint === AsciiCodePoint.BACKSLASH)
-                pIndex += 1;
-        }
-        if (hasNonWhitespaceBeforePipe && columns.length > 1)
-            cellCount += 1;
-        if (cellCount !== columns.length)
-            return null;
-        return columns;
-    }
-    calcTableRow(api, line, columns) {
+    function calcTableRow(line, columns) {
         const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex } = line;
         let p = nodePoints[firstNonWhitespaceIndex];
         let i = p.codePoint === AsciiCodePoint.VERTICAL_SLASH
@@ -291,9 +154,9 @@ class TableTokenizer extends BaseBlockTokenizer {
                     break;
             }
             const endPoint = calcEndYastNodePoint(nodePoints, i - 1);
-            const phrasingContent = cellFirstNonWhitespaceIndex >= cellEndIndex
-                ? null
-                : api.buildPhrasingContentToken([
+            const lines = cellFirstNonWhitespaceIndex >= cellEndIndex
+                ? []
+                : [
                     {
                         nodePoints,
                         startIndex: cellStartIndex,
@@ -301,12 +164,12 @@ class TableTokenizer extends BaseBlockTokenizer {
                         firstNonWhitespaceIndex: cellFirstNonWhitespaceIndex,
                         countOfPrecedeSpaces: cellFirstNonWhitespaceIndex - cellStartIndex,
                     },
-                ]);
+                ];
             const cell = {
-                _tokenizer: this.name,
+                _tokenizer,
                 nodeType: TableCellType,
                 position: { start: startPoint, end: endPoint },
-                children: phrasingContent == null ? [] : [phrasingContent],
+                lines: lines,
             };
             cells.push(cell);
             if (cells.length >= columns.length)
@@ -316,21 +179,74 @@ class TableTokenizer extends BaseBlockTokenizer {
         const endPoint = calcEndYastNodePoint(nodePoints, endIndex - 1);
         for (let c = cells.length; c < columns.length; ++c) {
             const cell = {
-                _tokenizer: this.name,
+                _tokenizer,
                 nodeType: TableCellType,
                 position: { start: Object.assign({}, endPoint), end: Object.assign({}, endPoint) },
-                children: [],
+                lines: [],
             };
             cells.push(cell);
         }
         const row = {
-            _tokenizer: this.name,
+            _tokenizer,
             nodeType: TableRowType,
             position: { start: startPoint, end: endPoint },
-            children: cells,
+            cells,
         };
         return row;
     }
+};
+
+const parse = api => ({
+    parse: tokens => tokens.map(token => {
+        const tableRows = token.rows.map((row) => {
+            const tableCells = row.cells.map((cell) => {
+                const contents = [];
+                {
+                    const nodePoints = mergeAndStripContentLines(cell.lines);
+                    for (let i = 0, endIndex = nodePoints.length; i < endIndex; ++i) {
+                        const p = nodePoints[i];
+                        if (p.codePoint === AsciiCodePoint.BACKSLASH && i + 1 < endIndex) {
+                            const q = nodePoints[i + 1];
+                            if (q.codePoint !== AsciiCodePoint.VERTICAL_SLASH)
+                                contents.push(p);
+                            contents.push(q);
+                            i += 1;
+                        }
+                        else {
+                            contents.push(p);
+                        }
+                    }
+                }
+                const children = api.processInlines(contents);
+                const tableCell = api.shouldReservePosition
+                    ? { type: TableCellType, position: cell.position, children }
+                    : { type: TableCellType, children };
+                return tableCell;
+            });
+            const tableRow = api.shouldReservePosition
+                ? { type: TableRowType, position: row.position, children: tableCells }
+                : { type: TableRowType, children: tableCells };
+            return tableRow;
+        });
+        const table = api.shouldReservePosition
+            ? { type: TableType, position: token.position, columns: token.columns, children: tableRows }
+            : { type: TableType, columns: token.columns, children: tableRows };
+        return table;
+    }),
+});
+
+const uniqueName = '@yozora/tokenizer-table';
+
+class TableTokenizer extends BaseBlockTokenizer {
+    constructor(props = {}) {
+        var _a, _b;
+        super({
+            name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
+            priority: (_b = props.priority) !== null && _b !== void 0 ? _b : TokenizerPriority.INTERRUPTABLE_BLOCK,
+        });
+        this.match = match;
+        this.parse = parse;
+    }
 }
 
-export { TableTokenizer, uniqueName as TableTokenizerName, TableTokenizer as default };
+export { TableTokenizer, uniqueName as TableTokenizerName, TableTokenizer as default, match as tableMatch, parse as tableParse };

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
-import { TableTokenizer } from './tokenizer';
-export { TableTokenizer } from './tokenizer';
+export { match as tableMatch } from './match';
+export { parse as tableParse } from './parse';
+export { TableTokenizer, TableTokenizer as default } from './tokenizer';
 export { uniqueName as TableTokenizerName } from './types';
-export type { TableCellToken, TableRowToken, TableToken, TokenizerProps as TableTokenizerProps, } from './types';
-export default TableTokenizer;
+export type { IThis as ITableHookContext, ITableCellToken, ITableRowToken, IToken as ITableToken, ITokenizerProps as ITableTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,26 @@
+import type { IMatchBlockHookCreator } from '@yozora/core-tokenizer';
+import type { IThis, IToken, T } from './types';
+/**
+ * A table is an arrangement of data with rows and columns, consisting of
+ * a single header row, a delimiter row separating the header from the data,
+ * and zero or more data rows.
+ *
+ * Each row consists of cells containing arbitrary text, in which inlines
+ * are parsed, separated by pipes (|). A leading and trailing pipe is also
+ * recommended for clarity of reading, and if there’s otherwise parsing
+ * ambiguity. Spaces between pipes and cell content are trimmed. Block-level
+ * elements cannot be inserted in a table.
+ *
+ * @see https://github.github.com/gfm/#table
+ * @see https://github.com/syntax-tree/mdast#tablerow
+ * @see https://github.com/syntax-tree/mdast#tablecell
+ */
+export declare const match: IMatchBlockHookCreator<T, IToken, IThis>;
+/**
+ * Find delimiter row
+ *
+ * The delimiter row consists of cells whose only content are
+ * hyphens (-), and optionally, a leading or trailing colon (:),
+ * or both, to indicate left, right, or center alignment respectively.
+ * @see https://github.github.com/gfm/#delimiter-row
+ */

package/lib/types/parse.d.ts

@@ -0,0 +1,3 @@
+import type { IParseBlockHookCreator } from '@yozora/core-tokenizer';
+import type { INode, IThis, IToken, T } from './types';
+export declare const parse: IParseBlockHookCreator<T, IToken, INode, IThis>;

package/lib/types/tokenizer.d.ts

@@ -1,59 +1,14 @@
-import type { TableColumn, YastNode } from '@yozora/ast';
-import type { NodePoint } from '@yozora/character';
-import type { MatchBlockPhaseApi, ParseBlockPhaseApi, PhrasingContentLine, ResultOfEatAndInterruptPreviousSibling, ResultOfEatLazyContinuationText, ResultOfEatOpener, ResultOfParse, Tokenizer, TokenizerMatchBlockHook, TokenizerParseBlockHook, YastBlockToken } from '@yozora/core-tokenizer';
+import type { IBlockTokenizer, IMatchBlockHookCreator, IParseBlockHookCreator } from '@yozora/core-tokenizer';
 import { BaseBlockTokenizer } from '@yozora/core-tokenizer';
-import type { Node, T, TableRowToken, Token, TokenizerProps } from './types';
+import type { INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Table, table-row and table-cell.
- *
- * A table is an arrangement of data with rows and columns, consisting of
- * a single header row, a delimiter row separating the header from the data,
- * and zero or more data rows.
- *
- * Each row consists of cells containing arbitrary text, in which inlines
- * are parsed, separated by pipes (|). A leading and trailing pipe is also
- * recommended for clarity of reading, and if there’s otherwise parsing
- * ambiguity. Spaces between pipes and cell content are trimmed. Block-level
- * elements cannot be inserted in a table.
- *
  * @see https://github.github.com/gfm/#table
  * @see https://github.com/syntax-tree/mdast#tablerow
  * @see https://github.com/syntax-tree/mdast#tablecell
  */
-export declare class TableTokenizer extends BaseBlockTokenizer implements Tokenizer, TokenizerMatchBlockHook<T, Token>, TokenizerParseBlockHook<T, Token, Node> {
-    readonly isContainingBlock = false;
-    constructor(props?: TokenizerProps);
-    /**
-     * @override
-     * @see TokenizerMatchBlockHook
-     */
-    eatOpener(): ResultOfEatOpener<T, Token>;
-    /**
-     * @override
-     * @see TokenizerMatchBlockHook
-     */
-    eatAndInterruptPreviousSibling(line: Readonly<PhrasingContentLine>, prevSiblingToken: Readonly<YastBlockToken>, parentToken: Readonly<YastBlockToken>, api: Readonly<MatchBlockPhaseApi>): ResultOfEatAndInterruptPreviousSibling<T, Token>;
-    /**
-     * @override
-     * @see TokenizerMatchBlockHook
-     */
-    eatLazyContinuationText(line: Readonly<PhrasingContentLine>, token: Token, parentToken: Readonly<YastBlockToken>, api: Readonly<MatchBlockPhaseApi>): ResultOfEatLazyContinuationText;
-    /**
-     * @override
-     * @see TokenizerParseBlockHook
-     */
-    parseBlock(token: Readonly<Token>, children: YastNode[] | undefined, api: Readonly<ParseBlockPhaseApi>): ResultOfParse<T, Node>;
-    /**
-     * Find delimiter row
-     *
-     * The delimiter row consists of cells whose only content are
-     * hyphens (-), and optionally, a leading or trailing colon (:),
-     * or both, to indicate left, right, or center alignment respectively.
-     * @see https://github.github.com/gfm/#delimiter-row
-     */
-    protected calcTableColumn(nodePoints: ReadonlyArray<NodePoint>, currentLine: PhrasingContentLine, previousLine: PhrasingContentLine): TableColumn[] | null;
-    /**
-     * process table row
-     */
-    protected calcTableRow(api: Readonly<MatchBlockPhaseApi>, line: PhrasingContentLine, columns: TableColumn[]): TableRowToken;
+export declare class TableTokenizer extends BaseBlockTokenizer<T, IToken, INode, IThis> implements IBlockTokenizer<T, IToken, INode, IThis> {
+    constructor(props?: ITokenizerProps);
+    readonly match: IMatchBlockHookCreator<T, IToken, IThis>;
+    readonly parse: IParseBlockHookCreator<T, IToken, INode, IThis>;
 }

package/lib/types/types.d.ts

@@ -1,29 +1,24 @@
-import type { Table, TableCell, TableCellType, TableColumn, TableRow, TableRowType, TableType } from '@yozora/ast';
-import type { BaseBlockTokenizerProps, PartialYastBlockToken, PhrasingContentToken, YastBlockToken } from '@yozora/core-tokenizer';
-export declare type T = TableType | TableRowType | TableCellType;
-export declare type Node = Table | TableRow | TableCell;
-export declare type Token = TableToken | TableRowToken | TableCellToken;
+import type { ITable, ITableColumn, IYastNodePosition, TableCellType, TableRowType, TableType } from '@yozora/ast';
+import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, IPhrasingContentLine, ITokenizer } from '@yozora/core-tokenizer';
+export declare type T = TableType;
+export declare type INode = ITable;
 export declare const uniqueName = "@yozora/tokenizer-table";
-export interface TableToken extends PartialYastBlockToken<TableType> {
+export interface IToken extends IPartialYastBlockToken<TableType> {
     /**
      * Table column configuration items
      */
-    columns: TableColumn[];
+    columns: ITableColumn[];
     /**
      * Table rows
      */
-    children: TableRowToken[];
+    rows: ITableRowToken[];
 }
-export interface TableRowToken extends YastBlockToken<TableRowType> {
-    /**
-     * Table cells
-     */
-    children: TableCellToken[];
+export declare type IThis = ITokenizer;
+export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;
+export interface ITableRowToken extends IPartialYastBlockToken<TableRowType> {
+    cells: ITableCellToken[];
 }
-export interface TableCellToken extends YastBlockToken<TableCellType> {
-    /**
-     * Contents of table cell.
-     */
-    children: PhrasingContentToken[];
+export interface ITableCellToken extends IPartialYastBlockToken<TableCellType> {
+    position: IYastNodePosition;
+    lines: IPhrasingContentLine[];
 }
-export declare type TokenizerProps = Partial<BaseBlockTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-table",
-  "version": "1.2.2",
+  "version": "2.0.0-alpha.2",
   "author": {
     "name": "guanghechen",
     "url": "https://github.com/guanghechen/"
@@ -35,9 +35,9 @@
     "test": "cross-env TS_NODE_FILES=true jest --config ../../jest.config.js --rootDir ."
   },
   "dependencies": {
-    "@yozora/ast": "^1.2.2",
-    "@yozora/character": "^1.2.2",
-    "@yozora/core-tokenizer": "^1.2.2"
+    "@yozora/ast": "^2.0.0-alpha.2",
+    "@yozora/character": "^2.0.0-alpha.2",
+    "@yozora/core-tokenizer": "^2.0.0-alpha.2"
   },
-  "gitHead": "fb4b804548592c09259aabcf9cc4dd96176bd024"
+  "gitHead": "da59d85520455c59a117a35032ef1a035c10ea21"
 }