diff --git a/packages/react-native/ReactCommon/jsi/jsi/decorator.h b/packages/react-native/ReactCommon/jsi/jsi/decorator.h index f101c1832e6..b78aa14214d 100644 --- a/packages/react-native/ReactCommon/jsi/jsi/decorator.h +++ b/packages/react-native/ReactCommon/jsi/jsi/decorator.h @@ -243,6 +243,10 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation { return plain_.utf16(sym); } + size_t length(const String& str) override { + return plain_.length(str); + } + void getStringData( const jsi::String& str, void* ctx, @@ -822,6 +826,11 @@ class WithRuntimeDecorator : public RuntimeDecorator { return RD::utf16(sym); } + size_t length(const String& str) override { + Around around{with_}; + return RD::length(str); + } + void getStringData( const jsi::String& str, void* ctx, diff --git a/packages/react-native/ReactCommon/jsi/jsi/test/testlib.cpp b/packages/react-native/ReactCommon/jsi/jsi/test/testlib.cpp index 9c056ef0379..38e2fc328b1 100644 --- a/packages/react-native/ReactCommon/jsi/jsi/test/testlib.cpp +++ b/packages/react-native/ReactCommon/jsi/jsi/test/testlib.cpp @@ -138,6 +138,61 @@ TEST_P(JSITest, StringLengthTest) { EXPECT_EQ(invalid.length(rt), 2); } +TEST_P(JSITest, DecoratorForwardsStringLength) { + // Decorators should forward length(const String&) to the decorated runtime + // instead of falling back to the default Runtime::length, which copies the + // string via utf16() and bypasses the runtime's own implementation. + class Inner : public RuntimeDecorator { + public: + explicit Inner(Runtime& rt) : RuntimeDecorator(rt) {} + + size_t length(const String&) override { + ++lengthCalls; + return 42; + } + + std::u16string utf16(const String& str) override { + ++utf16Calls; + return RuntimeDecorator::utf16(str); + } + + int lengthCalls = 0; + int utf16Calls = 0; + }; + + class Outer : public RuntimeDecorator { + public: + explicit Outer(Runtime& rt) : RuntimeDecorator(rt) {} + }; + + struct Count { + void before() { + ++beforeCalls; + } + void after() { + ++afterCalls; + } + int beforeCalls = 0; + int afterCalls = 0; + }; + + Inner inner(rt); + String str = String::createFromAscii(inner, "hello"); + + Outer outer(inner); + EXPECT_EQ(str.length(outer), 42); + EXPECT_EQ(inner.lengthCalls, 1); + EXPECT_EQ(inner.utf16Calls, 0); + + Count count; + WithRuntimeDecorator with(inner, count); + EXPECT_EQ(str.length(with), 42); + EXPECT_EQ(inner.lengthCalls, 2); + EXPECT_EQ(inner.utf16Calls, 0); + EXPECT_EQ(count.beforeCalls, 1); + EXPECT_EQ(count.afterCalls, 1); +} + TEST_P(JSITest, ObjectTest) { eval("x = {1:2, '3':4, 5:'six', 'seven':['eight', 'nine']}"); Object x = rt.global().getPropertyAsObject(rt, "x"); diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api index 26a0e9aae1c..1458d1fd6e0 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -12784,6 +12784,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -12902,6 +12903,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api index df56ecd8860..b53bb3d44cf 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -12400,6 +12400,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -12518,6 +12519,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; diff --git a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api index 477acb18084..e58c3cf65e8 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -12631,6 +12631,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -12749,6 +12750,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index 49083a64beb..193fb5bb024 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -14545,6 +14545,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -14663,6 +14664,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index 31970c885ee..81674ace5e1 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -14227,6 +14227,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -14345,6 +14346,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index b53af145f6b..db9d046d055 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -14402,6 +14402,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -14520,6 +14521,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api index d535a900430..ca287d50b95 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -9731,6 +9731,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -9849,6 +9850,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api index 1cc76431096..55d897711b2 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -9555,6 +9555,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -9673,6 +9674,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; diff --git a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api index 59516a749ad..f9313a060c5 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -9722,6 +9722,7 @@ class facebook::jsi::RuntimeDecorator : public facebook::jsi::Runtime { protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override; @@ -9840,6 +9841,7 @@ class facebook::jsi::WithRuntimeDecorator : public facebook::jsi::RuntimeDecorat protected virtual facebook::jsi::WeakObject createWeakObject(const facebook::jsi::Object& o) override; protected virtual size_t byteLength(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t byteOffset(const facebook::jsi::TypedArray& typedArray) override; + protected virtual size_t length(const facebook::jsi::String& str) override; protected virtual size_t length(const facebook::jsi::TypedArray& typedArray) override; protected virtual size_t push(const facebook::jsi::Array& a, const facebook::jsi::Value* elements, size_t count) override; protected virtual size_t size(const facebook::jsi::Array& a) override;