react-native-windows 0.78.5 → 0.78.6

package/Microsoft.ReactNative.Cxx/JSI/JsiApiContext.cpp

@@ -10,20 +10,12 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 namespace winrt::Microsoft::ReactNative {
 
-// Try to get JSI Runtime for the current JS dispatcher thread.
+namespace Details {
+// Try to get JSI Runtime for the ReactContext
 // If it is not found, then create it based on context JSI runtime and store it in the context.Properties().
 // The function returns nullptr if the current context does not have JSI runtime.
 // It makes sure that the JSI runtime holder is removed when the instance is unloaded.
-facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context) noexcept {
-  ReactDispatcher jsDispatcher = context.JSDispatcher();
-  VerifyElseCrashSz(jsDispatcher.HasThreadAccess(), "Must be in JS thread");
-
-  // The JSI runtime is not available if we do Web debugging when JS is running in web browser.
-  JsiRuntime abiJsiRuntime = context.Handle().JSRuntime().as<JsiRuntime>();
-  if (!abiJsiRuntime) {
-    return nullptr;
-  }
-
+JsiAbiRuntime *TryGetOrCreateContextRuntime(ReactContext const &context, JsiRuntime const &abiJsiRuntime) noexcept {
   // See if the JSI runtime was previously created.
   JsiAbiRuntime *runtime = JsiAbiRuntime::GetFromJsiRuntime(abiJsiRuntime);
   if (!runtime) {
@@ -57,6 +49,48 @@ facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context
   return runtime;
 }
 
+} // namespace Details
+
+facebook::jsi::Runtime *TryGetOrCreateContextRuntime(
+    ReactContext const &context,
+    winrt::Windows::Foundation::IInspectable const &runtimeHandle) noexcept {
+  if (!runtimeHandle) {
+    return nullptr;
+  }
+
+  // The JSI runtime is not available if we do Web debugging when JS is running in web browser.
+  JsiRuntime abiJsiRuntime = runtimeHandle.as<JsiRuntime>();
+  if (!abiJsiRuntime) {
+    return nullptr;
+  }
+
+  return Details::TryGetOrCreateContextRuntime(context, abiJsiRuntime);
+}
+
+// Note: deprecated in favor of TryGetOrCreateContextRuntime with Handle parameter
+facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context) noexcept {
+#ifdef DEBUG
+  ReactDispatcher jsDispatcher = context.JSDispatcher();
+  VerifyElseCrashSz(jsDispatcher.HasThreadAccess(), "Must be in JS thread");
+#endif
+
+  if (auto runtimeHandle = context.Handle().JSRuntime()) {
+    return TryGetOrCreateContextRuntime(context, runtimeHandle);
+  }
+
+  return nullptr;
+}
+
+// Calls TryGetOrCreateContextRuntime to get JSI runtime.
+// It crashes when TryGetOrCreateContextRuntime returns null.
+[[deprecated]] facebook::jsi::Runtime &GetOrCreateContextRuntime(
+    ReactContext const &context,
+    winrt::Windows::Foundation::IInspectable const &runtimeHandle) noexcept {
+  facebook::jsi::Runtime *runtime = TryGetOrCreateContextRuntime(context, runtimeHandle);
+  VerifyElseCrashSz(runtime, "JSI runtime is not available");
+  return *runtime;
+}
+
 // Calls TryGetOrCreateContextRuntime to get JSI runtime.
 // It crashes when TryGetOrCreateContextRuntime returns null.
 // Note: deprecated in favor of TryGetOrCreateContextRuntime.

package/Microsoft.ReactNative.Cxx/JSI/JsiApiContext.h

@@ -11,10 +11,15 @@
 
 namespace winrt::Microsoft::ReactNative {
 
+facebook::jsi::Runtime &GetOrCreateContextRuntime(
+    ReactContext const &context,
+    winrt::Windows::Foundation::IInspectable const &runtimeHandle) noexcept;
+
 // Try to get JSI Runtime for the current JS dispatcher thread.
 // If it is not found, then create it based on context JSI runtime and store it in the context.Properties().
 // The function returns nullptr if the current context does not have JSI runtime.
 // It makes sure that the JSI runtime holder is removed when the instance is unloaded.
+// Deprecated -- will remove once we remove the JSRuntime property from ReactContext
 facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context) noexcept;
 
 // Calls TryGetOrCreateContextRuntime to get JSI runtime.
@@ -25,6 +30,7 @@ facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context
 // Call provided lambda with the facebook::jsi::Runtime& parameter.
 // For example: ExecuteJsi(context, [](facebook::jsi::Runtime& runtime){...})
 // The code is executed synchronously if it is already in JSDispatcher, or asynchronously otherwise.
+// New Arch should use ReactContext.CallInvoker instead
 template <class TCodeWithRuntime>
 void ExecuteJsi(ReactContext const &context, TCodeWithRuntime const &code, ReactPromise<void> *callStatus = nullptr) {
   ReactDispatcher jsDispatcher = context.JSDispatcher();

package/Microsoft.ReactNative.Cxx/JSI/decorator.h

@@ -126,6 +126,11 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
       const std::shared_ptr<const PreparedJavaScript>& js) override {
     return plain().evaluatePreparedJavaScript(js);
   }
+#if JSI_VERSION >= 12
+  void queueMicrotask(const jsi::Function& callback) override {
+    return plain().queueMicrotask(callback);
+  }
+#endif
 #if JSI_VERSION >= 4
   bool drainMicrotasks(int maxMicrotasksHint) override {
     return plain().drainMicrotasks(maxMicrotasksHint);
@@ -183,6 +188,12 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
   PropNameID createPropNameIDFromString(const String& str) override {
     return plain_.createPropNameIDFromString(str);
   };
+#if JSI_VERSION >= 19
+  PropNameID createPropNameIDFromUtf16(const char16_t* utf16, size_t length)
+      override {
+    return plain_.createPropNameIDFromUtf16(utf16, length);
+  }
+#endif
 #if JSI_VERSION >= 5
   PropNameID createPropNameIDFromSymbol(const Symbol& sym) override {
     return plain_.createPropNameIDFromSymbol(sym);
@@ -226,10 +237,48 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
   String createStringFromUtf8(const uint8_t* utf8, size_t length) override {
     return plain_.createStringFromUtf8(utf8, length);
   };
+#if JSI_VERSION >= 19
+  String createStringFromUtf16(const char16_t* utf16, size_t length) override {
+    return plain_.createStringFromUtf16(utf16, length);
+  }
+#endif
   std::string utf8(const String& s) override {
     return plain_.utf8(s);
   }
 
+#if JSI_VERSION >= 14
+  std::u16string utf16(const String& str) override {
+    return plain_.utf16(str);
+  }
+  std::u16string utf16(const PropNameID& sym) override {
+    return plain_.utf16(sym);
+  }
+#endif
+
+#if JSI_VERSION >= 16
+  void getStringData(
+      const jsi::String& str,
+      void* ctx,
+      void (
+          *cb)(void* ctx, bool ascii, const void* data, size_t num)) override {
+    plain_.getStringData(str, ctx, cb);
+  }
+
+  void getPropNameIdData(
+      const jsi::PropNameID& sym,
+      void* ctx,
+      void (
+          *cb)(void* ctx, bool ascii, const void* data, size_t num)) override {
+    plain_.getPropNameIdData(sym, ctx, cb);
+  }
+#endif
+
+#if JSI_VERSION >= 18
+  Object createObjectWithPrototype(const Value& prototype) override {
+    return plain_.createObjectWithPrototype(prototype);
+  }
+#endif
+
   Object createObject() override {
     return plain_.createObject();
   };
@@ -268,6 +317,16 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
   }
 #endif
 
+#if JSI_VERSION >= 17
+  void setPrototypeOf(const Object& object, const Value& prototype) override {
+    plain_.setPrototypeOf(object, prototype);
+  }
+
+  Value getPrototypeOf(const Object& object) override {
+    return plain_.getPrototypeOf(object);
+  }
+#endif
+
   Value getProperty(const Object& o, const PropNameID& name) override {
     return plain_.getProperty(o, name);
   };
@@ -427,13 +486,29 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
     plain().instrumentation().stopHeapSampling(os);
   }
 
+#if JSI_VERSION >= 13
+  void createSnapshotToFile(
+      const std::string& path,
+      const HeapSnapshotOptions& options) override {
+    plain().instrumentation().createSnapshotToFile(path, options);
+  }
+#else
   void createSnapshotToFile(const std::string& path) override {
     plain().instrumentation().createSnapshotToFile(path);
   }
+#endif
 
+#if JSI_VERSION >= 13
+  void createSnapshotToStream(
+      std::ostream& os,
+      const HeapSnapshotOptions& options) override {
+    plain().instrumentation().createSnapshotToStream(os, options);
+  }
+#else
   void createSnapshotToStream(std::ostream& os) override {
     plain().instrumentation().createSnapshotToStream(os);
   }
+#endif
 
   std::string flushAndDisableBridgeTrafficTrace() override {
     return const_cast<Plain&>(plain())
@@ -562,6 +637,12 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     Around around{with_};
     return RD::evaluatePreparedJavaScript(js);
   }
+#if JSI_VERSION >= 12
+  void queueMicrotask(const Function& callback) override {
+    Around around{with_};
+    RD::queueMicrotask(callback);
+  }
+#endif
 #if JSI_VERSION >= 4
   bool drainMicrotasks(int maxMicrotasksHint) override {
     Around around{with_};
@@ -595,6 +676,12 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     Around around{with_};
     return RD::cloneSymbol(pv);
   };
+#if JSI_VERSION >= 6
+  Runtime::PointerValue* cloneBigInt(const Runtime::PointerValue* pv) override {
+    Around around{with_};
+    return RD::cloneBigInt(pv);
+  };
+#endif
   Runtime::PointerValue* cloneString(const Runtime::PointerValue* pv) override {
     Around around{with_};
     return RD::cloneString(pv);
@@ -619,10 +706,23 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     Around around{with_};
     return RD::createPropNameIDFromUtf8(utf8, length);
   };
+#if JSI_VERSION >= 19
+  PropNameID createPropNameIDFromUtf16(const char16_t* utf16, size_t length)
+      override {
+    Around around{with_};
+    return RD::createPropNameIDFromUtf16(utf16, length);
+  }
+#endif
   PropNameID createPropNameIDFromString(const String& str) override {
     Around around{with_};
     return RD::createPropNameIDFromString(str);
   };
+#if JSI_VERSION >= 5
+  PropNameID createPropNameIDFromSymbol(const Symbol& sym) override {
+    Around around{with_};
+    return RD::createPropNameIDFromSymbol(sym);
+  };
+#endif
   std::string utf8(const PropNameID& id) override {
     Around around{with_};
     return RD::utf8(id);
@@ -637,6 +737,33 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     return RD::symbolToString(sym);
   };
 
+#if JSI_VERSION >= 8
+  BigInt createBigIntFromInt64(int64_t i) override {
+    Around around{with_};
+    return RD::createBigIntFromInt64(i);
+  };
+  BigInt createBigIntFromUint64(uint64_t i) override {
+    Around around{with_};
+    return RD::createBigIntFromUint64(i);
+  };
+  bool bigintIsInt64(const BigInt& bi) override {
+    Around around{with_};
+    return RD::bigintIsInt64(bi);
+  };
+  bool bigintIsUint64(const BigInt& bi) override {
+    Around around{with_};
+    return RD::bigintIsUint64(bi);
+  };
+  uint64_t truncate(const BigInt& bi) override {
+    Around around{with_};
+    return RD::truncate(bi);
+  };
+  String bigintToString(const BigInt& bi, int i) override {
+    Around around{with_};
+    return RD::bigintToString(bi, i);
+  };
+#endif
+
   String createStringFromAscii(const char* str, size_t length) override {
     Around around{with_};
     return RD::createStringFromAscii(str, length);
@@ -645,11 +772,60 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     Around around{with_};
     return RD::createStringFromUtf8(utf8, length);
   };
+#if JSI_VERSION >= 19
+  String createStringFromUtf16(const char16_t* utf16, size_t length) override {
+    Around around{with_};
+    return RD::createStringFromUtf16(utf16, length);
+  }
+#endif
   std::string utf8(const String& s) override {
     Around around{with_};
     return RD::utf8(s);
   }
 
+#if JSI_VERSION >= 14
+  std::u16string utf16(const String& str) override {
+    Around around{with_};
+    return RD::utf16(str);
+  }
+  std::u16string utf16(const PropNameID& sym) override {
+    Around around{with_};
+    return RD::utf16(sym);
+  }
+#endif
+
+#if JSI_VERSION >= 16
+  void getStringData(
+      const jsi::String& str,
+      void* ctx,
+      void (
+          *cb)(void* ctx, bool ascii, const void* data, size_t num)) override {
+    Around around{with_};
+    RD::getStringData(str, ctx, cb);
+  }
+
+  void getPropNameIdData(
+      const jsi::PropNameID& sym,
+      void* ctx,
+      void (
+          *cb)(void* ctx, bool ascii, const void* data, size_t num)) override {
+    Around around{with_};
+    RD::getPropNameIdData(sym, ctx, cb);
+  }
+#endif
+
+  Value createValueFromJsonUtf8(const uint8_t* json, size_t length) override {
+    Around around{with_};
+    return RD::createValueFromJsonUtf8(json, length);
+  };
+
+#if JSI_VERSION >= 18
+  Object createObjectWithPrototype(const Value& prototype) override {
+    Around around{with_};
+    return RD::createObjectWithPrototype(prototype);
+  }
+#endif
+
   Object createObject() override {
     Around around{with_};
     return RD::createObject();
@@ -667,6 +843,34 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     return RD::getHostFunction(f);
   };
 
+#if JSI_VERSION >= 7
+  bool hasNativeState(const Object& o) override {
+    Around around{with_};
+    return RD::hasNativeState(o);
+  };
+  std::shared_ptr<NativeState> getNativeState(const Object& o) override {
+    Around around{with_};
+    return RD::getNativeState(o);
+  };
+  void setNativeState(const Object& o, std::shared_ptr<NativeState> state)
+      override {
+    Around around{with_};
+    RD::setNativeState(o, state);
+  };
+#endif
+
+#if JSI_VERSION >= 17
+  void setPrototypeOf(const Object& object, const Value& prototype) override {
+    Around around{with_};
+    RD::setPrototypeOf(object, prototype);
+  }
+
+  Value getPrototypeOf(const Object& object) override {
+    Around around{with_};
+    return RD::getPrototypeOf(object);
+  }
+#endif
+
   Value getProperty(const Object& o, const PropNameID& name) override {
     Around around{with_};
     return RD::getProperty(o, name);
@@ -800,6 +1004,14 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     Around around{with_};
     return RD::strictEquals(a, b);
   };
+
+#if JSI_VERSION >= 6
+  bool strictEquals(const BigInt& a, const BigInt& b) const override {
+    Around around{with_};
+    return RD::strictEquals(a, b);
+  };
+#endif
+
   bool strictEquals(const String& a, const String& b) const override {
     Around around{with_};
     return RD::strictEquals(a, b);
@@ -814,6 +1026,14 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     return RD::instanceOf(o, f);
   };
 
+#if JSI_VERSION >= 11
+  void setExternalMemoryPressure(const jsi::Object& obj, size_t amount)
+      override {
+    Around around{with_};
+    RD::setExternalMemoryPressure(obj, amount);
+  };
+#endif
+
  private:
   // Wrap an RAII type around With& to guarantee after always happens.
   struct Around {

package/Microsoft.ReactNative.Cxx/JSI/instrumentation.h

@@ -25,6 +25,14 @@ namespace jsi {
 /// it modify the values of any jsi values in the heap (although GCs are fine).
 class JSI_EXPORT Instrumentation {
  public:
+#if JSI_VERSION >= 13
+  /// Additional options controlling what to include when capturing a heap
+  /// snapshot.
+  struct HeapSnapshotOptions {
+    bool captureNumericValue{false};
+  };
+#endif
+
   virtual ~Instrumentation() = default;
 
   /// Returns GC statistics as a JSON-encoded string, with an object containing
@@ -89,15 +97,35 @@ class JSI_EXPORT Instrumentation {
   /// \p os. The output is a JSON formatted string.
   virtual void stopHeapSampling(std::ostream& os) = 0;
 
+#if JSI_VERSION >= 13
+  /// Captures the heap to a file
+  ///
+  /// \param path to save the heap capture.
+  /// \param options additional options for what to capture.
+  virtual void createSnapshotToFile(
+      const std::string& path,
+      const HeapSnapshotOptions& options = {false}) = 0;
+#else
   /// Captures the heap to a file
   ///
   /// \param path to save the heap capture
   virtual void createSnapshotToFile(const std::string& path) = 0;
+#endif
 
+#if JSI_VERSION >= 13
+  /// Captures the heap to an output stream
+  ///
+  /// \param os output stream to write to.
+  /// \param options additional options for what to capture.
+  virtual void createSnapshotToStream(
+      std::ostream& os,
+      const HeapSnapshotOptions& options = {false}) = 0;
+#else
   /// Captures the heap to an output stream
   ///
   /// \param os output stream to write to.
   virtual void createSnapshotToStream(std::ostream& os) = 0;
+#endif
 
   /// If the runtime has been created to trace to a temp file, flush
   /// any unwritten parts of the trace of bridge traffic to the file,

package/Microsoft.ReactNative.Cxx/JSI/jsi-inl.h

@@ -86,6 +86,12 @@ inline const Runtime::PointerValue* Runtime::getPointerValue(
   return value.data_.pointer.ptr_;
 }
 
+#if JSI_VERSION >= 17
+Value Object::getPrototype(Runtime& runtime) const {
+  return runtime.getPrototypeOf(*this);
+}
+#endif
+
 inline Value Object::getProperty(Runtime& runtime, const char* name) const {
   return getProperty(runtime, String::createFromAscii(runtime, name));
 }