upgrade to zig 0.12.1

krichprollsch · krichprollsch · commit ef364f83c843 · 2024-06-18T16:13:27.000+02:00
diff --git a/src/async/Client.zig b/src/async/Client.zig
diff --git a/src/async/test.zig b/src/async/test.zig
@@ -68,7 +68,7 @@ test "blocking mode open/send/wait API" {
     });
     defer req.deinit();
 
-    try req.send(.{});
+    try req.send();
     try req.finish();
     try req.wait();
 
@@ -120,7 +120,7 @@ const AsyncClient = struct {
                 },
                 .open => {
                     self.state = .send;
-                    self.req.?.send(.{}) catch |e| return self.onerr(e);
+                    self.req.?.send() catch |e| return self.onerr(e);
                 },
                 .send => {
                     self.state = .finish;
diff --git a/src/browser/browser.zig b/src/browser/browser.zig
@@ -224,7 +224,7 @@ pub const Page = struct {
         // own the url
         if (self.rawuri) |prev| alloc.free(prev);
         self.rawuri = try alloc.dupe(u8, uri);
-        self.uri = std.Uri.parse(self.rawuri.?) catch try std.Uri.parseWithoutScheme(self.rawuri.?);
+        self.uri = std.Uri.parse(self.rawuri.?) catch try std.Uri.parseAfterScheme("", self.rawuri.?);
 
         // prepare origin value.
         var buf = std.ArrayList(u8).init(alloc);
@@ -511,7 +511,8 @@ pub const Page = struct {
         log.debug("starting fetch script {s}", .{src});
 
         var buffer: [1024]u8 = undefined;
-        const u = try std.Uri.resolve_inplace(self.uri, src, &buffer);
+        var b: []u8 = buffer[0..];
+        const u = try std.Uri.resolve_inplace(self.uri, src, &b);
 
         var fetchres = try self.session.loader.get(alloc, u);
         defer fetchres.deinit();
@@ -529,7 +530,7 @@ pub const Page = struct {
         // check no body
         if (body.len == 0) return FetchError.NoBody;
 
-        var res = try self.session.env.execTryCatch(alloc, fetchres.body.?, src);
+        var res = try self.session.env.execTryCatch(alloc, body, src);
         defer res.deinit(alloc);
 
         if (res.success) {
diff --git a/src/browser/loader.zig b/src/browser/loader.zig
@@ -69,7 +69,7 @@ pub const Loader = struct {
         });
         errdefer resp.req.deinit();
 
-        try resp.req.send(.{});
+        try resp.req.send();
         try resp.req.finish();
         try resp.req.wait();
 
diff --git a/src/html/elements.zig b/src/html/elements.zig
@@ -246,10 +246,10 @@ pub const HTMLAnchorElement = struct {
         defer u.deinit(alloc);
 
         if (p) |pp| {
-            u.uri.host = h;
+            u.uri.host = .{ .raw = h };
             u.uri.port = pp;
         } else {
-            u.uri.host = v;
+            u.uri.host = .{ .raw = v };
             u.uri.port = null;
         }
 
@@ -271,7 +271,7 @@ pub const HTMLAnchorElement = struct {
         var u = try url(self, alloc);
         defer u.deinit(alloc);
 
-        u.uri.host = v;
+        u.uri.host = .{ .raw = v };
         const href = try u.format(alloc);
         try parser.anchorSetHref(self, href);
     }
@@ -312,7 +312,11 @@ pub const HTMLAnchorElement = struct {
         var u = try url(self, alloc);
         defer u.deinit(alloc);
 
-        u.uri.user = v;
+        if (v) |vv| {
+            u.uri.user = .{ .raw = vv };
+        } else {
+            u.uri.user = null;
+        }
         const href = try u.format(alloc);
         defer alloc.free(href);
 
@@ -331,7 +335,11 @@ pub const HTMLAnchorElement = struct {
         var u = try url(self, alloc);
         defer u.deinit(alloc);
 
-        u.uri.password = v;
+        if (v) |vv| {
+            u.uri.password = .{ .raw = vv };
+        } else {
+            u.uri.password = null;
+        }
         const href = try u.format(alloc);
         defer alloc.free(href);
 
@@ -350,7 +358,7 @@ pub const HTMLAnchorElement = struct {
         var u = try url(self, alloc);
         defer u.deinit(alloc);
 
-        u.uri.path = v;
+        u.uri.path = .{ .raw = v };
         const href = try u.format(alloc);
         defer alloc.free(href);
 
@@ -369,7 +377,11 @@ pub const HTMLAnchorElement = struct {
         var u = try url(self, alloc);
         defer u.deinit(alloc);
 
-        u.uri.query = v;
+        if (v) |vv| {
+            u.uri.query = .{ .raw = vv };
+        } else {
+            u.uri.query = null;
+        }
         const href = try u.format(alloc);
         defer alloc.free(href);
 
@@ -388,7 +400,11 @@ pub const HTMLAnchorElement = struct {
         var u = try url(self, alloc);
         defer u.deinit(alloc);
 
-        u.uri.fragment = v;
+        if (v) |vv| {
+            u.uri.fragment = .{ .raw = vv };
+        } else {
+            u.uri.fragment = null;
+        }
         const href = try u.format(alloc);
         defer alloc.free(href);
 
diff --git a/src/run_tests.zig b/src/run_tests.zig
@@ -182,7 +182,7 @@ pub fn main() !void {
     while (args.next()) |arg| {
         if (std.mem.eql(u8, "-h", arg) or std.mem.eql(u8, "--help", arg)) {
             try std.io.getStdErr().writer().print(usage, .{});
-            std.os.exit(0);
+            std.posix.exit(0);
         }
         if (std.mem.eql(u8, "--json", arg)) {
             out = .json;
diff --git a/src/url/url.zig b/src/url/url.zig
@@ -62,7 +62,10 @@ pub const URL = struct {
         return .{
             .rawuri = raw,
             .uri = uri,
-            .search_params = try URLSearchParams.constructor(alloc, uri.query),
+            .search_params = try URLSearchParams.constructor(
+                alloc,
+                uriComponentNullStr(uri.query),
+            ),
         };
     }
 
@@ -102,7 +105,7 @@ pub const URL = struct {
         var q = std.ArrayList(u8).init(alloc);
         defer q.deinit();
         try self.search_params.values.encode(q.writer());
-        self.uri.query = q.items;
+        self.uri.query = .{ .raw = q.items };
 
         return try self.format(alloc);
     }
@@ -116,9 +119,9 @@ pub const URL = struct {
             .scheme = true,
             .authentication = true,
             .authority = true,
-            .path = self.uri.path.len > 0,
-            .query = self.uri.query != null and self.uri.query.?.len > 0,
-            .fragment = self.uri.fragment != null and self.uri.fragment.?.len > 0,
+            .path = uriComponentNullStr(self.uri.path).len > 0,
+            .query = uriComponentNullStr(self.uri.query).len > 0,
+            .fragment = uriComponentNullStr(self.uri.fragment).len > 0,
         }, buf.writer());
         return try buf.toOwnedSlice();
     }
@@ -131,11 +134,11 @@ pub const URL = struct {
     }
 
     pub fn get_username(self: *URL) []const u8 {
-        return self.uri.user orelse "";
+        return uriComponentNullStr(self.uri.user);
     }
 
     pub fn get_password(self: *URL) []const u8 {
-        return self.uri.password orelse "";
+        return uriComponentNullStr(self.uri.password);
     }
 
     // the caller must free the returned string.
@@ -157,7 +160,7 @@ pub const URL = struct {
     }
 
     pub fn get_hostname(self: *URL) []const u8 {
-        return self.uri.host orelse "";
+        return uriComponentNullStr(self.uri.host);
     }
 
     // the caller must free the returned string.
@@ -174,8 +177,8 @@ pub const URL = struct {
     }
 
     pub fn get_pathname(self: *URL) []const u8 {
-        if (self.uri.path.len == 0) return "/";
-        return self.uri.path;
+        if (uriComponentStr(self.uri.path).len == 0) return "/";
+        return uriComponentStr(self.uri.path);
     }
 
     // the caller must free the returned string.
@@ -198,7 +201,7 @@ pub const URL = struct {
     pub fn get_hash(self: *URL, alloc: std.mem.Allocator) ![]const u8 {
         if (self.uri.fragment == null) return try alloc.dupe(u8, "");
 
-        return try std.mem.concat(alloc, u8, &[_][]const u8{ "#", self.uri.fragment.? });
+        return try std.mem.concat(alloc, u8, &[_][]const u8{ "#", uriComponentNullStr(self.uri.fragment) });
     }
 
     pub fn get_searchParams(self: *URL) *URLSearchParams {
@@ -210,6 +213,21 @@ pub const URL = struct {
     }
 };
 
+// uriComponentNullStr converts an optional std.Uri.Component to string value.
+// The string value can be undecoded.
+fn uriComponentNullStr(c: ?std.Uri.Component) []const u8 {
+    if (c == null) return "";
+
+    return uriComponentStr(c.?);
+}
+
+fn uriComponentStr(c: std.Uri.Component) []const u8 {
+    return switch (c) {
+        .raw => |v| v,
+        .percent_encoded => |v| v,
+    };
+}
+
 // https://url.spec.whatwg.org/#interface-urlsearchparams
 // TODO array like
 pub const URLSearchParams = struct {
diff --git a/src/xhr/xhr.zig b/src/xhr/xhr.zig
@@ -97,7 +97,7 @@ pub const XMLHttpRequestBodyInit = union(XMLHttpRequestBodyInitTag) {
 pub const XMLHttpRequest = struct {
     proto: XMLHttpRequestEventTarget = XMLHttpRequestEventTarget{},
     alloc: std.mem.Allocator,
-    cli: Client,
+    cli: *Client,
     impl: YieldImpl,
 
     priv_state: PrivState = .new,
@@ -509,7 +509,7 @@ pub const XMLHttpRequest = struct {
                 if (self.payload) |v| self.req.?.transfer_encoding = .{ .content_length = v.len };
 
                 self.priv_state = .send;
-                self.req.?.send(.{}) catch |e| return self.onErr(e);
+                self.req.?.send() catch |e| return self.onErr(e);
             },
             .send => {
                 if (self.payload) |payload| {

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ pub fn main() !void {`
`182`	`182`	`while (args.next()) \|arg\| {`
`183`	`183`	`if (std.mem.eql(u8, "-h", arg) or std.mem.eql(u8, "--help", arg)) {`
`184`	`184`	`try std.io.getStdErr().writer().print(usage, .{});`
`185`		`- std.os.exit(0);`
	`185`	`+ std.posix.exit(0);`
`186`	`186`	`}`
`187`	`187`	`if (std.mem.eql(u8, "--json", arg)) {`
`188`	`188`	`out = .json;`