@shikijs/engine-javascript 1.24.2 → 1.24.4

package/README.md

@@ -1,6 +1,6 @@
 # @shikijs/engine-javascript
 
-Engine for Shiki using JavaScript's native RegExp (experimental). Uses [Oniguruma-To-ES](https://github.com/slevithan/oniguruma-to-es) to transpile regex syntax and behavior.
+Engine for Shiki using JavaScript's native RegExp. Uses [Oniguruma-To-ES](https://github.com/slevithan/oniguruma-to-es) to transpile regex syntax and behavior.
 
 [Documentation](https://shiki.style/guide/regex-engines)
 

package/dist/index.d.mts

@@ -45,7 +45,7 @@ declare class JavaScriptScanner implements PatternScanner {
     options: JavaScriptRegexEngineOptions;
     regexps: (RegExp | null)[];
     constructor(patterns: string[], options?: JavaScriptRegexEngineOptions);
-    findNextMatchSync(string: string | RegexEngineString, startPosition: number): IOnigMatch | null;
+    findNextMatchSync(string: string | RegexEngineString, startPosition: number, _options: number): IOnigMatch | null;
 }
 /**
  * Use the modern JavaScript RegExp engine to implement the OnigScanner.
@@ -54,8 +54,6 @@ declare class JavaScriptScanner implements PatternScanner {
  * patterns are not supported. Errors will be thrown when parsing TextMate grammars with
  * unsupported patterns, and when the grammar includes patterns that use invalid Oniguruma syntax.
  * Set `forgiving` to `true` to ignore these errors and skip any unsupported or invalid patterns.
- *
- * @experimental
  */
 declare function createJavaScriptRegexEngine(options?: JavaScriptRegexEngineOptions): RegexEngine;
 

package/dist/index.d.ts

@@ -45,7 +45,7 @@ declare class JavaScriptScanner implements PatternScanner {
     options: JavaScriptRegexEngineOptions;
     regexps: (RegExp | null)[];
     constructor(patterns: string[], options?: JavaScriptRegexEngineOptions);
-    findNextMatchSync(string: string | RegexEngineString, startPosition: number): IOnigMatch | null;
+    findNextMatchSync(string: string | RegexEngineString, startPosition: number, _options: number): IOnigMatch | null;
 }
 /**
  * Use the modern JavaScript RegExp engine to implement the OnigScanner.
@@ -54,8 +54,6 @@ declare class JavaScriptScanner implements PatternScanner {
  * patterns are not supported. Errors will be thrown when parsing TextMate grammars with
  * unsupported patterns, and when the grammar includes patterns that use invalid Oniguruma syntax.
  * Set `forgiving` to `true` to ignore these errors and skip any unsupported or invalid patterns.
- *
- * @experimental
  */
 declare function createJavaScriptRegexEngine(options?: JavaScriptRegexEngineOptions): RegexEngine;
 

package/dist/index.mjs

@@ -1,11 +1,5 @@
 import { toRegExp } from 'oniguruma-to-es';
 
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, key + "" , value);
-  return value;
-};
 const MAX = 4294967295;
 function defaultJavaScriptRegexConstructor(pattern, options) {
   return toRegExp(
@@ -14,9 +8,15 @@ function defaultJavaScriptRegexConstructor(pattern, options) {
       global: true,
       hasIndices: true,
       rules: {
+        // Needed since TextMate grammars merge backrefs across patterns
         allowOrphanBackrefs: true,
+        // Removing `\G` anchors in cases when they're not supported for emulation allows
+        // supporting more grammars, but also allows some mismatches
         allowUnhandledGAnchors: true,
-        asciiWordBoundaries: true
+        // Improves search performance for generated regexes
+        asciiWordBoundaries: true,
+        // Follow `vscode-oniguruma` which enables this Oniguruma option by default
+        captureGroup: true
       },
       ...options
     }
@@ -26,7 +26,6 @@ class JavaScriptScanner {
   constructor(patterns, options = {}) {
     this.patterns = patterns;
     this.options = options;
-    __publicField(this, "regexps");
     const {
       forgiving = false,
       cache,
@@ -55,7 +54,8 @@ class JavaScriptScanner {
       }
     });
   }
-  findNextMatchSync(string, startPosition) {
+  regexps;
+  findNextMatchSync(string, startPosition, _options) {
     const str = typeof string === "string" ? string : string.content;
     const pending = [];
     function toResult(index, match, offset = 0) {
@@ -64,15 +64,15 @@ class JavaScriptScanner {
         captureIndices: match.indices.map((indice) => {
           if (indice == null) {
             return {
-              end: MAX,
               start: MAX,
+              end: MAX,
               length: 0
             };
           }
           return {
             start: indice[0] + offset,
-            length: indice[1] - indice[0],
-            end: indice[1] + offset
+            end: indice[1] + offset,
+            length: indice[1] - indice[0]
           };
         })
       };

package/package.json

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