mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-14 12:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve comments

Browse Source
This commit is contained in:
Zack Radisic
2025-09-25 15:20:27 -07:00
parent 0cc63255b1
commit 11eddb2cf1
3 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bun.js/api/BunObject.zig
View File

@@ -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);
}

17
src/bun.js/bindings/BakeAdditionsToGlobalObject.cpp
View File

@@ -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<Zig::GlobalObject*>(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<JSRequest*>(requestValue);
JSRequest* request = jsDynamicCast<JSRequest*>(requestValue);
if (!request) {
Bun::throwError(globalObject, scope, ErrorCode::ERR_INVALID_ARG_TYPE, "request must be a JSRequest"_s);
return {};

9
src/bun.js/bindings/bindings.cpp
View File

@@ -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<KeyValuePair<String, String>> 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<Zig::GlobalObject*>(arg0), WTFMove(headers));
JSFetchHeaders* fetchHeaders = jsCast<JSFetchHeaders*>(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)