Merge branch 'develop'

Author: helje5

README.md

@@ -139,7 +139,7 @@ ManagedModels has no other dependencies.
 
 - [x] Archiving/Unarchiving, required for migration.
 - [ ] Figure out whether we can do ordered attributes: [Issue #1](https://github.com/Data-swift/ManagedModels/issues/1).
-- [ ] Figure out whether we can add support for array toMany properties: [Issue #2](https://github.com/Data-swift/ManagedModels/issues/2)
+- [x] Figure out whether we can add support for array toMany properties: [Issue #2](https://github.com/Data-swift/ManagedModels/issues/2)
 - [ ] Support for "autosave": [Issue #3](https://github.com/Data-swift/ManagedModels/issues/3)
 - [ ] Support transformable types, not sure they work right yet: [Issue #4](https://github.com/Data-swift/ManagedModels/issues/4)
 - [ ] Generate property initializers if the user didn't specify any inits: [Issue #5](https://github.com/Data-swift/ManagedModels/issues/5)
@@ -154,7 +154,7 @@ ManagedModels has no other dependencies.
   - [ ] SwiftUI `@Query` property wrapper/macro?: [Issue 12](https://github.com/Data-swift/ManagedModels/issues/12)
 - [ ] Figure out all the cloud sync options SwiftData has and whether CoreData
       can do them: [Issue 13](https://github.com/Data-swift/ManagedModels/issues/13)
-- [ ] Figure out whether we can allow initialized properties 
+- [x] Figure out whether we can allow initialized properties 
       (`var title = "No Title"`): [Issue 14](https://github.com/Data-swift/ManagedModels/issues/14)
 
 Pull requests are very welcome!

Sources/ManagedModelMacros/ModelMacro/MetadataSlot.swift

@@ -17,7 +17,8 @@ extension ModelMacro {
     func generateInfo(for property: ModelProperty) -> ExprSyntax? {
       guard let valueType = property.valueType     else { return nil }
       guard valueType.isKnownAttributePropertyType else { return nil }
-      return "CoreData.NSAttributeDescription(name: \(literal: property.name), valueType: \(valueType).self)"
+      let cleanValueType = valueType.replacingImplicitlyUnwrappedOptionalTypes().trimmed
+      return "CoreData.NSAttributeDescription(name: \(literal: property.name), valueType: \(cleanValueType).self)"
     }
 
     func attributeInfo(for property: ModelProperty,
@@ -26,7 +27,8 @@ extension ModelMacro {
     {
       // Note: We still want empty prop objects, because they still tell the
       //       type of a property!
-      let valueType = property.valueType ?? "Any"
+      let valueType : TypeSyntax = property.valueType?
+        .replacingImplicitlyUnwrappedOptionalTypes().trimmed ?? "Any"
       var fallback: ExprSyntax {
         "CoreData.NSAttributeDescription(name: \(literal: property.name), valueType: \(valueType).self)"
       }
@@ -53,7 +55,8 @@ extension ModelMacro {
     {
       // Note: We still want empty prop objects, because they still tell the
       //       type of a property!
-      let valueType = property.valueType ?? "Any"
+      let valueType : TypeSyntax = property.valueType?
+        .replacingImplicitlyUnwrappedOptionalTypes().trimmed ?? "Any"
       var fallback: ExprSyntax {
         "CoreData.NSRelationshipDescription(name: \(literal: property.name), valueType: \(valueType).self)"
       }

Sources/ManagedModelMacros/Utilities/TypeSyntax+Extras.swift

@@ -0,0 +1,21 @@
+//
+//  Created by Helge Heß.
+//  Copyright © 2023 ZeeZide GmbH.
+//
+
+import SwiftSyntax
+
+extension TypeSyntax {
+  
+  /**
+   * Rewrite `Product!` to `Product?`, since the former is not allowed in
+   * type references, like `Product!.self` (is forbidden).
+   */
+  func replacingImplicitlyUnwrappedOptionalTypes() -> TypeSyntax {
+    guard let force = self.as(ImplicitlyUnwrappedOptionalTypeSyntax.self) else {
+      return self
+    }
+    let regularOptional = OptionalTypeSyntax(wrappedType: force.wrappedType)
+    return TypeSyntax(regularOptional)
+  }
+}

Sources/ManagedModels/Container/ModelConfiguration.swift

@@ -23,13 +23,13 @@ public struct ModelConfiguration: Hashable {
   }
 
   public init(path: String? = nil, name: String? = nil,
+              schema                      : NSManagedObjectModel? = nil,
+              isStoredInMemoryOnly        : Bool                  = false,
+              allowsSave                  : Bool                  = true,
               groupAppContainerIdentifier : String?               = nil,
               cloudKitContainerIdentifier : String?               = nil,
               groupContainer              : GroupContainer        = .none,
-              cloudKitDatabase            : CloudKitDatabase      = .none,
-              schema                      : NSManagedObjectModel? = nil,
-              allowsSave                  : Bool                  = true,
-              isStoredInMemoryOnly        : Bool                  = false)
+              cloudKitDatabase            : CloudKitDatabase      = .none)
   {
     let actualPath : String
 
@@ -114,20 +114,21 @@ public extension ModelConfiguration {
     get { URL(fileURLWithPath: path) }
   }
 
-  init(url: URL, name: String? = nil,
+  init(_ name: String? = nil, schema: Schema? = nil, url: URL,
+       isStoredInMemoryOnly: Bool = false, allowsSave: Bool = true,
        groupAppContainerIdentifier: String? = nil,
        cloudKitContainerIdentifier: String? = nil,
        groupContainer: GroupContainer = .none,
-       cloudKitDatabase: CloudKitDatabase = .none, schema: Schema? = nil,
-       allowsSave: Bool = true, isStoredInMemoryOnly: Bool = false)
+       cloudKitDatabase: CloudKitDatabase = .none)
   {
     self.init(path: url.path, name: name ?? url.lastPathComponent,
+              schema: schema, 
+              isStoredInMemoryOnly: isStoredInMemoryOnly,
+              allowsSave: allowsSave,
               groupAppContainerIdentifier: groupAppContainerIdentifier,
               cloudKitContainerIdentifier: cloudKitContainerIdentifier,
               groupContainer: groupContainer,
-              cloudKitDatabase: cloudKitDatabase,
-              schema: schema, allowsSave: allowsSave,
-              isStoredInMemoryOnly: isStoredInMemoryOnly)
+              cloudKitDatabase: cloudKitDatabase)
   }
 }
 

Sources/ManagedModels/Context/NSManagedObjectContext+Data.swift

@@ -45,6 +45,16 @@ public extension NSManagedObjectContext {
   }
 }
 
+public extension NSManagedObjectContext {
+  
+  @inlinable
+  func fetchCount<T>(_ request: NSFetchRequest<T>) throws -> Int
+    where T: NSFetchRequestResult
+  {
+    try count(for: request)
+  }
+}
+
 public extension NSManagedObjectContext {
 
   static let willSave = willSaveObjectsNotification

Sources/ManagedModels/ModelMacroDefinition.swift

@@ -37,7 +37,10 @@ public macro Attribute(
 @attached(peer)
 public macro Relationship(
   _ options: NSRelationshipDescription.Option...,
+  deleteRule: Schema.Relationship.DeleteRule = .nullify,
+  minimumModelCount: Int? = 0, maximumModelCount: Int? = 0,
   originalName: String? = nil,
+  inverse: AnyKeyPath? = nil,
   hashModifier: String? = nil
 ) = #externalMacro(module: "ManagedModelMacros", type: "RelationshipMacro")
 

Sources/ManagedModels/PersistentModel/PersistentIdentifier.swift

@@ -15,6 +15,16 @@ extension NSManagedObjectID: Identifiable {
   public var id: Self { self }
 }
 
+extension NSManagedObjectID: Encodable {
+  
+  @inlinable
+  public func encode(to encoder: Encoder) throws {
+    var container = encoder.singleValueContainer()
+    try container.encode(self.uriRepresentation())
+  }
+}
+
+
 public extension NSManagedObjectID {
 
   @inlinable

Sources/ManagedModels/PersistentModel/PersistentModel.swift

@@ -44,6 +44,9 @@ public extension PersistentModel {
   /// The `NSManagedObjectID` of the model.
   @inlinable
   var persistentModelID : NSManagedObjectID { objectID }
+  
+  @inlinable
+  var id : NSManagedObjectID { persistentModelID }
 }
 
 extension PersistentModel {

Tests/ManagedModelMacrosTests/ManagedModelMacrosTests.swift

@@ -289,7 +289,85 @@ final class ModelMacroTests: XCTestCase {
     #endif
     #endif // canImport(ManagedModelMacros)
   }
-  
+
+  func testForceUnwrapType() throws {
+    #if !canImport(ManagedModelMacros)
+    throw XCTSkip("macros are only supported when running tests for the host platform")
+    #else
+    let explodedFile = parseAndExplode(
+    """
+    @Model
+    final class Address: NSManagedObject {
+      @Relationship(originalName: "ProductID")
+      var person: Person!
+    }
+    """
+    )
+    
+    // Hm, this doesn't seem to work?
+    let diags = ParseDiagnosticsGenerator.diagnostics(for: explodedFile)
+    XCTAssertTrue(diags.isEmpty)
+    if !diags.isEmpty {
+      print("DIAGS:", diags)
+    }
+
+    let explodedSource = explodedFile.description
+    XCTAssertTrue (explodedSource.contains(
+      "name: \"person\", valueType: Person?.self"
+    ))
+    XCTAssertFalse(explodedSource.contains(
+      "name: \"person\", valueType: Person!.self"
+    ))
+
+    #if false
+    print("Exploded:---\n")
+    print(explodedSource)
+    print("\n-----")
+    #endif
+    #endif // canImport(ManagedModelMacros)
+  }
+
+  func testCommentInType() throws {
+    #if !canImport(ManagedModelMacros)
+    throw XCTSkip("macros are only supported when running tests for the host platform")
+    #else
+    let explodedFile = parseAndExplode(
+    """
+    @Model
+    final class Address: NSManagedObject {
+      @Attribute(.unique, originalName: "CustomerTypeID")
+      public var typeID: String  // pkey in original
+    }
+    """
+    )
+    
+    // Hm, this doesn't seem to work?
+    let diags = ParseDiagnosticsGenerator.diagnostics(for: explodedFile)
+    XCTAssertTrue(diags.isEmpty)
+    if !diags.isEmpty {
+      print("DIAGS:", diags)
+    }
+
+    let explodedSource = explodedFile.description
+    XCTAssertTrue (explodedSource.contains(
+      """
+      originalName: "CustomerTypeID", name: "typeID", valueType: String
+      """
+    ))
+    XCTAssertFalse(explodedSource.contains(
+      """
+      originalName: "CustomerTypeID", name: "typeID", valueType: String  // pkey in original.self
+      """
+    ))
+
+    #if true
+    print("Exploded:---\n")
+    print(explodedSource)
+    print("\n-----")
+    #endif
+    #endif // canImport(ManagedModelMacros)
+  }
+
 
   // MARK: - Helper