poe-code 14.0.54 → 14.0.55

package/dist/index.js

@@ -145168,7 +145168,8 @@ function getStringMember(value, property, budget) {
           args,
           budget,
           (closure, closureArgs) => invokeBuiltinClosure(closure, closureArgs, budget, context, void 0),
-          context?.compilation
+          context?.compilation,
+          context
         );
       } finally {
         budget.setRetainedValues(retainedReceiver, void 0);
@@ -145188,7 +145189,7 @@ function isStringMethodName(property) {
 }
 function validateStringMethodArguments(_methodName, _args) {
 }
-function callStringMethod(value, methodName, args, budget, callClosure = async (closure, closureArgs) => await closure.call(closureArgs), parent) {
+function callStringMethod(value, methodName, args, budget, callClosure = async (closure, closureArgs) => await closure.call(closureArgs), parent, context) {
   if (methodName === "isWellFormed") {
     for (let index = 0; index < value.length; index++) {
       const codeUnit = value.charCodeAt(index);
@@ -145227,6 +145228,9 @@ function callStringMethod(value, methodName, args, budget, callClosure = async (
   if (methodName === "replace" || methodName === "replaceAll") {
     return callReplaceLikeMethod(value, methodName, args, budget, callClosure);
   }
+  if ((methodName === "match" || methodName === "matchAll" || methodName === "search") && !isSandboxRegex(args[0])) {
+    return callStringPattern(value, methodName, args[0], budget, parent, context);
+  }
   const operation = budget.acquireCompileOwner(false, parent?.owner);
   const compilation = new CompileScope(operation.owner);
   try {
@@ -145497,6 +145501,21 @@ function callSplit(value, args, budget, compilation) {
   budget.allocateArrayLength(result.length);
   return result;
 }
+async function callStringPattern(value, methodName, pattern, budget, parent, context) {
+  const operation = budget.acquireCompileOwner(false, parent?.owner);
+  const compilation = new CompileScope(operation.owner);
+  const retainedPattern = {};
+  budget.setRetainedValues(retainedPattern, () => [pattern]);
+  try {
+    const source = pattern === void 0 ? "" : await sandboxString(pattern, budget, context);
+    const regex = createSandboxRegex(source, methodName === "matchAll" ? "g" : "", 0, compilation);
+    return callMatchLikeMethod(value, methodName, [regex], compilation);
+  } finally {
+    budget.setRetainedValues(retainedPattern, void 0);
+    compilation.dispose();
+    operation.release();
+  }
+}
 function callMatchLikeMethod(value, methodName, args, compilation) {
   const regex = args[0];
   if (!isSandboxRegex(regex))
@@ -145514,15 +145533,16 @@ function callMatchLikeMethod(value, methodName, args, compilation) {
     return toMatchArray(executeRegex(regex, value), value);
   if (methodName === "match") regex.lastIndex = 0;
   const matcher = methodName === "matchAll" ? createSandboxRegex(regex.source, regex.flags, regex.lastIndex, compilation) : regex;
-  const matches = collectRegexMatches(matcher, value, true);
+  const matches = collectRegexMatches(matcher, value, true, compilation.owner?.budget);
   if (methodName === "match" && matches.length === 0) return null;
   return methodName === "match" ? matches.map((match) => match.text) : matches.map((match) => toMatchArray(match, value));
 }
-function collectRegexMatches(regex, value, all) {
+function collectRegexMatches(regex, value, all, budget) {
   const matches = [];
   do {
     const match = executeRegex(regex, value);
     if (match === null) break;
+    budget?.allocateArrayLength(matches.length + 1);
     matches.push(match);
     if (all && match.text.length === 0) regex.lastIndex += 1;
   } while (all);
@@ -148455,7 +148475,8 @@ async function evaluateStringMethodCall(node, target, methodName, context) {
         args.value,
         context.budget,
         (closure, closureArgs) => invokeSandboxClosure(closure, closureArgs, context, context.callStack),
-        context.compilation
+        context.compilation,
+        createCoercionContext(context)
       )
     };
   } catch (error3) {
@@ -151013,32 +151034,43 @@ var init_math = __esm({
 });
 
 // packages/safe-js/src/interp/globals/regex.ts
-function createRegexGlobals(owner) {
-  const construct = (args, context) => {
-    const selected = owner ?? context?.compilation?.owner;
+function createRegexGlobals(options) {
+  const invoke2 = (construct) => async (args, context) => {
+    const selected = options.compileOwner ?? context?.compilation?.owner;
     if (context?.compilation?.owner !== void 0 && selected !== context.compilation.owner) {
       throw new SandboxError("reentry");
     }
-    const operation = selected?.budget.acquireCompileOwner(false, selected);
-    const compilation = context?.compilation ?? new CompileScope(selected);
+    const operation = options.budget.acquireCompileOwner(false, selected);
+    const compilation = context?.compilation?.owner === operation.owner ? context.compilation : new CompileScope(operation.owner);
+    let source = "";
+    const retained = {};
+    options.budget.setRetainedValues(retained, () => [...args, source]);
     try {
+      const pattern = args[0];
+      const flags = args[1];
+      if (!construct && isSandboxRegex(pattern) && flags === void 0) return pattern;
+      const sourceValue = isSandboxRegex(pattern) ? pattern.source : pattern;
+      const flagsValue = isSandboxRegex(pattern) && flags === void 0 ? pattern.flags : flags;
+      source = sourceValue === void 0 ? "" : await sandboxString(sourceValue, options.budget, context);
+      const flagText = flagsValue === void 0 ? "" : await sandboxString(flagsValue, options.budget, context);
       const regex = createSandboxRegex(
-        String(args[0] ?? ""),
-        String(args[1] ?? ""),
+        source,
+        flagText,
         0,
         compilation
       );
-      if (context?.compilation === void 0 && selected !== void 0) {
-        reconcileCompiledValues(selected.budget, [regex], compilation);
+      if (compilation !== context?.compilation) {
+        reconcileCompiledValues(options.budget, [regex], compilation);
       }
       return regex;
     } finally {
-      if (context?.compilation === void 0) compilation.dispose();
-      operation?.release();
+      options.budget.setRetainedValues(retained, void 0);
+      if (compilation !== context?.compilation) compilation.dispose();
+      operation.release();
     }
   };
   return {
-    RegExp: createSandboxClosure({ sandbox: true, name: "RegExp", call: construct, construct })
+    RegExp: createSandboxClosure({ sandbox: true, name: "RegExp", call: invoke2(false), construct: invoke2(true) })
   };
 }
 var init_regex2 = __esm({
@@ -151047,6 +151079,7 @@ var init_regex2 = __esm({
     init_values();
     init_compile_guard();
     init_budget2();
+    init_string_coercion();
   }
 });
 
@@ -151630,7 +151663,7 @@ function createBuiltinBindings(options) {
     ...createObjectArrayGlobals(options),
     ...createMiscGlobals(options),
     ...createPromiseGlobals(options),
-    ...createRegexGlobals(options.compileOwner)
+    ...createRegexGlobals(options)
   };
 }
 var init_globals = __esm({