@yozora/tokenizer-indented-code 1.3.0 → 2.0.0-alpha.3

package/README.md

@@ -84,14 +84,14 @@ so you can use `YozoraParser` / `GfmExParser` / `GfmParser` 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 IndentedCodeTokenizer from '@yozora/tokenizer-indented-code'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new IndentedCodeTokenizer())
 
 // parse source markdown content
@@ -231,7 +231,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
@@ -291,7 +290,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

@@ -6,18 +6,13 @@ var ast = require('@yozora/ast');
 var character = require('@yozora/character');
 var coreTokenizer = require('@yozora/core-tokenizer');
 
-const uniqueName = '@yozora/tokenizer-indented-code';
-
-class IndentedCodeTokenizer 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,
+        eatContinuationText,
+    };
+    function eatOpener(line) {
         if (line.countOfPrecedeSpaces < 4)
             return null;
         const { nodePoints, startIndex, firstNonWhitespaceIndex, endIndex } = line;
@@ -50,8 +45,8 @@ class IndentedCodeTokenizer extends coreTokenizer.BaseBlockTokenizer {
         };
         return { token, nextIndex };
     }
-    eatContinuationText(line, token) {
-        const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex, countOfPrecedeSpaces, } = line;
+    function eatContinuationText(line, token) {
+        const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex, countOfPrecedeSpaces } = line;
         if (countOfPrecedeSpaces < 4 && firstNonWhitespaceIndex < endIndex)
             return { status: 'notMatched' };
         const firstIndex = Math.min(endIndex - 1, startIndex + 4);
@@ -64,28 +59,49 @@ class IndentedCodeTokenizer extends coreTokenizer.BaseBlockTokenizer {
         });
         return { status: 'opening', nextIndex: endIndex };
     }
-    parseBlock(token) {
-        const { lines } = token;
-        let startLineIndex = 0, endLineIndex = lines.length;
-        for (; startLineIndex < endLineIndex; ++startLineIndex) {
-            const line = lines[startLineIndex];
-            if (line.firstNonWhitespaceIndex < line.endIndex)
-                break;
-        }
-        for (; startLineIndex < endLineIndex; --endLineIndex) {
-            const line = lines[endLineIndex - 1];
-            if (line.firstNonWhitespaceIndex < line.endIndex)
-                break;
-        }
-        const contents = coreTokenizer.mergeContentLinesFaithfully(lines, startLineIndex, endLineIndex);
-        const node = {
-            type: ast.CodeType,
-            value: character.calcStringFromNodePoints(contents),
-        };
-        return node;
+};
+
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const { lines } = token;
+            let startLineIndex = 0, endLineIndex = lines.length;
+            for (; startLineIndex < endLineIndex; ++startLineIndex) {
+                const line = lines[startLineIndex];
+                if (line.firstNonWhitespaceIndex < line.endIndex)
+                    break;
+            }
+            for (; startLineIndex < endLineIndex; --endLineIndex) {
+                const line = lines[endLineIndex - 1];
+                if (line.firstNonWhitespaceIndex < line.endIndex)
+                    break;
+            }
+            const contents = coreTokenizer.mergeContentLinesFaithfully(lines, startLineIndex, endLineIndex);
+            const value = character.calcStringFromNodePoints(contents);
+            const node = api.shouldReservePosition
+                ? { type: ast.CodeType, position: token.position, value }
+                : { type: ast.CodeType, value };
+            return node;
+        }),
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-indented-code';
+
+class IndentedCodeTokenizer 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.IndentedCodeTokenizer = IndentedCodeTokenizer;
 exports.IndentedCodeTokenizerName = uniqueName;
-exports['default'] = IndentedCodeTokenizer;
+exports["default"] = IndentedCodeTokenizer;
+exports.indentedCodeMatch = match;
+exports.indentedCodeParse = parse;

package/lib/esm/index.js

@@ -1,19 +1,14 @@
 import { CodeType } from '@yozora/ast';
 import { AsciiCodePoint, VirtualCodePoint, calcStringFromNodePoints } from '@yozora/character';
-import { BaseBlockTokenizer, TokenizerPriority, calcStartYastNodePoint, calcEndYastNodePoint, mergeContentLinesFaithfully } from '@yozora/core-tokenizer';
+import { calcStartYastNodePoint, calcEndYastNodePoint, mergeContentLinesFaithfully, BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
-const uniqueName = '@yozora/tokenizer-indented-code';
-
-class IndentedCodeTokenizer 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,
+        eatContinuationText,
+    };
+    function eatOpener(line) {
         if (line.countOfPrecedeSpaces < 4)
             return null;
         const { nodePoints, startIndex, firstNonWhitespaceIndex, endIndex } = line;
@@ -46,8 +41,8 @@ class IndentedCodeTokenizer extends BaseBlockTokenizer {
         };
         return { token, nextIndex };
     }
-    eatContinuationText(line, token) {
-        const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex, countOfPrecedeSpaces, } = line;
+    function eatContinuationText(line, token) {
+        const { nodePoints, startIndex, endIndex, firstNonWhitespaceIndex, countOfPrecedeSpaces } = line;
         if (countOfPrecedeSpaces < 4 && firstNonWhitespaceIndex < endIndex)
             return { status: 'notMatched' };
         const firstIndex = Math.min(endIndex - 1, startIndex + 4);
@@ -60,26 +55,45 @@ class IndentedCodeTokenizer extends BaseBlockTokenizer {
         });
         return { status: 'opening', nextIndex: endIndex };
     }
-    parseBlock(token) {
-        const { lines } = token;
-        let startLineIndex = 0, endLineIndex = lines.length;
-        for (; startLineIndex < endLineIndex; ++startLineIndex) {
-            const line = lines[startLineIndex];
-            if (line.firstNonWhitespaceIndex < line.endIndex)
-                break;
-        }
-        for (; startLineIndex < endLineIndex; --endLineIndex) {
-            const line = lines[endLineIndex - 1];
-            if (line.firstNonWhitespaceIndex < line.endIndex)
-                break;
-        }
-        const contents = mergeContentLinesFaithfully(lines, startLineIndex, endLineIndex);
-        const node = {
-            type: CodeType,
-            value: calcStringFromNodePoints(contents),
-        };
-        return node;
+};
+
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const { lines } = token;
+            let startLineIndex = 0, endLineIndex = lines.length;
+            for (; startLineIndex < endLineIndex; ++startLineIndex) {
+                const line = lines[startLineIndex];
+                if (line.firstNonWhitespaceIndex < line.endIndex)
+                    break;
+            }
+            for (; startLineIndex < endLineIndex; --endLineIndex) {
+                const line = lines[endLineIndex - 1];
+                if (line.firstNonWhitespaceIndex < line.endIndex)
+                    break;
+            }
+            const contents = mergeContentLinesFaithfully(lines, startLineIndex, endLineIndex);
+            const value = calcStringFromNodePoints(contents);
+            const node = api.shouldReservePosition
+                ? { type: CodeType, position: token.position, value }
+                : { type: CodeType, value };
+            return node;
+        }),
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-indented-code';
+
+class IndentedCodeTokenizer 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 { IndentedCodeTokenizer, uniqueName as IndentedCodeTokenizerName, IndentedCodeTokenizer as default };
+export { IndentedCodeTokenizer, uniqueName as IndentedCodeTokenizerName, IndentedCodeTokenizer as default, match as indentedCodeMatch, parse as indentedCodeParse };

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
-import { IndentedCodeTokenizer } from './tokenizer';
-export { IndentedCodeTokenizer } from './tokenizer';
+export { match as indentedCodeMatch } from './match';
+export { parse as indentedCodeParse } from './parse';
+export { IndentedCodeTokenizer, IndentedCodeTokenizer as default } from './tokenizer';
 export { uniqueName as IndentedCodeTokenizerName } from './types';
-export type { Token as IndentedCodeToken, TokenizerProps as IndentedCodeTokenizerProps, } from './types';
-export default IndentedCodeTokenizer;
+export type { IThis as IIndentedCodeHookContext, IToken as IIndentedCodeToken, ITokenizerProps as IIndentedCodeTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,12 @@
+import type { IMatchBlockHookCreator } from '@yozora/core-tokenizer';
+import type { IThis, IToken, T } from './types';
+/**
+ * An indented code block is composed of one or more indented chunks
+ * separated by blank lines. An indented chunk is a sequence of non-blank
+ * lines, each indented four or more spaces. The contents of the code block
+ * are the literal contents of the lines, including trailing line endings,
+ * minus four spaces of indentation.
+ *
+ * @see https://github.github.com/gfm/#indented-code-block
+ */
+export declare const match: IMatchBlockHookCreator<T, IToken, IThis>;

package/lib/types/parse.d.ts

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

package/lib/types/tokenizer.d.ts

@@ -1,33 +1,12 @@
-import type { PhrasingContentLine, ResultOfEatContinuationText, ResultOfEatOpener, 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 { INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for IndentedCode.
- *
- * An indented code block is composed of one or more indented chunks
- * separated by blank lines. An indented chunk is a sequence of non-blank
- * lines, each indented four or more spaces. The contents of the code block
- * are the literal contents of the lines, including trailing line endings,
- * minus four spaces of indentation.
- *
  * @see https://github.github.com/gfm/#indented-code-block
  */
-export declare class IndentedCodeTokenizer 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 TokenizerParseBlockHook
-     */
-    parseBlock(token: Readonly<Token>): ResultOfParse<T, Node>;
+export declare class IndentedCodeTokenizer extends BaseBlockTokenizer<T, IToken, INode, IThis> implements IBlockTokenizer<T, IToken, INode, IThis> {
+    constructor(props?: ITokenizerProps);
+    readonly match: IMatchBlockHookCreator<T, IToken, IThis>;
+    readonly parse: IParseBlockHookCreator<T, IToken, INode, IThis>;
 }

package/lib/types/types.d.ts

@@ -1,12 +1,13 @@
 import type { Code, CodeType } from '@yozora/ast';
-import type { BaseBlockTokenizerProps, PartialYastBlockToken, PhrasingContentLine } from '@yozora/core-tokenizer';
+import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, IPhrasingContentLine, ITokenizer } from '@yozora/core-tokenizer';
 export declare type T = CodeType;
-export declare type Node = Code;
+export declare type INode = Code;
 export declare const uniqueName = "@yozora/tokenizer-indented-code";
-export interface Token extends PartialYastBlockToken<T> {
+export interface IToken extends IPartialYastBlockToken<T> {
     /**
      * Lines to construct the contents of a paragraph.
      */
-    lines: PhrasingContentLine[];
+    lines: IPhrasingContentLine[];
 }
-export declare type TokenizerProps = Partial<BaseBlockTokenizerProps>;
+export declare type IThis = ITokenizer;
+export declare type ITokenizerProps = Partial<IBaseBlockTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-indented-code",
-  "version": "1.3.0",
+  "version": "2.0.0-alpha.3",
   "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.3",
+    "@yozora/character": "^2.0.0-alpha.3",
+    "@yozora/core-tokenizer": "^2.0.0-alpha.3"
   },
-  "gitHead": "18c9b167004ad97718b2f94f25139f80598cbf7a"
+  "gitHead": "9f274fc7487a8c1dd213405d92508f9a7621f730"
 }