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

package/lib/cjs/index.js

@@ -2,21 +2,30 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var ast = require('@yozora/ast');
 var coreTokenizer = require('@yozora/core-tokenizer');
+var ast = require('@yozora/ast');
 
-const uniqueName = '@yozora/tokenizer-list';
+const parse = function () {
+    return {
+        parse: (token, children) => {
+            const node = {
+                type: ast.ListType,
+                ordered: token.ordered,
+                orderType: token.orderType,
+                start: token.start,
+                marker: token.marker,
+                spread: token.spread,
+                children: children,
+            };
+            return node;
+        },
+    };
+};
 
-class ListTokenizer 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.CONTAINING_BLOCK,
-        });
-        this.isContainingBlock = true;
-    }
-    transformMatch(tokens, api) {
+const postMatch = function (api) {
+    const { name: _tokenizer } = this;
+    return { transformMatch };
+    function transformMatch(tokens) {
         const results = [];
         let listItems = [];
         const resolveList = () => {
@@ -39,8 +48,7 @@ class ListTokenizer extends coreTokenizer.BaseBlockTokenizer {
                 let previousItem = listItems[0];
                 for (let i = 1; i < listItems.length; ++i) {
                     const currentItem = listItems[i];
-                    if (previousItem.position.end.line + 1 <
-                        currentItem.position.start.line) {
+                    if (previousItem.position.end.line + 1 < currentItem.position.start.line) {
                         spread = true;
                         break;
                     }
@@ -48,7 +56,7 @@ class ListTokenizer extends coreTokenizer.BaseBlockTokenizer {
                 }
             }
             const list = {
-                _tokenizer: this.name,
+                _tokenizer,
                 nodeType: ast.ListType,
                 ordered: listItems[0].ordered,
                 orderType: listItems[0].orderType,
@@ -97,20 +105,28 @@ class ListTokenizer extends coreTokenizer.BaseBlockTokenizer {
         resolveList();
         return results;
     }
-    parseBlock(token, children) {
-        const node = {
-            type: ast.ListType,
-            ordered: token.ordered,
-            orderType: token.orderType,
-            start: token.start,
-            marker: token.marker,
-            spread: token.spread,
-            children: (children || []),
+};
+
+const uniqueName = '@yozora/tokenizer-list';
+
+class ListTokenizer 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.CONTAINING_BLOCK,
+        });
+        this.match = () => {
+            return {
+                isContainingBlock: true,
+                eatOpener: () => null,
+            };
         };
-        return node;
+        this.postMatch = postMatch;
+        this.parse = parse;
     }
 }
 
 exports.ListTokenizer = ListTokenizer;
 exports.ListTokenizerName = uniqueName;
-exports['default'] = ListTokenizer;
+exports["default"] = ListTokenizer;

package/lib/esm/index.js

@@ -1,18 +1,27 @@
-import { ListItemType, ListType } from '@yozora/ast';
 import { BaseBlockTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { ListType, ListItemType } from '@yozora/ast';
 
-const uniqueName = '@yozora/tokenizer-list';
+const parse = function () {
+    return {
+        parse: (token, children) => {
+            const node = {
+                type: ListType,
+                ordered: token.ordered,
+                orderType: token.orderType,
+                start: token.start,
+                marker: token.marker,
+                spread: token.spread,
+                children: children,
+            };
+            return node;
+        },
+    };
+};
 
-class ListTokenizer 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.CONTAINING_BLOCK,
-        });
-        this.isContainingBlock = true;
-    }
-    transformMatch(tokens, api) {
+const postMatch = function (api) {
+    const { name: _tokenizer } = this;
+    return { transformMatch };
+    function transformMatch(tokens) {
         const results = [];
         let listItems = [];
         const resolveList = () => {
@@ -35,8 +44,7 @@ class ListTokenizer extends BaseBlockTokenizer {
                 let previousItem = listItems[0];
                 for (let i = 1; i < listItems.length; ++i) {
                     const currentItem = listItems[i];
-                    if (previousItem.position.end.line + 1 <
-                        currentItem.position.start.line) {
+                    if (previousItem.position.end.line + 1 < currentItem.position.start.line) {
                         spread = true;
                         break;
                     }
@@ -44,7 +52,7 @@ class ListTokenizer extends BaseBlockTokenizer {
                 }
             }
             const list = {
-                _tokenizer: this.name,
+                _tokenizer,
                 nodeType: ListType,
                 ordered: listItems[0].ordered,
                 orderType: listItems[0].orderType,
@@ -93,17 +101,25 @@ class ListTokenizer extends BaseBlockTokenizer {
         resolveList();
         return results;
     }
-    parseBlock(token, children) {
-        const node = {
-            type: ListType,
-            ordered: token.ordered,
-            orderType: token.orderType,
-            start: token.start,
-            marker: token.marker,
-            spread: token.spread,
-            children: (children || []),
+};
+
+const uniqueName = '@yozora/tokenizer-list';
+
+class ListTokenizer 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.CONTAINING_BLOCK,
+        });
+        this.match = () => {
+            return {
+                isContainingBlock: true,
+                eatOpener: () => null,
+            };
         };
-        return node;
+        this.postMatch = postMatch;
+        this.parse = parse;
     }
 }
 

package/lib/types/index.d.ts

@@ -1,5 +1,3 @@
-import { ListTokenizer } from './tokenizer';
-export { ListTokenizer } from './tokenizer';
+export { ListTokenizer, ListTokenizer as default } from './tokenizer';
 export { uniqueName as ListTokenizerName } from './types';
-export type { Token as ListToken, TokenizerProps as ListTokenizerProps, } from './types';
-export default ListTokenizer;
+export type { IToken as IListToken, ITokenizerProps as IListTokenizerProps } from './types';

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/postMatch.d.ts

@@ -0,0 +1,10 @@
+import type { IPostMatchBlockHookCreator } from '@yozora/core-tokenizer';
+import type { IHookContext } from './types';
+/**
+ * A list is a sequence of one or more list items of the same type.
+ * The list items may be separated by any number of blank lines.
+ *
+ * @see https://github.com/syntax-tree/mdast#list
+ * @see https://github.github.com/gfm/#list
+ */
+export declare const postMatch: IPostMatchBlockHookCreator<IHookContext>;

package/lib/types/tokenizer.d.ts

@@ -1,7 +1,6 @@
-import type { YastNode } from '@yozora/ast';
-import type { PostMatchBlockPhaseApi, ResultOfParse, Tokenizer, TokenizerParseBlockHook, TokenizerPostMatchBlockHook, YastBlockToken } from '@yozora/core-tokenizer';
+import type { IBlockTokenizer, IMatchBlockHookCreator, IParseBlockHookCreator, IPostMatchBlockHookCreator } 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';
 /**
  * Params for constructing ListTokenizer
  */
@@ -16,17 +15,9 @@ export interface ListTokenizerProps {
  * @see https://github.com/syntax-tree/mdast#list
  * @see https://github.github.com/gfm/#list
  */
-export declare class ListTokenizer extends BaseBlockTokenizer implements Tokenizer, TokenizerPostMatchBlockHook, TokenizerParseBlockHook<T, Token, Node> {
-    readonly isContainingBlock: boolean;
-    constructor(props?: TokenizerProps);
-    /**
-     * @override
-     * @see TokenizerPostMatchBlockHook
-     */
-    transformMatch(tokens: ReadonlyArray<YastBlockToken>, api: PostMatchBlockPhaseApi): YastBlockToken[];
-    /**
-     * @override
-     * @see TokenizerParseBlockHook
-     */
-    parseBlock(token: Readonly<Token>, children?: YastNode[]): ResultOfParse<T, Node>;
+export declare class ListTokenizer extends BaseBlockTokenizer<T, IToken, INode, IHookContext> implements IBlockTokenizer<T, IToken, INode, IHookContext> {
+    constructor(props?: ITokenizerProps);
+    readonly match: IMatchBlockHookCreator<T, IToken, IHookContext>;
+    readonly postMatch: IPostMatchBlockHookCreator<IHookContext>;
+    readonly parse: IParseBlockHookCreator<T, IToken, INode, IHookContext>;
 }

package/lib/types/types.d.ts

@@ -1,11 +1,11 @@
-import type { List, ListType } from '@yozora/ast';
-import type { BaseBlockTokenizerProps, PartialYastBlockToken, YastBlockToken } from '@yozora/core-tokenizer';
-import type { ListItemToken as _ListItemToken } from '@yozora/tokenizer-list-item';
+import type { IList, ListType } from '@yozora/ast';
+import type { IBaseBlockTokenizerProps, IPartialYastBlockToken, ITokenizer, IYastBlockToken } from '@yozora/core-tokenizer';
+import type { IListItemToken as IListItemToken0 } from '@yozora/tokenizer-list-item';
 export declare type T = ListType;
-export declare type Node = List;
+export declare type INode = IList;
 export declare const uniqueName = "@yozora/tokenizer-list";
-export declare type ListItemToken = _ListItemToken & YastBlockToken;
-export interface Token extends PartialYastBlockToken<T> {
+export declare type IListItemToken = IListItemToken0 & IYastBlockToken;
+export interface IToken extends IPartialYastBlockToken<T> {
     /**
      * Is it an ordered list item.
      */
@@ -30,6 +30,7 @@ export interface Token extends PartialYastBlockToken<T> {
     /**
      * List items.
      */
-    children: ListItemToken[];
+    children: IListItemToken[];
 }
-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-list",
-  "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/core-tokenizer": "^1.2.0",
-    "@yozora/tokenizer-list-item": "^1.2.0"
+    "@yozora/ast": "^2.0.0-alpha.0",
+    "@yozora/core-tokenizer": "^2.0.0-alpha.0",
+    "@yozora/tokenizer-list-item": "^2.0.0-alpha.0"
   },
-  "gitHead": "86da40e50d2fe9acace68695288e15e012e6cd0d"
+  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
 }