Merge branch 'main' into feat/ada-v3

Author: NathanWalker

.github/workflows/npm_release.yml

@@ -73,12 +73,12 @@ jobs:
       - name: Build npm package
         run: ./gradlew -PgitCommitVersion=${{ github.sha }} -PnoCCache --stacktrace
       - name: Upload npm package artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: npm-package
           path: dist/nativescript-android-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz
       - name: Upload debug symbols
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: debug-symbols
           path: test-app/runtime/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/*
@@ -146,7 +146,7 @@ jobs:
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org"
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: npm-package
           path: dist
@@ -176,11 +176,11 @@ jobs:
           node-version: 18
       - name: Setup
         run: npm install
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: npm-package
           path: dist
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: debug-symbols
           path: dist/debug-symbols

.github/workflows/pull_request.yml

@@ -70,12 +70,12 @@ jobs:
       - name: Build npm package
         run: ./gradlew -PgitCommitVersion=${{ github.sha }} -PnoCCache --stacktrace
       - name: Upload npm package artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: npm-package
           path: dist/nativescript-android-${{steps.npm_version_output.outputs.NPM_VERSION}}.tgz
       - name: Upload debug symbols
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: debug-symbols
           path: test-app/runtime/build/intermediates/merged_native_libs/release/mergeReleaseNativeLibs/out/lib/*

test-app/runtime/src/main/cpp/MetadataNode.cpp

@@ -859,11 +859,15 @@ void MetadataNode::SetInnerTypes(v8::Isolate* isolate, Local<Function>& ctorFunc
         auto context = isolate->GetCurrentContext();
         const auto &children = *treeNode->children;
         for (auto curChild: children) {
-            ctorFunction->SetAccessor(
-                    context,
-                    v8::String::NewFromUtf8(isolate, curChild->name.c_str()).ToLocalChecked(),
-                    InnerTypeAccessorGetterCallback, nullptr, v8::External::New(isolate, curChild)
-            );
+            bool hasOwnProperty = ctorFunction->HasOwnProperty(context, ArgConverter::ConvertToV8String(isolate, curChild->name)).ToChecked();
+                // Child is defined as a function already when the inner type is a companion object
+                if (!hasOwnProperty) {
+                    ctorFunction->SetAccessor(
+                        context,
+                        v8::String::NewFromUtf8(isolate, curChild->name.c_str()).ToLocalChecked(),
+                        InnerTypeAccessorGetterCallback, nullptr, v8::External::New(isolate, curChild)
+                );
+            }
         }
     }
 }