Removed with: parameter name

wickwirew · wickwirew · commit 638029346752 · 2025-09-06T21:34:28.000-04:00
diff --git a/Example/Todo/Extensions/DB+Extensions.swift b/Example/Todo/Extensions/DB+Extensions.swift
@@ -24,7 +24,7 @@ extension DB {
                 at: directoryURL,
                 withIntermediateDirectories: true
             )
-            self = try DB(url: dbURL)
+            self = try DB(url: dbURL, adapters: DB.Adapters())
         }
     }
 }
diff --git a/Example/Todo/TodoForm.swift b/Example/Todo/TodoForm.swift
@@ -44,7 +44,7 @@ struct TodoForm: View {
         TodoForm(
             model: TodoFormModel(
                 mode: .update(.mock()),
-                todoQueries: TodoQueriesNoop(),
+                todoQueries: .noop(),
                 complete: {}
             )
         )
diff --git a/Example/Todo/TodoFormModel.swift b/Example/Todo/TodoFormModel.swift
@@ -12,7 +12,7 @@ import Foundation
 final class TodoFormModel: Identifiable {
     let mode: Mode
     let complete: () -> Void
-    let todoQueries: any TodoQueries
+    let todoQueries: TodoQueries
     
     var name = ""
     var error: Error?
@@ -24,7 +24,7 @@ final class TodoFormModel: Identifiable {
     
     init(
         mode: Mode,
-        todoQueries: any TodoQueries,
+        todoQueries: TodoQueries,
         complete: @escaping () -> Void
     ) {
         self.mode = mode
@@ -43,11 +43,9 @@ final class TodoFormModel: Identifiable {
         do {
             switch mode {
             case .create:
-                _ = try await todoQueries.insertTodo
-                    .execute(with: name)
+                _ = try await todoQueries.insertTodo.execute(name)
             case .update(let todo):
-                try await todoQueries.updateTodo
-                    .execute(name: name, id: todo.id)
+                try await todoQueries.updateTodo.execute(name: name, id: todo.id)
             }
             
             complete()
diff --git a/Example/Todo/TodoList.swift b/Example/Todo/TodoList.swift
@@ -62,7 +62,7 @@ struct TodoList: View {
     NavigationStack {
         TodoList(
             model: TodoListModel(
-                todoQueries: TodoQueriesNoop(
+                todoQueries: .noop(
                     selectTodos: Queries.Just([
                         .mock(name: "Walk Dog"),
                         .mock(name: "Clean Kitchen", completed: .now),
diff --git a/Example/Todo/TodoListModel.swift b/Example/Todo/TodoListModel.swift
@@ -10,13 +10,13 @@ import Foundation
 @Observable
 @MainActor
 final class TodoListModel {
-    let todoQueries: any TodoQueries
+    let todoQueries: TodoQueries
     
     var todos: [Todo] = []
     var error: Error?
     var formModel: TodoFormModel?
     
-    init(todoQueries: any TodoQueries) {
+    init(todoQueries: TodoQueries) {
         self.todoQueries = todoQueries
     }
     
@@ -32,8 +32,7 @@ final class TodoListModel {
     
     func toggle(todo: Todo) async {
         do {
-            try await todoQueries.toggleTodo
-                .execute(with: todo.id)
+            try await todoQueries.toggleTodo.execute(todo.id)
         } catch {
             self.error = error
         }
diff --git a/Example/TodoTests/TodoFormTests.swift b/Example/TodoTests/TodoFormTests.swift
@@ -18,7 +18,7 @@ struct TodoFormTests {
         
         let model = TodoFormModel(
             mode: .create,
-            todoQueries: TodoQueriesNoop(insertTodo: insertTodo),
+            todoQueries: TodoQueries.noop(insertTodo: insertTodo),
             complete: {}
         )
         
@@ -32,7 +32,7 @@ struct TodoFormTests {
 
         let model = TodoFormModel(
             mode: .update(.mock()),
-            todoQueries: TodoQueriesNoop(updateTodo: updateTodo),
+            todoQueries: TodoQueries.noop(updateTodo: updateTodo),
             complete: {}
         )
         
diff --git a/Example/TodoTests/TodoListTests.swift b/Example/TodoTests/TodoListTests.swift
@@ -16,7 +16,7 @@ struct TodoListTests {
     @Test func todosAreSetOnLoad() async {
         let todos: [Todo] = [.mock(), .mock()]
         let selectTodos = Queries.Test<(), [Todo]>(todos)
-        let model = TodoListModel(todoQueries: TodoQueriesNoop(selectTodos: selectTodos))
+        let model = TodoListModel(todoQueries: .noop(selectTodos: selectTodos))
         
         await model.load()
         
@@ -26,7 +26,7 @@ struct TodoListTests {
     
     @Test func loadFailureSetsError() async {
         let model = TodoListModel(
-            todoQueries: TodoQueriesNoop(
+            todoQueries: .noop(
                 // Queries.Fail always throws an error
                 selectTodos: Queries.Fail()
             )
@@ -39,7 +39,7 @@ struct TodoListTests {
     
     @Test func toggleTodoUpdatesDB() async {
         let toggleTodo = Queries.Test<Todo.ID, ()>()
-        let model = TodoListModel(todoQueries: TodoQueriesNoop(toggleTodo: toggleTodo))
+        let model = TodoListModel(todoQueries: .noop(toggleTodo: toggleTodo))
         
         await model.toggle(todo: .mock())
         
diff --git a/Sources/Compiler/Gen/SwiftLanguage.swift b/Sources/Compiler/Gen/SwiftLanguage.swift
@@ -685,7 +685,7 @@ public struct SwiftLanguage: Language {
             writer.write(") async throws -> Output ")
             
             writer.braces {
-                writer.write(line: "try await execute(with: ", query.inputName, "(")
+                writer.write(line: "try await execute(", query.inputName, "(")
                 initInput()
                 writer.write("))")
             }
@@ -697,7 +697,7 @@ public struct SwiftLanguage: Language {
             writer.write(", tx: borrowing Transaction) throws -> Output ")
             
             writer.braces {
-                writer.write(line: "try execute(with: ", query.inputName, "(")
+                writer.write(line: "try execute(", query.inputName, "(")
                 initInput()
                 writer.write("), tx: tx)")
             }
@@ -706,10 +706,10 @@ public struct SwiftLanguage: Language {
             writer.blankLine()
             writer.write(line: "func observe(")
             writeInput()
-            writer.write(") -> any QueryObservation<Output> ")
+            writer.write(") -> QueryStream<Output> ")
             
             writer.braces {
-                writer.write(line: "observe(with: ", query.inputName, "(")
+                writer.write(line: "observe(", query.inputName, "(")
                 initInput()
                 writer.write("))")
             }
diff --git a/Sources/Otter/Database.swift b/Sources/Otter/Database.swift
@@ -69,8 +69,30 @@ public extension Database {
 
 
 extension Database where Adapters == DefaultAdapters {
+    /// Opens a connection pool to the database at the given URL.
+    ///
+    /// - Parameter url: The url of the database file
+    init(url: URL) throws {
+        self = try Self(url: url, adapters: DefaultAdapters())
+    }
+
+    /// Opens a connection pool to the database at the given path.
+    ///
+    /// - Parameter path: The path of the database file
+    init(path: String) throws {
+        self = try Self(path: path, adapters: DefaultAdapters())
+    }
+
+    /// Opens a connection pool to the database
+    ///
+    /// - Parameter config: The configuration specifying any info
+    /// needed to open the database.
+    init(config: DatabaseConfig) throws {
+        self = try Self(config: config, adapters: DefaultAdapters())
+    }
+    
     /// Creates an in memory database.
-    static func inMemory() throws -> Self {
+    public static func inMemory() throws -> Self {
         return try Self(config: DatabaseConfig(path: nil), adapters: DefaultAdapters())
     }
 }
diff --git a/Sources/Otter/Queries/AnyQuery.swift b/Sources/Otter/Queries/AnyQuery.swift
@@ -35,16 +35,16 @@ public struct AnyQuery<Input: Sendable, Output: Sendable>: Query {
             transactionKind: query.transactionKind,
             connection: query.connection,
             watchedTables: query.watchedTables,
-            execute: { try query.execute(with: $0, tx: $1) },
-            observe: { query.observation(with: $0) }
+            execute: { try query.execute($0, tx: $1) },
+            observe: { query.observation($0) }
         )
     }
     
-    public func execute(with input: Input, tx: borrowing Transaction) throws -> Output {
+    public func execute(_ input: Input, tx: borrowing Transaction) throws -> Output {
         try _execute(input, tx)
     }
 
-    public func observation(with input: Input) -> any QueryObservation<Output> {
+    public func observation(_ input: Input) -> any QueryObservation<Output> {
         _observe(input)
     }
 }
diff --git a/Sources/Otter/Queries/Bulk.swift b/Sources/Otter/Queries/Bulk.swift
@@ -25,13 +25,13 @@ extension Queries {
         }
         
         public func execute(
-            with input: [Base.Input],
+            _ input: [Base.Input],
             tx: borrowing Transaction
         ) throws -> [Base.Output] {
             var results: [Base.Output] = []
             
             for input in input {
-                try results.append(base.execute(with: input, tx: tx))
+                try results.append(base.execute(input, tx: tx))
             }
             
             return results
diff --git a/Sources/Otter/Queries/DatabaseQuery.swift b/Sources/Otter/Queries/DatabaseQuery.swift
@@ -43,7 +43,7 @@ public struct DatabaseQuery<Input, Output>: Query
     }
     
     public func execute(
-        with input: Input,
+        _ input: Input,
         tx: borrowing Transaction
     ) throws -> Output {
         guard tx.kind >= transactionKind else {
diff --git a/Sources/Otter/Queries/Fail.swift b/Sources/Otter/Queries/Fail.swift
@@ -43,7 +43,7 @@ public extension Queries {
         }
         
         public func execute(
-            with input: Input,
+            _ input: Input,
             tx: borrowing Transaction
         ) throws -> Output {
             throw error
diff --git a/Sources/Otter/Queries/Just.swift b/Sources/Otter/Queries/Just.swift
@@ -66,13 +66,13 @@ public extension Queries {
         }
         
         public func execute(
-            with input: Input,
+            _ input: Input,
             tx: borrowing Transaction
         ) throws -> Output {
             return output
         }
         
-        public func observation(with input: Input) -> any QueryObservation<Output> {
+        public func observation(_ input: Input) -> any QueryObservation<Output> {
             return Observation(output: output)
         }
         
diff --git a/Sources/Otter/Queries/Map.swift b/Sources/Otter/Queries/Map.swift
@@ -27,12 +27,12 @@ public extension Queries {
             base.watchedTables
         }
         
-        public func execute(with input: Base.Input, tx: borrowing Transaction) throws -> Output {
-            try transform(input, base.execute(with: input, tx: tx))
+        public func execute(_ input: Base.Input, tx: borrowing Transaction) throws -> Output {
+            try transform(input, base.execute(input, tx: tx))
         }
         
-        public func observation(with input: Base.Input) -> any QueryObservation<Output> {
-            return Observation(base: base.observation(with: input), input: input, transform: transform)
+        public func observation(_ input: Base.Input) -> any QueryObservation<Output> {
+            return Observation(base: base.observation(input), input: input, transform: transform)
         }
         
         struct Observation: QueryObservation {
diff --git a/Sources/Otter/Queries/MapInput.swift b/Sources/Otter/Queries/MapInput.swift
@@ -26,12 +26,12 @@ public extension Queries {
             base.watchedTables
         }
 
-        public func execute(with input: Input, tx: borrowing Transaction) throws -> Base.Output {
-            try base.execute(with: transform(input), tx: tx)
+        public func execute(_ input: Input, tx: borrowing Transaction) throws -> Base.Output {
+            try base.execute(transform(input), tx: tx)
         }
 
-        public func observation(with input: Input) -> any QueryObservation<Output> {
-            return base.observation(with: transform(input))
+        public func observation(_ input: Input) -> any QueryObservation<Output> {
+            return base.observation(transform(input))
         }
     }
 }
@@ -50,7 +50,7 @@ public extension Query {
         return Queries.MapInput(base: self, transform: transform)
     }
 
-    func with(input: Input) -> Queries.MapInput<Self, Void> {
+    func with(_ input: Input) -> Queries.MapInput<Self, Void> {
         Queries.MapInput(base: self) { input }
     }
 }
diff --git a/Sources/Otter/Queries/Test.swift b/Sources/Otter/Queries/Test.swift
@@ -55,12 +55,12 @@ public extension Queries {
         public var watchedTables: Set<String> { [] }
         public var connection: any Connection { NoopConnection() }
         
-        public func execute(with input: Input, tx: borrowing Transaction) throws -> Output {
+        public func execute(_ input: Input, tx: borrowing Transaction) throws -> Output {
             lock.withLock { executeCallCount += 1 }
             return try execute(input)
         }
         
-        public nonisolated func observation(with input: Input) -> any QueryObservation<Output> {
+        public nonisolated func observation(_ input: Input) -> any QueryObservation<Output> {
             lock.withLock { observeCallCount += 1 }
             return Observation(input: input, query: self)
         }
diff --git a/Sources/Otter/Query+Combine.swift b/Sources/Otter/Query+Combine.swift
@@ -46,7 +46,7 @@ public struct QueryPublisher<Output>: Publisher {
                 switch state {
                 case .pending:
                     // Received first demand, start observation
-                    let observation = query.observation(with: ())
+                    let observation = query.observation(())
                     
                     observation.start { [weak self] output in
                         self?.receive(output: output)
@@ -103,8 +103,8 @@ public extension Query {
     ///
     /// - Parameter input: The input for the query
     /// - Returns: A combine publisher
-    func publisher(with input: Input) -> QueryPublisher<Output> {
-        QueryPublisher(query: self.with(input: input))
+    func publisher(_ input: Input) -> QueryPublisher<Output> {
+        QueryPublisher(query: self.with(input))
     }
 }
 
diff --git a/Sources/Otter/Query.swift b/Sources/Otter/Query.swift
diff --git a/Sources/Otter/QueryObservation.swift b/Sources/Otter/QueryObservation.swift
diff --git a/Tests/OtterTests/ConnectionPoolTests.swift b/Tests/OtterTests/ConnectionPoolTests.swift
diff --git a/Tests/OtterTests/DatabaseValueAdapterTests.swift b/Tests/OtterTests/DatabaseValueAdapterTests.swift
diff --git a/Tests/OtterTests/JustTests.swift b/Tests/OtterTests/JustTests.swift
diff --git a/Tests/OtterTests/MapInputTests.swift b/Tests/OtterTests/MapInputTests.swift
diff --git a/Tests/OtterTests/QueryPublisherTests.swift b/Tests/OtterTests/QueryPublisherTests.swift
diff --git a/Tests/OtterTests/QueryTests.swift b/Tests/OtterTests/QueryTests.swift
diff --git a/Tests/OtterTests/SQLAnyTests.swift b/Tests/OtterTests/SQLAnyTests.swift

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ extension DB {`
`24`	`24`	`at: directoryURL,`
`25`	`25`	`withIntermediateDirectories: true`
`26`	`26`	`)`
`27`		`- self = try DB(url: dbURL)`
	`27`	`+ self = try DB(url: dbURL, adapters: DB.Adapters())`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ struct TodoForm: View {`
`44`	`44`	`TodoForm(`
`45`	`45`	`model: TodoFormModel(`
`46`	`46`	`mode: .update(.mock()),`
`47`		`- todoQueries: TodoQueriesNoop(),`
	`47`	`+ todoQueries: .noop(),`
`48`	`48`	`complete: {}`
`49`	`49`	`)`
`50`	`50`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ struct TodoFormTests {`
`18`	`18`
`19`	`19`	`let model = TodoFormModel(`
`20`	`20`	`mode: .create,`
`21`		`- todoQueries: TodoQueriesNoop(insertTodo: insertTodo),`
	`21`	`+ todoQueries: TodoQueries.noop(insertTodo: insertTodo),`
`22`	`22`	`complete: {}`
`23`	`23`	`)`
`24`	`24`
`@@ -32,7 +32,7 @@ struct TodoFormTests {`
`32`	`32`
`33`	`33`	`let model = TodoFormModel(`
`34`	`34`	`mode: .update(.mock()),`
`35`		`- todoQueries: TodoQueriesNoop(updateTodo: updateTodo),`
	`35`	`+ todoQueries: TodoQueries.noop(updateTodo: updateTodo),`
`36`	`36`	`complete: {}`
`37`	`37`	`)`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -35,16 +35,16 @@ public struct AnyQuery<Input: Sendable, Output: Sendable>: Query {`
`35`	`35`	`transactionKind: query.transactionKind,`
`36`	`36`	`connection: query.connection,`
`37`	`37`	`watchedTables: query.watchedTables,`
`38`		`- execute: { try query.execute(with: $0, tx: $1) },`
`39`		`- observe: { query.observation(with: $0) }`
	`38`	`+ execute: { try query.execute($0, tx: $1) },`
	`39`	`+ observe: { query.observation($0) }`
`40`	`40`	`)`
`41`	`41`	`}`
`42`	`42`
`43`		`- public func execute(with input: Input, tx: borrowing Transaction) throws -> Output {`
	`43`	`+ public func execute(_ input: Input, tx: borrowing Transaction) throws -> Output {`
`44`	`44`	`try _execute(input, tx)`
`45`	`45`	`}`
`46`	`46`
`47`		`- public func observation(with input: Input) -> any QueryObservation<Output> {`
	`47`	`+ public func observation(_ input: Input) -> any QueryObservation<Output> {`
`48`	`48`	`_observe(input)`
`49`	`49`	`}`
`50`	`50`	`}`