ci: fix macos tests and trusted npm tags

DjDeveloperr · DjDeveloperr · commit b139d4133184 · 2026-05-27T03:36:31.000-04:00
diff --git a/.github/workflows/npm_trusted_release.yml b/.github/workflows/npm_trusted_release.yml
@@ -44,6 +44,10 @@ on:
         required: false
         type: string
         default: next
+      npm-tag:
+        description: "Optional npm dist-tag override for publish, e.g. latest for the RN preview default install"
+        required: false
+        type: string
       dry-run:
         description: "Run release steps without making changes (no git push, no publish)"
         required: false
@@ -140,12 +144,14 @@ jobs:
           RELEASE_TYPE: ${{ inputs.release-type }}
           PACKAGE_VERSION: ${{ inputs.version }}
           PREID: ${{ inputs.preid }}
+          NPM_TAG_OVERRIDE: ${{ inputs.npm-tag }}
           TARGET: ${{ matrix.target }}
         run: |
           set -euo pipefail
           release_type="$RELEASE_TYPE"
           package_version="$PACKAGE_VERSION"
           preid="$PREID"
+          npm_tag_override="$NPM_TAG_OVERRIDE"
           target="$TARGET"
           if [ "$target" = "react-native" ]; then
             pkg_dir="packages/react-native"
@@ -172,7 +178,20 @@ jobs:
           popd >/dev/null
 
           NPM_TAG=$(NPM_VERSION="$NPM_VERSION" node ./scripts/get-npm-tag.js "$npm_tag_target")
-          if [ -n "$package_version" ] && [ "$release_type" = "prerelease" ] && [ "$NPM_TAG" = "latest" ]; then
+          if [ -n "$npm_tag_override" ]; then
+            case "$npm_tag_override" in
+              *[[:space:]]*)
+                echo "Invalid npm tag override '$npm_tag_override': dist-tags cannot contain whitespace." >&2
+                exit 1
+                ;;
+            esac
+            if printf '%s\n' "$npm_tag_override" | grep -Eq '^[0-9]+(\.[0-9]+)*$'; then
+              echo "Invalid npm tag override '$npm_tag_override': dist-tags must not look like semver versions." >&2
+              exit 1
+            fi
+            NPM_TAG="$npm_tag_override"
+          fi
+          if [ -n "$package_version" ] && [ "$release_type" = "prerelease" ] && [ -z "$npm_tag_override" ] && [ "$NPM_TAG" = "latest" ]; then
             echo "Exact prerelease publishes must include a prerelease identifier (for example 9.0.0-preview.0)." >&2
             exit 1
           fi
@@ -346,6 +365,7 @@ jobs:
           RELEASE_TYPE: ${{ inputs.release-type }}
           PACKAGE_VERSION: ${{ inputs.version }}
           PREID: ${{ inputs.preid }}
+          NPM_TAG_OVERRIDE: ${{ inputs.npm-tag }}
           DRY_RUN: ${{ inputs.dry-run }}
           TARGETS: ${{ needs.matrix.outputs.targets }}
           BUILD_RESULT: ${{ needs.build.result }}
@@ -355,6 +375,7 @@ jobs:
           echo "Release type:     $RELEASE_TYPE"
           echo "Exact version:    $PACKAGE_VERSION"
           echo "Preid:            $PREID"
+          echo "NPM tag override: $NPM_TAG_OVERRIDE"
           echo "Dry run:          $DRY_RUN"
           echo "Targets:          $TARGETS"
           echo "Build result:     $BUILD_RESULT"
diff --git a/NativeScript/ffi/shared/jsi/NativeApiJsiInstall.h b/NativeScript/ffi/shared/jsi/NativeApiJsiInstall.h
@@ -822,6 +822,10 @@ void InstallNativeApiJsiGlobalSymbols(Runtime& runtime, const char* globalName)
       classMembersInstalled = true;
       installClassMembers(constructable, nativeClass.__staticMembers, true);
       installClassMembers(basePrototypeTarget, nativeClass.__instanceMembers, false);
+      try {
+        delete constructable.__nativeApiInstallMembers;
+      } catch (_) {
+      }
     }
     try {
       Object.defineProperty(constructable, '__nativeApiInstallMembers', {
@@ -869,6 +873,7 @@ void InstallNativeApiJsiGlobalSymbols(Runtime& runtime, const char* globalName)
     constructable.prototype = typeof Proxy === 'function'
       ? new Proxy(basePrototypeTarget, {
           get: function(target, property, receiver) {
+            installNativeClassMembersIfNeeded();
             if (property in target) {
               return Reflect.get(target, property, receiver);
             }
@@ -902,7 +907,16 @@ void InstallNativeApiJsiGlobalSymbols(Runtime& runtime, const char* globalName)
             return true;
           },
           has: function(target, property) {
+            installNativeClassMembersIfNeeded();
             return property in target;
+          },
+          ownKeys: function(target) {
+            installNativeClassMembersIfNeeded();
+            return Reflect.ownKeys(target);
+          },
+          getOwnPropertyDescriptor: function(target, property) {
+            installNativeClassMembersIfNeeded();
+            return Reflect.getOwnPropertyDescriptor(target, property);
           }
         })
       : basePrototypeTarget;
@@ -952,12 +966,27 @@ void InstallNativeApiJsiGlobalSymbols(Runtime& runtime, const char* globalName)
             if (property === '__nativeApiClass') {
               return nativeClass;
             }
+            if (property === 'toString') {
+              return function() {
+                return String(nativeClass);
+              };
+            }
+            if (property === 'hasOwnProperty') {
+              return function(key) {
+                installNativeClassMembersIfNeeded();
+                return Object.prototype.hasOwnProperty.call(target, key);
+              };
+            }
             if (Object.prototype.hasOwnProperty.call(target, property) ||
                 property === 'prototype' ||
                 property === 'length' ||
                 property === 'name') {
               return Reflect.get(target, property, receiver);
             }
+            installNativeClassMembersIfNeeded();
+            if (Object.prototype.hasOwnProperty.call(target, property)) {
+              return Reflect.get(target, property, receiver);
+            }
             if (cachedNativeFunctions && cachedNativeFunctions.has(property)) {
               return cachedNativeFunctions.get(property);
             }
@@ -1015,13 +1044,37 @@ void InstallNativeApiJsiGlobalSymbols(Runtime& runtime, const char* globalName)
             return Reflect.set(target, property, value, receiver);
           },
           has: function(target, property) {
+            installNativeClassMembersIfNeeded();
             return property in target || property in nativeClass;
+          },
+          ownKeys: function(target) {
+            installNativeClassMembersIfNeeded();
+            return Reflect.ownKeys(target).filter(function(key) {
+              return key !== 'new' &&
+                key !== 'hasOwnProperty' &&
+                key !== '__nativeApiInstallMembers';
+            });
+          },
+          getOwnPropertyDescriptor: function(target, property) {
+            installNativeClassMembersIfNeeded();
+            return Reflect.getOwnPropertyDescriptor(target, property);
           }
 	        })
 	      : constructable;
 	    if (classWrappers) {
 	      classWrappers.set(nativeClass, wrapper);
 	    }
+    try {
+      var nativeSuperclass = nativeClass.__superclass;
+      if (nativeSuperclass && nativeSuperclass !== nativeClass) {
+        var superclassWrapper = wrapNativeClass(nativeSuperclass);
+        if (superclassWrapper && superclassWrapper !== wrapper &&
+            typeof Object.setPrototypeOf === 'function') {
+          Object.setPrototypeOf(wrapper, superclassWrapper);
+        }
+      }
+    } catch (_) {
+    }
     try {
       api.__rememberClassWrapper(nativeClass, wrapper, constructable.prototype);
     } catch (_) {
diff --git a/NativeScriptRuntime.xcodeproj/project.pbxproj b/NativeScriptRuntime.xcodeproj/project.pbxproj
@@ -613,7 +613,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -650,6 +650,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "-Wno-invalid-version-availability";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -689,7 +690,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -716,6 +717,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				OTHER_CFLAGS = "-Wno-invalid-version-availability";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
diff --git a/scripts/check_ffi_boundaries.sh b/scripts/check_ffi_boundaries.sh
@@ -28,17 +28,37 @@ if [ "${#EXISTING_DIRECT_DIRS[@]}" -eq 0 ]; then
   exit 0
 fi
 
-if rg -n '\b(napi_|napi_env|napi_value|js_native_api|node_api)\b' \
-  "${EXISTING_DIRECT_DIRS[@]}" \
-  -g '*.{h,hh,hpp,c,cc,cpp,m,mm,inc}'; then
+search_sources() {
+  local pattern="$1"
+  shift
+
+  if command -v rg >/dev/null 2>&1; then
+    rg -n "$pattern" "$@" -g '*.{h,hh,hpp,c,cc,cpp,m,mm,inc}'
+    return
+  fi
+
+  find "$@" \
+    -type f \( \
+      -name '*.h' -o \
+      -name '*.hh' -o \
+      -name '*.hpp' -o \
+      -name '*.c' -o \
+      -name '*.cc' -o \
+      -name '*.cpp' -o \
+      -name '*.m' -o \
+      -name '*.mm' -o \
+      -name '*.inc' \
+    \) -print0 | xargs -0 grep -nE "$pattern"
+}
+
+if search_sources '(^|[^[:alnum:]_])(napi_|napi_env|napi_value|js_native_api|node_api)($|[^[:alnum:]_])' \
+  "${EXISTING_DIRECT_DIRS[@]}"; then
   echo "Node-API symbols are not allowed in shared or direct engine FFI folders." >&2
   exit 1
 fi
 
-if rg -n '\b(EngineDirect|FastNative|HermesFast|V8Fast|JSCFast|QuickJSFast)\b' \
-  "$ROOT_DIR/NativeScript/ffi/napi" \
-  -g '*.{h,hh,hpp,c,cc,cpp,m,mm,inc}' \
-  -g '!GeneratedSignatureDispatch.inc'; then
+if search_sources '(^|[^[:alnum:]_])(EngineDirect|FastNative|HermesFast|V8Fast|JSCFast|QuickJSFast)($|[^[:alnum:]_])' \
+  "$ROOT_DIR/NativeScript/ffi/napi" | grep -v 'GeneratedSignatureDispatch.inc'; then
   echo "Direct-engine FFI code is not allowed in ffi/napi." >&2
   exit 1
 fi
diff --git a/test/runtime/fixtures/Marshalling/TNSObjCTypes.m b/test/runtime/fixtures/Marshalling/TNSObjCTypes.m
@@ -56,6 +56,17 @@ CFTypeRef TNSFunctionWithCreateCFTypeRefReturn() {
   }
   return (CFAbsoluteTimeGetCurrent() - startedAt) * 1000.0;
 }
+#else
+double TNSRNMeasureNativeUITabBarControllerNew(int iterations, int touchView) {
+  (void)iterations;
+  (void)touchView;
+  return 0;
+}
+
+double TNSRNMeasureNativeUIColorFactory(int iterations) {
+  (void)iterations;
+  return 0;
+}
 #endif
 
 @implementation TNSRNDelegateProbe
