expo-modules-jsi 58.0.4 → 58.0.6

package/apple/Sources/ExpoModulesJSI-Cxx/include/HostObjectCallbacks.h

@@ -4,6 +4,7 @@
 
 #include <swift/bridging>
 #include <jsi/jsi.h>
+#include <string>
 
 #include "RetainedSwiftPointer.h"
 
@@ -20,16 +21,24 @@ public:
   // Swift side can fill the caller's slot from inside its guaranteed-reference scope.
   // Both return whether the Swift side stored an error in `CppError`'s thread-local slot, so the
   // caller reads that slot only when needed.
-  using Getter = bool(Context, const char *_Nonnull name, facebook::jsi::Value *_Nonnull result);
-  using Setter = bool(Context, const char *_Nonnull name, void *_Nonnull value);
+  using Getter = bool(Context, const facebook::jsi::PropNameID *_Nonnull name, facebook::jsi::Value *_Nonnull result);
+  using Setter = bool(Context, const facebook::jsi::PropNameID *_Nonnull name, void *_Nonnull value);
   using PropertyNamesGetter = PropNameIds(Context);
   using Deallocator = void(Context);
 
-  explicit HostObjectCallbacks(Context context, Getter getter, Setter *_Nullable setter, PropertyNamesGetter propertyNamesGetter, Deallocator deallocator)
+  explicit HostObjectCallbacks(Context context, Getter getter, Setter setter, PropertyNamesGetter propertyNamesGetter, Deallocator deallocator)
   : _context(context), _getter(getter), _setter(setter), _propertyNamesGetter(propertyNamesGetter), _deallocator(deallocator) {}
 
-  inline bool get(const char *_Nonnull name, facebook::jsi::Value &result) const {
-    return _getter(_context, name, &result);
+  /**
+   Creates callbacks for a read-only host object: assignment from JavaScript throws a `jsi::JSError`
+   without calling into Swift. A separate constructor rather than a nullable setter, because Swift can't
+   pass a function reference where an optional C function pointer is expected.
+   */
+  explicit HostObjectCallbacks(Context context, Getter getter, PropertyNamesGetter propertyNamesGetter, Deallocator deallocator)
+  : _context(context), _getter(getter), _setter(nullptr), _propertyNamesGetter(propertyNamesGetter), _deallocator(deallocator) {}
+
+  inline bool get(const facebook::jsi::PropNameID &name, facebook::jsi::Value &result) const {
+    return _getter(_context, &name, &result);
   }
 
   /**
@@ -41,16 +50,16 @@ public:
    JSI call frame above this on the stack; calling outside that context will surface
    the throw as an unhandled C++ exception.
    */
-  inline bool set(facebook::jsi::Runtime &runtime, const char *_Nonnull name, const facebook::jsi::Value &value) const {
+  inline bool set(facebook::jsi::Runtime &runtime, const facebook::jsi::PropNameID &name, const facebook::jsi::Value &value) const {
     if (_setter == nullptr) {
       throw facebook::jsi::JSError(
         runtime,
-        std::string("Cannot set property '") + name + "' on a read-only host object: "
+        std::string("Cannot set property '") + name.utf8(runtime) + "' on a read-only host object: "
           "no setter was provided when the host object was created. "
           "Pass a `set` closure to `createHostObject` to make this property writable."
       );
     }
-    return _setter(_context, name, (void *)(&value));
+    return _setter(_context, &name, (void *)(&value));
   }
 
   inline PropNameIds getPropertyNames() const {

package/apple/Sources/ExpoModulesJSI-Cxx/include/JSIUtils.h

@@ -228,6 +228,26 @@ inline void getStringData(
 #endif
 }
 
+/**
+ Same as `getStringData`, but for a `jsi::PropNameID`.
+ */
+inline void getPropNameIdData(
+  jsi::IRuntime &runtime,
+  const jsi::PropNameID &propNameId,
+  void *ctx,
+  void (*callback)(void *_Nullable ctx, bool ascii, const void *_Nullable data, size_t num)
+) {
+#if defined(REACT_NATIVE_VERSION_MAJOR) && defined(REACT_NATIVE_VERSION_MINOR) && \
+    (REACT_NATIVE_VERSION_MAJOR > 0 || REACT_NATIVE_VERSION_MINOR >= 86)
+  runtime.getPropNameIdData(propNameId, ctx, callback);
+#else
+  auto forward = [ctx, callback](bool ascii, const void *data, size_t num) {
+    callback(ctx, ascii, data, num);
+  };
+  propNameId.getPropNameIdData(runtime, forward);
+#endif
+}
+
 // MARK: - ArrayBuffer
 
 /**

package/apple/Tests/JavaScriptRuntimeTests.swift

@@ -280,6 +280,46 @@ struct JavaScriptRuntimeTests {
     #expect(result.getString() == "hello")
   }
 
+  @Test
+  func `host object receives non-ASCII property names`() throws {
+    var receivedNames: [String] = []
+    var setNames: [String] = []
+
+    let hostObject = runtime.createHostObject(
+      get: { name in
+        receivedNames.append(name)
+        return .undefined
+      },
+      set: { name, _ in
+        setNames.append(name)
+      }
+    )
+
+    runtime.global().setProperty("hostObj", value: hostObject.asValue())
+    _ = try runtime.eval("globalThis.hostObj['właściwość']; globalThis.hostObj['🚀'] = 1")
+
+    #expect(receivedNames == ["właściwość"])
+    #expect(setNames == ["🚀"])
+  }
+
+  @Test
+  func `host object receives long property names`() throws {
+    var receivedName: String?
+    let longName = String(repeating: "a", count: 300)
+
+    let hostObject = runtime.createHostObject(
+      get: { name in
+        receivedName = name
+        return .undefined
+      }
+    )
+
+    runtime.global().setProperty("hostObj", value: hostObject.asValue())
+    _ = try runtime.eval("globalThis.hostObj['\(longName)']")
+
+    #expect(receivedName == longName)
+  }
+
   @Test
   func `isHostObject distinguishes host objects from plain ones`() {
     let hostObject = runtime.createHostObject(

package/apple/Tests/JavaScriptValueTests.swift

@@ -726,3 +726,21 @@ struct JavaScriptValueTests {
     #expect(pointee1 == pointee2)
   }
 }
+
+@Suite
+@JavaScriptActor
+struct JavaScriptValueRuntimeLifetimeTests {
+  @Test
+  func `runtime-free value kinds keep working after the runtime is gone`() throws {
+    var runtime: JavaScriptRuntime? = JavaScriptRuntime()
+    let bool = JavaScriptValue(runtime!, true)
+
+    // Values don't keep the runtime alive, so this deallocates it.
+    runtime = nil
+
+    // A boolean doesn't need the runtime, so these take the runtime-free paths instead of trapping.
+    #expect(try bool.jsonStringify() == "true")
+    #expect(bool.copy().getBool() == true)
+    #expect(bool.isEqual(to: .true()))
+  }
+}

package/apple/Tests/JavaScriptValuesBufferTests.swift

@@ -15,6 +15,20 @@ struct JavaScriptValuesBufferTests {
     #expect(try buffer[2].asBool() == true)
   }
 
+  @Test
+  func `copying accepts runtime-free values`() throws {
+    let buffer = JavaScriptValuesBuffer.copying(
+      in: runtime,
+      values: [.undefined, .null, .number(1), .true(), JavaScriptValue(runtime, "four")]
+    )
+    #expect(buffer.count == 5)
+    #expect(buffer[0].isUndefined())
+    #expect(buffer[1].isNull())
+    #expect(try buffer[2].asInt() == 1)
+    #expect(try buffer[3].asBool() == true)
+    #expect(try buffer[4].asString() == "four")
+  }
+
   @Test
   func `empty buffer has zero count and deinits cleanly`() {
     let buffer = JavaScriptValuesBuffer.allocate(in: runtime, capacity: 0)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-jsi",
-  "version": "58.0.4",
+  "version": "58.0.6",
   "description": "The JavaScript Interface for Expo Modules",
   "main": "index.js",
   "sideEffects": [],
@@ -41,7 +41,6 @@
       "./apple/scripts/test.sh"
     ]
   },
-  "gitHead": "ad41d067bd3df6dd12f1788acc6b54a68e7a650d",
   "scripts": {
     "benchmark": "TEST_RUNNER_EXPO_BENCHMARK=1 DESTINATION=\"${DESTINATION:-platform=macOS,variant=Mac Catalyst}\" apple/scripts/test.sh -configuration Release -only-testing Benchmarks -enableCodeCoverage NO",
     "build:xcframework": "apple/scripts/build-xcframework.sh",

package/apple/.generated/module.modulemap

@@ -1,6 +0,0 @@
-module jsi {
-  header "/Users/alanhughes/Work/expo/packages/expo-modules-jsi/.expo-prebuild/pods-stage/Headers/Public/React-jsi/jsi/jsi.h"
-  header "/Users/alanhughes/Work/expo/packages/expo-modules-jsi/.expo-prebuild/pods-stage/Headers/Public/React-jsi/jsi/instrumentation.h"
-
-  export *
-}

package/apple/Products/ExpoModulesJSI.xcframework/Info.plist

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>AvailableLibraries</key>
-  <array>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>ios-arm64</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>ios</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>ios-arm64_x86_64-maccatalyst</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-        <string>x86_64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>ios</string>
-      <key>SupportedPlatformVariant</key>
-      <string>maccatalyst</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>ios-arm64_x86_64-simulator</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-        <string>x86_64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>ios</string>
-      <key>SupportedPlatformVariant</key>
-      <string>simulator</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>macos-arm64_x86_64</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-        <string>x86_64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>macos</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>tvos-arm64</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>tvos</string>
-    </dict>
-    <dict>
-      <key>BinaryPath</key>
-      <string>ExpoModulesJSI.framework/ExpoModulesJSI</string>
-      <key>LibraryIdentifier</key>
-      <string>tvos-arm64_x86_64-simulator</string>
-      <key>LibraryPath</key>
-      <string>ExpoModulesJSI.framework</string>
-      <key>SupportedArchitectures</key>
-      <array>
-        <string>arm64</string>
-        <string>x86_64</string>
-      </array>
-      <key>SupportedPlatform</key>
-      <string>tvos</string>
-      <key>SupportedPlatformVariant</key>
-      <string>simulator</string>
-    </dict>
-  </array>
-  <key>CFBundlePackageType</key>
-  <string>XFWK</string>
-  <key>XCFrameworkFormatVersion</key>
-  <string>1.0</string>
-</dict>
-</plist>