@flomentumsolutions/capacitor-health-extended 0.0.12 → 0.0.14

package/ios/Sources/HealthPluginPlugin/HealthPlugin.swift

@@ -237,23 +237,53 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
     
     // Convenience methods for specific data types
     @objc func queryWeight(_ call: CAPPluginCall) {
-        call.setString("dataType", "weight")
-        queryLatestSample(call)
+        queryLatestSampleWithType(call, dataType: "weight")
     }
     
     @objc func queryHeight(_ call: CAPPluginCall) {
-        call.setString("dataType", "height")
-        queryLatestSample(call)
+        queryLatestSampleWithType(call, dataType: "height")
     }
     
     @objc func queryHeartRate(_ call: CAPPluginCall) {
-        call.setString("dataType", "heart-rate")
-        queryLatestSample(call)
+        queryLatestSampleWithType(call, dataType: "heart-rate")
     }
     
     @objc func querySteps(_ call: CAPPluginCall) {
-        call.setString("dataType", "steps")
-        queryLatestSample(call)
+        queryLatestSampleWithType(call, dataType: "steps")
+    }
+    
+    private func queryLatestSampleWithType(_ call: CAPPluginCall, dataType: String) {
+        // Safely coerce the original options into a [String: Any] JSObject.
+        let originalOptions = call.options as? [String: Any] ?? [:]
+        var params = originalOptions
+        params["dataType"] = dataType
+
+        // Create a proxy CAPPluginCall using the CURRENT (Capacitor 6) designated initializer.
+        // NOTE: The older init(callbackId:options:success:error:) is deprecated and *failable*,
+        // so we use the newer initializer that requires a method name. Guard against failure.
+        guard let proxyCall = CAPPluginCall(
+            callbackId: call.callbackId,
+            methodName: "queryLatestSample", // required in new API
+            options: params,
+            success: { result, _ in
+                // Forward the resolved data back to the original JS caller.
+                call.resolve(result?.data ?? [:])
+            },
+            error: { capError in
+                // Forward the error to the original call in the legacy reject format.
+                if let capError = capError {
+                    call.reject(capError.message, capError.code, capError.error, capError.data)
+                } else {
+                    call.reject("Unknown native error")
+                }
+            }
+        ) else {
+            call.reject("Failed to create proxy call")
+            return
+        }
+
+        // Delegate the actual HealthKit fetch to the common implementation.
+        queryLatestSample(proxyCall)
     }
     
     @objc func openAppleHealthSettings(_ call: CAPPluginCall) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flomentumsolutions/capacitor-health-extended",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "Capacitor plugin for Apple HealthKit and Google Health Connect Platform",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",