Skip to content

Commit 2409731

Browse files
karlseguinkarlseguin
committed
Zig 0.14 compatibility
1 parent 9fe1074 commit 2409731

File tree

26 files changed

+77
-196
lines changed

26 files changed

+77
-196
lines changed

‎.github/actions/install/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
zig:
66
description: 'Zig version to install'
77
required: false
8-
default: '0.13.0'
8+
default: '0.14.0'
99
arch:
1010
description: 'CPU arch used to select the v8 lib'
1111
required: false

‎.github/workflows/zig-fmt.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: zig-fmt
22

33
env:
4-
ZIG_VERSION: 0.13.0
4+
ZIG_VERSION: 0.14.0
55

66
on:
77
pull_request:

‎.gitmodules‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[submodule "vendor/zig-js-runtime"]
22
path = vendor/zig-js-runtime
33
url = https://github.com/lightpanda-io/zig-js-runtime.git/
4+
branch = zig-0.14
45
[submodule "vendor/netsurf/libwapcaplet"]
56
path = vendor/netsurf/libwapcaplet
67
url = https://github.com/lightpanda-io/libwapcaplet.git/
@@ -28,3 +29,4 @@
2829
[submodule "vendor/zig-async-io"]
2930
path = vendor/zig-async-io
3031
url = https://github.com/lightpanda-io/zig-async-io.git/
32+
branch = zig-0.14

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:24.04
22

33
ARG MINISIG=0.12
4-
ARG ZIG=0.13.0
4+
ARG ZIG=0.14.0
55
ARG ZIG_MINISIG=RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U
66
ARG ARCH=x86_64
77
ARG V8=11.1.134

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ You can also follow the progress of our Javascript support in our dedicated [zig
140140

141141
### Prerequisites
142142

143-
Lightpanda is written with [Zig](https://ziglang.org/) `0.13.0`. You have to
143+
Lightpanda is written with [Zig](https://ziglang.org/) `0.14.0`. You have to
144144
install it with the right version in order to build the project.
145145

146146
Lightpanda also depends on

‎build.zig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ pub fn build(b: *std.Build) !void {
108108
// compile
109109
const tests = b.addTest(.{
110110
.root_source_file = b.path("src/main_tests.zig"),
111-
.test_runner = b.path("src/main_tests.zig"),
111+
.test_runner = .{ .path = b.path("src/main_tests.zig"), .mode = .simple },
112112
.target = target,
113113
.optimize = mode,
114114
});
@@ -134,7 +134,7 @@ pub fn build(b: *std.Build) !void {
134134
// compile
135135
const unit_tests = b.addTest(.{
136136
.root_source_file = b.path("src/unit_tests.zig"),
137-
.test_runner = b.path("src/unit_tests.zig"),
137+
.test_runner = .{ .path = b.path("src/unit_tests.zig"), .mode = .simple },
138138
.target = target,
139139
.optimize = mode,
140140
});
@@ -195,7 +195,7 @@ fn common(
195195
step.root_module.addImport("asyncio", asyncio);
196196

197197
const tlsmod = b.addModule("tls", .{
198-
.root_source_file = b.path("vendor/tls.zig/src/main.zig"),
198+
.root_source_file = b.path("vendor/tls.zig/src/root.zig"),
199199
});
200200
step.root_module.addImport("tls", tlsmod);
201201
}

‎src/browser/browser.zig‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@ pub const Session = struct {
157157

158158
const ContextT = @TypeOf(ctx);
159159
const InspectorContainer = switch (@typeInfo(ContextT)) {
160-
.Struct => ContextT,
161-
.Pointer => |ptr| ptr.child,
162-
.Void => NoopInspector,
160+
.@"struct" => ContextT,
161+
.pointer => |ptr| ptr.child,
162+
.void => NoopInspector,
163163
else => @compileError("invalid context type"),
164164
};
165165

166166
// const ctx_opaque = @as(*anyopaque, @ptrCast(ctx));
167167
self.inspector = try jsruntime.Inspector.init(
168168
arena,
169-
self.env, // TODO: change to 'env' when https://github.com/lightpanda-io/zig-js-runtime/pull/285 lands
169+
&self.env,
170170
if (@TypeOf(ctx) == void) @constCast(@ptrCast(&{})) else ctx,
171171
InspectorContainer.onInspectorResponse,
172172
InspectorContainer.onInspectorEvent,
@@ -232,7 +232,7 @@ pub const Session = struct {
232232

233233
// load polyfills
234234
// TODO: change to 'env' when https://github.com/lightpanda-io/zig-js-runtime/pull/285 lands
235-
try polyfill.load(self.arena.allocator(), self.env);
235+
try polyfill.load(self.arena.allocator(), &self.env);
236236

237237
// inspector
238238
self.contextCreated(page, aux_data);
@@ -265,7 +265,7 @@ pub const Session = struct {
265265

266266
fn contextCreated(self: *Session, page: *Page, aux_data: ?[]const u8) void {
267267
log.debug("inspector context created", .{});
268-
self.inspector.contextCreated(self.env, "", page.origin orelse "://", aux_data);
268+
self.inspector.contextCreated(&self.env, "", page.origin orelse "://", aux_data);
269269
}
270270
};
271271

@@ -317,15 +317,15 @@ pub const Page = struct {
317317
pub fn wait(self: *Page) !void {
318318
// try catch
319319
var try_catch: jsruntime.TryCatch = undefined;
320-
try_catch.init(self.session.env);
320+
try_catch.init(&self.session.env);
321321
defer try_catch.deinit();
322322

323323
self.session.env.wait() catch |err| {
324324
// the js env could not be started if the document wasn't an HTML.
325325
if (err == error.EnvNotStarted) return;
326326

327327
const arena = self.arena;
328-
if (try try_catch.err(arena, self.session.env)) |msg| {
328+
if (try try_catch.err(arena, &self.session.env)) |msg| {
329329
defer arena.free(msg);
330330
log.info("wait error: {s}", .{msg});
331331
return;
@@ -592,9 +592,7 @@ pub const Page = struct {
592592
// TODO handle charset attribute
593593
const opt_text = try parser.nodeTextContent(parser.elementToNode(s.element));
594594
if (opt_text) |text| {
595-
// TODO: change to &self.session.env when
596-
// https://github.com/lightpanda-io/zig-js-runtime/pull/285 lands
597-
try s.eval(self.arena, self.session.env, text);
595+
try s.eval(self.arena, &self.session.env, text);
598596
return;
599597
}
600598

@@ -657,11 +655,8 @@ pub const Page = struct {
657655
// received.
658656
fn fetchScript(self: *const Page, s: *const Script) !void {
659657
const arena = self.arena;
660-
661658
const body = try self.fetchData(arena, s.src, null);
662-
// TODO: change to &self.session.env when
663-
// https://github.com/lightpanda-io/zig-js-runtime/pull/285 lands
664-
try s.eval(arena, self.session.env, body);
659+
try s.eval(arena, &self.session.env, body);
665660
}
666661

667662
const Script = struct {
@@ -684,9 +679,8 @@ pub const Page = struct {
684679

685680
return .{
686681
.element = e,
687-
.kind = kind(try parser.elementGetAttribute(e, "type")),
682+
.kind = parseKind(try parser.elementGetAttribute(e, "type")),
688683
.is_async = try parser.elementGetAttribute(e, "async") != null,
689-
690684
.src = try parser.elementGetAttribute(e, "src") orelse "inline",
691685
};
692686
}
@@ -696,15 +690,15 @@ pub const Page = struct {
696690
// > type indicates that the script is a "classic script", containing
697691
// > JavaScript code.
698692
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attribute_is_not_set_default_an_empty_string_or_a_javascript_mime_type
699-
fn kind(stype: ?[]const u8) Kind {
693+
fn parseKind(stype: ?[]const u8) Kind {
700694
if (stype == null or stype.?.len == 0) return .javascript;
701695
if (std.mem.eql(u8, stype.?, "application/javascript")) return .javascript;
702696
if (std.mem.eql(u8, stype.?, "module")) return .module;
703697

704698
return .unknown;
705699
}
706700

707-
fn eval(self: Script, arena: Allocator, env: Env, body: []const u8) !void {
701+
fn eval(self: Script, arena: Allocator, env: *const Env, body: []const u8) !void {
708702
var try_catch: jsruntime.TryCatch = undefined;
709703
try_catch.init(env);
710704
defer try_catch.deinit();

‎src/browser/mime.zig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ pub const Mime = struct {
245245
const bit_len = @bitSizeOf(@TypeOf(target.*)) - 8;
246246
const byte_len = bit_len / 8;
247247

248-
const T = @Type(.{ .Int = .{
248+
const T = @Type(.{ .int = .{
249249
.bits = bit_len,
250250
.signedness = .unsigned,
251251
} });

‎src/cdp/cdp.zig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ pub fn Command(comptime CDP_T: type, comptime Sender: type) type {
454454
pub fn sendResult(self: *Self, result: anytype, opts: SendResultOpts) !void {
455455
return self.sender.sendJSON(.{
456456
.id = self.input.id,
457-
.result = if (comptime @typeInfo(@TypeOf(result)) == .Null) struct {}{} else result,
457+
.result = if (comptime @typeInfo(@TypeOf(result)) == .null) struct {}{} else result,
458458
.sessionId = if (opts.include_session_id) self.input.session_id else null,
459459
});
460460
}
@@ -466,7 +466,7 @@ pub fn Command(comptime CDP_T: type, comptime Sender: type) type {
466466
// Events ALWAYS go to the client. self.sender should not be used
467467
return self.cdp.sendJSON(.{
468468
.method = method,
469-
.params = if (comptime @typeInfo(@TypeOf(p)) == .Null) struct {}{} else p,
469+
.params = if (comptime @typeInfo(@TypeOf(p)) == .null) struct {}{} else p,
470470
.sessionId = opts.session_id,
471471
});
472472
}

‎src/cdp/testing.zig‎

Lines changed: 4 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ const TestContext = struct {
174174

175175
pub fn processMessage(self: *TestContext, msg: anytype) !void {
176176
var json_message: []const u8 = undefined;
177-
if (@typeInfo(@TypeOf(msg)) != .Pointer) {
178-
json_message = try json.stringifyAlloc(self.arena.allocator(), msg, .{});
177+
if (@typeInfo(@TypeOf(msg)) != .pointer) {
178+
json_message = try std.json.stringifyAlloc(self.arena.allocator(), msg, .{});
179179
} else {
180180
// assume this is a string we want to send as-is, if it isn't, we'll
181181
// get a compile error, so no big deal.
@@ -196,7 +196,7 @@ const TestContext = struct {
196196
pub fn expectSentResult(self: *TestContext, expected: anytype, opts: ExpectResultOpts) !void {
197197
const expected_result = .{
198198
.id = opts.id,
199-
.result = if (comptime @typeInfo(@TypeOf(expected)) == .Null) struct {}{} else expected,
199+
.result = if (comptime @typeInfo(@TypeOf(expected)) == .null) struct {}{} else expected,
200200
.sessionId = opts.session_id,
201201
};
202202

@@ -210,7 +210,7 @@ const TestContext = struct {
210210
pub fn expectSentEvent(self: *TestContext, method: []const u8, params: anytype, opts: ExpectEventOpts) !void {
211211
const expected_event = .{
212212
.method = method,
213-
.params = if (comptime @typeInfo(@TypeOf(params)) == .Null) struct {}{} else params,
213+
.params = if (comptime @typeInfo(@TypeOf(params)) == .null) struct {}{} else params,
214214
.sessionId = opts.session_id,
215215
};
216216

@@ -323,96 +323,3 @@ fn compareJsonValues(a: std.json.Value, b: std.json.Value) bool {
323323
},
324324
}
325325
}
326-
327-
// fn compareAnyToJsonValue(expected: anytype, actual: json.Value) bool {
328-
// switch (@typeInfo(@TypeOf(expected))) {
329-
// .Optional => {
330-
// if (expected) |e| {
331-
// return compareAnyToJsonValue(e, actual);
332-
// }
333-
// return actual == .null;
334-
// },
335-
// .Int, .ComptimeInt => {
336-
// if (actual != .integer) {
337-
// return false;
338-
// }
339-
// return expected == actual.integer;
340-
// },
341-
// .Float, .ComptimeFloat => {
342-
// if (actual != .float) {
343-
// return false;
344-
// }
345-
// return expected == actual.float;
346-
// },
347-
// .Bool => {
348-
// if (actual != .bool) {
349-
// return false;
350-
// }
351-
// return expected == actual.bool;
352-
// },
353-
// .Pointer => |ptr| switch (ptr.size) {
354-
// .One => switch (@typeInfo(ptr.child)) {
355-
// .Struct => return compareAnyToJsonValue(expected.*, actual),
356-
// .Array => |arr| if (arr.child == u8) {
357-
// if (actual != .string) {
358-
// return false;
359-
// }
360-
// return std.mem.eql(u8, expected, actual.string);
361-
// },
362-
// else => {},
363-
// },
364-
// .Slice => switch (ptr.child) {
365-
// u8 => {
366-
// if (actual != .string) {
367-
// return false;
368-
// }
369-
// return std.mem.eql(u8, expected, actual.string);
370-
// },
371-
// else => {},
372-
// },
373-
// else => {},
374-
// },
375-
// .Struct => |s| {
376-
// if (s.is_tuple) {
377-
// // how an array might look in an anytype
378-
// if (actual != .array) {
379-
// return false;
380-
// }
381-
// if (s.fields.len != actual.array.items.len) {
382-
// return false;
383-
// }
384-
385-
// inline for (s.fields, 0..) |f, i| {
386-
// const e = @field(expected, f.name);
387-
// if (compareAnyToJsonValue(e, actual.array.items[i]) == false) {
388-
// return false;
389-
// }
390-
// }
391-
// return true;
392-
// }
393-
394-
// if (s.fields.len == 0) {
395-
// return (actual == .array and actual.array.items.len == 0);
396-
// }
397-
398-
// if (actual != .object) {
399-
// return false;
400-
// }
401-
// inline for (s.fields) |f| {
402-
// const e = @field(expected, f.name);
403-
// if (actual.object.get(f.name)) |a| {
404-
// if (compareAnyToJsonValue(e, a) == false) {
405-
// return false;
406-
// }
407-
// } else if (@typeInfo(f.type) != .Optional or e != null) {
408-
// // We don't JSON serialize nulls. So if we're expecting
409-
// // a null, that should show up as a missing field.
410-
// return false;
411-
// }
412-
// }
413-
// return true;
414-
// },
415-
// else => {},
416-
// }
417-
// @compileError("Can't compare " ++ @typeName(@TypeOf(expected)));
418-
// }

0 commit comments

Comments
 (0)