separate protocol

Author: wickwirew

Sources/Feather/DatabaseQuery.swift

@@ -6,7 +6,7 @@
 //
 
 /// A database query that fetches any array of rows.
-public struct FetchManyQuery<Input, Output>: Queryable
+public struct FetchManyQuery<Input, Output>: DatabaseQuery
     where Input: Sendable,
         Output: RangeReplaceableCollection & ExpressibleByArrayLiteral & Sendable,
         Output.Element: RowDecodable & Sendable
@@ -42,7 +42,7 @@ public struct FetchManyQuery<Input, Output>: Queryable
 }
 
 /// A database that fetches a single element. Can return `nil`
-public struct FetchSingleQuery<Input, Output>: Queryable
+public struct FetchSingleQuery<Input, Output>: DatabaseQuery
     where Input: Sendable, Output: RowDecodable & Sendable
 {
     public let transactionKind: TransactionKind
@@ -72,7 +72,7 @@ public struct FetchSingleQuery<Input, Output>: Queryable
 }
 
 /// A query that has no return value.
-public struct VoidQuery<Input>: Queryable where Input: Sendable {
+public struct VoidQuery<Input>: DatabaseQuery where Input: Sendable {
     public typealias Output = ()
 
     public let transactionKind: TransactionKind

Sources/Feather/Queries.swift

@@ -11,7 +11,7 @@ public enum Queries {
     /// Allows for the erasing of the database so a query can be
     /// passed around and be able to be executed without
     /// having the caller worry about by what.
-    public struct WithDatabase<Base: Queryable>: Queryable {
+    public struct WithDatabase<Base: DatabaseQuery>: DatabaseQuery, Query {
         /// The original query that requires a database
         let base: Base
         /// The database to execute the query in
@@ -43,10 +43,16 @@ public enum Queries {
         ) -> QueryObservation<Input, Output> {
             return base.observe(with: input, in: database, handle: handle, cancelled: cancelled)
         }
+        
+        public func execute(
+            with input: Base.Input
+        ) async throws -> Base.Output {
+            return try await base.execute(with: input, in: database)
+        }
     }
 
     /// Applies a transform to the queries result
-    public struct Map<Base: Queryable, Output: Sendable>: Queryable {
+    public struct Map<Base: DatabaseQuery, Output: Sendable>: DatabaseQuery {
         /// The upstream query to transform
         let base: Base
         /// The transform to apply to the output
@@ -72,7 +78,7 @@ public enum Queries {
     }
 
     /// Applies a transform to the queries result
-    public struct Just<Input, Output>: Queryable
+    public struct Just<Input, Output>: DatabaseQuery
         where Input: Sendable, Output: Sendable
     {
         let output: Output
@@ -100,8 +106,8 @@ public enum Queries {
         }
     }
 
-    public struct Then<First, Second>: Queryable
-        where First: Queryable, Second: Queryable,
+    public struct Then<First, Second>: DatabaseQuery
+        where First: DatabaseQuery, Second: DatabaseQuery,
               First.Output == Second.Input
     {
         let first: First
@@ -124,7 +130,7 @@ public enum Queries {
     }
 }
 
-public extension Queryable {
+public extension DatabaseQuery {
     func with(database: any Database) -> Queries.WithDatabase<Self> {
         return Queries.WithDatabase(base: self, database: database)
     }

Sources/Feather/Query.swift

@@ -0,0 +1,19 @@
+//
+//  Query.swift
+//  Feather
+//
+//  Created by Wes Wickwire on 3/29/25.
+//
+
+public protocol Query<Input, Output> {
+    associatedtype Input
+    associatedtype Output
+    
+    func execute(with input: Input) async throws -> Output
+}
+
+extension Query where Input == () {
+    func execute() async throws -> Output {
+        return try await execute(with: ())
+    }
+}

Sources/Feather/QueryObservation.swift

@@ -8,14 +8,14 @@
 public final class QueryObservation<Input, Output>: DatabaseSubscriber, Sendable
     where Input: Sendable, Output: Sendable
 {
-    private let query: any Query<Input, Output>
+    private let query: any DatabaseQuery<Input, Output>
     private let input: Input
     private let database: any Database
     private let handle: @Sendable (Output) -> Void
     private let cancelled: @Sendable () -> Void
 
     init(
-        query: any Query<Input, Output>,
+        query: any DatabaseQuery<Input, Output>,
         input: Input,
         database: any Database,
         handle: @Sendable @escaping (Output) -> Void,

Sources/Feather/Queryable.swift

@@ -1,13 +1,11 @@
 //
-//  Queryable.swift
+//  DatabaseQuery.swift
 //  Feather
 //
 //  Created by Wes Wickwire on 11/9/24.
 //
 
-public typealias Query<Input, Output> = Queryable<Input, Output>
-
-public protocol Queryable<Input, Output>: Sendable {
+public protocol DatabaseQuery<Input, Output>: Sendable {
     associatedtype Input: Sendable
     associatedtype Output: Sendable
 
@@ -25,7 +23,7 @@ public protocol Queryable<Input, Output>: Sendable {
     ) throws -> Output
 }
 
-public extension Queryable {
+public extension DatabaseQuery {
     func execute(
         with input: Input,
         in database: any Database
@@ -70,7 +68,7 @@ public extension Queryable {
     }
 }
 
-extension Queryable where Input == () {
+extension DatabaseQuery where Input == () {
     func execute(in database: any Database) async throws -> Output {
         return try await execute(with: (), in: database)
     }