allow zig js host functions to return JSError (#15120)

oven-sh · Nov 21, 2024 · 140131e · 140131e
1 parent 9ba4b0f
commit 140131e
Show file tree

Hide file tree

Showing 70 changed files with 827 additions and 876 deletions.
diff --git a/src/bake/FrameworkRouter.zig b/src/bake/FrameworkRouter.zig
@@ -1019,7 +1019,7 @@ pub const JSFrameworkRouter = struct {
             InsertionContext.wrap(JSFrameworkRouter, jsfr),
         ) catch |err| {
             global.throwError(err, "while scanning route list");
-            return global.jsErrorFromCPP();
+            return error.JSError;
         };
 
         return jsfr;
@@ -1054,7 +1054,7 @@ pub const JSFrameworkRouter = struct {
         return .null;
     }
 
-    pub fn toJSON(jsfr: *JSFrameworkRouter, global: *JSGlobalObject, callframe: *JSC.CallFrame) !JSValue {
+    pub fn toJSON(jsfr: *JSFrameworkRouter, global: *JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSValue {
         _ = callframe;
 
         var sfb = std.heap.stackFallback(4096, bun.default_allocator);
@@ -1129,7 +1129,7 @@ pub const JSFrameworkRouter = struct {
         const parsed = style.parse(filepath.slice(), std.fs.path.extension(filepath.slice()), &log, alloc) catch |err| switch (err) {
             error.InvalidRoutePattern => {
                 global.throw("{s} ({d}:{d})", .{ log.msg.slice(), log.cursor_at, log.cursor_len });
-                return global.jsErrorFromCPP();
+                return error.JSError;
             },
             else => |e| return e,
         } orelse

diff --git a/src/bake/bake.zig b/src/bake/bake.zig
@@ -52,11 +52,11 @@ pub const UserOptions = struct {
             bun.getcwdAlloc(alloc) catch |err| switch (err) {
                 error.OutOfMemory => {
                     global.throwOutOfMemory();
-                    return global.jsErrorFromCPP();
+                    return error.JSError;
                 },
                 else => {
                     global.throwError(err, "while querying current working directory");
-                    return global.jsErrorFromCPP();
+                    return error.JSError;
                 },
             };
 
@@ -104,9 +104,10 @@ const BuildConfigSubset = struct {
 
 /// Temporary function to invoke dev server via JavaScript. Will be
 /// replaced with a user-facing API. Refs the event loop forever.
-pub fn jsWipDevServer(global: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) !JSValue {
+pub fn jsWipDevServer(global: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSValue {
     _ = global;
     _ = callframe;
+
     if (!bun.FeatureFlags.bake) return .undefined;
 
     bun.Output.errGeneric(
@@ -562,7 +563,7 @@ fn getOptionalString(
 
 export fn Bun__getTemporaryDevServer(global: *JSC.JSGlobalObject) JSValue {
     if (!bun.FeatureFlags.bake) return .undefined;
-    return JSC.JSFunction.create(global, "wipDevServer", bun.JSC.toJSHostFunction(jsWipDevServer), 0, .{});
+    return JSC.JSFunction.create(global, "wipDevServer", jsWipDevServer, 0, .{});
 }
 
 pub inline fn getHmrRuntime(side: Side) [:0]const u8 {

diff --git a/src/bake/production.zig b/src/bake/production.zig
@@ -132,8 +132,10 @@ pub fn buildWithVm(ctx: bun.CLI.Command.Context, cwd: []const u8, vm: *VirtualMa
     const config_entry_point_string = bun.String.createUTF8(config_entry_point.pathConst().?.text);
     defer config_entry_point_string.deref();
 
-    const config_promise = bun.JSC.JSModuleLoader.loadAndEvaluateModule(global, &config_entry_point_string) orelse
-        return global.jsErrorFromCPP();
+    const config_promise = bun.JSC.JSModuleLoader.loadAndEvaluateModule(global, &config_entry_point_string) orelse {
+        bun.assert(global.hasException());
+        return error.JSError;
+    };
 
     vm.waitForPromise(.{ .internal = config_promise });
     var options = switch (config_promise.unwrap(vm.jsc, .mark_handled)) {

diff --git a/src/bun.js/BuildMessage.zig b/src/bun.js/BuildMessage.zig
@@ -81,15 +81,15 @@ pub const BuildMessage = struct {
         this: *BuildMessage,
         globalThis: *JSC.JSGlobalObject,
         _: *JSC.CallFrame,
-    ) JSC.JSValue {
+    ) bun.JSError!JSC.JSValue {
         return this.toStringFn(globalThis);
     }
 
     pub fn toPrimitive(
         this: *BuildMessage,
         globalThis: *JSC.JSGlobalObject,
         callframe: *JSC.CallFrame,
-    ) JSC.JSValue {
+    ) bun.JSError!JSC.JSValue {
         const args_ = callframe.arguments(1);
         const args = args_.ptr[0..args_.len];
         if (args.len > 0) {
@@ -110,7 +110,7 @@ pub const BuildMessage = struct {
         this: *BuildMessage,
         globalThis: *JSC.JSGlobalObject,
         _: *JSC.CallFrame,
-    ) JSC.JSValue {
+    ) bun.JSError!JSC.JSValue {
         var object = JSC.JSValue.createEmptyObject(globalThis, 4);
         object.put(globalThis, ZigString.static("name"), bun.String.static("BuildMessage").toJS(globalThis));
         object.put(globalThis, ZigString.static("position"), this.getPosition(globalThis));

diff --git a/src/bun.js/ResolveMessage.zig b/src/bun.js/ResolveMessage.zig
@@ -111,15 +111,15 @@ pub const ResolveMessage = struct {
         this: *ResolveMessage,
         globalThis: *JSC.JSGlobalObject,
         _: *JSC.CallFrame,
-    ) JSC.JSValue {
+    ) bun.JSError!JSC.JSValue {
         return this.toStringFn(globalThis);
     }
 
     pub fn toPrimitive(
         this: *ResolveMessage,
         globalThis: *JSC.JSGlobalObject,
         callframe: *JSC.CallFrame,
-    ) JSC.JSValue {
+    ) bun.JSError!JSC.JSValue {
         const args_ = callframe.arguments(1);
         const args = args_.ptr[0..args_.len];
         if (args.len > 0) {
@@ -140,7 +140,7 @@ pub const ResolveMessage = struct {
         this: *ResolveMessage,
         globalThis: *JSC.JSGlobalObject,
         _: *JSC.CallFrame,
-    ) JSC.JSValue {
+    ) bun.JSError!JSC.JSValue {
         var object = JSC.JSValue.createEmptyObject(globalThis, 7);
         object.put(globalThis, ZigString.static("name"), bun.String.static("ResolveMessage").toJS(globalThis));
         object.put(globalThis, ZigString.static("position"), this.getPosition(globalThis));