@yozora/tokenizer-autolink 1.2.2 → 2.0.0-alpha.2

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 AutolinkTokenizer from '@yozora/tokenizer-autolink'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new AutolinkTokenizer())
 
 // parse source markdown content
@@ -241,7 +241,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
@@ -301,7 +300,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

@@ -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) {
@@ -109,15 +107,13 @@ const helpers = [
     { contentType: 'uri', eat: eatAbsoluteUri },
     { contentType: 'email', eat: eatEmailAddress },
 ];
-class AutolinkTokenizer 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.ATOMIC,
-        });
-    }
-    _findDelimiter(startIndex, endIndex, nodePoints) {
+const match = function (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;
@@ -136,8 +132,7 @@ class AutolinkTokenizer extends coreTokenizer.BaseInlineTokenizer {
                 i = Math.max(i, nextIndex - 1);
                 continue;
             }
-            if (nextIndex < endIndex &&
-                nodePoints[nextIndex].codePoint === character.AsciiCodePoint.CLOSE_ANGLE) {
+            if (nextIndex < endIndex && nodePoints[nextIndex].codePoint === character.AsciiCodePoint.CLOSE_ANGLE) {
                 return {
                     type: 'full',
                     startIndex: i,
@@ -149,34 +144,55 @@ class AutolinkTokenizer extends coreTokenizer.BaseInlineTokenizer {
         }
         return null;
     }
-    processSingleDelimiter(delimiter, nodePoints, api) {
+    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, nodePoints),
+            children: api.resolveFallbackTokens([], delimiter.startIndex + 1, delimiter.endIndex - 1),
         };
         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;
+};
+
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            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 children = api.parseInlineTokens(token.children);
+            const node = api.shouldReservePosition
+                ? { type: ast.LinkType, position: api.calcPosition(token), url: encodedUrl, children }
+                : { type: ast.LinkType, url: encodedUrl, children };
+            return node;
+        }),
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-autolink';
+
+class AutolinkTokenizer 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.ATOMIC,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
 exports.AutolinkTokenizer = AutolinkTokenizer;
 exports.AutolinkTokenizerName = uniqueName;
-exports['default'] = AutolinkTokenizer;
+exports.autolinkMatch = match;
+exports.autolinkParse = parse;
+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 { genFindDelimiter, encodeLinkDestination, BaseInlineTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
 function eatEmailAddress(nodePoints, startIndex, endIndex) {
     let i = startIndex;
@@ -105,15 +103,13 @@ const helpers = [
     { contentType: 'uri', eat: eatAbsoluteUri },
     { contentType: 'email', eat: eatEmailAddress },
 ];
-class AutolinkTokenizer 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.ATOMIC,
-        });
-    }
-    _findDelimiter(startIndex, endIndex, nodePoints) {
+const match = function (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;
@@ -132,8 +128,7 @@ class AutolinkTokenizer extends BaseInlineTokenizer {
                 i = Math.max(i, nextIndex - 1);
                 continue;
             }
-            if (nextIndex < endIndex &&
-                nodePoints[nextIndex].codePoint === AsciiCodePoint.CLOSE_ANGLE) {
+            if (nextIndex < endIndex && nodePoints[nextIndex].codePoint === AsciiCodePoint.CLOSE_ANGLE) {
                 return {
                     type: 'full',
                     startIndex: i,
@@ -145,29 +140,48 @@ class AutolinkTokenizer extends BaseInlineTokenizer {
         }
         return null;
     }
-    processSingleDelimiter(delimiter, nodePoints, api) {
+    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, nodePoints),
+            children: api.resolveFallbackTokens([], delimiter.startIndex + 1, delimiter.endIndex - 1),
         };
         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;
+};
+
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            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 children = api.parseInlineTokens(token.children);
+            const node = api.shouldReservePosition
+                ? { type: LinkType, position: api.calcPosition(token), url: encodedUrl, children }
+                : { type: LinkType, url: encodedUrl, children };
+            return node;
+        }),
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-autolink';
+
+class AutolinkTokenizer 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.ATOMIC,
+        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
-export { AutolinkTokenizer, uniqueName as AutolinkTokenizerName, AutolinkTokenizer as default, eatAbsoluteUri, eatAutolinkSchema, eatEmailAddress };
+export { AutolinkTokenizer, uniqueName as AutolinkTokenizerName, match as autolinkMatch, parse as autolinkParse, AutolinkTokenizer as default, eatAbsoluteUri, eatAutolinkSchema, eatEmailAddress };

package/lib/types/index.d.ts

@@ -1,7 +1,7 @@
-import { AutolinkTokenizer } from './tokenizer';
 export * from './util/email';
 export * from './util/uri';
-export { AutolinkTokenizer } from './tokenizer';
+export { match as autolinkMatch } from './match';
+export { parse as autolinkParse } from './parse';
+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 { IThis as IAutolinkHookContext, IToken as IAutolinkToken, ITokenizerProps as IAutolinkTokenizerProps, AutolinkContentType, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,9 @@
+import type { IMatchInlineHookCreator } from '@yozora/core-tokenizer';
+import type { IDelimiter, IThis, IToken, T } from './types';
+/**
+ * Autolinks are absolute URIs and email addresses inside '<' and '>'.
+ * They are parsed as links, with the URL or email address as the link label.
+ *
+ * @see https://github.github.com/gfm/#autolink
+ */
+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,31 +1,12 @@
-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, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for Autolink.
- *
- * Autolinks are absolute URIs and email addresses inside '<' and '>'.
- * They are parsed as links, with the URL or email address as the link label.
- *
  * @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, 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,26 +1,27 @@
-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, ITokenizer, 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 IThis = ITokenizer;
+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.2",
+  "version": "2.0.0-alpha.2",
   "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.2",
-    "@yozora/character": "^1.2.2",
-    "@yozora/core-tokenizer": "^1.2.2"
+    "@yozora/ast": "^2.0.0-alpha.2",
+    "@yozora/character": "^2.0.0-alpha.2",
+    "@yozora/core-tokenizer": "^2.0.0-alpha.2"
   },
-  "gitHead": "fb4b804548592c09259aabcf9cc4dd96176bd024"
+  "gitHead": "da59d85520455c59a117a35032ef1a035c10ea21"
 }