@yozora/tokenizer-image 2.0.0-alpha.0 → 2.0.0

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 ImageTokenizer from '@yozora/tokenizer-image'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new ImageTokenizer())
 
 // parse source markdown content
@@ -223,7 +223,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
@@ -283,7 +282,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

@@ -21,6 +21,123 @@ function calcImageAlt(nodes) {
         .join('');
 }
 
+const match = function (api) {
+    return {
+        findDelimiter: () => coreTokenizer.genFindDelimiter(_findDelimiter),
+        isDelimiterPair,
+        processDelimiterPair,
+    };
+    function _findDelimiter(startIndex, endIndex) {
+        const nodePoints = api.getNodePoints();
+        const blockEndIndex = api.getBlockEndIndex();
+        for (let i = startIndex; i < endIndex; ++i) {
+            const c = nodePoints[i].codePoint;
+            switch (c) {
+                case character.AsciiCodePoint.BACKSLASH:
+                    i += 1;
+                    break;
+                case character.AsciiCodePoint.EXCLAMATION_MARK: {
+                    if (i + 1 < endIndex && nodePoints[i + 1].codePoint === character.AsciiCodePoint.OPEN_BRACKET) {
+                        return {
+                            type: 'opener',
+                            startIndex: i,
+                            endIndex: i + 2,
+                        };
+                    }
+                    break;
+                }
+                case character.AsciiCodePoint.CLOSE_BRACKET: {
+                    if (i + 1 >= endIndex ||
+                        nodePoints[i + 1].codePoint !== character.AsciiCodePoint.OPEN_PARENTHESIS) {
+                        break;
+                    }
+                    const destinationStartIndex = coreTokenizer.eatOptionalWhitespaces(nodePoints, i + 2, blockEndIndex);
+                    const destinationEndIndex = tokenizerLink.eatLinkDestination(nodePoints, destinationStartIndex, blockEndIndex);
+                    if (destinationEndIndex < 0)
+                        break;
+                    const titleStartIndex = coreTokenizer.eatOptionalWhitespaces(nodePoints, destinationEndIndex, blockEndIndex);
+                    const titleEndIndex = tokenizerLink.eatLinkTitle(nodePoints, titleStartIndex, blockEndIndex);
+                    if (titleEndIndex < 0)
+                        break;
+                    const _startIndex = i;
+                    const _endIndex = coreTokenizer.eatOptionalWhitespaces(nodePoints, titleEndIndex, blockEndIndex) + 1;
+                    if (_endIndex > blockEndIndex ||
+                        nodePoints[_endIndex - 1].codePoint !== character.AsciiCodePoint.CLOSE_PARENTHESIS) {
+                        break;
+                    }
+                    return {
+                        type: 'closer',
+                        startIndex: _startIndex,
+                        endIndex: _endIndex,
+                        destinationContent: destinationStartIndex < destinationEndIndex
+                            ? {
+                                startIndex: destinationStartIndex,
+                                endIndex: destinationEndIndex,
+                            }
+                            : undefined,
+                        titleContent: titleStartIndex < titleEndIndex
+                            ? { startIndex: titleStartIndex, endIndex: titleEndIndex }
+                            : undefined,
+                    };
+                }
+            }
+        }
+        return null;
+    }
+    function isDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
+        const nodePoints = api.getNodePoints();
+        const balancedBracketsStatus = tokenizerLink.checkBalancedBracketsStatus(openerDelimiter.endIndex, closerDelimiter.startIndex, internalTokens, nodePoints);
+        switch (balancedBracketsStatus) {
+            case -1:
+                return { paired: false, opener: false, closer: true };
+            case 0:
+                return { paired: true };
+            case 1:
+                return { paired: false, opener: true, closer: false };
+        }
+    }
+    function processDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
+        const token = {
+            nodeType: ast.ImageType,
+            startIndex: openerDelimiter.startIndex,
+            endIndex: closerDelimiter.endIndex,
+            destinationContent: closerDelimiter.destinationContent,
+            titleContent: closerDelimiter.titleContent,
+            children: api.resolveInternalTokens(internalTokens, openerDelimiter.endIndex, closerDelimiter.startIndex),
+        };
+        return { tokens: [token] };
+    }
+};
+
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const nodePoints = api.getNodePoints();
+            let url = '';
+            if (token.destinationContent != null) {
+                let { startIndex, endIndex } = token.destinationContent;
+                if (nodePoints[startIndex].codePoint === character.AsciiCodePoint.OPEN_ANGLE) {
+                    startIndex += 1;
+                    endIndex -= 1;
+                }
+                const destination = character.calcEscapedStringFromNodePoints(nodePoints, startIndex, endIndex, true);
+                url = coreTokenizer.encodeLinkDestination(destination);
+            }
+            const children = api.parseInlineTokens(token.children);
+            const alt = calcImageAlt(children);
+            let title;
+            if (token.titleContent != null) {
+                const { startIndex, endIndex } = token.titleContent;
+                title = character.calcEscapedStringFromNodePoints(nodePoints, startIndex + 1, endIndex - 1);
+            }
+            const node = api.shouldReservePosition
+                ? { type: ast.ImageType, position: api.calcPosition(token), url, alt, title }
+                : { type: ast.ImageType, url, alt, title };
+            return node;
+        }),
+    };
+};
+
 const uniqueName = '@yozora/tokenizer-image';
 
 class ImageTokenizer extends coreTokenizer.BaseInlineTokenizer {
@@ -30,116 +147,8 @@ class ImageTokenizer extends coreTokenizer.BaseInlineTokenizer {
             name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
             priority: (_b = props.priority) !== null && _b !== void 0 ? _b : coreTokenizer.TokenizerPriority.LINKS,
         });
-        this.match = api => {
-            return {
-                findDelimiter: () => coreTokenizer.genFindDelimiter(_findDelimiter),
-                isDelimiterPair,
-                processDelimiterPair,
-            };
-            function _findDelimiter(startIndex, endIndex) {
-                const nodePoints = api.getNodePoints();
-                const blockEndIndex = api.getBlockEndIndex();
-                for (let i = startIndex; i < endIndex; ++i) {
-                    const c = nodePoints[i].codePoint;
-                    switch (c) {
-                        case character.AsciiCodePoint.BACKSLASH:
-                            i += 1;
-                            break;
-                        case character.AsciiCodePoint.EXCLAMATION_MARK: {
-                            if (i + 1 < endIndex && nodePoints[i + 1].codePoint === character.AsciiCodePoint.OPEN_BRACKET) {
-                                return {
-                                    type: 'opener',
-                                    startIndex: i,
-                                    endIndex: i + 2,
-                                };
-                            }
-                            break;
-                        }
-                        case character.AsciiCodePoint.CLOSE_BRACKET: {
-                            if (i + 1 >= endIndex ||
-                                nodePoints[i + 1].codePoint !== character.AsciiCodePoint.OPEN_PARENTHESIS) {
-                                break;
-                            }
-                            const destinationStartIndex = coreTokenizer.eatOptionalWhitespaces(nodePoints, i + 2, blockEndIndex);
-                            const destinationEndIndex = tokenizerLink.eatLinkDestination(nodePoints, destinationStartIndex, blockEndIndex);
-                            if (destinationEndIndex < 0)
-                                break;
-                            const titleStartIndex = coreTokenizer.eatOptionalWhitespaces(nodePoints, destinationEndIndex, blockEndIndex);
-                            const titleEndIndex = tokenizerLink.eatLinkTitle(nodePoints, titleStartIndex, blockEndIndex);
-                            if (titleEndIndex < 0)
-                                break;
-                            const _startIndex = i;
-                            const _endIndex = coreTokenizer.eatOptionalWhitespaces(nodePoints, titleEndIndex, blockEndIndex) + 1;
-                            if (_endIndex > blockEndIndex ||
-                                nodePoints[_endIndex - 1].codePoint !== character.AsciiCodePoint.CLOSE_PARENTHESIS) {
-                                break;
-                            }
-                            return {
-                                type: 'closer',
-                                startIndex: _startIndex,
-                                endIndex: _endIndex,
-                                destinationContent: destinationStartIndex < destinationEndIndex
-                                    ? {
-                                        startIndex: destinationStartIndex,
-                                        endIndex: destinationEndIndex,
-                                    }
-                                    : undefined,
-                                titleContent: titleStartIndex < titleEndIndex
-                                    ? { startIndex: titleStartIndex, endIndex: titleEndIndex }
-                                    : undefined,
-                            };
-                        }
-                    }
-                }
-                return null;
-            }
-            function isDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
-                const nodePoints = api.getNodePoints();
-                const balancedBracketsStatus = tokenizerLink.checkBalancedBracketsStatus(openerDelimiter.endIndex, closerDelimiter.startIndex, internalTokens, nodePoints);
-                switch (balancedBracketsStatus) {
-                    case -1:
-                        return { paired: false, opener: false, closer: true };
-                    case 0:
-                        return { paired: true };
-                    case 1:
-                        return { paired: false, opener: true, closer: false };
-                }
-            }
-            function processDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
-                const token = {
-                    nodeType: ast.ImageType,
-                    startIndex: openerDelimiter.startIndex,
-                    endIndex: closerDelimiter.endIndex,
-                    destinationContent: closerDelimiter.destinationContent,
-                    titleContent: closerDelimiter.titleContent,
-                    children: api.resolveInternalTokens(internalTokens, openerDelimiter.endIndex, closerDelimiter.startIndex),
-                };
-                return { tokens: [token] };
-            }
-        };
-        this.parse = api => ({
-            parse: (token, children) => {
-                const nodePoints = api.getNodePoints();
-                let url = '';
-                if (token.destinationContent != null) {
-                    let { startIndex, endIndex } = token.destinationContent;
-                    if (nodePoints[startIndex].codePoint === character.AsciiCodePoint.OPEN_ANGLE) {
-                        startIndex += 1;
-                        endIndex -= 1;
-                    }
-                    const destination = character.calcEscapedStringFromNodePoints(nodePoints, startIndex, endIndex, true);
-                    url = coreTokenizer.encodeLinkDestination(destination);
-                }
-                const alt = calcImageAlt(children);
-                let title;
-                if (token.titleContent != null) {
-                    const { startIndex, endIndex } = token.titleContent;
-                    title = character.calcEscapedStringFromNodePoints(nodePoints, startIndex + 1, endIndex - 1);
-                }
-                const result = { type: ast.ImageType, url, alt, title };
-                return result;
-            },
-        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
@@ -147,3 +156,5 @@ exports.ImageTokenizer = ImageTokenizer;
 exports.ImageTokenizerName = uniqueName;
 exports.calcImageAlt = calcImageAlt;
 exports["default"] = ImageTokenizer;
+exports.imageMatch = match;
+exports.imageParse = parse;

package/lib/esm/index.js

@@ -1,6 +1,6 @@
 import { ImageType } from '@yozora/ast';
 import { AsciiCodePoint, calcEscapedStringFromNodePoints } from '@yozora/character';
-import { BaseInlineTokenizer, TokenizerPriority, genFindDelimiter, eatOptionalWhitespaces, encodeLinkDestination } from '@yozora/core-tokenizer';
+import { genFindDelimiter, eatOptionalWhitespaces, encodeLinkDestination, BaseInlineTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 import { eatLinkDestination, eatLinkTitle, checkBalancedBracketsStatus } from '@yozora/tokenizer-link';
 
 function calcImageAlt(nodes) {
@@ -17,6 +17,123 @@ function calcImageAlt(nodes) {
         .join('');
 }
 
+const match = function (api) {
+    return {
+        findDelimiter: () => genFindDelimiter(_findDelimiter),
+        isDelimiterPair,
+        processDelimiterPair,
+    };
+    function _findDelimiter(startIndex, endIndex) {
+        const nodePoints = api.getNodePoints();
+        const blockEndIndex = api.getBlockEndIndex();
+        for (let i = startIndex; i < endIndex; ++i) {
+            const c = nodePoints[i].codePoint;
+            switch (c) {
+                case AsciiCodePoint.BACKSLASH:
+                    i += 1;
+                    break;
+                case AsciiCodePoint.EXCLAMATION_MARK: {
+                    if (i + 1 < endIndex && nodePoints[i + 1].codePoint === AsciiCodePoint.OPEN_BRACKET) {
+                        return {
+                            type: 'opener',
+                            startIndex: i,
+                            endIndex: i + 2,
+                        };
+                    }
+                    break;
+                }
+                case AsciiCodePoint.CLOSE_BRACKET: {
+                    if (i + 1 >= endIndex ||
+                        nodePoints[i + 1].codePoint !== AsciiCodePoint.OPEN_PARENTHESIS) {
+                        break;
+                    }
+                    const destinationStartIndex = eatOptionalWhitespaces(nodePoints, i + 2, blockEndIndex);
+                    const destinationEndIndex = eatLinkDestination(nodePoints, destinationStartIndex, blockEndIndex);
+                    if (destinationEndIndex < 0)
+                        break;
+                    const titleStartIndex = eatOptionalWhitespaces(nodePoints, destinationEndIndex, blockEndIndex);
+                    const titleEndIndex = eatLinkTitle(nodePoints, titleStartIndex, blockEndIndex);
+                    if (titleEndIndex < 0)
+                        break;
+                    const _startIndex = i;
+                    const _endIndex = eatOptionalWhitespaces(nodePoints, titleEndIndex, blockEndIndex) + 1;
+                    if (_endIndex > blockEndIndex ||
+                        nodePoints[_endIndex - 1].codePoint !== AsciiCodePoint.CLOSE_PARENTHESIS) {
+                        break;
+                    }
+                    return {
+                        type: 'closer',
+                        startIndex: _startIndex,
+                        endIndex: _endIndex,
+                        destinationContent: destinationStartIndex < destinationEndIndex
+                            ? {
+                                startIndex: destinationStartIndex,
+                                endIndex: destinationEndIndex,
+                            }
+                            : undefined,
+                        titleContent: titleStartIndex < titleEndIndex
+                            ? { startIndex: titleStartIndex, endIndex: titleEndIndex }
+                            : undefined,
+                    };
+                }
+            }
+        }
+        return null;
+    }
+    function isDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
+        const nodePoints = api.getNodePoints();
+        const balancedBracketsStatus = checkBalancedBracketsStatus(openerDelimiter.endIndex, closerDelimiter.startIndex, internalTokens, nodePoints);
+        switch (balancedBracketsStatus) {
+            case -1:
+                return { paired: false, opener: false, closer: true };
+            case 0:
+                return { paired: true };
+            case 1:
+                return { paired: false, opener: true, closer: false };
+        }
+    }
+    function processDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
+        const token = {
+            nodeType: ImageType,
+            startIndex: openerDelimiter.startIndex,
+            endIndex: closerDelimiter.endIndex,
+            destinationContent: closerDelimiter.destinationContent,
+            titleContent: closerDelimiter.titleContent,
+            children: api.resolveInternalTokens(internalTokens, openerDelimiter.endIndex, closerDelimiter.startIndex),
+        };
+        return { tokens: [token] };
+    }
+};
+
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const nodePoints = api.getNodePoints();
+            let url = '';
+            if (token.destinationContent != null) {
+                let { startIndex, endIndex } = token.destinationContent;
+                if (nodePoints[startIndex].codePoint === AsciiCodePoint.OPEN_ANGLE) {
+                    startIndex += 1;
+                    endIndex -= 1;
+                }
+                const destination = calcEscapedStringFromNodePoints(nodePoints, startIndex, endIndex, true);
+                url = encodeLinkDestination(destination);
+            }
+            const children = api.parseInlineTokens(token.children);
+            const alt = calcImageAlt(children);
+            let title;
+            if (token.titleContent != null) {
+                const { startIndex, endIndex } = token.titleContent;
+                title = calcEscapedStringFromNodePoints(nodePoints, startIndex + 1, endIndex - 1);
+            }
+            const node = api.shouldReservePosition
+                ? { type: ImageType, position: api.calcPosition(token), url, alt, title }
+                : { type: ImageType, url, alt, title };
+            return node;
+        }),
+    };
+};
+
 const uniqueName = '@yozora/tokenizer-image';
 
 class ImageTokenizer extends BaseInlineTokenizer {
@@ -26,117 +143,9 @@ class ImageTokenizer extends BaseInlineTokenizer {
             name: (_a = props.name) !== null && _a !== void 0 ? _a : uniqueName,
             priority: (_b = props.priority) !== null && _b !== void 0 ? _b : TokenizerPriority.LINKS,
         });
-        this.match = api => {
-            return {
-                findDelimiter: () => genFindDelimiter(_findDelimiter),
-                isDelimiterPair,
-                processDelimiterPair,
-            };
-            function _findDelimiter(startIndex, endIndex) {
-                const nodePoints = api.getNodePoints();
-                const blockEndIndex = api.getBlockEndIndex();
-                for (let i = startIndex; i < endIndex; ++i) {
-                    const c = nodePoints[i].codePoint;
-                    switch (c) {
-                        case AsciiCodePoint.BACKSLASH:
-                            i += 1;
-                            break;
-                        case AsciiCodePoint.EXCLAMATION_MARK: {
-                            if (i + 1 < endIndex && nodePoints[i + 1].codePoint === AsciiCodePoint.OPEN_BRACKET) {
-                                return {
-                                    type: 'opener',
-                                    startIndex: i,
-                                    endIndex: i + 2,
-                                };
-                            }
-                            break;
-                        }
-                        case AsciiCodePoint.CLOSE_BRACKET: {
-                            if (i + 1 >= endIndex ||
-                                nodePoints[i + 1].codePoint !== AsciiCodePoint.OPEN_PARENTHESIS) {
-                                break;
-                            }
-                            const destinationStartIndex = eatOptionalWhitespaces(nodePoints, i + 2, blockEndIndex);
-                            const destinationEndIndex = eatLinkDestination(nodePoints, destinationStartIndex, blockEndIndex);
-                            if (destinationEndIndex < 0)
-                                break;
-                            const titleStartIndex = eatOptionalWhitespaces(nodePoints, destinationEndIndex, blockEndIndex);
-                            const titleEndIndex = eatLinkTitle(nodePoints, titleStartIndex, blockEndIndex);
-                            if (titleEndIndex < 0)
-                                break;
-                            const _startIndex = i;
-                            const _endIndex = eatOptionalWhitespaces(nodePoints, titleEndIndex, blockEndIndex) + 1;
-                            if (_endIndex > blockEndIndex ||
-                                nodePoints[_endIndex - 1].codePoint !== AsciiCodePoint.CLOSE_PARENTHESIS) {
-                                break;
-                            }
-                            return {
-                                type: 'closer',
-                                startIndex: _startIndex,
-                                endIndex: _endIndex,
-                                destinationContent: destinationStartIndex < destinationEndIndex
-                                    ? {
-                                        startIndex: destinationStartIndex,
-                                        endIndex: destinationEndIndex,
-                                    }
-                                    : undefined,
-                                titleContent: titleStartIndex < titleEndIndex
-                                    ? { startIndex: titleStartIndex, endIndex: titleEndIndex }
-                                    : undefined,
-                            };
-                        }
-                    }
-                }
-                return null;
-            }
-            function isDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
-                const nodePoints = api.getNodePoints();
-                const balancedBracketsStatus = checkBalancedBracketsStatus(openerDelimiter.endIndex, closerDelimiter.startIndex, internalTokens, nodePoints);
-                switch (balancedBracketsStatus) {
-                    case -1:
-                        return { paired: false, opener: false, closer: true };
-                    case 0:
-                        return { paired: true };
-                    case 1:
-                        return { paired: false, opener: true, closer: false };
-                }
-            }
-            function processDelimiterPair(openerDelimiter, closerDelimiter, internalTokens) {
-                const token = {
-                    nodeType: ImageType,
-                    startIndex: openerDelimiter.startIndex,
-                    endIndex: closerDelimiter.endIndex,
-                    destinationContent: closerDelimiter.destinationContent,
-                    titleContent: closerDelimiter.titleContent,
-                    children: api.resolveInternalTokens(internalTokens, openerDelimiter.endIndex, closerDelimiter.startIndex),
-                };
-                return { tokens: [token] };
-            }
-        };
-        this.parse = api => ({
-            parse: (token, children) => {
-                const nodePoints = api.getNodePoints();
-                let url = '';
-                if (token.destinationContent != null) {
-                    let { startIndex, endIndex } = token.destinationContent;
-                    if (nodePoints[startIndex].codePoint === AsciiCodePoint.OPEN_ANGLE) {
-                        startIndex += 1;
-                        endIndex -= 1;
-                    }
-                    const destination = calcEscapedStringFromNodePoints(nodePoints, startIndex, endIndex, true);
-                    url = encodeLinkDestination(destination);
-                }
-                const alt = calcImageAlt(children);
-                let title;
-                if (token.titleContent != null) {
-                    const { startIndex, endIndex } = token.titleContent;
-                    title = calcEscapedStringFromNodePoints(nodePoints, startIndex + 1, endIndex - 1);
-                }
-                const result = { type: ImageType, url, alt, title };
-                return result;
-            },
-        });
+        this.match = match;
+        this.parse = parse;
     }
 }
 
-export { ImageTokenizer, uniqueName as ImageTokenizerName, calcImageAlt, ImageTokenizer as default };
+export { ImageTokenizer, uniqueName as ImageTokenizerName, calcImageAlt, ImageTokenizer as default, match as imageMatch, parse as imageParse };

package/lib/types/index.d.ts

@@ -1,4 +1,6 @@
 export * from './util';
+export { match as imageMatch } from './match';
+export { parse as imageParse } from './parse';
 export { ImageTokenizer, ImageTokenizer as default } from './tokenizer';
 export { uniqueName as ImageTokenizerName } from './types';
-export type { IToken as IImageToken, ITokenizerProps as IImageTokenizerProps } from './types';
+export type { IThis as IImageHookContext, IToken as IImageToken, ITokenizerProps as IImageTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,30 @@
+import type { IMatchInlineHookCreator } from '@yozora/core-tokenizer';
+import type { IDelimiter, IThis, IToken, T } from './types';
+/**
+ * Syntax for images is like the syntax for links, with one difference.
+ * Instead of link text, we have an image description.
+ * The rules for this are the same as for link text, except that
+ *
+ *  a) an image description starts with '![' rather than '[', and
+ *  b) an image description may contain links.
+ *
+ * An image description has inline elements as its contents. When an image is
+ * rendered to HTML, this is standardly used as the image’s alt attribute.
+ *
+ * ------
+ *
+ * A 'opener' type delimiter is one of the following forms:
+ *
+ *  - '!['
+ *
+ * A 'closer' type delimiter is one of the following forms:
+ *
+ *  - '](url)'
+ *  - '](url "title")'
+ *  - '](<url>)'
+ *  - '](<url> "title")'
+ *
+ * @see https://github.com/syntax-tree/mdast#image
+ * @see https://github.github.com/gfm/#images
+ */
+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,13 @@
 import type { IInlineTokenizer, IMatchInlineHookCreator, IParseInlineHookCreator } from '@yozora/core-tokenizer';
 import { BaseInlineTokenizer } from '@yozora/core-tokenizer';
-import type { IDelimiter, INode, IToken, ITokenizerProps, T } from './types';
+import type { IDelimiter, INode, IThis, IToken, ITokenizerProps, T } from './types';
 /**
  * Lexical Analyzer for InlineImage.
- *
- * Syntax for images is like the syntax for links, with one difference.
- * Instead of link text, we have an image description.
- * The rules for this are the same as for link text, except that
- *
- *  a) an image description starts with '![' rather than '[', and
- *  b) an image description may contain links.
- *
- * An image description has inline elements as its contents. When an image is
- * rendered to HTML, this is standardly used as the image’s alt attribute.
- *
- * ------
- *
- * A 'opener' type delimiter is one of the following forms:
- *
- *  - '!['
- *
- * A 'closer' type delimiter is one of the following forms:
- *
- *  - '](url)'
- *  - '](url "title")'
- *  - '](<url>)'
- *  - '](<url> "title")'
- *
  * @see https://github.com/syntax-tree/mdast#image
  * @see https://github.github.com/gfm/#images
  */
-export declare class ImageTokenizer extends BaseInlineTokenizer<T, IDelimiter, IToken, INode> implements IInlineTokenizer<T, IDelimiter, IToken, INode> {
+export declare class ImageTokenizer extends BaseInlineTokenizer<T, IDelimiter, IToken, INode, IThis> implements IInlineTokenizer<T, IDelimiter, IToken, INode, IThis> {
     constructor(props?: ITokenizerProps);
-    readonly match: IMatchInlineHookCreator<T, IDelimiter, IToken>;
-    readonly parse: IParseInlineHookCreator<T, IToken, INode>;
+    readonly match: IMatchInlineHookCreator<T, IDelimiter, IToken, IThis>;
+    readonly parse: IParseInlineHookCreator<T, IToken, INode, IThis>;
 }

package/lib/types/types.d.ts

@@ -1,8 +1,8 @@
-import type { IImage, ImageType } from '@yozora/ast';
+import type { Image, ImageType } from '@yozora/ast';
 import type { INodeInterval } from '@yozora/character';
-import type { IBaseInlineTokenizerProps, IPartialYastInlineToken, IYastTokenDelimiter } from '@yozora/core-tokenizer';
+import type { IBaseInlineTokenizerProps, IPartialYastInlineToken, ITokenizer, IYastTokenDelimiter } from '@yozora/core-tokenizer';
 export declare type T = ImageType;
-export declare type INode = IImage;
+export declare type INode = Image;
 export declare const uniqueName = "@yozora/tokenizer-image";
 /**
  * An image token.
@@ -31,4 +31,5 @@ export interface IDelimiter extends IYastTokenDelimiter {
      */
     titleContent?: INodeInterval;
 }
+export declare type IThis = ITokenizer;
 export declare type ITokenizerProps = Partial<IBaseInlineTokenizerProps>;

package/lib/types/util.d.ts

@@ -1,8 +1,8 @@
-import type { IYastNode } from '@yozora/ast';
+import type { Node } from '@yozora/ast';
 /**
  * calc alt
  * An image description has inline elements as its contents. When an image
  * is rendered to HTML, this is standardly used as the image’s alt attribute
  * @see https://github.github.com/gfm/#example-582
  */
-export declare function calcImageAlt(nodes: ReadonlyArray<IYastNode>): string;
+export declare function calcImageAlt(nodes: ReadonlyArray<Node>): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-image",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0",
   "author": {
     "name": "guanghechen",
     "url": "https://github.com/guanghechen/"
@@ -35,10 +35,10 @@
     "test": "cross-env TS_NODE_FILES=true jest --config ../../jest.config.js --rootDir ."
   },
   "dependencies": {
-    "@yozora/ast": "^2.0.0-alpha.0",
-    "@yozora/character": "^2.0.0-alpha.0",
-    "@yozora/core-tokenizer": "^2.0.0-alpha.0",
-    "@yozora/tokenizer-link": "^2.0.0-alpha.0"
+    "@yozora/ast": "^2.0.0",
+    "@yozora/character": "^2.0.0",
+    "@yozora/core-tokenizer": "^2.0.0",
+    "@yozora/tokenizer-link": "^2.0.0"
   },
-  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
+  "gitHead": "65e99d1709fdd1c918465dce6b1e91de96bdab5e"
 }