@kingstinct/react-native-healthkit 11.1.0 → 11.1.1

package/nitrogen/generated/ios/swift/CategorySample.swift

@@ -48,14 +48,7 @@ public extension CategorySample {
   var device: Device? {
     @inline(__always)
     get {
-      return { () -> Device? in
-        if bridge.has_value_std__optional_Device_(self.__device) {
-          let __unwrapped = bridge.get_std__optional_Device_(self.__device)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__device.value
     }
     @inline(__always)
     set {
@@ -127,14 +120,7 @@ public extension CategorySample {
   var sourceRevision: SourceRevision? {
     @inline(__always)
     get {
-      return { () -> SourceRevision? in
-        if bridge.has_value_std__optional_SourceRevision_(self.__sourceRevision) {
-          let __unwrapped = bridge.get_std__optional_SourceRevision_(self.__sourceRevision)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__sourceRevision.value
     }
     @inline(__always)
     set {

package/nitrogen/generated/ios/swift/CategorySampleForSaving.swift

@@ -86,14 +86,7 @@ public extension CategorySampleForSaving {
   var sourceRevision: SourceRevision? {
     @inline(__always)
     get {
-      return { () -> SourceRevision? in
-        if bridge.has_value_std__optional_SourceRevision_(self.__sourceRevision) {
-          let __unwrapped = bridge.get_std__optional_SourceRevision_(self.__sourceRevision)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__sourceRevision.value
     }
     @inline(__always)
     set {

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

@@ -84,14 +84,7 @@ public extension ElectrocardiogramSample {
   var device: Device? {
     @inline(__always)
     get {
-      return { () -> Device? in
-        if bridge.has_value_std__optional_Device_(self.__device) {
-          let __unwrapped = bridge.get_std__optional_Device_(self.__device)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__device.value
     }
     @inline(__always)
     set {
@@ -275,14 +268,7 @@ public extension ElectrocardiogramSample {
   var sourceRevision: SourceRevision? {
     @inline(__always)
     get {
-      return { () -> SourceRevision? in
-        if bridge.has_value_std__optional_SourceRevision_(self.__sourceRevision) {
-          let __unwrapped = bridge.get_std__optional_SourceRevision_(self.__sourceRevision)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__sourceRevision.value
     }
     @inline(__always)
     set {

package/nitrogen/generated/ios/swift/Func_void_std__optional_QueryStatisticsResponse_.swift

@@ -23,14 +23,7 @@ public final class Func_void_std__optional_QueryStatisticsResponse_ {
 
   @inline(__always)
   public func call(value: bridge.std__optional_QueryStatisticsResponse_) -> Void {
-    self.closure({ () -> QueryStatisticsResponse? in
-      if bridge.has_value_std__optional_QueryStatisticsResponse_(value) {
-        let __unwrapped = bridge.get_std__optional_QueryStatisticsResponse_(value)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }())
+    self.closure(value.value)
   }
 
   /**

package/nitrogen/generated/ios/swift/Func_void_std__optional_WorkoutPlan_.swift

@@ -23,14 +23,7 @@ public final class Func_void_std__optional_WorkoutPlan_ {
 
   @inline(__always)
   public func call(value: bridge.std__optional_WorkoutPlan_) -> Void {
-    self.closure({ () -> WorkoutPlan? in
-      if bridge.has_value_std__optional_WorkoutPlan_(value) {
-        let __unwrapped = bridge.get_std__optional_WorkoutPlan_(value)
-        return __unwrapped
-      } else {
-        return nil
-      }
-    }())
+    self.closure(value.value)
   }
 
   /**

package/nitrogen/generated/ios/swift/HeartbeatSeriesSample.swift

@@ -60,14 +60,7 @@ public extension HeartbeatSeriesSample {
   var device: Device? {
     @inline(__always)
     get {
-      return { () -> Device? in
-        if bridge.has_value_std__optional_Device_(self.__device) {
-          let __unwrapped = bridge.get_std__optional_Device_(self.__device)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__device.value
     }
     @inline(__always)
     set {
@@ -147,14 +140,7 @@ public extension HeartbeatSeriesSample {
   var sourceRevision: SourceRevision? {
     @inline(__always)
     get {
-      return { () -> SourceRevision? in
-        if bridge.has_value_std__optional_SourceRevision_(self.__sourceRevision) {
-          let __unwrapped = bridge.get_std__optional_SourceRevision_(self.__sourceRevision)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__sourceRevision.value
     }
     @inline(__always)
     set {

package/nitrogen/generated/ios/swift/HybridCategoryTypeModuleSpec_cxx.swift

@@ -131,14 +131,7 @@ open class HybridCategoryTypeModuleSpec_cxx {
   @inline(__always)
   public final func queryCategorySamples(identifier: Int32, options: bridge.std__optional_QueryOptionsWithSortOrder_) -> bridge.Result_std__shared_ptr_Promise_std__vector_CategorySample____ {
     do {
-      let __result = try self.__implementation.queryCategorySamples(identifier: margelo.nitro.healthkit.CategoryTypeIdentifier(rawValue: identifier)!, options: { () -> QueryOptionsWithSortOrder? in
-        if bridge.has_value_std__optional_QueryOptionsWithSortOrder_(options) {
-          let __unwrapped = bridge.get_std__optional_QueryOptionsWithSortOrder_(options)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }())
+      let __result = try self.__implementation.queryCategorySamples(identifier: margelo.nitro.healthkit.CategoryTypeIdentifier(rawValue: identifier)!, options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_CategorySample___ in
         let __promise = bridge.create_std__shared_ptr_Promise_std__vector_CategorySample___()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__vector_CategorySample___(__promise)

package/nitrogen/generated/ios/swift/HybridCoreModuleSpec_cxx.swift

@@ -231,7 +231,11 @@ open class HybridCoreModuleSpec_cxx {
   @inline(__always)
   public final func getPreferredUnits(identifiers: bridge.std__vector_QuantityTypeIdentifier_, forceUpdate: bridge.std__optional_bool_) -> bridge.Result_std__shared_ptr_Promise_std__vector_IdentifierWithUnit____ {
     do {
-      let __result = try self.__implementation.getPreferredUnits(identifiers: identifiers.map({ __item in __item }), forceUpdate: forceUpdate.value)
+      let __result = try self.__implementation.getPreferredUnits(identifiers: { () -> [QuantityTypeIdentifier] in
+        let __data = bridge.get_data_std__vector_QuantityTypeIdentifier_(identifiers)
+        let __size = identifiers.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }(), forceUpdate: forceUpdate.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_IdentifierWithUnit___ in
         let __promise = bridge.create_std__shared_ptr_Promise_std__vector_IdentifierWithUnit___()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__vector_IdentifierWithUnit___(__promise)
@@ -375,7 +379,15 @@ open class HybridCoreModuleSpec_cxx {
   @inline(__always)
   public final func getRequestStatusForAuthorization(toShare: bridge.std__vector_SampleTypeIdentifierWriteable_, toRead: bridge.std__vector_ObjectTypeIdentifier_) -> bridge.Result_std__shared_ptr_Promise_AuthorizationRequestStatus___ {
     do {
-      let __result = try self.__implementation.getRequestStatusForAuthorization(toShare: toShare.map({ __item in __item }), toRead: toRead.map({ __item in __item }))
+      let __result = try self.__implementation.getRequestStatusForAuthorization(toShare: { () -> [SampleTypeIdentifierWriteable] in
+        let __data = bridge.get_data_std__vector_SampleTypeIdentifierWriteable_(toShare)
+        let __size = toShare.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }(), toRead: { () -> [ObjectTypeIdentifier] in
+        let __data = bridge.get_data_std__vector_ObjectTypeIdentifier_(toRead)
+        let __size = toRead.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }())
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_AuthorizationRequestStatus__ in
         let __promise = bridge.create_std__shared_ptr_Promise_AuthorizationRequestStatus__()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_AuthorizationRequestStatus__(__promise)
@@ -394,7 +406,15 @@ open class HybridCoreModuleSpec_cxx {
   @inline(__always)
   public final func requestAuthorization(toShare: bridge.std__vector_SampleTypeIdentifierWriteable_, toRead: bridge.std__vector_ObjectTypeIdentifier_) -> bridge.Result_std__shared_ptr_Promise_bool___ {
     do {
-      let __result = try self.__implementation.requestAuthorization(toShare: toShare.map({ __item in __item }), toRead: toRead.map({ __item in __item }))
+      let __result = try self.__implementation.requestAuthorization(toShare: { () -> [SampleTypeIdentifierWriteable] in
+        let __data = bridge.get_data_std__vector_SampleTypeIdentifierWriteable_(toShare)
+        let __size = toShare.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }(), toRead: { () -> [ObjectTypeIdentifier] in
+        let __data = bridge.get_data_std__vector_ObjectTypeIdentifier_(toRead)
+        let __size = toRead.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }())
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_bool__ in
         let __promise = bridge.create_std__shared_ptr_Promise_bool__()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_bool__(__promise)
@@ -471,7 +491,11 @@ open class HybridCoreModuleSpec_cxx {
   @inline(__always)
   public final func areObjectTypesAvailable(objectTypeIdentifiers: bridge.std__vector_ObjectTypeIdentifier_) -> bridge.Result_std__unordered_map_std__string__bool__ {
     do {
-      let __result = try self.__implementation.areObjectTypesAvailable(objectTypeIdentifiers: objectTypeIdentifiers.map({ __item in __item }))
+      let __result = try self.__implementation.areObjectTypesAvailable(objectTypeIdentifiers: { () -> [ObjectTypeIdentifier] in
+        let __data = bridge.get_data_std__vector_ObjectTypeIdentifier_(objectTypeIdentifiers)
+        let __size = objectTypeIdentifiers.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }())
       let __resultCpp = { () -> bridge.std__unordered_map_std__string__bool_ in
         var __map = bridge.create_std__unordered_map_std__string__bool_(__result.count)
         for (__k, __v) in __result {
@@ -489,7 +513,11 @@ open class HybridCoreModuleSpec_cxx {
   @inline(__always)
   public final func areObjectTypesAvailableAsync(objectTypeIdentifiers: bridge.std__vector_ObjectTypeIdentifier_) -> bridge.Result_std__shared_ptr_Promise_std__unordered_map_std__string__bool____ {
     do {
-      let __result = try self.__implementation.areObjectTypesAvailableAsync(objectTypeIdentifiers: objectTypeIdentifiers.map({ __item in __item }))
+      let __result = try self.__implementation.areObjectTypesAvailableAsync(objectTypeIdentifiers: { () -> [ObjectTypeIdentifier] in
+        let __data = bridge.get_data_std__vector_ObjectTypeIdentifier_(objectTypeIdentifiers)
+        let __size = objectTypeIdentifiers.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }())
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__unordered_map_std__string__bool___ in
         let __promise = bridge.create_std__shared_ptr_Promise_std__unordered_map_std__string__bool___()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__unordered_map_std__string__bool___(__promise)

package/nitrogen/generated/ios/swift/HybridElectrocardiogramModuleSpec_cxx.swift

@@ -112,14 +112,7 @@ open class HybridElectrocardiogramModuleSpec_cxx {
   @inline(__always)
   public final func queryElectrocardiogramSamples(options: bridge.std__optional_ECGQueryOptionsWithSortOrder_) -> bridge.Result_std__shared_ptr_Promise_std__vector_ElectrocardiogramSample____ {
     do {
-      let __result = try self.__implementation.queryElectrocardiogramSamples(options: { () -> ECGQueryOptionsWithSortOrder? in
-        if bridge.has_value_std__optional_ECGQueryOptionsWithSortOrder_(options) {
-          let __unwrapped = bridge.get_std__optional_ECGQueryOptionsWithSortOrder_(options)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }())
+      let __result = try self.__implementation.queryElectrocardiogramSamples(options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_ElectrocardiogramSample___ in
         let __promise = bridge.create_std__shared_ptr_Promise_std__vector_ElectrocardiogramSample___()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__vector_ElectrocardiogramSample___(__promise)

package/nitrogen/generated/ios/swift/HybridHeartbeatSeriesModuleSpec_cxx.swift

@@ -112,14 +112,7 @@ open class HybridHeartbeatSeriesModuleSpec_cxx {
   @inline(__always)
   public final func queryHeartbeatSeriesSamples(options: bridge.std__optional_QueryOptionsWithSortOrder_) -> bridge.Result_std__shared_ptr_Promise_std__vector_HeartbeatSeriesSample____ {
     do {
-      let __result = try self.__implementation.queryHeartbeatSeriesSamples(options: { () -> QueryOptionsWithSortOrder? in
-        if bridge.has_value_std__optional_QueryOptionsWithSortOrder_(options) {
-          let __unwrapped = bridge.get_std__optional_QueryOptionsWithSortOrder_(options)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }())
+      let __result = try self.__implementation.queryHeartbeatSeriesSamples(options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_HeartbeatSeriesSample___ in
         let __promise = bridge.create_std__shared_ptr_Promise_std__vector_HeartbeatSeriesSample___()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__vector_HeartbeatSeriesSample___(__promise)

package/nitrogen/generated/ios/swift/HybridQuantityTypeModuleSpec_cxx.swift

@@ -189,14 +189,7 @@ open class HybridQuantityTypeModuleSpec_cxx {
   @inline(__always)
   public final func queryQuantitySamples(identifier: Int32, options: bridge.std__optional_QueryOptionsWithSortOrderAndUnit_) -> bridge.Result_std__shared_ptr_Promise_std__vector_QuantitySample____ {
     do {
-      let __result = try self.__implementation.queryQuantitySamples(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, options: { () -> QueryOptionsWithSortOrderAndUnit? in
-        if bridge.has_value_std__optional_QueryOptionsWithSortOrderAndUnit_(options) {
-          let __unwrapped = bridge.get_std__optional_QueryOptionsWithSortOrderAndUnit_(options)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }())
+      let __result = try self.__implementation.queryQuantitySamples(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_QuantitySample___ in
         let __promise = bridge.create_std__shared_ptr_Promise_std__vector_QuantitySample___()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__vector_QuantitySample___(__promise)
@@ -221,14 +214,11 @@ open class HybridQuantityTypeModuleSpec_cxx {
   @inline(__always)
   public final func queryStatisticsForQuantity(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, options: bridge.std__optional_StatisticsQueryOptions_) -> bridge.Result_std__shared_ptr_Promise_QueryStatisticsResponse___ {
     do {
-      let __result = try self.__implementation.queryStatisticsForQuantity(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, statistics: statistics.map({ __item in __item }), options: { () -> StatisticsQueryOptions? in
-        if bridge.has_value_std__optional_StatisticsQueryOptions_(options) {
-          let __unwrapped = bridge.get_std__optional_StatisticsQueryOptions_(options)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }())
+      let __result = try self.__implementation.queryStatisticsForQuantity(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, statistics: { () -> [StatisticsOptions] in
+        let __data = bridge.get_data_std__vector_StatisticsOptions_(statistics)
+        let __size = statistics.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }(), options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_QueryStatisticsResponse__ in
         let __promise = bridge.create_std__shared_ptr_Promise_QueryStatisticsResponse__()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_QueryStatisticsResponse__(__promise)
@@ -247,14 +237,11 @@ open class HybridQuantityTypeModuleSpec_cxx {
   @inline(__always)
   public final func queryStatisticsCollectionForQuantity(identifier: Int32, statistics: bridge.std__vector_StatisticsOptions_, anchorDate: std.string, intervalComponents: IntervalComponents, options: bridge.std__optional_StatisticsQueryOptions_) -> bridge.Result_std__shared_ptr_Promise_std__vector_QueryStatisticsResponse____ {
     do {
-      let __result = try self.__implementation.queryStatisticsCollectionForQuantity(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, statistics: statistics.map({ __item in __item }), anchorDate: String(anchorDate), intervalComponents: intervalComponents, options: { () -> StatisticsQueryOptions? in
-        if bridge.has_value_std__optional_StatisticsQueryOptions_(options) {
-          let __unwrapped = bridge.get_std__optional_StatisticsQueryOptions_(options)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }())
+      let __result = try self.__implementation.queryStatisticsCollectionForQuantity(identifier: margelo.nitro.healthkit.QuantityTypeIdentifier(rawValue: identifier)!, statistics: { () -> [StatisticsOptions] in
+        let __data = bridge.get_data_std__vector_StatisticsOptions_(statistics)
+        let __size = statistics.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }(), anchorDate: String(anchorDate), intervalComponents: intervalComponents, options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_QueryStatisticsResponse___ in
         let __promise = bridge.create_std__shared_ptr_Promise_std__vector_QueryStatisticsResponse___()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__vector_QueryStatisticsResponse___(__promise)

package/nitrogen/generated/ios/swift/HybridStateOfMindModuleSpec_cxx.swift

@@ -112,14 +112,7 @@ open class HybridStateOfMindModuleSpec_cxx {
   @inline(__always)
   public final func queryStateOfMindSamples(options: bridge.std__optional_QueryOptionsWithSortOrder_) -> bridge.Result_std__shared_ptr_Promise_std__vector_StateOfMindSample____ {
     do {
-      let __result = try self.__implementation.queryStateOfMindSamples(options: { () -> QueryOptionsWithSortOrder? in
-        if bridge.has_value_std__optional_QueryOptionsWithSortOrder_(options) {
-          let __unwrapped = bridge.get_std__optional_QueryOptionsWithSortOrder_(options)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }())
+      let __result = try self.__implementation.queryStateOfMindSamples(options: options.value)
       let __resultCpp = { () -> bridge.std__shared_ptr_Promise_std__vector_StateOfMindSample___ in
         let __promise = bridge.create_std__shared_ptr_Promise_std__vector_StateOfMindSample___()
         let __promiseHolder = bridge.wrap_std__shared_ptr_Promise_std__vector_StateOfMindSample___(__promise)
@@ -144,7 +137,15 @@ open class HybridStateOfMindModuleSpec_cxx {
   @inline(__always)
   public final func saveStateOfMindSample(date: margelo.nitro.chrono_time, kind: Int32, valence: Double, labels: bridge.std__vector_StateOfMindLabel_, associations: bridge.std__vector_StateOfMindAssociation_, metadata: bridge.std__optional_std__shared_ptr_AnyMap__) -> bridge.Result_std__shared_ptr_Promise_bool___ {
     do {
-      let __result = try self.__implementation.saveStateOfMindSample(date: Date(fromChrono: date), kind: margelo.nitro.healthkit.StateOfMindKind(rawValue: kind)!, valence: valence, labels: labels.map({ __item in __item }), associations: associations.map({ __item in __item }), metadata: { () -> AnyMap? in
+      let __result = try self.__implementation.saveStateOfMindSample(date: Date(fromChrono: date), kind: margelo.nitro.healthkit.StateOfMindKind(rawValue: kind)!, valence: valence, labels: { () -> [StateOfMindLabel] in
+        let __data = bridge.get_data_std__vector_StateOfMindLabel_(labels)
+        let __size = labels.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }(), associations: { () -> [StateOfMindAssociation] in
+        let __data = bridge.get_data_std__vector_StateOfMindAssociation_(associations)
+        let __size = associations.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }(), metadata: { () -> AnyMap? in
         if bridge.has_value_std__optional_std__shared_ptr_AnyMap__(metadata) {
           let __unwrapped = bridge.get_std__optional_std__shared_ptr_AnyMap__(metadata)
           return AnyMap(withCppPart: __unwrapped)

package/nitrogen/generated/ios/swift/QuantitySample.swift

@@ -48,14 +48,7 @@ public extension QuantitySample {
   var device: Device? {
     @inline(__always)
     get {
-      return { () -> Device? in
-        if bridge.has_value_std__optional_Device_(self.__device) {
-          let __unwrapped = bridge.get_std__optional_Device_(self.__device)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__device.value
     }
     @inline(__always)
     set {
@@ -138,14 +131,7 @@ public extension QuantitySample {
   var sourceRevision: SourceRevision? {
     @inline(__always)
     get {
-      return { () -> SourceRevision? in
-        if bridge.has_value_std__optional_SourceRevision_(self.__sourceRevision) {
-          let __unwrapped = bridge.get_std__optional_SourceRevision_(self.__sourceRevision)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__sourceRevision.value
     }
     @inline(__always)
     set {

package/nitrogen/generated/ios/swift/QuantitySampleForSaving.swift

@@ -97,14 +97,7 @@ public extension QuantitySampleForSaving {
   var sourceRevision: SourceRevision? {
     @inline(__always)
     get {
-      return { () -> SourceRevision? in
-        if bridge.has_value_std__optional_SourceRevision_(self.__sourceRevision) {
-          let __unwrapped = bridge.get_std__optional_SourceRevision_(self.__sourceRevision)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__sourceRevision.value
     }
     @inline(__always)
     set {

package/nitrogen/generated/ios/swift/QueryStatisticsResponse.swift

@@ -79,14 +79,7 @@ public extension QueryStatisticsResponse {
   var averageQuantity: Quantity? {
     @inline(__always)
     get {
-      return { () -> Quantity? in
-        if bridge.has_value_std__optional_Quantity_(self.__averageQuantity) {
-          let __unwrapped = bridge.get_std__optional_Quantity_(self.__averageQuantity)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__averageQuantity.value
     }
     @inline(__always)
     set {
@@ -103,14 +96,7 @@ public extension QueryStatisticsResponse {
   var maximumQuantity: Quantity? {
     @inline(__always)
     get {
-      return { () -> Quantity? in
-        if bridge.has_value_std__optional_Quantity_(self.__maximumQuantity) {
-          let __unwrapped = bridge.get_std__optional_Quantity_(self.__maximumQuantity)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__maximumQuantity.value
     }
     @inline(__always)
     set {
@@ -127,14 +113,7 @@ public extension QueryStatisticsResponse {
   var minimumQuantity: Quantity? {
     @inline(__always)
     get {
-      return { () -> Quantity? in
-        if bridge.has_value_std__optional_Quantity_(self.__minimumQuantity) {
-          let __unwrapped = bridge.get_std__optional_Quantity_(self.__minimumQuantity)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__minimumQuantity.value
     }
     @inline(__always)
     set {
@@ -151,14 +130,7 @@ public extension QueryStatisticsResponse {
   var sumQuantity: Quantity? {
     @inline(__always)
     get {
-      return { () -> Quantity? in
-        if bridge.has_value_std__optional_Quantity_(self.__sumQuantity) {
-          let __unwrapped = bridge.get_std__optional_Quantity_(self.__sumQuantity)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__sumQuantity.value
     }
     @inline(__always)
     set {
@@ -175,14 +147,7 @@ public extension QueryStatisticsResponse {
   var mostRecentQuantity: Quantity? {
     @inline(__always)
     get {
-      return { () -> Quantity? in
-        if bridge.has_value_std__optional_Quantity_(self.__mostRecentQuantity) {
-          let __unwrapped = bridge.get_std__optional_Quantity_(self.__mostRecentQuantity)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__mostRecentQuantity.value
     }
     @inline(__always)
     set {
@@ -199,14 +164,7 @@ public extension QueryStatisticsResponse {
   var mostRecentQuantityDateInterval: QuantityDateInterval? {
     @inline(__always)
     get {
-      return { () -> QuantityDateInterval? in
-        if bridge.has_value_std__optional_QuantityDateInterval_(self.__mostRecentQuantityDateInterval) {
-          let __unwrapped = bridge.get_std__optional_QuantityDateInterval_(self.__mostRecentQuantityDateInterval)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__mostRecentQuantityDateInterval.value
     }
     @inline(__always)
     set {
@@ -223,14 +181,7 @@ public extension QueryStatisticsResponse {
   var duration: Quantity? {
     @inline(__always)
     get {
-      return { () -> Quantity? in
-        if bridge.has_value_std__optional_Quantity_(self.__duration) {
-          let __unwrapped = bridge.get_std__optional_Quantity_(self.__duration)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__duration.value
     }
     @inline(__always)
     set {

package/nitrogen/generated/ios/swift/StateOfMindSample.swift

@@ -37,19 +37,11 @@ public extension StateOfMindSample {
       } else {
         return .init()
       }
-    }(), valence, kind, valenceClassification, { () -> bridge.std__vector_StateOfMindAssociation_ in
-      var __vector = bridge.create_std__vector_StateOfMindAssociation_(associations.count)
-      for __item in associations {
-        __vector.push_back(__item)
-      }
-      return __vector
-    }(), { () -> bridge.std__vector_StateOfMindLabel_ in
-      var __vector = bridge.create_std__vector_StateOfMindLabel_(labels.count)
-      for __item in labels {
-        __vector.push_back(__item)
-      }
-      return __vector
-    }())
+    }(), valence, kind, valenceClassification, associations.withUnsafeBufferPointer { __pointer -> bridge.std__vector_StateOfMindAssociation_ in
+      return bridge.copy_std__vector_StateOfMindAssociation_(__pointer.baseAddress!, associations.count)
+    }, labels.withUnsafeBufferPointer { __pointer -> bridge.std__vector_StateOfMindLabel_ in
+      return bridge.copy_std__vector_StateOfMindLabel_(__pointer.baseAddress!, labels.count)
+    })
   }
 
   var uuid: String {
@@ -66,14 +58,7 @@ public extension StateOfMindSample {
   var device: Device? {
     @inline(__always)
     get {
-      return { () -> Device? in
-        if bridge.has_value_std__optional_Device_(self.__device) {
-          let __unwrapped = bridge.get_std__optional_Device_(self.__device)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__device.value
     }
     @inline(__always)
     set {
@@ -136,14 +121,7 @@ public extension StateOfMindSample {
   var sourceRevision: SourceRevision? {
     @inline(__always)
     get {
-      return { () -> SourceRevision? in
-        if bridge.has_value_std__optional_SourceRevision_(self.__sourceRevision) {
-          let __unwrapped = bridge.get_std__optional_SourceRevision_(self.__sourceRevision)
-          return __unwrapped
-        } else {
-          return nil
-        }
-      }()
+      return self.__sourceRevision.value
     }
     @inline(__always)
     set {
@@ -193,34 +171,34 @@ public extension StateOfMindSample {
   var associations: [StateOfMindAssociation] {
     @inline(__always)
     get {
-      return self.__associations.map({ __item in __item })
+      return { () -> [StateOfMindAssociation] in
+        let __data = bridge.get_data_std__vector_StateOfMindAssociation_(self.__associations)
+        let __size = self.__associations.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }()
     }
     @inline(__always)
     set {
-      self.__associations = { () -> bridge.std__vector_StateOfMindAssociation_ in
-        var __vector = bridge.create_std__vector_StateOfMindAssociation_(newValue.count)
-        for __item in newValue {
-          __vector.push_back(__item)
-        }
-        return __vector
-      }()
+      self.__associations = newValue.withUnsafeBufferPointer { __pointer -> bridge.std__vector_StateOfMindAssociation_ in
+        return bridge.copy_std__vector_StateOfMindAssociation_(__pointer.baseAddress!, newValue.count)
+      }
     }
   }
   
   var labels: [StateOfMindLabel] {
     @inline(__always)
     get {
-      return self.__labels.map({ __item in __item })
+      return { () -> [StateOfMindLabel] in
+        let __data = bridge.get_data_std__vector_StateOfMindLabel_(self.__labels)
+        let __size = self.__labels.size()
+        return Array(UnsafeBufferPointer(start: __data, count: __size))
+      }()
     }
     @inline(__always)
     set {
-      self.__labels = { () -> bridge.std__vector_StateOfMindLabel_ in
-        var __vector = bridge.create_std__vector_StateOfMindLabel_(newValue.count)
-        for __item in newValue {
-          __vector.push_back(__item)
-        }
-        return __vector
-      }()
+      self.__labels = newValue.withUnsafeBufferPointer { __pointer -> bridge.std__vector_StateOfMindLabel_ in
+        return bridge.copy_std__vector_StateOfMindLabel_(__pointer.baseAddress!, newValue.count)
+      }
     }
   }
 }