@yozora/tokenizer-emphasis 1.2.1 → 2.0.0-alpha.1

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 EmphasisTokenizer from '@yozora/tokenizer-emphasis'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new EmphasisTokenizer())
 
 // parse source markdown content
@@ -265,7 +265,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
@@ -325,7 +324,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,21 +6,23 @@ var ast = require('@yozora/ast');
 var character = require('@yozora/character');
 var coreTokenizer = require('@yozora/core-tokenizer');
 
-const uniqueName = '@yozora/tokenizer-emphasis';
-
-class EmphasisTokenizer 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.CONTAINING_INLINE,
-        });
-    }
-    _findDelimiter(startIndex, endIndex, nodePoints) {
+const match = function (api) {
+    return {
+        findDelimiter: () => coreTokenizer.genFindDelimiter(_findDelimiter),
+        isDelimiterPair,
+        processDelimiterPair,
+    };
+    function _findDelimiter(startIndex, endIndex) {
+        const nodePoints = api.getNodePoints();
+        const blockStartIndex = api.getBlockStartIndex();
+        const blockEndIndex = api.getBlockEndIndex();
         const isOpenerDelimiter = (delimiterStartIndex, delimiterEndIndex) => {
-            const nextCodePosition = delimiterEndIndex >= endIndex ? null : nodePoints[delimiterEndIndex];
-            if (nextCodePosition == null ||
-                character.isUnicodeWhitespaceCharacter(nextCodePosition.codePoint))
+            if (delimiterEndIndex === blockEndIndex)
+                return false;
+            if (delimiterEndIndex === endIndex)
+                return true;
+            const nextCodePosition = nodePoints[delimiterEndIndex];
+            if (character.isUnicodeWhitespaceCharacter(nextCodePosition.codePoint))
                 return false;
             if (!character.isPunctuationCharacter(nextCodePosition.codePoint))
                 return true;
@@ -31,13 +33,15 @@ class EmphasisTokenizer extends coreTokenizer.BaseInlineTokenizer {
                 character.isPunctuationCharacter(prevCodePosition.codePoint));
         };
         const isCloserDelimiter = (delimiterStartIndex, delimiterEndIndex) => {
-            if (delimiterStartIndex > startIndex) {
-                const prevCodePosition = nodePoints[delimiterStartIndex - 1];
-                if (character.isUnicodeWhitespaceCharacter(prevCodePosition.codePoint))
-                    return false;
-                if (!character.isPunctuationCharacter(prevCodePosition.codePoint))
-                    return true;
-            }
+            if (delimiterStartIndex === blockStartIndex)
+                return false;
+            if (delimiterStartIndex === startIndex)
+                return true;
+            const prevCodePosition = nodePoints[delimiterStartIndex - 1];
+            if (character.isUnicodeWhitespaceCharacter(prevCodePosition.codePoint))
+                return false;
+            if (!character.isPunctuationCharacter(prevCodePosition.codePoint))
+                return true;
             if (delimiterEndIndex >= endIndex)
                 return true;
             const nextCodePosition = nodePoints[delimiterEndIndex];
@@ -86,25 +90,23 @@ class EmphasisTokenizer extends coreTokenizer.BaseInlineTokenizer {
         }
         return null;
     }
-    isDelimiterPair(openerDelimiter, closerDelimiter, internalTokens, nodePoints) {
+    function isDelimiterPair(openerDelimiter, closerDelimiter) {
+        const nodePoints = api.getNodePoints();
         if (nodePoints[openerDelimiter.startIndex].codePoint !==
             nodePoints[closerDelimiter.startIndex].codePoint ||
             ((openerDelimiter.type === 'both' || closerDelimiter.type === 'both') &&
-                (openerDelimiter.originalThickness +
-                    closerDelimiter.originalThickness) %
-                    3 ===
-                    0 &&
+                (openerDelimiter.originalThickness + closerDelimiter.originalThickness) % 3 === 0 &&
                 openerDelimiter.originalThickness % 3 !== 0)) {
             return { paired: false, opener: true, closer: true };
         }
         return { paired: true };
     }
-    processDelimiterPair(openerDelimiter, closerDelimiter, internalTokens, nodePoints, api) {
+    function processDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
         let thickness = 1;
         if (openerDelimiter.thickness > 1 && closerDelimiter.thickness > 1) {
             thickness = 2;
         }
-        internalTokens = api.resolveInternalTokens(internalTokens, openerDelimiter.endIndex, closerDelimiter.startIndex, nodePoints);
+        internalTokens = api.resolveInternalTokens(internalTokens, openerDelimiter.endIndex, closerDelimiter.startIndex);
         const token = {
             nodeType: thickness === 1 ? ast.EmphasisType : ast.StrongType,
             startIndex: openerDelimiter.endIndex - thickness,
@@ -136,15 +138,36 @@ class EmphasisTokenizer extends coreTokenizer.BaseInlineTokenizer {
             remainCloserDelimiter,
         };
     }
-    processToken(token, children) {
-        const result = {
-            type: token.nodeType,
-            children: children !== null && children !== void 0 ? children : [],
-        };
-        return result;
+};
+
+const parse = function () {
+    return {
+        parse: (token, children) => {
+            const result = {
+                type: token.nodeType,
+                children,
+            };
+            return result;
+        },
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-emphasis';
+
+class EmphasisTokenizer 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.CONTAINING_INLINE,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
 exports.EmphasisTokenizer = EmphasisTokenizer;
 exports.EmphasisTokenizerName = uniqueName;
-exports['default'] = EmphasisTokenizer;
+exports["default"] = EmphasisTokenizer;
+exports.emphasisMatch = match;
+exports.emphasisParse = parse;

package/lib/esm/index.js

@@ -1,22 +1,24 @@
 import { EmphasisType, StrongType } from '@yozora/ast';
 import { AsciiCodePoint, isPunctuationCharacter, isUnicodeWhitespaceCharacter } from '@yozora/character';
-import { BaseInlineTokenizer, TokenizerPriority, eatOptionalCharacters } from '@yozora/core-tokenizer';
+import { genFindDelimiter, eatOptionalCharacters, BaseInlineTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
-const uniqueName = '@yozora/tokenizer-emphasis';
-
-class EmphasisTokenizer 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.CONTAINING_INLINE,
-        });
-    }
-    _findDelimiter(startIndex, endIndex, nodePoints) {
+const match = function (api) {
+    return {
+        findDelimiter: () => genFindDelimiter(_findDelimiter),
+        isDelimiterPair,
+        processDelimiterPair,
+    };
+    function _findDelimiter(startIndex, endIndex) {
+        const nodePoints = api.getNodePoints();
+        const blockStartIndex = api.getBlockStartIndex();
+        const blockEndIndex = api.getBlockEndIndex();
         const isOpenerDelimiter = (delimiterStartIndex, delimiterEndIndex) => {
-            const nextCodePosition = delimiterEndIndex >= endIndex ? null : nodePoints[delimiterEndIndex];
-            if (nextCodePosition == null ||
-                isUnicodeWhitespaceCharacter(nextCodePosition.codePoint))
+            if (delimiterEndIndex === blockEndIndex)
+                return false;
+            if (delimiterEndIndex === endIndex)
+                return true;
+            const nextCodePosition = nodePoints[delimiterEndIndex];
+            if (isUnicodeWhitespaceCharacter(nextCodePosition.codePoint))
                 return false;
             if (!isPunctuationCharacter(nextCodePosition.codePoint))
                 return true;
@@ -27,13 +29,15 @@ class EmphasisTokenizer extends BaseInlineTokenizer {
                 isPunctuationCharacter(prevCodePosition.codePoint));
         };
         const isCloserDelimiter = (delimiterStartIndex, delimiterEndIndex) => {
-            if (delimiterStartIndex > startIndex) {
-                const prevCodePosition = nodePoints[delimiterStartIndex - 1];
-                if (isUnicodeWhitespaceCharacter(prevCodePosition.codePoint))
-                    return false;
-                if (!isPunctuationCharacter(prevCodePosition.codePoint))
-                    return true;
-            }
+            if (delimiterStartIndex === blockStartIndex)
+                return false;
+            if (delimiterStartIndex === startIndex)
+                return true;
+            const prevCodePosition = nodePoints[delimiterStartIndex - 1];
+            if (isUnicodeWhitespaceCharacter(prevCodePosition.codePoint))
+                return false;
+            if (!isPunctuationCharacter(prevCodePosition.codePoint))
+                return true;
             if (delimiterEndIndex >= endIndex)
                 return true;
             const nextCodePosition = nodePoints[delimiterEndIndex];
@@ -82,25 +86,23 @@ class EmphasisTokenizer extends BaseInlineTokenizer {
         }
         return null;
     }
-    isDelimiterPair(openerDelimiter, closerDelimiter, internalTokens, nodePoints) {
+    function isDelimiterPair(openerDelimiter, closerDelimiter) {
+        const nodePoints = api.getNodePoints();
         if (nodePoints[openerDelimiter.startIndex].codePoint !==
             nodePoints[closerDelimiter.startIndex].codePoint ||
             ((openerDelimiter.type === 'both' || closerDelimiter.type === 'both') &&
-                (openerDelimiter.originalThickness +
-                    closerDelimiter.originalThickness) %
-                    3 ===
-                    0 &&
+                (openerDelimiter.originalThickness + closerDelimiter.originalThickness) % 3 === 0 &&
                 openerDelimiter.originalThickness % 3 !== 0)) {
             return { paired: false, opener: true, closer: true };
         }
         return { paired: true };
     }
-    processDelimiterPair(openerDelimiter, closerDelimiter, internalTokens, nodePoints, api) {
+    function processDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
         let thickness = 1;
         if (openerDelimiter.thickness > 1 && closerDelimiter.thickness > 1) {
             thickness = 2;
         }
-        internalTokens = api.resolveInternalTokens(internalTokens, openerDelimiter.endIndex, closerDelimiter.startIndex, nodePoints);
+        internalTokens = api.resolveInternalTokens(internalTokens, openerDelimiter.endIndex, closerDelimiter.startIndex);
         const token = {
             nodeType: thickness === 1 ? EmphasisType : StrongType,
             startIndex: openerDelimiter.endIndex - thickness,
@@ -132,13 +134,32 @@ class EmphasisTokenizer extends BaseInlineTokenizer {
             remainCloserDelimiter,
         };
     }
-    processToken(token, children) {
-        const result = {
-            type: token.nodeType,
-            children: children !== null && children !== void 0 ? children : [],
-        };
-        return result;
+};
+
+const parse = function () {
+    return {
+        parse: (token, children) => {
+            const result = {
+                type: token.nodeType,
+                children,
+            };
+            return result;
+        },
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-emphasis';
+
+class EmphasisTokenizer 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.CONTAINING_INLINE,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
-export { EmphasisTokenizer, uniqueName as EmphasisTokenizerName, EmphasisTokenizer as default };
+export { EmphasisTokenizer, uniqueName as EmphasisTokenizerName, EmphasisTokenizer as default, match as emphasisMatch, parse as emphasisParse };

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
-import { EmphasisTokenizer } from './tokenizer';
-export { EmphasisTokenizer } from './tokenizer';
+export { match as emphasisMatch } from './match';
+export { parse as emphasisParse } from './parse';
+export { EmphasisTokenizer, EmphasisTokenizer as default } from './tokenizer';
 export { uniqueName as EmphasisTokenizerName } from './types';
-export type { Token as EmphasisToken, TokenizerProps as EmphasisTokenizerProps, } from './types';
-export default EmphasisTokenizer;
+export type { IThis as IEmphasisHookContext, IToken as IEmphasisToken, ITokenizerProps as IEmphasisTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,7 @@
+import type { IMatchInlineHookCreator } from '@yozora/core-tokenizer';
+import type { IDelimiter, IThis, IToken, T } from './types';
+/**
+ * @see https://github.com/syntax-tree/mdast#strong
+ * @see https://github.github.com/gfm/#emphasis-and-strong-emphasis
+ */
+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,34 +1,13 @@
-import type { YastNode } from '@yozora/ast';
-import type { NodePoint } from '@yozora/character';
-import type { MatchInlinePhaseApi, ResultOfIsDelimiterPair, ResultOfProcessDelimiterPair, Tokenizer, TokenizerMatchInlineHook, TokenizerParseInlineHook, YastInlineToken } 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 Emphasis and Strong Emphasis.
- *
  * @see https://github.com/syntax-tree/mdast#strong
  * @see https://github.github.com/gfm/#emphasis-and-strong-emphasis
  */
-export declare class EmphasisTokenizer 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, nodePoints: ReadonlyArray<NodePoint>): Delimiter | null;
-    /**
-     * @override
-     * @see TokenizerMatchInlineHook
-     */
-    isDelimiterPair(openerDelimiter: Delimiter, closerDelimiter: Delimiter, internalTokens: ReadonlyArray<YastInlineToken>, nodePoints: ReadonlyArray<NodePoint>): ResultOfIsDelimiterPair;
-    /**
-     * @override
-     * @see TokenizerMatchInlineHook
-     */
-    processDelimiterPair(openerDelimiter: Delimiter, closerDelimiter: Delimiter, internalTokens: ReadonlyArray<YastInlineToken>, nodePoints: ReadonlyArray<NodePoint>, api: Readonly<MatchInlinePhaseApi>): ResultOfProcessDelimiterPair<T, Token, Delimiter>;
-    /**
-     * @override
-     * @see TokenizerParseInlineHook
-     */
-    processToken(token: Token, children?: YastNode[]): Node;
+export declare class EmphasisTokenizer 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,15 +1,15 @@
-import type { Emphasis, EmphasisType, Strong, StrongType } from '@yozora/ast';
-import type { BaseInlineTokenizerProps, PartialYastInlineToken, YastTokenDelimiter } from '@yozora/core-tokenizer';
+import type { EmphasisType, IEmphasis, IStrong, StrongType } from '@yozora/ast';
+import type { IBaseInlineTokenizerProps, IPartialYastInlineToken, ITokenizer, IYastTokenDelimiter } from '@yozora/core-tokenizer';
 export declare type T = EmphasisType | StrongType;
-export declare type Node = Emphasis | Strong;
+export declare type INode = IEmphasis | IStrong;
 export declare const uniqueName = "@yozora/tokenizer-emphasis";
-export interface Token extends PartialYastInlineToken<T> {
+export interface IToken extends IPartialYastInlineToken<T> {
     /**
-     * Delimiter thickness.
+     * IDelimiter thickness.
      */
     thickness: number;
 }
-export interface Delimiter extends YastTokenDelimiter {
+export interface IDelimiter extends IYastTokenDelimiter {
     /**
      * Thickness of the delimiter.
      */
@@ -19,4 +19,5 @@ export interface Delimiter extends YastTokenDelimiter {
      */
     originalThickness: number;
 }
-export declare type TokenizerProps = Partial<BaseInlineTokenizerProps>;
+export declare type IThis = ITokenizer;
+export declare type ITokenizerProps = Partial<IBaseInlineTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-emphasis",
-  "version": "1.2.1",
+  "version": "2.0.0-alpha.1",
   "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.1",
-    "@yozora/character": "^1.2.1",
-    "@yozora/core-tokenizer": "^1.2.1"
+    "@yozora/ast": "^2.0.0-alpha.1",
+    "@yozora/character": "^2.0.0-alpha.1",
+    "@yozora/core-tokenizer": "^2.0.0-alpha.1"
   },
-  "gitHead": "d98d07d7c56dd9f6bb60149b2b0a4be2787e1046"
+  "gitHead": "86202e1d2b03ccfc2ab030517d9d314f7aee7666"
 }