mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-15 21:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

router almost works

Browse Source 
Former-commit-id: a8b9d27bd0946f9c48bd8e4b5b5c2031aa434f28
This commit is contained in:
Jarred Sumner
2021-08-05 23:47:36 -07:00
parent 49929405df
commit 6e4da63abe
12 changed files with 244 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/javascript/jsc/base.zig
View File

@@ -3,6 +3,7 @@ const std = @import("std");
pub usingnamespace @import("../../global.zig");
usingnamespace @import("./javascript.zig");
usingnamespace @import("./webcore/response.zig");
const Router = @import("./api/router.zig");
const TaggedPointerTypes = @import("../../tagged_pointer.zig");
const TaggedPointerUnion = TaggedPointerTypes.TaggedPointerUnion;
@@ -10,6 +11,11 @@ const TaggedPointerUnion = TaggedPointerTypes.TaggedPointerUnion;
pub const ExceptionValueRef = [*c]js.JSValueRef;
pub const JSValueRef = js.JSValueRef;
fn ObjectPtrType(comptime Type: type) type {
if (Type == void) return Type;
return *Type;
}
pub const To = struct {
pub const JS = struct {
pub inline fn str(ref: anytype, val: anytype) js.JSStringRef {
@@ -18,11 +24,11 @@ pub const To = struct {
pub fn functionWithCallback(
comptime ZigContextType: type,
zig: *ZigContextType,
zig: ObjectPtrType(ZigContextType),
name: js.JSStringRef,
ctx: js.JSContextRef,
comptime callback: fn (
obj: *ZigContextType,
obj: ObjectPtrType(ZigContextType),
ctx: js.JSContextRef,
function: js.JSObjectRef,
thisObject: js.JSObjectRef,
@@ -41,7 +47,7 @@ pub const To = struct {
pub fn Finalize(
comptime ZigContextType: type,
comptime ctxfn: fn (
this: *ZigContextType,
this: ObjectPtrType(ZigContextType),
) void,
) type {
return struct {
@@ -109,7 +115,7 @@ pub const To = struct {
pub fn Callback(
comptime ZigContextType: type,
comptime ctxfn: fn (
obj: *ZigContextType,
obj: ObjectPtrType(ZigContextType),
ctx: js.JSContextRef,
function: js.JSObjectRef,
thisObject: js.JSObjectRef,
@@ -137,6 +143,15 @@ pub const To = struct {
if (arguments) |args| args[0..argumentCount] else &[_]js.JSValueRef{},
exception,
);
} else if (comptime ZigContextType == void) {
return ctxfn(
void{},
ctx,
function,
thisObject,
if (arguments) |args| args[0..argumentCount] else &[_]js.JSValueRef{},
exception,
);
} else {
return ctxfn(
GetJSPrivateData(ZigContextType, function) orelse GetJSPrivateData(ZigContextType, thisObject) orelse return js.JSValueMakeUndefined(ctx),
@@ -168,32 +183,6 @@ pub const To = struct {
};
};
pub const RuntimeImports = struct {
pub fn resolve(ctx: js.JSContextRef, str: string) ?js.JSObjectRef {
switch (ModuleList.Map.get(str) orelse ModuleList.none) {
.Router => {
const Router = @import("./api/router.zig");
return js.JSObjectMake(ctx, Router.Class.get().*, null);
},
else => {
return null;
},
}
}
pub const ModuleList = enum(u8) {
Router = 0,
none = std.math.maxInt(u8),
pub const Map = std.ComptimeStringMap(
ModuleList,
.{
.{ "speedy.js/router", ModuleList.Router },
},
);
};
};
pub const Properties = struct {
pub const UTF8 = struct {
pub const module: string = "module";
@@ -751,6 +740,23 @@ pub fn NewClass(
}
};
pub fn throwInvalidConstructorError(ctx: js.JSContextRef, obj: js.JSObjectRef, c: usize, a: [*c]const js.JSValueRef, exception: js.ExceptionRef) callconv(.C) js.JSObjectRef {
JSError(getAllocator(ctx), "" ++ name ++ " is not a constructor", .{}, ctx, exception);
return null;
}
pub fn throwInvalidFunctionError(
ctx: js.JSContextRef,
function: js.JSObjectRef,
thisObject: js.JSObjectRef,
argumentCount: usize,
arguments: [*c]const js.JSValueRef,
exception: js.ExceptionRef,
) callconv(.C) js.JSValueRef {
JSError(getAllocator(ctx), "" ++ name ++ " is not a function", .{}, ctx, exception);
return null;
}
pub const Constructor = ConstructorWrapper.rfn;
pub const static_value_count = static_properties.len;
@@ -872,7 +878,7 @@ pub fn NewClass(
prop: js.JSStringRef,
exception: js.ExceptionRef,
) callconv(.C) js.JSValueRef {
var this = GetJSPrivateData(ZigType, obj) orelse return js.JSValueMakeUndefined(ctx);
var this: ObjectPtrType(ZigType) = if (comptime ZigType == void) void{} else GetJSPrivateData(ZigType, obj) orelse return js.JSValueMakeUndefined(ctx);
var exc: js.JSValueRef = null;
const Field = @TypeOf(@field(
@@ -902,7 +908,7 @@ pub fn NewClass(
const Func = @typeInfo(@TypeOf(func));
const WithPropFn = fn (
*ZigType,
ObjectPtrType(ZigType),
js.JSContextRef,
js.JSObjectRef,
js.JSStringRef,
@@ -910,7 +916,7 @@ pub fn NewClass(
) js.JSValueRef;
const WithoutPropFn = fn (
*ZigType,
ObjectPtrType(ZigType),
js.JSContextRef,
js.JSObjectRef,
js.ExceptionRef,
@@ -1292,7 +1298,7 @@ pub fn NewClass(
const ctxfn = CtxField.rfn;
const Func: std.builtin.TypeInfo.Fn = @typeInfo(@TypeOf(ctxfn)).Fn;
const PointerType = std.meta.Child(Func.args[0].arg_type.?);
const PointerType = if (Func.args[0].arg_type.? == void) void else std.meta.Child(Func.args[0].arg_type.?);
var callback = if (Func.calling_convention == .C) ctxfn else To.JS.Callback(
PointerType,
@@ -1361,6 +1367,14 @@ pub fn NewClass(
def.className = class_name_str;
// def.getProperty = getPropertyCallback;
if (def.callAsConstructor == null) {
def.callAsConstructor = throwInvalidConstructorError;
}
if (def.callAsFunction == null) {
def.callAsFunction = throwInvalidFunctionError;
}
if (!singleton)
def.hasInstance = customHasInstance;
return def;
@@ -1422,6 +1436,7 @@ pub const JSPrivateDataPtr = TaggedPointerUnion(.{
FetchEvent,
Headers,
Body,
Router,
});
pub inline fn GetJSPrivateData(comptime Type: type, ref: js.JSObjectRef) ?*Type {