expo-modules-core 0.8.0 → 0.9.2

package/ios/Tests/FunctionSpec.swift

@@ -10,7 +10,7 @@ class FunctionSpec: ExpoSpec {
     func testFunctionReturning<T: Equatable>(value returnValue: T) {
       waitUntil { done in
         mockModuleHolder(appContext) {
-          function(functionName) {
+          AsyncFunction(functionName) {
             return returnValue
           }
         }
@@ -26,7 +26,7 @@ class FunctionSpec: ExpoSpec {
     it("is called") {
       waitUntil { done in
         mockModuleHolder(appContext) {
-          function(functionName) {
+          AsyncFunction(functionName) {
             done()
           }
         }
@@ -59,7 +59,7 @@ class FunctionSpec: ExpoSpec {
       let str: String? = nil
 
       mockModuleHolder(appContext) {
-        function(functionName) { (a: String?) in
+        AsyncFunction(functionName) { (a: String?) in
           expect(a == nil) == true
         }
       }
@@ -70,7 +70,7 @@ class FunctionSpec: ExpoSpec {
       let array: [[String]] = [["expo"]]
 
       mockModuleHolder(appContext) {
-        function(functionName) { (a: [[String]]) in
+        AsyncFunction(functionName) { (a: [[String]]) in
           expect(a.first!.first) == array.first!.first
         }
       }
@@ -91,7 +91,7 @@ class FunctionSpec: ExpoSpec {
       it("converts to simple record when passed as an argument") {
         waitUntil { done in
           mockModuleHolder(appContext) {
-            function(functionName) { (a: TestRecord) in
+            AsyncFunction(functionName) { (a: TestRecord) in
               return a.property
             }
           }
@@ -107,7 +107,7 @@ class FunctionSpec: ExpoSpec {
       it("converts to record with custom key") {
         waitUntil { done in
           mockModuleHolder(appContext) {
-            function(functionName) { (a: TestRecord) in
+            AsyncFunction(functionName) { (a: TestRecord) in
               return a.customKeyProperty
             }
           }
@@ -123,7 +123,7 @@ class FunctionSpec: ExpoSpec {
       it("returns the record back") {
         waitUntil { done in
           mockModuleHolder(appContext) {
-            function(functionName) { (a: TestRecord) in
+            AsyncFunction(functionName) { (a: TestRecord) in
               return a.toDictionary()
             }
           }
@@ -144,15 +144,14 @@ class FunctionSpec: ExpoSpec {
     it("throws when called with more arguments than expected") {
       waitUntil { done in
         mockModuleHolder(appContext) {
-          function(functionName) { (_: Int) in
+          AsyncFunction(functionName) { (_: Int) in
             return "something"
           }
         }
         // Function expects one argument, let's give it more.
         .call(function: functionName, args: [1, 2]) { _, error in
           expect(error).notTo(beNil())
-          expect(error).to(beAKindOf(FunctionCallException.self))
-          expect((error as! Exception).isCausedBy(InvalidArgsNumberException.self)) == true
+          expect(error).to(beAKindOf(InvalidArgsNumberException.self))
           done()
         }
       }
@@ -161,14 +160,14 @@ class FunctionSpec: ExpoSpec {
     it("throws when called with arguments of incompatible types") {
       waitUntil { done in
         mockModuleHolder(appContext) {
-          function(functionName) { (_: String) in
+          AsyncFunction(functionName) { (_: String) in
             return "something"
           }
         }
         // Function expects a string, let's give it a number.
         .call(function: functionName, args: [1]) { value, error in
           expect(error).notTo(beNil())
-          expect(error).to(beAKindOf(FunctionCallException.self))
+          expect(error).to(beAKindOf(ArgumentCastException.self))
           expect((error as! Exception).isCausedBy(Conversions.CastingException<String>.self)) == true
           done()
         }

package/ios/Tests/FunctionWithConvertiblesSpec.swift

@@ -17,7 +17,7 @@ class FunctionWithConvertiblesSpec: ExpoSpec {
       let height = 592.1
 
       mockModuleHolder(appContext) {
-        function(functionName) { (point: CGPoint, size: CGSize, vector: CGVector, rect: CGRect) in
+        AsyncFunction(functionName) { (point: CGPoint, size: CGSize, vector: CGVector, rect: CGRect) in
           expect(point.x) == x
           expect(point.y) == y
           expect(size.width) == width
@@ -47,7 +47,7 @@ class FunctionWithConvertiblesSpec: ExpoSpec {
       }
 
       mockModuleHolder(appContext) {
-        function(functionName) { (color1: CGColor, color2: CGColor, color3: CGColor, color4: CGColor) in
+        AsyncFunction(functionName) { (color1: CGColor, color2: CGColor, color3: CGColor, color4: CGColor) in
           testColorComponents(color1, 0x2A, 0x4B, 0x5D, 0xFF)
           testColorComponents(color2, 0x11, 0xFF, 0x00, 0xDD)
           testColorComponents(color3, 0x66, 0x00, 0xCC, 0xAA)

package/ios/Tests/ModuleEventListenersSpec.swift

@@ -18,22 +18,22 @@ class ModuleEventListenersSpec: ExpoSpec {
       appContext = AppContext()
     }
 
-    it("calls onCreate once the module instance is created") {
+    it("calls OnCreate once the module instance is created") {
       waitUntil { done in
         _ = mockModuleHolder(appContext) {
-          $0.onCreate {
+          OnCreate {
             done()
           }
         }
       }
     }
 
-    it("calls onDestroy once the module is about to be deallocated") {
+    it("calls OnDestroy once the module is about to be deallocated") {
       waitUntil { done in
         let moduleName = "mockedModule"
         let holder = mockModuleHolder(appContext) {
-          $0.name(moduleName)
-          $0.onDestroy {
+          Name(moduleName)
+          OnDestroy {
             done()
           }
         }
@@ -44,10 +44,10 @@ class ModuleEventListenersSpec: ExpoSpec {
       }
     }
 
-    it("calls onAppContextDestroys once the context destroys") {
+    it("calls OnAppContextDestroys once the context destroys") {
       waitUntil { done in
         let holder = mockModuleHolder(appContext) {
-          $0.onAppContextDestroys {
+          OnAppContextDestroys {
             done()
           }
         }
@@ -69,10 +69,10 @@ class ModuleEventListenersSpec: ExpoSpec {
       }
     }
 
-    it("calls onAppEntersForeground when system's willEnterForegroundNotification is sent") {
+    it("calls OnAppEntersForeground when system's willEnterForegroundNotification is sent") {
       waitUntil { done in
         let holder = mockModuleHolder(appContext) {
-          $0.onAppEntersForeground {
+          OnAppEntersForeground {
             done()
           }
         }
@@ -81,10 +81,10 @@ class ModuleEventListenersSpec: ExpoSpec {
       }
     }
 
-    it("calls onAppBecomesActive when system's didBecomeActiveNotification is sent") {
+    it("calls OnAppBecomesActive when system's didBecomeActiveNotification is sent") {
       waitUntil { done in
         let holder = mockModuleHolder(appContext) {
-          $0.onAppBecomesActive {
+          OnAppBecomesActive {
             done()
           }
         }
@@ -93,10 +93,10 @@ class ModuleEventListenersSpec: ExpoSpec {
       }
     }
 
-    it("calls onAppEntersBackground when system's didEnterBackgroundNotification is sent") {
+    it("calls OnAppEntersBackground when system's didEnterBackgroundNotification is sent") {
       waitUntil { done in
         let holder = mockModuleHolder(appContext) {
-          $0.onAppEntersBackground {
+          OnAppEntersBackground {
             done()
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "0.8.0",
+  "version": "0.9.2",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
+  "gitHead": "464933d2189a33b02375b47cd655e87f5694afb4"
 }

package/ios/Swift/Functions/AsyncFunction.swift

@@ -1,17 +0,0 @@
-// Copyright 2022-present 650 Industries. All rights reserved.
-
-/**
- Represents a function that can only be called asynchronously, thus its JavaScript equivalent returns a Promise.
-
- - ToDo: Move some asynchronous logic from `ConcreteFunction` (like `call(args:promise:)`) to this class and drop the `isAsync` property.
- */
-public final class AsyncFunction<Args, ReturnType>: ConcreteFunction<Args, ReturnType> {
-  override init(
-    _ name: String,
-    argTypes: [AnyArgumentType],
-    _ closure: @escaping ConcreteFunction<Args, ReturnType>.ClosureType
-  ) {
-    super.init(name, argTypes: argTypes, closure)
-    self.isAsync = true
-  }
-}