Merge remote-tracking branch 'origin/main' into feat/allow-conditional-esm-consumption

Author: NathanWalker

.github/workflows/dependency-review.yml

@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
+        uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1

.github/workflows/npm_release.yml

@@ -24,15 +24,15 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
           xcode-version: ${{env.XCODE_VERSION}}
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
       - name: LLVM cache
-        uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3.4.3
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ./llvm
           key: ${{ hashFiles('download_llvm.sh') }}
-      - uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 20
           registry-url: "https://registry.npmjs.org"
@@ -93,13 +93,13 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
           xcode-version: ${{env.XCODE_VERSION}}
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: LLVM cache
-        uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3.4.3
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ./llvm
           key: ${{ hashFiles('download_llvm.sh') }}
-      - uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 20
       - name: Install Python
@@ -164,11 +164,11 @@ jobs:
         uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
-      - uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 20
           registry-url: "https://registry.npmjs.org"
-      - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: npm-package
           path: dist
@@ -194,19 +194,19 @@ jobs:
         uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 20
       - name: Setup
         run: npm install
-      - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: npm-package
           path: dist
-      - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+      - uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: NativeScript-dSYMs
           path: dist/dSYMs

.github/workflows/pull_request.yml

@@ -13,15 +13,15 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
           xcode-version: ${{env.XCODE_VERSION}}
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           fetch-depth: 0
       - name: LLVM cache
-        uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3.4.3
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ./llvm
           key: ${{ hashFiles('download_llvm.sh') }}
-      - uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 20
       - name: Install Python
@@ -69,13 +69,13 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
         with:
           xcode-version: ${{env.XCODE_VERSION}}
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: LLVM cache
-        uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # v3.4.3
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ./llvm
           key: ${{ hashFiles('download_llvm.sh') }}
-      - uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610 # v3.9.1
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 20
       - name: Install Python

.github/workflows/scorecards.yml

@@ -33,7 +33,7 @@ jobs:
     steps:
 
       - name: "Checkout code"
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

CHANGELOG.md

@@ -1,3 +1,21 @@
+## [8.9.5](https://github.com/NativeScript/ios/compare/v8.9.4...v8.9.5) (2025-10-24)
+
+
+### Bug Fixes
+
+* make debugger log public ([#302](https://github.com/NativeScript/ios/issues/302)) ([e89067c](https://github.com/NativeScript/ios/commit/e89067cf0f57adcc2479642e4e043b6d6e0d8a0b))
+* prevent crash during debug on fast view churn (like with HMR) ([#294](https://github.com/NativeScript/ios/issues/294)) ([42a5328](https://github.com/NativeScript/ios/commit/42a5328f9e95b2298efe067485ac6775718d0510))
+* properly convert objective-c logs into os_log ([#301](https://github.com/NativeScript/ios/issues/301)) ([5733af1](https://github.com/NativeScript/ios/commit/5733af1abd896ef8902fbd5b0f57888e71d67d1b))
+* symbol loader log true errors only to not confuse terminal output ([#293](https://github.com/NativeScript/ios/issues/293)) ([7101127](https://github.com/NativeScript/ios/commit/710112731a9149020c49c2b2b34a82ebd39a2d49))
+* x86 simulators and add better failsafe around generated class names ([#303](https://github.com/NativeScript/ios/issues/303)) ([bb02623](https://github.com/NativeScript/ios/commit/bb02623415359d11cd9e17f3d6351c3b04c4f01d))
+
+
+### Features
+
+* queueMicrotask support ([#291](https://github.com/NativeScript/ios/issues/291)) ([b12d552](https://github.com/NativeScript/ios/commit/b12d5528885086335487bae4c62cab13ccdb841a))
+
+
+
 ## [8.9.4](https://github.com/NativeScript/ios/compare/v8.9.2...v8.9.3) (2025-09-09)
 
 

NativeScript/inspector/JsV8InspectorClient.mm

@@ -24,9 +24,9 @@
   [[NSString stringWithFormat:@"%@:NativeScript.Debug.%s", \
                               [[NSBundle mainBundle] bundleIdentifier], name] UTF8String]
 
-#define LOG_DEBUGGER_PORT(port)                                                        \
-  NSLog(@"NativeScript debugger has opened inspector socket on port %d for %@.", port, \
-        [[NSBundle mainBundle] bundleIdentifier])
+#define LOG_DEBUGGER_PORT(port)                                                      \
+  Log(@"NativeScript debugger has opened inspector socket on port %d for %@.", port, \
+      [[NSBundle mainBundle] bundleIdentifier])
 
 JsV8InspectorClient::JsV8InspectorClient(tns::Runtime* runtime)
     : runtime_(runtime), isolate_(runtime_->GetIsolate()), messages_(), runningNestedLoops_(false) {
@@ -578,4 +578,4 @@
 
 std::map<std::string, Persistent<Object>*> JsV8InspectorClient::Domains;
 
-}
+}  // namespace v8_inspector

NativeScript/runtime/ClassBuilder.cpp

@@ -1,47 +1,18 @@
 #include "ClassBuilder.h"
-#if TARGET_CPU_X86_64 || TARGET_CPU_X86
-#include "SpinLock.h"
-#endif
 
 namespace tns {
 
 // Moved this method in a separate .cpp file because ARC destroys the class
 // created with objc_allocateClassPair when the control leaves this method scope
-// TODO: revist this as there are x86 simulator issues, so maybe a lock is
-// needed regardless
+// TODO: revist this. Maybe a lock is needed regardless
 Class ClassBuilder::GetExtendedClass(std::string baseClassName,
-                                     std::string staticClassName) {
-#if TARGET_CPU_X86_64 || TARGET_CPU_X86
-  // X86 simulators have this bugged, so we fallback to old behavior
-  static SpinMutex m;
-  SpinLock lock(m);
+                                     std::string staticClassName,
+                                     std::string suffix) {
   Class baseClass = objc_getClass(baseClassName.c_str());
   std::string name =
       !staticClassName.empty()
           ? staticClassName
-          : baseClassName + "_" +
-                std::to_string(++ClassBuilder::classNameCounter_);
-  Class clazz = objc_getClass(name.c_str());
-
-  if (clazz != nil) {
-    int i = 1;
-    std::string initialName = name;
-    while (clazz != nil) {
-      name = initialName + std::to_string(i++);
-      clazz = objc_getClass(name.c_str());
-    }
-  }
-
-  clazz = objc_allocateClassPair(baseClass, name.c_str(), 0);
-
-  objc_registerClassPair(clazz);
-  return clazz;
-#else
-  Class baseClass = objc_getClass(baseClassName.c_str());
-  std::string name =
-      !staticClassName.empty()
-          ? staticClassName
-          : baseClassName + "_" +
+          : baseClassName + suffix + "_" +
                 std::to_string(++ClassBuilder::classNameCounter_);
   // here we could either call objc_getClass with the name to see if the class
   // already exists or we can just try allocating it, which will return nil if
@@ -60,7 +31,6 @@ Class ClassBuilder::GetExtendedClass(std::string baseClassName,
 
   objc_registerClassPair(clazz);
   return clazz;
-#endif
 }
 
 }  // namespace tns

NativeScript/runtime/ClassBuilder.h

@@ -23,13 +23,13 @@ struct PropertyCallbackContext {
 class ClassBuilder {
 public:
     static v8::Local<v8::FunctionTemplate> GetExtendFunction(v8::Isolate* isolate, const InterfaceMeta* interfaceMeta);
-    static Class GetExtendedClass(std::string baseClassName, std::string staticClassName);
+    static Class GetExtendedClass(std::string baseClassName, std::string staticClassName, std::string suffix);
 
     static void RegisterBaseTypeScriptExtendsFunction(v8::Local<v8::Context> context);
     static void RegisterNativeTypeScriptExtendsFunction(v8::Local<v8::Context> context);
     static std::string GetTypeEncoding(const TypeEncoding* typeEncoding, int argsCount);
 private:
-    static unsigned long long classNameCounter_;
+    static std::atomic<unsigned long long> classNameCounter_;
 
     static void ExtendCallback(const v8::FunctionCallbackInfo<v8::Value>& info);
     static void SuperAccessorGetterCallback(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value>& info);

NativeScript/runtime/ClassBuilder.mm

@@ -57,8 +57,10 @@
         staticClassName = tns::ToString(isolate, explicitClassName);
       }
     }
+    auto cache = Caches::Get(isolate);
+    auto isolateId = cache->getIsolateId();
 
-    Class extendedClass = ClassBuilder::GetExtendedClass(baseClassName, staticClassName);
+    Class extendedClass = ClassBuilder::GetExtendedClass(baseClassName, staticClassName, std::to_string(isolateId) + "_");
     class_addProtocol(extendedClass, @protocol(TNSDerivedClass));
     class_addProtocol(object_getClass(extendedClass), @protocol(TNSDerivedClass));
 
@@ -70,7 +72,6 @@
                                          implementationObject);
     }
 
-    auto cache = Caches::Get(isolate);
     Local<v8::Function> baseCtorFunc =
         cache->CtorFuncs.find(item->meta_->name())->second->Get(isolate);
 
@@ -212,8 +213,9 @@
         Local<v8::Function> extendedClassCtorFunc = info[0].As<v8::Function>();
         std::string extendedClassName = tns::ToString(isolate, extendedClassCtorFunc->GetName());
 
+        auto isolateId = cache->getIsolateId();
         __block Class extendedClass =
-            ClassBuilder::GetExtendedClass(baseClassName, extendedClassName);
+            ClassBuilder::GetExtendedClass(baseClassName, extendedClassName, std::to_string(isolateId) + "_");
         class_addProtocol(extendedClass, @protocol(TNSDerivedClass));
         class_addProtocol(object_getClass(extendedClass), @protocol(TNSDerivedClass));
 
@@ -984,6 +986,6 @@
   return class_getMethodImplementation(klass, method);
 }
 
-unsigned long long ClassBuilder::classNameCounter_ = 0;
+std::atomic<unsigned long long> ClassBuilder::classNameCounter_{0};
 
 }  // namespace tns

NativeScript/runtime/Helpers.h

@@ -219,8 +219,7 @@ bool IsArrayOrArrayLike(v8::Isolate* isolate,
 void* TryGetBufferFromArrayBuffer(const v8::Local<v8::Value>& value,
                                   bool& isArrayBuffer);
 
-void ExecuteOnRunLoop(CFRunLoopRef queue, std::function<void()> func,
-                      bool async = true);
+void ExecuteOnRunLoop(CFRunLoopRef queue, void (^func)(void), bool async = true);
 void ExecuteOnDispatchQueue(dispatch_queue_t queue, std::function<void()> func,
                             bool async = true);
 void ExecuteOnMainThread(std::function<void()> func, bool async = true);
@@ -240,47 +239,27 @@ static inline void TNS_FormatAndLog(NSString* fmt, ...) {
   va_list ap;
   va_start(ap, fmt);
 
-  // Convert NSString format to C string and delegate to the main implementation
-  const char* cFmt = [fmt UTF8String];
-  if (!cFmt) {
-    va_end(ap);
+  // Use NSString's formatting to handle both C and Objective-C format
+  // specifiers
+  NSString* formattedString =
+      [[NSString alloc] initWithFormat:fmt arguments:ap];
+  va_end(ap);
+
+  if (!formattedString) {
     return;
   }
 
-  // Fast path: try a reasonably sized stack buffer first
-  const int STACK_BUF_SIZE = 1024;
-  char stack_buf[STACK_BUF_SIZE];
-
-  va_list ap_copy;
-  va_copy(ap_copy, ap);
-  int needed = vsnprintf(stack_buf, STACK_BUF_SIZE, cFmt, ap_copy);
-  va_end(ap_copy);
-
-  if (needed < 0) {
-    va_end(ap);
+  // Convert to C string for logging
+  const char* cStr = [formattedString UTF8String];
+  if (!cStr) {
     return;
   }
 
-  if (needed < STACK_BUF_SIZE) {
-    // Message fit into stack buffer
-#if TNS_HAVE_OS_LOG
-    os_log(OS_LOG_DEFAULT, "%{public}s", stack_buf);
-#else
-    NSLog(@"%s", stack_buf);
-#endif
-  } else {
-    // Needs heap allocation
-    std::vector<char> buffer((size_t)needed + 1);
-    vsnprintf(buffer.data(), buffer.size(), cFmt, ap);
-
 #if TNS_HAVE_OS_LOG
-    os_log(OS_LOG_DEFAULT, "%{public}s", buffer.data());
+  os_log(OS_LOG_DEFAULT, "%{public}s", cStr);
 #else
-    NSLog(@"%s", buffer.data());
+  NSLog(@"%s", cStr);
 #endif
-  }
-
-  va_end(ap);
 }
 #endif
 
@@ -337,7 +316,7 @@ static inline void TNS_FormatAndLog(const char* fmt, ...) {
 }
 
 // Keep the existing Log(...) macro name for call-site compatibility.
-#define Log(...) TNS_FormatAndLog(__VA_ARGS__)
+#define Log(...) tns::TNS_FormatAndLog(__VA_ARGS__)
 
 v8::Local<v8::String> JsonStringifyObject(v8::Local<v8::Context> context,
                                           v8::Local<v8::Value> value,