diff --git a/src/bun.js/api/BunObject.zig b/src/bun.js/api/BunObject.zig index f6aa230e93..586a001ca6 100644 --- a/src/bun.js/api/BunObject.zig +++ b/src/bun.js/api/BunObject.zig @@ -1277,10 +1277,6 @@ pub fn getGlobConstructor(globalThis: *jsc.JSGlobalObject, _: *jsc.JSObject) jsc return jsc.API.Glob.js.getConstructor(globalThis); } -pub fn getSSRResponseConstructor(globalThis: *jsc.JSGlobalObject, _: *jsc.JSObject) jsc.JSValue { - const Bake__getSSRResponseConstructor = @extern(*const fn (*jsc.JSGlobalObject) callconv(jsc.conv) jsc.JSValue, .{ .name = "Bake__getSSRResponseConstructor" }); - return Bake__getSSRResponseConstructor(globalThis); -} pub fn getS3ClientConstructor(globalThis: *jsc.JSGlobalObject, _: *jsc.JSObject) jsc.JSValue { return jsc.WebCore.S3Client.js.getConstructor(globalThis); } diff --git a/src/bun.js/bindings/BakeAdditionsToGlobalObject.cpp b/src/bun.js/bindings/BakeAdditionsToGlobalObject.cpp index 9d4bfa9f18..44ceb0c4bc 100644 --- a/src/bun.js/bindings/BakeAdditionsToGlobalObject.cpp +++ b/src/bun.js/bindings/BakeAdditionsToGlobalObject.cpp @@ -23,20 +23,21 @@ void createDevServerFrameworkRequestArgsStructure(JSC::LazyClassStructure::Initi extern "C" EncodedJSValue Bake__createDevServerFrameworkRequestArgsObject(JSC::JSGlobalObject* globalObject, EncodedJSValue routerTypeMain, EncodedJSValue routeModules, EncodedJSValue clientEntryUrl, EncodedJSValue styles, EncodedJSValue params) { auto scope = DECLARE_THROW_SCOPE(globalObject->vm()); + auto& vm = globalObject->vm(); - auto* zig = jsCast<::Zig::GlobalObject*>(globalObject); - auto* object = JSFinalObject::create(zig->vm(), zig->bakeAdditions().m_DevServerFrameworkRequestArgsClassStructure.get(zig)); + auto* zig = jsCast(globalObject); + auto* object = JSFinalObject::create(vm, zig->bakeAdditions().m_DevServerFrameworkRequestArgsClassStructure.get(zig)); RETURN_IF_EXCEPTION(scope, {}); - object->putDirectOffset(zig->vm(), 0, JSValue::decode(routerTypeMain)); + object->putDirectOffset(vm, 0, JSValue::decode(routerTypeMain)); RETURN_IF_EXCEPTION(scope, {}); - object->putDirectOffset(zig->vm(), 1, JSValue::decode(routeModules)); + object->putDirectOffset(vm, 1, JSValue::decode(routeModules)); RETURN_IF_EXCEPTION(scope, {}); - object->putDirectOffset(zig->vm(), 2, JSValue::decode(clientEntryUrl)); + object->putDirectOffset(vm, 2, JSValue::decode(clientEntryUrl)); RETURN_IF_EXCEPTION(scope, {}); - object->putDirectOffset(zig->vm(), 3, JSValue::decode(styles)); + object->putDirectOffset(vm, 3, JSValue::decode(styles)); RETURN_IF_EXCEPTION(scope, {}); - object->putDirectOffset(zig->vm(), 4, JSValue::decode(params)); + object->putDirectOffset(vm, 4, JSValue::decode(params)); RETURN_IF_EXCEPTION(scope, {}); return JSValue::encode(object); @@ -101,7 +102,7 @@ BUN_DEFINE_HOST_FUNCTION(jsFunctionBakeGetBundleNewRouteJSFunction, (JSC::JSGlob return {}; } - JSRequest* request = jsCast(requestValue); + JSRequest* request = jsDynamicCast(requestValue); if (!request) { Bun::throwError(globalObject, scope, ErrorCode::ERR_INVALID_ARG_TYPE, "request must be a JSRequest"_s); return {}; diff --git a/src/bun.js/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp index 7f18e5defa..117013abf0 100644 --- a/src/bun.js/bindings/bindings.cpp +++ b/src/bun.js/bindings/bindings.cpp @@ -1992,7 +1992,7 @@ void WebCore__FetchHeaders__deref(WebCore::FetchHeaders* arg0) arg0->deref(); } -JSFetchHeaders* WebCore__FetchHeaders__createValueNotJS(JSC::JSGlobalObject* arg0, StringPointer* arg1, StringPointer* arg2, const ZigString* arg3, uint32_t count) +WebCore::FetchHeaders* WebCore__FetchHeaders__createValueNotJS(JSC::JSGlobalObject* arg0, StringPointer* arg1, StringPointer* arg2, const ZigString* arg3, uint32_t count) { auto throwScope = DECLARE_THROW_SCOPE(arg0->vm()); Vector> pairs; @@ -2007,12 +2007,7 @@ JSFetchHeaders* WebCore__FetchHeaders__createValueNotJS(JSC::JSGlobalObject* arg auto* headers = new WebCore::FetchHeaders({ WebCore::FetchHeaders::Guard::None, {} }); headers->relaxAdoptionRequirement(); WebCore::propagateException(*arg0, throwScope, headers->fill(WebCore::FetchHeaders::Init(WTFMove(pairs)))); - - JSValue value = WebCore::toJSNewlyCreated(arg0, reinterpret_cast(arg0), WTFMove(headers)); - - JSFetchHeaders* fetchHeaders = jsCast(value); - fetchHeaders->computeMemoryCost(); - return fetchHeaders; + return headers; } JSC::EncodedJSValue WebCore__FetchHeaders__createValue(JSC::JSGlobalObject* arg0, StringPointer* arg1, StringPointer* arg2, const ZigString* arg3, uint32_t count)