Use oniguruma-parser-cjs instead

Author: RedCMD

package-lock.json

@@ -587,7 +587,7 @@
 	},
 	"dependencies": {
 		"date-and-time": "^3.6.0",
-		"oniguruma-parser": "^0.12.1",
+		"oniguruma-parser-cjs": "^0.0.1",
 		"oniguruma-to-es": "^4.3.3",
 		"plist": "^3.1.0",
 		"vscode-oniguruma": "1.7.0",

package.json

@@ -5,13 +5,7 @@ import { unicodeproperties, UNICODE_PROPERTIES } from "../UNICODE_PROPERTIES";
 import { closeEnoughQuestionMark, stringify, wagnerFischer } from "../extension";
 import { debouncedDiagnostics } from "../DiagnosticCollection";
 
-// Can't import ECMAScript module
-// import { optimize } from 'oniguruma-parser/optimizer';
-let optimize: typeof import("oniguruma-parser/optimizer", { with: { 'resolution-mode': 'import' } }).optimize | undefined;
-importOnigurumaParserOptimizer();
-async function importOnigurumaParserOptimizer() {
-	optimize = (await import("oniguruma-parser/optimizer")).optimize;
-}
+import { optimize } from 'oniguruma-parser-cjs/optimizer';
 
 export const metadata: vscode.CodeActionProviderMetadata = {
 	providedCodeActionKinds: [
@@ -229,22 +223,20 @@ async function optimizeRegex(edit: vscode.WorkspaceEdit, regexNode: Node, uri: v
 	const range = toRange(regexNode);
 
 	try {
-		if (optimize) {
-			const text: string = JSON.parse(`"${regexNode.text}"`);
-
-			const optimized = optimize(text, {
-				rules: {
-					// Follow `vscode-oniguruma` which enables this Oniguruma option by default
-					captureGroup: true,
-					allowOrphanBackrefs: true,
-				},
-			}).pattern;
+		const text: string = JSON.parse(`"${regexNode.text}"`);
 
-			const replacedText = JSON.stringify(optimized).slice(1, -1); // remove surrounding "double quotes"
-			edit.replace(uri, range, replacedText);
+		const optimized = optimize(text, {
+			rules: {
+				// Follow `vscode-oniguruma` which enables this Oniguruma option by default
+				captureGroup: true,
+				allowOrphanBackrefs: true,
+			},
+		}).pattern;
 
-			return;
-		}
+		const replacedText = JSON.stringify(optimized).slice(1, -1); // remove surrounding "double quotes"
+		edit.replace(uri, range, replacedText);
+
+		return;
 	} catch (error) {
 		console.warn("JSON TextMate: oniguruma-parser/optimizer: range: ", range, '\n', error);
 	}