From 7b68a6f6c20d41a67d0425d94b614cef5f4fcc73 Mon Sep 17 00:00:00 2001 From: dave caruso Date: Thu, 19 Dec 2024 17:15:23 -0800 Subject: [PATCH] bwaa --- src/bun.js/api/BunObject.zig | 2 +- src/bun.js/bindgen_test.bind.ts | 16 ++++++++-------- src/codegen/bindgen.ts | 2 +- src/js_parser.zig | 21 +-------------------- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/src/bun.js/api/BunObject.zig b/src/bun.js/api/BunObject.zig index cbff954472..c52509173d 100644 --- a/src/bun.js/api/BunObject.zig +++ b/src/bun.js/api/BunObject.zig @@ -536,7 +536,7 @@ pub fn inspect(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.J export fn Bun__inspect(globalThis: *JSGlobalObject, value: JSValue) ZigString { // very stable memory address - var array = MutableString.init(getAllocator(globalThis), 0) catch unreachable; + var array = MutableString.init(bun.default_allocator, 0) catch unreachable; var buffered_writer = MutableString.BufferedWriter{ .context = &array }; const writer = buffered_writer.writer(); diff --git a/src/bun.js/bindgen_test.bind.ts b/src/bun.js/bindgen_test.bind.ts index 742aa7b3bc..6904e27425 100644 --- a/src/bun.js/bindgen_test.bind.ts +++ b/src/bun.js/bindgen_test.bind.ts @@ -34,14 +34,14 @@ export const returnBunString = Fn({ args: { len: t.u32.enforceRange(), }, - ret: t.DOMString, + ret: t.BunString, }); -export const HeadersInit = t.sequence(t.DOMString); +// export const HeadersInit = t.sequence(t.DOMString); -export const headersInit = fn({ - args: { - a: HeadersInit, - }, - ret: t.i32, -}); \ No newline at end of file +// export const headersInit = fn({ +// args: { +// a: HeadersInit, +// }, +// ret: t.i32, +// }); diff --git a/src/codegen/bindgen.ts b/src/codegen/bindgen.ts index b861e1b643..e47178f41e 100644 --- a/src/codegen/bindgen.ts +++ b/src/codegen/bindgen.ts @@ -392,7 +392,7 @@ function emitCppCallToVariant(className: string, name: string, variant: Variant, // already validated against assert(false); case "DOMString": - cpp.line(`return JSC::JSValue::encode(WebCore::toJS(*global, out.toWTFString()));`); + cpp.line(`return JSC::JSValue::encode(WebCore::toJS(*global, out));`); break; case "BunString": cpp.line(`JSC::JSValue js = JSC::jsString(vm, out.toWTFString());`); diff --git a/src/js_parser.zig b/src/js_parser.zig index abe0a5271b..46bb0db790 100644 --- a/src/js_parser.zig +++ b/src/js_parser.zig @@ -4659,26 +4659,7 @@ const Jest = struct { }; // workaround for https://github.com/ziglang/zig/issues/10903 -fn NewParser( - comptime parser_features: ParserFeatures, -) type { - return NewParser_( - parser_features.typescript, - parser_features.jsx, - parser_features.scan_only, - ); -} -fn NewParser_( - comptime parser_feature__typescript: bool, - comptime parser_feature__jsx: JSXTransformType, - comptime parser_feature__scan_only: bool, -) type { - const js_parser_features: ParserFeatures = .{ - .typescript = parser_feature__typescript, - .jsx = parser_feature__jsx, - .scan_only = parser_feature__scan_only, - }; - +fn NewParser(comptime js_parser_features: ParserFeatures) type { // P is for Parser! return struct { const js_parser_jsx = js_parser_features.jsx;