From f9d45f22dbf8dc39104010f6e03da98e435512d2 Mon Sep 17 00:00:00 2001
From: Ben Kuper <bkuperberg@gmail.com>
Date: Tue, 25 Feb 2025 19:12:23 +0100
Subject: [PATCH] Better type support in QuickJSToJuce

---
 .../choc/javascript/choc_javascript_QuickJS.h | 10 ++++++++--
 .../detail/juce_QuickJSHelpers.h              | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h b/modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h
index 99101236f1..16ad9aa406 100644
--- a/modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h
+++ b/modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h
@@ -8912,7 +8912,13 @@ static inline JS_BOOL JS_IsNumber(JSValueConst v)
     return tag == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag);
 }
 
-static inline JS_BOOL JS_IsBigInt(JSContext *ctx, JSValueConst v)
+static inline JS_BOOL JS_IsInteger(JSValueConst v)
+{
+    int tag = JS_VALUE_GET_TAG(v);
+    return tag == JS_TAG_INT;
+}
+
+static inline JS_BOOL JS_IsBigInt(JSValueConst v)
 {
     int tag = JS_VALUE_GET_TAG(v);
     return tag == JS_TAG_BIG_INT;
@@ -20782,7 +20788,7 @@ inline int JS_ToInt64(JSContext *ctx, int64_t *pres, JSValueConst val)
 
 inline int JS_ToInt64Ext(JSContext *ctx, int64_t *pres, JSValueConst val)
 {
-    if (JS_IsBigInt(ctx, val))
+    if (JS_IsBigInt(val))
         return JS_ToBigInt64(ctx, pres, val);
     else
         return JS_ToInt64(ctx, pres, val);
diff --git a/modules/juce_javascript/detail/juce_QuickJSHelpers.h b/modules/juce_javascript/detail/juce_QuickJSHelpers.h
index d8226eb3b0..27ff9d4a2e 100644
--- a/modules/juce_javascript/detail/juce_QuickJSHelpers.h
+++ b/modules/juce_javascript/detail/juce_QuickJSHelpers.h
@@ -249,9 +249,22 @@ static var tryQuickJSToJuce (const qjs::QuickJSContext::ValuePtr& ptr,
 
     if (JS_IsNumber (ptr.value))
     {
-        double d = 0;
-        JS_ToFloat64 (ptr.context, std::addressof (d), ptr.value);
-        return d;
+        if(JS_IsBigInt(ptr.value))
+        {
+            int64_t i = 0;
+            JS_ToBigInt64 (ptr.context, std::addressof (i), ptr.value);
+            return i;
+        }if(JS_IsInteger(ptr.value))
+        {
+            int32_t i = 0;
+            JS_ToInt32 (ptr.context, std::addressof (i), ptr.value);
+            return i;
+        }
+        {
+            double d = 0;
+            JS_ToFloat64 (ptr.context, std::addressof (d), ptr.value);
+            return d;
+        }
     }
 
     if (JS_IsBool (ptr.value))