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 dbc39b765f3..fd6f06c9d6c 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api @@ -12836,6 +12836,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; @@ -12954,6 +12955,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 2e0f57b2235..da6710b8ab0 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api @@ -12449,6 +12449,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; @@ -12567,6 +12568,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 c057c28b79b..91197294e5a 100644 --- a/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api @@ -12680,6 +12680,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; @@ -12798,6 +12799,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 d60317dda7f..2c41c3d94cf 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -14644,6 +14644,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; @@ -14762,6 +14763,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 edf8c0cd490..c27b6b6806b 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -14323,6 +14323,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; @@ -14441,6 +14442,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 4e964faacfe..2e7c4cda3a0 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -14498,6 +14498,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; @@ -14616,6 +14617,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 97903e19cc4..42a23f135e2 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonDebugCxx.api @@ -9755,6 +9755,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; @@ -9873,6 +9874,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 48a176dc704..5bce141ec8f 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonNewarchCxx.api @@ -9579,6 +9579,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; @@ -9697,6 +9698,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 3eef4b97c94..a263c5af295 100644 --- a/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactCommonReleaseCxx.api @@ -9746,6 +9746,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; @@ -9864,6 +9865,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;