expo-modules-core 55.0.2 → 55.0.4

package/ios/DevTools/ModuleDefinitionEncoder.swift

@@ -16,7 +16,12 @@ class ModuleDefinitionEncoder: Encodable {
   func encode(to encoder: Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
     try container.encode(definition.name, forKey: .name)
-    try container.encode(definition.legacyConstants.map({ LegacyConstantsDefinitionEncoder($0) }), forKey: .constants)
+    var allConstants: [[ConstantEncoder]] = []
+    allConstants.append(contentsOf: definition.legacyConstants.map({ LegacyConstantsDefinitionEncoder($0).getEncoders() }))
+    if !definition.constants.isEmpty {
+      allConstants.append(definition.constants.values.map({ ConstantEncoder($0.name, value: $0.getRawValue()) }))
+    }
+    try container.encode(allConstants, forKey: .constants)
     try container.encode(definition.properties.values.map({ PropertyDefinitionEncoder($0) }), forKey: .properties)
     try container.encode(definition.functions.values.map({ FunctionDefinitionEncoder($0) }), forKey: .functions)
     try container.encode(definition.views.values.map({ ViewDefinitionEncoder($0) }), forKey: .views)
@@ -130,10 +135,10 @@ class ConstantEncoder: Encodable {
     case nil:
       try container.encodeNil(forKey: .value)
       try container.encode("null", forKey: .type)
-    case let value as [String: Any]:
+    case _ as [String: Any]:
       try container.encodeNil(forKey: .value)
       try container.encode("object", forKey: .type)
-    case let value as [Any]:
+    case _ as [Any]:
       try container.encodeNil(forKey: .value)
       try container.encode("array", forKey: .type)
     default:
@@ -143,24 +148,16 @@ class ConstantEncoder: Encodable {
   }
 }
 
-class LegacyConstantsDefinitionEncoder: Encodable {
+class LegacyConstantsDefinitionEncoder {
   private let definition: ConstantsDefinition
 
   init(_ definition: ConstantsDefinition) {
     self.definition = definition
   }
 
-  enum CodingKeys: String, CodingKey {
-    case name
-    case value
-  }
-
-  func encode(to encoder: Encoder) throws {
-    var container = encoder.unkeyedContainer()
+  func getEncoders() -> [ConstantEncoder] {
     let constants = definition.body()
-    for (key, value) in constants {
-      try container.encode(ConstantEncoder(key, value: value))
-    }
+    return constants.map { (key, value) in ConstantEncoder(key, value: value) }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "55.0.2",
+  "version": "55.0.4",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@testing-library/react-native": "^13.2.0",
-    "expo-module-scripts": "^55.0.1"
+    "expo-module-scripts": "^55.0.2"
   },
-  "gitHead": "9e6e4e518083f0516edf32a14a39f8afbbd049e4"
+  "gitHead": "7d7f6762fc6907c27a329953c682134a84410dea"
 }

package/android/src/main/cpp/WeakRuntimeHolder.cpp

@@ -1,24 +0,0 @@
-#include "WeakRuntimeHolder.h"
-#include "JavaScriptRuntime.h"
-#include "JSIContext.h"
-
-namespace expo {
-WeakRuntimeHolder::WeakRuntimeHolder(std::weak_ptr<JavaScriptRuntime> runtime)
-  : std::weak_ptr<JavaScriptRuntime>(std::move(runtime)) {}
-
-jsi::Runtime &WeakRuntimeHolder::getJSRuntime() const {
-  auto runtime = lock();
-  assert((runtime != nullptr) && "JS Runtime was used after deallocation");
-  return runtime->get();
-}
-
-void WeakRuntimeHolder::ensureRuntimeIsValid() {
-  assert((!expired()) && "JS Runtime was used after deallocation");
-}
-
-JSIContext *WeakRuntimeHolder::getJSIContext() {
-  auto runtime = lock();
-  assert((runtime != nullptr) && "JS Runtime was used after deallocation");
-  return expo::getJSIContext(runtime->get());
-}
-} // namespace expo

package/android/src/main/cpp/WeakRuntimeHolder.h

@@ -1,40 +0,0 @@
-// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
-
-#pragma once
-
-#include <jsi/jsi.h>
-
-#include <memory>
-
-namespace jsi = facebook::jsi;
-
-namespace expo {
-
-class JavaScriptRuntime;
-
-class JSIContext;
-
-/**
- * A convenient class to access underlying jni::Runtime and hold a weak reference to expo::JavaScriptRuntime.
- * It's working like std::weak_ptr but can have more helper methods.
- */
-class WeakRuntimeHolder : public std::weak_ptr<JavaScriptRuntime> {
-public:
-  WeakRuntimeHolder() = default;
-
-  WeakRuntimeHolder(WeakRuntimeHolder const &) = default;
-
-  WeakRuntimeHolder(WeakRuntimeHolder &&) = default;
-
-  WeakRuntimeHolder(std::weak_ptr<JavaScriptRuntime> runtime);
-
-  /**
-   * @return an reference to the jsi::Runtime.
-   */
-  jsi::Runtime &getJSRuntime() const;
-
-  JSIContext *getJSIContext();
-
-  void ensureRuntimeIsValid();
-};
-} // namespace expo