Moved name and imports into options

Author: wickwirew

Sources/Compiler/Driver.swift

@@ -68,8 +68,6 @@ public actor Driver {
     public func generate<Lang: Language>(
         language: Lang.Type,
         to path: Path?,
-        imports: [String],
-        databaseName: String,
         options: GenerationOptions
     ) throws {
         // An array of all migrations source code
@@ -85,8 +83,6 @@ public actor Driver {
             .map { ($0.fileName.split(separator: ".").first?.description, $0.statements) }
 
         let file = try Lang.generate(
-            imports: imports,
-            databaseName: databaseName,
             migrations: migrations,
             queries: queries,
             schema: currentSchema,

Sources/Compiler/Gen/Language.swift

@@ -24,8 +24,6 @@ public protocol Language {
 
     /// A file source code containing all of the generated tables, queries and migrations.
     static func file(
-        imports: [String],
-        databaseName: String,
         migrations: [String],
         tables: [GeneratedModel],
         queries: [(String?, [GeneratedQuery])],
@@ -45,8 +43,6 @@ public protocol Language {
 
 extension Language {
     public static func generate(
-        imports: [String],
-        databaseName: String,
         migrations: [String],
         queries: [(String?, [Statement])],
         schema: Schema,
@@ -55,8 +51,6 @@ extension Language {
         let values = try assemble(queries: queries, schema: schema)
 
         return try file(
-            imports: imports,
-            databaseName: databaseName,
             migrations: migrations,
             tables: values.tables,
             queries: values.queries,
@@ -244,10 +238,18 @@ extension Language {
     }
 }
 
-
-public typealias GenerationOptions = Set<GenerationOption>
-
-public enum GenerationOption: Hashable {}
+public struct GenerationOptions: Sendable {
+    public var databaseName: String
+    public var imports: [String]
+    
+    public init(
+        databaseName: String? = nil,
+        imports: [String] = []
+    ) {
+        self.databaseName = databaseName ?? "DB"
+        self.imports = imports
+    }
+}
 
 public struct GeneratedModel {
     let name: String

Sources/Compiler/Gen/SwiftLanguage.swift

@@ -57,8 +57,6 @@ public struct SwiftLanguage: Language {
     }
 
     public static func file(
-        imports: [String],
-        databaseName: String,
         migrations: [String],
         tables: [GeneratedModel],
         queries: [(String?, [GeneratedQuery])],
@@ -70,7 +68,7 @@ public struct SwiftLanguage: Language {
             try ImportDeclSyntax("import Foundation")
             try ImportDeclSyntax("import Feather")
 
-            for `import` in imports {
+            for `import` in options.imports {
                 try ImportDeclSyntax("import \(raw: `import`)")
             }
 
@@ -92,7 +90,7 @@ public struct SwiftLanguage: Language {
                 }
             }
 
-            try StructDeclSyntax("struct \(raw: databaseName): Database") {
+            try StructDeclSyntax("struct \(raw: options.databaseName): Database") {
                 "let connection: any Feather.Connection"
 
                 try declaration(for: migrations, options: options)
@@ -105,7 +103,7 @@ public struct SwiftLanguage: Language {
                         // This is really only used by the macro since it doesnt have file names
                         // which really wont happen here but still implement it for completeness.
                         for query in queries {
-                            try declaration(for: query, databaseName: databaseName, options: options)
+                            try declaration(for: query, databaseName: options.databaseName, options: options)
                         }
                     }
                 }

Sources/FeatherCLI/Feather.swift

@@ -25,10 +25,18 @@ struct Feather: AsyncParsableCommand {
     var additionalImports: String?
 
     mutating func run() async throws {
-        try await generate(language: SwiftLanguage.self)
+        let options = GenerationOptions(
+            databaseName: databaseName,
+            imports: additionalImports?.split(separator: ",").map(\.description) ?? []
+        )
+        
+        try await generate(language: SwiftLanguage.self, options: options)
     }
 
-    private func generate<Lang: Language>(language: Lang.Type) async throws {
+    private func generate<Lang: Language>(
+        language: Lang.Type,
+        options: GenerationOptions
+    ) async throws {
         let driver = Driver()
         await driver.add(reporter: StdoutDiagnosticReporter())
 
@@ -37,13 +45,7 @@ struct Feather: AsyncParsableCommand {
         try await driver.generate(
             language: Lang.self,
             to: output,
-            imports: additionalImports?.split(separator: ",").map(\.description) ?? [],
-            databaseName: databaseName,
-            options: gatherOptions()
+            options: options
         )
     }
-    
-    private func gatherOptions() -> GenerationOptions {
-        return [] // This originally had options
-    }
 }