From a1dc55be6e695a1c04e5e9e0f1ce7406a5dd3dff Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Thu, 15 Oct 2026 11:25:14 +0200 Subject: add function struct to register js functions dynamically --- src/zilch/Env/Function.zig | 13 +++++ src/zilch/Env/call.zig | 13 +---- src/zilch/Env/future.zig | 2 +- src/zilch/Env/js.zig | 2 +- src/zilch/Env/root.zig | 129 ++++++--------------------------------------- 5 files changed, 33 insertions(+), 126 deletions(-) create mode 100644 src/zilch/Env/Function.zig (limited to 'src/zilch/Env') diff --git a/src/zilch/Env/Function.zig b/src/zilch/Env/Function.zig new file mode 100644 index 0000000..692ce2b --- /dev/null +++ b/src/zilch/Env/Function.zig @@ -0,0 +1,13 @@ +const std = @import("std"); + +const Self = @This(); + +content: []const u8, +id: u32, + +pub fn from(content: []const u8) Self { + return .{ + .content = content, + .id = std.hash.XxHash32.hash(4654, content), + }; +} diff --git a/src/zilch/Env/call.zig b/src/zilch/Env/call.zig index a5db835..1681165 100644 --- a/src/zilch/Env/call.zig +++ b/src/zilch/Env/call.zig @@ -1,16 +1,5 @@ pub const Call = extern struct { - kind: Kind, + kind: u32, num_args: u8, - - const Kind = enum(u8) { - free = 0, - get_prop = 1, - set_prop = 2, - del_prop = 3, - call_method = 4, - call = 5, - new = 6, - }; }; - diff --git a/src/zilch/Env/future.zig b/src/zilch/Env/future.zig index a014990..6e0cc63 100644 --- a/src/zilch/Env/future.zig +++ b/src/zilch/Env/future.zig @@ -44,7 +44,7 @@ pub const AnyFuture = union(enum) { switch (self.*) { .err => |err| return err, .result => |result| { - defer env.pool.destroy(result); + defer env.release(self.*); if (result.kind != .uninit) { return result.*; diff --git a/src/zilch/Env/js.zig b/src/zilch/Env/js.zig index c1ff85d..ed8592a 100644 --- a/src/zilch/Env/js.zig +++ b/src/zilch/Env/js.zig @@ -2,7 +2,7 @@ const std = @import("std"); const Env = @import("root.zig"); pub extern "object_store" fn process( - [*]const Env.Call, + [*]const u16, [*]const Env.Value, [*]*Env.Value, length: usize, diff --git a/src/zilch/Env/root.zig b/src/zilch/Env/root.zig index 6fd2bab..5ab3fbd 100644 --- a/src/zilch/Env/root.zig +++ b/src/zilch/Env/root.zig @@ -1,15 +1,13 @@ const std = @import("std"); -const Self = @This(); - const js = @import("js.zig"); -const future = @import("future.zig"); const Object = @import("../Object.zig"); pub const Call = @import("call.zig").Call; -pub const AnyFuture = future.AnyFuture; -pub const Future = future.Future; +pub const AnyFuture = @import("future.zig").AnyFuture; +pub const Future = @import("future.zig").Future; pub const Value = @import("value.zig").Value; +pub const Function = @import("Function.zig"); calls: std.ArrayList(Call) = .empty, values: std.ArrayList(Value) = .empty, @@ -17,124 +15,24 @@ pool: std.heap.MemoryPool(Value) = .empty, results: std.ArrayList(*Value) = .empty, gpa: std.mem.Allocator, -pub const default: Self = .{ .gpa = std.heap.wasm_allocator }; - -pub fn init(gpa: std.mem.Allocator) Self { - return .{ .gpa = gpa }; -} - -pub fn getProp(self: *Self, object: *Object, key: anytype) AnyFuture { - self.calls.append(self.gpa, .{ - .kind = .get_prop, - .num_args = 2, - }) catch |err| return .{ .err = err }; - self.values.append(self.gpa, .from(object)) catch |err| return .{ .err = err }; - self.values.append(self.gpa, .from(key)) catch |err| return .{ .err = err }; - - return self.registerFuture() catch |err| .{ .err = err }; -} - -pub fn setProp( - self: *Self, - object: *Object, - key: anytype, - value: anytype, -) Future(.undefined) { - self.calls.append(self.gpa, .{ - .kind = .set_prop, - .num_args = 3, - }) catch |err| return .fromAny(.{ .err = err }); - - self.values.append(self.gpa, .from(object)) catch |err| return .fromAny(.{ .err = err }); - self.values.append(self.gpa, .from(key)) catch |err| return .fromAny(.{ .err = err }); - self.values.append(self.gpa, .from(value)) catch |err| return .fromAny(.{ .err = err }); - - return .fromAny(self.registerFuture() catch |err| .{ .err = err }); -} - -pub fn deleteProp( - self: *Self, - object: *Object, - key: anytype, -) Future(.undefined) { - self.calls.append(self.gpa, .{ - .kind = .del_prop, - .num_args = 2, - }) catch |err| return .fromAny(.{ .err = err }); - - self.values.append(self.gpa, .from(object)) catch |err| return .fromAny(.{ .err = err }); - self.values.append(self.gpa, .from(key)) catch |err| return .fromAny(.{ .err = err }); - - return .fromAny(self.registerFuture() catch |err| .{ .err = err }); -} - -pub fn callMethod( - self: *Self, - object: *Object, - key: []const u8, - args: anytype, -) AnyFuture { - self.calls.append(self.gpa, .{ - .kind = .call_method, - .num_args = 2 + args.len, - }) catch |err| return .{ .err = err }; - - self.values.append(self.gpa, .from(object)) catch |err| return .{ .err = err }; - self.values.append(self.gpa, .from(key)) catch |err| return .{ .err = err }; - - inline for (args) |arg| { - self.values.append(self.gpa, .from(arg)) catch |err| return .{ .err = err }; - } +const Self = @This(); - return self.registerFuture() catch |err| return .{ .err = err }; -} +pub const default: Self = .{ .gpa = std.heap.wasm_allocator }; -pub fn call(self: *Self, object: *Object, args: anytype) AnyFuture { +pub fn call(self: *Self, function: Function, args: anytype) AnyFuture { self.calls.append(self.gpa, .{ - .kind = .call, - .num_args = 1 + args.len, + .kind = function.id, + .num_args = args.len, }) catch |err| return .{ .err = err }; - self.values.append(self.gpa, .from(object)) catch |err| return .{ .err = err }; - inline for (args) |arg| { self.values.append(self.gpa, .from(arg)) catch |err| return .{ .err = err }; } - return self.registerFuture() catch |err| return .{ .err = err }; -} - -pub fn free(self: *Self, object: *Object) Future(.undefined) { - self.calls.append(self.gpa, .{ - .kind = .free, - .num_args = 1, - }) catch |err| return .fromAny(.{ .err = err }); - - self.values.append(self.gpa, .from(object)) catch |err| return .fromAny(.{ .err = err }); - - return .fromAny(self.registerFuture() catch |err| .{ .err = err }); -} - -pub fn new(self: *Self, object: *Object, args: anytype) Future(.object) { - self.calls.append(self.gpa, .{ - .kind = .new, - .num_args = 1 + args.len, - }) catch |err| return .fromAny(.{ .err = err }); - - self.values.append(self.gpa, .from(object)) catch |err| return .fromAny(.{ .err = err }); - - inline for (args) |arg| { - self.values.append(self.gpa, .from(arg)) catch |err| return .fromAny(.{ .err = err }); - } - - return .fromAny(self.registerFuture() catch |err| .{ .err = err }); -} - -fn registerFuture(self: *Self) !AnyFuture { - const result = try self.pool.create(self.gpa); + const result = self.pool.create(self.gpa) catch |err| return .{ .err = err }; errdefer self.pool.destroy(result); result.kind = .uninit; - try self.results.append(self.gpa, result); + self.results.append(self.gpa, result) catch |err| return .{ .err = err }; return .{ .result = result }; } @@ -150,6 +48,13 @@ pub fn flush(self: *Self) void { self.results.clearRetainingCapacity(); } +pub fn release(self: *Self, future: AnyFuture) void { + switch (future) { + .err => {}, + .result => |result| self.pool.destroy(result), + } +} + pub fn deinit(self: *Self) void { self.flush(); -- cgit v1.2.3-70-g09d2