@yozora/tokenizer-html-inline 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 HtmlInlineTokenizer from '@yozora/tokenizer-html-inline'
 
-const parser = new DefaultYastParser()
-  .useBlockFallbackTokenizer(new ParagraphTokenizer())
-  .useInlineFallbackTokenizer(new TextTokenizer())
+const parser = new DefaultParser()
+  .useFallbackTokenizer(new ParagraphTokenizer())
+  .useFallbackTokenizer(new TextTokenizer())
   .useTokenizer(new HtmlInlineTokenizer())
 
 // parse source markdown content
@@ -229,7 +229,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
@@ -289,7 +288,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

@@ -203,57 +203,37 @@ function eatHtmlInlineTokenOpenDelimiter(nodePoints, startIndex, endIndex) {
     return delimiter;
 }
 
-const uniqueName = '@yozora/tokenizer-html-inline';
-
-class HtmlInlineTokenizer 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 = api => {
-            return {
-                findDelimiter: () => coreTokenizer.genFindDelimiter(_findDelimiter),
-                processSingleDelimiter,
-            };
-            function _findDelimiter(startIndex, endIndex) {
-                const nodePoints = api.getNodePoints();
-                for (let i = startIndex; i < endIndex; ++i) {
-                    i = coreTokenizer.eatOptionalWhitespaces(nodePoints, i, endIndex);
-                    if (i >= endIndex)
-                        break;
-                    const c = nodePoints[i].codePoint;
-                    switch (c) {
-                        case character.AsciiCodePoint.BACKSLASH:
-                            i += 1;
-                            break;
-                        case character.AsciiCodePoint.OPEN_ANGLE: {
-                            const delimiter = tryToEatDelimiter(nodePoints, i, endIndex);
-                            if (delimiter != null)
-                                return delimiter;
-                            break;
-                        }
-                    }
+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) {
+            i = coreTokenizer.eatOptionalWhitespaces(nodePoints, i, endIndex);
+            if (i >= endIndex)
+                break;
+            const c = nodePoints[i].codePoint;
+            switch (c) {
+                case character.AsciiCodePoint.BACKSLASH:
+                    i += 1;
+                    break;
+                case character.AsciiCodePoint.OPEN_ANGLE: {
+                    const delimiter = tryToEatDelimiter(nodePoints, i, endIndex);
+                    if (delimiter != null)
+                        return delimiter;
+                    break;
                 }
-                return null;
-            }
-            function processSingleDelimiter(delimiter) {
-                const token = Object.assign(Object.assign({}, delimiter), { nodeType: ast.HtmlType });
-                return [token];
             }
-        };
-        this.parse = api => ({
-            parse: token => {
-                const { startIndex, endIndex } = token;
-                const nodePoints = api.getNodePoints();
-                const value = character.calcStringFromNodePoints(nodePoints, startIndex, endIndex);
-                const result = { type: ast.HtmlType, value };
-                return result;
-            },
-        });
+        }
+        return null;
     }
-}
+    function processSingleDelimiter(delimiter) {
+        const token = Object.assign(Object.assign({}, delimiter), { nodeType: ast.HtmlType });
+        return [token];
+    }
+};
 function tryToEatDelimiter(nodePoints, startIndex, endIndex) {
     let delimiter = null;
     delimiter = eatHtmlInlineTokenOpenDelimiter(nodePoints, startIndex, endIndex);
@@ -275,6 +255,34 @@ function tryToEatDelimiter(nodePoints, startIndex, endIndex) {
     return delimiter;
 }
 
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const { startIndex, endIndex } = token;
+            const nodePoints = api.getNodePoints();
+            const value = character.calcStringFromNodePoints(nodePoints, startIndex, endIndex);
+            const node = api.shouldReservePosition
+                ? { type: ast.HtmlType, position: api.calcPosition(token), value }
+                : { type: ast.HtmlType, value };
+            return node;
+        }),
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-html-inline';
+
+class HtmlInlineTokenizer 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.HtmlInlineTokenizer = HtmlInlineTokenizer;
 exports.HtmlInlineTokenizerName = uniqueName;
 exports["default"] = HtmlInlineTokenizer;
@@ -284,3 +292,5 @@ exports.eatHtmlInlineCommentDelimiter = eatHtmlInlineCommentDelimiter;
 exports.eatHtmlInlineDeclarationDelimiter = eatHtmlInlineDeclarationDelimiter;
 exports.eatHtmlInlineInstructionDelimiter = eatHtmlInlineInstructionDelimiter;
 exports.eatHtmlInlineTokenOpenDelimiter = eatHtmlInlineTokenOpenDelimiter;
+exports.htmlInlineMatch = match;
+exports.htmlInlineParse = parse;

package/lib/esm/index.js

@@ -1,5 +1,5 @@
 import { AsciiCodePoint, isAsciiUpperLetter, isWhitespaceCharacter, calcStringFromNodePoints } from '@yozora/character';
-import { eatOptionalWhitespaces, BaseInlineTokenizer, TokenizerPriority, genFindDelimiter } from '@yozora/core-tokenizer';
+import { eatOptionalWhitespaces, genFindDelimiter, BaseInlineTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 import { eatHTMLTagName, eatHTMLAttribute } from '@yozora/tokenizer-html-block';
 import { HtmlType } from '@yozora/ast';
 
@@ -199,57 +199,37 @@ function eatHtmlInlineTokenOpenDelimiter(nodePoints, startIndex, endIndex) {
     return delimiter;
 }
 
-const uniqueName = '@yozora/tokenizer-html-inline';
-
-class HtmlInlineTokenizer 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 = api => {
-            return {
-                findDelimiter: () => genFindDelimiter(_findDelimiter),
-                processSingleDelimiter,
-            };
-            function _findDelimiter(startIndex, endIndex) {
-                const nodePoints = api.getNodePoints();
-                for (let i = startIndex; i < endIndex; ++i) {
-                    i = eatOptionalWhitespaces(nodePoints, i, endIndex);
-                    if (i >= endIndex)
-                        break;
-                    const c = nodePoints[i].codePoint;
-                    switch (c) {
-                        case AsciiCodePoint.BACKSLASH:
-                            i += 1;
-                            break;
-                        case AsciiCodePoint.OPEN_ANGLE: {
-                            const delimiter = tryToEatDelimiter(nodePoints, i, endIndex);
-                            if (delimiter != null)
-                                return delimiter;
-                            break;
-                        }
-                    }
+const match = function (api) {
+    return {
+        findDelimiter: () => genFindDelimiter(_findDelimiter),
+        processSingleDelimiter,
+    };
+    function _findDelimiter(startIndex, endIndex) {
+        const nodePoints = api.getNodePoints();
+        for (let i = startIndex; i < endIndex; ++i) {
+            i = eatOptionalWhitespaces(nodePoints, i, endIndex);
+            if (i >= endIndex)
+                break;
+            const c = nodePoints[i].codePoint;
+            switch (c) {
+                case AsciiCodePoint.BACKSLASH:
+                    i += 1;
+                    break;
+                case AsciiCodePoint.OPEN_ANGLE: {
+                    const delimiter = tryToEatDelimiter(nodePoints, i, endIndex);
+                    if (delimiter != null)
+                        return delimiter;
+                    break;
                 }
-                return null;
-            }
-            function processSingleDelimiter(delimiter) {
-                const token = Object.assign(Object.assign({}, delimiter), { nodeType: HtmlType });
-                return [token];
             }
-        };
-        this.parse = api => ({
-            parse: token => {
-                const { startIndex, endIndex } = token;
-                const nodePoints = api.getNodePoints();
-                const value = calcStringFromNodePoints(nodePoints, startIndex, endIndex);
-                const result = { type: HtmlType, value };
-                return result;
-            },
-        });
+        }
+        return null;
     }
-}
+    function processSingleDelimiter(delimiter) {
+        const token = Object.assign(Object.assign({}, delimiter), { nodeType: HtmlType });
+        return [token];
+    }
+};
 function tryToEatDelimiter(nodePoints, startIndex, endIndex) {
     let delimiter = null;
     delimiter = eatHtmlInlineTokenOpenDelimiter(nodePoints, startIndex, endIndex);
@@ -271,4 +251,32 @@ function tryToEatDelimiter(nodePoints, startIndex, endIndex) {
     return delimiter;
 }
 
-export { HtmlInlineTokenizer, uniqueName as HtmlInlineTokenizerName, HtmlInlineTokenizer as default, eatHtmlInlineCDataDelimiter, eatHtmlInlineClosingDelimiter, eatHtmlInlineCommentDelimiter, eatHtmlInlineDeclarationDelimiter, eatHtmlInlineInstructionDelimiter, eatHtmlInlineTokenOpenDelimiter };
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const { startIndex, endIndex } = token;
+            const nodePoints = api.getNodePoints();
+            const value = calcStringFromNodePoints(nodePoints, startIndex, endIndex);
+            const node = api.shouldReservePosition
+                ? { type: HtmlType, position: api.calcPosition(token), value }
+                : { type: HtmlType, value };
+            return node;
+        }),
+    };
+};
+
+const uniqueName = '@yozora/tokenizer-html-inline';
+
+class HtmlInlineTokenizer 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 { HtmlInlineTokenizer, uniqueName as HtmlInlineTokenizerName, HtmlInlineTokenizer as default, eatHtmlInlineCDataDelimiter, eatHtmlInlineClosingDelimiter, eatHtmlInlineCommentDelimiter, eatHtmlInlineDeclarationDelimiter, eatHtmlInlineInstructionDelimiter, eatHtmlInlineTokenOpenDelimiter, match as htmlInlineMatch, parse as htmlInlineParse };

package/lib/types/index.d.ts

@@ -4,6 +4,8 @@ export * from './util/comment';
 export * from './util/declaration';
 export * from './util/instruction';
 export * from './util/open';
+export { match as htmlInlineMatch } from './match';
+export { parse as htmlInlineParse } from './parse';
 export { HtmlInlineTokenizer, HtmlInlineTokenizer as default } from './tokenizer';
 export { uniqueName as HtmlInlineTokenizerName } from './types';
-export type { IToken as IHtmlInlineToken, ITokenizerProps as IHtmlInlineTokenizerProps, } from './types';
+export type { IThis as IHtmlInlineHookContext, IToken as IHtmlInlineToken, ITokenizerProps as IHtmlInlineTokenizerProps, } from './types';

package/lib/types/match.d.ts

@@ -0,0 +1,11 @@
+import type { IMatchInlineHookCreator } from '@yozora/core-tokenizer';
+import type { IDelimiter, IThis, IToken, T } from './types';
+/**
+ * Text between '<' and '>' that looks like an HTML tag is parsed as a raw HTML
+ * tag and will be rendered in HTML without escaping. Tag and attribute names
+ * are not limited to current HTML tags, so custom tags (and even, say, DocBook
+ * tags) may be used.
+ *
+ * @see https://github.github.com/gfm/#raw-html
+ */
+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,6 +1,6 @@
 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 HtmlInline.
  *
@@ -11,8 +11,8 @@ import type { IDelimiter, INode, IToken, ITokenizerProps, T } from './types';
  *
  * @see https://github.github.com/gfm/#raw-html
  */
-export declare class HtmlInlineTokenizer extends BaseInlineTokenizer<T, IDelimiter, IToken, INode> implements IInlineTokenizer<T, IDelimiter, IToken, INode> {
+export declare class HtmlInlineTokenizer 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,5 +1,5 @@
-import type { HtmlType, IHtml } from '@yozora/ast';
-import type { IBaseInlineTokenizerProps, IPartialYastInlineToken } from '@yozora/core-tokenizer';
+import type { Html, HtmlType } from '@yozora/ast';
+import type { IBaseInlineTokenizerProps, IPartialYastInlineToken, ITokenizer } from '@yozora/core-tokenizer';
 import type { IHtmlInlineCDataDelimiter, IHtmlInlineCDataTokenData } from './util/cdata';
 import type { IHtmlInlineClosingDelimiter, IHtmlInlineClosingTokenData } from './util/closing';
 import type { IHtmlInlineCommentDelimiter, IHtmlInlineCommentTokenData } from './util/comment';
@@ -7,7 +7,7 @@ import type { IHtmlInlineDeclarationDelimiter, IHtmlInlineDeclarationTokenData }
 import type { IHtmlInlineInstructionDelimiter, IHtmlInlineInstructionTokenData } from './util/instruction';
 import type { IHtmlInlineOpenDelimiter, IHtmlInlineOpenTokenData as IHtmlInlineOpenTokenData } from './util/open';
 export declare type T = HtmlType;
-export declare type INode = IHtml;
+export declare type INode = Html;
 export declare const uniqueName = "@yozora/tokenizer-html-inline";
 /**
  * Text between '<' and '>' that looks like an HTML tag is parsed as a raw
@@ -19,4 +19,5 @@ export declare const uniqueName = "@yozora/tokenizer-html-inline";
  */
 export declare type IToken = IPartialYastInlineToken<T> & (IHtmlInlineOpenTokenData | IHtmlInlineClosingTokenData | IHtmlInlineCommentTokenData | IHtmlInlineInstructionTokenData | IHtmlInlineDeclarationTokenData | IHtmlInlineCDataTokenData);
 export declare type IDelimiter = IHtmlInlineOpenDelimiter | IHtmlInlineClosingDelimiter | IHtmlInlineCommentDelimiter | IHtmlInlineInstructionDelimiter | IHtmlInlineDeclarationDelimiter | IHtmlInlineCDataDelimiter;
+export declare type IThis = ITokenizer;
 export declare type ITokenizerProps = Partial<IBaseInlineTokenizerProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-html-inline",
-  "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-html-block": "^2.0.0-alpha.0"
+    "@yozora/ast": "^2.0.0",
+    "@yozora/character": "^2.0.0",
+    "@yozora/core-tokenizer": "^2.0.0",
+    "@yozora/tokenizer-html-block": "^2.0.0"
   },
-  "gitHead": "0171501339c49ffd02ed16a63447fa20a47a29a7"
+  "gitHead": "65e99d1709fdd1c918465dce6b1e91de96bdab5e"
 }