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

package/lib/cjs/index.js

@@ -102,8 +102,8 @@ 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,
             rows: [row],
@@ -137,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];
@@ -156,7 +154,7 @@ const match = function (api) {
                 if (!character.isWhitespaceCharacter(p.codePoint))
                     break;
             }
-            const endPoint = coreTokenizer.calcEndYastNodePoint(nodePoints, i - 1);
+            const endPoint = coreTokenizer.calcEndPoint(nodePoints, i - 1);
             const lines = cellFirstNonWhitespaceIndex >= cellEndIndex
                 ? []
                 : [
@@ -177,8 +175,8 @@ const match = function (api) {
             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 = {
                 nodeType: ast.TableCellType,

package/lib/esm/index.js

@@ -1,6 +1,6 @@
 import { TableType, TableCellType, TableRowType } from '@yozora/ast';
 import { AsciiCodePoint, isWhitespaceCharacter } from '@yozora/character';
-import { calcStartYastNodePoint, calcEndYastNodePoint, mergeAndStripContentLines, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { calcStartPoint, calcEndPoint, mergeAndStripContentLines, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const match = function (api) {
     return {
@@ -98,8 +98,8 @@ 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,
             rows: [row],
@@ -133,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];
@@ -152,7 +150,7 @@ const match = function (api) {
                 if (!isWhitespaceCharacter(p.codePoint))
                     break;
             }
-            const endPoint = calcEndYastNodePoint(nodePoints, i - 1);
+            const endPoint = calcEndPoint(nodePoints, i - 1);
             const lines = cellFirstNonWhitespaceIndex >= cellEndIndex
                 ? []
                 : [
@@ -173,8 +171,8 @@ const match = function (api) {
             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 = {
                 nodeType: TableCellType,

package/lib/types/types.d.ts

@@ -1,4 +1,4 @@
-import type { NodePosition, Table, TableCellType, TableColumn, TableRowType, TableType } from '@yozora/ast';
+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;
@@ -19,6 +19,6 @@ export interface ITableRowToken extends IPartialYastBlockToken<TableRowType> {
     cells: ITableCellToken[];
 }
 export interface ITableCellToken extends IPartialYastBlockToken<TableCellType> {
-    position: NodePosition;
+    position: Position;
     lines: IPhrasingContentLine[];
 }

package/package.json

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