@interval-health/capacitor-health 1.2.0 → 1.4.0

package/ios/Sources/HealthPlugin/Health.swift

@@ -351,8 +351,20 @@ final class Health {
         
         // For all other data types, use the standard query approach
         let sampleType = try dataType.sampleType()
+        
+        // For sleep data, extend the query window to capture overnight sleep
+        // Sleep typically starts in the evening (e.g., 10 PM) but should be attributed to the next day
+        // So we need to fetch samples that started up to 12 hours before the requested start date
+        let queryStartDate: Date
+        if dataType == .sleep {
+            // Extend query 12 hours earlier to capture overnight sleep that started previous evening
+            queryStartDate = startDate.addingTimeInterval(-12 * 60 * 60) // -12 hours
+        } else {
+            queryStartDate = startDate
+        }
+        
         // Use .strictStartDate to include samples that start within the range (even if they end after endDate)
-        let predicate = HKQuery.predicateForSamples(withStart: startDate, end: endDate, options: .strictStartDate)
+        let predicate = HKQuery.predicateForSamples(withStart: queryStartDate, end: endDate, options: .strictStartDate)
         let sortDescriptor = NSSortDescriptor(key: HKSampleSortIdentifierStartDate, ascending: ascending)
         
         // Use no limit by default to ensure all samples are retrieved
@@ -932,7 +944,10 @@ final class Health {
             ))
         }
         
-        // Now attribute each session to the day you WOKE UP (end date)
+        // Attribute sleep based on 6 PM rule:
+        // - Sleep starting AFTER 6 PM → attribute to the NEXT day (overnight sleep)
+        // - Sleep starting BEFORE 6 PM → attribute to the SAME day (naps)
+        // This makes logical sense because evening sleep continues into the next morning
         struct DayData {
             var sessions: [SleepSession]
             var deepMinutes: Double
@@ -945,10 +960,25 @@ final class Health {
         var sleepByDate: [String: DayData] = [:]
         
         for session in sessions {
-            // Wake-up date (local)
             let calendar = Calendar.current
-            let wakeDate = calendar.dateComponents([.year, .month, .day], from: session.end)
-            let dateString = String(format: "%04d-%02d-%02d", wakeDate.year!, wakeDate.month!, wakeDate.day!)
+            
+            // Get the hour when sleep started
+            let startHour = calendar.component(.hour, from: session.start)
+            
+            // Determine which date this sleep belongs to:
+            // If sleep starts at or after 6 PM (18:00), it belongs to the NEXT day
+            // If sleep starts before 6 PM, it belongs to the SAME day (e.g., naps)
+            let attributionDate: Date
+            if startHour >= 18 {
+                // Sleep started at/after 6 PM - attribute to next day
+                attributionDate = calendar.date(byAdding: .day, value: 1, to: session.start)!
+            } else {
+                // Sleep started before 6 PM (nap or early morning) - attribute to same day
+                attributionDate = session.start
+            }
+            
+            let dateComponents = calendar.dateComponents([.year, .month, .day], from: attributionDate)
+            let dateString = String(format: "%04d-%02d-%02d", dateComponents.year!, dateComponents.month!, dateComponents.day!)
             
             // Initialize day data if needed
             if sleepByDate[dateString] == nil {
@@ -1349,7 +1379,8 @@ final class Health {
                     case .bodyFatPercentage:
                         // Convert decimal to percentage: 0.25 -> 25%
                         let valueInDecimal = sample.quantity.doubleValue(for: HKUnit.percent())
-                        dayData["bodyFat"] = round(valueInDecimal * 10) / 10  // 1 decimal place
+                        let percentageValue = valueInDecimal * 100
+                        dayData["bodyFat"] = round(percentageValue * 10) / 10  // 1 decimal place
                         
                     default:
                         break

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interval-health/capacitor-health",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Capacitor plugin to interact with data from Apple HealthKit and Health Connect",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",