Merge branch 'develop'

Author: helje5

.github/workflows/swift.yml

@@ -5,15 +5,30 @@ on:
   pull_request:
 
 jobs:
-  nextstep:
+  xcode15:
     runs-on: macos-13
     steps:
       - name: Select latest available Xcode
-        uses: maxim-lobanov/setup-xcode@v1
+        uses: maxim-lobanov/setup-xcode@v1.5.1
         with:
           xcode-version: '15.2.0'
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+      - name: Build Swift Debug Package
+        run: swift build -c debug
+      - name: Build Swift Release Package
+        run: swift build -c release
+      - name: Run Tests
+        run: swift test
+  xcode16:
+    runs-on: macos-latest
+    steps:
+      - name: Select latest available Xcode
+        uses: maxim-lobanov/setup-xcode@v1.5.1
+        with:
+          xcode-version: latest
+      - name: Checkout Repository
+        uses: actions/checkout@v4
       - name: Build Swift Debug Package
         run: swift build -c debug
       - name: Build Swift Release Package

Package.swift

@@ -16,7 +16,8 @@ let package = Package(
     .library(name: "ManagedModels", targets: [ "ManagedModels" ])
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0")
+    .package(url: "https://github.com/swiftlang/swift-syntax.git",
+             "509.0.0"..<"600.0.1")
   ],
   targets: [
     .target(

Sources/ManagedModelMacros/ModelMacro/ModelMemberAttributes.swift

@@ -29,6 +29,9 @@ extension ModelMacro: MemberAttributeMacro { // @attached(memberAttribute)
       return [] // TBD: rather throw?
     }
 
+    // This is an array because the `member` declaration can contain multiple
+    // bindings, e.g.: `var street, city, country : String`.
+    // Those are NOT all the properties of the `declaration` (e.g. the class).
     var properties = [ ModelProperty ]()
     addModelProperties(in: member, to: &properties,
                        context: context)
@@ -41,7 +44,20 @@ extension ModelMacro: MemberAttributeMacro { // @attached(memberAttribute)
     }
 
     guard !property.isTransient else { return [] }
+    
+    /*
+     // property.declaredValueType is nil, but we detect some
+     var firstname = "Jason"
+     // property.declaredValueType is set
+     var lastname  : String
+     */
+    let addAtObjC = property.isKnownRelationshipPropertyType
+                 || (property.valueType?.canBeRepresentedInObjectiveC ?? false)
 
-    return [ "@_PersistedProperty" ]
+    // We'd like @objc, but we don't know which ones to attach it to?
+    // https://github.com/Data-swift/ManagedModels/issues/36
+    return addAtObjC
+         ? [ "@_PersistedProperty", "@objc" ]
+         : [ "@_PersistedProperty" ]
   }
 }

Sources/ManagedModelMacros/Utilities/AttributeTypes.swift

@@ -48,7 +48,38 @@ private let toManyRelationshipTypes : Set<String> = [
 ]
 
 extension TypeSyntax {
+
+  /// Whether the type can be represented in Objective-C.
+  /// A *very* basic implementation.
+  var canBeRepresentedInObjectiveC : Bool {
+    // TODO: Naive shortcut
+    if let id = self.as(IdentifierTypeSyntax.self) {
+      return id.isKnownAttributePropertyType
+          || id.isKnownRelationshipPropertyType
+    }
+    
+    if let opt = self.as(OptionalTypeSyntax.self) {
+      if let id = opt.wrappedType.as(IdentifierTypeSyntax.self) {
+        return id.isKnownAttributePropertyType
+            || id.isKnownRelationshipPropertyType
+      }
+      // E.g. this is not representable: `String??`, this is `String?`.
+      // I.e. nesting of Optional's are not representable.
+      return false
+    }
+    if let array = self.as(ArrayTypeSyntax.self) {
+      // This *is* representable: `[String]`,
+      // even this `[ [ 10, 20 ], [ 30, 40 ] ]`
+      return array.element.canBeRepresentedInObjectiveC
+    }
+
+    return false
+  }
 
+  /**
+   * This checks for some known basetypes, like `Int`, `String` or `Data`.
+   * It also unwraps optionals, arrays and such.
+   */
   var isKnownAttributePropertyType : Bool {
     if let id = self.as(IdentifierTypeSyntax.self) {
       return id.isKnownAttributePropertyType

Sources/ManagedModelMacros/Utilities/ExpressionType.swift

@@ -8,6 +8,10 @@ import SwiftSyntax
 extension ExprSyntax {
 
   func detectExpressionType() -> TypeSyntax? {
+    guard let idType = detectExpressionTypeName() else { return nil }
+    return TypeSyntax(IdentifierTypeSyntax(name: .identifier(idType)))
+  }
+  func detectExpressionTypeName() -> String? {
     // TODO: detect base types and such
     // - check function expressions, like:
     //   - `Data()`?
@@ -18,7 +22,8 @@ extension ExprSyntax {
       case .integerLiteralExpr : return "Swift.Int"
       case .floatLiteralExpr   : return "Swift.Double"
       case .booleanLiteralExpr : return "Swift.Bool"
-      default: break
+      default:
+        break
     }
 
     return nil

Tests/ManagedModelMacrosTests/ManagedModelMacrosTests.swift

@@ -121,7 +121,7 @@ final class ModelMacroTests: XCTestCase {
 
     let explodedSource = explodedFile.description
     XCTAssertTrue(explodedSource.contains(
-      "extension Person: ManagedModels.PersistentModel"))
+      "extension MySchema.Person: ManagedModels.PersistentModel"))
     XCTAssertTrue (explodedSource.contains("static let x = 10"))
     XCTAssertFalse(explodedSource.contains("@NSManaged"))
     XCTAssertTrue (explodedSource.contains("static let schemaMetadata"))
@@ -131,6 +131,14 @@ final class ModelMacroTests: XCTestCase {
       """
     ))
 
+    XCTAssertTrue(explodedSource.contains(try Regex(
+      #"var(\s+)addresses(\s+):(\s+)\[(\s+)Address(\s+)\]"#
+    )))
+    XCTAssertTrue(explodedSource.contains(
+      #"setValue(forKey: "addresses", to: newValue)"#))
+    XCTAssertTrue(explodedSource.contains(#"getValue(forKey: "addresses")"#))
+
+
 #if false
     print("Exploded:---\n")
     print(explodedSource)
@@ -386,11 +394,19 @@ final class ModelMacroTests: XCTestCase {
       ]
     )
 
+    #if canImport(SwiftSyntax600)
+    let explodedFile : Syntax = sourceFile.expand(
+      macros: macros,
+      contextGenerator: { _ in context },
+      indentationWidth: .spaces(2) // what else!
+    )
+    #else
     let explodedFile : Syntax = sourceFile.expand(
       macros: macros,
       in: context,
       indentationWidth: .spaces(2) // what else!
     )
+    #endif
 
     return explodedFile
   }