@opencode/codemode 0.0.0-dev-19645 → 0.0.0-dev-19648

package/dist/interpreter/objects.js

@@ -90,7 +90,6 @@ export class RegExpObj extends Obj {
     constructor(proto, pattern, flags) {
         super(proto);
         this.regex = new RegExp(pattern, flags);
-        define(this, "lastIndex", 0, { writable: true, enumerable: false, configurable: false });
     }
 }
 export class MapObj extends Obj {

package/dist/stdlib/regexp.js

@@ -1,7 +1,7 @@
 import { Effect } from "effect";
 import { constructor, methods, prototypeFrom, receiver } from "../interpreter/native.js";
 import { syntaxError, typeError } from "../interpreter/model.js";
-import { define, defineAccessor, getOwn, Arr, Obj, RegExpObj, record, set } from "../interpreter/objects.js";
+import { define, defineAccessor, Arr, Obj, RegExpObj, record } from "../interpreter/objects.js";
 import { coerceToNumber, coerceToString } from "./value.js";
 const flagProperties = [
     "hasIndices",
@@ -61,12 +61,6 @@ export const constructRegExp = (builtins, args, proto = builtins.RegExp) => {
             : `new RegExp(...) received ${JSON.stringify(pattern)}, which is not a valid regular expression pattern (${reason}). ${escapeRegexHint}`);
     }
 };
-const toLength = (value) => {
-    const number = coerceToNumber(value);
-    if (Number.isNaN(number) || number <= 0)
-        return 0;
-    return Math.min(Math.floor(number), Number.MAX_SAFE_INTEGER);
-};
 // RegExp constructs identically with or without new, like JS.
 export const regexpGlobal = (ctx) => {
     const builtins = ctx.builtins;
@@ -91,20 +85,18 @@ export const regexpGlobal = (ctx) => {
     const self = (thisValue, name) => receiver(RegExpObj, thisValue, `RegExp.prototype.${name}`);
     defineAccessor(proto, "source", (thisValue) => self(thisValue, "source").regex.source);
     defineAccessor(proto, "flags", (thisValue) => self(thisValue, "flags").regex.flags);
+    // The host regex holds the only lastIndex, so exec/test and the String methods share one counter.
+    defineAccessor(proto, "lastIndex", (thisValue) => self(thisValue, "lastIndex").regex.lastIndex, (thisValue, value) => {
+        self(thisValue, "lastIndex").regex.lastIndex = coerceToNumber(value);
+    });
     for (const name of flagProperties)
         defineAccessor(proto, name, (thisValue) => self(thisValue, name).regex[name]);
-    // exec/test run the host regex from the program-visible lastIndex and write it back only when g or y is set.
     const run = (name) => [
         name,
         1,
         (thisValue, args) => {
             const value = self(thisValue, name);
-            const input = coerceToString(args[0]);
-            const stateful = value.regex.global || value.regex.sticky;
-            value.regex.lastIndex = toLength(getOwn(value, "lastIndex"));
-            const matched = value.regex.exec(input);
-            if (stateful)
-                set(value, "lastIndex", value.regex.lastIndex);
+            const matched = value.regex.exec(coerceToString(args[0]));
             if (name === "test")
                 return matched !== null;
             return matched === null ? null : matchToValue(builtins, matched);

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/codemode",
-  "version": "0.0.0-dev-19645",
+  "version": "0.0.0-dev-19648",
   "description": "Effect-native confined code execution over schema-described tools",
   "type": "module",
   "license": "MIT",