@opencode/codemode 0.0.0-dev-20144 → 0.0.0-dev-20146

package/dist/interpreter/interpreter.js

@@ -884,20 +884,20 @@ class Frame {
                 return;
             }
             if (pattern.type === "ObjectPattern") {
-                if (!(value instanceof Obj)) {
-                    throw typeError(`Object destructuring requires a data object or array value, received ${describeValue(value)}.`, pattern);
+                if (value === null || value === undefined) {
+                    throw typeError(`Cannot destructure ${describeValue(value)} as it is ${value}.`, pattern);
                 }
                 const consumed = new Set();
                 for (const property of pattern.properties) {
                     if (property.type === "RestElement") {
                         const rest = new Obj(self.ctx.builtins.Object);
-                        assign(rest, value, consumed);
+                        assign(rest, enumerableSource(self.ctx, "Object destructuring", value, pattern), consumed);
                         yield* self.declarePattern(property.argument, rest, mutable, property, initialize);
                         continue;
                     }
                     const key = yield* self.destructuringPropertyKey(property);
                     consumed.add(typeof key === "symbol" ? key : String(key));
-                    yield* self.declarePattern(property.value, self.readProperty(value, key, property), mutable, property, initialize);
+                    yield* self.declarePattern(property.value, self.destructuredProperty(value, key, property), mutable, property, initialize);
                 }
                 return;
             }
@@ -924,20 +924,20 @@ class Frame {
                 return;
             }
             if (pattern.type === "ObjectPattern") {
-                if (!(value instanceof Obj)) {
-                    throw invalidData(`Object destructuring requires a data object or array value, received ${describeValue(value)}.`, pattern);
+                if (value === null || value === undefined) {
+                    throw typeError(`Cannot destructure ${describeValue(value)} as it is ${value}.`, pattern);
                 }
                 const consumed = new Set();
                 for (const property of pattern.properties) {
                     if (property.type === "RestElement") {
                         const rest = new Obj(self.ctx.builtins.Object);
-                        assign(rest, value, consumed);
+                        assign(rest, enumerableSource(self.ctx, "Object destructuring", value, pattern), consumed);
                         yield* self.assignPattern(property.argument, rest, property);
                         continue;
                     }
                     const key = yield* self.destructuringPropertyKey(property);
                     consumed.add(typeof key === "symbol" ? key : String(key));
-                    yield* self.assignPattern(property.value, self.readProperty(value, key, property), property);
+                    yield* self.assignPattern(property.value, self.destructuredProperty(value, key, property), property);
                 }
                 return;
             }
@@ -1825,31 +1825,43 @@ class Frame {
                 : propertyNode.type === "Identifier"
                     ? propertyNode.name
                     : self.toPropertyKey(yield* self.evaluateExpression(propertyNode));
-            if (objectValue instanceof ToolReference) {
-                if (typeof key !== "string") {
-                    throw typeError("Tool paths must use string property names.", propertyNode);
-                }
-                return new ToolReference([...objectValue.path, key]);
-            }
-            if (objectValue instanceof Obj)
-                return { target: objectValue, key, receiver: objectValue };
-            // Strings own length and indexes; every other primitive property reads through the wrapper prototype.
-            if (typeof objectValue === "string") {
-                if (key === "length")
-                    return { value: objectValue.length };
-                const index = typeof key === "symbol" ? undefined : parseArrayIndex(key);
-                if (index !== undefined)
-                    return { value: objectValue[index] };
-            }
-            const proto = primitivePrototype(self.ctx.builtins, objectValue);
-            if (proto !== undefined)
-                return { target: proto, key, receiver: objectValue };
-            if (objectValue === null || objectValue === undefined) {
-                throw typeError(`Cannot read properties of ${objectValue} (reading '${String(key)}').`, objectNode);
-            }
-            throw typeError("Cannot access a property on a non-object value.", objectNode);
+            return self.resolveProperty(objectValue, key, objectNode, propertyNode);
         });
     }
+    resolveProperty(objectValue, key, objectNode, propertyNode) {
+        if (objectValue instanceof ToolReference) {
+            if (typeof key !== "string") {
+                throw typeError("Tool paths must use string property names.", propertyNode);
+            }
+            return new ToolReference([...objectValue.path, key]);
+        }
+        if (objectValue instanceof Obj)
+            return { target: objectValue, key, receiver: objectValue };
+        // Strings own length and indexes; every other primitive property reads through the wrapper prototype.
+        if (typeof objectValue === "string") {
+            if (key === "length")
+                return { value: objectValue.length };
+            const index = typeof key === "symbol" ? undefined : parseArrayIndex(key);
+            if (index !== undefined)
+                return { value: objectValue[index] };
+        }
+        const proto = primitivePrototype(this.ctx.builtins, objectValue);
+        if (proto !== undefined)
+            return { target: proto, key, receiver: objectValue };
+        if (objectValue === null || objectValue === undefined) {
+            throw typeError(`Cannot read properties of ${objectValue} (reading '${String(key)}').`, objectNode);
+        }
+        throw typeError("Cannot access a property on a non-object value.", objectNode);
+    }
+    // One destructured property, read the way a member expression would read it (primitives use their prototype).
+    destructuredProperty(source, key, node) {
+        const reference = this.resolveProperty(source, key, node, node);
+        if (reference instanceof ToolReference)
+            return reference;
+        if ("value" in reference)
+            return reference.value;
+        return this.readProperty(reference.target, reference.key, node, reference.receiver);
+    }
     readReference(reference, node) {
         // Reject unknown promise properties so a missing await cannot hide.
         if (reference.target instanceof PromiseObj && !has(reference.target, reference.key)) {

package/dist/stdlib/date.js

@@ -14,8 +14,8 @@ const constructDate = (ctx, args, proto) => {
             ? new DateObj(proto, Date.parse(value))
             : new DateObj(proto, new Date(coerceToNumber(value)).getTime()));
     }
-    const parts = args.map((arg) => coerceToNumber(arg));
-    return Effect.succeed(new DateObj(proto, new Date(...parts).getTime()));
+    // The spec converts at most seven components, in order, so extra arguments never run program code.
+    return Effect.map(Effect.forEach(args.slice(0, 7), (arg) => toPrimitiveNumber(ctx, arg), { concurrency: 1 }), (parts) => new DateObj(proto, new Date(...parts).getTime()));
 };
 const getters = [
     "getFullYear",
@@ -66,7 +66,11 @@ export const dateGlobal = (ctx) => {
     methods(builtins, date, [
         ["now", 0, () => Date.now()],
         ["parse", 1, (_, args) => Date.parse(coerceToString(args[0]))],
-        ["UTC", 7, (_, args) => Date.UTC(...args.map((arg) => coerceToNumber(arg)))],
+        [
+            "UTC",
+            7,
+            (_, args) => Effect.map(Effect.forEach(args.slice(0, 7), (arg) => toPrimitiveNumber(ctx, arg), { concurrency: 1 }), (parts) => Date.UTC(...parts)),
+        ],
     ]);
     const self = (thisValue, name) => receiver(DateObj, thisValue, `Date.prototype.${name}`);
     const iso = (value) => {
@@ -107,6 +111,9 @@ export const dateGlobal = (ctx) => {
                 return Effect.map(Effect.forEach(args.slice(0, length), (arg) => toPrimitiveNumber(ctx, arg), {
                     concurrency: 1,
                 }), (values) => {
+                    // Every setter but setTime and setFullYear leaves an invalid Date untouched and answers NaN.
+                    if (Number.isNaN(hosted.getTime()) && name !== "setTime" && !name.endsWith("FullYear"))
+                        return NaN;
                     target.time = hosted[name](...values);
                     return target.time;
                 });

package/package.json

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