@yozora/tokenizer-table 2.0.0-alpha.0 → 2.0.0

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

@@ -7,7 +7,6 @@ var character = require('@yozora/character');
 var coreTokenizer = require('@yozora/core-tokenizer');
 
 const match = function (api) {
-    const { name: _tokenizer } = this;
     return {
         isContainingBlock: false,
         eatOpener,
@@ -103,11 +102,11 @@ const match = function (api) {
         const token = {
             nodeType: ast.TableType,
             position: {
-                start: coreTokenizer.calcStartYastNodePoint(previousLine.nodePoints, previousLine.startIndex),
-                end: coreTokenizer.calcEndYastNodePoint(nodePoints, nextIndex - 1),
+                start: coreTokenizer.calcStartPoint(previousLine.nodePoints, previousLine.startIndex),
+                end: coreTokenizer.calcEndPoint(nodePoints, nextIndex - 1),
             },
             columns,
-            children: [row],
+            rows: [row],
         };
         return {
             token,
@@ -119,11 +118,10 @@ const match = function (api) {
         if (line.firstNonWhitespaceIndex >= line.endIndex) {
             return { status: 'notMatched' };
         }
-        const tableToken = token;
-        const row = calcTableRow(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 };
     }
     function calcTableRow(line, columns) {
@@ -139,9 +137,7 @@ const match = function (api) {
                 if (!character.isWhitespaceCharacter(p.codePoint))
                     break;
             }
-            const startPoint = i < endIndex
-                ? coreTokenizer.calcStartYastNodePoint(nodePoints, i)
-                : coreTokenizer.calcEndYastNodePoint(nodePoints, endIndex - 1);
+            const startPoint = i < endIndex ? coreTokenizer.calcStartPoint(nodePoints, i) : coreTokenizer.calcEndPoint(nodePoints, endIndex - 1);
             const cellStartIndex = i, cellFirstNonWhitespaceIndex = i;
             for (; i < endIndex; ++i) {
                 p = nodePoints[i];
@@ -158,10 +154,10 @@ const match = function (api) {
                 if (!character.isWhitespaceCharacter(p.codePoint))
                     break;
             }
-            const endPoint = coreTokenizer.calcEndYastNodePoint(nodePoints, i - 1);
-            const phrasingContent = cellFirstNonWhitespaceIndex >= cellEndIndex
-                ? null
-                : api.buildPhrasingContentToken([
+            const endPoint = coreTokenizer.calcEndPoint(nodePoints, i - 1);
+            const lines = cellFirstNonWhitespaceIndex >= cellEndIndex
+                ? []
+                : [
                     {
                         nodePoints,
                         startIndex: cellStartIndex,
@@ -169,88 +165,72 @@ const match = function (api) {
                         firstNonWhitespaceIndex: cellFirstNonWhitespaceIndex,
                         countOfPrecedeSpaces: cellFirstNonWhitespaceIndex - cellStartIndex,
                     },
-                ]);
+                ];
             const cell = {
-                _tokenizer,
                 nodeType: ast.TableCellType,
                 position: { start: startPoint, end: endPoint },
-                children: phrasingContent == null ? [] : [phrasingContent],
+                lines: lines,
             };
             cells.push(cell);
             if (cells.length >= columns.length)
                 break;
         }
-        const startPoint = coreTokenizer.calcStartYastNodePoint(nodePoints, startIndex);
-        const endPoint = coreTokenizer.calcEndYastNodePoint(nodePoints, endIndex - 1);
+        const startPoint = coreTokenizer.calcStartPoint(nodePoints, startIndex);
+        const endPoint = coreTokenizer.calcEndPoint(nodePoints, endIndex - 1);
         for (let c = cells.length; c < columns.length; ++c) {
             const cell = {
-                _tokenizer,
                 nodeType: ast.TableCellType,
                 position: { start: Object.assign({}, endPoint), end: Object.assign({}, endPoint) },
-                children: [],
+                lines: [],
             };
             cells.push(cell);
         }
         const row = {
-            _tokenizer,
             nodeType: ast.TableRowType,
             position: { start: startPoint, end: endPoint },
-            children: cells,
+            cells,
         };
         return row;
     }
 };
 
-const parse = () => ({
-    parse: (token, children) => {
-        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];
+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 = phrasingContent.contents[i + 1];
+                            const q = nodePoints[i + 1];
                             if (q.codePoint !== character.AsciiCodePoint.VERTICAL_SLASH)
-                                nextContents.push(p);
-                            nextContents.push(q);
+                                contents.push(p);
+                            contents.push(q);
                             i += 1;
-                            continue;
                         }
-                        nextContents.push(p);
+                        else {
+                            contents.push(p);
+                        }
                     }
-                    phrasingContent.contents = nextContents;
                 }
-                break;
-            }
-            default:
-                return null;
-        }
-        return node;
-    },
+                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';

package/lib/esm/index.js

@@ -1,9 +1,8 @@
 import { TableType, TableCellType, TableRowType } from '@yozora/ast';
 import { AsciiCodePoint, isWhitespaceCharacter } from '@yozora/character';
-import { calcStartYastNodePoint, calcEndYastNodePoint, PhrasingContentType, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { calcStartPoint, calcEndPoint, mergeAndStripContentLines, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const match = function (api) {
-    const { name: _tokenizer } = this;
     return {
         isContainingBlock: false,
         eatOpener,
@@ -99,11 +98,11 @@ const match = function (api) {
         const token = {
             nodeType: TableType,
             position: {
-                start: calcStartYastNodePoint(previousLine.nodePoints, previousLine.startIndex),
-                end: calcEndYastNodePoint(nodePoints, nextIndex - 1),
+                start: calcStartPoint(previousLine.nodePoints, previousLine.startIndex),
+                end: calcEndPoint(nodePoints, nextIndex - 1),
             },
             columns,
-            children: [row],
+            rows: [row],
         };
         return {
             token,
@@ -115,11 +114,10 @@ const match = function (api) {
         if (line.firstNonWhitespaceIndex >= line.endIndex) {
             return { status: 'notMatched' };
         }
-        const tableToken = token;
-        const row = calcTableRow(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 };
     }
     function calcTableRow(line, columns) {
@@ -135,9 +133,7 @@ const match = function (api) {
                 if (!isWhitespaceCharacter(p.codePoint))
                     break;
             }
-            const startPoint = i < endIndex
-                ? calcStartYastNodePoint(nodePoints, i)
-                : calcEndYastNodePoint(nodePoints, endIndex - 1);
+            const startPoint = i < endIndex ? calcStartPoint(nodePoints, i) : calcEndPoint(nodePoints, endIndex - 1);
             const cellStartIndex = i, cellFirstNonWhitespaceIndex = i;
             for (; i < endIndex; ++i) {
                 p = nodePoints[i];
@@ -154,10 +150,10 @@ const match = function (api) {
                 if (!isWhitespaceCharacter(p.codePoint))
                     break;
             }
-            const endPoint = calcEndYastNodePoint(nodePoints, i - 1);
-            const phrasingContent = cellFirstNonWhitespaceIndex >= cellEndIndex
-                ? null
-                : api.buildPhrasingContentToken([
+            const endPoint = calcEndPoint(nodePoints, i - 1);
+            const lines = cellFirstNonWhitespaceIndex >= cellEndIndex
+                ? []
+                : [
                     {
                         nodePoints,
                         startIndex: cellStartIndex,
@@ -165,88 +161,72 @@ const match = function (api) {
                         firstNonWhitespaceIndex: cellFirstNonWhitespaceIndex,
                         countOfPrecedeSpaces: cellFirstNonWhitespaceIndex - cellStartIndex,
                     },
-                ]);
+                ];
             const cell = {
-                _tokenizer,
                 nodeType: TableCellType,
                 position: { start: startPoint, end: endPoint },
-                children: phrasingContent == null ? [] : [phrasingContent],
+                lines: lines,
             };
             cells.push(cell);
             if (cells.length >= columns.length)
                 break;
         }
-        const startPoint = calcStartYastNodePoint(nodePoints, startIndex);
-        const endPoint = calcEndYastNodePoint(nodePoints, endIndex - 1);
+        const startPoint = calcStartPoint(nodePoints, startIndex);
+        const endPoint = calcEndPoint(nodePoints, endIndex - 1);
         for (let c = cells.length; c < columns.length; ++c) {
             const cell = {
-                _tokenizer,
                 nodeType: TableCellType,
                 position: { start: Object.assign({}, endPoint), end: Object.assign({}, endPoint) },
-                children: [],
+                lines: [],
             };
             cells.push(cell);
         }
         const row = {
-            _tokenizer,
             nodeType: TableRowType,
             position: { start: startPoint, end: endPoint },
-            children: cells,
+            cells,
         };
         return row;
     }
 };
 
-const parse = () => ({
-    parse: (token, children) => {
-        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];
+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 = phrasingContent.contents[i + 1];
+                            const q = nodePoints[i + 1];
                             if (q.codePoint !== AsciiCodePoint.VERTICAL_SLASH)
-                                nextContents.push(p);
-                            nextContents.push(q);
+                                contents.push(p);
+                            contents.push(q);
                             i += 1;
-                            continue;
                         }
-                        nextContents.push(p);
+                        else {
+                            contents.push(p);
+                        }
                     }
-                    phrasingContent.contents = nextContents;
                 }
-                break;
-            }
-            default:
-                return null;
-        }
-        return node;
-    },
+                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';

package/lib/types/index.d.ts

@@ -2,4 +2,4 @@ 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 { IHookContext as ITableHookContext, ITableCellToken, ITableRowToken, ITableToken, ITokenizerProps as ITableTokenizerProps, } from './types';
+export type { IThis as ITableHookContext, ITableCellToken, ITableRowToken, IToken as ITableToken, ITokenizerProps as ITableTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -1,5 +1,5 @@
 import type { IMatchBlockHookCreator } from '@yozora/core-tokenizer';
-import type { IHookContext, IToken, T } from './types';
+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,
@@ -15,7 +15,7 @@ import type { IHookContext, IToken, T } from './types';
  * @see https://github.com/syntax-tree/mdast#tablerow
  * @see https://github.com/syntax-tree/mdast#tablecell
  */
-export declare const match: IMatchBlockHookCreator<T, IToken, IHookContext>;
+export declare const match: IMatchBlockHookCreator<T, IToken, IThis>;
 /**
  * Find delimiter row
  *

package/lib/types/parse.d.ts

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

package/lib/types/tokenizer.d.ts

@@ -1,14 +1,14 @@
 import type { IBlockTokenizer, IMatchBlockHookCreator, IParseBlockHookCreator } from '@yozora/core-tokenizer';
 import { BaseBlockTokenizer } from '@yozora/core-tokenizer';
-import type { IHookContext, INode, IToken, ITokenizerProps, T } from './types';
+import type { INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Table, table-row and table-cell.
  * @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<T, IToken, INode, IHookContext> implements IBlockTokenizer<T, IToken, INode, IHookContext> {
+export declare class TableTokenizer extends BaseBlockTokenizer<T, IToken, INode, IThis> implements IBlockTokenizer<T, IToken, INode, IThis> {
     constructor(props?: ITokenizerProps);
-    readonly match: IMatchBlockHookCreator<T, IToken, IHookContext>;
-    readonly parse: IParseBlockHookCreator<T, IToken, INode, IHookContext>;
+    readonly match: IMatchBlockHookCreator<T, IToken, IThis>;
+    readonly parse: IParseBlockHookCreator<T, IToken, INode, IThis>;
 }

package/lib/types/types.d.ts

@@ -1,30 +1,24 @@
-import type { ITable, ITableCell, ITableColumn, ITableRow, TableCellType, TableRowType, TableType } from '@yozora/ast';
-import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, IPhrasingContentToken, ITokenizer, IYastBlockToken } from '@yozora/core-tokenizer';
-export declare type T = TableType | TableRowType | TableCellType;
-export declare type INode = ITable | ITableRow | ITableCell;
-export declare type IToken = ITableToken | ITableRowToken | ITableCellToken;
+import type { Position, Table, TableCellType, TableColumn, TableRowType, TableType } from '@yozora/ast';
+import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, IPhrasingContentLine, ITokenizer } from '@yozora/core-tokenizer';
+export declare type T = TableType;
+export declare type INode = Table;
 export declare const uniqueName = "@yozora/tokenizer-table";
-export interface ITableToken extends IPartialYastBlockToken<TableType> {
+export interface IToken extends IPartialYastBlockToken<TableType> {
     /**
      * Table column configuration items
      */
-    columns: ITableColumn[];
+    columns: TableColumn[];
     /**
      * Table rows
      */
-    children: ITableRowToken[];
+    rows: ITableRowToken[];
 }
-export interface ITableRowToken extends IYastBlockToken<TableRowType> {
-    /**
-     * Table cells
-     */
-    children: ITableCellToken[];
+export declare type IThis = ITokenizer;
+export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;
+export interface ITableRowToken extends IPartialYastBlockToken<TableRowType> {
+    cells: ITableCellToken[];
 }
-export interface ITableCellToken extends IYastBlockToken<TableCellType> {
-    /**
-     * Contents of table cell.
-     */
-    children: IPhrasingContentToken[];
+export interface ITableCellToken extends IPartialYastBlockToken<TableCellType> {
+    position: Position;
+    lines: IPhrasingContentLine[];
 }
-export declare type IHookContext = ITokenizer;
-export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-table",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0",
   "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": "^2.0.0-alpha.0",
-    "@yozora/character": "^2.0.0-alpha.0",
-    "@yozora/core-tokenizer": "^2.0.0-alpha.0"
+    "@yozora/ast": "^2.0.0",
+    "@yozora/character": "^2.0.0",
+    "@yozora/core-tokenizer": "^2.0.0"
   },
-  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
+  "gitHead": "65e99d1709fdd1c918465dce6b1e91de96bdab5e"
 }