Skip to content

Remove unmanagedIdAccessor in favor of unmanagedId property in IdentifiedUnmanagedModel #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
r-jarvis merged 2 commits into from
Oct 10, 2025
Merged

Remove unmanagedIdAccessor in favor of unmanagedId property in IdentifiedUnmanagedModel #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e580042
Remove unmanagedIdAccessor in favor of unmanagedId property in Identi…
roanutil Oct 9, 2025
45c70e0
Run swiftformat
roanutil Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/CoreDataRepository/IdentifiedUnmanagedModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import CoreData

public protocol IdentifiedUnmanagedModel: ReadableUnmanagedModel {
associatedtype UnmanagedId: Equatable
static var unmanagedIdAccessor: (Self) -> UnmanagedId { get }
var unmanagedId: UnmanagedId { get }
static var managedIdExpression: NSExpression { get }
}

extension IdentifiedUnmanagedModel {
@inlinable
public func readManaged(from context: NSManagedObjectContext) throws -> ManagedModel {
try Self.readManaged(id: Self.unmanagedIdAccessor(self), from: context)
try Self.readManaged(id: unmanagedId, from: context)
}

@inlinable
Expand Down
5 changes: 4 additions & 1 deletion Sources/Internal/ModelsWithIntId/IdentifiableModel_Int.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ extension IdentifiableModel_IntId: IdentifiedUnmanagedModel {
}

@inlinable
package static var unmanagedIdAccessor: (IdentifiableModel_IntId) -> Int { \.id }
package var unmanagedId: Int {
id
}

package nonisolated(unsafe) static let managedIdExpression = NSExpression(forKeyPath: \ManagedModel_IntId.id)
}

Expand Down
5 changes: 4 additions & 1 deletion Sources/Internal/ModelsWithUuidId/IdentifiableModel_Uuid.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ extension IdentifiableModel_UuidId: IdentifiedUnmanagedModel {
}

@inlinable
package static var unmanagedIdAccessor: (IdentifiableModel_UuidId) -> UUID { \.id }
package var unmanagedId: UUID {
id
}

package nonisolated(unsafe) static let managedIdExpression = NSExpression(forKeyPath: \ManagedModel_UuidId.id)
}

Expand Down
4 changes: 2 additions & 2 deletions Tests/CoreDataRepositoryTests/BatchRequestTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ extension CoreDataRepositoryTests {
let count = try repositoryContext.count(for: fetchRequest)
expectNoDifference(count, 0, "Count of objects in CoreData should be zero at the start of each test.")

let _ = try values
_ = try values
.map(mapDictToManagedModel(_:))
try repositoryContext.save()
}
Expand Down Expand Up @@ -207,7 +207,7 @@ extension CoreDataRepositoryTests {
let count = try repositoryContext.count(for: fetchRequest)
expectNoDifference(count, 0, "Count of objects in CoreData should be zero at the start of each test.")

let _ = try values
_ = try values
.map(mapDictToManagedModel(_:))
try repositoryContext.save()
}
Expand Down