refactor: unify android runtime c++ layout

.gitignore

@@ -54,10 +54,10 @@ v8_build
 .cipd/
 
 # project template
-/templates/ios/.build_env_vars.sh
-/templates/ios/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/
-/templates/visionos/.build_env_vars.sh
-/templates/visionos/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+/platforms/apple/templates/ios/.build_env_vars.sh
+/platforms/apple/templates/ios/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/
+/platforms/apple/templates/visionos/.build_env_vars.sh
+/platforms/apple/templates/visionos/__PROJECT_NAME__.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 
 .cache/
 
@@ -67,10 +67,10 @@ packages/*/types
 SwiftBindgen
 
 # Generated Objective-C/C dispatch wrappers
-NativeScript/ffi/*/GeneratedSignatureDispatch.inc
-NativeScript/ffi/*/GeneratedSignatureDispatch.inc.stamp
-NativeScript/ffi/*/GeneratedGsdSignatureDispatch.inc
-NativeScript/ffi/*/GeneratedGsdSignatureDispatch.inc.stamp
+NativeScript/ffi/**/GeneratedSignatureDispatch.inc
+NativeScript/ffi/**/GeneratedSignatureDispatch.inc.stamp
+NativeScript/ffi/**/GeneratedGsdSignatureDispatch.inc
+NativeScript/ffi/**/GeneratedGsdSignatureDispatch.inc.stamp
 
 # Packaged native framework artifacts
 packages/*/NativeScript.xcframework/

NativeScript/CMakeLists.txt

@@ -228,68 +228,68 @@ include_directories(
 )
 
 set(FFI_SHARED_SOURCE_FILES
-  ffi/shared/Tasks.cpp
+  ffi/objc/shared/Tasks.cpp
 )
 
 set(FFI_NAPI_SOURCE_FILES
-  ffi/napi/AutoreleasePool.mm
-  ffi/napi/Protocol.mm
-  ffi/napi/ObjCBridge.mm
-  ffi/napi/Block.mm
-  ffi/napi/Class.mm
-  ffi/napi/Closure.mm
-  ffi/napi/ClassMember.mm
-  ffi/napi/Cif.mm
-  ffi/napi/TypeConv.mm
-  ffi/napi/Util.mm
-  ffi/napi/Struct.mm
-  ffi/napi/ObjectRef.mm
-  ffi/napi/JSObject.mm
-  ffi/napi/Enum.mm
-  ffi/napi/Variable.mm
-  ffi/napi/Object.mm
-  ffi/napi/CFunction.mm
-  ffi/napi/Interop.mm
-  ffi/napi/InlineFunctions.mm
-  ffi/napi/ClassBuilder.mm
+  ffi/objc/napi/AutoreleasePool.mm
+  ffi/objc/napi/Protocol.mm
+  ffi/objc/napi/ObjCBridge.mm
+  ffi/objc/napi/Block.mm
+  ffi/objc/napi/Class.mm
+  ffi/objc/napi/Closure.mm
+  ffi/objc/napi/ClassMember.mm
+  ffi/objc/napi/Cif.mm
+  ffi/objc/napi/TypeConv.mm
+  ffi/objc/napi/Util.mm
+  ffi/objc/napi/Struct.mm
+  ffi/objc/napi/ObjectRef.mm
+  ffi/objc/napi/JSObject.mm
+  ffi/objc/napi/Enum.mm
+  ffi/objc/napi/Variable.mm
+  ffi/objc/napi/Object.mm
+  ffi/objc/napi/CFunction.mm
+  ffi/objc/napi/Interop.mm
+  ffi/objc/napi/InlineFunctions.mm
+  ffi/objc/napi/ClassBuilder.mm
 )
 
 set(FFI_ENGINE_SHARED_SOURCE_FILES
-  ffi/shared/MetadataState.mm
+  ffi/objc/shared/MetadataState.mm
 )
 
 set(FFI_HERMES_ENGINE_SOURCE_FILES
   ${FFI_ENGINE_SHARED_SOURCE_FILES}
-  ffi/hermes/NativeApiJsi.mm
+  ffi/objc/hermes/NativeApiJsi.mm
 )
 
 set(FFI_V8_ENGINE_SOURCE_FILES
   ${FFI_ENGINE_SHARED_SOURCE_FILES}
-  ffi/v8/NativeApiV8.mm
-  ffi/v8/NativeApiV8HostObjects.mm
-  ffi/v8/NativeApiV8Runtime.mm
-  ffi/v8/NativeApiV8Value.mm
+  ffi/objc/v8/NativeApiV8.mm
+  ffi/objc/v8/NativeApiV8HostObjects.mm
+  ffi/objc/v8/NativeApiV8Runtime.mm
+  ffi/objc/v8/NativeApiV8Value.mm
 )
 
 set(FFI_JSC_ENGINE_SOURCE_FILES
   ${FFI_ENGINE_SHARED_SOURCE_FILES}
-  ffi/jsc/NativeApiJSC.mm
-  ffi/jsc/NativeApiJSCHostObjects.mm
-  ffi/jsc/NativeApiJSCRuntime.mm
-  ffi/jsc/NativeApiJSCValue.mm
+  ffi/objc/jsc/NativeApiJSC.mm
+  ffi/objc/jsc/NativeApiJSCHostObjects.mm
+  ffi/objc/jsc/NativeApiJSCRuntime.mm
+  ffi/objc/jsc/NativeApiJSCValue.mm
 )
 
 set(FFI_QUICKJS_ENGINE_SOURCE_FILES
   ${FFI_ENGINE_SHARED_SOURCE_FILES}
-  ffi/quickjs/NativeApiQuickJSHostObjects.mm
-  ffi/quickjs/NativeApiQuickJS.mm
-  ffi/quickjs/NativeApiQuickJSRuntime.mm
-  ffi/quickjs/NativeApiQuickJSValue.mm
+  ffi/objc/quickjs/NativeApiQuickJSHostObjects.mm
+  ffi/objc/quickjs/NativeApiQuickJS.mm
+  ffi/objc/quickjs/NativeApiQuickJSRuntime.mm
+  ffi/objc/quickjs/NativeApiQuickJSValue.mm
 )
 
 set(SOURCE_FILES
   ${FFI_SHARED_SOURCE_FILES}
-  runtime/NativeScriptException.mm
+  runtime/apple/NativeScriptException.mm
 )
 
 if(NS_EFFECTIVE_FFI_BACKEND STREQUAL "napi")
@@ -302,28 +302,28 @@ endif()
 if(ENABLE_JS_RUNTIME)
   set(SOURCE_FILES
     ${SOURCE_FILES}
-    runtime/modules/console/Console.cpp
-    runtime/Runtime.cpp
-    runtime/modules/worker/Worker.mm
-    runtime/modules/worker/MessageJSON.cpp
-    runtime/modules/worker/MessageV8.cpp
-    runtime/modules/worker/ConcurrentQueue.cpp
-    runtime/modules/worker/WorkerImpl.mm
-    runtime/modules/worker/WorkerImpl.mm
-    runtime/modules/module/ModuleInternal.cpp
-    runtime/modules/node/Node.cpp
-    runtime/modules/node/FS.cpp
-    runtime/modules/node/Path.cpp
-    runtime/modules/node/Process.cpp
-    runtime/modules/node/VM.cpp
-    runtime/modules/performance/Performance.cpp
-    runtime/ThreadSafeFunction.mm
-    runtime/Bundle.mm
-    runtime/modules/timers/Timers.mm
-    runtime/modules/app/App.mm
-    runtime/modules/web/Web.mm
-    runtime/NativeScript.mm
-    runtime/RuntimeConfig.cpp
+    runtime/apple/modules/console/Console.cpp
+    runtime/apple/Runtime.cpp
+    runtime/apple/modules/worker/Worker.mm
+    runtime/apple/modules/worker/MessageJSON.cpp
+    runtime/apple/modules/worker/MessageV8.cpp
+    runtime/apple/modules/worker/ConcurrentQueue.cpp
+    runtime/apple/modules/worker/WorkerImpl.mm
+    runtime/apple/modules/worker/WorkerImpl.mm
+    runtime/apple/modules/module/ModuleInternal.cpp
+    runtime/apple/modules/node/Node.cpp
+    runtime/apple/modules/node/FS.cpp
+    runtime/apple/modules/node/Path.cpp
+    runtime/apple/modules/node/Process.cpp
+    runtime/apple/modules/node/VM.cpp
+    runtime/apple/modules/performance/Performance.cpp
+    runtime/apple/ThreadSafeFunction.mm
+    runtime/apple/Bundle.mm
+    runtime/apple/modules/timers/Timers.mm
+    runtime/apple/modules/app/App.mm
+    runtime/apple/modules/web/Web.mm
+    runtime/apple/NativeScript.mm
+    runtime/apple/RuntimeConfig.cpp
     runtime/modules/url/ada/ada.cpp
     runtime/modules/url/URL.cpp
     runtime/modules/url/URLSearchParams.cpp

NativeScript/cli/main.cpp

@@ -5,12 +5,12 @@
 #include <iostream>
 #include <string>
 
-#include "runtime/NativeScriptException.h"
-#include "runtime/Bundle.h"
-#include "runtime/Runtime.h"
-#include "runtime/RuntimeConfig.h"
+#include "runtime/apple/NativeScriptException.h"
+#include "runtime/apple/Bundle.h"
+#include "runtime/apple/Runtime.h"
+#include "runtime/apple/RuntimeConfig.h"
 #include "segappend.h"
-#include "ffi/shared/Tasks.h"
+#include "ffi/objc/shared/Tasks.h"
 #include "BundleLoader.h"
 
 using namespace nativescript;

platforms/android/test-app/runtime/src/main/cpp/runtime/conversion/ArgConverter.cpp → NativeScript/ffi/jni/napi/conversion/ArgConverter.cpp

@@ -13,6 +13,25 @@
 using namespace std;
 using namespace tns;
 
+namespace {
+napi_value EnsurePlainConstructorThis(napi_env env, napi_value jsThis, napi_value prototype) {
+    if (!napi_util::is_null_or_undefined(env, jsThis)) {
+        return jsThis;
+    }
+
+    napi_value receiver = nullptr;
+    if (napi_create_object(env, &receiver) != napi_ok || receiver == nullptr) {
+        return nullptr;
+    }
+
+    if (!napi_util::is_null_or_undefined(env, prototype)) {
+        napi_util::setPrototypeOf(env, receiver, prototype);
+    }
+
+    return receiver;
+}
+}
+
 void ArgConverter::Init(napi_env env) {
     auto cache = GetTypeLongCache(env);
 
@@ -98,15 +117,24 @@ napi_value ArgConverter::NativeScriptLongToStringFunctionCallback(napi_env env,
 napi_value ArgConverter::NativeScriptLongFunctionCallback(napi_env env, napi_callback_info info) {
     try {
         NAPI_CALLBACK_BEGIN(1);
+        napi_value newTarget;
+        napi_get_new_target(env, info, &newTarget);
+        napi_value receiverPrototype = !napi_util::is_null_or_undefined(env, newTarget)
+                                       ? napi_util::get_prototype(env, newTarget)
+                                       : nullptr;
+        napi_value receiver = EnsurePlainConstructorThis(env, jsThis, receiverPrototype);
+        if (receiver == nullptr) {
+            return nullptr;
+        }
         auto cache = GetTypeLongCache(env);
         napi_value javaLong;
         napi_get_boolean(env, true, &javaLong);
-        napi_set_named_property(env, jsThis, "javaLong", javaLong);
+        napi_set_named_property(env, receiver, "javaLong", javaLong);
 
-        NumericCasts::MarkAsLong(env, jsThis, argv[0]);
+        NumericCasts::MarkAsLong(env, receiver, argv[0]);
 
-        napi_set_named_property(env, jsThis, "prototype", napi_util::get_ref_value(env, cache->NanNumberObject));
-        return jsThis;
+        napi_set_named_property(env, receiver, "prototype", napi_util::get_ref_value(env, cache->NanNumberObject));
+        return receiver;
 
     } catch (NativeScriptException &e) {
       e.ReThrowToNapi(env);
@@ -262,4 +290,4 @@ void ArgConverter::onDisposeEnv(napi_env env) {
     }
 }
 
-robin_hood::unordered_map<napi_env, ArgConverter::TypeLongOperationsCache *> ArgConverter::s_type_long_operations_cache;
+robin_hood::unordered_map<napi_env, ArgConverter::TypeLongOperationsCache *> ArgConverter::s_type_long_operations_cache;