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

package/lib/cjs/index.js

@@ -241,8 +241,8 @@ const match = function (api) {
             const token = {
                 nodeType: ast.DefinitionType,
                 position: {
-                    start: coreTokenizer.calcStartYastNodePoint(nodePoints, startIndex),
-                    end: coreTokenizer.calcEndYastNodePoint(nodePoints, endIndex - 1),
+                    start: coreTokenizer.calcStartPoint(nodePoints, startIndex),
+                    end: coreTokenizer.calcEndPoint(nodePoints, endIndex - 1),
                 },
                 label: labelState,
                 destination: null,
@@ -350,7 +350,7 @@ const match = function (api) {
             }
             const lastLine = token.lines[token.lines.length - 1];
             token.title = null;
-            token.position.end = coreTokenizer.calcEndYastNodePoint(lastLine.nodePoints, lastLine.endIndex - 1);
+            token.position.end = coreTokenizer.calcEndPoint(lastLine.nodePoints, lastLine.endIndex - 1);
             return {
                 status: 'closingAndRollback',
                 lines: token.lines.slice(token.lineNoOfTitle - 1),
@@ -376,7 +376,7 @@ const match = function (api) {
                 const lines = token.lines.splice(token.lineNoOfTitle - 1);
                 const lastLine = token.lines[token.lines.length - 1];
                 token.title = null;
-                token.position.end = coreTokenizer.calcEndYastNodePoint(lastLine.nodePoints, lastLine.endIndex - 1);
+                token.position.end = coreTokenizer.calcEndPoint(lastLine.nodePoints, lastLine.endIndex - 1);
                 result = { status: 'closingAndRollback', lines };
             }
         }

package/lib/esm/index.js

@@ -1,5 +1,5 @@
 import { AsciiCodePoint, VirtualCodePoint, isWhitespaceCharacter, isAsciiControlCharacter, calcStringFromNodePoints, calcEscapedStringFromNodePoints } from '@yozora/character';
-import { eatOptionalWhitespaces, calcEndYastNodePoint, resolveLabelToIdentifier, calcStartYastNodePoint, encodeLinkDestination, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { eatOptionalWhitespaces, calcEndPoint, resolveLabelToIdentifier, calcStartPoint, encodeLinkDestination, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 import { DefinitionType } from '@yozora/ast';
 
 function eatAndCollectLinkDestination(nodePoints, startIndex, endIndex, state) {
@@ -237,8 +237,8 @@ const match = function (api) {
             const token = {
                 nodeType: DefinitionType,
                 position: {
-                    start: calcStartYastNodePoint(nodePoints, startIndex),
-                    end: calcEndYastNodePoint(nodePoints, endIndex - 1),
+                    start: calcStartPoint(nodePoints, startIndex),
+                    end: calcEndPoint(nodePoints, endIndex - 1),
                 },
                 label: labelState,
                 destination: null,
@@ -346,7 +346,7 @@ const match = function (api) {
             }
             const lastLine = token.lines[token.lines.length - 1];
             token.title = null;
-            token.position.end = calcEndYastNodePoint(lastLine.nodePoints, lastLine.endIndex - 1);
+            token.position.end = calcEndPoint(lastLine.nodePoints, lastLine.endIndex - 1);
             return {
                 status: 'closingAndRollback',
                 lines: token.lines.slice(token.lineNoOfTitle - 1),
@@ -372,7 +372,7 @@ const match = function (api) {
                 const lines = token.lines.splice(token.lineNoOfTitle - 1);
                 const lastLine = token.lines[token.lines.length - 1];
                 token.title = null;
-                token.position.end = calcEndYastNodePoint(lastLine.nodePoints, lastLine.endIndex - 1);
+                token.position.end = calcEndPoint(lastLine.nodePoints, lastLine.endIndex - 1);
                 result = { status: 'closingAndRollback', lines };
             }
         }

package/lib/types/types.d.ts

@@ -1,8 +1,8 @@
 import type { Definition, DefinitionType } from '@yozora/ast';
 import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, IPhrasingContentLine, ITokenizer } from '@yozora/core-tokenizer';
-import type { LinkDestinationCollectingState } from './util/link-destination';
-import type { LinkLabelCollectingState } from './util/link-label';
-import type { LinkTitleCollectingState } from './util/link-title';
+import type { ILinkDestinationCollectingState } from './util/link-destination';
+import type { ILinkLabelCollectingState } from './util/link-label';
+import type { ILinkTitleCollectingState } from './util/link-title';
 export declare type T = DefinitionType;
 export declare type INode = Definition;
 export declare const uniqueName = "@yozora/tokenizer-definition";
@@ -15,15 +15,15 @@ export interface IToken extends IPartialYastBlockToken<T> {
      * Link label
      * Trimmed, Case-Insensitive
      */
-    label: LinkLabelCollectingState;
+    label: ILinkLabelCollectingState;
     /**
      * Link destination
      */
-    destination: LinkDestinationCollectingState | null;
+    destination: ILinkDestinationCollectingState | null;
     /**
      * Link title
      */
-    title: LinkTitleCollectingState | null;
+    title: ILinkTitleCollectingState | null;
     /**
      * The line number of the first matched character of the link label
      */

package/lib/types/util/link-destination.d.ts

@@ -5,7 +5,7 @@ import type { INodePoint } from '@yozora/character';
  *
  * @see https://github.github.com/gfm/#link-destination
  */
-export interface LinkDestinationCollectingState {
+export interface ILinkDestinationCollectingState {
     /**
      * Whether the current token has collected a legal LinkDestination
      */
@@ -31,7 +31,7 @@ export interface LinkDestinationCollectingState {
  * @param state
  * @see https://github.github.com/gfm/#link-destination
  */
-export declare function eatAndCollectLinkDestination(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: LinkDestinationCollectingState | null): {
+export declare function eatAndCollectLinkDestination(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: ILinkDestinationCollectingState | null): {
     nextIndex: number;
-    state: LinkDestinationCollectingState;
+    state: ILinkDestinationCollectingState;
 };

package/lib/types/util/link-label.d.ts

@@ -5,7 +5,7 @@ import type { INodePoint } from '@yozora/character';
  *
  * @see https://github.github.com/gfm/#link-label
  */
-export interface LinkLabelCollectingState {
+export interface ILinkLabelCollectingState {
     /**
      * Whether the current token has collected a legal LinkDestination
      */
@@ -38,7 +38,7 @@ export interface LinkLabelCollectingState {
  * @param state
  * @see https://github.github.com/gfm/#link-label
  */
-export declare function eatAndCollectLinkLabel(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: LinkLabelCollectingState | null): {
+export declare function eatAndCollectLinkLabel(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: ILinkLabelCollectingState | null): {
     nextIndex: number;
-    state: LinkLabelCollectingState;
+    state: ILinkLabelCollectingState;
 };

package/lib/types/util/link-title.d.ts

@@ -5,7 +5,7 @@ import type { INodePoint } from '@yozora/character';
  *
  * @see https://github.github.com/gfm/#link-title
  */
-export interface LinkTitleCollectingState {
+export interface ILinkTitleCollectingState {
     /**
      * Whether the current token has collected a legal LinkDestination
      */
@@ -27,7 +27,7 @@ export interface LinkTitleCollectingState {
  * @param state
  * @see https://github.github.com/gfm/#link-title
  */
-export declare function eatAndCollectLinkTitle(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: LinkTitleCollectingState | null): {
+export declare function eatAndCollectLinkTitle(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: ILinkTitleCollectingState | null): {
     nextIndex: number;
-    state: LinkTitleCollectingState;
+    state: ILinkTitleCollectingState;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-definition",
-  "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"
 }