@yozora/tokenizer-inline-math 2.3.10 → 2.3.11

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## <small>2.3.11 (2025-01-13)</small>
+
+* improve(inline-math): the inline dollars should take high processing priority so the delimiter bound ([3dba582](https://github.com/yozorajs/yozora/commit/3dba582))
+
+
+
+
+
 ## <small>2.3.10 (2025-01-09)</small>
 
 * chore: fix nx dependencies ([d11d405](https://github.com/yozorajs/yozora/commit/d11d405))

package/README.md

@@ -2,7 +2,7 @@
 
 <header>
   <h1 align="center">
-    <a href="https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/inline-math#readme">@yozora/tokenizer-inline-math</a>
+    <a href="https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/inline-math#readme">@yozora/tokenizer-inline-math</a>
   </h1>
   <div align="center">
     <a href="https://www.npmjs.com/package/@yozora/tokenizer-inline-math">
@@ -181,80 +181,80 @@ parser.parse("`$x^2 + y^2 = z^2, x < 0$`")
 
 [live-examples]: https://yozora.guanghechen.com/docs/package/tokenizer-inline-math#live-examples
 [docpage]: https://yozora.guanghechen.com/docs/package/tokenizer-inline-math
-[homepage]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/inline-math#readme
+[homepage]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/inline-math#readme
 [gfm-spec]: https://github.github.com/gfm
 [mdast-homepage]: https://github.com/syntax-tree/mdast
-[@yozora/ast]: https://github.com/yozorajs/yozora/tree/v2.3.10/packages/ast#readme
-[@yozora/ast-util]: https://github.com/yozorajs/yozora/tree/v2.3.10/packages/ast-util#readme
-[@yozora/character]: https://github.com/yozorajs/yozora/tree/v2.3.10/packages/character#readme
+[@yozora/ast]: https://github.com/yozorajs/yozora/tree/v2.3.11/packages/ast#readme
+[@yozora/ast-util]: https://github.com/yozorajs/yozora/tree/v2.3.11/packages/ast-util#readme
+[@yozora/character]: https://github.com/yozorajs/yozora/tree/v2.3.11/packages/character#readme
 [@yozora/eslint-config]:
   https://github.com/yozorajs/yozora/tree/release-2.x.x/packages/eslint-config#readme
-[@yozora/core-parser]: https://github.com/yozorajs/yozora/tree/v2.3.10/packages/core-parser#readme
+[@yozora/core-parser]: https://github.com/yozorajs/yozora/tree/v2.3.11/packages/core-parser#readme
 [@yozora/core-tokenizer]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/packages/core-tokenizer#readme
-[@yozora/invariant]: https://github.com/yozorajs/yozora/tree/v2.3.10/packages/invariant#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/packages/core-tokenizer#readme
+[@yozora/invariant]: https://github.com/yozorajs/yozora/tree/v2.3.11/packages/invariant#readme
 [@yozora/jest-for-tokenizer]:
   https://github.com/yozorajs/yozora/tree/release-2.x.x/packages/jest-for-tokenizer#readme
-[@yozora/parser]: https://github.com/yozorajs/yozora/tree/v2.3.10/packages/parser#readme
-[@yozora/parser-gfm]: https://github.com/yozorajs/yozora/tree/v2.3.10/packages/parser-gfm#readme
+[@yozora/parser]: https://github.com/yozorajs/yozora/tree/v2.3.11/packages/parser#readme
+[@yozora/parser-gfm]: https://github.com/yozorajs/yozora/tree/v2.3.11/packages/parser-gfm#readme
 [@yozora/parser-gfm-ex]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/packages/parser-gfm-ex#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/packages/parser-gfm-ex#readme
 [@yozora/template-tokenizer]:
   https://github.com/yozorajs/yozora/tree/release-2.x.x/packages/template-tokenizer#readme
 [@yozora/tokenizer-admonition]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/admonition#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/admonition#readme
 [@yozora/tokenizer-autolink]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/autolink#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/autolink#readme
 [@yozora/tokenizer-autolink-extension]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/autolink-extension#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/autolink-extension#readme
 [@yozora/tokenizer-blockquote]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/blockquote#readme
-[@yozora/tokenizer-break]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/break#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/blockquote#readme
+[@yozora/tokenizer-break]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/break#readme
 [@yozora/tokenizer-definition]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/definition#readme
-[@yozora/tokenizer-delete]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/delete#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/definition#readme
+[@yozora/tokenizer-delete]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/delete#readme
 [@yozora/tokenizer-ecma-import]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/ecma-import#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/ecma-import#readme
 [@yozora/tokenizer-emphasis]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/emphasis#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/emphasis#readme
 [@yozora/tokenizer-fenced-block]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/fenced-block#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/fenced-block#readme
 [@yozora/tokenizer-fenced-code]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/fenced-code#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/fenced-code#readme
 [@yozora/tokenizer-footnote]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/footnote#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/footnote#readme
 [@yozora/tokenizer-footnote-definition]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/footnote-definition#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/footnote-definition#readme
 [@yozora/tokenizer-footnote-reference]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/footnote-reference#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/footnote-reference#readme
 [@yozora/tokenizer-heading]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/heading#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/heading#readme
 [@yozora/tokenizer-html-block]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/html-block#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/html-block#readme
 [@yozora/tokenizer-html-inline]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/html-inline#readme
-[@yozora/tokenizer-image]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/image#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/html-inline#readme
+[@yozora/tokenizer-image]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/image#readme
 [@yozora/tokenizer-image-reference]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/image-reference#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/image-reference#readme
 [@yozora/tokenizer-indented-code]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/indented-code#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/indented-code#readme
 [@yozora/tokenizer-inline-code]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/inline-code#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/inline-code#readme
 [@yozora/tokenizer-inline-math]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/inline-math#readme
-[@yozora/tokenizer-link]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/link#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/inline-math#readme
+[@yozora/tokenizer-link]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/link#readme
 [@yozora/tokenizer-link-reference]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/link-reference#readme
-[@yozora/tokenizer-list]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/list#readme
-[@yozora/tokenizer-math]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/math#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/link-reference#readme
+[@yozora/tokenizer-list]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/list#readme
+[@yozora/tokenizer-math]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/math#readme
 [@yozora/tokenizer-paragraph]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/paragraph#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/paragraph#readme
 [@yozora/tokenizer-setext-heading]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/setext-heading#readme
-[@yozora/tokenizer-table]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/table#readme
-[@yozora/tokenizer-text]: https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/text#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/setext-heading#readme
+[@yozora/tokenizer-table]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/table#readme
+[@yozora/tokenizer-text]: https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/text#readme
 [@yozora/tokenizer-thematic-break]:
-  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/thematic-break#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.11/tokenizers/thematic-break#readme
 [@yozora/react-admonition]:
   https://github.com/yozorajs/yozora-react/tree/main/packages/admonition#readme
 [@yozora/react-blockquote]:

package/lib/cjs/index.cjs

@@ -27,8 +27,9 @@ const match = function (api) {
                     const leftCodePoint = i === blockStartIndex ? null : nodePoints[i - 1].codePoint;
                     i = coreTokenizer.eatOptionalCharacters(nodePoints, i + 1, blockEndIndex, character.AsciiCodePoint.DOLLAR_SIGN);
                     const rightCodePoint = i === blockEndIndex ? null : nodePoints[i].codePoint;
-                    const isPotentialOpener = checkIfPotentialOpener(leftCodePoint, rightCodePoint);
-                    const isPotentialCloser = checkIfPotentialCloser(leftCodePoint, rightCodePoint);
+                    const thickness = i - _startIndex;
+                    const isPotentialOpener = thickness > 1 || checkIfPotentialOpener(leftCodePoint, rightCodePoint);
+                    const isPotentialCloser = thickness > 1 || checkIfPotentialCloser(leftCodePoint, rightCodePoint);
                     if (!isPotentialOpener && !isPotentialCloser)
                         break;
                     const delimiterType = isPotentialOpener
@@ -40,7 +41,7 @@ const match = function (api) {
                         type: delimiterType,
                         startIndex: _startIndex,
                         endIndex: i,
-                        thickness: i - _startIndex,
+                        thickness,
                     };
                     return delimiter;
                 }
@@ -85,36 +86,6 @@ function processDelimiterPair(openerDelimiter, closerDelimiter) {
     return { tokens: [token] };
 }
 
-const parse = function (api) {
-    return {
-        parse: tokens => tokens.map(token => {
-            const nodePoints = api.getNodePoints();
-            let startIndex = token.startIndex + token.thickness;
-            let endIndex = token.endIndex - token.thickness;
-            let isAllSpace = true;
-            for (let i = startIndex; i < endIndex; ++i) {
-                if (character.isSpaceLike(nodePoints[i].codePoint))
-                    continue;
-                isAllSpace = false;
-                break;
-            }
-            if (!isAllSpace && startIndex + 2 < endIndex) {
-                const firstCharacter = nodePoints[startIndex].codePoint;
-                const lastCharacter = nodePoints[endIndex - 1].codePoint;
-                if (character.isSpaceLike(firstCharacter) && character.isSpaceLike(lastCharacter)) {
-                    startIndex += 1;
-                    endIndex -= 1;
-                }
-            }
-            const value = character.calcStringFromNodePoints(nodePoints, startIndex, endIndex).replace(/\n/g, ' ');
-            const node = api.shouldReservePosition
-                ? { type: ast.InlineMathType, position: api.calcPosition(token), value }
-                : { type: ast.InlineMathType, value };
-            return node;
-        }),
-    };
-};
-
 const matchWithBacktick = function (api) {
     return { findDelimiter, processSingleDelimiter };
     function* findDelimiter() {
@@ -216,6 +187,36 @@ const matchWithBacktick = function (api) {
     }
 };
 
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const nodePoints = api.getNodePoints();
+            let startIndex = token.startIndex + token.thickness;
+            let endIndex = token.endIndex - token.thickness;
+            let isAllSpace = true;
+            for (let i = startIndex; i < endIndex; ++i) {
+                if (character.isSpaceLike(nodePoints[i].codePoint))
+                    continue;
+                isAllSpace = false;
+                break;
+            }
+            if (!isAllSpace && startIndex + 2 < endIndex) {
+                const firstCharacter = nodePoints[startIndex].codePoint;
+                const lastCharacter = nodePoints[endIndex - 1].codePoint;
+                if (character.isSpaceLike(firstCharacter) && character.isSpaceLike(lastCharacter)) {
+                    startIndex += 1;
+                    endIndex -= 1;
+                }
+            }
+            const value = character.calcStringFromNodePoints(nodePoints, startIndex, endIndex).replace(/\n/g, ' ');
+            const node = api.shouldReservePosition
+                ? { type: ast.InlineMathType, position: api.calcPosition(token), value }
+                : { type: ast.InlineMathType, value };
+            return node;
+        }),
+    };
+};
+
 const uniqueName = '@yozora/tokenizer-inline-math';
 const uniqueName_withBacktick = '@yozora/tokenizer-inline-math_with_backtick';
 
@@ -238,4 +239,5 @@ exports.InlineMathTokenizerName = uniqueName;
 exports.InlineMathTokenizerName_withBacktick = uniqueName_withBacktick;
 exports.default = InlineMathTokenizer;
 exports.inlineMathMatch = match;
+exports.inlineMathMatchWithBacktick = matchWithBacktick;
 exports.inlineMathParse = parse;

package/lib/esm/index.mjs

@@ -23,8 +23,9 @@ const match = function (api) {
                     const leftCodePoint = i === blockStartIndex ? null : nodePoints[i - 1].codePoint;
                     i = eatOptionalCharacters(nodePoints, i + 1, blockEndIndex, AsciiCodePoint.DOLLAR_SIGN);
                     const rightCodePoint = i === blockEndIndex ? null : nodePoints[i].codePoint;
-                    const isPotentialOpener = checkIfPotentialOpener(leftCodePoint, rightCodePoint);
-                    const isPotentialCloser = checkIfPotentialCloser(leftCodePoint, rightCodePoint);
+                    const thickness = i - _startIndex;
+                    const isPotentialOpener = thickness > 1 || checkIfPotentialOpener(leftCodePoint, rightCodePoint);
+                    const isPotentialCloser = thickness > 1 || checkIfPotentialCloser(leftCodePoint, rightCodePoint);
                     if (!isPotentialOpener && !isPotentialCloser)
                         break;
                     const delimiterType = isPotentialOpener
@@ -36,7 +37,7 @@ const match = function (api) {
                         type: delimiterType,
                         startIndex: _startIndex,
                         endIndex: i,
-                        thickness: i - _startIndex,
+                        thickness,
                     };
                     return delimiter;
                 }
@@ -81,36 +82,6 @@ function processDelimiterPair(openerDelimiter, closerDelimiter) {
     return { tokens: [token] };
 }
 
-const parse = function (api) {
-    return {
-        parse: tokens => tokens.map(token => {
-            const nodePoints = api.getNodePoints();
-            let startIndex = token.startIndex + token.thickness;
-            let endIndex = token.endIndex - token.thickness;
-            let isAllSpace = true;
-            for (let i = startIndex; i < endIndex; ++i) {
-                if (isSpaceLike(nodePoints[i].codePoint))
-                    continue;
-                isAllSpace = false;
-                break;
-            }
-            if (!isAllSpace && startIndex + 2 < endIndex) {
-                const firstCharacter = nodePoints[startIndex].codePoint;
-                const lastCharacter = nodePoints[endIndex - 1].codePoint;
-                if (isSpaceLike(firstCharacter) && isSpaceLike(lastCharacter)) {
-                    startIndex += 1;
-                    endIndex -= 1;
-                }
-            }
-            const value = calcStringFromNodePoints(nodePoints, startIndex, endIndex).replace(/\n/g, ' ');
-            const node = api.shouldReservePosition
-                ? { type: InlineMathType, position: api.calcPosition(token), value }
-                : { type: InlineMathType, value };
-            return node;
-        }),
-    };
-};
-
 const matchWithBacktick = function (api) {
     return { findDelimiter, processSingleDelimiter };
     function* findDelimiter() {
@@ -212,6 +183,36 @@ const matchWithBacktick = function (api) {
     }
 };
 
+const parse = function (api) {
+    return {
+        parse: tokens => tokens.map(token => {
+            const nodePoints = api.getNodePoints();
+            let startIndex = token.startIndex + token.thickness;
+            let endIndex = token.endIndex - token.thickness;
+            let isAllSpace = true;
+            for (let i = startIndex; i < endIndex; ++i) {
+                if (isSpaceLike(nodePoints[i].codePoint))
+                    continue;
+                isAllSpace = false;
+                break;
+            }
+            if (!isAllSpace && startIndex + 2 < endIndex) {
+                const firstCharacter = nodePoints[startIndex].codePoint;
+                const lastCharacter = nodePoints[endIndex - 1].codePoint;
+                if (isSpaceLike(firstCharacter) && isSpaceLike(lastCharacter)) {
+                    startIndex += 1;
+                    endIndex -= 1;
+                }
+            }
+            const value = calcStringFromNodePoints(nodePoints, startIndex, endIndex).replace(/\n/g, ' ');
+            const node = api.shouldReservePosition
+                ? { type: InlineMathType, position: api.calcPosition(token), value }
+                : { type: InlineMathType, value };
+            return node;
+        }),
+    };
+};
+
 const uniqueName = '@yozora/tokenizer-inline-math';
 const uniqueName_withBacktick = '@yozora/tokenizer-inline-math_with_backtick';
 
@@ -229,4 +230,4 @@ class InlineMathTokenizer extends BaseInlineTokenizer {
     }
 }
 
-export { InlineMathTokenizer, uniqueName as InlineMathTokenizerName, uniqueName_withBacktick as InlineMathTokenizerName_withBacktick, InlineMathTokenizer as default, match as inlineMathMatch, parse as inlineMathParse };
+export { InlineMathTokenizer, uniqueName as InlineMathTokenizerName, uniqueName_withBacktick as InlineMathTokenizerName_withBacktick, InlineMathTokenizer as default, match as inlineMathMatch, matchWithBacktick as inlineMathMatchWithBacktick, parse as inlineMathParse };

package/lib/types/index.d.ts

@@ -32,6 +32,8 @@ interface ITokenizerProps extends Partial<IBaseInlineTokenizerProps> {
 
 declare const match: IMatchInlineHookCreator<T, IDelimiter, IToken, IThis>;
 
+declare const matchWithBacktick: IMatchInlineHookCreator<T, IDelimiter, IToken, IThis>;
+
 declare const parse: IParseInlineHookCreator<T, IToken, INode, IThis>;
 
 /**
@@ -43,4 +45,4 @@ declare class InlineMathTokenizer extends BaseInlineTokenizer<T, IDelimiter, ITo
     constructor(props?: ITokenizerProps);
 }
 
-export { type IThis as IInlineMathHookContext, type IToken as IInlineMathToken, type ITokenizerProps as IInlineMathTokenizerProps, InlineMathTokenizer, uniqueName as InlineMathTokenizerName, uniqueName_withBacktick as InlineMathTokenizerName_withBacktick, InlineMathTokenizer as default, match as inlineMathMatch, parse as inlineMathParse };
+export { type IThis as IInlineMathHookContext, type IToken as IInlineMathToken, type ITokenizerProps as IInlineMathTokenizerProps, InlineMathTokenizer, uniqueName as InlineMathTokenizerName, uniqueName_withBacktick as InlineMathTokenizerName_withBacktick, InlineMathTokenizer as default, match as inlineMathMatch, matchWithBacktick as inlineMathMatchWithBacktick, parse as inlineMathParse };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-inline-math",
-  "version": "2.3.10",
+  "version": "2.3.11",
   "description": "Tokenizer for processing inline math (formulas)",
   "author": {
     "name": "guanghechen",
@@ -11,7 +11,7 @@
     "url": "https://github.com/yozorajs/yozora.git",
     "directory": "tokenizers/inline-math"
   },
-  "homepage": "https://github.com/yozorajs/yozora/tree/v2.3.9/tokenizers/inline-math",
+  "homepage": "https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/inline-math",
   "keywords": [
     "yozora",
     "markdown",
@@ -44,9 +44,9 @@
     "README.md"
   ],
   "dependencies": {
-    "@yozora/ast": "^2.3.10",
-    "@yozora/character": "^2.3.10",
-    "@yozora/core-tokenizer": "^2.3.10"
+    "@yozora/ast": "^2.3.11",
+    "@yozora/character": "^2.3.11",
+    "@yozora/core-tokenizer": "^2.3.11"
   },
-  "gitHead": "a36b4ddca579a3d20bf2ab68b9e31eaa3f03e423"
+  "gitHead": "dcc0a95d27fcdac98153e0facd658dcce104a455"
 }