@yozora/tokenizer-heading 1.2.0 → 2.0.0-alpha.0

package/lib/cjs/index.js

@@ -6,24 +6,18 @@ var ast = require('@yozora/ast');
 var character = require('@yozora/character');
 var coreTokenizer = require('@yozora/core-tokenizer');
 
-const uniqueName = '@yozora/tokenizer-heading';
-
-class HeadingTokenizer 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 () {
+    return {
+        isContainingBlock: false,
+        eatOpener,
+        eatAndInterruptPreviousSibling,
+    };
+    function eatOpener(line) {
         if (line.countOfPrecedeSpaces >= 4)
             return null;
         const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex } = line;
         if (firstNonWhitespaceIndex >= endIndex ||
-            nodePoints[firstNonWhitespaceIndex].codePoint !==
-                character.AsciiCodePoint.NUMBER_SIGN) {
+            nodePoints[firstNonWhitespaceIndex].codePoint !== character.AsciiCodePoint.NUMBER_SIGN) {
             return null;
         }
         const i = coreTokenizer.eatOptionalCharacters(nodePoints, firstNonWhitespaceIndex + 1, endIndex, character.AsciiCodePoint.NUMBER_SIGN);
@@ -44,8 +38,8 @@ class HeadingTokenizer extends coreTokenizer.BaseBlockTokenizer {
         };
         return { token, nextIndex, saturated: true };
     }
-    eatAndInterruptPreviousSibling(line, prevSiblingToken) {
-        const result = this.eatOpener(line);
+    function eatAndInterruptPreviousSibling(line, prevSiblingToken) {
+        const result = eatOpener(line);
         if (result == null)
             return null;
         return {
@@ -54,47 +48,68 @@ class HeadingTokenizer extends coreTokenizer.BaseBlockTokenizer {
             remainingSibling: prevSiblingToken,
         };
     }
-    parseBlock(token, children, api) {
-        const { nodePoints, firstNonWhitespaceIndex, endIndex } = token.line;
-        let [leftIndex, rightIndex] = character.calcTrimBoundaryOfCodePoints(nodePoints, firstNonWhitespaceIndex + token.depth, endIndex);
-        let closeCharCount = 0;
-        for (let j = rightIndex - 1; j >= leftIndex; --j) {
-            const c = nodePoints[j].codePoint;
-            if (c !== character.AsciiCodePoint.NUMBER_SIGN)
-                break;
-            closeCharCount += 1;
-        }
-        if (closeCharCount > 0) {
-            let spaceCount = 0, j = rightIndex - 1 - closeCharCount;
-            for (; j >= leftIndex; --j) {
+};
+
+const parse = function (api) {
+    return {
+        parse: token => {
+            const { nodePoints, firstNonWhitespaceIndex, endIndex } = token.line;
+            let [leftIndex, rightIndex] = character.calcTrimBoundaryOfCodePoints(nodePoints, firstNonWhitespaceIndex + token.depth, endIndex);
+            let closeCharCount = 0;
+            for (let j = rightIndex - 1; j >= leftIndex; --j) {
                 const c = nodePoints[j].codePoint;
-                if (!character.isWhitespaceCharacter(c))
+                if (c !== character.AsciiCodePoint.NUMBER_SIGN)
                     break;
-                spaceCount += 1;
+                closeCharCount += 1;
             }
-            if (spaceCount > 0 || j < leftIndex) {
-                rightIndex -= closeCharCount + spaceCount;
+            if (closeCharCount > 0) {
+                let spaceCount = 0, j = rightIndex - 1 - closeCharCount;
+                for (; j >= leftIndex; --j) {
+                    const c = nodePoints[j].codePoint;
+                    if (!character.isWhitespaceCharacter(c))
+                        break;
+                    spaceCount += 1;
+                }
+                if (spaceCount > 0 || j < leftIndex) {
+                    rightIndex -= closeCharCount + spaceCount;
+                }
             }
-        }
-        const lines = [
-            {
-                nodePoints,
-                startIndex: leftIndex,
-                endIndex: rightIndex,
-                firstNonWhitespaceIndex: leftIndex,
-                countOfPrecedeSpaces: 0,
-            },
-        ];
-        const phrasingContent = api.buildPhrasingContent(lines);
-        const node = {
-            type: ast.HeadingType,
-            depth: token.depth,
-            children: phrasingContent == null ? [] : [phrasingContent],
-        };
-        return node;
+            const lines = [
+                {
+                    nodePoints,
+                    startIndex: leftIndex,
+                    endIndex: rightIndex,
+                    firstNonWhitespaceIndex: leftIndex,
+                    countOfPrecedeSpaces: 0,
+                },
+            ];
+            const phrasingContent = api.buildPhrasingContent(lines);
+            const node = {
+                type: ast.HeadingType,
+                depth: token.depth,
+                children: phrasingContent == null ? [] : [phrasingContent],
+            };
+            return node;
+        },
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-heading';
+
+class HeadingTokenizer 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.HeadingTokenizer = HeadingTokenizer;
 exports.HeadingTokenizerName = uniqueName;
-exports['default'] = HeadingTokenizer;
+exports["default"] = HeadingTokenizer;
+exports.headingMatch = match;
+exports.headingParse = parse;

package/lib/esm/index.js

@@ -1,25 +1,19 @@
 import { HeadingType } from '@yozora/ast';
 import { AsciiCodePoint, isSpaceCharacter, calcTrimBoundaryOfCodePoints, isWhitespaceCharacter } from '@yozora/character';
-import { BaseBlockTokenizer, TokenizerPriority, eatOptionalCharacters, calcStartYastNodePoint, calcEndYastNodePoint } from '@yozora/core-tokenizer';
+import { eatOptionalCharacters, calcStartYastNodePoint, calcEndYastNodePoint, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
-const uniqueName = '@yozora/tokenizer-heading';
-
-class HeadingTokenizer 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 () {
+    return {
+        isContainingBlock: false,
+        eatOpener,
+        eatAndInterruptPreviousSibling,
+    };
+    function eatOpener(line) {
         if (line.countOfPrecedeSpaces >= 4)
             return null;
         const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex } = line;
         if (firstNonWhitespaceIndex >= endIndex ||
-            nodePoints[firstNonWhitespaceIndex].codePoint !==
-                AsciiCodePoint.NUMBER_SIGN) {
+            nodePoints[firstNonWhitespaceIndex].codePoint !== AsciiCodePoint.NUMBER_SIGN) {
             return null;
         }
         const i = eatOptionalCharacters(nodePoints, firstNonWhitespaceIndex + 1, endIndex, AsciiCodePoint.NUMBER_SIGN);
@@ -40,8 +34,8 @@ class HeadingTokenizer extends BaseBlockTokenizer {
         };
         return { token, nextIndex, saturated: true };
     }
-    eatAndInterruptPreviousSibling(line, prevSiblingToken) {
-        const result = this.eatOpener(line);
+    function eatAndInterruptPreviousSibling(line, prevSiblingToken) {
+        const result = eatOpener(line);
         if (result == null)
             return null;
         return {
@@ -50,45 +44,64 @@ class HeadingTokenizer extends BaseBlockTokenizer {
             remainingSibling: prevSiblingToken,
         };
     }
-    parseBlock(token, children, api) {
-        const { nodePoints, firstNonWhitespaceIndex, endIndex } = token.line;
-        let [leftIndex, rightIndex] = calcTrimBoundaryOfCodePoints(nodePoints, firstNonWhitespaceIndex + token.depth, endIndex);
-        let closeCharCount = 0;
-        for (let j = rightIndex - 1; j >= leftIndex; --j) {
-            const c = nodePoints[j].codePoint;
-            if (c !== AsciiCodePoint.NUMBER_SIGN)
-                break;
-            closeCharCount += 1;
-        }
-        if (closeCharCount > 0) {
-            let spaceCount = 0, j = rightIndex - 1 - closeCharCount;
-            for (; j >= leftIndex; --j) {
+};
+
+const parse = function (api) {
+    return {
+        parse: token => {
+            const { nodePoints, firstNonWhitespaceIndex, endIndex } = token.line;
+            let [leftIndex, rightIndex] = calcTrimBoundaryOfCodePoints(nodePoints, firstNonWhitespaceIndex + token.depth, endIndex);
+            let closeCharCount = 0;
+            for (let j = rightIndex - 1; j >= leftIndex; --j) {
                 const c = nodePoints[j].codePoint;
-                if (!isWhitespaceCharacter(c))
+                if (c !== AsciiCodePoint.NUMBER_SIGN)
                     break;
-                spaceCount += 1;
+                closeCharCount += 1;
             }
-            if (spaceCount > 0 || j < leftIndex) {
-                rightIndex -= closeCharCount + spaceCount;
+            if (closeCharCount > 0) {
+                let spaceCount = 0, j = rightIndex - 1 - closeCharCount;
+                for (; j >= leftIndex; --j) {
+                    const c = nodePoints[j].codePoint;
+                    if (!isWhitespaceCharacter(c))
+                        break;
+                    spaceCount += 1;
+                }
+                if (spaceCount > 0 || j < leftIndex) {
+                    rightIndex -= closeCharCount + spaceCount;
+                }
             }
-        }
-        const lines = [
-            {
-                nodePoints,
-                startIndex: leftIndex,
-                endIndex: rightIndex,
-                firstNonWhitespaceIndex: leftIndex,
-                countOfPrecedeSpaces: 0,
-            },
-        ];
-        const phrasingContent = api.buildPhrasingContent(lines);
-        const node = {
-            type: HeadingType,
-            depth: token.depth,
-            children: phrasingContent == null ? [] : [phrasingContent],
-        };
-        return node;
+            const lines = [
+                {
+                    nodePoints,
+                    startIndex: leftIndex,
+                    endIndex: rightIndex,
+                    firstNonWhitespaceIndex: leftIndex,
+                    countOfPrecedeSpaces: 0,
+                },
+            ];
+            const phrasingContent = api.buildPhrasingContent(lines);
+            const node = {
+                type: HeadingType,
+                depth: token.depth,
+                children: phrasingContent == null ? [] : [phrasingContent],
+            };
+            return node;
+        },
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-heading';
+
+class HeadingTokenizer 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 { HeadingTokenizer, uniqueName as HeadingTokenizerName, HeadingTokenizer as default };
+export { HeadingTokenizer, uniqueName as HeadingTokenizerName, HeadingTokenizer as default, match as headingMatch, parse as headingParse };

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
-import { HeadingTokenizer } from './tokenizer';
-export { HeadingTokenizer } from './tokenizer';
+export { match as headingMatch } from './match';
+export { parse as headingParse } from './parse';
+export { HeadingTokenizer, HeadingTokenizer as default } from './tokenizer';
 export { uniqueName as HeadingTokenizerName } from './types';
-export type { Token as HeadingToken, TokenizerProps as HeadingTokenizerProps, } from './types';
-export default HeadingTokenizer;
+export type { IHookContext as IHeadingHookContext, IToken as IHeadingToken, ITokenizerProps as IHeadingTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,17 @@
+import type { IMatchBlockHookCreator } from '@yozora/core-tokenizer';
+import type { IHookContext, IToken, T } from './types';
+/**
+ * An ATX heading consists of a string of characters, parsed as inline content,
+ * between an opening sequence of 1–6 unescaped '#' characters and an optional
+ * closing sequence of any number of unescaped '#' characters. The opening
+ * sequence of '#' characters must be followed by a space or by the end of line.
+ * The optional closing sequence of #s must be preceded by a space and may be
+ * followed by spaces only. The opening # character may be indented 0-3 spaces.
+ * The raw contents of the heading are stripped of leading and trailing spaces
+ * before being parsed as inline content. The heading level is equal to the
+ * number of '#' characters in the opening sequence.
+ *
+ * @see https://github.com/syntax-tree/mdast#heading
+ * @see https://github.github.com/gfm/#atx-heading
+ */
+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,38 +1,13 @@
-import type { ParseBlockPhaseApi, PhrasingContentLine, ResultOfEatAndInterruptPreviousSibling, 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, Token, TokenizerProps } from './types';
+import type { IHookContext, INode, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Heading.
- *
- * An ATX heading consists of a string of characters, parsed as inline content,
- * between an opening sequence of 1–6 unescaped '#' characters and an optional
- * closing sequence of any number of unescaped '#' characters. The opening
- * sequence of '#' characters must be followed by a space or by the end of line.
- * The optional closing sequence of #s must be preceded by a space and may be
- * followed by spaces only. The opening # character may be indented 0-3 spaces.
- * The raw contents of the heading are stripped of leading and trailing spaces
- * before being parsed as inline content. The heading level is equal to the
- * number of '#' characters in the opening sequence.
- *
  * @see https://github.com/syntax-tree/mdast#heading
  * @see https://github.github.com/gfm/#atx-heading
  */
-export declare class HeadingTokenizer 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
-     */
-    eatAndInterruptPreviousSibling(line: Readonly<PhrasingContentLine>, prevSiblingToken: Readonly<YastBlockToken>): ResultOfEatAndInterruptPreviousSibling<T, Token>;
-    /**
-     * @override
-     * @see TokenizerParseBlockHook
-     */
-    parseBlock(token: Readonly<Token>, children: undefined, api: Readonly<ParseBlockPhaseApi>): ResultOfParse<T, Node>;
+export declare class HeadingTokenizer 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,9 +1,9 @@
-import type { Heading, HeadingType } from '@yozora/ast';
-import type { BaseBlockTokenizerProps, PartialYastBlockToken, PhrasingContentLine } from '@yozora/core-tokenizer';
+import type { HeadingType, IHeading } from '@yozora/ast';
+import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, IPhrasingContentLine, ITokenizer } from '@yozora/core-tokenizer';
 export declare type T = HeadingType;
-export declare type Node = Heading;
+export declare type INode = IHeading;
 export declare const uniqueName = "@yozora/tokenizer-heading";
-export interface Token extends PartialYastBlockToken<T> {
+export interface IToken extends IPartialYastBlockToken<T> {
     /**
      * Level of heading
      */
@@ -11,6 +11,7 @@ export interface Token extends PartialYastBlockToken<T> {
     /**
      * Contents
      */
-    line: Readonly<PhrasingContentLine>;
+    line: Readonly<IPhrasingContentLine>;
 }
-export declare type TokenizerProps = Partial<BaseBlockTokenizerProps>;
+export declare type IHookContext = ITokenizer;
+export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-heading",
-  "version": "1.2.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.2.0",
-    "@yozora/character": "^1.2.0",
-    "@yozora/core-tokenizer": "^1.2.0"
+    "@yozora/ast": "^2.0.0-alpha.0",
+    "@yozora/character": "^2.0.0-alpha.0",
+    "@yozora/core-tokenizer": "^2.0.0-alpha.0"
   },
-  "gitHead": "86da40e50d2fe9acace68695288e15e012e6cd0d"
+  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
 }