rename scope jscontext

src/cdp/cdp.zig

@@ -555,8 +555,8 @@ const IsolatedWorld = struct {
         self.executor.deinit();
     }
     pub fn removeContext(self: *IsolatedWorld) !void {
-        if (self.executor.scope == null) return error.NoIsolatedContextToRemove;
-        self.executor.endScope();
+        if (self.executor.js_context == null) return error.NoIsolatedContextToRemove;
+        self.executor.removeJsContext();
     }
 
     // The isolate world must share at least some of the state with the related page, specifically the DocumentHTML
@@ -565,8 +565,8 @@ const IsolatedWorld = struct {
     // This also means this pointer becomes invalid after removePage untill a new page is created.
     // Currently we have only 1 page/frame and thus also only 1 state in the isolate world.
     pub fn createContext(self: *IsolatedWorld, page: *Page) !void {
-        if (self.executor.scope != null) return error.Only1IsolatedContextSupported;
-        _ = try self.executor.startScope(&page.window, page, {}, false);
+        if (self.executor.js_context != null) return error.Only1IsolatedContextSupported;
+        _ = try self.executor.createJsContext(&page.window, page, {}, false);
     }
 };
 

src/cdp/domains/dom.zig

@@ -259,13 +259,13 @@ fn resolveNode(cmd: anytype) !void {
     const bc = cmd.browser_context orelse return error.BrowserContextNotLoaded;
     const page = bc.session.currentPage() orelse return error.PageNotLoaded;
 
-    var scope = page.scope;
+    var js_context = page.main_context;
     if (params.executionContextId) |context_id| {
-        if (scope.context.debugContextId() != context_id) {
+        if (js_context.v8_context.debugContextId() != context_id) {
             var isolated_world = bc.isolated_world orelse return error.ContextNotFound;
-            scope = &(isolated_world.executor.scope orelse return error.ContextNotFound);
+            js_context = &(isolated_world.executor.js_context orelse return error.ContextNotFound);
 
-            if (scope.context.debugContextId() != context_id) return error.ContextNotFound;
+            if (js_context.v8_context.debugContextId() != context_id) return error.ContextNotFound;
         }
     }
 
@@ -275,7 +275,7 @@ fn resolveNode(cmd: anytype) !void {
     // node._node is a *parser.Node we need this to be able to find its most derived type e.g. Node -> Element -> HTMLElement
     // So we use the Node.Union when retrieve the value from the environment
     const remote_object = try bc.inspector.getRemoteObject(
-        scope,
+        js_context,
         params.objectGroup orelse "",
         try dom_node.Node.toInterface(node._node),
     );

src/cdp/domains/page.zig

@@ -117,14 +117,14 @@ fn createIsolatedWorld(cmd: anytype) !void {
     const world = try bc.createIsolatedWorld(params.worldName, params.grantUniveralAccess);
     const page = bc.session.currentPage() orelse return error.PageNotLoaded;
     try pageCreated(bc, page);
-    const scope = &world.executor.scope.?;
+    const js_context = &world.executor.js_context.?;
 
     // Create the auxdata json for the contextCreated event
     // Calling contextCreated will assign a Id to the context and send the contextCreated event
     const aux_data = try std.fmt.allocPrint(cmd.arena, "{{\"isDefault\":false,\"type\":\"isolated\",\"frameId\":\"{s}\"}}", .{params.frameId});
-    bc.inspector.contextCreated(scope, world.name, "", aux_data, false);
+    bc.inspector.contextCreated(js_context, world.name, "", aux_data, false);
 
-    return cmd.sendResult(.{ .executionContextId = scope.context.debugContextId() }, .{});
+    return cmd.sendResult(.{ .executionContextId = js_context.v8_context.debugContextId() }, .{});
 }
 
 fn navigate(cmd: anytype) !void {
@@ -253,7 +253,7 @@ pub fn pageNavigate(arena: Allocator, bc: anytype, event: *const Notification.Pa
         const page = bc.session.currentPage() orelse return error.PageNotLoaded;
         const aux_data = try std.fmt.allocPrint(arena, "{{\"isDefault\":true,\"type\":\"default\",\"frameId\":\"{s}\"}}", .{target_id});
         bc.inspector.contextCreated(
-            page.scope,
+            page.main_context,
             "",
             try page.origin(arena),
             aux_data,
@@ -264,7 +264,7 @@ pub fn pageNavigate(arena: Allocator, bc: anytype, event: *const Notification.Pa
         const aux_json = try std.fmt.allocPrint(arena, "{{\"isDefault\":false,\"type\":\"isolated\",\"frameId\":\"{s}\"}}", .{target_id});
         // Calling contextCreated will assign a new Id to the context and send the contextCreated event
         bc.inspector.contextCreated(
-            &isolated_world.executor.scope.?,
+            &isolated_world.executor.js_context.?,
             isolated_world.name,
             "://",
             aux_json,
@@ -286,7 +286,7 @@ pub fn pageCreated(bc: anytype, page: *Page) !void {
         try isolated_world.createContext(page);
 
         const polyfill = @import("../../browser/polyfill/polyfill.zig");
-        try polyfill.load(bc.arena, &isolated_world.executor.scope.?);
+        try polyfill.load(bc.arena, &isolated_world.executor.js_context.?);
     }
 }
 

src/cdp/domains/target.zig

@@ -127,7 +127,7 @@ fn createTarget(cmd: anytype) !void {
     {
         const aux_data = try std.fmt.allocPrint(cmd.arena, "{{\"isDefault\":true,\"type\":\"default\",\"frameId\":\"{s}\"}}", .{target_id});
         bc.inspector.contextCreated(
-            page.scope,
+            page.main_context,
             "",
             try page.origin(cmd.arena),
             aux_data,