Merge pull request #134 from launchdarkly/yus/sc-185314/format-swift-code

[sc-185314] Prettify swift code and split modd file

Author: yusinto

README.md

@@ -1,62 +1,56 @@
-LaunchDarkly Client-Side SDK for React Native
-===========================
+# LaunchDarkly Client-Side SDK for React Native
 
 [![NPM](https://img.shields.io/npm/v/launchdarkly-react-native-client-sdk.svg)](https://www.npmjs.com/package/launchdarkly-react-native-client-sdk)
 [![CircleCI](https://circleci.com/gh/launchdarkly/react-native-client-sdk.svg?style=shield)](https://circleci.com/gh/launchdarkly/react-native-client-sdk)
 [![Documentation](https://img.shields.io/static/v1?label=GitHub+Pages&message=API+reference&color=00add8)](https://launchdarkly.github.io/react-native-client-sdk)
 
-LaunchDarkly overview
--------------------------
+## LaunchDarkly overview
+
 [LaunchDarkly](https://www.launchdarkly.com) is a feature management platform that serves over 100 billion feature flags daily to help teams build better software, faster. [Get started](https://docs.launchdarkly.com/home/getting-started) using LaunchDarkly today!
 
 [![Twitter Follow](https://img.shields.io/twitter/follow/launchdarkly.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/intent/follow?screen_name=launchdarkly)
 
-Supported versions
--------------------------
+## Supported versions
 
 This SDK is currently compatible with React Native versions `>=0.64 <0.71`, the minimum iOS deployment target is `10.0`, and the minimum Android SDK version is `21`. Builds are tested with XCode 12.5+. Please look at the CircleCI test build to see which combination of React Native and XCode works together.
 
 For React Native `0.63.x` support, use the latest [`5.1.x` release](https://github.com/launchdarkly/react-native-client-sdk/releases/tag/5.1.1).
 
-Getting started
----------------
+## Getting started
 
 Refer to the [SDK documentation](https://docs.launchdarkly.com/sdk/client-side/react/react-native#getting-started) for instructions on getting started with using the SDK.
 
-Learn more
------------
+## Learn more
 
 Check out our [documentation](https://docs.launchdarkly.com) for in-depth instructions on configuring and using LaunchDarkly. You can also head straight to the [complete reference guide for this SDK](https://docs.launchdarkly.com/sdk/client-side/react/react-native).
 
-Testing
--------
+## Testing
 
 We run integration tests for all our SDKs using a centralized test harness. This approach gives us the ability to test for consistency across SDKs, as well as test networking behavior in a long-running application. These tests cover each method in the SDK, and verify that event sending, flag evaluation, stream reconnection, and other aspects of the SDK all behave correctly.
 
-Contributing
-------------
+## Contributing
 
 We encourage pull requests and other contributions from the community. Check out our [contributing guidelines](CONTRIBUTING.md) for instructions on how to contribute to this SDK.
 
-About LaunchDarkly
------------
-
-* LaunchDarkly is a continuous delivery platform that provides feature flags as a service and allows developers to iterate quickly and safely. We allow you to easily flag your features and manage them from the LaunchDarkly dashboard.  With LaunchDarkly, you can:
-    * Roll out a new feature to a subset of your users (like a group of users who opt-in to a beta tester group), gathering feedback and bug reports from real-world use cases.
-    * Gradually roll out a feature to an increasing percentage of users, and track the effect that the feature has on key metrics (for instance, how likely is a user to complete a purchase if they have feature A versus feature B?).
-    * Turn off a feature that you realize is causing performance problems in production, without needing to re-deploy, or even restart the application with a changed configuration file.
-    * Grant access to certain features based on user attributes, like payment plan (eg: users on the ‘gold’ plan get access to more features than users in the ‘silver’ plan). Disable parts of your application to facilitate maintenance, without taking everything offline.
-* LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Read [our documentation](https://docs.launchdarkly.com/sdk) for a complete list.
-* Explore LaunchDarkly
-    * [launchdarkly.com](https://www.launchdarkly.com/ "LaunchDarkly Main Website") for more information
-    * [docs.launchdarkly.com](https://docs.launchdarkly.com/  "LaunchDarkly Documentation") for our documentation and SDK reference guides
-    * [apidocs.launchdarkly.com](https://apidocs.launchdarkly.com/  "LaunchDarkly API Documentation") for our API documentation
-    * [blog.launchdarkly.com](https://blog.launchdarkly.com/  "LaunchDarkly Blog Documentation") for the latest product updates
-
-Developing this SDK
------------
-
-* Run `npx react-native doctor` in both the root and ManualTestApp directories and make sure everything is green
-  * If watchman fails, you can try installing it manually `brew reinstall watchman`
-* Make sure you have [modd](https://github.com/cortesi/modd#install) installed so native code changes are hot reloaded
-* Run `modd`
+## About LaunchDarkly
+
+- LaunchDarkly is a continuous delivery platform that provides feature flags as a service and allows developers to iterate quickly and safely. We allow you to easily flag your features and manage them from the LaunchDarkly dashboard. With LaunchDarkly, you can:
+  - Roll out a new feature to a subset of your users (like a group of users who opt-in to a beta tester group), gathering feedback and bug reports from real-world use cases.
+  - Gradually roll out a feature to an increasing percentage of users, and track the effect that the feature has on key metrics (for instance, how likely is a user to complete a purchase if they have feature A versus feature B?).
+  - Turn off a feature that you realize is causing performance problems in production, without needing to re-deploy, or even restart the application with a changed configuration file.
+  - Grant access to certain features based on user attributes, like payment plan (eg: users on the ‘gold’ plan get access to more features than users in the ‘silver’ plan). Disable parts of your application to facilitate maintenance, without taking everything offline.
+- LaunchDarkly provides feature flag SDKs for a wide variety of languages and technologies. Read [our documentation](https://docs.launchdarkly.com/sdk) for a complete list.
+- Explore LaunchDarkly
+  - [launchdarkly.com](https://www.launchdarkly.com/ 'LaunchDarkly Main Website') for more information
+  - [docs.launchdarkly.com](https://docs.launchdarkly.com/ 'LaunchDarkly Documentation') for our documentation and SDK reference guides
+  - [apidocs.launchdarkly.com](https://apidocs.launchdarkly.com/ 'LaunchDarkly API Documentation') for our API documentation
+  - [blog.launchdarkly.com](https://blog.launchdarkly.com/ 'LaunchDarkly Blog Documentation') for the latest product updates
+
+## Developing this SDK
+
+- Run `npx react-native doctor` in both the root and ManualTestApp directories and make sure everything is green
+  - If watchman fails, you can try installing it manually `brew reinstall watchman`
+- Make sure you have [modd](https://github.com/cortesi/modd#install) installed so native code changes are hot reloaded
+
+* For ios run `modd -f modd-ios.conf`
+* For android run `modd -f modd-android.conf`

ios/LaunchdarklyReactNativeClient.swift

@@ -9,11 +9,11 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
     private let ERROR_INIT = "E_INITIALIZE"
     private let ERROR_IDENTIFY = "E_IDENTIFY"
     private let ERROR_UNKNOWN = "E_UNKNOWN"
-
+    
     private var flagListenerOwners: [String: ObserverOwner] = [:]
     private var allFlagsListenerOwners: [String: ObserverOwner] = [:]
     private var connectionModeListenerOwners: [String: ObserverOwner] = [:]
-
+    
     override func supportedEvents() -> [String]! {
         return [FLAG_PREFIX, ALL_FLAGS_PREFIX, CONNECTION_MODE_PREFIX]
     }
@@ -29,14 +29,14 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
     @objc func configure(_ config: NSDictionary, user: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         internalConfigure(config: config, user: user, timeout: nil, resolve: resolve, reject: reject)
     }
-
+    
     @objc func configureWithTimeout(_ config: NSDictionary, user: NSDictionary, timeout: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         internalConfigure(config: config, user: user, timeout: timeout, resolve: resolve, reject: reject)
     }
-
+    
     private func internalConfigure(config: NSDictionary, user: NSDictionary, timeout: Int?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         let config = configBuild(config: config)
-
+        
         if let config = config {
             if let timeoutUnwrapped = timeout {
                 let startWaitSeconds: TimeInterval = Double(timeoutUnwrapped)
@@ -54,7 +54,7 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
             }
         }
     }
-
+    
     private func id<T>(_ x: T) -> T { x }
     private func millis(_ x: NSNumber) -> TimeInterval { TimeInterval(x.doubleValue / 1_000) }
     private func url(_ x: String) -> URL { URL.init(string: x)! }
@@ -67,7 +67,7 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
     private func configBuild(config: NSDictionary) -> LDConfig? {
         guard let mobileKey = config["mobileKey"] as? String
         else { return nil }
-
+        
         var ldConfig = LDConfig(mobileKey: mobileKey)
         configField(&ldConfig.baseUrl, config["pollUri"], url)
         configField(&ldConfig.eventsUrl, config["eventsUri"], url)
@@ -92,14 +92,14 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
         configField(&ldConfig.autoAliasingOptOut, config["autoAliasingOptOut"], id)
         configField(&ldConfig.inlineUserInEvents, config["inlineUsersInEvents"], id)
         configField(&ldConfig.privateUserAttributes, config["privateAttributeNames"], { (x: [String]) in x.map { UserAttribute.forName($0) }})
-
+        
         if let val = config["secondaryMobileKeys"] as? [String: String] {
             try! ldConfig.setSecondaryMobileKeys(val)
         }
-
+        
         return ldConfig
     }
-
+    
     private func userBuild(_ userDict: NSDictionary) -> LDUser {
         var user = LDUser(key: userDict["key"] as? String)
         if let anon = userDict["anonymous"] as? Bool {
@@ -118,97 +118,97 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
         user.custom = (userDict["custom"] as? [String: Any] ?? [:]).mapValues { LDValue.fromBridge($0) }
         return user
     }
-
+    
     @objc func boolVariation(_ flagKey: String, defaultValue: ObjCBool, environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         resolve(LDClient.get(environment: environment)!.boolVariation(forKey: flagKey, defaultValue: defaultValue.boolValue))
     }
-
+    
     @objc func numberVariation(_ flagKey: String, defaultValue: Double, environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         resolve(LDClient.get(environment: environment)!.doubleVariation(forKey: flagKey, defaultValue: defaultValue))
     }
-
+    
     @objc func stringVariation(_ flagKey: String, defaultValue: String, environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         resolve(LDClient.get(environment: environment)!.stringVariation(forKey: flagKey, defaultValue: defaultValue))
     }
-
+    
     @objc func jsonVariation(_ flagKey: String, defaultValue: Any, environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         resolve(LDClient.get(environment: environment)!.jsonVariation(forKey: flagKey, defaultValue: LDValue.fromBridge(defaultValue)).toBridge())
     }
-
+    
     @objc func boolVariationDetail(_ flagKey: String, defaultValue: ObjCBool, environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         let detail = LDClient.get(environment: environment)!.boolVariationDetail(forKey: flagKey, defaultValue: defaultValue.boolValue)
         resolve(bridgeDetail(detail, id))
     }
-
+    
     @objc func numberVariationDetail(_ flagKey: String, defaultValue: Double, environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         let detail = LDClient.get(environment: environment)!.doubleVariationDetail(forKey: flagKey, defaultValue: defaultValue)
         resolve(bridgeDetail(detail, id))
     }
-
+    
     @objc func stringVariationDetail(_ flagKey: String, defaultValue: String, environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         let detail = LDClient.get(environment: environment)!.stringVariationDetail(forKey: flagKey, defaultValue: defaultValue)
         resolve(bridgeDetail(detail, id))
     }
-
+    
     @objc func jsonVariationDetail(_ flagKey: String, defaultValue: Any, environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         let detail = LDClient.get(environment: environment)!.jsonVariationDetail(forKey: flagKey, defaultValue: LDValue.fromBridge(defaultValue))
         resolve(bridgeDetail(detail, { $0.toBridge() }))
     }
-
+    
     private func bridgeDetail<T>(_ detail: LDEvaluationDetail<T>, _ converter: ((T) -> Any)) -> NSDictionary {
         [ "value": converter(detail.value)
-        , "variationIndex": (detail.variationIndex as Any)
-        , "reason": ((detail.reason?.mapValues { $0.toBridge() }) as Any)
+          , "variationIndex": (detail.variationIndex as Any)
+          , "reason": ((detail.reason?.mapValues { $0.toBridge() }) as Any)
         ]
     }
-
+    
     @objc func trackData(_ eventName: String, data: Any, environment: String) {
         LDClient.get(environment: environment)!.track(key: eventName, data: LDValue.fromBridge(data))
     }
-
+    
     @objc func trackMetricValue(_ eventName: String, data: Any, metricValue: NSNumber, environment: String) {
         LDClient.get(environment: environment)!.track(key: eventName, data: LDValue.fromBridge(data), metricValue: Double(truncating: metricValue))
     }
-
+    
     @objc func setOffline(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         LDClient.get()?.setOnline(false) {
             resolve(true)
         }
     }
-
+    
     @objc func isOffline(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         resolve(!(LDClient.get()?.isOnline ?? false))
     }
-
+    
     @objc func setOnline(_ resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         LDClient.get()?.setOnline(true) {
             resolve(true)
         }
     }
-
+    
     @objc func flush() {
         LDClient.get()?.flush()
     }
-
+    
     @objc func close(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         LDClient.get()?.close()
         resolve(true)
     }
-
+    
     @objc func identify(_ options: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         LDClient.get()?.identify(user: userBuild(options)) {
             resolve(nil)
         }
     }
-
+    
     @objc func alias(_ environment: String, user: NSDictionary, previousUser: NSDictionary) {
         LDClient.get(environment: environment)!.alias(context: userBuild(user), previousContext: userBuild(previousUser))
     }
-
+    
     @objc func allFlags(_ environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         resolve(LDClient.get(environment: environment)!.allFlags?.mapValues { $0.toBridge() } ?? [:] as NSDictionary)
     }
-
+    
     @objc func getConnectionMode(_ environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         let connectionInformation = LDClient.get(environment: environment)!.getConnectionInformation()
         var connectionMode: String
@@ -224,16 +224,16 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
         }
         resolve(connectionMode)
     }
-
+    
     // lastKnownFlagValidity is nil if either no connection has ever been successfully made or if the SDK has an active streaming connection. It will have a value if 1) in polling mode and at least one poll has completed successfully, or 2) if in streaming mode whenever the streaming connection closes.
     @objc func getLastSuccessfulConnection(_ environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         resolve(LDClient.get(environment: environment)!.getConnectionInformation().lastKnownFlagValidity ?? 0)
     }
-
+    
     @objc func getLastFailedConnection(_ environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         resolve(LDClient.get(environment: environment)!.getConnectionInformation().lastFailedConnection ?? 0)
     }
-
+    
     @objc func getLastFailure(_ environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         let connectionInformation = LDClient.get(environment: environment)!.getConnectionInformation()
         var failureReason: String
@@ -249,11 +249,11 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
         }
         resolve(failureReason)
     }
-
+    
     private func envConcat(environment: String, identifier: String) -> String {
         return environment + ";" + identifier
     }
-
+    
     @objc func registerFeatureFlagListener(_ flagKey: String, environment: String) {
         let multiListenerId = envConcat(environment: environment, identifier: flagKey)
         let owner = ObserverOwner()
@@ -264,14 +264,14 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
             }
         }
     }
-
+    
     @objc func unregisterFeatureFlagListener(_ flagKey: String, environment: String) {
         let multiListenerId = envConcat(environment: environment, identifier: flagKey)
         if let owner = flagListenerOwners.removeValue(forKey: multiListenerId) {
             LDClient.get(environment: environment)!.stopObserving(owner: owner)
         }
     }
-
+    
     @objc func registerCurrentConnectionModeListener(_ listenerId: String, environment: String) {
         let multiListenerId = envConcat(environment: environment, identifier: listenerId)
         let owner = ObserverOwner()
@@ -282,14 +282,14 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
             }
         }
     }
-
+    
     @objc func unregisterCurrentConnectionModeListener(_ listenerId: String, environment: String) {
         let multiListenerId = envConcat(environment: environment, identifier: listenerId)
         if let owner = connectionModeListenerOwners.removeValue(forKey: multiListenerId) {
             LDClient.get(environment: environment)!.stopObserving(owner: owner)
         }
     }
-
+    
     @objc func registerAllFlagsListener(_ listenerId: String, environment: String) {
         let multiListenerId = envConcat(environment: environment, identifier: listenerId)
         let owner = ObserverOwner()
@@ -300,14 +300,14 @@ class LaunchdarklyReactNativeClient: RCTEventEmitter {
             }
         }
     }
-
+    
     @objc func unregisterAllFlagsListener(_ listenerId: String, environment: String) {
         let multiListenerId = envConcat(environment: environment, identifier: listenerId)
         if let owner = allFlagsListenerOwners.removeValue(forKey: multiListenerId) {
             LDClient.get(environment: environment)!.stopObserving(owner: owner)
         }
     }
-
+    
     @objc func isInitialized(_ environment: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
         if LDClient.get() == nil {
             reject(ERROR_UNKNOWN, "SDK has not been configured", nil)
@@ -342,7 +342,7 @@ extension LDValue {
         if let dictValue = value as? [String: Any] { return .object(dictValue.mapValues { fromBridge($0) }) }
         return .null
     }
-
+    
     func toBridge() -> Any {
         switch self {
         case .null: return NSNull()

modd-android.conf

@@ -0,0 +1,5 @@
+android/** package.json tsconfig.json {
+    prep: yarn
+    prep: yarn link-dev
+    prep: yarn --cwd ManualTestApp android
+}