Skip to content

Runtime crash on failure to build count fetch request #47

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
roanutil merged 4 commits into from
Sep 2, 2026
Merged

Runtime crash on failure to build count fetch request #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ecd313
Prevent runtime crashes for invalid subscription requests
roanutil Aug 29, 2026
3788d28
Fix erasure of CoreDataError to NSError in count endpoint
roanutil Aug 29, 2026
c58deb0
Format
roanutil Aug 29, 2026
b4052a0
handle thrown CoreDataError in aggregate send function
roanutil Aug 31, 2026
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
490 changes: 312 additions & 178 deletions Sources/CoreDataRepository/CoreDataRepository+Aggregate.swift
View file
Open in desktop

Large diffs are not rendered by default.

94 changes: 24 additions & 70 deletions Sources/CoreDataRepository/Internal/AggregateSubscription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,48 +48,25 @@ final class AggregateSubscription<Value: Numeric & Sendable>: Subscription<Value
attributeDesc: NSAttributeDescription,
groupBy: NSAttributeDescription? = nil,
continuation: AsyncStream<Result<Value, CoreDataError>>.Continuation
) {
let request: NSFetchRequest<NSDictionary>
do {
request = try NSFetchRequest.request(
function: function,
predicate: predicate,
entityDesc: entityDesc,
attributeDesc: attributeDesc,
groupBy: groupBy
)
} catch {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
fail(error)
return
}
) throws(CoreDataError) {
let request: NSFetchRequest<NSDictionary> = try NSFetchRequest.request(
function: function,
predicate: predicate,
entityDesc: entityDesc,
attributeDesc: attributeDesc,
groupBy: groupBy
)
guard entityDesc == attributeDesc.entity else {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
guard let entityName = entityDesc.name ?? entityDesc.managedObjectClassName else {
fail(.propertyDoesNotMatchEntity(description: nil))
return
throw CoreDataError.propertyDoesNotMatchEntity(description: nil)
}
guard let attributeEntityName = attributeDesc.entity.name ?? attributeDesc.entity.managedObjectClassName
else {
fail(.propertyDoesNotMatchEntity(description: entityName))
return
throw CoreDataError.propertyDoesNotMatchEntity(description: entityName)
}
fail(
.propertyDoesNotMatchEntity(
description: "\(entityName) != \(attributeDesc.name).\(attributeEntityName)"
)
throw CoreDataError.propertyDoesNotMatchEntity(
description: "\(entityName) != \(attributeDesc.name).\(attributeEntityName)"
)
return
}
self.init(request: request, context: context, continuation: continuation)
}
Expand All @@ -104,48 +81,25 @@ final class AggregateSubscription<Value: Numeric & Sendable>: Subscription<Value
attributeDesc: NSAttributeDescription,
groupBy: NSAttributeDescription? = nil,
continuation: AsyncStream<Result<Value, CoreDataError>>.Continuation
) {
let request: NSFetchRequest<NSDictionary>
do {
request = try NSFetchRequest.request(
function: function,
predicate: predicate,
entityDesc: entityDesc,
attributeDesc: attributeDesc,
groupBy: groupBy
)
} catch {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
fail(error)
return
}
) throws(CoreDataError) {
let request: NSFetchRequest<NSDictionary> = try NSFetchRequest.request(
function: function,
predicate: predicate,
entityDesc: entityDesc,
attributeDesc: attributeDesc,
groupBy: groupBy
)
guard entityDesc == attributeDesc.entity else {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
guard let entityName = entityDesc.name ?? entityDesc.managedObjectClassName else {
fail(.propertyDoesNotMatchEntity(description: nil))
return
throw CoreDataError.propertyDoesNotMatchEntity(description: nil)
}
guard let attributeEntityName = attributeDesc.entity.name ?? attributeDesc.entity.managedObjectClassName
else {
fail(.propertyDoesNotMatchEntity(description: entityName))
return
throw CoreDataError.propertyDoesNotMatchEntity(description: entityName)
}
fail(
.propertyDoesNotMatchEntity(
description: "\(entityName) != \(attributeDesc.name).\(attributeEntityName)"
)
throw CoreDataError.propertyDoesNotMatchEntity(
description: "\(entityName) != \(attributeDesc.name).\(attributeEntityName)"
)
return
}
self.init(
fetchRequest: request,
Expand Down
94 changes: 24 additions & 70 deletions Sources/CoreDataRepository/Internal/AggregateThrowingSubscription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,48 +52,25 @@ final class AggregateThrowingSubscription<Value: Numeric & Sendable>: ThrowingSu
attributeDesc: NSAttributeDescription,
groupBy: NSAttributeDescription? = nil,
continuation: AsyncThrowingStream<Value, any Error>.Continuation
) {
let request: NSFetchRequest<NSDictionary>
do {
request = try NSFetchRequest.request(
function: function,
predicate: predicate,
entityDesc: entityDesc,
attributeDesc: attributeDesc,
groupBy: groupBy
)
} catch {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
fail(error)
return
}
) throws(CoreDataError) {
let request: NSFetchRequest<NSDictionary> = try NSFetchRequest.request(
function: function,
predicate: predicate,
entityDesc: entityDesc,
attributeDesc: attributeDesc,
groupBy: groupBy
)
guard entityDesc == attributeDesc.entity else {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
guard let entityName = entityDesc.name ?? entityDesc.managedObjectClassName else {
fail(.propertyDoesNotMatchEntity(description: nil))
return
throw CoreDataError.propertyDoesNotMatchEntity(description: nil)
}
guard let attributeEntityName = attributeDesc.entity.name ?? attributeDesc.entity.managedObjectClassName
else {
fail(.propertyDoesNotMatchEntity(description: entityName))
return
throw CoreDataError.propertyDoesNotMatchEntity(description: entityName)
}
fail(
.propertyDoesNotMatchEntity(
description: "\(entityName) != \(attributeDesc.name).\(attributeEntityName)"
)
throw CoreDataError.propertyDoesNotMatchEntity(
description: "\(entityName) != \(attributeDesc.name).\(attributeEntityName)"
)
return
}
self.init(request: request, context: context, continuation: continuation)
}
Expand All @@ -108,48 +85,25 @@ final class AggregateThrowingSubscription<Value: Numeric & Sendable>: ThrowingSu
attributeDesc: NSAttributeDescription,
groupBy: NSAttributeDescription? = nil,
continuation: AsyncThrowingStream<Value, any Error>.Continuation
) {
let request: NSFetchRequest<NSDictionary>
do {
request = try NSFetchRequest.request(
function: function,
predicate: predicate,
entityDesc: entityDesc,
attributeDesc: attributeDesc,
groupBy: groupBy
)
} catch {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
fail(error)
return
}
) throws(CoreDataError) {
let request: NSFetchRequest<NSDictionary> = try NSFetchRequest.request(
function: function,
predicate: predicate,
entityDesc: entityDesc,
attributeDesc: attributeDesc,
groupBy: groupBy
)
guard entityDesc == attributeDesc.entity else {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
guard let entityName = entityDesc.name ?? entityDesc.managedObjectClassName else {
fail(.propertyDoesNotMatchEntity(description: nil))
return
throw CoreDataError.propertyDoesNotMatchEntity(description: nil)
}
guard let attributeEntityName = attributeDesc.entity.name ?? attributeDesc.entity.managedObjectClassName
else {
fail(.propertyDoesNotMatchEntity(description: entityName))
return
throw CoreDataError.propertyDoesNotMatchEntity(description: entityName)
}
fail(
.propertyDoesNotMatchEntity(
description: "\(entityName) != \(attributeDesc.name).\(attributeEntityName)"
)
throw CoreDataError.propertyDoesNotMatchEntity(
description: "\(entityName) != \(attributeDesc.name).\(attributeEntityName)"
)
return
}
self.init(
fetchRequest: request,
Expand Down
8 changes: 8 additions & 0 deletions Sources/CoreDataRepository/Internal/BaseSubscription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ class BaseSubscription<
fetchResultControllerRequest: NSFetchRequest<ControllerResult>,
context: NSManagedObjectContext
) {
if fetchRequest.sortDescriptors == nil {
// if `sortDescriptors` is `nil`, an exception is raised and causes a runtime crash
fetchRequest.sortDescriptors = []
}
if fetchResultControllerRequest.sortDescriptors == nil {
// if `sortDescriptors` is `nil`, an exception is raised and causes a runtime crash
fetchResultControllerRequest.sortDescriptors = []
}
request = fetchRequest
frc = NSFetchedResultsController(
fetchRequest: fetchResultControllerRequest,
Expand Down
41 changes: 10 additions & 31 deletions Sources/CoreDataRepository/Internal/CountSubscription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,11 @@ final class CountSubscription<Value: Numeric & Sendable>: Subscription<Value, NS
predicate: NSPredicate,
entityDesc: NSEntityDescription,
continuation: AsyncStream<Result<Value, CoreDataError>>.Continuation
) {
let request: NSFetchRequest<NSDictionary>
do {
request = try NSFetchRequest.countRequest(
predicate: predicate,
entityDesc: entityDesc
)
} catch {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
fail(error)
return
}
) throws(CoreDataError) {
let request: NSFetchRequest<NSDictionary> = try NSFetchRequest.countRequest(
predicate: predicate,
entityDesc: entityDesc
)
self.init(request: request, context: context, continuation: continuation)
}

Expand All @@ -62,20 +50,11 @@ final class CountSubscription<Value: Numeric & Sendable>: Subscription<Value, NS
changeTrackingRequest: NSFetchRequest<NSManagedObject>,
entityDesc: NSEntityDescription,
continuation: AsyncStream<Result<Value, CoreDataError>>.Continuation
) {
let request: NSFetchRequest<NSDictionary>
do {
request = try NSFetchRequest.countRequest(predicate: predicate, entityDesc: entityDesc)
} catch {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
fail(error)
return
}
) throws(CoreDataError) {
let request: NSFetchRequest<NSDictionary> = try NSFetchRequest.countRequest(
predicate: predicate,
entityDesc: entityDesc
)
self.init(
fetchRequest: request,
fetchResultControllerRequest: changeTrackingRequest,
Expand Down
44 changes: 10 additions & 34 deletions Sources/CoreDataRepository/Internal/CountThrowingSubscription.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,11 @@ final class CountThrowingSubscription<Value: Numeric & Sendable>: ThrowingSubscr
predicate: NSPredicate,
entityDesc: NSEntityDescription,
continuation: AsyncThrowingStream<Value, any Error>.Continuation
) {
let request: NSFetchRequest<NSDictionary>
do {
request = try NSFetchRequest.countRequest(
predicate: predicate,
entityDesc: entityDesc
)
} catch {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
fail(error)
return
}
) throws(CoreDataError) {
let request: NSFetchRequest<NSDictionary> = try NSFetchRequest.countRequest(
predicate: predicate,
entityDesc: entityDesc
)
self.init(request: request, context: context, continuation: continuation)
}

Expand All @@ -66,23 +54,11 @@ final class CountThrowingSubscription<Value: Numeric & Sendable>: ThrowingSubscr
changeTrackingRequest: NSFetchRequest<NSManagedObject>,
entityDesc: NSEntityDescription,
continuation: AsyncThrowingStream<Value, any Error>.Continuation
) {
let request: NSFetchRequest<NSDictionary>
do {
request = try NSFetchRequest.countRequest(
predicate: predicate,
entityDesc: entityDesc
)
} catch {
self.init(
fetchRequest: NSFetchRequest(),
fetchResultControllerRequest: NSFetchRequest(),
context: context,
continuation: continuation
)
fail(error)
return
}
) throws(CoreDataError) {
let request: NSFetchRequest<NSDictionary> = try NSFetchRequest.countRequest(
predicate: predicate,
entityDesc: entityDesc
)
self.init(
fetchRequest: request,
fetchResultControllerRequest: changeTrackingRequest,
Expand Down
Loading
Loading