@yozora/tokenizer-break 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 BreakTokenizer from '@yozora/tokenizer-break'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new BreakTokenizer())
 
 // parse source markdown content
@@ -250,7 +250,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
@@ -310,7 +309,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

@@ -13,15 +13,12 @@ var BreakTokenMarkerType;
     BreakTokenMarkerType["MORE_THAN_TWO_SPACES"] = "more-than-two-spaces";
 })(BreakTokenMarkerType || (BreakTokenMarkerType = {}));
 
-class BreakTokenizer extends coreTokenizer.BaseInlineTokenizer {
-    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.SOFT_INLINE,
-        });
-    }
-    _findDelimiter(startIndex, endIndex, api) {
+const match = function (api) {
+    return {
+        findDelimiter: () => coreTokenizer.genFindDelimiter(_findDelimiter),
+        processSingleDelimiter,
+    };
+    function _findDelimiter(startIndex, endIndex) {
         const nodePoints = api.getNodePoints();
         for (let i = startIndex + 1; i < endIndex; ++i) {
             if (nodePoints[i].codePoint !== character.VirtualCodePoint.LINE_END)
@@ -66,7 +63,7 @@ class BreakTokenizer extends coreTokenizer.BaseInlineTokenizer {
         }
         return null;
     }
-    processSingleDelimiter(delimiter) {
+    function processSingleDelimiter(delimiter) {
         const token = {
             nodeType: ast.BreakType,
             startIndex: delimiter.startIndex,
@@ -74,12 +71,33 @@ class BreakTokenizer extends coreTokenizer.BaseInlineTokenizer {
         };
         return [token];
     }
-    parseInline() {
-        const result = { type: ast.BreakType };
-        return result;
+};
+
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const node = api.shouldReservePosition
+                ? { type: ast.BreakType, position: api.calcPosition(token) }
+                : { type: ast.BreakType };
+            return node;
+        }),
+    };
+};
+
+class BreakTokenizer extends coreTokenizer.BaseInlineTokenizer {
+    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.SOFT_INLINE,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
 exports.BreakTokenizer = BreakTokenizer;
 exports.BreakTokenizerName = uniqueName;
-exports['default'] = BreakTokenizer;
+exports.breakMatch = match;
+exports.breakParse = parse;
+exports["default"] = BreakTokenizer;

package/lib/esm/index.js

@@ -1,6 +1,6 @@
 import { BreakType } from '@yozora/ast';
 import { VirtualCodePoint, AsciiCodePoint } from '@yozora/character';
-import { BaseInlineTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
+import { genFindDelimiter, BaseInlineTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const uniqueName = '@yozora/tokenizer-break';
 var BreakTokenMarkerType;
@@ -9,15 +9,12 @@ var BreakTokenMarkerType;
     BreakTokenMarkerType["MORE_THAN_TWO_SPACES"] = "more-than-two-spaces";
 })(BreakTokenMarkerType || (BreakTokenMarkerType = {}));
 
-class BreakTokenizer extends BaseInlineTokenizer {
-    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.SOFT_INLINE,
-        });
-    }
-    _findDelimiter(startIndex, endIndex, api) {
+const match = function (api) {
+    return {
+        findDelimiter: () => genFindDelimiter(_findDelimiter),
+        processSingleDelimiter,
+    };
+    function _findDelimiter(startIndex, endIndex) {
         const nodePoints = api.getNodePoints();
         for (let i = startIndex + 1; i < endIndex; ++i) {
             if (nodePoints[i].codePoint !== VirtualCodePoint.LINE_END)
@@ -62,7 +59,7 @@ class BreakTokenizer extends BaseInlineTokenizer {
         }
         return null;
     }
-    processSingleDelimiter(delimiter) {
+    function processSingleDelimiter(delimiter) {
         const token = {
             nodeType: BreakType,
             startIndex: delimiter.startIndex,
@@ -70,10 +67,29 @@ class BreakTokenizer extends BaseInlineTokenizer {
         };
         return [token];
     }
-    parseInline() {
-        const result = { type: BreakType };
-        return result;
+};
+
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const node = api.shouldReservePosition
+                ? { type: BreakType, position: api.calcPosition(token) }
+                : { type: BreakType };
+            return node;
+        }),
+    };
+};
+
+class BreakTokenizer extends BaseInlineTokenizer {
+    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.SOFT_INLINE,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
-export { BreakTokenizer, uniqueName as BreakTokenizerName, BreakTokenizer as default };
+export { BreakTokenizer, uniqueName as BreakTokenizerName, match as breakMatch, parse as breakParse, BreakTokenizer as default };

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
-import { BreakTokenizer } from './tokenizer';
-export { BreakTokenizer } from './tokenizer';
+export { match as breakMatch } from './match';
+export { parse as breakParse } from './parse';
+export { BreakTokenizer, BreakTokenizer as default } from './tokenizer';
 export { uniqueName as BreakTokenizerName } from './types';
-export type { Token as BreakToken, TokenizerProps as BreakTokenizerProps, } from './types';
-export default BreakTokenizer;
+export type { IThis as IBreakHookContext, IToken as IBreakToken, ITokenizerProps as IBreakTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,17 @@
+import type { IMatchInlineHookCreator } from '@yozora/core-tokenizer';
+import type { IDelimiter, IThis, IToken, T } from './types';
+/**
+ * A line break (not in a code span or HTML tag) that is preceded by two or more
+ * spaces and does not occur at the end of a block is parsed as a hard line
+ * break (rendered in HTML as a <br /> tag)
+ * @see https://github.github.com/gfm/#hard-line-breaks
+ *
+ * A regular line break (not in a code span or HTML tag) that is not preceded
+ * by two or more spaces or a backslash is parsed as a softbreak. (A softbreak
+ * may be rendered in HTML either as a line ending or as a space. The result
+ * will be the same in browsers.
+ * @see https://github.github.com/gfm/#soft-line-breaks
+ *
+ * @see https://github.com/syntax-tree/mdast#break
+ */
+export declare const match: IMatchInlineHookCreator<T, IDelimiter, IToken, IThis>;

package/lib/types/parse.d.ts

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

package/lib/types/tokenizer.d.ts

@@ -1,37 +1,14 @@
-import type { MatchInlinePhaseApi, ResultOfProcessSingleDelimiter, Tokenizer, TokenizerMatchInlineHook, TokenizerParseInlineHook } from '@yozora/core-tokenizer';
+import type { IInlineTokenizer, IMatchInlineHookCreator, IParseInlineHookCreator } from '@yozora/core-tokenizer';
 import { BaseInlineTokenizer } from '@yozora/core-tokenizer';
-import type { Delimiter, Node, T, Token, TokenizerProps } from './types';
+import type { IDelimiter, INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for a line break.
- *
- * A line break (not in a code span or HTML tag) that is preceded by two or more
- * spaces and does not occur at the end of a block is parsed as a hard line
- * break (rendered in HTML as a <br /> tag)
  * @see https://github.github.com/gfm/#hard-line-breaks
- *
- * A regular line break (not in a code span or HTML tag) that is not preceded
- * by two or more spaces or a backslash is parsed as a softbreak. (A softbreak
- * may be rendered in HTML either as a line ending or as a space. The result
- * will be the same in browsers.
  * @see https://github.github.com/gfm/#soft-line-breaks
- *
  * @see https://github.com/syntax-tree/mdast#break
  */
-export declare class BreakTokenizer extends BaseInlineTokenizer<Delimiter> implements Tokenizer, TokenizerMatchInlineHook<T, Delimiter, Token>, TokenizerParseInlineHook<T, Token, Node> {
-    constructor(props?: TokenizerProps);
-    /**
-     * @override
-     * @see BaseInlineTokenizer
-     */
-    protected _findDelimiter(startIndex: number, endIndex: number, api: Readonly<MatchInlinePhaseApi>): Delimiter | null;
-    /**
-     * @override
-     * @see TokenizerMatchInlineHook
-     */
-    processSingleDelimiter(delimiter: Delimiter): ResultOfProcessSingleDelimiter<T, Token>;
-    /**
-     * @override
-     * @see TokenizerParseInlineHook
-     */
-    parseInline(): Node;
+export declare class BreakTokenizer extends BaseInlineTokenizer<T, IDelimiter, IToken, INode, IThis> implements IInlineTokenizer<T, IDelimiter, IToken, INode, IThis> {
+    constructor(props?: ITokenizerProps);
+    readonly match: IMatchInlineHookCreator<T, IDelimiter, IToken, IThis>;
+    readonly parse: IParseInlineHookCreator<T, IToken, INode, IThis>;
 }

package/lib/types/types.d.ts

@@ -1,17 +1,18 @@
 import type { Break, BreakType } from '@yozora/ast';
-import type { BaseInlineTokenizerProps, PartialYastInlineToken, YastTokenDelimiter } from '@yozora/core-tokenizer';
+import type { IBaseInlineTokenizerProps, IPartialYastInlineToken, ITokenizer, IYastTokenDelimiter } from '@yozora/core-tokenizer';
 export declare type T = BreakType;
-export declare type Node = Break;
+export declare type INode = Break;
 export declare const uniqueName = "@yozora/tokenizer-break";
-export declare type Token = PartialYastInlineToken<T>;
-export interface Delimiter extends YastTokenDelimiter {
+export declare type IToken = IPartialYastInlineToken<T>;
+export interface IDelimiter extends IYastTokenDelimiter {
     type: 'full';
     /**
      * Line break marker type.
      */
     markerType: BreakTokenMarkerType;
 }
-export declare type TokenizerProps = Partial<BaseInlineTokenizerProps>;
+export declare type IThis = ITokenizer;
+export declare type ITokenizerProps = Partial<IBaseInlineTokenizerProps>;
 /**
  * Line break marker type.
  */

package/package.json

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