expo-modules-core 0.6.4 → 0.8.0

package/ios/NativeModulesProxy/EXNativeModulesProxy.mm

@@ -17,11 +17,11 @@
 #import <ExpoModulesCore/EXViewManagerAdapterClassesRegistry.h>
 #import <ExpoModulesCore/EXModuleRegistryProvider.h>
 #import <ExpoModulesCore/EXReactNativeEventEmitter.h>
-#import <ExpoModulesCore/JSIInstaller.h>
+#import <ExpoModulesCore/EXJSIInstaller.h>
 #import <ExpoModulesCore/Swift.h>
 
 static const NSString *exportedMethodsNamesKeyPath = @"exportedMethods";
-static const NSString *viewManagersNamesKeyPath = @"viewManagersNames";
+static const NSString *viewManagersMetadataKeyPath = @"viewManagersMetadata";
 static const NSString *exportedConstantsKeyPath = @"modulesConstants";
 
 static const NSString *methodInfoKeyKey = @"key";
@@ -41,13 +41,6 @@ static const NSString *methodInfoArgumentsCountKey = @"argumentsCount";
 
 @end
 
-@interface RCTComponentData (EXNativeModulesProxy)
-
-- (instancetype)initWithManagerClass:(Class)managerClass bridge:(RCTBridge *)bridge eventDispatcher:(id<RCTEventDispatcherProtocol>) eventDispatcher; // available in RN 0.65+
-- (instancetype)initWithManagerClass:(Class)managerClass bridge:(RCTBridge *)bridge;
-
-@end
-
 @interface EXNativeModulesProxy ()
 
 @property (nonatomic, strong) NSRegularExpression *regexp;
@@ -97,8 +90,9 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
 
 - (NSDictionary *)constantsToExport
 {
-  // Install the TurboModule implementation of the proxy.
-  [self installExpoTurboModules];
+  // Install ExpoModules host object in the runtime. It's probably not the right place,
+  // but it's the earliest moment in bridge's lifecycle when we have access to the runtime.
+  [self installExpoModulesHostObject];
 
   NSMutableDictionary <NSString *, id> *exportedModulesConstants = [NSMutableDictionary dictionary];
   // Grab all the constants exported by modules
@@ -130,17 +124,21 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
   // Add entries from Swift modules
   [exportedMethodsNamesAccumulator addEntriesFromDictionary:[_swiftInteropBridge exportedFunctionNames]];
 
-  // Also, add `viewManagersNames` for sanity check and testing purposes -- with names we know what managers to mock on UIManager
+  // Also, add `viewManagersMetadata` for sanity check and testing purposes -- with names we know what managers to mock on UIManager
   NSArray<EXViewManager *> *viewManagers = [_exModuleRegistry getAllViewManagers];
-  NSMutableArray<NSString *> *viewManagersNames = [NSMutableArray arrayWithCapacity:[viewManagers count]];
+  NSMutableDictionary<NSString *, NSDictionary *> *viewManagersMetadata = [[NSMutableDictionary alloc] initWithCapacity:[viewManagers count]];
+
   for (EXViewManager *viewManager in viewManagers) {
-    [viewManagersNames addObject:[viewManager viewName]];
+    viewManagersMetadata[viewManager.viewName] = @{
+      @"propsNames": [[viewManager getPropsNames] allKeys]
+    };
   }
 
-  [viewManagersNames addObjectsFromArray:[_swiftInteropBridge exportedViewManagersNames]];
+  // Add entries from Swift view managers
+  [viewManagersMetadata addEntriesFromDictionary:[_swiftInteropBridge viewManagersMetadata]];
 
   NSMutableDictionary <NSString *, id> *constantsAccumulator = [NSMutableDictionary dictionary];
-  constantsAccumulator[viewManagersNamesKeyPath] = viewManagersNames;
+  constantsAccumulator[viewManagersMetadataKeyPath] = viewManagersMetadata;
   constantsAccumulator[exportedConstantsKeyPath] = exportedModulesConstants;
   constantsAccumulator[exportedMethodsNamesKeyPath] = exportedMethodsNamesAccumulator;
 
@@ -150,8 +148,18 @@ RCT_EXPORT_MODULE(NativeUnimoduleProxy)
 - (void)setBridge:(RCTBridge *)bridge
 {
   if (!_bridge) {
-    [self registerExpoModulesInBridge:bridge];
+    // The `setBridge` can be called during module setup or after. Registering more modules
+    // during setup causes a crash due to mutating `_moduleDataByID` while it's being enumerated.
+    // In that case we register them asynchronously.
+    if ([[bridge valueForKey:@"_moduleSetupComplete"] boolValue]) {
+      [self registerExpoModulesInBridge:bridge];
+    } else {
+      dispatch_async(dispatch_get_main_queue(), ^{
+        [self registerExpoModulesInBridge:bridge];
+      });
+    }
   }
+  [_swiftInteropBridge setReactBridge:bridge];
   _bridge = bridge;
 }
 
@@ -203,7 +211,7 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
 
 #pragma mark - Statics
 
-+ (id<ModulesProviderObjCProtocol>)getExpoModulesProvider
++ (ModulesProvider *)getExpoModulesProvider
 {
   // Dynamically gets the modules provider class.
   // NOTE: This needs to be versioned in Expo Go.
@@ -233,45 +241,49 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
 
 - (void)registerExpoModulesInBridge:(RCTBridge *)bridge
 {
-  // Registering expo modules in bridge is needed only when the proxy module owns the registry
-  // (was autoinitialized by React Native). Otherwise they're registered by the registry adapter.
-  if (!_ownsModuleRegistry || [bridge moduleIsInitialized:[EXReactNativeEventEmitter class]]) {
-    return;
-  }
+  // Registering expo modules (excluding Swifty view managers!) in bridge is needed only when the proxy module owns
+  // the registry (was autoinitialized by React Native). Otherwise they're registered by the registry adapter.
+  BOOL ownsModuleRegistry = _ownsModuleRegistry && ![bridge moduleIsInitialized:[EXReactNativeEventEmitter class]];
 
   // An array of `RCTBridgeModule` classes to register.
   NSMutableArray<Class<RCTBridgeModule>> *additionalModuleClasses = [NSMutableArray new];
   NSMutableSet *visitedSweetModules = [NSMutableSet new];
 
-  // Event emitter is a bridge module, however it's also needed by expo modules,
-  // so later we'll register an instance created by React Native as expo module.
-  [additionalModuleClasses addObject:[EXReactNativeEventEmitter class]];
-
   // Add dynamic wrappers for view modules written in Sweet API.
   for (ViewModuleWrapper *swiftViewModule in [_swiftInteropBridge getViewManagers]) {
-    Class wrappedViewModuleClass = [ViewModuleWrapper createViewModuleWrapperClassWithModule:swiftViewModule];
+    Class wrappedViewModuleClass = [self registerComponentData:swiftViewModule inBridge:bridge];
     [additionalModuleClasses addObject:wrappedViewModuleClass];
     [visitedSweetModules addObject:swiftViewModule.name];
   }
 
-  // Add dynamic wrappers for the classic view managers.
-  for (EXViewManager *viewManager in [_exModuleRegistry getAllViewManagers]) {
-    if (![visitedSweetModules containsObject:viewManager.viewName]) {
-      Class viewManagerWrapperClass = [EXViewManagerAdapterClassesRegistry createViewManagerAdapterClassForViewManager:viewManager];
-      [additionalModuleClasses addObject:viewManagerWrapperClass];
+  [additionalModuleClasses addObject:[ViewModuleWrapper class]];
+  [self registerLegacyComponentData:[ViewModuleWrapper class] inBridge:bridge];
+
+  // Add modules from legacy module registry only when the NativeModulesProxy owns the registry.
+  if (ownsModuleRegistry) {
+    // Event emitter is a bridge module, however it's also needed by expo modules,
+    // so later we'll register an instance created by React Native as expo module.
+    [additionalModuleClasses addObject:[EXReactNativeEventEmitter class]];
+
+    // Add dynamic wrappers for the classic view managers.
+    for (EXViewManager *viewManager in [_exModuleRegistry getAllViewManagers]) {
+      if (![visitedSweetModules containsObject:viewManager.viewName]) {
+        Class viewManagerWrapperClass = [EXViewManagerAdapterClassesRegistry createViewManagerAdapterClassForViewManager:viewManager];
+        [additionalModuleClasses addObject:viewManagerWrapperClass];
+        [self registerLegacyComponentData:viewManagerWrapperClass inBridge:bridge];
+      }
     }
-  }
 
-  // View manager wrappers don't have their own prop configs, so we must register
-  // their base view managers that provides common props such as `proxiedProperties`.
-  // Otherwise, React Native may treat these props as invalid in subclassing views.
-  [additionalModuleClasses addObject:[EXViewManagerAdapter class]];
-  [additionalModuleClasses addObject:[ViewModuleWrapper class]];
+    // View manager wrappers don't have their own prop configs, so we must register
+    // their base view managers that provides common props such as `proxiedProperties`.
+    // Otherwise, React Native may treat these props as invalid in subclassing views.
+    [additionalModuleClasses addObject:[EXViewManagerAdapter class]];
 
-  // Some modules might need access to the bridge.
-  for (id module in [_exModuleRegistry getAllInternalModules]) {
-    if ([module conformsToProtocol:@protocol(RCTBridgeModule)]) {
-      [module setValue:bridge forKey:@"bridge"];
+    // Some modules might need access to the bridge.
+    for (id module in [_exModuleRegistry getAllInternalModules]) {
+      if ([module conformsToProtocol:@protocol(RCTBridgeModule)]) {
+        [module setValue:bridge forKey:@"bridge"];
+      }
     }
   }
 
@@ -283,19 +295,19 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   // Register the view managers as additional modules.
   [self registerAdditionalModuleClasses:additionalModuleClasses inBridge:bridge];
 
-  // Bridge's `registerAdditionalModuleClasses:` method doesn't register
-  // components in UIManager — we need to register them on our own.
-  [self registerComponentDataForModuleClasses:additionalModuleClasses inBridge:bridge];
-
-  // Get the newly created instance of `EXReactEventEmitter` bridge module,
-  // pass event names supported by Swift modules and register it in legacy modules registry.
+  // Get the instance of `EXReactEventEmitter` bridge module and give it access to the interop bridge.
   EXReactNativeEventEmitter *eventEmitter = [bridge moduleForClass:[EXReactNativeEventEmitter class]];
   [eventEmitter setSwiftInteropBridge:_swiftInteropBridge];
-  [_exModuleRegistry registerInternalModule:eventEmitter];
 
-  // Let the modules consume the registry :)
-  // It calls `setModuleRegistry:` on all `EXModuleRegistryConsumer`s.
-  [_exModuleRegistry initialize];
+  // As the last step, when the registry is owned,
+  // register the event emitter and initialize the registry.
+  if (ownsModuleRegistry) {
+    [_exModuleRegistry registerInternalModule:eventEmitter];
+
+    // Let the modules consume the registry :)
+    // It calls `setModuleRegistry:` on all `EXModuleRegistryConsumer`s.
+    [_exModuleRegistry initialize];
+  }
 }
 
 - (void)registerAdditionalModuleClasses:(NSArray<Class> *)moduleClasses inBridge:(RCTBridge *)bridge
@@ -324,27 +336,38 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
   [bridge registerAdditionalModuleClasses:moduleClasses];
 }
 
-- (void)registerComponentDataForModuleClasses:(NSArray<Class> *)moduleClasses inBridge:(RCTBridge *)bridge
+- (Class)registerComponentData:(ViewModuleWrapper *)viewModule inBridge:(RCTBridge *)bridge
 {
   // Hacky way to get a dictionary with `RCTComponentData` from UIManager.
   NSMutableDictionary<NSString *, RCTComponentData *> *componentDataByName = [bridge.uiManager valueForKey:@"_componentDataByName"];
+  Class wrappedViewModuleClass = [ViewModuleWrapper createViewModuleWrapperClassWithModule:viewModule];
+  NSString *className = NSStringFromClass(wrappedViewModuleClass);
 
-  // Register missing components data for all view managers.
-  for (Class moduleClass in moduleClasses) {
-    NSString *className = NSStringFromClass(moduleClass);
-
-    if ([moduleClass isSubclassOfClass:[RCTViewManager class]] && !componentDataByName[className]) {
-      RCTComponentData *componentData = [RCTComponentData alloc];
-      if ([componentData respondsToSelector:@selector(initWithManagerClass:bridge:eventDispatcher:)]) {
-        // Init method was changed in RN 0.65
-        [componentData initWithManagerClass:moduleClass bridge:bridge eventDispatcher:bridge.eventDispatcher];
-      } else {
-        // fallback for older RNs
-        [componentData initWithManagerClass:moduleClass bridge:bridge];
-      }
-      
-      componentDataByName[className] = componentData;
-    }
+  if (componentDataByName[className]) {
+    // Just in case the component was already registered, let's leave a log that we're overriding it.
+    NSLog(@"Overriding ComponentData for view %@", className);
+  }
+
+  EXComponentData *componentData = [[EXComponentData alloc] initWithViewModule:viewModule
+                                                                  managerClass:wrappedViewModuleClass
+                                                                        bridge:bridge];
+  componentDataByName[className] = componentData;
+  return wrappedViewModuleClass;
+}
+
+/**
+ Bridge's `registerAdditionalModuleClasses:` method doesn't register
+ components in UIManager — we need to register them on our own.
+ */
+- (void)registerLegacyComponentData:(Class)moduleClass inBridge:(RCTBridge *)bridge
+{
+  // Hacky way to get a dictionary with `RCTComponentData` from UIManager.
+  NSMutableDictionary<NSString *, RCTComponentData *> *componentDataByName = [bridge.uiManager valueForKey:@"_componentDataByName"];
+  NSString *className = NSStringFromClass(moduleClass);
+
+  if ([moduleClass isSubclassOfClass:[RCTViewManager class]] && !componentDataByName[className]) {
+    RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:moduleClass bridge:bridge eventDispatcher:bridge.eventDispatcher];
+    componentDataByName[className] = componentData;
   }
 }
 
@@ -380,14 +403,17 @@ RCT_EXPORT_METHOD(callMethod:(NSString *)moduleName methodNameOrKey:(id)methodNa
 }
 
 /**
- Installs expo modules in JSI runtime.
+ Installs ExpoModules host object in the runtime that the current bridge operates on.
  */
-- (void)installExpoTurboModules
+- (void)installExpoModulesHostObject
 {
-  facebook::jsi::Runtime *runtime = [_bridge respondsToSelector:@selector(runtime)] ? reinterpret_cast<facebook::jsi::Runtime *>(_bridge.runtime) : NULL;
+  facebook::jsi::Runtime *jsiRuntime = [_bridge respondsToSelector:@selector(runtime)] ? reinterpret_cast<facebook::jsi::Runtime *>(_bridge.runtime) : nullptr;
+
+  if (jsiRuntime) {
+    EXJavaScriptRuntime *runtime = [[EXJavaScriptRuntime alloc] initWithRuntime:jsiRuntime callInvoker:_bridge.jsCallInvoker];
 
-  if (runtime) {
-    expo::installRuntimeObjects(*runtime, _bridge.jsCallInvoker, self);
+    [EXJavaScriptRuntimeManager installExpoModulesToRuntime:runtime withSwiftInterop:_swiftInteropBridge];
+    [_swiftInteropBridge setRuntime:runtime];
   }
 }
 

package/ios/RCTComponentData+Privates.h

@@ -0,0 +1,12 @@
+// Copyright 2021-present 650 Industries. All rights reserved.
+
+#import <React/RCTComponent.h>
+#import <React/RCTComponentData.h>
+
+typedef void (^RCTPropBlockAlias)(id<RCTComponent> _Nonnull view, id _Nullable json);
+
+@interface RCTComponentData (Privates)
+
+- (nonnull RCTPropBlockAlias)createPropBlock:(nonnull NSString *)name isShadowView:(BOOL)isShadowView;
+
+@end

package/ios/ReactDelegates/EXReactCompatibleHelpers.h

@@ -0,0 +1,18 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import <UIKit/UIKit.h>
+
+#import <ExpoModulesCore/EXDefines.h>
+#import <React/RCTBridge.h>
+
+
+EX_EXTERN_C_BEGIN
+
+/**
+ * Backward compatible version of `RCTAppSetupDefaultRootView`.
+ *
+ * `RCTAppSetupDefaultRootView` is introduced in react-native 0.68. To make `expo-modules-core` compatible with older react-native,  introduces this compatible helper.
+ */
+UIView *EXAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties);
+
+EX_EXTERN_C_END

package/ios/ReactDelegates/EXReactCompatibleHelpers.m

@@ -0,0 +1,19 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import <ExpoModulesCore/EXReactCompatibleHelpers.h>
+
+#import <React/RCTRootView.h>
+
+#if __has_include(<React/RCTAppSetupUtils.h>)
+#import <React/RCTAppSetupUtils.h>
+#endif
+
+UIView *EXAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties)
+{
+#if __has_include(<React/RCTAppSetupUtils.h>)
+  return RCTAppSetupDefaultRootView(bridge, moduleName, initialProperties);
+#else
+  return [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
+#endif
+}
+

package/ios/ReactDelegates/ExpoReactDelegate.swift

@@ -12,7 +12,7 @@ public class ExpoReactDelegate: NSObject {
   }
 
   @objc
-  public func createBridge(delegate: RCTBridgeDelegate, launchOptions: [AnyHashable : Any]?) -> RCTBridge {
+  public func createBridge(delegate: RCTBridgeDelegate, launchOptions: [AnyHashable: Any]?) -> RCTBridge {
     self.handlers.forEach { $0.bridgeWillCreate() }
     let result = self.handlers.lazy
       .compactMap { $0.createBridge(reactDelegate: self, bridgeDelegate: delegate, launchOptions: launchOptions) }
@@ -22,10 +22,10 @@ public class ExpoReactDelegate: NSObject {
   }
 
   @objc
-  public func createRootView(bridge: RCTBridge, moduleName: String, initialProperties: [AnyHashable : Any]?) -> RCTRootView {
+  public func createRootView(bridge: RCTBridge, moduleName: String, initialProperties: [AnyHashable: Any]?) -> UIView {
     return self.handlers.lazy
       .compactMap { $0.createRootView(reactDelegate: self, bridge: bridge, moduleName: moduleName, initialProperties: initialProperties) }
-      .first(where: { _ in true }) ?? RCTRootView(bridge: bridge, moduleName: moduleName, initialProperties: initialProperties)
+      .first(where: { _ in true }) ?? EXAppSetupDefaultRootView(bridge, moduleName, initialProperties)
   }
 
   @objc

package/ios/ReactDelegates/ExpoReactDelegateHandler.swift

@@ -1,6 +1,6 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
-import Foundation
+import React
 
 /**
  The handler for `ExpoReactDelegate`. A module can implement a handler to process react instance creation.
@@ -14,7 +14,7 @@ open class ExpoReactDelegateHandler: NSObject {
    Otherwise return nil.
    */
   @objc
-  open func createBridge(reactDelegate: ExpoReactDelegate, bridgeDelegate: RCTBridgeDelegate, launchOptions: [AnyHashable : Any]?) -> RCTBridge? {
+  open func createBridge(reactDelegate: ExpoReactDelegate, bridgeDelegate: RCTBridgeDelegate, launchOptions: [AnyHashable: Any]?) -> RCTBridge? {
     return nil
   }
 
@@ -23,7 +23,7 @@ open class ExpoReactDelegateHandler: NSObject {
    Otherwise return nil.
    */
   @objc
-  open func createRootView(reactDelegate: ExpoReactDelegate, bridge: RCTBridge, moduleName: String, initialProperties: [AnyHashable : Any]?) -> RCTRootView? {
+  open func createRootView(reactDelegate: ExpoReactDelegate, bridge: RCTBridge, moduleName: String, initialProperties: [AnyHashable: Any]?) -> RCTRootView? {
     return nil
   }
 
@@ -36,7 +36,7 @@ open class ExpoReactDelegateHandler: NSObject {
     return nil
   }
 
-  // MARK - event callbacks
+  // MARK: - event callbacks
 
   /**
    Callback before bridge creation

package/ios/ReactDelegates/ModulePriorities.swift

@@ -11,7 +11,7 @@ internal struct ModulePriorities {
     // key: node package name
     // value: priority value, the higher value takes precedence
     "expo-screen-orientation": 10,
-    "expo-updates": 5,
+    "expo-updates": 5
   ]
 
   static func get(_ packageName: String) -> Int {

package/ios/Swift/AppContext.swift

@@ -3,6 +3,13 @@ import UIKit
  The app context is an interface to a single Expo app.
  */
 public final class AppContext {
+  internal static func create() -> AppContext {
+    let appContext = AppContext()
+
+    appContext.runtime = JavaScriptRuntime()
+    return appContext
+  }
+
   /**
    The module registry for the app context.
    */
@@ -13,6 +20,25 @@ public final class AppContext {
    */
   public private(set) var legacyModuleRegistry: EXModuleRegistry?
 
+  /**
+   React bridge of the context's app.
+   */
+  public internal(set) weak var reactBridge: RCTBridge?
+
+  /**
+   JSI runtime of the running app.
+   */
+  public internal(set) var runtime: JavaScriptRuntime? {
+    didSet {
+      // When the runtime is unpinned from the context (e.g. deallocated),
+      // we should make sure to release all JS objects from the memory.
+      // Otherwise the JSCRuntime asserts may fail on deallocation.
+      if runtime == nil {
+        releaseRuntimeObjects()
+      }
+    }
+  }
+
   /**
    Designated initializer without modules provider.
    */
@@ -78,6 +104,13 @@ public final class AppContext {
     return legacyModule(implementing: EXEventEmitterService.self)
   }
 
+  /**
+   Provides access to the logger from legacy module registry.
+   */
+  public var logger: EXLogManager? {
+    return legacyModuleRegistry?.getSingletonModule(forName: EXLogManager.name()) as? EXLogManager
+  }
+
   /**
    Starts listening to `UIApplication` notifications.
    */
@@ -85,7 +118,7 @@ public final class AppContext {
     [
       UIApplication.willEnterForegroundNotification,
       UIApplication.didBecomeActiveNotification,
-      UIApplication.didEnterBackgroundNotification,
+      UIApplication.didEnterBackgroundNotification
     ].forEach { name in
       NotificationCenter.default.addObserver(self, selector: #selector(handleClientAppNotification(_:)), name: name, object: nil)
     }
@@ -108,6 +141,25 @@ public final class AppContext {
     }
   }
 
+  // MARK: - Runtime
+
+  internal func installExpoModulesHostObject(_ interopBridge: SwiftInteropBridge) throws {
+    guard let runtime = runtime else {
+      throw UndefinedRuntimeException()
+    }
+    EXJavaScriptRuntimeManager.installExpoModules(to: runtime, withSwiftInterop: interopBridge)
+  }
+  /**
+   Unsets runtime objects that we hold for each module.
+   */
+  private func releaseRuntimeObjects() {
+    for module in moduleRegistry {
+      module.javaScriptObject = nil
+    }
+  }
+
+  // MARK: - Deallocation
+
   /**
    Cleans things up before deallocation.
    */
@@ -116,9 +168,17 @@ public final class AppContext {
     moduleRegistry.post(event: .appContextDestroys)
   }
 
-  // MARK: Errors
+  // MARK: - Exceptions
 
-  struct DeallocatedAppContextError: CodedError {
-    var description: String = "The app context has been deallocated."
+  class DeallocatedAppContextException: Exception {
+    override var reason: String {
+      "The AppContext has been deallocated"
+    }
+  }
+
+  class UndefinedRuntimeException: Exception {
+    override var reason: String {
+      "The AppContext has undefined runtime"
+    }
   }
 }

package/ios/Swift/Arguments/ArgumentType.swift

@@ -1,5 +1,9 @@
 // Copyright 2021-present 650 Industries. All rights reserved.
 
+// Function names should start with a lowercase character, but in this one case
+// we want it to be uppercase as we treat it more like a generic class.
+// swiftlint:disable identifier_name
+
 /**
  Factory creating an instance of the argument type wrapper conforming to `AnyArgumentType`.
  Depending on the given type, it may return one of `ArrayArgumentType`, `OptionalArgumentType`, `ConvertibleArgumentType`, etc.

package/ios/Swift/Arguments/Convertibles.swift

@@ -3,11 +3,11 @@
 import UIKit
 import CoreGraphics
 
-/// Here we extend some common iOS types to implement `ConvertibleArgument` protocol and
-/// describe how they can be converted from primitive types received from JavaScript runtime.
-/// This allows these types to be used as argument types of functions callable from JavaScript.
-/// As an example, when the `CGPoint` type is used as an argument type, its instance can be
-/// created from an array of two doubles or an object with `x` and `y` fields.
+// Here we extend some common iOS types to implement `ConvertibleArgument` protocol and
+// describe how they can be converted from primitive types received from JavaScript runtime.
+// This allows these types to be used as argument types of functions callable from JavaScript.
+// As an example, when the `CGPoint` type is used as an argument type, its instance can be
+// created from an array of two doubles or an object with `x` and `y` fields.
 
 // MARK: - Foundation
 
@@ -19,7 +19,7 @@ extension URL: ConvertibleArgument {
       // If it has no scheme, we assume it was the file path.
       return url.scheme != nil ? url : URL(fileURLWithPath: uri)
     }
-    throw Conversions.ConvertingError<URL>(value: value)
+    throw Conversions.ConvertingException<URL>(value)
   }
 }
 
@@ -37,7 +37,7 @@ extension UIColor: ConvertibleArgument {
     if let value = value as? Int {
       return try Conversions.toColor(argb: UInt64(value)) as! Self
     }
-    throw Conversions.ConvertingError<UIColor>(value: value)
+    throw Conversions.ConvertingException<UIColor>(value)
   }
 }
 
@@ -52,7 +52,7 @@ extension CGPoint: ConvertibleArgument {
       let args = try Conversions.pickValues(from: value, byKeys: ["x", "y"], as: Double.self)
       return CGPoint(x: args[0], y: args[1])
     }
-    throw Conversions.ConvertingError<CGPoint>(value: value)
+    throw Conversions.ConvertingException<CGPoint>(value)
   }
 }
 
@@ -65,7 +65,7 @@ extension CGSize: ConvertibleArgument {
       let args = try Conversions.pickValues(from: value, byKeys: ["width", "height"], as: Double.self)
       return CGSize(width: args[0], height: args[1])
     }
-    throw Conversions.ConvertingError<CGSize>(value: value)
+    throw Conversions.ConvertingException<CGSize>(value)
   }
 }
 
@@ -78,7 +78,7 @@ extension CGVector: ConvertibleArgument {
       let args = try Conversions.pickValues(from: value, byKeys: ["dx", "dy"], as: Double.self)
       return CGVector(dx: args[0], dy: args[1])
     }
-    throw Conversions.ConvertingError<CGVector>(value: value)
+    throw Conversions.ConvertingException<CGVector>(value)
   }
 }
 
@@ -91,7 +91,7 @@ extension CGRect: ConvertibleArgument {
       let args = try Conversions.pickValues(from: value, byKeys: ["x", "y", "width", "height"], as: Double.self)
       return CGRect(x: args[0], y: args[1], width: args[2], height: args[3])
     }
-    throw Conversions.ConvertingError<CGRect>(value: value)
+    throw Conversions.ConvertingException<CGRect>(value)
   }
 }
 
@@ -99,9 +99,9 @@ extension CGColor: ConvertibleArgument {
   public static func convert(from value: Any?) throws -> Self {
     do {
       return try UIColor.convert(from: value).cgColor as! Self
-    } catch _ as Conversions.ConvertingError<UIColor> {
+    } catch _ as Conversions.ConvertingException<UIColor> {
       // Rethrow `ConvertingError` with proper type
-      throw Conversions.ConvertingError<CGColor>(value: value)
+      throw Conversions.ConvertingException<CGColor>(value)
     }
   }
 }

package/ios/Swift/Arguments/Types/EnumArgumentType.swift

@@ -43,10 +43,10 @@ public protocol EnumArgument: AnyArgument {
 public extension EnumArgument where Self: RawRepresentable, Self: Hashable {
   static func create<ArgType>(fromRawValue rawValue: ArgType) throws -> Self {
     guard let rawValue = rawValue as? RawValue else {
-      throw EnumCastingError(type: RawValue.self, value: rawValue)
+      throw EnumCastingException((type: RawValue.self, value: rawValue))
     }
     guard let enumCase = Self.init(rawValue: rawValue) else {
-      throw EnumNoSuchValueError(type: Self.self, value: rawValue)
+      throw EnumNoSuchValueException((type: Self.self, value: rawValue))
     }
     return enumCase
   }
@@ -75,31 +75,25 @@ public extension EnumArgument where Self: RawRepresentable, Self: Hashable {
 }
 
 /**
- An error that is thrown when the value cannot be casted to associated `RawValue`.
+ An error that is thrown when the value cannot be cast to associated `RawValue`.
  */
-internal struct EnumCastingError: CodedError {
-  let type: Any.Type
-  let value: Any
-
-  var description: String {
-    "Cannot cast value `\(value)` to expected type `\(type)`"
+internal class EnumCastingException: GenericException<(type: Any.Type, value: Any)> {
+  override var reason: String {
+    "Unable to cast '\(param.value)' to expected type \(param.type)"
   }
 }
 
 /**
  An error that is thrown when the value doesn't match any available case.
  */
-internal struct EnumNoSuchValueError: CodedError {
-  let type: EnumArgument.Type
-  let value: Any
-
+internal class EnumNoSuchValueException: GenericException<(type: EnumArgument.Type, value: Any)> {
   var allRawValuesFormatted: String {
-    return type.allRawValues
-      .map { "`\($0)`" }
+    return param.type.allRawValues
+      .map { "'\($0)'" }
       .joined(separator: ", ")
   }
 
-  var description: String {
-    "Cannot create `\(type)` enum from value `\(value)`. It must be one of: \(allRawValuesFormatted)"
+  override var reason: String {
+    "'\(param.value)' is not present in \(param.type) enum, it must be one of: \(allRawValuesFormatted)"
   }
 }