marked-katex-extension 4.0.1 → 4.0.3

package/lib/index.cjs

@@ -2,8 +2,7 @@
 
 var katex = require('katex');
 
-const inlineStartRule = /(\s|^)\${1,2}(?!\$)/;
-const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:]|$)/;
+const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:？！。，：]|$)/;
 const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/;
 
 function index(options = {}) {
@@ -24,16 +23,24 @@ function inlineKatex(options, renderer) {
     name: 'inlineKatex',
     level: 'inline',
     start(src) {
-      const match = src.match(inlineStartRule);
-      if (!match) {
-        return;
-      }
+      let index;
+      let indexSrc = src;
+
+      while (indexSrc) {
+        index = indexSrc.indexOf('$');
+        if (index === -1) {
+          return;
+        }
+
+        if (index === 0 || indexSrc.charAt(index - 1) === ' ') {
+          const possibleKatex = indexSrc.substring(index);
 
-      const index = match.index + match[1].length;
-      const possibleKatex = src.substring(index);
+          if (possibleKatex.match(inlineRule)) {
+            return index;
+          }
+        }
 
-      if (possibleKatex.match(inlineRule)) {
-        return index;
+        indexSrc = indexSrc.substring(index + 1).replace(/^\$+/, '');
       }
     },
     tokenizer(src, tokens) {

package/lib/index.umd.js

@@ -18419,8 +18419,7 @@
     }
   };
 
-  const inlineStartRule = /(\s|^)\${1,2}(?!\$)/;
-  const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:]|$)/;
+  const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:？！。，：]|$)/;
   const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/;
 
   function index(options = {}) {
@@ -18441,16 +18440,24 @@
       name: 'inlineKatex',
       level: 'inline',
       start(src) {
-        const match = src.match(inlineStartRule);
-        if (!match) {
-          return;
-        }
+        let index;
+        let indexSrc = src;
+
+        while (indexSrc) {
+          index = indexSrc.indexOf('$');
+          if (index === -1) {
+            return;
+          }
 
-        const index = match.index + match[1].length;
-        const possibleKatex = src.substring(index);
+          if (index === 0 || indexSrc.charAt(index - 1) === ' ') {
+            const possibleKatex = indexSrc.substring(index);
+
+            if (possibleKatex.match(inlineRule)) {
+              return index;
+            }
+          }
 
-        if (possibleKatex.match(inlineRule)) {
-          return index;
+          indexSrc = indexSrc.substring(index + 1).replace(/^\$+/, '');
         }
       },
       tokenizer(src, tokens) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marked-katex-extension",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "MarkedJS extesion to render katex",
   "main": "./lib/index.cjs",
   "module": "./src/index.js",
@@ -23,7 +23,9 @@
     }
   },
   "scripts": {
-    "test": "jest --verbose",
+    "test": "npm run build && npm run test:cover && npm run test:spec && npm run test:types && npm run lint",
+    "test:katex": "jest --verbose",
+    "test:spec": "node --test spec/marked-tests.js",
     "test:cover": "jest --coverage",
     "test:types": "tsd -f spec/index.test-d.ts -t src/index.d.ts",
     "lint": "eslint .",
@@ -44,9 +46,10 @@
     "marked": ">=4 <10"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.0",
-    "@babel/preset-env": "^7.22.20",
-    "@rollup/plugin-node-resolve": "^15.2.1",
+    "@babel/core": "^7.23.2",
+    "@babel/preset-env": "^7.23.2",
+    "@markedjs/testutils": "9.1.0-3",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^11.0.0",
     "@semantic-release/git": "^10.0.1",
@@ -55,20 +58,20 @@
     "@semantic-release/release-notes-generator": "^12.0.0",
     "babel-jest": "^29.7.0",
     "cheerio": "^1.0.0-rc.12",
-    "eslint": "^8.50.0",
+    "eslint": "^8.52.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-n": "^16.1.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-n": "^16.2.0",
     "eslint-plugin-promise": "^6.1.1",
     "jest-cli": "^29.7.0",
-    "marked": "^9.0.3",
+    "marked": "^9.1.2",
     "node-fetch": "^3.3.2",
-    "rollup": "^3.29.4",
+    "rollup": "^4.1.4",
     "semantic-release": "^22.0.5",
     "tsd": "^0.29.0"
   },
   "dependencies": {
-    "@types/katex": "^0.16.3",
+    "@types/katex": "^0.16.5",
     "katex": "^0.16.9"
   }
 }

package/src/index.js

@@ -1,7 +1,6 @@
 import katex from 'katex';
 
-const inlineStartRule = /(\s|^)\${1,2}(?!\$)/;
-const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:]|$)/;
+const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:？！。，：]|$)/;
 const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/;
 
 export default function(options = {}) {
@@ -22,16 +21,24 @@ function inlineKatex(options, renderer) {
     name: 'inlineKatex',
     level: 'inline',
     start(src) {
-      const match = src.match(inlineStartRule);
-      if (!match) {
-        return;
-      }
+      let index;
+      let indexSrc = src;
+
+      while (indexSrc) {
+        index = indexSrc.indexOf('$');
+        if (index === -1) {
+          return;
+        }
+
+        if (index === 0 || indexSrc.charAt(index - 1) === ' ') {
+          const possibleKatex = indexSrc.substring(index);
 
-      const index = match.index + match[1].length;
-      const possibleKatex = src.substring(index);
+          if (possibleKatex.match(inlineRule)) {
+            return index;
+          }
+        }
 
-      if (possibleKatex.match(inlineRule)) {
-        return index;
+        indexSrc = indexSrc.substring(index + 1).replace(/^\$+/, '');
       }
     },
     tokenizer(src, tokens) {