aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2022-01-21 18:10:38 -0800
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2022-01-21 18:10:38 -0800
commit22c01ca14c72b73e64472b24f8adb227b586d3e6 (patch)
tree6ef0cb6c90800c2e967bf67abca32f7c47cc2d20
parent111f0921f58c91c6ccbe901dafadd83f23fcf399 (diff)
downloadbun-22c01ca14c72b73e64472b24f8adb227b586d3e6.tar.gz
bun-22c01ca14c72b73e64472b24f8adb227b586d3e6.tar.zst
bun-22c01ca14c72b73e64472b24f8adb227b586d3e6.zip
FIx `macros` remap in `Transpiler`
-rw-r--r--src/javascript/jsc/api/transpiler.zig2
-rw-r--r--src/javascript/jsc/bindings/bindings.zig7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/javascript/jsc/api/transpiler.zig b/src/javascript/jsc/api/transpiler.zig
index 10d7bf72a..2a03ea777 100644
--- a/src/javascript/jsc/api/transpiler.zig
+++ b/src/javascript/jsc/api/transpiler.zig
@@ -443,7 +443,7 @@ fn transformOptionsFromJSC(ctx: JSC.C.JSContextRef, temp_allocator: std.mem.Allo
macros: {
if (macros.isUndefinedOrNull()) break :macros;
const kind = macros.jsType();
- const is_object = kind == JSC.JSValue.JSType.Object;
+ const is_object = kind.isObject();
if (!(kind.isStringLike() or is_object)) {
JSC.throwInvalidArguments("macro must be an object", .{}, ctx, exception);
return transpiler;
diff --git a/src/javascript/jsc/bindings/bindings.zig b/src/javascript/jsc/bindings/bindings.zig
index 6c7cbd523..f615d584a 100644
--- a/src/javascript/jsc/bindings/bindings.zig
+++ b/src/javascript/jsc/bindings/bindings.zig
@@ -1439,6 +1439,13 @@ pub const JSValue = enum(i64) {
MaxJS = 0b11111111,
_,
+ pub fn isObject(this: JSType) bool {
+ return switch (this) {
+ .Object, .FinalObject => true,
+ else => false,
+ };
+ }
+
pub fn toC(this: JSType) C_API.JSTypedArrayType {
return switch (this) {
.Int8Array => .kJSTypedArrayTypeInt8Array,