@swf2es/runtime 0.1.17 → 0.1.19

package/src/avm2/natives/object.ts

@@ -2,6 +2,7 @@
 // calling or constructing Object, Namespace, QName or Function does.
 
 import type { AsObject, Value } from "../descriptors.js";
+import { forgetStep } from "../enumeration.js";
 import type { ClassHook } from "../hooks.js";
 import { formatClassName, Namespace, prefixOf, publicQname } from "../names.js";
 import { NOT_FOUND, type Runtime } from "../runtime.js";
@@ -51,7 +52,11 @@ export const objectNatives: Natives = {
         o.$d.allHidden = false;
       }
     } else {
-      o.$dontEnum ??= new Set();
+      if (o.$dontEnum === undefined) {
+        o.$dontEnum = new Set();
+        forgetStep(o);
+      }
+
       o.$dontEnum.add(name);
     }
   },

package/src/avm2/natives/vector.ts

@@ -76,7 +76,7 @@ for (const [kind, , , elementsOf, store] of VECTORS) {
         a.length = length;
       } else if (length === 0) {
         // A new array: V8 empties one by a call into its runtime.
-        this.$a = elementsOf(0);
+        rt.setElements(this, elementsOf(0));
       } else if (length < a.length) {
         a.length = length;
       } else if (length > a.length) {

package/src/avm2/runtime.ts

@@ -39,13 +39,17 @@ import {
   continues,
   dictionaryAt,
   type Enumeration,
+  elementName,
   elementsAt,
   enumerated,
+  forgetStep,
   INT_ATOM_LIMIT,
   nextIndex,
   ownNames,
   pairIndex,
   pairOf,
+  sparseElement,
+  traitsAt,
   walkless,
 } from "./enumeration.js";
 import { AsError, describe, detailOf, errorMessage, stackOf, UnsupportedError } from "./errors.js";
@@ -1115,7 +1119,21 @@ export class Runtime {
     this.arrayConversion.noteArrayClass(cls);
   }
 
+  /**
+   * A class's prototype, whose methods compiled code calls on a primitive:
+   * at every such call, so a String's, a Number's and a Boolean's are read
+   * from their traits, kept once known, without the lookup by name.
+   */
   prototypeOf(ref: TypeRef): AsObject {
+    switch (ref) {
+      case "String":
+        return (this.stringTraits ?? this.builtinTraits("String")).proto;
+      case "Number":
+        return (this.numberTraits ?? this.builtinTraits("Number")).proto;
+      case "Boolean":
+        return (this.booleanTraits ?? this.builtinTraits("Boolean")).proto;
+    }
+
     return this.classOf(ref).$it.proto;
   }
 
@@ -2505,9 +2523,18 @@ export class Runtime {
     return this.array(values);
   }
 
+  /**
+   * Give `o`, which has elements, the storage `elements` in place of its
+   * own, so that a for-in under way over it goes on over them.
+   */
+  setElements(o: AsObject, elements: Value[]): void {
+    o.$a = elements;
+    forgetStep(o);
+  }
+
   /** An Array holding `values`. */
   array(values: Value[]): AsObject {
-    const o = this.builtinTraits("Array").instance();
+    const o = (this.arrayTraits ?? this.builtinTraits("Array")).instance();
     o.$a = values;
     return o;
   }
@@ -3335,7 +3362,7 @@ export class Runtime {
     }
 
     // As avmplus' ArrayObject and TypedVectorObject: the elements, then the other names.
-    const length = elementsAt(o, index);
+    const length = elementsAt(o, index)?.length ?? 0;
     if (index > 0 && index <= length) {
       const element = index - 1;
       return element < INT_ATOM_LIMIT ? element : String(element);
@@ -3352,7 +3379,7 @@ export class Runtime {
   }
 
   nextValue(o: Value, index: number): Value {
-    const traits: Traits | undefined = o?.$traits;
+    const traits: Traits | undefined = traitsAt(o, index);
     if (!continues(o, index)) {
       const properties = traits?.properties;
       if (properties) {
@@ -3372,7 +3399,8 @@ export class Runtime {
       }
     }
 
-    const length = elementsAt(o, index);
+    const a = elementsAt(o, index);
+    const length = a?.length ?? 0;
     if (index > 0 && index <= length) {
       const element = index - 1;
       if (traits?.getIndex) {
@@ -3381,8 +3409,8 @@ export class Runtime {
 
       if (traits === this.arrayTraits) {
         // A hole reads undefined too: only then is `in` asked.
-        const value = o.$a[element];
-        if (value !== undefined || element in o.$a) {
+        const value = (a as Value[])[element];
+        if (value !== undefined || element in (a as Value[])) {
           return value;
         }
       }
@@ -3396,12 +3424,22 @@ export class Runtime {
     }
 
     // Else a Dictionary's slot holds a dynamic property's name.
-    const name =
-      keys !== null
-        ? (keys.nameAt(index - length) as string)
-        : index <= length
-          ? String(index - 1)
-          : enumerated(o, index - length, index);
+    let name: string;
+    if (keys !== null) {
+      name = keys.nameAt(index - length) as string;
+    } else if (index <= length) {
+      // A step by a sparse Array's indices reads its element here, off the path of every other.
+      if (index < 0) {
+        const value = sparseElement(o, index, traits === this.arrayTraits, NOT_FOUND);
+        if (value !== NOT_FOUND) {
+          return value;
+        }
+      }
+
+      name = elementName(index);
+    } else {
+      name = enumerated(o, index - length, index) as string;
+    }
 
     // A dynamic property's value, as avmplus' nextValue reads its slot's:
     // no binding has its name, which setting it would have gone to.