all: add modulemap for swift module

Author: ThomasMengelatte

RNBatchPush.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
 
   s.dependency "React"
   s.dependency 'Batch', '~> 2.1.0'
-
+  s.module_map "RNBatch.modulemap"
 end

ios/RNBatch.modulemap

@@ -0,0 +1,7 @@
+framework module RNBatch {
+    
+    umbrella header "RNBatch.h"
+    
+    export *
+    module * { export * }
+}

plugin/src/__tests__/withReactNativeBatchAppDelegate.test.ts

@@ -1,4 +1,5 @@
 import { appDelegateExpectedFixture, appDelegateFixture } from '../fixtures/appDelegate';
+import { swift_appDelegateExpectedFixture, swift_appDelegateFixture } from '../fixtures/swift_appDelegate';
 import { modifyAppDelegate } from '../ios/withReactNativeBatchAppDelegate';
 
 describe(modifyAppDelegate, () => {
@@ -8,3 +9,11 @@ describe(modifyAppDelegate, () => {
     expect(result).toEqual(appDelegateExpectedFixture);
   });
 });
+
+describe(modifyAppDelegate, () => {
+  it('should modify the swift_AppDelegate', () => {
+    const result = modifyAppDelegate(swift_appDelegateFixture);
+
+    expect(result).toEqual(swift_appDelegateExpectedFixture);
+  });
+});

plugin/src/fixtures/swift_appDelegate.ts

@@ -0,0 +1,91 @@
+export const swift_appDelegateFixture = `import React
+import Expo
+
+@UIApplicationMain
+public class AppDelegate: ExpoAppDelegate {
+  public override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    self.moduleName = "main"
+    self.initialProps = [:]
+
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+
+  public override func bundleURL() -> URL? {
+#if DEBUG
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: ".expo/.virtual-metro-entry")
+#else
+    return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+
+  // Linking API
+  public override func application(
+    _ app: UIApplication,
+    open url: URL,
+    options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+  ) -> Bool {
+    return super.application(app, open: url, options: options) || RCTLinkingManager.application(app, open: url, options: options)
+  }
+
+  // Universal Links
+  public override func application(
+    _ application: UIApplication,
+    continue userActivity: NSUserActivity,
+    restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
+  ) -> Bool {
+    let result = RCTLinkingManager.application(application, continue: userActivity, restorationHandler: restorationHandler)
+    return super.application(application, continue: userActivity, restorationHandler: restorationHandler) || result
+  }
+}
+`;
+
+export const swift_appDelegateExpectedFixture = `import React
+
+import RNBatch
+import Expo
+
+@UIApplicationMain
+public class AppDelegate: ExpoAppDelegate {
+  public override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+    RNBatch.start()
+
+    self.moduleName = "main"
+    self.initialProps = [:]
+
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+
+  public override func bundleURL() -> URL? {
+#if DEBUG
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: ".expo/.virtual-metro-entry")
+#else
+    return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+
+  // Linking API
+  public override func application(
+    _ app: UIApplication,
+    open url: URL,
+    options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+  ) -> Bool {
+    return super.application(app, open: url, options: options) || RCTLinkingManager.application(app, open: url, options: options)
+  }
+
+  // Universal Links
+  public override func application(
+    _ application: UIApplication,
+    continue userActivity: NSUserActivity,
+    restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
+  ) -> Bool {
+    let result = RCTLinkingManager.application(application, continue: userActivity, restorationHandler: restorationHandler)
+    return super.application(application, continue: userActivity, restorationHandler: restorationHandler) || result
+  }
+}
+`;

plugin/src/ios/withReactNativeBatchAppDelegate.ts

@@ -1,17 +1,39 @@
 import { ConfigPlugin, withAppDelegate } from '@expo/config-plugins';
 
-const DID_FINISH_LAUNCHING_WITH_OPTIONS_DECLARATION =
+// MARK : - Objectif-c
+
+const DID_FINISH_LAUNCHING_WITH_OPTIONS_OBJC_DECLARATION =
   '- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions\n{';
+const IMPORT_OBJC_BATCH = '\n\n#import <RNBatchPush/RNBatch.h>\n';
+const REGISTER_OBJC_BATCH = '\n  [RNBatch start];\n';
+
+export const modifyObjCDelegate = (contents: string): string => {
+  return modifyDelegate(contents, IMPORT_OBJC_BATCH, DID_FINISH_LAUNCHING_WITH_OPTIONS_OBJC_DECLARATION, REGISTER_OBJC_BATCH);
+};
 
-const IMPORT_BATCH = '\n\n#import <RNBatchPush/RNBatch.h>\n';
-const REGISTER_BATCH = '\n  [RNBatch start];\n';
+// MARK : - Swift
+
+const DID_FINISH_LAUNCHING_WITH_OPTIONS_SWIFT_DECLARATION = `@UIApplicationMain
+public class AppDelegate: ExpoAppDelegate {
+  public override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {`;
+const IMPORT_SWIFT_BATCH = '\n\nimport RNBatch\n';
+const REGISTER_SWIFT_BATCH = '\n    RNBatch.start()\n';
+
+export const modifySwiftDelegate = (contents: string): string => {
+  return modifyDelegate(contents, IMPORT_SWIFT_BATCH, DID_FINISH_LAUNCHING_WITH_OPTIONS_SWIFT_DECLARATION, REGISTER_SWIFT_BATCH);
+};
 
-export const modifyAppDelegate = (contents: string) => {
-  contents = contents.replace('\n', IMPORT_BATCH);
+// MARK : - Common
 
-  const [beforeDeclaration, afterDeclaration] = contents.split(DID_FINISH_LAUNCHING_WITH_OPTIONS_DECLARATION);
+export const modifyDelegate = (contents: string, importBatch: string, declaration: string, register: string): string => {
+  contents = contents.replace('\n', importBatch);
 
-  const newAfterDeclaration = DID_FINISH_LAUNCHING_WITH_OPTIONS_DECLARATION.concat(REGISTER_BATCH).concat(afterDeclaration);
+  const [beforeDeclaration, afterDeclaration] = contents.split(declaration);
+
+  const newAfterDeclaration = declaration.concat(register).concat(afterDeclaration);
 
   contents = beforeDeclaration.concat(newAfterDeclaration);
   return contents;
@@ -23,3 +45,11 @@ export const withReactNativeBatchAppDelegate: ConfigPlugin<object | void> = conf
     return config;
   });
 };
+
+export const modifyAppDelegate = (content: string): string => {
+  return isObjCDelegate(content) ? modifyObjCDelegate(content) : modifySwiftDelegate(content);
+};
+
+const isObjCDelegate = (content: string): boolean => {
+  return content.includes('@interface AppDelegate () <RCTBridgeDelegate>');
+};