Implement Typed Arrays

boa/src/builtins/array/array_iterator.rs

@@ -15,19 +15,21 @@ use crate::{
 /// [spec]: https://tc39.es/ecma262/#sec-array-iterator-objects
 #[derive(Debug, Clone, Finalize, Trace)]
 pub struct ArrayIterator {
-    array: JsValue,
-    next_index: u32,
+    array: JsObject,
+    next_index: usize,
     kind: PropertyNameKind,
+    done: bool,
 }
 
 impl ArrayIterator {
     pub(crate) const NAME: &'static str = "ArrayIterator";
 
-    fn new(array: JsValue, kind: PropertyNameKind) -> Self {
+    fn new(array: JsObject, kind: PropertyNameKind) -> Self {
         ArrayIterator {
             array,
             kind,
             next_index: 0,
+            done: false,
         }
     }
 
@@ -40,7 +42,7 @@ impl ArrayIterator {
     ///
     /// [spec]: https://tc39.es/ecma262/#sec-createarrayiterator
     pub(crate) fn create_array_iterator(
-        array: JsValue,
+        array: JsObject,
         kind: PropertyNameKind,
         context: &Context,
     ) -> JsValue {
@@ -66,21 +68,28 @@ impl ArrayIterator {
             let mut object = object.borrow_mut();
             if let Some(array_iterator) = object.as_array_iterator_mut() {
                 let index = array_iterator.next_index;
-                if array_iterator.array.is_undefined() {
+                if array_iterator.done {
                     return Ok(create_iter_result_object(
                         JsValue::undefined(),
                         true,
                         context,
                     ));
                 }
-                let len = array_iterator
-                    .array
-                    .get_field("length", context)?
-                    .as_number()
-                    .ok_or_else(|| context.construct_type_error("Not an array"))?
-                    as u32;
-                if array_iterator.next_index >= len {
-                    array_iterator.array = JsValue::undefined();
+
+                let len = if let Some(f) = array_iterator.array.borrow().as_typed_array() {
+                    if f.is_detached() {
+                        return context.throw_type_error(
+                            "Cannot get value from typed array that has a detached array buffer",
+                        );
+                    }
+
+                    f.array_length()
+                } else {
+                    array_iterator.array.length_of_array_like(context)?
+                };
+
+                if index >= len {
+                    array_iterator.done = true;
                     return Ok(create_iter_result_object(
                         JsValue::undefined(),
                         true,
@@ -93,11 +102,11 @@ impl ArrayIterator {
                         Ok(create_iter_result_object(index.into(), false, context))
                     }
                     PropertyNameKind::Value => {
-                        let element_value = array_iterator.array.get_field(index, context)?;
+                        let element_value = array_iterator.array.get(index, context)?;
                         Ok(create_iter_result_object(element_value, false, context))
                     }
                     PropertyNameKind::KeyAndValue => {
-                        let element_value = array_iterator.array.get_field(index, context)?;
+                        let element_value = array_iterator.array.get(index, context)?;
                         let result =
                             Array::create_array_from_list([index.into(), element_value], context);
                         Ok(create_iter_result_object(result.into(), false, context))

boa/src/builtins/array/mod.rs

@@ -720,10 +720,11 @@ impl Array {
         let len = o.length_of_array_like(context)?;
         // 3. If separator is undefined, let sep be the single-element String ",".
         // 4. Else, let sep be ? ToString(separator).
-        let separator = if let Some(separator) = args.get(0) {
-            separator.to_string(context)?
-        } else {
+        let separator = args.get_or_undefined(0);
+        let separator = if separator.is_undefined() {
             JsString::new(",")
+        } else {
+            separator.to_string(context)?
         };
 
         // 5. Let R be the empty String.
@@ -2527,8 +2528,12 @@ impl Array {
         _: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
+        // 1. Let O be ? ToObject(this value).
+        let o = this.to_object(context)?;
+
+        // 2. Return CreateArrayIterator(O, value).
         Ok(ArrayIterator::create_array_iterator(
-            this.clone(),
+            o,
             PropertyNameKind::Value,
             context,
         ))
@@ -2542,11 +2547,15 @@ impl Array {
     ///  - [ECMAScript reference][spec]
     ///  - [MDN documentation][mdn]
     ///
-    /// [spec]: https://tc39.es/ecma262/#sec-array.prototype.values
+    /// [spec]: https://tc39.es/ecma262/#sec-array.prototype.keys
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values
     pub(crate) fn keys(this: &JsValue, _: &[JsValue], context: &mut Context) -> JsResult<JsValue> {
+        // 1. Let O be ? ToObject(this value).
+        let o = this.to_object(context)?;
+
+        // 2. Return CreateArrayIterator(O, key).
         Ok(ArrayIterator::create_array_iterator(
-            this.clone(),
+            o,
             PropertyNameKind::Key,
             context,
         ))
@@ -2560,15 +2569,19 @@ impl Array {
     ///  - [ECMAScript reference][spec]
     ///  - [MDN documentation][mdn]
     ///
-    /// [spec]: https://tc39.es/ecma262/#sec-array.prototype.values
+    /// [spec]: https://tc39.es/ecma262/#sec-array.prototype.entries
     /// [mdn]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/values
     pub(crate) fn entries(
         this: &JsValue,
         _: &[JsValue],
         context: &mut Context,
     ) -> JsResult<JsValue> {
+        // 1. Let O be ? ToObject(this value).
+        let o = this.to_object(context)?;
+
+        // 2. Return CreateArrayIterator(O, key+value).
         Ok(ArrayIterator::create_array_iterator(
-            this.clone(),
+            o,
             PropertyNameKind::KeyAndValue,
             context,
         ))

boa/src/builtins/array/tests.rs

@@ -1412,7 +1412,7 @@ fn array_spread_non_iterable() {
         try {
             const array2 = [...5];
         } catch (err) {
-            err.name === "TypeError" && err.message === "Not an iterable"
+            err.name === "TypeError" && err.message === "Value is not callable"
         }
     "#;
     assert_eq!(forward(&mut context, init), "true");