Minor changes

Author: komyg

nova_vm/src/ecmascript/builtins/control_abstraction_objects/promise_objects/promise_abstract_operations/promise_all_record.rs

@@ -30,15 +30,6 @@ pub struct PromiseAllRecordHeapData<'a> {
 pub struct PromiseAllRecord<'a>(pub(crate) BaseIndex<'a, PromiseAllRecordHeapData<'a>>);
 
 impl<'a> PromiseAllRecordHeapData<'a> {
-    pub(crate) fn new(agent: &mut Agent, num_promises: u32, gc: NoGcScope<'a, '_>) -> Self {
-        let undefined_values = vec![Value::Undefined; num_promises as usize];
-        let result_array = Array::from_slice(agent, &undefined_values, gc);
-        Self {
-            remaining_unresolved_promise_count: num_promises,
-            result_array,
-        }
-    }
-
     pub(crate) fn on_promise_fufilled(
         &mut self,
         agent: &mut Agent,
@@ -60,6 +51,8 @@ impl<'a> PromiseAllRecordHeapData<'a> {
             })
             .collect();
 
+        eprintln!("New values: {:#?}", new_values);
+
         self.result_array = Array::from_slice(agent, &new_values, gc);
 
         self.remaining_unresolved_promise_count -= 1;
@@ -68,6 +61,8 @@ impl<'a> PromiseAllRecordHeapData<'a> {
                 "All promises fulfilled, should resolve main promise: {:#?}",
                 self.result_array
             );
+            // self.promise_capability
+            //     .resolve(agent, self.result_array, gc.into_nogc());
         }
     }
 }

nova_vm/src/ecmascript/builtins/control_abstraction_objects/promise_objects/promise_constructor.rs

@@ -271,7 +271,24 @@ impl PromiseConstructor {
             ));
         };
 
+        let Some(second_element) = array_slice[1] else {
+            return Err(agent.throw_exception_with_static_message(
+                ExceptionType::TypeError,
+                "Second element is None",
+                gc.into_nogc(),
+            ));
+        };
+        let Value::Promise(second_promise) = second_element.unbind() else {
+            return Err(agent.throw_exception_with_static_message(
+                ExceptionType::TypeError,
+                "Second element is not a Promise",
+                gc.into_nogc(),
+            ));
+        };
+
         let result_capability = PromiseCapability::new(agent, gc.nogc());
+
+        let second_capability = PromiseCapability::new(agent, gc.nogc());
         let result_promise = result_capability.promise();
 
         // let result_callback_closure: for<'a, 'b, 'c, 'd, 'e, '_gc> fn(
@@ -307,27 +324,37 @@ impl PromiseConstructor {
         //     gc.nogc(),
         // );
 
-        let args: [Value<'gc>; 1] = [Value::Undefined; 1];
-        let result_array = Array::from_slice(agent, &args, gc.nogc());
+        let undefined_values = vec![Value::Undefined; 2];
+        let result_array = Array::from_slice(agent, &undefined_values, gc.nogc());
         let promise_all_record = agent.heap.create(PromiseAllRecordHeapData {
-            remaining_unresolved_promise_count: 1,
+            remaining_unresolved_promise_count: 2,
             result_array,
         });
 
-        let promise_all_handler = PromiseReactionHandler::PromiseAll {
-            index: 0,
-            promise_all: promise_all_record,
-        };
-
         inner_promise_then(
             agent,
             promise_to_await,
-            promise_all_handler,
+            PromiseReactionHandler::PromiseAll {
+                index: 0,
+                promise_all: promise_all_record,
+            },
             PromiseReactionHandler::Empty,
             Some(result_capability),
             gc.nogc(),
         );
 
+        inner_promise_then(
+            agent,
+            second_promise,
+            PromiseReactionHandler::PromiseAll {
+                index: 1,
+                promise_all: promise_all_record,
+            },
+            PromiseReactionHandler::Empty,
+            Some(second_capability),
+            gc.nogc(),
+        );
+
         Ok(result_promise.unbind().into_value())
     }