@kingstinct/react-native-healthkit 13.4.0 → 14.0.0

package/nitrogen/generated/ios/swift/ElectrocardiogramSample.swift

@@ -18,7 +18,7 @@ public extension ElectrocardiogramSample {
   /**
    * Create a new instance of `ElectrocardiogramSample`.
    */
-  init(classification: ElectrocardiogramClassification, symptomsStatus: ElectrocardiogramSymptomsStatus, averageHeartRateBpm: Double?, samplingFrequencyHz: Double?, numberOfVoltageMeasurements: Double, voltages: [ElectrocardiogramVoltage]?, sampleType: SampleType, startDate: Date, endDate: Date, hasUndeterminedDuration: Bool, metadataWeatherCondition: WeatherCondition?, metadataWeatherHumidity: Quantity?, metadataWeatherTemperature: Quantity?, metadataInsulinDeliveryReason: InsulinDeliveryReason?, metadataHeartRateMotionContext: HeartRateMotionContext?, uuid: String, sourceRevision: SourceRevision, device: Device?, metadata: AnyMap, metadataExternalUUID: String?, metadataTimeZone: String?, metadataWasUserEntered: Bool?, metadataDeviceSerialNumber: String?, metadataUdiDeviceIdentifier: String?, metadataUdiProductionIdentifier: String?, metadataDigitalSignature: String?, metadataDeviceName: String?, metadataDeviceManufacturerName: String?, metadataSyncIdentifier: String?, metadataSyncVersion: Double?, metadataWasTakenInLab: Bool?, metadataReferenceRangeLowerLimit: Double?, metadataReferenceRangeUpperLimit: Double?, metadataAlgorithmVersion: Double?) {
+  init(classification: ElectrocardiogramClassification, symptomsStatus: ElectrocardiogramSymptomsStatus, averageHeartRateBpm: Double?, samplingFrequencyHz: Double?, numberOfVoltageMeasurements: Double, voltages: [ElectrocardiogramVoltage]?, sampleType: SampleType, startDate: Date, endDate: Date, hasUndeterminedDuration: Bool, metadata: AnyMap, uuid: String, sourceRevision: SourceRevision, device: Device?) {
     self.init(classification, symptomsStatus, { () -> bridge.std__optional_double_ in
       if let __unwrappedValue = averageHeartRateBpm {
         return bridge.create_std__optional_double_(__unwrappedValue)
@@ -43,132 +43,12 @@ public extension ElectrocardiogramSample {
       } else {
         return .init()
       }
-    }(), sampleType, startDate.toCpp(), endDate.toCpp(), hasUndeterminedDuration, { () -> bridge.std__optional_WeatherCondition_ in
-      if let __unwrappedValue = metadataWeatherCondition {
-        return bridge.create_std__optional_WeatherCondition_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_Quantity_ in
-      if let __unwrappedValue = metadataWeatherHumidity {
-        return bridge.create_std__optional_Quantity_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_Quantity_ in
-      if let __unwrappedValue = metadataWeatherTemperature {
-        return bridge.create_std__optional_Quantity_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_InsulinDeliveryReason_ in
-      if let __unwrappedValue = metadataInsulinDeliveryReason {
-        return bridge.create_std__optional_InsulinDeliveryReason_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_HeartRateMotionContext_ in
-      if let __unwrappedValue = metadataHeartRateMotionContext {
-        return bridge.create_std__optional_HeartRateMotionContext_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), std.string(uuid), sourceRevision, { () -> bridge.std__optional_Device_ in
+    }(), sampleType, startDate.toCpp(), endDate.toCpp(), hasUndeterminedDuration, metadata.cppPart, std.string(uuid), sourceRevision, { () -> bridge.std__optional_Device_ in
       if let __unwrappedValue = device {
         return bridge.create_std__optional_Device_(__unwrappedValue)
       } else {
         return .init()
       }
-    }(), metadata.cppPart, { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataExternalUUID {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataTimeZone {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_bool_ in
-      if let __unwrappedValue = metadataWasUserEntered {
-        return bridge.create_std__optional_bool_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataDeviceSerialNumber {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataUdiDeviceIdentifier {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataUdiProductionIdentifier {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataDigitalSignature {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataDeviceName {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataDeviceManufacturerName {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = metadataSyncIdentifier {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = metadataSyncVersion {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_bool_ in
-      if let __unwrappedValue = metadataWasTakenInLab {
-        return bridge.create_std__optional_bool_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = metadataReferenceRangeLowerLimit {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = metadataReferenceRangeUpperLimit {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
-    }(), { () -> bridge.std__optional_double_ in
-      if let __unwrappedValue = metadataAlgorithmVersion {
-        return bridge.create_std__optional_double_(__unwrappedValue)
-      } else {
-        return .init()
-      }
     }())
   }
 
@@ -244,28 +124,8 @@ public extension ElectrocardiogramSample {
   }
   
   @inline(__always)
-  var metadataWeatherCondition: WeatherCondition? {
-    return self.__metadataWeatherCondition.has_value() ? self.__metadataWeatherCondition.pointee : nil
-  }
-  
-  @inline(__always)
-  var metadataWeatherHumidity: Quantity? {
-    return self.__metadataWeatherHumidity.value
-  }
-  
-  @inline(__always)
-  var metadataWeatherTemperature: Quantity? {
-    return self.__metadataWeatherTemperature.value
-  }
-  
-  @inline(__always)
-  var metadataInsulinDeliveryReason: InsulinDeliveryReason? {
-    return self.__metadataInsulinDeliveryReason.has_value() ? self.__metadataInsulinDeliveryReason.pointee : nil
-  }
-  
-  @inline(__always)
-  var metadataHeartRateMotionContext: HeartRateMotionContext? {
-    return self.__metadataHeartRateMotionContext.has_value() ? self.__metadataHeartRateMotionContext.pointee : nil
+  var metadata: AnyMap {
+    return AnyMap(withCppPart: self.__metadata)
   }
   
   @inline(__always)
@@ -282,189 +142,4 @@ public extension ElectrocardiogramSample {
   var device: Device? {
     return self.__device.value
   }
-  
-  @inline(__always)
-  var metadata: AnyMap {
-    return AnyMap(withCppPart: self.__metadata)
-  }
-  
-  @inline(__always)
-  var metadataExternalUUID: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataExternalUUID) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataExternalUUID)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataTimeZone: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataTimeZone) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataTimeZone)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataWasUserEntered: Bool? {
-    return { () -> Bool? in
-      if bridge.has_value_std__optional_bool_(self.__metadataWasUserEntered) {
-        let __unwrapped = bridge.get_std__optional_bool_(self.__metadataWasUserEntered)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataDeviceSerialNumber: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataDeviceSerialNumber) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataDeviceSerialNumber)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataUdiDeviceIdentifier: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataUdiDeviceIdentifier) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataUdiDeviceIdentifier)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataUdiProductionIdentifier: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataUdiProductionIdentifier) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataUdiProductionIdentifier)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataDigitalSignature: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataDigitalSignature) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataDigitalSignature)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataDeviceName: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataDeviceName) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataDeviceName)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataDeviceManufacturerName: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataDeviceManufacturerName) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataDeviceManufacturerName)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataSyncIdentifier: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__metadataSyncIdentifier) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__metadataSyncIdentifier)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataSyncVersion: Double? {
-    return { () -> Double? in
-      if bridge.has_value_std__optional_double_(self.__metadataSyncVersion) {
-        let __unwrapped = bridge.get_std__optional_double_(self.__metadataSyncVersion)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataWasTakenInLab: Bool? {
-    return { () -> Bool? in
-      if bridge.has_value_std__optional_bool_(self.__metadataWasTakenInLab) {
-        let __unwrapped = bridge.get_std__optional_bool_(self.__metadataWasTakenInLab)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataReferenceRangeLowerLimit: Double? {
-    return { () -> Double? in
-      if bridge.has_value_std__optional_double_(self.__metadataReferenceRangeLowerLimit) {
-        let __unwrapped = bridge.get_std__optional_double_(self.__metadataReferenceRangeLowerLimit)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataReferenceRangeUpperLimit: Double? {
-    return { () -> Double? in
-      if bridge.has_value_std__optional_double_(self.__metadataReferenceRangeUpperLimit) {
-        let __unwrapped = bridge.get_std__optional_double_(self.__metadataReferenceRangeUpperLimit)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
-  
-  @inline(__always)
-  var metadataAlgorithmVersion: Double? {
-    return { () -> Double? in
-      if bridge.has_value_std__optional_double_(self.__metadataAlgorithmVersion) {
-        let __unwrapped = bridge.get_std__optional_double_(self.__metadataAlgorithmVersion)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }()
-  }
 }

package/nitrogen/generated/ios/swift/FilterForWorkouts.swift

@@ -18,7 +18,7 @@ public extension FilterForWorkouts {
   /**
    * Create a new instance of `FilterForWorkouts`.
    */
-  init(OR: [FilterForWorkoutsBase]?, NOT: [FilterForWorkoutsBase]?, AND: [FilterForWorkoutsBase]?, workoutActivityType: WorkoutActivityType?, duration: WorkoutDurationPredicate?, sources: [(any HybridSourceProxySpec)]?, uuid: String?, uuids: [String]?, metadata: PredicateWithMetadataKey?, date: DateFilter?) {
+  init(OR: [FilterForWorkoutsBase]?, NOT: [FilterForWorkoutsBase]?, AND: [FilterForWorkoutsBase]?, workoutActivityType: WorkoutActivityType?, duration: WorkoutDurationPredicate?, metadata: PredicateWithMetadataKey?, uuid: String?, sources: [(any HybridSourceProxySpec)]?, uuids: [String]?, date: DateFilter?) {
     self.init({ () -> bridge.std__optional_std__vector_FilterForWorkoutsBase__ in
       if let __unwrappedValue = OR {
         return bridge.create_std__optional_std__vector_FilterForWorkoutsBase__({ () -> bridge.std__vector_FilterForWorkoutsBase_ in
@@ -67,6 +67,18 @@ public extension FilterForWorkouts {
       } else {
         return .init()
       }
+    }(), { () -> bridge.std__optional_PredicateWithMetadataKey_ in
+      if let __unwrappedValue = metadata {
+        return bridge.create_std__optional_PredicateWithMetadataKey_(__unwrappedValue)
+      } else {
+        return .init()
+      }
+    }(), { () -> bridge.std__optional_std__string_ in
+      if let __unwrappedValue = uuid {
+        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+      } else {
+        return .init()
+      }
     }(), { () -> bridge.std__optional_std__vector_std__shared_ptr_HybridSourceProxySpec___ in
       if let __unwrappedValue = sources {
         return bridge.create_std__optional_std__vector_std__shared_ptr_HybridSourceProxySpec___({ () -> bridge.std__vector_std__shared_ptr_HybridSourceProxySpec__ in
@@ -82,12 +94,6 @@ public extension FilterForWorkouts {
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = uuid {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
     }(), { () -> bridge.std__optional_std__vector_std__string__ in
       if let __unwrappedValue = uuids {
         return bridge.create_std__optional_std__vector_std__string__({ () -> bridge.std__vector_std__string_ in
@@ -100,12 +106,6 @@ public extension FilterForWorkouts {
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_PredicateWithMetadataKey_ in
-      if let __unwrappedValue = metadata {
-        return bridge.create_std__optional_PredicateWithMetadataKey_(__unwrappedValue)
-      } else {
-        return .init()
-      }
     }(), { () -> bridge.std__optional_DateFilter_ in
       if let __unwrappedValue = date {
         return bridge.create_std__optional_DateFilter_(__unwrappedValue)
@@ -161,6 +161,23 @@ public extension FilterForWorkouts {
     return self.__duration.value
   }
   
+  @inline(__always)
+  var metadata: PredicateWithMetadataKey? {
+    return self.__metadata.value
+  }
+  
+  @inline(__always)
+  var uuid: String? {
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__uuid) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__uuid)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
+  }
+  
   @inline(__always)
   var sources: [(any HybridSourceProxySpec)]? {
     return { () -> [(any HybridSourceProxySpec)]? in
@@ -177,18 +194,6 @@ public extension FilterForWorkouts {
     }()
   }
   
-  @inline(__always)
-  var uuid: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__uuid) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__uuid)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
   @inline(__always)
   var uuids: [String]? {
     return { () -> [String]? in
@@ -201,11 +206,6 @@ public extension FilterForWorkouts {
     }()
   }
   
-  @inline(__always)
-  var metadata: PredicateWithMetadataKey? {
-    return self.__metadata.value
-  }
-  
   @inline(__always)
   var date: DateFilter? {
     return self.__date.value

package/nitrogen/generated/ios/swift/FilterForWorkoutsBase.swift

@@ -18,7 +18,7 @@ public extension FilterForWorkoutsBase {
   /**
    * Create a new instance of `FilterForWorkoutsBase`.
    */
-  init(workoutActivityType: WorkoutActivityType?, duration: WorkoutDurationPredicate?, sources: [(any HybridSourceProxySpec)]?, uuid: String?, uuids: [String]?, metadata: PredicateWithMetadataKey?, date: DateFilter?) {
+  init(workoutActivityType: WorkoutActivityType?, duration: WorkoutDurationPredicate?, metadata: PredicateWithMetadataKey?, uuid: String?, sources: [(any HybridSourceProxySpec)]?, uuids: [String]?, date: DateFilter?) {
     self.init({ () -> bridge.std__optional_WorkoutActivityType_ in
       if let __unwrappedValue = workoutActivityType {
         return bridge.create_std__optional_WorkoutActivityType_(__unwrappedValue)
@@ -31,6 +31,18 @@ public extension FilterForWorkoutsBase {
       } else {
         return .init()
       }
+    }(), { () -> bridge.std__optional_PredicateWithMetadataKey_ in
+      if let __unwrappedValue = metadata {
+        return bridge.create_std__optional_PredicateWithMetadataKey_(__unwrappedValue)
+      } else {
+        return .init()
+      }
+    }(), { () -> bridge.std__optional_std__string_ in
+      if let __unwrappedValue = uuid {
+        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
+      } else {
+        return .init()
+      }
     }(), { () -> bridge.std__optional_std__vector_std__shared_ptr_HybridSourceProxySpec___ in
       if let __unwrappedValue = sources {
         return bridge.create_std__optional_std__vector_std__shared_ptr_HybridSourceProxySpec___({ () -> bridge.std__vector_std__shared_ptr_HybridSourceProxySpec__ in
@@ -46,12 +58,6 @@ public extension FilterForWorkoutsBase {
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_std__string_ in
-      if let __unwrappedValue = uuid {
-        return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
-      } else {
-        return .init()
-      }
     }(), { () -> bridge.std__optional_std__vector_std__string__ in
       if let __unwrappedValue = uuids {
         return bridge.create_std__optional_std__vector_std__string__({ () -> bridge.std__vector_std__string_ in
@@ -64,12 +70,6 @@ public extension FilterForWorkoutsBase {
       } else {
         return .init()
       }
-    }(), { () -> bridge.std__optional_PredicateWithMetadataKey_ in
-      if let __unwrappedValue = metadata {
-        return bridge.create_std__optional_PredicateWithMetadataKey_(__unwrappedValue)
-      } else {
-        return .init()
-      }
     }(), { () -> bridge.std__optional_DateFilter_ in
       if let __unwrappedValue = date {
         return bridge.create_std__optional_DateFilter_(__unwrappedValue)
@@ -89,6 +89,23 @@ public extension FilterForWorkoutsBase {
     return self.__duration.value
   }
   
+  @inline(__always)
+  var metadata: PredicateWithMetadataKey? {
+    return self.__metadata.value
+  }
+  
+  @inline(__always)
+  var uuid: String? {
+    return { () -> String? in
+      if bridge.has_value_std__optional_std__string_(self.__uuid) {
+        let __unwrapped = bridge.get_std__optional_std__string_(self.__uuid)
+        return String(__unwrapped)
+      } else {
+        return nil
+      }
+    }()
+  }
+  
   @inline(__always)
   var sources: [(any HybridSourceProxySpec)]? {
     return { () -> [(any HybridSourceProxySpec)]? in
@@ -105,18 +122,6 @@ public extension FilterForWorkoutsBase {
     }()
   }
   
-  @inline(__always)
-  var uuid: String? {
-    return { () -> String? in
-      if bridge.has_value_std__optional_std__string_(self.__uuid) {
-        let __unwrapped = bridge.get_std__optional_std__string_(self.__uuid)
-        return String(__unwrapped)
-      } else {
-        return nil
-      }
-    }()
-  }
-  
   @inline(__always)
   var uuids: [String]? {
     return { () -> [String]? in
@@ -129,11 +134,6 @@ public extension FilterForWorkoutsBase {
     }()
   }
   
-  @inline(__always)
-  var metadata: PredicateWithMetadataKey? {
-    return self.__metadata.value
-  }
-  
   @inline(__always)
   var date: DateFilter? {
     return self.__date.value

package/nitrogen/generated/ios/swift/GeneralForm.swift

@@ -17,14 +17,14 @@ public extension GeneralForm {
    */
   init?(fromString string: String) {
     switch string {
+      case "device":
+        self = .device
       case "unknown":
         self = .unknown
       case "capsule":
         self = .capsule
       case "cream":
         self = .cream
-      case "device":
-        self = .device
       case "drops":
         self = .drops
       case "foam":
@@ -63,14 +63,14 @@ public extension GeneralForm {
    */
   var stringValue: String {
     switch self {
+      case .device:
+        return "device"
       case .unknown:
         return "unknown"
       case .capsule:
         return "capsule"
       case .cream:
         return "cream"
-      case .device:
-        return "device"
       case .drops:
         return "drops"
       case .foam: