module_evaluation passes

src/primitives.rs

@@ -2,7 +2,6 @@ use std::ops::Deref;
 
 use crate::isolate::Isolate;
 use crate::support::Opaque;
-use crate::HandleScope;
 use crate::Local;
 use crate::Value;
 
@@ -29,21 +28,21 @@ extern "C" {
   fn v8__False(isolate: *mut Isolate) -> *mut Boolean;
 }
 
-pub fn new_null<'sc>(scope: &mut HandleScope<'sc>) -> Local<'sc, Primitive> {
+pub fn new_null<'sc>(scope: &mut impl AsMut<Isolate>) -> Local<'sc, Primitive> {
   unsafe { Local::from_raw(v8__Null(scope.as_mut())) }.unwrap()
 }
 
 pub fn new_undefined<'sc>(
-  scope: &mut HandleScope<'sc>,
+  scope: &mut impl AsMut<Isolate>,
 ) -> Local<'sc, Primitive> {
   unsafe { Local::from_raw(v8__Undefined(scope.as_mut())) }.unwrap()
 }
 
-pub fn new_true<'sc>(scope: &mut HandleScope<'sc>) -> Local<'sc, Boolean> {
+pub fn new_true<'sc>(scope: &mut impl AsMut<Isolate>) -> Local<'sc, Boolean> {
   unsafe { Local::from_raw(v8__True(scope.as_mut())) }.unwrap()
 }
 
-pub fn new_false<'sc>(scope: &mut HandleScope<'sc>) -> Local<'sc, Boolean> {
+pub fn new_false<'sc>(scope: &mut impl AsMut<Isolate>) -> Local<'sc, Boolean> {
   unsafe { Local::from_raw(v8__False(scope.as_mut())) }.unwrap()
 }
 

tests/test_api.rs

@@ -736,17 +736,18 @@ fn set_promise_reject_callback() {
 }
 
 fn mock_script_origin<'sc>(
-  scope: &mut HandleScope<'sc>,
+  isolate: &mut impl AsMut<v8::Isolate>,
+  resource_name_: &str,
 ) -> v8::ScriptOrigin<'sc> {
-  let resource_name = v8_str(scope, "foo.js");
-  let resource_line_offset = v8::Integer::new(scope, 0);
-  let resource_column_offset = v8::Integer::new(scope, 0);
-  let resource_is_shared_cross_origin = v8::new_true(scope);
-  let script_id = v8::Integer::new(scope, 123);
-  let source_map_url = v8_str(scope, "source_map_url");
-  let resource_is_opaque = v8::new_true(scope);
-  let is_wasm = v8::new_false(scope);
-  let is_module = v8::new_true(scope);
+  let resource_name = v8_str(isolate, resource_name_);
+  let resource_line_offset = v8::Integer::new(isolate, 0);
+  let resource_column_offset = v8::Integer::new(isolate, 0);
+  let resource_is_shared_cross_origin = v8::new_true(isolate);
+  let script_id = v8::Integer::new(isolate, 123);
+  let source_map_url = v8_str(isolate, "source_map_url");
+  let resource_is_opaque = v8::new_true(isolate);
+  let is_wasm = v8::new_false(isolate);
+  let is_module = v8::new_true(isolate);
   v8::ScriptOrigin::new(
     resource_name.into(),
     resource_line_offset,
@@ -774,7 +775,7 @@ fn script_compiler_source() {
     context.enter();
 
     let source = "1+2";
-    let script_origin = mock_script_origin(scope);
+    let script_origin = mock_script_origin(scope, "foo.js");
     let source =
       v8::script_compiler::Source::new(v8_str(scope, source), &script_origin);
 
@@ -810,7 +811,7 @@ fn module_instantiation_failures1() {
       "import './foo.js';\n\
        export {} from './bar.js';",
     );
-    let origin = mock_script_origin(scope);
+    let origin = mock_script_origin(scope, "foo.js");
     let source = v8::script_compiler::Source::new(source_text, &origin);
 
     let mut module = v8::script_compiler::compile_module(
@@ -887,7 +888,7 @@ fn module_evaluation() {
       "import 'Object.expando = 5';\n\
        import 'Object.expando *= 2';",
     );
-    let origin = mock_script_origin(scope);
+    let origin = mock_script_origin(scope, "foo.js");
     let source = v8::script_compiler::Source::new(source_text, &origin);
 
     let mut module = v8::script_compiler::compile_module(
@@ -901,16 +902,20 @@ fn module_evaluation() {
 
     extern "C" fn resolve_callback(
       mut context: v8::Local<v8::Context>,
-      _specifier: v8::Local<v8::String>,
+      specifier: v8::Local<v8::String>,
       _referrer: v8::Local<v8::Module>,
     ) -> *mut v8::Module {
-      /*
-      ScriptOrigin origin = ModuleOrigin(v8_str("module.js"), CcTest::isolate());
-      ScriptCompiler::Source source(specifier, origin);
-      return ScriptCompiler::CompileModule(CcTest::isolate(), &source)
-          .ToLocalChecked();
-      */
-      std::ptr::null_mut()
+      let isolate: &mut v8::Isolate = context.as_mut();
+      let origin = mock_script_origin(isolate, "module.js");
+      let source = v8::script_compiler::Source::new(specifier, &origin);
+      let mut module = v8::script_compiler::compile_module(
+        isolate,
+        source,
+        v8::script_compiler::CompileOptions::NoCompileOptions,
+        v8::script_compiler::NoCacheReason::NoReason,
+      )
+      .unwrap();
+      &mut *module
     }
     let result = module.instantiate_module(context, resolve_callback);
     assert!(result.unwrap());