Merge branch 'develop'

Author: helje5

Sources/ManagedModels/PersistentModel/PersistentModel+KVC.swift

@@ -52,7 +52,7 @@ public extension PersistentModel {
 
 // MARK: - Transformable
 public extension PersistentModel {
-
+  
   @inlinable
   func setTransformableValue(forKey key: String, to value: Any) {
     willChangeValue(forKey: key); defer { didChangeValue(forKey: key) }
@@ -64,6 +64,23 @@ public extension PersistentModel {
     willAccessValue(forKey: key); defer { didAccessValue(forKey: key) }
     return primitiveValue(forKey: key) as! T
   }
+  
+  @inlinable
+  func setTransformableValue(forKey key: String, to value: Any?) {
+    willChangeValue(forKey: key); defer { didChangeValue(forKey: key) }
+    setPrimitiveValue(value, forKey: key)
+  }
+  
+  @inlinable
+  func getTransformableValue<T>(forKey key: String) -> T
+         where T: AnyOptional
+  {
+    willAccessValue(forKey: key); defer { didAccessValue(forKey: key) }
+    guard let value = primitiveValue(forKey: key) else {
+      return .noneValue
+    }
+    return (value as? T) ?? .noneValue
+  }
 }
 
 
@@ -223,6 +240,28 @@ public extension PersistentModel {
     }
     return wrapped
   }
+  
+  // Overloads for RawRepresentables that are ALSO Codable
+  
+  @inlinable
+  func setValue<T>(forKey key: String, to value: T)
+    where T: RawRepresentable & Codable,
+          T.RawValue: Codable & CoreDataPrimitiveValue
+  {
+    setValue(forKey: key, to: value.rawValue)
+  }
+  
+  @inlinable
+  func getValue<T>(forKey key: String) -> T
+    where T: RawRepresentable & Codable,
+          T.RawValue: Codable & CoreDataPrimitiveValue
+  {
+    let rawValue : T.RawValue = getValue(forKey: key)
+    guard let wrapped = T.init(rawValue: rawValue) else {
+      fatalError("Could not wrap raw value \(rawValue) for \(key)")
+    }
+    return wrapped
+  }
 }
 
 // MARK: - Codable
@@ -232,14 +271,14 @@ public extension PersistentModel {
 
   func setValue<T>(forKey key: String, to value: T) where T: Codable {
     willChangeValue(forKey: key); defer { didChangeValue(forKey: key) }
-    setPrimitiveValue(CodableBox<T>(value), forKey: key)
+    setPrimitiveValue(value, forKey: key)
   }
 
   func setValue<T>(forKey key: String, to value: T)
          where T: Codable & AnyOptional
   {
     willChangeValue(forKey: key); defer { didChangeValue(forKey: key) }
-    if value.isSome { setPrimitiveValue(CodableBox<T>(value), forKey: key) }
+    if value.isSome { setPrimitiveValue(value, forKey: key) }
     else { setPrimitiveValue(nil, forKey: key) }
   }
 
@@ -249,10 +288,7 @@ public extension PersistentModel {
       fatalError("No box found for non-optional Codable value for key \(key)?")
     }
 
-    if let box = value as? CodableBox<T> {
-      guard let value = box.value else {
-        fatalError("Box has no value for non-optional Codable for key \(key)?")
-      }
+    if let value = value as? T {
       return value
     }
 
@@ -266,17 +302,13 @@ public extension PersistentModel {
       }
     }
 
-    guard let value = value as? T else {
-      fatalError("Unexpected value for key \(key)? \(value)")
-    }
-    assertionFailure("Codable value is directly stored? \(value)")
-    return value
+    fatalError("Codable value type doesn't match? \(value)")
   }
 
   func getValue<T>(forKey key: String) -> T where T: Codable & AnyOptional {
     willAccessValue(forKey: key); defer { didAccessValue(forKey: key) }
     guard let value = primitiveValue(forKey: key) else { return .noneValue }
-    if let box = value as? CodableBox<T> { return box.value ?? .noneValue }
+    if let value = value as? T { return value }
 
     if let data = value as? Data {
       assertionFailure("Unexpected Data as primitive!")
@@ -291,7 +323,7 @@ public extension PersistentModel {
     guard let value = value as? T else {
       fatalError("Unexpected value for key \(key)? \(value)")
     }
-    assertionFailure("Codable value is directly stored? \(value)")
-    return value
+    assertionFailure("Codable value type doesn't match? \(value)")
+    return .noneValue
   }
 }

Sources/ManagedModels/SchemaCompatibility/CodableBox.swift

@@ -0,0 +1,48 @@
+//
+//  Created by Helge Heß.
+//  Copyright © 2023 ZeeZide GmbH.
+//
+
+import Foundation
+import CoreData
+
+final class CodableTransformer<T: Codable>: ValueTransformer {
+  
+  #if false
+  override class func transformedValueClass() -> AnyClass {
+    T.self // doesn't work
+  }
+  #endif
+  override class func allowsReverseTransformation() -> Bool { true }
+  
+  override func transformedValue(_ value: Any?) -> Any? {
+    // value is the box
+    guard let value else { return nil }
+    guard let typed = value as? T else {
+      assertionFailure("Value to be transformed is not the right type? \(value)")
+      return nil
+    }
+    do {
+      return try JSONEncoder().encode(typed)
+    }
+    catch {
+      assertionFailure("Could not encode JSON value of property? \(error)")
+      return nil
+    }
+  }
+
+  override func reverseTransformedValue(_ value: Any?) -> Any? {
+    guard let value else { return nil }
+    guard let data = value as? Data else {
+      assert(value is Data, "Reverse value is not `Data`?")
+      return nil
+    }
+    do {
+      return try JSONDecoder().decode(T.self, from: data)
+    }
+    catch {
+      assertionFailure("Could not decode JSON value of property? \(error)")
+      return nil
+    }
+  }
+}

Sources/ManagedModels/SchemaCompatibility/CodableTransformer.swift

@@ -40,8 +40,8 @@ extension CoreData.NSAttributeDescription: SchemaProperty {
 
       if let primitiveType = newValue as? CoreDataPrimitiveValue.Type {
         let config = primitiveType.coreDataValue
-        self.attributeType           = config.attributeType
-        self.isOptional              = config.isOptional
+        self.attributeType = config.attributeType
+        self.isOptional    = config.isOptional
         if let newClassName = config.attributeValueClassName {
           self.attributeValueClassName = newClassName
         }
@@ -55,8 +55,8 @@ extension CoreData.NSAttributeDescription: SchemaProperty {
           let rawType = type.RawValue.self
           if let primitiveType = rawType as? CoreDataPrimitiveValue.Type {
             let config = primitiveType.coreDataValue
-            self.attributeType           = config.attributeType
-            self.isOptional              = config.isOptional
+            self.attributeType = config.attributeType
+            self.isOptional    = config.isOptional
             if let newClassName = config.attributeValueClassName {
               self.attributeValueClassName = newClassName
             }
@@ -75,12 +75,14 @@ extension CoreData.NSAttributeDescription: SchemaProperty {
         self.isOptional    = newValue is any AnyOptional.Type
 
         func setValueClassName<T: Codable>(for type: T.Type) {
-          self.attributeValueClassName = NSStringFromClass(CodableBox<T>.self)
+          #if false // doesn't work
+          self.attributeValueClassName = NSStringFromClass(T.self)
+          #endif
 
-          let name = NSStringFromClass(CodableBox<T>.Transformer.self)
+          let name = NSStringFromClass(CodableTransformer<T>.self)
           if !ValueTransformer.valueTransformerNames().contains(.init(name)) {
             // no access to valueTransformerForName?
-            let transformer = CodableBox<T>.Transformer()
+            let transformer = CodableTransformer<T>()
             ValueTransformer
               .setValueTransformer(transformer, forName: .init(name))
           }
@@ -92,6 +94,15 @@ extension CoreData.NSAttributeDescription: SchemaProperty {
         return
       }
 
+        if let valueTransformerName = valueTransformerName {
+        self.attributeType = .transformableAttributeType
+        self.isOptional    = newValue is any AnyOptional.Type
+        
+        self.attributeValueClassName = NSStringFromClass(NSObject.self)
+        assert(ValueTransformer.valueTransformerNames().contains(.init(valueTransformerName)))
+        return
+      }
+
       // TBD:
       // undefinedAttributeType = 0
       // transformableAttributeType = 1800
@@ -168,9 +179,8 @@ public extension NSAttributeDescription {
 
     assert(valueTransformerName == nil)
     valueTransformerName = nil
-    if valueType != Any.self { self.valueType = valueType }
-    
     setOptions(options)
+    if valueType != Any.self { self.valueType = valueType }
   }
 }
 
@@ -197,10 +207,22 @@ private extension NSAttributeDescription {
 
         case .transformableByName(let name):
           assert(valueTransformerName == nil)
+          attributeType = .transformableAttributeType
           valueTransformerName = name
+          if !ValueTransformer.valueTransformerNames().contains(.init(name)) {
+            print("WARNING: Named transformer is not registered: \(name)",
+                  "in attribute:", self)
+          }
         case .transformableByType(let type):
-          assert(valueTransformerName == nil)
-          valueTransformerName = NSStringFromClass(type)
+          let name = NSStringFromClass(type)
+          if !ValueTransformer.valueTransformerNames().contains(.init(name)) {
+              // no access to valueTransformerForName?
+              let transformer = type.init()
+              ValueTransformer
+                  .setValueTransformer(transformer, forName: .init(name))
+          }
+          valueTransformerName = name
+          attributeType = .transformableAttributeType
 
         case .allowsCloudEncryption: // FIXME: restrict availability
           if #available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *) {

Sources/ManagedModels/SchemaCompatibility/NSAttributeDescription+Data.swift

@@ -371,6 +371,7 @@ final class ModelMacroTests: XCTestCase {
 
   // MARK: - Helper
 
+#if canImport(ManagedModelMacros)
   func parseAndExplode(_ source: String) -> Syntax {
     // Parse the original source file.
     let sourceFile : SourceFileSyntax = Parser.parse(source: source)
@@ -393,6 +394,7 @@ final class ModelMacroTests: XCTestCase {
 
     return explodedFile
   }
+#endif // canImport(ManagedModelMacros)
 
   // Note: This does not fail the test, but it does fail the compiler.
   //       https://github.com/Data-swift/ManagedModels/issues/18