update zig-jsruntime

Author: krichprollsch

src/browser/browser.zig

@@ -166,7 +166,7 @@ pub const Session = struct {
         // const ctx_opaque = @as(*anyopaque, @ptrCast(ctx));
         self.inspector = try jsruntime.Inspector.init(
             arena,
-            self.env, // TODO: change to 'env' when https://github.com/lightpanda-io/zig-js-runtime/pull/285 lands
+            &self.env,
             if (@TypeOf(ctx) == void) @constCast(@ptrCast(&{})) else ctx,
             InspectorContainer.onInspectorResponse,
             InspectorContainer.onInspectorEvent,
@@ -231,8 +231,7 @@ pub const Session = struct {
         }
 
         // load polyfills
-        // TODO: change to 'env' when https://github.com/lightpanda-io/zig-js-runtime/pull/285 lands
-        try polyfill.load(self.arena.allocator(), self.env);
+        try polyfill.load(self.arena.allocator(), &self.env);
 
         // inspector
         self.contextCreated(page, aux_data);
@@ -265,7 +264,7 @@ pub const Session = struct {
 
     fn contextCreated(self: *Session, page: *Page, aux_data: ?[]const u8) void {
         log.debug("inspector context created", .{});
-        self.inspector.contextCreated(self.env, "", page.origin orelse "://", aux_data);
+        self.inspector.contextCreated(&self.env, "", page.origin orelse "://", aux_data);
     }
 };
 
@@ -317,15 +316,15 @@ pub const Page = struct {
     pub fn wait(self: *Page) !void {
         // try catch
         var try_catch: jsruntime.TryCatch = undefined;
-        try_catch.init(self.session.env);
+        try_catch.init(&self.session.env);
         defer try_catch.deinit();
 
         self.session.env.wait() catch |err| {
             // the js env could not be started if the document wasn't an HTML.
             if (err == error.EnvNotStarted) return;
 
             const arena = self.arena;
-            if (try try_catch.err(arena, self.session.env)) |msg| {
+            if (try try_catch.err(arena, &self.session.env)) |msg| {
                 defer arena.free(msg);
                 log.info("wait error: {s}", .{msg});
                 return;
@@ -592,8 +591,6 @@ pub const Page = struct {
         // TODO handle charset attribute
         const opt_text = try parser.nodeTextContent(parser.elementToNode(s.element));
         if (opt_text) |text| {
-            // TODO: change to &self.session.env when
-            // https://github.com/lightpanda-io/zig-js-runtime/pull/285 lands
             try s.eval(self.arena, self.session.env, text);
             return;
         }
@@ -659,8 +656,6 @@ pub const Page = struct {
         const arena = self.arena;
 
         const body = try self.fetchData(arena, s.src, null);
-        // TODO: change to &self.session.env when
-        // https://github.com/lightpanda-io/zig-js-runtime/pull/285 lands
         try s.eval(arena, self.session.env, body);
     }
 
@@ -704,24 +699,24 @@ pub const Page = struct {
             return .unknown;
         }
 
-        fn eval(self: Script, arena: Allocator, env: Env, body: []const u8) !void {
+        fn eval(self: Script, arena: Allocator, env: Env, body: []const u8) !void { // TODO use an *const Env
             var try_catch: jsruntime.TryCatch = undefined;
-            try_catch.init(env);
+            try_catch.init(&env);
             defer try_catch.deinit();
 
             const res = switch (self.kind) {
                 .unknown => return error.UnknownScript,
-                .javascript => env.exec(body, self.src),
-                .module => env.module(body, self.src),
+                .javascript => env.exec(body, self.src), // TODO use an *const Env
+                .module => env.module(body, self.src), // TODO use an *const Env
             } catch {
-                if (try try_catch.err(arena, env)) |msg| {
+                if (try try_catch.err(arena, &env)) |msg| {
                     log.info("eval script {s}: {s}", .{ self.src, msg });
                 }
                 return FetchError.JsErr;
             };
 
             if (builtin.mode == .Debug) {
-                const msg = try res.toString(arena, env);
+                const msg = try res.toString(arena, &env);
                 log.debug("eval script {s}: {s}", .{ self.src, msg });
             }
         }

src/polyfill/fetch.zig

@@ -20,7 +20,7 @@ pub fn testExecFn(
     alloc: std.mem.Allocator,
     js_env: *jsruntime.Env,
 ) anyerror!void {
-    try @import("polyfill.zig").load(alloc, js_env.*);
+    try @import("polyfill.zig").load(alloc, js_env);
 
     var fetch = [_]Case{
         .{

src/polyfill/polyfill.zig

@@ -33,7 +33,7 @@ const modules = [_]struct {
     .{ .name = "polyfill-fetch", .source = @import("fetch.zig").source },
 };
 
-pub fn load(alloc: std.mem.Allocator, env: Env) !void {
+pub fn load(alloc: std.mem.Allocator, env: *const Env) !void {
     var try_catch: jsruntime.TryCatch = undefined;
     try_catch.init(env);
     defer try_catch.deinit();

src/wpt/run.zig

@@ -77,11 +77,11 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const
     defer js_env.stop();
 
     // load polyfills
-    try polyfill.load(alloc, js_env);
+    try polyfill.load(alloc, &js_env);
 
     // display console logs
     defer {
-        const res = evalJS(js_env, alloc, "console.join('\\n');", "console") catch unreachable;
+        const res = evalJS(&js_env, alloc, "console.join('\\n');", "console") catch unreachable;
         defer res.deinit(alloc);
 
         if (res.msg != null and res.msg.?.len > 0) {
@@ -104,7 +104,7 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const
         \\  console.push("debug", ...arguments);
         \\};
     ;
-    var res = try evalJS(js_env, alloc, init, "init");
+    var res = try evalJS(&js_env, alloc, init, "init");
     if (!res.ok) return res;
     res.deinit(alloc);
 
@@ -123,14 +123,14 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const
                 path = try fspath.join(alloc, &.{ "/", dirname, path });
             }
 
-            res = try evalJS(js_env, alloc, try loader.get(path), src);
+            res = try evalJS(&js_env, alloc, try loader.get(path), src);
             if (!res.ok) return res;
             res.deinit(alloc);
         }
 
         // If the script as a source text, execute it.
         const src = try parser.nodeTextContent(s) orelse continue;
-        res = try evalJS(js_env, alloc, src, "");
+        res = try evalJS(&js_env, alloc, src, "");
         if (!res.ok) return res;
         res.deinit(alloc);
     }
@@ -147,22 +147,22 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const
 
     // wait for all async executions
     var try_catch: jsruntime.TryCatch = undefined;
-    try_catch.init(js_env);
+    try_catch.init(&js_env);
     defer try_catch.deinit();
     js_env.wait() catch {
         return .{
             .ok = false,
-            .msg = try try_catch.err(alloc, js_env),
+            .msg = try try_catch.err(alloc, &js_env),
         };
     };
 
     // Check the final test status.
-    res = try evalJS(js_env, alloc, "report.status;", "teststatus");
+    res = try evalJS(&js_env, alloc, "report.status;", "teststatus");
     if (!res.ok) return res;
     res.deinit(alloc);
 
     // return the detailed result.
-    return try evalJS(js_env, alloc, "report.log", "teststatus");
+    return try evalJS(&js_env, alloc, "report.log", "teststatus");
 }
 
 pub const Res = struct {
@@ -176,7 +176,7 @@ pub const Res = struct {
     }
 };
 
-fn evalJS(env: jsruntime.Env, alloc: std.mem.Allocator, script: []const u8, name: ?[]const u8) !Res {
+fn evalJS(env: *const jsruntime.Env, alloc: std.mem.Allocator, script: []const u8, name: ?[]const u8) !Res {
     var try_catch: jsruntime.TryCatch = undefined;
     try_catch.init(env);
     defer try_catch.deinit();