refactor(Worklets): move PlatformLogger (#6794)

## Summary `PlatformLogger` remained in Reanimated during early steps of establishing Worklets Module due to how difficult it was to move it back then. Now it's very simple, so let's do it. ## Test plan See in app if `LogExample` works.
software-mansion · Dec 6, 2024 · b79faa3 · b79faa3
1 parent cf1f618
commit b79faa3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 44 deletions.
diff --git a/...ges/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp b/...ges/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp
@@ -1,5 +1,4 @@
 #include <reanimated/NativeModules/ReanimatedModuleProxy.h>
-#include <reanimated/RuntimeDecorators/ReanimatedWorkletRuntimeDecorator.h>
 #include <reanimated/RuntimeDecorators/UIRuntimeDecorator.h>
 #include <reanimated/Tools/CollectionUtils.h>
 #include <reanimated/Tools/FeaturesConfig.h>
@@ -242,7 +241,6 @@ jsi::Value ReanimatedModuleProxy::createWorkletRuntime(
   auto initializerShareable = extractShareableOrThrow<ShareableWorklet>(
       rt, initializer, "[Reanimated] Initializer must be a worklet.");
   workletRuntime->runGuarded(initializerShareable);
-  ReanimatedWorkletRuntimeDecorator::decorate(workletRuntime->getJSIRuntime());
   return jsi::Object::createFromHostObject(rt, workletRuntime);
 }
 

diff --git a/...-reanimated/Common/cpp/reanimated/RuntimeDecorators/ReanimatedWorkletRuntimeDecorator.cpp b/...-reanimated/Common/cpp/reanimated/RuntimeDecorators/ReanimatedWorkletRuntimeDecorator.cpp
diff --git a/...ve-reanimated/Common/cpp/reanimated/RuntimeDecorators/ReanimatedWorkletRuntimeDecorator.h b/...ve-reanimated/Common/cpp/reanimated/RuntimeDecorators/ReanimatedWorkletRuntimeDecorator.h
diff --git a/...mon/cpp/reanimated/Tools/PlatformLogger.h → ...ommon/cpp/worklets/Tools/PlatformLogger.h b/...mon/cpp/reanimated/Tools/PlatformLogger.h → ...ommon/cpp/worklets/Tools/PlatformLogger.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-namespace reanimated {
+namespace worklets {
 
 class PlatformLogger {
  public:
@@ -13,4 +13,4 @@ class PlatformLogger {
   static void log(const bool b);
 };
 
-} // namespace reanimated
+} // namespace worklets
diff --git a/...es/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/WorkletRuntimeDecorator.cpp b/...es/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/WorkletRuntimeDecorator.cpp
@@ -1,5 +1,6 @@
 #include <worklets/SharedItems/Shareables.h>
 #include <worklets/Tools/JSISerializer.h>
+#include <worklets/Tools/PlatformLogger.h>
 #include <worklets/Tools/ReanimatedJSIUtils.h>
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 #include <worklets/WorkletRuntime/WorkletRuntimeDecorator.h>
@@ -76,6 +77,11 @@ void WorkletRuntimeDecorator::decorate(
           evalWithSourceUrl));
 #endif // NDEBUG
 
+  jsi_utils::installJsiFunction(
+      rt, "_log", [](jsi::Runtime &rt, const jsi::Value &value) {
+        PlatformLogger::log(stringifyJSIValue(rt, value));
+      });
+
   jsi_utils::installJsiFunction(
       rt, "_toString", [](jsi::Runtime &rt, const jsi::Value &value) {
         return jsi::String::createFromUtf8(rt, stringifyJSIValue(rt, value));

diff --git a/...cpp/reanimated/android/PlatformLogger.cpp → ...n/cpp/worklets/android/PlatformLogger.cpp b/...cpp/reanimated/android/PlatformLogger.cpp → ...n/cpp/worklets/android/PlatformLogger.cpp
@@ -1,10 +1,10 @@
 #include <android/log.h>
 
-#include <reanimated/Tools/PlatformLogger.h>
+#include <worklets/Tools/PlatformLogger.h>
 
-constexpr const auto tag = "Reanimated";
+constexpr const auto tag = "Worklets";
 
-namespace reanimated {
+namespace worklets {
 
 void PlatformLogger::log(const char *str) {
   __android_log_print(ANDROID_LOG_VERBOSE, tag, "%s", str);
@@ -26,4 +26,4 @@ void PlatformLogger::log(const bool b) {
   log(b ? "true" : "false");
 }
 
-} // namespace reanimated
+} // namespace worklets
diff --git a/...reanimated/apple/native/PlatformLogger.mm → ...ed/apple/worklets/apple/PlatformLogger.mm b/...reanimated/apple/native/PlatformLogger.mm → ...ed/apple/worklets/apple/PlatformLogger.mm
@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
-#import <reanimated/Tools/PlatformLogger.h>
+#import <worklets/Tools/PlatformLogger.h>
 
-namespace reanimated {
+namespace worklets {
 
 void PlatformLogger::log(const char *str)
 {
@@ -28,4 +28,4 @@
   log(b ? "true" : "false");
 }
 
-} // namespace reanimated
+} // namespace worklets