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

package/lib/cjs/index.js

@@ -2,12 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var ast = require('@yozora/ast');
 var character = require('@yozora/character');
+var ast = require('@yozora/ast');
 var coreTokenizer = require('@yozora/core-tokenizer');
 
-const uniqueName = '@yozora/tokenizer-autolink';
-
 function eatEmailAddress(nodePoints, startIndex, endIndex) {
     let i = startIndex;
     for (; i < endIndex; i += 1) {
@@ -105,6 +103,8 @@ function eatAutolinkSchema(nodePoints, startIndex, endIndex) {
     return { valid: true, nextIndex: i };
 }
 
+const uniqueName = '@yozora/tokenizer-autolink';
+
 const helpers = [
     { contentType: 'uri', eat: eatAbsoluteUri },
     { contentType: 'email', eat: eatEmailAddress },
@@ -116,67 +116,77 @@ class AutolinkTokenizer extends coreTokenizer.BaseInlineTokenizer {
             name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
             priority: (_b = props.priority) !== null && _b !== void 0 ? _b : coreTokenizer.TokenizerPriority.ATOMIC,
         });
-    }
-    _findDelimiter(startIndex, endIndex, nodePoints) {
-        for (let i = startIndex; i < endIndex; ++i) {
-            if (nodePoints[i].codePoint !== character.AsciiCodePoint.OPEN_ANGLE)
-                continue;
-            let nextIndex = endIndex;
-            let contentType = null;
-            for (const helper of helpers) {
-                const eatResult = helper.eat(nodePoints, i + 1, endIndex);
-                nextIndex = Math.min(nextIndex, eatResult.nextIndex);
-                if (eatResult.valid) {
-                    contentType = helper.contentType;
-                    nextIndex = eatResult.nextIndex;
-                    break;
+        this.match = api => {
+            return {
+                findDelimiter: () => coreTokenizer.genFindDelimiter(_findDelimiter),
+                processSingleDelimiter,
+            };
+            function _findDelimiter(startIndex, endIndex) {
+                const nodePoints = api.getNodePoints();
+                for (let i = startIndex; i < endIndex; ++i) {
+                    if (nodePoints[i].codePoint !== character.AsciiCodePoint.OPEN_ANGLE)
+                        continue;
+                    let nextIndex = endIndex;
+                    let contentType = null;
+                    for (const helper of helpers) {
+                        const eatResult = helper.eat(nodePoints, i + 1, endIndex);
+                        nextIndex = Math.min(nextIndex, eatResult.nextIndex);
+                        if (eatResult.valid) {
+                            contentType = helper.contentType;
+                            nextIndex = eatResult.nextIndex;
+                            break;
+                        }
+                    }
+                    if (contentType == null) {
+                        i = Math.max(i, nextIndex - 1);
+                        continue;
+                    }
+                    if (nextIndex < endIndex &&
+                        nodePoints[nextIndex].codePoint === character.AsciiCodePoint.CLOSE_ANGLE) {
+                        return {
+                            type: 'full',
+                            startIndex: i,
+                            endIndex: nextIndex + 1,
+                            contentType,
+                        };
+                    }
+                    i = nextIndex - 1;
                 }
+                return null;
             }
-            if (contentType == null) {
-                i = Math.max(i, nextIndex - 1);
-                continue;
-            }
-            if (nextIndex < endIndex &&
-                nodePoints[nextIndex].codePoint === character.AsciiCodePoint.CLOSE_ANGLE) {
-                return {
-                    type: 'full',
-                    startIndex: i,
-                    endIndex: nextIndex + 1,
-                    contentType,
+            function processSingleDelimiter(delimiter) {
+                const token = {
+                    nodeType: ast.LinkType,
+                    startIndex: delimiter.startIndex,
+                    endIndex: delimiter.endIndex,
+                    contentType: delimiter.contentType,
+                    children: api.resolveFallbackTokens([], delimiter.startIndex + 1, delimiter.endIndex - 1),
                 };
+                return [token];
             }
-            i = nextIndex - 1;
-        }
-        return null;
-    }
-    processSingleDelimiter(delimiter, nodePoints, api) {
-        const token = {
-            nodeType: ast.LinkType,
-            startIndex: delimiter.startIndex,
-            endIndex: delimiter.endIndex,
-            contentType: delimiter.contentType,
-            children: api.resolveFallbackTokens([], delimiter.startIndex + 1, delimiter.endIndex - 1, nodePoints),
-        };
-        return [token];
-    }
-    processToken(token, children, nodePoints) {
-        let url = character.calcStringFromNodePoints(nodePoints, token.startIndex + 1, token.endIndex - 1);
-        if (token.contentType === 'email') {
-            url = 'mailto:' + url;
-        }
-        const encodedUrl = coreTokenizer.encodeLinkDestination(url);
-        const result = {
-            type: ast.LinkType,
-            url: encodedUrl,
-            children: children !== null && children !== void 0 ? children : [],
         };
-        return result;
+        this.parse = api => ({
+            parse: (token, children) => {
+                const nodePoints = api.getNodePoints();
+                let url = character.calcStringFromNodePoints(nodePoints, token.startIndex + 1, token.endIndex - 1);
+                if (token.contentType === 'email') {
+                    url = 'mailto:' + url;
+                }
+                const encodedUrl = coreTokenizer.encodeLinkDestination(url);
+                const result = {
+                    type: ast.LinkType,
+                    url: encodedUrl,
+                    children,
+                };
+                return result;
+            },
+        });
     }
 }
 
 exports.AutolinkTokenizer = AutolinkTokenizer;
 exports.AutolinkTokenizerName = uniqueName;
-exports['default'] = AutolinkTokenizer;
+exports["default"] = AutolinkTokenizer;
 exports.eatAbsoluteUri = eatAbsoluteUri;
 exports.eatAutolinkSchema = eatAutolinkSchema;
 exports.eatEmailAddress = eatEmailAddress;

package/lib/esm/index.js

@@ -1,8 +1,6 @@
-import { LinkType } from '@yozora/ast';
 import { isAsciiLetter, isAsciiDigitCharacter, AsciiCodePoint, isAlphanumeric, isAsciiCharacter, isWhitespaceCharacter, isAsciiControlCharacter, calcStringFromNodePoints } from '@yozora/character';
-import { BaseInlineTokenizer, TokenizerPriority, encodeLinkDestination } from '@yozora/core-tokenizer';
-
-const uniqueName = '@yozora/tokenizer-autolink';
+import { LinkType } from '@yozora/ast';
+import { BaseInlineTokenizer, TokenizerPriority, genFindDelimiter, encodeLinkDestination } from '@yozora/core-tokenizer';
 
 function eatEmailAddress(nodePoints, startIndex, endIndex) {
     let i = startIndex;
@@ -101,6 +99,8 @@ function eatAutolinkSchema(nodePoints, startIndex, endIndex) {
     return { valid: true, nextIndex: i };
 }
 
+const uniqueName = '@yozora/tokenizer-autolink';
+
 const helpers = [
     { contentType: 'uri', eat: eatAbsoluteUri },
     { contentType: 'email', eat: eatEmailAddress },
@@ -112,61 +112,71 @@ class AutolinkTokenizer extends BaseInlineTokenizer {
             name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
             priority: (_b = props.priority) !== null && _b !== void 0 ? _b : TokenizerPriority.ATOMIC,
         });
-    }
-    _findDelimiter(startIndex, endIndex, nodePoints) {
-        for (let i = startIndex; i < endIndex; ++i) {
-            if (nodePoints[i].codePoint !== AsciiCodePoint.OPEN_ANGLE)
-                continue;
-            let nextIndex = endIndex;
-            let contentType = null;
-            for (const helper of helpers) {
-                const eatResult = helper.eat(nodePoints, i + 1, endIndex);
-                nextIndex = Math.min(nextIndex, eatResult.nextIndex);
-                if (eatResult.valid) {
-                    contentType = helper.contentType;
-                    nextIndex = eatResult.nextIndex;
-                    break;
+        this.match = api => {
+            return {
+                findDelimiter: () => genFindDelimiter(_findDelimiter),
+                processSingleDelimiter,
+            };
+            function _findDelimiter(startIndex, endIndex) {
+                const nodePoints = api.getNodePoints();
+                for (let i = startIndex; i < endIndex; ++i) {
+                    if (nodePoints[i].codePoint !== AsciiCodePoint.OPEN_ANGLE)
+                        continue;
+                    let nextIndex = endIndex;
+                    let contentType = null;
+                    for (const helper of helpers) {
+                        const eatResult = helper.eat(nodePoints, i + 1, endIndex);
+                        nextIndex = Math.min(nextIndex, eatResult.nextIndex);
+                        if (eatResult.valid) {
+                            contentType = helper.contentType;
+                            nextIndex = eatResult.nextIndex;
+                            break;
+                        }
+                    }
+                    if (contentType == null) {
+                        i = Math.max(i, nextIndex - 1);
+                        continue;
+                    }
+                    if (nextIndex < endIndex &&
+                        nodePoints[nextIndex].codePoint === AsciiCodePoint.CLOSE_ANGLE) {
+                        return {
+                            type: 'full',
+                            startIndex: i,
+                            endIndex: nextIndex + 1,
+                            contentType,
+                        };
+                    }
+                    i = nextIndex - 1;
                 }
+                return null;
             }
-            if (contentType == null) {
-                i = Math.max(i, nextIndex - 1);
-                continue;
-            }
-            if (nextIndex < endIndex &&
-                nodePoints[nextIndex].codePoint === AsciiCodePoint.CLOSE_ANGLE) {
-                return {
-                    type: 'full',
-                    startIndex: i,
-                    endIndex: nextIndex + 1,
-                    contentType,
+            function processSingleDelimiter(delimiter) {
+                const token = {
+                    nodeType: LinkType,
+                    startIndex: delimiter.startIndex,
+                    endIndex: delimiter.endIndex,
+                    contentType: delimiter.contentType,
+                    children: api.resolveFallbackTokens([], delimiter.startIndex + 1, delimiter.endIndex - 1),
                 };
+                return [token];
             }
-            i = nextIndex - 1;
-        }
-        return null;
-    }
-    processSingleDelimiter(delimiter, nodePoints, api) {
-        const token = {
-            nodeType: LinkType,
-            startIndex: delimiter.startIndex,
-            endIndex: delimiter.endIndex,
-            contentType: delimiter.contentType,
-            children: api.resolveFallbackTokens([], delimiter.startIndex + 1, delimiter.endIndex - 1, nodePoints),
-        };
-        return [token];
-    }
-    processToken(token, children, nodePoints) {
-        let url = calcStringFromNodePoints(nodePoints, token.startIndex + 1, token.endIndex - 1);
-        if (token.contentType === 'email') {
-            url = 'mailto:' + url;
-        }
-        const encodedUrl = encodeLinkDestination(url);
-        const result = {
-            type: LinkType,
-            url: encodedUrl,
-            children: children !== null && children !== void 0 ? children : [],
         };
-        return result;
+        this.parse = api => ({
+            parse: (token, children) => {
+                const nodePoints = api.getNodePoints();
+                let url = calcStringFromNodePoints(nodePoints, token.startIndex + 1, token.endIndex - 1);
+                if (token.contentType === 'email') {
+                    url = 'mailto:' + url;
+                }
+                const encodedUrl = encodeLinkDestination(url);
+                const result = {
+                    type: LinkType,
+                    url: encodedUrl,
+                    children,
+                };
+                return result;
+            },
+        });
     }
 }
 

package/lib/types/index.d.ts

@@ -1,7 +1,5 @@
-import { AutolinkTokenizer } from './tokenizer';
 export * from './util/email';
 export * from './util/uri';
-export { AutolinkTokenizer } from './tokenizer';
+export { AutolinkTokenizer, AutolinkTokenizer as default } from './tokenizer';
 export { uniqueName as AutolinkTokenizerName } from './types';
-export type { Token as AutolinkToken, TokenizerProps as AutolinkTokenizerProps, AutolinkContentType, } from './types';
-export default AutolinkTokenizer;
+export type { IToken as IAutolinkToken, ITokenizerProps as IAutolinkTokenizerProps, AutolinkContentType, } from './types';

package/lib/types/tokenizer.d.ts

@@ -1,8 +1,6 @@
-import type { YastNode } from '@yozora/ast';
-import type { NodePoint } from '@yozora/character';
-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, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Autolink.
  *
@@ -11,21 +9,8 @@ import type { Delimiter, Node, T, Token, TokenizerProps } from './types';
  *
  * @see https://github.github.com/gfm/#autolink
  */
-export declare class AutolinkTokenizer 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
-     */
-    processSingleDelimiter(delimiter: Delimiter, nodePoints: ReadonlyArray<NodePoint>, api: Readonly<MatchInlinePhaseApi>): ResultOfProcessSingleDelimiter<T, Token>;
-    /**
-     * @override
-     * @see TokenizerParseInlineHook
-     */
-    processToken(token: Token, children: YastNode[] | undefined, nodePoints: ReadonlyArray<NodePoint>): Node;
+export declare class AutolinkTokenizer extends BaseInlineTokenizer<T, IDelimiter, IToken, INode> implements IInlineTokenizer<T, IDelimiter, IToken, INode> {
+    constructor(props?: ITokenizerProps);
+    readonly match: IMatchInlineHookCreator<T, IDelimiter, IToken>;
+    readonly parse: IParseInlineHookCreator<T, IToken, INode>;
 }

package/lib/types/types.d.ts

@@ -1,26 +1,26 @@
-import type { Link, LinkType } from '@yozora/ast';
-import type { NodePoint } from '@yozora/character';
-import type { BaseInlineTokenizerProps, PartialYastInlineToken, ResultOfRequiredEater, YastTokenDelimiter } from '@yozora/core-tokenizer';
+import type { ILink, LinkType } from '@yozora/ast';
+import type { INodePoint } from '@yozora/character';
+import type { IBaseInlineTokenizerProps, IPartialYastInlineToken, IResultOfRequiredEater, IYastTokenDelimiter } from '@yozora/core-tokenizer';
 export declare type AutolinkContentType = 'uri' | 'email';
 export declare type T = LinkType;
-export declare type Node = Link;
+export declare type INode = ILink;
 export declare const uniqueName = "@yozora/tokenizer-autolink";
-export interface Token extends PartialYastInlineToken<T> {
+export interface IToken extends IPartialYastInlineToken<T> {
     /**
      * Autolink content type: absolute uri or email.
      */
     contentType: AutolinkContentType;
 }
-export interface Delimiter extends YastTokenDelimiter {
+export interface IDelimiter extends IYastTokenDelimiter {
     type: 'full';
     /**
      * Autolink content type: absolute uri or email.
      */
     contentType: AutolinkContentType;
 }
-export declare type TokenizerProps = Partial<BaseInlineTokenizerProps>;
-export declare type ContentEater = (nodePoints: ReadonlyArray<NodePoint>, startIndex: number, endIndex: number) => ResultOfRequiredEater;
-export interface ContentHelper {
+export declare type ITokenizerProps = Partial<IBaseInlineTokenizerProps>;
+export declare type ContentEater = (nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number) => IResultOfRequiredEater;
+export interface IContentHelper {
     contentType: AutolinkContentType;
     eat: ContentEater;
 }

package/lib/types/util/email.d.ts

@@ -1,5 +1,5 @@
-import type { NodePoint } from '@yozora/character';
-import type { ResultOfRequiredEater } from '@yozora/core-tokenizer';
+import type { INodePoint } from '@yozora/character';
+import type { IResultOfRequiredEater } from '@yozora/core-tokenizer';
 /**
  * An email address, for these purposes, is anything that matches the
  * non-normative regex from the HTML5 spec:
@@ -9,4 +9,4 @@ import type { ResultOfRequiredEater } from '@yozora/core-tokenizer';
  *
  * @see https://github.github.com/gfm/#email-address
  */
-export declare function eatEmailAddress(nodePoints: ReadonlyArray<NodePoint>, startIndex: number, endIndex: number): ResultOfRequiredEater;
+export declare function eatEmailAddress(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number): IResultOfRequiredEater;

package/lib/types/util/uri.d.ts

@@ -1,5 +1,5 @@
-import type { NodePoint } from '@yozora/character';
-import type { ResultOfRequiredEater } from '@yozora/core-tokenizer';
+import type { INodePoint } from '@yozora/character';
+import type { IResultOfRequiredEater } from '@yozora/core-tokenizer';
 /**
  * Try to find to autolink absolute uri strictly start from the give `startIndex`.
  *
@@ -10,7 +10,7 @@ import type { ResultOfRequiredEater } from '@yozora/core-tokenizer';
  *
  * @see https://github.github.com/gfm/#absolute-uri
  */
-export declare function eatAbsoluteUri(nodePoints: ReadonlyArray<NodePoint>, startIndex: number, endIndex: number): ResultOfRequiredEater;
+export declare function eatAbsoluteUri(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number): IResultOfRequiredEater;
 /**
  * Try to find to autolink schema strictly start from the give `startIndex`.
  *
@@ -20,4 +20,4 @@ export declare function eatAbsoluteUri(nodePoints: ReadonlyArray<NodePoint>, sta
  *
  * @see https://github.github.com/gfm/#scheme
  */
-export declare function eatAutolinkSchema(nodePoints: ReadonlyArray<NodePoint>, startIndex: number, endIndex: number): ResultOfRequiredEater;
+export declare function eatAutolinkSchema(nodePoints: ReadonlyArray<INodePoint>, startIndex: number, endIndex: number): IResultOfRequiredEater;

package/package.json

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