feat: bump oniguruma-to-es for grammar support and perf

shikijs · Nov 22, 2024 · 5d2df10 · 5d2df10
1 parent 1da0bc8
commit 5d2df10
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/docs/references/engine-js-compat.md b/docs/references/engine-js-compat.md
@@ -2,9 +2,9 @@
 
 Compatibility reference of all built-in grammars with the [JavaScript RegExp engine](/guide/regex-engines#javascript-regexp-engine-experimental).
 
-> Generated on Sunday, November 17, 2024
+> Generated on Friday, November 22, 2024
 >
-> Version `1.23.0`
+> Version `1.23.1`
 >
 > Runtime: Node.js v22.11.0
 
@@ -13,8 +13,8 @@ Compatibility reference of all built-in grammars with the [JavaScript RegExp eng
 |                 |                        Count |
 | :-------------- | ---------------------------: |
 | Total Languages |                          215 |
-| Supported       |  [192](#supported-languages) |
-| Mismatched      |  [10](#mismatched-languages) |
+| Supported       |  [193](#supported-languages) |
+| Mismatched      |   [9](#mismatched-languages) |
 | Unsupported     | [13](#unsupported-languages) |
 
 ## Supported Languages
@@ -129,6 +129,7 @@ In some edge cases, it's not guaranteed that the the highlighting will be 100% t
 | marko              | ✅ OK           |               926 |               - |      |
 | matlab             | ✅ OK           |                88 |               - |      |
 | mdx                | ✅ OK           |               197 |               - |      |
+| mermaid            | ✅ OK           |               129 |               - |      |
 | mipsasm            | ✅ OK           |                17 |               - |      |
 | mojo               | ✅ OK           |               213 |               - |      |
 | move               | ✅ OK           |               120 |               - |      |
@@ -235,7 +236,6 @@ Languages that do not throw with the JavaScript RegExp engine, but will produce
 | haskell   | [🚧 Mismatch](https://textmate-grammars-themes.netlify.app/?grammar=haskell)   |               157 |               - |   39 |
 | kotlin    | [🚧 Mismatch](https://textmate-grammars-themes.netlify.app/?grammar=kotlin)    |                58 |               - | 1953 |
 | kusto     | [🚧 Mismatch](https://textmate-grammars-themes.netlify.app/?grammar=kusto)     |                60 |               - |   40 |
-| mermaid   | [🚧 Mismatch](https://textmate-grammars-themes.netlify.app/?grammar=mermaid)   |               129 |               - |   38 |
 | nginx     | [🚧 Mismatch](https://textmate-grammars-themes.netlify.app/?grammar=nginx)     |               378 |               - |    4 |
 | php       | [🚧 Mismatch](https://textmate-grammars-themes.netlify.app/?grammar=php)       |              1131 |               - |  605 |
 | po        | [🚧 Mismatch](https://textmate-grammars-themes.netlify.app/?grammar=po)        |                23 |               - |  423 |
@@ -254,7 +254,7 @@ Languages that throw with the JavaScript RegExp engine, either because they cont
 | rst        | [🚧 Mismatch](https://textmate-grammars-themes.netlify.app/?grammar=rst) |              1855 |               2 |   62 |
 | hack       | ❌ Error                                                                 |               947 |               1 |  114 |
 | purescript | ❌ Error                                                                 |                72 |               1 |   42 |
-| cpp        | ❌ Error                                                                 |               510 |               2 |    8 |
+| cpp        | ❌ Error                                                                 |               510 |               2 |   27 |
 | csharp     | ❌ Error                                                                 |               306 |               3 |  204 |
 | markdown   | ❌ Error                                                                 |               115 |               3 |  857 |
 | swift      | ❌ Error                                                                 |               326 |               3 |   40 |

diff --git a/packages/engine-javascript/src/index.ts b/packages/engine-javascript/src/index.ts
@@ -54,10 +54,13 @@ export function defaultJavaScriptRegexConstructor(pattern: string, options?: Oni
   return toRegExp(
     pattern,
     {
-      accuracy: 'loose',
       global: true,
       hasIndices: true,
-      tmGrammar: true,
+      rules: {
+        allowOrphanBackrefs: true,
+        allowUnhandledGAnchors: true,
+        asciiWordBoundaries: true,
+      },
       ...options,
     },
   )

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -53,7 +53,7 @@ catalog:
   minimist: ^1.2.8
   monaco-editor-core: ^0.52.0
   ofetch: ^1.4.1
-  oniguruma-to-es: 0.4.1
+  oniguruma-to-es: 0.6.0
   picocolors: ^1.1.1
   pinia: ^2.2.6
   pnpm: ^9.13.2