From 12a02f161504b49a54243bed996df6b44e25b7b4 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Tue, 6 Oct 2026 15:08:13 +0200 Subject: refactor wasm --- src/app/root.zig | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'src/app/root.zig') diff --git a/src/app/root.zig b/src/app/root.zig index dcba16f..6de9216 100644 --- a/src/app/root.zig +++ b/src/app/root.zig @@ -2,36 +2,40 @@ const builtin = @import("builtin"); const std = @import("std"); const z = @import("z"); -pub const panic = z.env.panic; +pub const panic = z.panic; pub const std_options: std.Options = .{ - .logFn = z.env.logFn, + .logFn = z.log.default, }; -pub const app: z.App(.{ .name = "Memora" }, .{ - .window = *z.Env.Object, - .Object = *z.Env.Object, +pub const app: z.App(.{ + .name = "Memora", + .globals = &.{ + z.Object.global(.window), + z.Object.global(.Object), + }, }) = .init; -const js = struct { - const window = app.globals.window; - const Object = app.globals.Object; -}; - fn run_wrapped() !void { var env: z.Env = .init(std.heap.wasm_allocator); defer env.deinit(); - _ = js.window.set(&env, "my_prop", 45); - _ = js.window.delete(&env, "my_prop"); + // Set and delete properties + _ = app.globals.window.set(&env, "my_prop", 45); + _ = app.globals.window.delete(&env, "my_prop"); + // Get properties const console = try app.globals.window.get(&env, "console").await(&env, .object); const location = try app.globals.window.get(&env, "location").await(&env, .object); + // Create new object const obj = app.globals.Object.new(&env); + + // Get string, needs to be freed. const hostname = try location.get(&env, "hostname").await(&env, .string); defer std.heap.wasm_allocator.free(hostname); - const call = console.call( + // Call method of an object + try console.call( &env, .log, .{ @@ -39,21 +43,15 @@ fn run_wrapped() !void { try obj.await(&env), hostname, }, - ); - - try call.await(&env, .undefined); + ).await(&env, .undefined); + // Unlink Object from global store. _ = env.free(console); } fn run() callconv(.c) void { run_wrapped() catch |e| { - var buffer: [1024]u8 = undefined; - var writer: std.Io.Writer = .fixed(&buffer); - - writer.print("{}", .{e}) catch unreachable; - - z.env.console.log(writer.buffered()); + std.log.err("{}", .{e}); }; } -- cgit v1.2.3-70-g09d2