@crossbind/core-embind-jsi 2.0.0-beta.60 → 2.0.0-beta.63

package/cpp/src/emscripten/bind.h

@@ -17,6 +17,7 @@
 #include <map>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include "./em_macros.h"
@@ -630,42 +631,21 @@ struct SignatureTranslator<ReturnType (*)(Args...)> { using type = void*; };
 #define call_invoke_4 ({return invoke(fn, args[0], args[1], args[2], args[3]);})
 #define call_invoke(count) (call_invoke_##count)
 
+    namespace internal {
+        // Every JS argument of a call, however many parameters the bound function has.
+        template<typename Invoke, typename Fn, std::size_t... I>
+        EMSCRIPTEN_ALWAYS_INLINE decltype(auto) invokeWithArgs(facebook::jsi::Runtime& rt, Invoke&& invoke, Fn&& fn,
+                const facebook::jsi::Value* args, std::index_sequence<I...>) {
+            return invoke(rt, std::forward<Fn>(fn), args[I]...);
+        }
+    } // end namespace internal
+
 #define callInvoke(count, invokeVar, fnVar) ({ \
-    if constexpr (count == 1) { return invokeVar(rt, fnVar, args[0]); }\
-    else if constexpr (count == 2) { return invokeVar(rt, fnVar, args[0], args[1]); }\
-    else if constexpr (count == 3) { return invokeVar(rt, fnVar, args[0], args[1], args[2]); }\
-    else if constexpr (count == 4) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3]); }\
-    else if constexpr (count == 5) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4]); }\
-    else if constexpr (count == 6) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5]); }\
-    else if constexpr (count == 7) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6]); }\
-    else if constexpr (count == 8) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]); }\
-    else if constexpr (count == 9) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]); }\
-    else if constexpr (count == 10) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]); }\
-    else if constexpr (count == 11) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10]); }\
-    else if constexpr (count == 12) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11]); }\
-    else if constexpr (count == 13) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12]); }\
-    else if constexpr (count == 14) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12], args[13]); }\
-    else if constexpr (count == 15) { return invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12], args[13], args[14]); }\
-    else { return invokeVar(rt, fnVar); }                                              \
+    return ::emscripten::internal::invokeWithArgs(rt, invokeVar, fnVar, args, std::make_index_sequence<(count)>{}); \
 })
 
 #define callInvokeVoid(count, invokeVar, fnVar) ({ \
-    if constexpr (count == 1) { invokeVar(rt, fnVar, args[0]); }\
-    else if constexpr (count == 2) { invokeVar(rt, fnVar, args[0], args[1]); }\
-    else if constexpr (count == 3) { invokeVar(rt, fnVar, args[0], args[1], args[2]); }\
-    else if constexpr (count == 4) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3]); }\
-    else if constexpr (count == 5) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4]); }\
-    else if constexpr (count == 6) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5]); }\
-    else if constexpr (count == 7) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6]); }\
-    else if constexpr (count == 8) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7]); }\
-    else if constexpr (count == 9) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8]); }\
-    else if constexpr (count == 10) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9]); }\
-    else if constexpr (count == 11) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10]); }\
-    else if constexpr (count == 12) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11]); }\
-    else if constexpr (count == 13) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12]); }\
-    else if constexpr (count == 14) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12], args[13]); }\
-    else if constexpr (count == 15) { invokeVar(rt, fnVar, args[0], args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], args[9], args[10], args[11], args[12], args[13], args[14]); }\
-    else { invokeVar(rt, fnVar); }                                              \
+    ::emscripten::internal::invokeWithArgs(rt, invokeVar, fnVar, args, std::make_index_sequence<(count)>{}); \
 })
 
     template<typename ReturnType, typename... Args, typename... Policies>
@@ -1183,7 +1163,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_constructor"),
                 1,
                 [destructor](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t = reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt));
+                    ClassType* t = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0]));
                     destructor(t);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1216,7 +1196,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_gter1"),
                 2,
                 [getter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(field, *t2);
                 });
 
@@ -1225,7 +1205,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_ster1"),
                 3,
                 [setter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(field, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1257,8 +1237,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_gter2"),
                 2,
                 [g, getter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Getter* t = reinterpret_cast<Getter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Getter* t = reinterpret_cast<Getter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return g(getter, *t2);
                 });
 
@@ -1267,8 +1247,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_ster2"),
                 3,
                 [s](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Setter* t = reinterpret_cast<Setter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Setter* t = reinterpret_cast<Setter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     s(*t, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1299,8 +1279,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_gter3"),
                 2,
                 [getter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    int t1 = static_cast<int>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    int t1 = static_cast<int>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(t1, *t2);
                 });
 
@@ -1310,8 +1290,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_array_element_ster3"),
                 3,
                 [setter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    int t1 = static_cast<int>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    int t1 = static_cast<int>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(t1, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1359,7 +1339,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_constructor"),
                 1,
                 [dtor](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t = reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt));
+                    ClassType* t = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0]));
                     dtor(t);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1392,7 +1372,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_gter1"),
                 2,
                 [getter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(field, *t2);
                 });
 
@@ -1401,7 +1381,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_ster1"),
                 3,
                 [setter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(field, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1439,8 +1419,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_gter1"),
                 2,
                 [getter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    const MemberPointer* t1 = reinterpret_cast<MemberPointer*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    const MemberPointer* t1 = reinterpret_cast<MemberPointer*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(*t1, *t2);
                 });
 
@@ -1449,8 +1429,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_ster1"),
                 3,
                 [setter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    const MemberPointer* t1 = reinterpret_cast<MemberPointer*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    const MemberPointer* t1 = reinterpret_cast<MemberPointer*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(*t1, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1487,8 +1467,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_gter2"),
                 2,
                 [g, getter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Getter* t = reinterpret_cast<Getter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Getter* t = reinterpret_cast<Getter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return g(getter, *t2);
                 });
 
@@ -1497,8 +1477,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_ster2"),
                 3,
                 [s](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Setter* t = reinterpret_cast<Setter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Setter* t = reinterpret_cast<Setter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     s(*t, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -1531,8 +1511,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_gter3"),
                 2,
                 [getter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    int t1 = static_cast<int>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    int t1 = static_cast<int>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(t1, *t2);
                 });
 
@@ -1541,8 +1521,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, "value_object_element_ster3"),
                 3,
                 [setter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    int t1 = static_cast<int>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    int t1 = static_cast<int>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(t1, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -2159,7 +2139,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"__getActualType"),
                 1,
                 [_getActualType](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    auto returnValue = _getActualType(reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt)));
+                    auto returnValue = _getActualType(reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0])));
                     return facebook::jsi::BigInt::fromUint64(rt, reinterpret_cast<uint64_t>(returnValue));
                 });
 
@@ -2168,7 +2148,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_upcast"),
                 1,
                 [upcast](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t = reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt));
+                    ClassType* t = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0]));
                     BaseSpecifier* a = nullptr;
                     return dsadsa<ClassType, BaseSpecifier>(rt, t, a);
                 });
@@ -2178,7 +2158,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_downcast"),
                 1,
                 [downcast](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t = reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt));
+                    ClassType* t = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0]));
                     BaseSpecifier* a = nullptr;
                     return downcastHelper<ClassType, BaseSpecifier>(rt, t, a);
                 });
@@ -2188,7 +2168,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_destructor"),
                 1,
                 [destructor](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    destructor(reinterpret_cast<ClassType*>(args[0].asBigInt(rt).asUint64(rt)));
+                    destructor(reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[0])));
                     return facebook::jsi::Value::undefined();
                 });
 
@@ -2227,7 +2207,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_get"),
                 1,
                 [get](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    uint64_t ptrNumber = args[0].asBigInt(rt).asUint64(rt);
+                    uint64_t ptrNumber = internal::bigIntUint64(rt, args[0]);
                     auto b = *reinterpret_cast<PointerType*>(ptrNumber);
                     auto a = get(b);
                     return facebook::jsi::BigInt::fromUint64(rt, reinterpret_cast<uint64_t>(a));
@@ -2247,10 +2227,10 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_share"),
                 2,
                 [share](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    uint64_t pNumber = args[0].asBigInt(rt).asUint64(rt);
+                    uint64_t pNumber = internal::bigIntUint64(rt, args[0]);
                     auto p = reinterpret_cast<PointeeType*>(pNumber);
                     // uint64_t vNumber = (uint64_t) args[1].getNumber();
-                    uint64_t vNumber = args[1].asBigInt(rt).asUint64(rt);
+                    uint64_t vNumber = internal::bigIntUint64(rt, args[1]);
                     EM_VAL v = reinterpret_cast<EM_VAL>(vNumber);
                     auto a = share(p, v);
                     auto e = facebook::jsi::BigInt::fromUint64(rt, reinterpret_cast<uint64_t>(a));
@@ -2262,7 +2242,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(name)+"_destructor"),
                 1,
                 [destructor](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    uint64_t ptrNumber = args[0].asBigInt(rt).asUint64(rt);
+                    uint64_t ptrNumber = internal::bigIntUint64(rt, args[0]);
                     auto b = reinterpret_cast<PointerType*>(ptrNumber);
                     destructor(b);
                     return facebook::jsi::Value::undefined();
@@ -2403,7 +2383,7 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_gter"),
                 2,
                 [getter, a](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(a, *t2);
                 });
 
@@ -2441,8 +2421,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_gter"),
                 2,
                 [getter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    FieldType* t = reinterpret_cast<FieldType*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    FieldType* t = reinterpret_cast<FieldType*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return getter(field, *t2);
                 });
 
@@ -2451,8 +2431,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_ster"),
                 3,
                 [setter, field](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    FieldType* t = reinterpret_cast<FieldType*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    FieldType* t = reinterpret_cast<FieldType*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     setter(field, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });
@@ -2487,8 +2467,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName) + "_gter"),
                 2,
                 [gter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Getter* t = reinterpret_cast<Getter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Getter* t = reinterpret_cast<Getter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return gter(*t, *t2);
                 });
 
@@ -2536,8 +2516,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_gter"),
                 2,
                 [gter](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Getter* t = reinterpret_cast<Getter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Getter* t = reinterpret_cast<Getter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     return gter(*t, *t2);
                 });
 
@@ -2546,8 +2526,8 @@ public:
                 facebook::jsi::PropNameID::forAscii(*jsRuntime, std::string(fieldName)+"_ster"),
                 3,
                 [ster](facebook::jsi::Runtime& rt, const facebook::jsi::Value& thisVal, const facebook::jsi::Value* args, size_t count) {
-                    Setter* t = reinterpret_cast<Setter*>(args[0].asBigInt(rt).asUint64(rt));
-                    ClassType* t2 = reinterpret_cast<ClassType*>(args[1].asBigInt(rt).asUint64(rt));
+                    Setter* t = reinterpret_cast<Setter*>(internal::bigIntUint64(rt, args[0]));
+                    ClassType* t2 = reinterpret_cast<ClassType*>(internal::bigIntUint64(rt, args[1]));
                     ster(*t, *t2, args[2]);
                     return facebook::jsi::Value::undefined();
                 });