@yozora/tokenizer-definition 1.3.0 → 2.0.0-alpha.0

package/lib/cjs/index.js

@@ -2,11 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var ast = require('@yozora/ast');
 var character = require('@yozora/character');
 var coreTokenizer = require('@yozora/core-tokenizer');
-
-const uniqueName = '@yozora/tokenizer-definition';
+var ast = require('@yozora/ast');
 
 function eatAndCollectLinkDestination(nodePoints, startIndex, endIndex, state) {
     let i = startIndex;
@@ -76,8 +74,7 @@ function eatAndCollectLinkDestination(nodePoints, startIndex, endIndex, state) {
                 }
                 break;
             default:
-                if (character.isWhitespaceCharacter(p.codePoint) ||
-                    character.isAsciiControlCharacter(p.codePoint)) {
+                if (character.isWhitespaceCharacter(p.codePoint) || character.isAsciiControlCharacter(p.codePoint)) {
                     state.saturated = true;
                     return { nextIndex: i, state: state };
                 }
@@ -206,8 +203,7 @@ function eatAndCollectLinkTitle(nodePoints, startIndex, endIndex, state) {
                     case character.AsciiCodePoint.OPEN_PARENTHESIS:
                         return { nextIndex: -1, state: state };
                     case character.AsciiCodePoint.CLOSE_PARENTHESIS:
-                        if (i + 1 >= endIndex ||
-                            nodePoints[i + 1].codePoint === character.VirtualCodePoint.LINE_END) {
+                        if (i + 1 >= endIndex || nodePoints[i + 1].codePoint === character.VirtualCodePoint.LINE_END) {
                             state.nodePoints.push(p);
                             state.saturated = true;
                             break;
@@ -223,16 +219,14 @@ function eatAndCollectLinkTitle(nodePoints, startIndex, endIndex, state) {
     return { nextIndex: endIndex, state: state };
 }
 
-class DefinitionTokenizer 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.ATOMIC,
-        });
-        this.isContainingBlock = false;
-    }
-    eatOpener(line) {
+const match = function (api) {
+    return {
+        isContainingBlock: false,
+        eatOpener,
+        eatContinuationText,
+        onClose,
+    };
+    function eatOpener(line) {
         if (line.countOfPrecedeSpaces >= 4)
             return null;
         const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex } = line;
@@ -302,7 +296,7 @@ class DefinitionTokenizer extends coreTokenizer.BaseBlockTokenizer {
         token.lineNoOfTitle = lineNo;
         return { token, nextIndex: endIndex };
     }
-    eatContinuationText(line, token) {
+    function eatContinuationText(line, token) {
         var _a;
         if (token.title != null && token.title.saturated)
             return { status: 'notMatched' };
@@ -366,7 +360,7 @@ class DefinitionTokenizer extends coreTokenizer.BaseBlockTokenizer {
         const saturated = (_a = token.title) === null || _a === void 0 ? void 0 : _a.saturated;
         return { status: saturated ? 'closing' : 'opening', nextIndex: endIndex };
     }
-    onClose(token, api) {
+    function onClose(token) {
         let result;
         if (token.title == null || !token.title.saturated) {
             if (!token.label.saturated) {
@@ -394,31 +388,52 @@ class DefinitionTokenizer extends coreTokenizer.BaseBlockTokenizer {
         token._identifier = identifier;
         return result;
     }
-    parseBlock(token) {
-        const label = token._label;
-        const identifier = token._identifier;
-        const destinationPoints = token.destination.nodePoints;
-        const destination = destinationPoints[0].codePoint === character.AsciiCodePoint.OPEN_ANGLE
-            ? character.calcEscapedStringFromNodePoints(destinationPoints, 1, destinationPoints.length - 1, true)
-            : character.calcEscapedStringFromNodePoints(destinationPoints, 0, destinationPoints.length, true);
-        const url = coreTokenizer.encodeLinkDestination(destination);
-        const title = token.title == null
-            ? undefined
-            : character.calcEscapedStringFromNodePoints(token.title.nodePoints, 1, token.title.nodePoints.length - 1);
-        const node = {
-            type: ast.DefinitionType,
-            identifier,
-            label,
-            url,
-            title,
-        };
-        return node;
+};
+
+const parse = function () {
+    return {
+        parse: token => {
+            const label = token._label;
+            const identifier = token._identifier;
+            const destinationPoints = token.destination.nodePoints;
+            const destination = destinationPoints[0].codePoint === character.AsciiCodePoint.OPEN_ANGLE
+                ? character.calcEscapedStringFromNodePoints(destinationPoints, 1, destinationPoints.length - 1, true)
+                : character.calcEscapedStringFromNodePoints(destinationPoints, 0, destinationPoints.length, true);
+            const url = coreTokenizer.encodeLinkDestination(destination);
+            const title = token.title == null
+                ? undefined
+                : character.calcEscapedStringFromNodePoints(token.title.nodePoints, 1, token.title.nodePoints.length - 1);
+            const node = {
+                type: ast.DefinitionType,
+                identifier,
+                label,
+                url,
+                title,
+            };
+            return node;
+        },
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-definition';
+
+class DefinitionTokenizer 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.ATOMIC,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
 exports.DefinitionTokenizer = DefinitionTokenizer;
 exports.DefinitionTokenizerName = uniqueName;
-exports['default'] = DefinitionTokenizer;
+exports["default"] = DefinitionTokenizer;
+exports.definitionMatch = match;
+exports.definitionParse = parse;
 exports.eatAndCollectLinkDestination = eatAndCollectLinkDestination;
 exports.eatAndCollectLinkLabel = eatAndCollectLinkLabel;
 exports.eatAndCollectLinkTitle = eatAndCollectLinkTitle;

package/lib/esm/index.js

@@ -1,8 +1,6 @@
-import { DefinitionType } from '@yozora/ast';
 import { AsciiCodePoint, VirtualCodePoint, isWhitespaceCharacter, isAsciiControlCharacter, calcStringFromNodePoints, calcEscapedStringFromNodePoints } from '@yozora/character';
-import { eatOptionalWhitespaces, BaseBlockTokenizer, TokenizerPriority, calcEndYastNodePoint, resolveLabelToIdentifier, encodeLinkDestination, calcStartYastNodePoint } from '@yozora/core-tokenizer';
-
-const uniqueName = '@yozora/tokenizer-definition';
+import { eatOptionalWhitespaces, calcEndYastNodePoint, resolveLabelToIdentifier, calcStartYastNodePoint, encodeLinkDestination, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { DefinitionType } from '@yozora/ast';
 
 function eatAndCollectLinkDestination(nodePoints, startIndex, endIndex, state) {
     let i = startIndex;
@@ -72,8 +70,7 @@ function eatAndCollectLinkDestination(nodePoints, startIndex, endIndex, state) {
                 }
                 break;
             default:
-                if (isWhitespaceCharacter(p.codePoint) ||
-                    isAsciiControlCharacter(p.codePoint)) {
+                if (isWhitespaceCharacter(p.codePoint) || isAsciiControlCharacter(p.codePoint)) {
                     state.saturated = true;
                     return { nextIndex: i, state: state };
                 }
@@ -202,8 +199,7 @@ function eatAndCollectLinkTitle(nodePoints, startIndex, endIndex, state) {
                     case AsciiCodePoint.OPEN_PARENTHESIS:
                         return { nextIndex: -1, state: state };
                     case AsciiCodePoint.CLOSE_PARENTHESIS:
-                        if (i + 1 >= endIndex ||
-                            nodePoints[i + 1].codePoint === VirtualCodePoint.LINE_END) {
+                        if (i + 1 >= endIndex || nodePoints[i + 1].codePoint === VirtualCodePoint.LINE_END) {
                             state.nodePoints.push(p);
                             state.saturated = true;
                             break;
@@ -219,16 +215,14 @@ function eatAndCollectLinkTitle(nodePoints, startIndex, endIndex, state) {
     return { nextIndex: endIndex, state: state };
 }
 
-class DefinitionTokenizer 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.ATOMIC,
-        });
-        this.isContainingBlock = false;
-    }
-    eatOpener(line) {
+const match = function (api) {
+    return {
+        isContainingBlock: false,
+        eatOpener,
+        eatContinuationText,
+        onClose,
+    };
+    function eatOpener(line) {
         if (line.countOfPrecedeSpaces >= 4)
             return null;
         const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex } = line;
@@ -298,7 +292,7 @@ class DefinitionTokenizer extends BaseBlockTokenizer {
         token.lineNoOfTitle = lineNo;
         return { token, nextIndex: endIndex };
     }
-    eatContinuationText(line, token) {
+    function eatContinuationText(line, token) {
         var _a;
         if (token.title != null && token.title.saturated)
             return { status: 'notMatched' };
@@ -362,7 +356,7 @@ class DefinitionTokenizer extends BaseBlockTokenizer {
         const saturated = (_a = token.title) === null || _a === void 0 ? void 0 : _a.saturated;
         return { status: saturated ? 'closing' : 'opening', nextIndex: endIndex };
     }
-    onClose(token, api) {
+    function onClose(token) {
         let result;
         if (token.title == null || !token.title.saturated) {
             if (!token.label.saturated) {
@@ -390,26 +384,45 @@ class DefinitionTokenizer extends BaseBlockTokenizer {
         token._identifier = identifier;
         return result;
     }
-    parseBlock(token) {
-        const label = token._label;
-        const identifier = token._identifier;
-        const destinationPoints = token.destination.nodePoints;
-        const destination = destinationPoints[0].codePoint === AsciiCodePoint.OPEN_ANGLE
-            ? calcEscapedStringFromNodePoints(destinationPoints, 1, destinationPoints.length - 1, true)
-            : calcEscapedStringFromNodePoints(destinationPoints, 0, destinationPoints.length, true);
-        const url = encodeLinkDestination(destination);
-        const title = token.title == null
-            ? undefined
-            : calcEscapedStringFromNodePoints(token.title.nodePoints, 1, token.title.nodePoints.length - 1);
-        const node = {
-            type: DefinitionType,
-            identifier,
-            label,
-            url,
-            title,
-        };
-        return node;
+};
+
+const parse = function () {
+    return {
+        parse: token => {
+            const label = token._label;
+            const identifier = token._identifier;
+            const destinationPoints = token.destination.nodePoints;
+            const destination = destinationPoints[0].codePoint === AsciiCodePoint.OPEN_ANGLE
+                ? calcEscapedStringFromNodePoints(destinationPoints, 1, destinationPoints.length - 1, true)
+                : calcEscapedStringFromNodePoints(destinationPoints, 0, destinationPoints.length, true);
+            const url = encodeLinkDestination(destination);
+            const title = token.title == null
+                ? undefined
+                : calcEscapedStringFromNodePoints(token.title.nodePoints, 1, token.title.nodePoints.length - 1);
+            const node = {
+                type: DefinitionType,
+                identifier,
+                label,
+                url,
+                title,
+            };
+            return node;
+        },
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-definition';
+
+class DefinitionTokenizer 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.ATOMIC,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
-export { DefinitionTokenizer, uniqueName as DefinitionTokenizerName, DefinitionTokenizer as default, eatAndCollectLinkDestination, eatAndCollectLinkLabel, eatAndCollectLinkTitle };
+export { DefinitionTokenizer, uniqueName as DefinitionTokenizerName, DefinitionTokenizer as default, match as definitionMatch, parse as definitionParse, eatAndCollectLinkDestination, eatAndCollectLinkLabel, eatAndCollectLinkTitle };

package/lib/types/index.d.ts

@@ -1,8 +1,8 @@
-import { DefinitionTokenizer } from './tokenizer';
 export * from './util/link-destination';
 export * from './util/link-label';
 export * from './util/link-title';
-export { DefinitionTokenizer } from './tokenizer';
+export { match as definitionMatch } from './match';
+export { parse as definitionParse } from './parse';
+export { DefinitionTokenizer, DefinitionTokenizer as default } from './tokenizer';
 export { uniqueName as DefinitionTokenizerName } from './types';
-export type { Token as DefinitionToken, TokenizerProps as DefinitionTokenizerProps, } from './types';
-export default DefinitionTokenizer;
+export type { IHookContext as IDefinitionHookContext, IToken as IDefinitionToken, ITokenizerProps as IDefinitionTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,18 @@
+import type { IMatchBlockHookCreator } from '@yozora/core-tokenizer';
+import type { IHookContext, IToken, T } from './types';
+/**
+ * A link reference definition consists of a link label, indented up to three
+ * spaces, followed by a colon (:), optional whitespace (including up to one
+ * line ending), a link destination, optional whitespace (including up to one
+ * line ending), and an optional link title, which if it is present must be
+ * separated from the link destination by whitespace. No further non-whitespace
+ * characters may occur on the line.
+ *
+ * A link reference definition does not correspond to a structural element of
+ * a document. Instead, it defines a label which can be used in reference
+ * links and reference-style images elsewhere in the document. Link reference
+ * definitions can come either before or after the links that use them.
+ *
+ * @see https://github.github.com/gfm/#link-reference-definition
+ */
+export declare const match: IMatchBlockHookCreator<T, IToken, IHookContext>;

package/lib/types/parse.d.ts

@@ -0,0 +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>;

package/lib/types/tokenizer.d.ts

@@ -1,44 +1,12 @@
-import type { MatchBlockPhaseApi, PhrasingContentLine, ResultOfEatContinuationText, ResultOfEatOpener, ResultOfOnClose, ResultOfParse, Tokenizer, TokenizerMatchBlockHook, TokenizerParseBlockHook } from '@yozora/core-tokenizer';
+import type { IBlockTokenizer, IMatchBlockHookCreator, IParseBlockHookCreator } from '@yozora/core-tokenizer';
 import { BaseBlockTokenizer } from '@yozora/core-tokenizer';
-import type { Node, T, Token, TokenizerProps } from './types';
+import type { IHookContext, INode, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Definition.
- *
- * A link reference definition consists of a link label, indented up to three
- * spaces, followed by a colon (:), optional whitespace (including up to one
- * line ending), a link destination, optional whitespace (including up to one
- * line ending), and an optional link title, which if it is present must be
- * separated from the link destination by whitespace. No further non-whitespace
- * characters may occur on the line.
- *
- * A link reference definition does not correspond to a structural element of
- * a document. Instead, it defines a label which can be used in reference
- * links and reference-style images elsewhere in the document. Link reference
- * definitions can come either before or after the links that use them.
- *
  * @see https://github.github.com/gfm/#link-reference-definition
  */
-export declare class DefinitionTokenizer extends BaseBlockTokenizer implements Tokenizer, TokenizerMatchBlockHook<T, Token>, TokenizerParseBlockHook<T, Token, Node> {
-    readonly isContainingBlock = false;
-    constructor(props?: TokenizerProps);
-    /**
-     * @override
-     * @see TokenizerMatchBlockHook
-     */
-    eatOpener(line: Readonly<PhrasingContentLine>): ResultOfEatOpener<T, Token>;
-    /**
-     * @override
-     * @see TokenizerMatchBlockHook
-     */
-    eatContinuationText(line: Readonly<PhrasingContentLine>, token: Token): ResultOfEatContinuationText;
-    /**
-     * @override
-     * @see TokenizerMatchBlockHook
-     */
-    onClose(token: Token, api: Readonly<MatchBlockPhaseApi>): ResultOfOnClose;
-    /**
-     * @override
-     * @see TokenizerParseBlockHook
-     */
-    parseBlock(token: Readonly<Token>): ResultOfParse<T, Node>;
+export declare class DefinitionTokenizer extends BaseBlockTokenizer<T, IToken, INode, IHookContext> implements IBlockTokenizer<T, IToken, INode, IHookContext> {
+    constructor(props?: ITokenizerProps);
+    readonly match: IMatchBlockHookCreator<T, IToken, IHookContext>;
+    readonly parse: IParseBlockHookCreator<T, IToken, INode, IHookContext>;
 }

package/lib/types/types.d.ts

@@ -1,16 +1,16 @@
-import type { Definition, DefinitionType } from '@yozora/ast';
-import type { BaseBlockTokenizerProps, PartialYastBlockToken, PhrasingContentLine } from '@yozora/core-tokenizer';
+import type { DefinitionType, IDefinition } 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';
 export declare type T = DefinitionType;
-export declare type Node = Definition;
+export declare type INode = IDefinition;
 export declare const uniqueName = "@yozora/tokenizer-definition";
-export interface Token extends PartialYastBlockToken<T> {
+export interface IToken extends IPartialYastBlockToken<T> {
     /**
      *
      */
-    lines: Array<Readonly<PhrasingContentLine>>;
+    lines: Array<Readonly<IPhrasingContentLine>>;
     /**
      * Link label
      * Trimmed, Case-Insensitive
@@ -45,4 +45,5 @@ export interface Token extends PartialYastBlockToken<T> {
      */
     _identifier?: string;
 }
-export declare type TokenizerProps = Partial<BaseBlockTokenizerProps>;
+export declare type IHookContext = ITokenizer;
+export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

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

@@ -1,4 +1,4 @@
-import type { NodePoint } from '@yozora/character';
+import type { INodePoint } from '@yozora/character';
 /**
  * The processing token of eatAndCollectLinkDestination, used to save
  * intermediate data to support multiple codePosition fragment processing
@@ -13,7 +13,7 @@ export interface LinkDestinationCollectingState {
     /**
      * Collected token points
      */
-    nodePoints: NodePoint[];
+    nodePoints: INodePoint[];
     /**
      * Whether an opening angle bracket has been matched
      */
@@ -31,7 +31,7 @@ export interface LinkDestinationCollectingState {
  * @param state
  * @see https://github.github.com/gfm/#link-destination
  */
-export declare function eatAndCollectLinkDestination(nodePoints: ReadonlyArray<NodePoint>, startIndex: number, endIndex: number, state: LinkDestinationCollectingState | null): {
+export declare function eatAndCollectLinkDestination(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: LinkDestinationCollectingState | null): {
     nextIndex: number;
     state: LinkDestinationCollectingState;
 };

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

@@ -1,4 +1,4 @@
-import type { NodePoint } from '@yozora/character';
+import type { INodePoint } from '@yozora/character';
 /**
  * The processing token of eatAndCollectLinkLabel, used to save
  * intermediate data to support multiple codePosition fragment processing
@@ -13,7 +13,7 @@ export interface LinkLabelCollectingState {
     /**
      * Collected token points
      */
-    nodePoints: NodePoint[];
+    nodePoints: INodePoint[];
     /**
      * Does it contain non-blank characters
      */
@@ -38,7 +38,7 @@ export interface LinkLabelCollectingState {
  * @param state
  * @see https://github.github.com/gfm/#link-label
  */
-export declare function eatAndCollectLinkLabel(nodePoints: ReadonlyArray<NodePoint>, startIndex: number, endIndex: number, state: LinkLabelCollectingState | null): {
+export declare function eatAndCollectLinkLabel(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: LinkLabelCollectingState | null): {
     nextIndex: number;
     state: LinkLabelCollectingState;
 };

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

@@ -1,4 +1,4 @@
-import type { NodePoint } from '@yozora/character';
+import type { INodePoint } from '@yozora/character';
 /**
  * The processing token of eatAndCollectLinkDestination, used to save
  * intermediate data to support multiple codePosition fragment processing.
@@ -13,7 +13,7 @@ export interface LinkTitleCollectingState {
     /**
      * Collected token points
      */
-    nodePoints: NodePoint[];
+    nodePoints: INodePoint[];
     /**
      * Character that wrap link-title
      */
@@ -27,7 +27,7 @@ export interface LinkTitleCollectingState {
  * @param state
  * @see https://github.github.com/gfm/#link-title
  */
-export declare function eatAndCollectLinkTitle(nodePoints: ReadonlyArray<NodePoint>, startIndex: number, endIndex: number, state: LinkTitleCollectingState | null): {
+export declare function eatAndCollectLinkTitle(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number, state: LinkTitleCollectingState | null): {
     nextIndex: number;
     state: LinkTitleCollectingState;
 };

package/package.json

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