WIP - Adapters passed in a struct

Author: wickwirew

Sources/Compiler/Gen/Language.swift

@@ -8,13 +8,16 @@
 import OrderedCollections
 import SwiftSyntax
 import SwiftSyntaxBuilder
+import Foundation
 
 public protocol Language {
     init(options: GenerationOptions)
 
     var boolName: String { get }
 
-    var builtinAdapters: Set<String> { get }
+    /// A list of types that have builtin adapters supplied by the library.
+    /// Note: These are the type names, not the name of the adapter used.
+    var builtinAdapterTypes: Set<String> { get }
 
     func queryTypeName(input: String, output: String) -> String
 
@@ -49,6 +52,9 @@ extension Language {
     ) throws -> String {
         let values = try assemble(queries: queries, schema: schema)
 
+        let builtinAdapters = builtinAdapterTypes
+            .map(adapterName(from:))
+        
         // Get a list of all adapters used. Right now we only have to look at the
         // tables since any output would inhereit the encoding of the source table.
         let adapters: Set<String> = values.tables.reduce(into: []) { adapters, table in
@@ -214,7 +220,7 @@ extension Language {
             return .encoded(
                 generationType(for: root),
                 alias: alias,
-                adapter: "\(adapter?.description ?? alias)DatabaseValueAdapter"
+                adapter: adapter.map(adapterName(from:)) ?? adapterName(from: alias)
             )
         case let .optional(type):
             return .optional(generationType(for: type))
@@ -319,8 +325,44 @@ extension Language {
 
         return singleOrMany(.model(model))
     }
+    
+    /// Converts a type name to the usable adapter name. Basically lower camelcases it.
+    ///
+    /// Int -> int
+    /// UUID -> uuid
+    /// Foo.ID -> fooID
+    private func adapterName<S: StringProtocol>(from typeName: S) -> String {
+        var result = ""
+        result.reserveCapacity(typeName.count)
+        
+        // Right now we only support Swift so we are expecting the input
+        // to be upper camel case so we really only have to worry about
+        // lower casing the initial characters until we hit the first lower
+        // cased character
+        var hasHitLowerCase = false
+        
+        for c in typeName {
+            guard identifierCharacters.contains(c) else { continue }
+            
+            if !hasHitLowerCase {
+                result.append(c.lowercased())
+            } else {
+                result.append(c)
+            }
+            
+            hasHitLowerCase = hasHitLowerCase || c.isLowercase
+        }
+        
+        return result
+    }
 }
 
+let identifierCharacters: Set<Character> = {
+    var characters: Set<Character> = Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890_")
+    characters.insert("_")
+    return characters
+}()
+
 public struct GenerationOptions: Sendable {
     public var databaseName: String
     public var imports: [String]

Sources/Compiler/Gen/SwiftLanguage.swift

@@ -15,23 +15,24 @@ public struct SwiftLanguage: Language {
 
     public var boolName: String { "Bool" }
 
-    public var builtinAdapters: Set<String> {
+    public var builtinAdapterTypes: Set<String> {
         [
-            "BoolDatabaseValueAdapter",
-            "Int8DatabaseValueAdapter",
-            "Int16DatabaseValueAdapter",
-            "Int32DatabaseValueAdapter",
-            "Int64DatabaseValueAdapter",
-            "UInt8DatabaseValueAdapter",
-            "UInt16DatabaseValueAdapter",
-            "UInt32DatabaseValueAdapter",
-            "UInt64DatabaseValueAdapter",
-            "UIntDatabaseValueAdapter",
-            "FloatDatabaseValueAdapter",
-            "Float16DatabaseValueAdapter",
-            "UUIDDatabaseValueAdapter",
-            "DecimalDatabaseValueAdapter",
-            "DateDatabaseValueAdapter",
+            "Bool",
+            "Int8",
+            "Int16",
+            "Int32",
+            "Int64",
+            "UInt8",
+            "UInt16",
+            "UInt32",
+            "UInt64",
+            "UInt",
+            "Float",
+            "Float16",
+            "UUID",
+            "Decimal",
+            "Date",
+            "URL",
         ]
     }
 
@@ -87,12 +88,13 @@ public struct SwiftLanguage: Language {
 
         writer.write("import Foundation")
         writer.write(line: "import Otter")
-        writer.blankLine()
 
         for `import` in options.imports {
             writer.write(line: "import \(`import`)")
         }
 
+        writer.blankLine()
+        
         for table in tables {
             declaration(for: table, isOutput: true)
         }
@@ -109,7 +111,7 @@ public struct SwiftLanguage: Language {
             }
         }
 
-        dbStruct(queries: queries, migrations: migrations)
+        dbStruct(queries: queries, migrations: migrations, adapters: adapters)
         writer.blankLine()
 
         for query in allQueries {
@@ -166,12 +168,28 @@ public struct SwiftLanguage: Language {
 
     private func dbStruct(
         queries: [(String?, [GeneratedQuery])],
-        migrations: [String]
+        migrations: [String],
+        adapters: [String]
     ) {
         writer.write(line: "struct ", options.databaseName, ": Database")
 
         writer.braces {
             writer.write(line: "let connection: any Otter.Connection")
+            
+            writer.write(line: "let adapters: Adapters")
+            // Don't require initialization if there are no custom adapters
+            if adapters.isEmpty {
+                writer.write(" = Adapters()")
+            }
+            writer.newline()
+            
+            writer.write(line: "struct Adapters ")
+            writer.braces {
+                for adapter in adapters {
+                    writer.write(line: "let ", adapter, ": DatabaseValueAdapter")
+                }
+            }
+            
             writer.newline()
 
             writer.write(line: "static var migrations: [String] ")
@@ -289,6 +307,7 @@ public struct SwiftLanguage: Language {
         writer.indent()
 
         writer.write(line: "let connection: any Connection")
+        writer.write(line: "let adapters: ", options.databaseName,"Adapters")
         writer.blankLine()
 
         for (position, query) in queries.positional() {
@@ -514,10 +533,10 @@ public struct SwiftLanguage: Language {
                 writer.write("row.optionallyEmbedded(at: start + ", index.description, ")")
                 index += model.fields.count
             case let .encoded(storage, _, adapter):
-                writer.write("row.value(at: start + ", index.description, ", using: ", adapter, ".self, storage: ", typeName(for: storage), ".self)")
+                writer.write("row.value(at: start + ", index.description, ", using: adapters.", adapter, ", storage: ", typeName(for: storage), ".self)")
                 index += 1
             case let .optional(.encoded(storage, _, adapter)):
-                writer.write("row.optionalValue(at: start + ", index.description, ", using: ", adapter, ".self, storage: ", typeName(for: storage), ".self)")
+                writer.write("row.optionalValue(at: start + ", index.description, ", using: adapters.", adapter, ", storage: ", typeName(for: storage), ".self)")
                 index += 1
             default:
                 fatalError("Invalid field type \(field.typeName) \(field.type)")
@@ -680,7 +699,7 @@ public struct SwiftLanguage: Language {
             writer.write(name, ", to: ", index.description)
 
             if let adapter {
-                writer.write(", using: ", adapter.name, ".self, as: ", adapter.storage, ".self")
+                writer.write(", using: adapters.", adapter.name, ", as: ", adapter.storage, ".self")
             }
 
             writer.write(")")

Sources/Otter/DatabaseValueAdapter.swift

@@ -276,3 +276,21 @@ public enum DateDatabaseValueAdapter: DatabaseValueAdapter {
         try .double(encodeToDouble(value: value))
     }
 }
+
+public struct URLDatabaseValueAdapter: DatabaseValueAdapter {
+    @inlinable public static func encodeToString(value: URL) throws(OtterError) -> String {
+        value.absoluteString
+    }
+    
+    @inlinable public static func encodeToAny(value: URL) throws(OtterError) -> SQLAny {
+        .string(value.absoluteString)
+    }
+    
+    @inlinable public static func decode(from primitive: String) throws(OtterError) -> URL {
+        guard let url = URL(string: primitive) else {
+            throw OtterError.cannotEncode(String.self, to: URL.self)
+        }
+        
+        return url
+    }
+}

Sources/OtterCLI/GenerateCommand.swift

@@ -30,6 +30,9 @@ struct GenerateCommand: AsyncParsableCommand {
 
     @Flag(help: "If true, it will emit diagnostics that Xcode can understand")
     var xcodeDiagnosticReporter = false
+    
+    @Flag(help: "If true, the output will be dumped to stdout and not not be written to disk")
+    var dump = false
 
     mutating func run() async throws {
         let config = try Config(at: path)
@@ -73,7 +76,7 @@ struct GenerateCommand: AsyncParsableCommand {
 
         try await driver.generate(
             language: Lang.self,
-            to: project.generatedOutputFile.path,
+            to: dump ? nil : project.generatedOutputFile.path,
             options: options
         )