Merge branch 'Tencent:master' into master

ArnoChenFx · Jan 24, 2024 · b766d6e · b766d6e
2 parents 84c8651 + 04d9004
commit b766d6e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/unreal/Puerts/Content/JavaScript/puerts/promises.js b/unreal/Puerts/Content/JavaScript/puerts/promises.js
@@ -25,7 +25,9 @@ var global = global || (function () { return this; }());
                 maybeUnhandledRejection.set(promise, {
                     reason,
                 }); //maybe unhandledRejection
-                Promise.resolve().then(_ => unhandledRejection(promise, reason));
+                Promise.resolve()
+                    .then(() => Promise.resolve()) // run after all microtasks
+                    .then(_ => unhandledRejection(promise, reason));
                 break;
             case kPromiseHandlerAddedAfterReject:
                 handlerAddedAfterReject(promise);

diff --git a/unreal/Puerts/Source/JsEnv/Public/ScriptBackend.hpp b/unreal/Puerts/Source/JsEnv/Public/ScriptBackend.hpp
@@ -87,18 +87,20 @@
     {                            \
     };
 
-#define DeclOverload(Name, SIGNATURE, M, ...)                                                                                   \
-    template <>                                                                                                                 \
-    struct Name##PuertsOverloads<SIGNATURE>                                                                                     \
-    {                                                                                                                           \
-        static bool overloadCall(::PUERTS_NAMESPACE::PUERTS_BINDING_IMPL::API::CallbackInfoType info)                           \
-        {                                                                                                                       \
-            return ::PUERTS_NAMESPACE::FuncCallWrapper<SIGNATURE, M, true>::overloadCallWithDefaultValues(info, ##__VA_ARGS__); \
-        }                                                                                                                       \
-        static const ::PUERTS_NAMESPACE::CFunctionInfo* info()                                                                  \
-        {                                                                                                                       \
-            return ::PUERTS_NAMESPACE::FuncCallWrapper<SIGNATURE, M>::info(PUERTS_NAMESPACE::Count(__VA_ARGS__));               \
-        }                                                                                                                       \
+#define DeclOverload(Name, SIGNATURE, M, ...)                                                                           \
+    template <>                                                                                                         \
+    struct Name##PuertsOverloads<SIGNATURE>                                                                             \
+    {                                                                                                                   \
+        static bool overloadCall(::PUERTS_NAMESPACE::PUERTS_BINDING_IMPL::API::CallbackInfoType info)                   \
+        {                                                                                                               \
+            return ::PUERTS_NAMESPACE::FuncCallWrapper<PUERTS_NAMESPACE::PUERTS_BINDING_IMPL::API, SIGNATURE, M,        \
+                true>::overloadCallWithDefaultValues(info, ##__VA_ARGS__);                                              \
+        }                                                                                                               \
+        static const ::PUERTS_NAMESPACE::CFunctionInfo* info()                                                          \
+        {                                                                                                               \
+            return ::PUERTS_NAMESPACE::FuncCallWrapper<PUERTS_NAMESPACE::PUERTS_BINDING_IMPL::API, SIGNATURE, M>::info( \
+                PUERTS_NAMESPACE::Count(__VA_ARGS__));                                                                  \
+        }                                                                                                               \
     };
 
 #define SelectOverload(Name, SIGNATURE) Name##PuertsOverloads<SIGNATURE>

diff --git a/unreal/Puerts/Source/JsEnv/Public/StaticCall.hpp b/unreal/Puerts/Source/JsEnv/Public/StaticCall.hpp
@@ -1627,7 +1627,12 @@ class ClassDefineBuilder
 
     void Register()
     {
-        RegisterAPI::template Register<T>(FinalizeBuilder<T>::Build(), *this);
+        Register(FinalizeBuilder<T>::Build());
+    }
+
+    void Register(FinalizeFuncType Finalize)
+    {
+        RegisterAPI::template Register<T>(Finalize, *this);
     }
 };