⚠️ Cleaning up Swiftlint warnings (#1022)

Author: dvanwinkle

Amplify/Categories/DataStore/Model/Internal/Embedded.swift

@@ -13,10 +13,10 @@ import Foundation
 /// `embedded(type:)` or `embeddedCollection(of:)` must comform to the `Embeddable` protocol except for Swift's Basic
 /// types embedded as a collection. A collection of String can be embedded in the `Model` as
 /// `embeddedCollection(of: String.self)` without needing to conform to Embeddable.
-/// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
-///
+/// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+///   breaking change.
 public protocol Embeddable: Codable {
 
     /// A reference to the `ModelSchema` associated with this embedded type.

Amplify/Categories/DataStore/Model/Internal/Model+Array.swift

@@ -9,9 +9,10 @@ import Foundation
 
 extension Array where Element: Model {
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public func unique() throws -> Element? {
         guard (0 ... 1).contains(count) else {
             throw DataStoreError.nonUniqueResult(model: Element.modelName, count: count)
@@ -22,9 +23,10 @@ extension Array where Element: Model {
 
 extension Array where Element == Model {
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public func unique() throws -> Element? {
         guard (0 ... 1).contains(count) else {
             let firstModelName = self[0].modelName

Amplify/Categories/DataStore/Model/Internal/Model+Codable.swift

@@ -20,9 +20,10 @@ extension Model where Self: Codable {
     /// - Returns: an instance of the concrete type conforming to `Model`
     /// - Throws: `DecodingError.dataCorrupted` in case data is not a valid JSON or any
     /// other decoding specific error that `JSONDecoder.decode()` might throw.
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public static func from(json: String,
                             decoder: JSONDecoder? = nil) throws -> Self {
         let resolvedDecoder: JSONDecoder
@@ -49,9 +50,10 @@ extension Model where Self: Codable {
     /// - Returns: an instance of the concrete type conforming to `Model`
     /// - Throws: `DecodingError.dataCorrupted` in case data is not a valid JSON or any
     /// other decoding specific error that `JSONDecoder.decode()` might throw.
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public static func from(dictionary: [String: Any]) throws -> Self {
         let data = try JSONSerialization.data(withJSONObject: dictionary)
         let decoder = JSONDecoder(dateDecodingStrategy: ModelDateFormatting.decodingStrategy)
@@ -64,9 +66,10 @@ extension Model where Self: Codable {
     ///     custom date formatter that encodes ISO8601 dates with fractional seconds
     /// - Returns: the JSON representation of the `Model`
     /// - seealso: https://developer.apple.com/documentation/foundation/jsonencoder/2895034-encode
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public func toJSON(encoder: JSONEncoder? = nil) throws -> String {
         let resolvedEncoder: JSONEncoder
         if let encoder = encoder {

Amplify/Categories/DataStore/Model/Internal/Model+DateFormatting.swift

@@ -7,9 +7,10 @@
 
 import Foundation
 
-/// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+/// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+///   breaking change.
 public struct ModelDateFormatting {
 
     public static let decodingStrategy: JSONDecoder.DateDecodingStrategy = {
@@ -35,9 +36,10 @@ public struct ModelDateFormatting {
 
 public extension JSONDecoder {
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     convenience init(dateDecodingStrategy: JSONDecoder.DateDecodingStrategy) {
         self.init()
         self.dateDecodingStrategy = dateDecodingStrategy
@@ -46,9 +48,10 @@ public extension JSONDecoder {
 
 public extension JSONEncoder {
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     convenience init(dateEncodingStrategy: JSONEncoder.DateEncodingStrategy) {
         self.init()
         self.dateEncodingStrategy = dateEncodingStrategy

Amplify/Categories/DataStore/Model/Internal/Model+Subscript.swift

@@ -12,9 +12,10 @@
 /// ```
 extension Model {
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public subscript(_ key: String) -> Any?? {
 
         if let jsonModel = self as? JSONValueHolder {

Amplify/Categories/DataStore/Model/Internal/ModelRegistry+Syncable.swift

@@ -7,9 +7,10 @@
 
 public extension ModelRegistry {
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     static var hasSyncableModels: Bool {
         if #available(iOS 13.0, *) {
             return modelSchemas.contains { !$0.isSystem }

Amplify/Categories/DataStore/Model/Internal/Persistable.swift

@@ -42,9 +42,10 @@ struct PersistableHelper {
     ///   - lhs: a reference to a Persistable object
     ///   - rhs: another reference
     /// - Returns: `true` in case both values are equal or `false` otherwise
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public static func isEqual(_ lhs: Persistable?, _ rhs: Persistable?) -> Bool {
         if lhs == nil && rhs == nil {
             return true
@@ -69,7 +70,7 @@ struct PersistableHelper {
         }
     }
 
-    //We are promoting Int to Double in the case where we are comparing these two types
+    // We are promoting Int to Double in the case where we are comparing these two types
     public static func isEqual(_ lhs: Any?, _ rhs: Persistable?) -> Bool {
         if lhs == nil && rhs == nil {
             return true
@@ -98,13 +99,13 @@ struct PersistableHelper {
         }
     }
 
-    //We are promoting Int to Double in the case where we are comparing these two types
+    // We are promoting Int to Double in the case where we are comparing these two types
     public static func isLessOrEqual(_ lhs: Any?, _ rhs: Persistable?) -> Bool {
         if lhs == nil && rhs == nil {
             return true
         }
         switch (lhs, rhs) {
-        //case Bool Removed
+        // case Bool Removed
         case let (lhs, rhs) as (Temporal.Date, Temporal.Date):
             return lhs <= rhs
         case let (lhs, rhs) as (Temporal.DateTime, Temporal.DateTime):
@@ -126,13 +127,13 @@ struct PersistableHelper {
         }
     }
 
-    //We are promoting Int to Double in the case where we are comparing these two types
+    // We are promoting Int to Double in the case where we are comparing these two types
     public static func isLessThan(_ lhs: Any?, _ rhs: Persistable?) -> Bool {
         if lhs == nil && rhs == nil {
             return false
         }
         switch (lhs, rhs) {
-        //case Bool Removed
+        // case Bool Removed
         case let (lhs, rhs) as (Temporal.Date, Temporal.Date):
             return lhs < rhs
         case let (lhs, rhs) as (Temporal.DateTime, Temporal.DateTime):
@@ -154,13 +155,13 @@ struct PersistableHelper {
         }
     }
 
-    //We are promoting Int to Double in the case where we are comparing these two types
+    // We are promoting Int to Double in the case where we are comparing these two types
     public static func isGreaterOrEqual(_ lhs: Any?, _ rhs: Persistable?) -> Bool {
         if lhs == nil && rhs == nil {
             return true
         }
         switch (lhs, rhs) {
-        //case Bool Removed
+        // case Bool Removed
         case let (lhs, rhs) as (Temporal.Date, Temporal.Date):
             return lhs >= rhs
         case let (lhs, rhs) as (Temporal.DateTime, Temporal.DateTime):
@@ -182,13 +183,13 @@ struct PersistableHelper {
         }
     }
 
-    //We are promoting Int to Double in the case where we are comparing these two types
+    // We are promoting Int to Double in the case where we are comparing these two types
     public static func isGreaterThan(_ lhs: Any?, _ rhs: Persistable?) -> Bool {
         if lhs == nil && rhs == nil {
             return false
         }
         switch (lhs, rhs) {
-        //case Bool Removed
+        // case Bool Removed
         case let (lhs, rhs) as (Temporal.Date, Temporal.Date):
             return lhs > rhs
         case let (lhs, rhs) as (Temporal.DateTime, Temporal.DateTime):

Amplify/Categories/DataStore/Model/Internal/Schema/Model+Schema.swift

@@ -9,17 +9,19 @@ import Foundation
 
 extension Model {
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public static var schema: ModelSchema {
         // TODO load schema from JSON when this it not overridden by specific models
         ModelSchema(name: modelName, fields: [:])
     }
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning. Though it is not used by host application making any change
-    ///   to these `public` types should be backward compatible, otherwise it will be a breaking change.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning. Though it is not used by host
+    ///   application making any change to these `public` types should be backward compatible, otherwise it will be a
+    ///   breaking change.
     public var schema: ModelSchema {
         type(of: self).schema
     }
@@ -42,8 +44,8 @@ extension Model {
     ///   - attributes: model attributes (aka "directives" or "annotations")
     ///   - define: the closure used to define the model attributes and fields
     /// - Returns: a valid `ModelSchema` instance
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning.
     public static func defineSchema(name: String? = nil,
                                     attributes: ModelAttribute...,
                                     define: (inout ModelSchemaDefinition) -> Void) -> ModelSchema {
@@ -53,8 +55,8 @@ extension Model {
         return definition.build()
     }
 
-    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used directly
-    ///   by host applications. The behavior of this may change without warning.
+    /// - Warning: Although this has `public` access, it is intended for internal & codegen use and should not be used
+    ///   directly by host applications. The behavior of this may change without warning.
     public static func rule(allow: AuthStrategy,
                             ownerField: String? = nil,
                             identityClaim: String? = nil,