yuzucchii/jetzig
1
0
Fork 0
mirror of https://github.com/jetzig-framework/jetzig.git synced 2025-05-14 14:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Latest Zig master compatibility

Browse Source
This commit is contained in:
Bob Farrell 2024-08-30 18:43:12 +01:00
parent 3c7ca4eacd
commit 15b0fa1af9
6 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build.zig.zon
View File

@ -3,28 +3,28 @@
.version = "0.0.0", .version = "0.0.0",
.dependencies = .{ .dependencies = .{
.zmd = .{ .zmd = .{
.url = "https://github.com/jetzig-framework/zmd/archive/a197906b017d2a2d6c1896d77c04a74b13ddfa7f.tar.gz", .url = "https://github.com/jetzig-framework/zmd/archive/6dda080c7fcbe78c39d9e4f52b8eec9aa7cbbaad.tar.gz",
.hash = "12203b56c2e17a2fd62ea3d3d9be466f43921a3aef88b381cf58f41251815205fdb5", .hash = "12208a01a7c10d0583f253787cf7271587d9509862f34e2b6d754cade7bc08500ef6",
}, },
.zmpl = .{ .zmpl = .{
.url = "https://github.com/jetzig-framework/zmpl/archive/7c2e599807fe8d28ce45b8b3be1829e3d704422e.tar.gz", .url = "https://github.com/jetzig-framework/zmpl/archive/8d7376704319682e89fb032c36c17e7dd6c51533.tar.gz",
.hash = "12207c30c6fbcb8c7519719fc47ff9d0acca72a3557ec671984d16260bdf1c832740", .hash = "12201a0c32e8fa8d3c8482d7486c59656187aead94f7846ad1a6c48b378570d12d1a",
}, },
.jetkv = .{ .jetkv = .{
.url = "https://github.com/jetzig-framework/jetkv/archive/cf1c611a9c406ccadb50b1bf7798e2b88c43fd2b.tar.gz", .url = "https://github.com/jetzig-framework/jetkv/archive/2b1130a48979ea2871c8cf6ca89c38b1e7062839.tar.gz",
.hash = "1220434169bfbfbb3a0bbe7073f9bcff5401979a967d25ba3915046f6ea44e40839d", .hash = "12201d75d73aad5e1c996de4d5ae87a00e58479c8d469bc2eeb5fdeeac8857bc09af",
}, },
.args = .{ .args = .{
.url = "https://github.com/ikskuh/zig-args/archive/03af1b6c5bfda9646a562c861055024daed5b238.tar.gz", .url = "https://github.com/ikskuh/zig-args/archive/0abdd6947a70e6d8cc83b66228cea614aa856206.tar.gz",
.hash = "1220904d2fdcd970dd0d216211d092eb3ef6da01117163cc9393ab845a1d66c029d9", .hash = "1220411a8c46d95bbf3b6e2059854bcb3c5159d428814099df5294232b9980517e9c",
}, },
.smtp_client = .{ .smtp_client = .{
.url = "https://github.com/karlseguin/smtp_client.zig/archive/8fcfad9ca2d9e446612c79f4e54050cfbe81b38d.tar.gz", .url = "https://github.com/karlseguin/smtp_client.zig/archive/8fcfad9ca2d9e446612c79f4e54050cfbe81b38d.tar.gz",
.hash = "1220cebfcf6c63295819df92ec54abe62aad91b1d16666781194c29a7874bb7bbbda", .hash = "1220cebfcf6c63295819df92ec54abe62aad91b1d16666781194c29a7874bb7bbbda",
}, },
.httpz = .{ .httpz = .{
.url = "https://github.com/karlseguin/http.zig/archive/e1df408cd530d058a7e1652bd8dcfa7191ff776e.tar.gz", .url = "https://github.com/karlseguin/http.zig/archive/30195d6e668d1cb97630bab282d4ac7f147af607.tar.gz",
.hash = "1220efbc744de6e13e57ab9fa6370ea9690601e55ba6ced74179c081a295c99fd422", .hash = "12204f7c5a6b8a6988ab7cbccaf3c1c6199fbf423741412a607be8bde835fb4b8cc8",
}, },
}, },

4
cli/build.zig.zon
View File

@ -5,8 +5,8 @@
.dependencies = .{ .dependencies = .{
.args = .{ .args = .{
.url = "https://github.com/ikskuh/zig-args/archive/03af1b6c5bfda9646a562c861055024daed5b238.tar.gz", .url = "https://github.com/ikskuh/zig-args/archive/0abdd6947a70e6d8cc83b66228cea614aa856206.tar.gz",
.hash = "1220904d2fdcd970dd0d216211d092eb3ef6da01117163cc9393ab845a1d66c029d9", .hash = "1220411a8c46d95bbf3b6e2059854bcb3c5159d428814099df5294232b9980517e9c",
}, },
}, },
.paths = .{ .paths = .{

2
src/Routes.zig
View File

@ -598,7 +598,7 @@ fn asNodeIndex(index: usize) std.zig.Ast.Node.Index {
} }
fn isActionFunctionName(name: []const u8) bool { fn isActionFunctionName(name: []const u8) bool {
inline for (@typeInfo(jetzig.views.Route.Action).Enum.fields) |field| { inline for (@typeInfo(jetzig.views.Route.Action).@"enum".fields) |field| {
if (std.mem.eql(u8, field.name, name)) return true; if (std.mem.eql(u8, field.name, name)) return true;
} }

30
src/jetzig/testing.zig
View File

@ -40,7 +40,7 @@ pub const Logger = struct {
pub fn log( pub fn log(
self: *Logger, self: *Logger,
comptime message_level: std.log.Level, comptime message_level: std.log.Level,
comptime scope: @Type(.EnumLiteral), comptime scope: @Type(.enum_literal),
comptime format: []const u8, comptime format: []const u8,
args: anytype, args: anytype,
) void { ) void {
@ -154,10 +154,10 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
if (try data.getValue(std.mem.trimLeft(u8, expected_path, &.{'.'}))) |value| { if (try data.getValue(std.mem.trimLeft(u8, expected_path, &.{'.'}))) |value| {
switch (value.*) { switch (value.*) {
.string => |string| switch (@typeInfo(@TypeOf(expected_value))) { .string => |string| switch (@typeInfo(@TypeOf(expected_value))) {
.Pointer, .Array => { .pointer, .array => {
if (std.mem.eql(u8, string.value, expected_value)) return; if (std.mem.eql(u8, string.value, expected_value)) return;
}, },
.Null => { .null => {
logFailure( logFailure(
"Expected null/non-existent value for " ++ jetzig.colors.cyan("{s}") ++ ", found: " ++ jetzig.colors.cyan("{s}"), "Expected null/non-existent value for " ++ jetzig.colors.cyan("{s}") ++ ", found: " ++ jetzig.colors.cyan("{s}"),
.{ expected_path, string.value }, .{ expected_path, string.value },
@ -167,10 +167,10 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
else => unreachable, else => unreachable,
}, },
.integer => |integer| switch (@typeInfo(@TypeOf(expected_value))) { .integer => |integer| switch (@typeInfo(@TypeOf(expected_value))) {
.Int, .ComptimeInt => { .int, .comptime_int => {
if (integer.value == expected_value) return; if (integer.value == expected_value) return;
}, },
.Null => { .null => {
logFailure( logFailure(
"Expected null/non-existent value for " ++ jetzig.colors.cyan("{s}") ++ ", found: " ++ jetzig.colors.green("{}"), "Expected null/non-existent value for " ++ jetzig.colors.cyan("{s}") ++ ", found: " ++ jetzig.colors.green("{}"),
.{ expected_path, integer.value }, .{ expected_path, integer.value },
@ -180,10 +180,10 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
else => {}, else => {},
}, },
.float => |float| switch (@typeInfo(@TypeOf(expected_value))) { .float => |float| switch (@typeInfo(@TypeOf(expected_value))) {
.Float, .ComptimeFloat => { .float, .comptime_float => {
if (float.value == expected_value) return; if (float.value == expected_value) return;
}, },
.Null => { .null => {
logFailure( logFailure(
"Expected null/non-existent value for " ++ jetzig.colors.cyan("{s}") ++ ", found: " ++ jetzig.colors.green("{}"), "Expected null/non-existent value for " ++ jetzig.colors.cyan("{s}") ++ ", found: " ++ jetzig.colors.green("{}"),
.{ expected_path, float.value }, .{ expected_path, float.value },
@ -193,10 +193,10 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
else => {}, else => {},
}, },
.boolean => |boolean| switch (@typeInfo(@TypeOf(expected_value))) { .boolean => |boolean| switch (@typeInfo(@TypeOf(expected_value))) {
.Bool => { .bool => {
if (boolean.value == expected_value) return; if (boolean.value == expected_value) return;
}, },
.Null => { .null => {
logFailure( logFailure(
"Expected null/non-existent value for " ++ jetzig.colors.cyan("{s}") ++ ", found: " ++ jetzig.colors.green("{}"), "Expected null/non-existent value for " ++ jetzig.colors.cyan("{s}") ++ ", found: " ++ jetzig.colors.green("{}"),
.{ expected_path, boolean.value }, .{ expected_path, boolean.value },
@ -206,10 +206,10 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
else => {}, else => {},
}, },
.Null => switch (@typeInfo(@TypeOf(expected_value))) { .Null => switch (@typeInfo(@TypeOf(expected_value))) {
.Optional => { .optional => {
if (expected_value == null) return; if (expected_value == null) return;
}, },
.Null => { .null => {
return; return;
}, },
else => {}, else => {},
@ -220,7 +220,7 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
switch (value.*) { switch (value.*) {
.string => |string| { .string => |string| {
switch (@typeInfo(@TypeOf(expected_value))) { switch (@typeInfo(@TypeOf(expected_value))) {
.Pointer, .Array => { .pointer, .array => {
logFailure( logFailure(
"Expected \"" ++ jetzig.colors.red("{s}") ++ "\" in " ++ jetzig.colors.cyan("{s}") ++ ", found \"" ++ jetzig.colors.green("{s}") ++ "\"\nJSON:" ++ json_banner, "Expected \"" ++ jetzig.colors.red("{s}") ++ "\" in " ++ jetzig.colors.cyan("{s}") ++ ", found \"" ++ jetzig.colors.green("{s}") ++ "\"\nJSON:" ++ json_banner,
.{ expected_value, expected_path, string.value, try jsonPretty(response) }, .{ expected_value, expected_path, string.value, try jsonPretty(response) },
@ -232,7 +232,7 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
.integer, .integer,
=> |integer| { => |integer| {
switch (@typeInfo(@TypeOf(expected_value))) { switch (@typeInfo(@TypeOf(expected_value))) {
.Int, .ComptimeInt => { .int, .comptime_int => {
logFailure( logFailure(
"Expected " ++ jetzig.colors.red("{}") ++ " in " ++ jetzig.colors.cyan("{s}") ++ ", found " ++ jetzig.colors.green("{}") ++ "\nJSON:" ++ json_banner, "Expected " ++ jetzig.colors.red("{}") ++ " in " ++ jetzig.colors.cyan("{s}") ++ ", found " ++ jetzig.colors.green("{}") ++ "\nJSON:" ++ json_banner,
@ -244,7 +244,7 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
}, },
.float => |float| { .float => |float| {
switch (@typeInfo(@TypeOf(expected_value))) { switch (@typeInfo(@TypeOf(expected_value))) {
.Float, .ComptimeFloat => { .float, .comptime_float => {
logFailure( logFailure(
"Expected " ++ jetzig.colors.red("{}") ++ " in " ++ jetzig.colors.cyan("{s}") ++ ", found " ++ jetzig.colors.green("{}") ++ "\nJSON:" ++ json_banner, "Expected " ++ jetzig.colors.red("{}") ++ " in " ++ jetzig.colors.cyan("{s}") ++ ", found " ++ jetzig.colors.green("{}") ++ "\nJSON:" ++ json_banner,
.{ expected_value, expected_path, float.value, try jsonPretty(response) }, .{ expected_value, expected_path, float.value, try jsonPretty(response) },
@ -255,7 +255,7 @@ pub fn expectJson(expected_path: []const u8, expected_value: anytype, response:
}, },
.boolean => |boolean| { .boolean => |boolean| {
switch (@typeInfo(@TypeOf(expected_value))) { switch (@typeInfo(@TypeOf(expected_value))) {
.Bool => { .bool => {
logFailure( logFailure(
"Expected " ++ jetzig.colors.red("{}") ++ " in " ++ jetzig.colors.cyan("{s}") ++ ", found " ++ jetzig.colors.green("{}") ++ "\nJSON:" ++ json_banner, "Expected " ++ jetzig.colors.red("{}") ++ " in " ++ jetzig.colors.cyan("{s}") ++ ", found " ++ jetzig.colors.green("{}") ++ "\nJSON:" ++ json_banner,
.{ expected_value, expected_path, boolean.value, try jsonPretty(response) }, .{ expected_value, expected_path, boolean.value, try jsonPretty(response) },

8
src/jetzig/testing/App.zig
View File

@ -145,7 +145,7 @@ pub fn request(
pub fn params(self: App, args: anytype) []Param { pub fn params(self: App, args: anytype) []Param {
const allocator = self.arena.allocator(); const allocator = self.arena.allocator();
var array = std.ArrayList(Param).init(allocator); var array = std.ArrayList(Param).init(allocator);
inline for (@typeInfo(@TypeOf(args)).Struct.fields) |field| { inline for (@typeInfo(@TypeOf(args)).@"struct".fields) |field| {
array.append(.{ .key = field.name, .value = @field(args, field.name) }) catch @panic("OOM"); array.append(.{ .key = field.name, .value = @field(args, field.name) }) catch @panic("OOM");
} }
return array.toOwnedSlice() catch @panic("OOM"); return array.toOwnedSlice() catch @panic("OOM");
@ -166,7 +166,7 @@ pub fn multipart(self: *App, comptime args: anytype) []const u8 {
const boundary = jetzig.util.generateRandomString(&boundary_buf); const boundary = jetzig.util.generateRandomString(&boundary_buf);
self.multipart_boundary = boundary; self.multipart_boundary = boundary;
inline for (@typeInfo(@TypeOf(args)).Struct.fields, 0..) |field, index| { inline for (@typeInfo(@TypeOf(args)).@"struct".fields, 0..) |field, index| {
if (index > 0) tryWrite(writer, "\r\n"); if (index > 0) tryWrite(writer, "\r\n");
tryWrite(writer, "--"); tryWrite(writer, "--");
tryWrite(writer, boundary); tryWrite(writer, boundary);
@ -238,6 +238,8 @@ fn stubbedRequest(
.path = path, .path = path,
.query = query, .query = query,
}, },
.route_data = null,
.middlewares = undefined,
.address = undefined, .address = undefined,
.method = std.enums.nameCast(httpz.Method, @tagName(method)), .method = std.enums.nameCast(httpz.Method, @tagName(method)),
.protocol = .HTTP11, .protocol = .HTTP11,
@ -289,7 +291,7 @@ fn createStore(allocator: std.mem.Allocator) !*jetzig.kv.Store {
fn buildOptions(app: *const App, args: anytype) RequestOptions { fn buildOptions(app: *const App, args: anytype) RequestOptions {
const fields = switch (@typeInfo(@TypeOf(args))) { const fields = switch (@typeInfo(@TypeOf(args))) {
.Struct => |info| info.fields, .@"struct" => |info| info.fields,
else => @compileError("Expected struct, found `" ++ @tagName(@typeInfo(@TypeOf(args))) ++ "`"), else => @compileError("Expected struct, found `" ++ @tagName(@typeInfo(@TypeOf(args))) ++ "`"),
}; };

2
src/test_runner.zig
View File

@ -9,7 +9,7 @@ pub const std_options = .{
pub fn log( pub fn log(
comptime message_level: std.log.Level, comptime message_level: std.log.Level,
comptime scope: @Type(.EnumLiteral), comptime scope: @Type(.enum_literal),
comptime format: []const u8, comptime format: []const u8,
args: anytype, args: anytype,
) void { ) void {