Fix parsing issue, add support for DotLottieConfiguration in SwiftUI LottieView

.github/workflows/main.yml

@@ -47,7 +47,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
         with:
-          xcode: '14.3' # Swift 5.8
+          xcode: '15.0' # Swift 5.9
       - name: Test Package
         run: bundle exec rake test:package
       - name: Process test artifacts
@@ -143,7 +143,7 @@ jobs:
     strategy:
       matrix:
         xcode:
-        - '14.3' # Swift 5.8
+        - '15.0' # Swift 5.9
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/setup
@@ -162,7 +162,7 @@ jobs:
         with:
           install-mint: true
           install-carthage: true
-          xcode: '14.3' # Swift 5.8
+          xcode: '15.0' # Swift 5.9
       - name: Test Carthage support
         run: bundle exec rake test:carthage
 

Sources/Private/CoreAnimation/Layers/LayerModel+makeAnimationLayer.swift

@@ -51,11 +51,7 @@ extension LayerModel {
     case (.null, _):
       return TransformLayer(layerModel: self)
 
-    default:
-      try context.logCompatibilityIssue("""
-        Unexpected layer type combination ("\(type)" and "\(Swift.type(of: self))")
-        """)
-
+    case (.unknown, _), (.precomp, _), (.solid, _), (.image, _), (.shape, _), (.text, _):
       return nil
     }
   }

Sources/Private/Model/Assets/Asset.swift

@@ -26,7 +26,7 @@ public class Asset: Codable, DictionaryInitializable {
     } else if let id = dictionary[CodingKeys.id.rawValue] as? Int {
       self.id = String(id)
     } else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
   }
 

Sources/Private/Model/Assets/AssetLibrary.swift

@@ -18,14 +18,17 @@ final class AssetLibrary: Codable, AnyInitializable, Sendable {
     var imageAssets = [String : ImageAsset]()
     var precompAssets = [String : PrecompAsset]()
 
-    while !container.isAtEnd {
-      let keyContainer = try containerForKeys.nestedContainer(keyedBy: PrecompAsset.CodingKeys.self)
-      if keyContainer.contains(.layers) {
-        let precompAsset = try container.decode(PrecompAsset.self)
+    while
+      !container.isAtEnd,
+      let keyContainer = try? containerForKeys.nestedContainer(keyedBy: PrecompAsset.CodingKeys.self)
+    {
+      if
+        keyContainer.contains(.layers),
+        let precompAsset = try? container.decode(PrecompAsset.self)
+      {
         decodedAssets[precompAsset.id] = precompAsset
         precompAssets[precompAsset.id] = precompAsset
-      } else {
-        let imageAsset = try container.decode(ImageAsset.self)
+      } else if let imageAsset = try? container.decode(ImageAsset.self) {
         decodedAssets[imageAsset.id] = imageAsset
         imageAssets[imageAsset.id] = imageAsset
       }
@@ -37,7 +40,7 @@ final class AssetLibrary: Codable, AnyInitializable, Sendable {
 
   init(value: Any) throws {
     guard let dictionaries = value as? [[String: Any]] else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     var decodedAssets = [String : Asset]()
     var imageAssets = [String : ImageAsset]()
@@ -47,8 +50,7 @@ final class AssetLibrary: Codable, AnyInitializable, Sendable {
         let asset = try PrecompAsset(dictionary: dictionary)
         decodedAssets[asset.id] = asset
         precompAssets[asset.id] = asset
-      } else {
-        let asset = try ImageAsset(dictionary: dictionary)
+      } else if let asset = try? ImageAsset(dictionary: dictionary) {
         decodedAssets[asset.id] = asset
         imageAssets[asset.id] = asset
       }

Sources/Private/Model/DictionaryInitializable.swift

@@ -8,7 +8,7 @@
 // MARK: - InitializableError
 
 enum InitializableError: Error {
-  case invalidInput
+  case invalidInput(file: StaticString = #file, line: UInt = #line)
 }
 
 // MARK: - DictionaryInitializable
@@ -30,14 +30,24 @@ protocol AnyInitializable {
 extension Dictionary {
 
   @_disfavoredOverload
-  func value<T, KeyType: RawRepresentable>(for key: KeyType) throws -> T where KeyType.RawValue == Key {
+  func value<T, KeyType: RawRepresentable>(
+    for key: KeyType,
+    file: StaticString = #file,
+    line: UInt = #line)
+    throws -> T where KeyType.RawValue == Key
+  {
     guard let value = self[key.rawValue] as? T else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput(file: file, line: line)
     }
     return value
   }
 
-  func value<T: AnyInitializable, KeyType: RawRepresentable>(for key: KeyType) throws -> T where KeyType.RawValue == Key {
+  func value<T: AnyInitializable, KeyType: RawRepresentable>(
+    for key: KeyType,
+    file: StaticString = #file,
+    line: UInt = #line)
+    throws -> T where KeyType.RawValue == Key
+  {
     if let value = self[key.rawValue] as? T {
       return value
     }
@@ -46,7 +56,7 @@ extension Dictionary {
       return try T(value: value)
     }
 
-    throw InitializableError.invalidInput
+    throw InitializableError.invalidInput(file: file, line: line)
   }
 
 }
@@ -57,7 +67,7 @@ extension [Double]: AnyInitializable {
 
   init(value: Any) throws {
     guard let array = value as? [Double] else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self = array
   }

Sources/Private/Model/Keyframes/KeyframeGroup.swift

@@ -164,7 +164,7 @@ extension KeyframeGroup: DictionaryInitializable where T: AnyInitializable {
           let value: T = data.startValue ?? previousKeyframeData?.endValue,
           let time = data.time
         else {
-          throw InitializableError.invalidInput
+          throw InitializableError.invalidInput()
         }
         keyframes.append(Keyframe<T>(
           value: value,

Sources/Private/Model/Layers/LayerModel.swift

@@ -93,7 +93,7 @@ class LayerModel: Codable, DictionaryInitializable {
     inFrame = try container.decode(Double.self, forKey: .inFrame)
     outFrame = try container.decode(Double.self, forKey: .outFrame)
     startTime = try container.decode(Double.self, forKey: .startTime)
-    transform = try container.decode(Transform.self, forKey: .transform)
+    transform = try container.decodeIfPresent(Transform.self, forKey: .transform) ?? .default
     parent = try container.decodeIfPresent(Int.self, forKey: .parent)
     blendMode = try container.decodeIfPresent(BlendMode.self, forKey: .blendMode) ?? .normal
     masks = try container.decodeIfPresent([Mask].self, forKey: .masks)
@@ -119,8 +119,15 @@ class LayerModel: Codable, DictionaryInitializable {
     inFrame = try dictionary.value(for: CodingKeys.inFrame)
     outFrame = try dictionary.value(for: CodingKeys.outFrame)
     startTime = try dictionary.value(for: CodingKeys.startTime)
-    transform = try Transform(dictionary: try dictionary.value(for: CodingKeys.transform))
     parent = try? dictionary.value(for: CodingKeys.parent)
+    if
+      let transformDictionary: [String: Any] = try dictionary.value(for: CodingKeys.transform),
+      let transform = try? Transform(dictionary: transformDictionary)
+    {
+      self.transform = transform
+    } else {
+      transform = .default
+    }
     if
       let blendModeRawValue = dictionary[CodingKeys.blendMode.rawValue] as? Int,
       let blendMode = BlendMode(rawValue: blendModeRawValue)

Sources/Private/Model/Objects/DashPattern.swift

@@ -22,7 +22,7 @@ final class DashElement: Codable, DictionaryInitializable {
   init(dictionary: [String: Any]) throws {
     let typeRawValue: String = try dictionary.value(for: CodingKeys.type)
     guard let type = DashElementType(rawValue: typeRawValue) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.type = type
     let valueDictionary: [String: Any] = try dictionary.value(for: CodingKeys.value)

Sources/Private/Model/Objects/Transform.swift

@@ -84,7 +84,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       self.anchorPoint = anchorPoint
     } else {
-      anchorPoint = KeyframeGroup(LottieVector3D(x: Double(0), y: 0, z: 0))
+      anchorPoint = Transform.default.anchorPoint
     }
 
     if
@@ -110,7 +110,7 @@ final class Transform: Codable, DictionaryInitializable {
       positionY = try KeyframeGroup<LottieVector1D>(dictionary: yDictionary)
       position = nil
     } else {
-      position = KeyframeGroup(LottieVector3D(x: Double(0), y: 0, z: 0))
+      position = Transform.default.position
       positionX = nil
       positionY = nil
     }
@@ -121,7 +121,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       self.scale = scale
     } else {
-      scale = KeyframeGroup(LottieVector3D(x: Double(100), y: 100, z: 100))
+      scale = Transform.default.scale
     }
 
     if
@@ -130,7 +130,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       rotationX = rotation
     } else {
-      rotationX = KeyframeGroup(LottieVector1D(0))
+      rotationX = Transform.default.rotationX
     }
 
     if
@@ -139,7 +139,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       rotationY = rotation
     } else {
-      rotationY = KeyframeGroup(LottieVector1D(0))
+      rotationY = Transform.default.rotationY
     }
 
     if
@@ -153,7 +153,7 @@ final class Transform: Codable, DictionaryInitializable {
     {
       rotationZ = rotation
     } else {
-      rotationZ = KeyframeGroup(LottieVector1D(0))
+      rotationZ = Transform.default.rotationZ
     }
     rotation = nil
     if
@@ -162,10 +162,34 @@ final class Transform: Codable, DictionaryInitializable {
     {
       self.opacity = opacity
     } else {
-      opacity = KeyframeGroup(LottieVector1D(100))
+      opacity = Transform.default.opacity
     }
   }
 
+  init(
+    anchorPoint: KeyframeGroup<LottieVector3D>,
+    position: KeyframeGroup<LottieVector3D>?,
+    positionX: KeyframeGroup<LottieVector1D>?,
+    positionY: KeyframeGroup<LottieVector1D>?,
+    scale: KeyframeGroup<LottieVector3D>,
+    rotationX: KeyframeGroup<LottieVector1D>,
+    rotationY: KeyframeGroup<LottieVector1D>,
+    rotationZ: KeyframeGroup<LottieVector1D>,
+    opacity: KeyframeGroup<LottieVector1D>,
+    rotation: KeyframeGroup<LottieVector1D>?)
+  {
+    self.anchorPoint = anchorPoint
+    self.position = position
+    self.positionX = positionX
+    self.positionY = positionY
+    self.scale = scale
+    self.rotationX = rotationX
+    self.rotationY = rotationY
+    self.rotationZ = rotationZ
+    self.opacity = opacity
+    self.rotation = rotation
+  }
+
   // MARK: Internal
 
   enum CodingKeys: String, CodingKey {
@@ -187,6 +211,21 @@ final class Transform: Codable, DictionaryInitializable {
     case positionY = "y"
   }
 
+  /// Default transform values to use if no transform is provided
+  static var `default`: Transform {
+    Transform(
+      anchorPoint: KeyframeGroup(LottieVector3D(x: Double(0), y: 0, z: 0)),
+      position: KeyframeGroup(LottieVector3D(x: Double(0), y: 0, z: 0)),
+      positionX: nil,
+      positionY: nil,
+      scale: KeyframeGroup(LottieVector3D(x: Double(100), y: 100, z: 100)),
+      rotationX: KeyframeGroup(LottieVector1D(0)),
+      rotationY: KeyframeGroup(LottieVector1D(0)),
+      rotationZ: KeyframeGroup(LottieVector1D(0)),
+      opacity: KeyframeGroup(LottieVector1D(100)),
+      rotation: nil)
+  }
+
   /// The anchor point of the transform.
   let anchorPoint: KeyframeGroup<LottieVector3D>
 

Sources/Private/Model/ShapeItems/GradientFill.swift

@@ -43,7 +43,7 @@ final class GradientFill: ShapeItem {
     endPoint = try KeyframeGroup<LottieVector3D>(dictionary: endPointDictionary)
     let gradientRawType: Int = try dictionary.value(for: CodingKeys.gradientType)
     guard let gradient = GradientType(rawValue: gradientRawType) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     gradientType = gradient
     if let highlightLengthDictionary = dictionary[CodingKeys.highlightLength.rawValue] as? [String: Any] {

Sources/Private/Model/ShapeItems/GradientStroke.swift

@@ -58,7 +58,7 @@ final class GradientStroke: ShapeItem {
     endPoint = try KeyframeGroup<LottieVector3D>(dictionary: endPointDictionary)
     let gradientRawType: Int = try dictionary.value(for: CodingKeys.gradientType)
     guard let gradient = GradientType(rawValue: gradientRawType) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     gradientType = gradient
     if let highlightLengthDictionary = dictionary[CodingKeys.highlightLength.rawValue] as? [String: Any] {

Sources/Private/Model/ShapeItems/Merge.swift

@@ -31,7 +31,7 @@ final class Merge: ShapeItem {
   required init(dictionary: [String: Any]) throws {
     let modeRawType: Int = try dictionary.value(for: CodingKeys.mode)
     guard let mode = MergeMode(rawValue: modeRawType) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.mode = mode
     try super.init(dictionary: dictionary)

Sources/Private/Model/ShapeItems/Star.swift

@@ -64,7 +64,7 @@ final class Star: ShapeItem {
     points = try KeyframeGroup<LottieVector1D>(dictionary: pointsDictionary)
     let starTypeRawValue: Int = try dictionary.value(for: CodingKeys.starType)
     guard let starType = StarType(rawValue: starTypeRawValue) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.starType = starType
     try super.init(dictionary: dictionary)

Sources/Private/Model/ShapeItems/Trim.swift

@@ -36,7 +36,7 @@ final class Trim: ShapeItem {
     offset = try KeyframeGroup<LottieVector1D>(dictionary: offsetDictionary)
     let trimTypeRawValue: Int = try dictionary.value(for: CodingKeys.trimType)
     guard let trimType = TrimType(rawValue: trimTypeRawValue) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.trimType = trimType
     try super.init(dictionary: dictionary)

Sources/Private/Model/Text/TextDocument.swift

@@ -25,7 +25,7 @@ final class TextDocument: Codable, DictionaryInitializable, AnyInitializable {
     fontFamily = try dictionary.value(for: CodingKeys.fontFamily)
     let justificationValue: Int = try dictionary.value(for: CodingKeys.justification)
     guard let justification = TextJustification(rawValue: justificationValue) else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     self.justification = justification
     tracking = try dictionary.value(for: CodingKeys.tracking)
@@ -57,7 +57,7 @@ final class TextDocument: Codable, DictionaryInitializable, AnyInitializable {
 
   convenience init(value: Any) throws {
     guard let dictionary = value as? [String: Any] else {
-      throw InitializableError.invalidInput
+      throw InitializableError.invalidInput()
     }
     try self.init(dictionary: dictionary)
   }

Sources/Private/Utility/LottieAnimationSource.swift

@@ -20,8 +20,18 @@ extension LottieAnimationSource {
     switch self {
     case .lottieAnimation(let animation):
       return animation
+    case .dotLottieFile:
+      return dotLottieAnimation?.animation
+    }
+  }
+
+  /// The `DotLottieFile.Animation`, if this is a dotLottie animation
+  var dotLottieAnimation: DotLottieFile.Animation? {
+    switch self {
+    case .lottieAnimation:
+      return nil
     case .dotLottieFile(let dotLottieFile):
-      return dotLottieFile.animation()?.animation
+      return dotLottieFile.animation()
     }
   }
 }