@poe-platform/safe-js 0.1.188 → 0.1.190

package/dist/safe-js/chunks/{chunk-6DIV4OFN.js → chunk-JR2ZFJJM.js}

@@ -27,7 +27,7 @@ import {
   validateMigrationSemantics,
   validateSnapshotData,
   validateSnapshotMigration
-} from "./chunk-23I25RFY.js";
+} from "./chunk-YEZOXLY4.js";
 
 // packages/safe-js/src/migrate.ts
 import { createHash } from "node:crypto";
@@ -8249,4 +8249,4 @@ export {
   parseMcpConfig,
   makeMcpModule
 };
-//# sourceMappingURL=chunk-6DIV4OFN.js.map
+//# sourceMappingURL=chunk-JR2ZFJJM.js.map

package/dist/safe-js/chunks/{chunk-23I25RFY.js → chunk-YEZOXLY4.js}

@@ -9896,7 +9896,7 @@ function callStringMethodBody(value, methodName, args, budget, parent, context)
   if (methodName === "search" && isSandboxRegex(regex) && hasRegexPropertyOverride(regex, ["exec"], budget))
     return regexSearch(regex, value, budget, context);
   if (methodName === "match" && isSandboxRegex(regex) && hasRegexPropertyOverride(regex, ["exec", "flags", ...Object.keys(regexFlagProperties)], budget))
-    return callObservableRegexMatch(value, regex, budget, context);
+    return regexMatch(value, regex, budget, context);
   if (isSandboxRegex(regex) && (methodName === "matchAll" || methodName === "match" && !regex.flags.includes("g") && regex.lastIndex !== null && typeof regex.lastIndex === "object")) {
     return callStringRegexCursor(value, methodName, regex, budget, parent, context);
   }
@@ -10068,7 +10068,7 @@ function callReplaceLikeMethod(value, methodName, args, budget, callClosure, use
 }
 async function replaceRegex(value, regex, replacement, budget, callClosure, context) {
   if (hasRegexPropertyOverride(regex, ["exec", "flags", ...Object.keys(regexFlagProperties)], budget))
-    return replaceObservableRegex(value, regex, replacement, budget, callClosure, context);
+    return regexReplace(value, regex, replacement, budget, callClosure, context);
   if (regex.flags.includes("g")) regex.lastIndex = 0;
   const cursor = regex.lastIndex;
   let result = "";
@@ -10099,7 +10099,10 @@ function readReplacementProperty(target, key, budget, context) {
   if (descriptor !== void 0) return readPropertyDescriptor(descriptor, target, context);
   return isSandboxRegex(target) ? getRegexMember(target, key, budget, context) : void 0;
 }
-async function replaceObservableRegex(value, regex, replacement, budget, callClosure, context) {
+async function regexReplace(input, regex, replacementInput, budget, callClosure, context) {
+  if (regex === null || typeof regex !== "object") throw new TypeError("RegExp replace requires an object receiver.");
+  let value;
+  let replacement;
   const matches = [];
   let current;
   let field;
@@ -10108,15 +10111,23 @@ async function replaceObservableRegex(value, regex, replacement, budget, callClo
   let captures = [];
   let result = "";
   let flags;
-  const release = retainValues(budget, () => [value, regex, replacement, matches, current, field, groups, matched, captures, result, flags]);
+  const release = retainValues(budget, () => [input, value, regex, replacementInput, replacement, matches, current, field, groups, matched, captures, result, flags]);
   try {
+    value = await sandboxString(input, budget, context);
+    input = void 0;
+    replacement = isSandboxClosure(replacementInput) ? replacementInput : await sandboxString(replacementInput, budget, context);
+    replacementInput = void 0;
+    if (isSandboxRegex(regex) && !hasRegexPropertyOverride(regex, ["exec", "flags", ...Object.keys(regexFlagProperties)], budget)) {
+      release();
+      return await replaceRegex(value, regex, replacement, budget, callClosure, context);
+    }
     field = await readReplacementProperty(regex, "flags", budget, context);
     flags = await sandboxString(field, budget, context);
     field = void 0;
     const global = flags.includes("g");
     const fullUnicode = flags.includes("u") || flags.includes("v");
     flags = void 0;
-    if (global) regex.lastIndex = 0;
+    if (global) await setSandboxProperty(regex, "lastIndex", 0, budget, true, context);
     while (true) {
       budget.visitNode();
       current = await regexExec(regex, value, budget, context);
@@ -10128,10 +10139,10 @@ async function replaceObservableRegex(value, regex, replacement, budget, callClo
       matched = await sandboxString(field, budget, context);
       field = void 0;
       if (matched.length === 0) {
-        field = regex.lastIndex;
+        field = await readReplacementProperty(regex, "lastIndex", budget, context);
         const index = normalizeLastIndex(await sandboxNumber(field, budget, context));
         const point = fullUnicode ? value.codePointAt(index) : void 0;
-        regex.lastIndex = index + (point !== void 0 && point > 65535 ? 2 : 1);
+        await setSandboxProperty(regex, "lastIndex", index + (point !== void 0 && point > 65535 ? 2 : 1), budget, true, context);
         field = void 0;
       }
       matched = void 0;
@@ -10363,38 +10374,50 @@ async function callStringPattern(value, methodName, pattern, budget, parent, con
     operation.release();
   }
 }
-async function callObservableRegexMatch(value, regex, budget, context) {
+async function regexMatch(input, regex, budget, context) {
+  if (regex === null || typeof regex !== "object") throw new TypeError("RegExp match requires an object receiver.");
+  let value;
   const matches = [];
   let result;
   let matched;
   let cursor;
   let flagsValue;
   let flags;
-  const release = retainValues(budget, () => [value, regex, matches, result, matched, cursor, flagsValue, flags]);
+  const release = retainValues(budget, () => [input, value, regex, matches, result, matched, cursor, flagsValue, flags]);
+  const read = (target, key) => {
+    if (context?.getProperty !== void 0) return context.getProperty(target, key);
+    const descriptor = getSandboxPropertyDescriptor(target, key, budget);
+    return descriptor === void 0 ? void 0 : readPropertyDescriptor(descriptor, target, context);
+  };
   try {
-    const descriptor = context?.getProperty === void 0 ? getSandboxPropertyDescriptor(regex, "flags", budget) : void 0;
-    flagsValue = await (context?.getProperty !== void 0 ? context.getProperty(regex, "flags") : descriptor === void 0 ? getRegexMember(regex, "flags", budget, context) : readPropertyDescriptor(descriptor, regex, context));
+    value = await sandboxString(input, budget, context);
+    input = void 0;
+    if (isSandboxRegex(regex) && !hasRegexPropertyOverride(regex, ["exec", "flags", ...Object.keys(regexFlagProperties)], budget)) {
+      release();
+      return await callStringMethodBody(value, "match", [regex], budget, context?.compilation, context);
+    }
+    flagsValue = await read(regex, "flags");
     flags = await sandboxString(flagsValue, budget, context);
     flagsValue = void 0;
     if (!flags.includes("g")) return await regexExec(regex, value, budget, context);
     const fullUnicode = flags.includes("u") || flags.includes("v");
     flags = void 0;
-    regex.lastIndex = 0;
+    await setSandboxProperty(regex, "lastIndex", 0, budget, true, context);
     while (true) {
       budget.visitNode();
       result = await regexExec(regex, value, budget, context);
       if (result === null) return matches.length === 0 ? null : matches;
-      const descriptor2 = context?.getProperty === void 0 ? getSandboxPropertyDescriptor(result, "0", budget) : void 0;
-      matched = await (context?.getProperty !== void 0 ? context.getProperty(result, "0") : descriptor2 === void 0 ? void 0 : readPropertyDescriptor(descriptor2, result, context));
+      const descriptor = context?.getProperty === void 0 ? getSandboxPropertyDescriptor(result, "0", budget) : void 0;
+      matched = await (context?.getProperty !== void 0 ? context.getProperty(result, "0") : descriptor === void 0 ? void 0 : readPropertyDescriptor(descriptor, result, context));
       const text = await sandboxString(matched, budget, context);
       matched = void 0;
       budget.allocateArrayLength(matches.length + 1);
       matches.push(text);
       if (text.length === 0) {
-        cursor = regex.lastIndex;
+        cursor = await read(regex, "lastIndex");
         const index = normalizeLastIndex(await sandboxNumber(cursor, budget, context));
         const point = fullUnicode ? value.codePointAt(index) : void 0;
-        regex.lastIndex = index + (point !== void 0 && point > 65535 ? 2 : 1);
+        await setSandboxProperty(regex, "lastIndex", index + (point !== void 0 && point > 65535 ? 2 : 1), budget, true, context);
         cursor = void 0;
       }
       result = void 0;
@@ -34443,6 +34466,35 @@ function createRegexGlobals(options) {
     writable: true,
     configurable: true
   });
+  Object.defineProperty(prototype, Symbol.match, {
+    value: createSandboxClosure({
+      guest: true,
+      sandbox: true,
+      name: "[Symbol.match]",
+      length: 1,
+      call: (args, context) => regexMatch(args[0], context?.thisValue, options.budget, context)
+    }),
+    writable: true,
+    configurable: true
+  });
+  Object.defineProperty(prototype, Symbol.replace, {
+    value: createSandboxClosure({
+      guest: true,
+      sandbox: true,
+      name: "[Symbol.replace]",
+      length: 2,
+      call: (args, context) => regexReplace(
+        args[0],
+        context?.thisValue,
+        args[1],
+        options.budget,
+        (closure, values) => invokeBuiltinClosure(closure, values, options.budget, context, void 0),
+        context
+      )
+    }),
+    writable: true,
+    configurable: true
+  });
   for (const name of ["exec", "test", "toString"]) {
     Object.defineProperty(prototype, name, {
       value: createSandboxClosure({
@@ -36787,4 +36839,4 @@ export {
   FileSnapshotBackend,
   run
 };
-//# sourceMappingURL=chunk-23I25RFY.js.map
+//# sourceMappingURL=chunk-YEZOXLY4.js.map