diff options
Diffstat (limited to 'src/javascript')
-rw-r--r-- | src/javascript/jsc/javascript.zig | 13 | ||||
-rw-r--r-- | src/javascript/jsc/webcore/response.zig | 21 |
2 files changed, 14 insertions, 20 deletions
diff --git a/src/javascript/jsc/javascript.zig b/src/javascript/jsc/javascript.zig index d233fddd5..a0efe4a54 100644 --- a/src/javascript/jsc/javascript.zig +++ b/src/javascript/jsc/javascript.zig @@ -721,11 +721,6 @@ pub const Performance = struct { }; const bun_file_import_path = "/node_modules.server.bun"; -pub const LazyClasses = [_]type{}; - -pub const Module = struct { - reload_pending: bool = false, -}; const FetchTasklet = Fetch.FetchTasklet; const TaggedPointerUnion = @import("../../tagged_pointer.zig").TaggedPointerUnion; @@ -738,14 +733,12 @@ pub const Task = TaggedPointerUnion(.{ // We can see that it's sort of like std.mem.Allocator but for JSGlobalContextRef, to support Automatic Reference Counting // Its unavailable on Linux pub const VirtualMachine = struct { - const RequireCacheType = std.AutoHashMap(u32, *Module); global: *JSGlobalObject, allocator: *std.mem.Allocator, node_modules: ?*NodeModuleBundle = null, bundler: Bundler, watcher: ?*http.Watcher = null, console: *ZigConsoleClient, - require_cache: RequireCacheType, log: *logger.Log, event_listeners: EventListenerMixin.Map, main: string = "", @@ -867,7 +860,6 @@ pub const VirtualMachine = struct { .global = undefined, .allocator = allocator, .entry_point = ServerEntryPoint{}, - .require_cache = RequireCacheType.init(allocator), .event_listeners = EventListenerMixin.Map.init(allocator), .bundler = bundler, .console = console, @@ -1871,10 +1863,6 @@ pub const VirtualMachine = struct { } }; -pub const Object = struct { - ref: js.jsObjectRef, -}; - const GetterFn = fn ( this: anytype, ctx: js.JSContextRef, @@ -2390,3 +2378,4 @@ pub const BuildError = struct { }; pub const JSPrivateDataTag = JSPrivateDataPtr.Tag; + diff --git a/src/javascript/jsc/webcore/response.zig b/src/javascript/jsc/webcore/response.zig index 065ab9884..565843423 100644 --- a/src/javascript/jsc/webcore/response.zig +++ b/src/javascript/jsc/webcore/response.zig @@ -1,7 +1,8 @@ usingnamespace @import("../base.zig"); const std = @import("std"); const Api = @import("../../../api/schema.zig").Api; -const http = @import("../../../http.zig"); +const RequestContext = @import("../../../http.zig").RequestContext; +const MimeType = @import("../../../http.zig").MimeType; usingnamespace @import("../javascript.zig"); usingnamespace @import("../bindings/bindings.zig"); const ZigURL = @import("../../../query_string_map.zig").URL; @@ -263,7 +264,7 @@ pub const Response = struct { this.allocator.destroy(this); } - pub fn mimeType(response: *const Response, request_ctx: *const http.RequestContext) string { + pub fn mimeType(response: *const Response, request_ctx: *const RequestContext) string { if (response.body.init.headers) |headers| { // Remember, we always lowercase it // hopefully doesn't matter here tho @@ -273,7 +274,7 @@ pub const Response = struct { } if (request_ctx.url.extname.len > 0) { - return http.MimeType.byExtension(request_ctx.url.extname).value; + return MimeType.byExtension(request_ctx.url.extname).value; } switch (response.body.value) { @@ -283,10 +284,10 @@ pub const Response = struct { .String => |body| { // poor man's mimetype sniffing if (body.len > 0 and (body[0] == '{' or body[0] == '[')) { - return http.MimeType.json.value; + return MimeType.json.value; } - return http.MimeType.html.value; + return MimeType.html.value; }, .Unconsumed, .ArrayBuffer => { return "application/octet-stream"; @@ -1092,7 +1093,7 @@ pub const Headers = struct { } // TODO: is it worth making this lazy? instead of copying all the request headers, should we just do it on get/put/iterator? - pub fn fromRequestCtx(allocator: *std.mem.Allocator, request: *http.RequestContext) !Headers { + pub fn fromRequestCtx(allocator: *std.mem.Allocator, request: *RequestContext) !Headers { return fromPicoHeaders(allocator, request.request.headers); } @@ -1486,7 +1487,7 @@ pub const Body = struct { // https://developer.mozilla.org/en-US/docs/Web/API/Request pub const Request = struct { - request_context: *http.RequestContext, + request_context: *RequestContext, url_string_ref: js.JSStringRef = null, headers: ?Headers = null, @@ -1673,7 +1674,7 @@ pub const Request = struct { pub const FetchEvent = struct { started_waiting_at: u64 = 0, response: ?*Response = null, - request_context: *http.RequestContext, + request_context: *RequestContext, request: Request, pending_promise: ?*JSInternalPromise = null, @@ -1980,3 +1981,7 @@ pub const FetchEvent = struct { // }, // ); // }; + +test "" { + std.testing.refAllDecls(Api); +} |