@capacitor/ios 3.4.1 → 4.0.1-alpha.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.1-alpha.0](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.1-alpha.0) (2022-03-25)
+
+
+### Features
+
+* **ios:** add getConfig to CAPPlugin ([#5495](https://github.com/ionic-team/capacitor/issues/5495)) ([224a9d0](https://github.com/ionic-team/capacitor/commit/224a9d075629d9c9da9ddc658eb282617fc46d09))
+
+
+
+
+
 ## [3.4.1](https://github.com/ionic-team/capacitor/compare/3.4.0...3.4.1) (2022-02-09)
 
 

package/Capacitor/Capacitor/CAPInstanceConfiguration.swift

@@ -15,10 +15,18 @@ extension InstanceConfiguration {
         return serverURL
     }
 
+    @available(*, deprecated, message: "Use getPluginConfig")
     @objc public func getPluginConfigValue(_ pluginId: String, _ configKey: String) -> Any? {
         return (pluginConfigurations as? JSObject)?[keyPath: KeyPath("\(pluginId).\(configKey)")]
     }
 
+    @objc public func getPluginConfig(_ pluginId: String) -> PluginConfig {
+        if let cfg = (pluginConfigurations as? JSObject)?[keyPath: KeyPath("\(pluginId)")] as? JSObject {
+            return PluginConfig(config: cfg)
+        }
+        return PluginConfig(config: JSObject())
+    }
+
     @objc public func shouldAllowNavigation(to host: String) -> Bool {
         for hostname in allowedNavigationHostnames {
             if doesHost(host, match: hostname) {

package/Capacitor/Capacitor/CAPPlugin.h

@@ -4,6 +4,8 @@
 @protocol CAPBridgeProtocol;
 @class CAPPluginCall;
 
+@class PluginConfig;
+
 @interface CAPPlugin : NSObject
 
 @property (nonatomic, weak, nullable) WKWebView *webView;
@@ -44,7 +46,8 @@
 -(NSString* _Nonnull)getId;
 -(BOOL)getBool:(CAPPluginCall* _Nonnull) call field:(NSString* _Nonnull)field defaultValue:(BOOL)defaultValue DEPRECATED_MSG_ATTRIBUTE("Use accessors on CAPPluginCall instead. See CAPBridgedJSTypes.h for Obj-C implementations.");
 -(NSString* _Nullable)getString:(CAPPluginCall* _Nonnull)call field:(NSString* _Nonnull)field defaultValue:(NSString* _Nonnull)defaultValue DEPRECATED_MSG_ATTRIBUTE("Use accessors on CAPPluginCall instead. See CAPBridgedJSTypes.h for Obj-C implementations.");
--(id _Nullable)getConfigValue:(NSString* _Nonnull)key;
+-(id _Nullable)getConfigValue:(NSString* _Nonnull)key __deprecated_msg("use getConfig() and access config values using the methods available depending on the type.");
+-(PluginConfig* _Nonnull)getConfig;
 -(void)setCenteredPopover:(UIViewController* _Nonnull)vc;
 -(BOOL)supportsPopover;
 

package/Capacitor/Capacitor/CAPPlugin.m

@@ -29,10 +29,14 @@
   return [call getString:field defaultValue:defaultValue];
 }
 
--(id)getConfigValue:(NSString *)key {
+-(id)getConfigValue:(NSString *)key __deprecated {
   return [self.bridge.config getPluginConfigValue:self.pluginName :key];
 }
 
+-(PluginConfig*)getConfig {
+    return [self.bridge.config getPluginConfig:self.pluginName];
+}
+
 -(void)load {}
 
 - (void)addEventListener:(NSString *)eventName listener:(CAPPluginCall *)listener {

package/Capacitor/Capacitor/PluginConfig.swift

@@ -0,0 +1,56 @@
+import Foundation
+
+@objc public class PluginConfig: NSObject {
+
+    // The object containing the plugin config values
+    private var config: JSObject
+
+    init(config: JSObject) {
+        self.config = config
+    }
+
+    public func getString(configKey: String, defaultValue: String? = nil) -> String? {
+        if let val = (self.config)[keyPath: KeyPath(configKey)] as? String {
+            return val
+        }
+        return defaultValue
+    }
+
+    public func getBoolean(configKey: String, defaultValue: Bool) -> Bool {
+        if let val = (self.config)[keyPath: KeyPath(configKey)] as? Bool {
+            return val
+        }
+        return defaultValue
+    }
+
+    public func getInt(configKey: String, defaultValue: Int) -> Int {
+        if let val = (self.config)[keyPath: KeyPath(configKey)] as? Int {
+            return val
+        }
+        return defaultValue
+    }
+
+    public func getArray(configKey: String, defaultValue: JSArray? = nil) -> JSArray? {
+        if let val = (self.config)[keyPath: KeyPath(configKey)] as? JSArray {
+            return val
+        }
+        return defaultValue
+    }
+
+    public func getObject(configKey: String) -> JSObject? {
+        return (self.config)[keyPath: KeyPath(configKey)] as? JSObject
+    }
+
+    public func isEmpty() -> Bool {
+        return self.config.isEmpty
+    }
+
+    /**
+     * Gets the JSObject containing the config of the the provided plugin ID.
+     *
+     * @return The config for that plugin
+     */
+    public func getConfigJSON() -> JSObject {
+        return self.config
+    }
+}

package/Capacitor.podspec

@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/capacitorjs'
   s.license = 'MIT'
   s.homepage = 'https://capacitorjs.com/'
-  s.ios.deployment_target  = '12.0'
+  s.ios.deployment_target  = '13.0'
   s.authors = { 'Ionic Team' => 'hi@ionicframework.com' }
   s.source = { :git => 'https://github.com/ionic-team/capacitor.git', :branch => "portals-dev" }
   s.source_files = 'Capacitor/Capacitor/*.{swift,h,m}', 'Capacitor/Capacitor/Plugins/*.{swift,h,m}', 'Capacitor/Capacitor/Plugins/**/*.{swift,h,m}'

package/CapacitorCordova.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.license      = 'MIT'
   s.authors      = { 'Ionic Team' => 'hi@ionicframework.com' }
   s.source       = { :git => 'https://github.com/ionic-team/capacitor', :tag => s.version.to_s }
-  s.platform     = :ios, 12.0
+  s.platform     = :ios, 13.0
   s.source_files = 'CapacitorCordova/CapacitorCordova/**/*.{h,m}'
   s.public_header_files = 'CapacitorCordova/CapacitorCordova/Classes/Public/*.h', 'CapacitorCordova/CapacitorCordova/CapacitorCordova.h'
   s.module_map = 'CapacitorCordova/CapacitorCordova/CapacitorCordova.modulemap'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "3.4.1",
+  "version": "4.0.1-alpha.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bc7b49ff2ad242fecff7bcb3900c627ff6880f7b"
+  "gitHead": "7faec09fd724a0af7436f3d30c83856b7bb5ce51"
 }