@yozora/tokenizer-inline-math 2.3.8 → 2.3.10

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## <small>2.3.10 (2025-01-09)</small>
+
+* chore: fix nx dependencies ([d11d405](https://github.com/yozorajs/yozora/commit/d11d405))
+
+
+
+
+
+# Change Log
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## <small>2.3.9 (2024-12-05)</small>
+
+- :bug: fix(inline-math): the delimiter could be adjacent to a punctuation character
+  ([a6071be](https://github.com/yozorajs/yozora/commit/a6071be))
+
+# Change Log
+
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 

package/README.md

@@ -2,7 +2,7 @@
 
 <header>
   <h1 align="center">
-    <a href="https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/inline-math#readme">@yozora/tokenizer-inline-math</a>
+    <a href="https://github.com/yozorajs/yozora/tree/v2.3.10/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.8/tokenizers/inline-math#readme
+[homepage]: https://github.com/yozorajs/yozora/tree/v2.3.10/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.8/packages/ast#readme
-[@yozora/ast-util]: https://github.com/yozorajs/yozora/tree/v2.3.8/packages/ast-util#readme
-[@yozora/character]: https://github.com/yozorajs/yozora/tree/v2.3.8/packages/character#readme
+[@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/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.8/packages/core-parser#readme
+[@yozora/core-parser]: https://github.com/yozorajs/yozora/tree/v2.3.10/packages/core-parser#readme
 [@yozora/core-tokenizer]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/packages/core-tokenizer#readme
-[@yozora/invariant]: https://github.com/yozorajs/yozora/tree/v2.3.8/packages/invariant#readme
+  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
 [@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.8/packages/parser#readme
-[@yozora/parser-gfm]: https://github.com/yozorajs/yozora/tree/v2.3.8/packages/parser-gfm#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-gfm-ex]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/packages/parser-gfm-ex#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/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.8/tokenizers/admonition#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/admonition#readme
 [@yozora/tokenizer-autolink]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/autolink#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/autolink#readme
 [@yozora/tokenizer-autolink-extension]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/autolink-extension#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/autolink-extension#readme
 [@yozora/tokenizer-blockquote]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/blockquote#readme
-[@yozora/tokenizer-break]: https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/break#readme
+  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
 [@yozora/tokenizer-definition]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/definition#readme
-[@yozora/tokenizer-delete]: https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/delete#readme
+  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
 [@yozora/tokenizer-ecma-import]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/ecma-import#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/ecma-import#readme
 [@yozora/tokenizer-emphasis]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/emphasis#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/emphasis#readme
 [@yozora/tokenizer-fenced-block]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/fenced-block#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/fenced-block#readme
 [@yozora/tokenizer-fenced-code]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/fenced-code#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/fenced-code#readme
 [@yozora/tokenizer-footnote]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/footnote#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/footnote#readme
 [@yozora/tokenizer-footnote-definition]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/footnote-definition#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/footnote-definition#readme
 [@yozora/tokenizer-footnote-reference]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/footnote-reference#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/footnote-reference#readme
 [@yozora/tokenizer-heading]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/heading#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/heading#readme
 [@yozora/tokenizer-html-block]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/html-block#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/html-block#readme
 [@yozora/tokenizer-html-inline]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/html-inline#readme
-[@yozora/tokenizer-image]: https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/image#readme
+  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
 [@yozora/tokenizer-image-reference]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/image-reference#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/image-reference#readme
 [@yozora/tokenizer-indented-code]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/indented-code#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/indented-code#readme
 [@yozora/tokenizer-inline-code]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/inline-code#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/inline-code#readme
 [@yozora/tokenizer-inline-math]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/inline-math#readme
-[@yozora/tokenizer-link]: https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/link#readme
+  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
 [@yozora/tokenizer-link-reference]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/link-reference#readme
-[@yozora/tokenizer-list]: https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/list#readme
-[@yozora/tokenizer-math]: https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/math#readme
+  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
 [@yozora/tokenizer-paragraph]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/paragraph#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/tokenizers/paragraph#readme
 [@yozora/tokenizer-setext-heading]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/setext-heading#readme
-[@yozora/tokenizer-table]: https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/table#readme
-[@yozora/tokenizer-text]: https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/text#readme
+  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
 [@yozora/tokenizer-thematic-break]:
-  https://github.com/yozorajs/yozora/tree/v2.3.8/tokenizers/thematic-break#readme
+  https://github.com/yozorajs/yozora/tree/v2.3.10/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

@@ -23,14 +23,12 @@ const match = function (api) {
                     i += 1;
                     break;
                 case character.AsciiCodePoint.DOLLAR_SIGN: {
-                    const leftCodePoint = i === blockStartIndex ? null : nodePoints[i - 1].codePoint;
                     const _startIndex = i;
+                    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 = (leftCodePoint === null || character.isWhitespaceCharacter(leftCodePoint)) &&
-                        (rightCodePoint === null || !character.isWhitespaceCharacter(rightCodePoint));
-                    const isPotentialCloser = (leftCodePoint === null || !character.isWhitespaceCharacter(leftCodePoint)) &&
-                        (rightCodePoint === null || character.isWhitespaceCharacter(rightCodePoint));
+                    const isPotentialOpener = checkIfPotentialOpener(leftCodePoint, rightCodePoint);
+                    const isPotentialCloser = checkIfPotentialCloser(leftCodePoint, rightCodePoint);
                     if (!isPotentialOpener && !isPotentialCloser)
                         break;
                     const delimiterType = isPotentialOpener
@@ -50,21 +48,42 @@ const match = function (api) {
         }
         return null;
     }
-    function isDelimiterPair(openerDelimiter, closerDelimiter) {
-        if (openerDelimiter.thickness === closerDelimiter.thickness)
-            return { paired: true };
-        return { paired: false, opener: true, closer: true };
-    }
-    function processDelimiterPair(openerDelimiter, closerDelimiter) {
-        const token = {
-            nodeType: ast.InlineMathType,
-            startIndex: openerDelimiter.startIndex,
-            endIndex: closerDelimiter.endIndex,
-            thickness: openerDelimiter.thickness,
-        };
-        return { tokens: [token] };
-    }
 };
+function checkIfPotentialOpener(leftCodePoint, rightCodePoint) {
+    if (rightCodePoint === null)
+        return false;
+    if (leftCodePoint === character.AsciiCodePoint.BACKTICK)
+        return false;
+    if (leftCodePoint === null)
+        return true;
+    return character.isWhitespaceCharacter(leftCodePoint) || character.isPunctuationCharacter(leftCodePoint);
+}
+function checkIfPotentialCloser(leftCodePoint, rightCodePoint) {
+    if (leftCodePoint === null)
+        return false;
+    if (rightCodePoint === character.AsciiCodePoint.BACKTICK)
+        return false;
+    if (rightCodePoint === null)
+        return true;
+    return character.isWhitespaceCharacter(rightCodePoint) || character.isPunctuationCharacter(rightCodePoint);
+}
+function isDelimiterPair(openerDelimiter, closerDelimiter) {
+    if (openerDelimiter.thickness === closerDelimiter.thickness &&
+        (openerDelimiter.type === 'opener' || openerDelimiter.type === 'both') &&
+        (closerDelimiter.type === 'closer' || closerDelimiter.type === 'both')) {
+        return { paired: true };
+    }
+    return { paired: false, opener: true, closer: true };
+}
+function processDelimiterPair(openerDelimiter, closerDelimiter) {
+    const token = {
+        nodeType: ast.InlineMathType,
+        startIndex: openerDelimiter.startIndex,
+        endIndex: closerDelimiter.endIndex,
+        thickness: openerDelimiter.thickness,
+    };
+    return { tokens: [token] };
+}
 
 const parse = function (api) {
     return {

package/lib/esm/index.mjs

@@ -1,5 +1,5 @@
 import { InlineMathType } from '@yozora/ast';
-import { AsciiCodePoint, isWhitespaceCharacter, isSpaceLike, calcStringFromNodePoints } from '@yozora/character';
+import { AsciiCodePoint, isWhitespaceCharacter, isPunctuationCharacter, isSpaceLike, calcStringFromNodePoints } from '@yozora/character';
 import { genFindDelimiter, eatOptionalCharacters, BaseInlineTokenizer, TokenizerPriority } from '@yozora/core-tokenizer';
 
 const match = function (api) {
@@ -19,14 +19,12 @@ const match = function (api) {
                     i += 1;
                     break;
                 case AsciiCodePoint.DOLLAR_SIGN: {
-                    const leftCodePoint = i === blockStartIndex ? null : nodePoints[i - 1].codePoint;
                     const _startIndex = i;
+                    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 = (leftCodePoint === null || isWhitespaceCharacter(leftCodePoint)) &&
-                        (rightCodePoint === null || !isWhitespaceCharacter(rightCodePoint));
-                    const isPotentialCloser = (leftCodePoint === null || !isWhitespaceCharacter(leftCodePoint)) &&
-                        (rightCodePoint === null || isWhitespaceCharacter(rightCodePoint));
+                    const isPotentialOpener = checkIfPotentialOpener(leftCodePoint, rightCodePoint);
+                    const isPotentialCloser = checkIfPotentialCloser(leftCodePoint, rightCodePoint);
                     if (!isPotentialOpener && !isPotentialCloser)
                         break;
                     const delimiterType = isPotentialOpener
@@ -46,21 +44,42 @@ const match = function (api) {
         }
         return null;
     }
-    function isDelimiterPair(openerDelimiter, closerDelimiter) {
-        if (openerDelimiter.thickness === closerDelimiter.thickness)
-            return { paired: true };
-        return { paired: false, opener: true, closer: true };
-    }
-    function processDelimiterPair(openerDelimiter, closerDelimiter) {
-        const token = {
-            nodeType: InlineMathType,
-            startIndex: openerDelimiter.startIndex,
-            endIndex: closerDelimiter.endIndex,
-            thickness: openerDelimiter.thickness,
-        };
-        return { tokens: [token] };
-    }
 };
+function checkIfPotentialOpener(leftCodePoint, rightCodePoint) {
+    if (rightCodePoint === null)
+        return false;
+    if (leftCodePoint === AsciiCodePoint.BACKTICK)
+        return false;
+    if (leftCodePoint === null)
+        return true;
+    return isWhitespaceCharacter(leftCodePoint) || isPunctuationCharacter(leftCodePoint);
+}
+function checkIfPotentialCloser(leftCodePoint, rightCodePoint) {
+    if (leftCodePoint === null)
+        return false;
+    if (rightCodePoint === AsciiCodePoint.BACKTICK)
+        return false;
+    if (rightCodePoint === null)
+        return true;
+    return isWhitespaceCharacter(rightCodePoint) || isPunctuationCharacter(rightCodePoint);
+}
+function isDelimiterPair(openerDelimiter, closerDelimiter) {
+    if (openerDelimiter.thickness === closerDelimiter.thickness &&
+        (openerDelimiter.type === 'opener' || openerDelimiter.type === 'both') &&
+        (closerDelimiter.type === 'closer' || closerDelimiter.type === 'both')) {
+        return { paired: true };
+    }
+    return { paired: false, opener: true, closer: true };
+}
+function processDelimiterPair(openerDelimiter, closerDelimiter) {
+    const token = {
+        nodeType: InlineMathType,
+        startIndex: openerDelimiter.startIndex,
+        endIndex: closerDelimiter.endIndex,
+        thickness: openerDelimiter.thickness,
+    };
+    return { tokens: [token] };
+}
 
 const parse = function (api) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yozora/tokenizer-inline-math",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "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.7/tokenizers/inline-math",
+  "homepage": "https://github.com/yozorajs/yozora/tree/v2.3.9/tokenizers/inline-math",
   "keywords": [
     "yozora",
     "markdown",
@@ -44,9 +44,9 @@
     "README.md"
   ],
   "dependencies": {
-    "@yozora/ast": "^2.3.8",
-    "@yozora/character": "^2.3.8",
-    "@yozora/core-tokenizer": "^2.3.8"
+    "@yozora/ast": "^2.3.10",
+    "@yozora/character": "^2.3.10",
+    "@yozora/core-tokenizer": "^2.3.10"
   },
-  "gitHead": "c4ddb8bfb317b74d481be80ce545d7dbe3add3f2"
+  "gitHead": "a36b4ddca579a3d20bf2ab68b9e31eaa3f03e423"
 }