@shikijs/engine-javascript 1.23.0 → 1.24.0

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { PatternScanner, RegexEngineString, RegexEngine } from '@shikijs/types';
 import { IOnigMatch } from '@shikijs/vscode-textmate';
-import { Options } from 'oniguruma-to-es';
+import { OnigurumaToEsOptions } from 'oniguruma-to-es';
 
 interface JavaScriptRegexEngineOptions {
     /**
@@ -9,26 +9,22 @@ interface JavaScriptRegexEngineOptions {
      * @default false
      */
     forgiving?: boolean;
-    /**
-     * Cleanup some grammar patterns before use.
-     *
-     * @default true
-     */
-    simulation?: boolean;
     /**
      * The target ECMAScript version.
      *
-     * For the best accuracy, Oniguruma-to-ES needs the `v` flag support in RegExp which is landed in ES2024.
-     * Which requires Node.js 20+ or Chrome 112+.
+     * Oniguruma-To-ES uses RegExp features from later versions of ECMAScript to provide improved
+     * accuracy and add support for more grammars. If using target `ES2024` or later, the RegExp `v`
+     * flag is used which requires Node.js 20+ or Chrome 112+.
      * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/unicodeSets
      *
-     * For the maximum compatibility, you can set it to `ES2018`. Which will use the `u` flag to simulate and will be less accurate.
+     * For maximum compatibility, you can set it to `ES2018` which uses the RegExp `u` flag but
+     * supports a few less grammars.
      *
-     * Set to `auto` to detect the target version automatically.
+     * Set to `auto` to automatically detect the latest version supported by the environment.
      *
      * @default 'auto'
      */
-    target?: 'ES2024' | 'ES2025' | 'ES2018' | 'auto';
+    target?: 'auto' | 'ES2025' | 'ES2024' | 'ES2018';
     /**
      * Cache for regex patterns.
      */
@@ -43,7 +39,7 @@ interface JavaScriptRegexEngineOptions {
 /**
  * The default RegExp constructor for JavaScript regex engine.
  */
-declare function defaultJavaScriptRegexConstructor(pattern: string, options?: Options): RegExp;
+declare function defaultJavaScriptRegexConstructor(pattern: string, options?: OnigurumaToEsOptions): RegExp;
 declare class JavaScriptScanner implements PatternScanner {
     patterns: string[];
     options: JavaScriptRegexEngineOptions;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PatternScanner, RegexEngineString, RegexEngine } from '@shikijs/types';
 import { IOnigMatch } from '@shikijs/vscode-textmate';
-import { Options } from 'oniguruma-to-es';
+import { OnigurumaToEsOptions } from 'oniguruma-to-es';
 
 interface JavaScriptRegexEngineOptions {
     /**
@@ -9,26 +9,22 @@ interface JavaScriptRegexEngineOptions {
      * @default false
      */
     forgiving?: boolean;
-    /**
-     * Cleanup some grammar patterns before use.
-     *
-     * @default true
-     */
-    simulation?: boolean;
     /**
      * The target ECMAScript version.
      *
-     * For the best accuracy, Oniguruma-to-ES needs the `v` flag support in RegExp which is landed in ES2024.
-     * Which requires Node.js 20+ or Chrome 112+.
+     * Oniguruma-To-ES uses RegExp features from later versions of ECMAScript to provide improved
+     * accuracy and add support for more grammars. If using target `ES2024` or later, the RegExp `v`
+     * flag is used which requires Node.js 20+ or Chrome 112+.
      * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/unicodeSets
      *
-     * For the maximum compatibility, you can set it to `ES2018`. Which will use the `u` flag to simulate and will be less accurate.
+     * For maximum compatibility, you can set it to `ES2018` which uses the RegExp `u` flag but
+     * supports a few less grammars.
      *
-     * Set to `auto` to detect the target version automatically.
+     * Set to `auto` to automatically detect the latest version supported by the environment.
      *
      * @default 'auto'
      */
-    target?: 'ES2024' | 'ES2025' | 'ES2018' | 'auto';
+    target?: 'auto' | 'ES2025' | 'ES2024' | 'ES2018';
     /**
      * Cache for regex patterns.
      */
@@ -43,7 +39,7 @@ interface JavaScriptRegexEngineOptions {
 /**
  * The default RegExp constructor for JavaScript regex engine.
  */
-declare function defaultJavaScriptRegexConstructor(pattern: string, options?: Options): RegExp;
+declare function defaultJavaScriptRegexConstructor(pattern: string, options?: OnigurumaToEsOptions): RegExp;
 declare class JavaScriptScanner implements PatternScanner {
     patterns: string[];
     options: JavaScriptRegexEngineOptions;

package/dist/index.mjs

@@ -7,27 +7,17 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 const MAX = 4294967295;
-let supportedRegExpTarget;
-function detectRegExpTarget() {
-  if (supportedRegExpTarget != null)
-    return supportedRegExpTarget;
-  supportedRegExpTarget = "ES2018";
-  try {
-    new RegExp("a", "v");
-    supportedRegExpTarget = "ES2024";
-  } catch {
-    supportedRegExpTarget = "ES2018";
-  }
-  return supportedRegExpTarget;
-}
 function defaultJavaScriptRegexConstructor(pattern, options) {
   return toRegExp(
     pattern,
     {
-      accuracy: "loose",
       global: true,
       hasIndices: true,
-      tmGrammar: true,
+      rules: {
+        allowOrphanBackrefs: true,
+        allowUnhandledGAnchors: true,
+        asciiWordBoundaries: true
+      },
       ...options
     }
   );
@@ -41,14 +31,9 @@ class JavaScriptScanner {
       forgiving = false,
       cache,
       target = "auto",
-      simulation = true,
-      regexConstructor = (pattern) => defaultJavaScriptRegexConstructor(pattern, {
-        target: target === "auto" ? detectRegExpTarget() : target
-      })
+      regexConstructor = (pattern) => defaultJavaScriptRegexConstructor(pattern, { target })
     } = options;
     this.regexps = patterns.map((p) => {
-      if (simulation)
-        p = p.replaceAll("(^|\\\uFFFF)", "(^|\\G)");
       const cached = cache?.get(p);
       if (cached) {
         if (cached instanceof RegExp) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/engine-javascript",
   "type": "module",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "description": "Engine for Shiki using JavaScript's native RegExp",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -31,8 +31,8 @@
   ],
   "dependencies": {
     "@shikijs/vscode-textmate": "^9.3.0",
-    "oniguruma-to-es": "0.1.2",
-    "@shikijs/types": "1.23.0"
+    "oniguruma-to-es": "0.7.0",
+    "@shikijs/types": "1.24.0"
   },
   "scripts": {
     "build": "unbuild",