Namespace queries

Author: wickwirew

Sources/Compiler/Compiler.swift

@@ -7,7 +7,7 @@
 
 public struct Compiler {
     public private(set) var schema = Schema()
-    public private(set) var queries: [Statement] = []
+    public private(set) var queries: [Namespace: [Statement]] = [:]
     public private(set) var migrations: [Statement] = []
     public private(set) var diagnostics: [Namespace: Diagnostics] = [:]
 
@@ -16,6 +16,11 @@ public struct Compiler {
     public enum Namespace: Hashable {
         case global
         case file(String)
+        
+        public var file: String? {
+            guard case .file(let name) = self else { return nil }
+            return name
+        }
     }
 
     public init() {}
@@ -41,7 +46,7 @@ public struct Compiler {
             validator: IsValidForQueries(),
             context: "queries"
         )
-        self.queries.append(contentsOf: stmts)
+        self.queries[namespace, default: []].append(contentsOf: stmts)
         self.diagnostics[namespace] = diagnostics
         return diagnostics
     }
@@ -74,7 +79,7 @@ public struct Compiler {
             )
         )
 
-        self.queries.append(stmtWithDef)
+        self.queries[namespace, default: []].append(stmtWithDef)
         self.diagnostics[namespace] = diagnostics
         return diagnostics
     }

Sources/Compiler/Gen/Language.swift

@@ -10,6 +10,15 @@ import SwiftSyntax
 import SwiftSyntaxBuilder
 
 public protocol Language {
+    static func queryTypeName(input: String, output: String) -> String
+    
+    static func inputTypeName(input: BuiltinOrGenerated?) -> String
+    
+    static func outputTypeName(
+        output: BuiltinOrGenerated?,
+        cardinality: Cardinality
+    ) -> String
+    
     /// Returns the Language builtin for the given SQL type
     static func builtinType(for type: Type) -> String
 
@@ -19,7 +28,7 @@ public protocol Language {
         databaseName: String,
         migrations: [String],
         tables: [GeneratedModel],
-        queries: [GeneratedQuery],
+        queries: [(String?, [GeneratedQuery])],
         options: GenerationOptions
     ) throws -> String
 
@@ -39,7 +48,7 @@ extension Language {
         imports: [String],
         databaseName: String,
         migrations: [String],
-        queries: [Statement],
+        queries: [(String?, [Statement])],
         schema: Schema,
         options: GenerationOptions
     ) throws -> String {
@@ -56,14 +65,14 @@ extension Language {
     }
 
     public static func assemble(
-        queries: [Statement],
+        queries: [(String?, [Statement])],
         schema: Schema
     ) throws -> (
         tables: [GeneratedModel],
-        queries: [GeneratedQuery]
+        queries: [(String?, [GeneratedQuery])]
     ) {
         let tables = schema.mapValues(model(for:))
-        let queries = queries.map { query(for: $0, tables: tables) }
+        let queries = queries.map { ($0.map { "\($0)Queries" }, $1.map{ query(for: $0, tables: tables) }) }
         return (Array(tables.values), queries)
     }
 
@@ -91,10 +100,18 @@ extension Language {
             }
         }.joined()
 
+        let inputTypeName = inputTypeName(input: input)
+        let outputTypeName = outputTypeName(output: output, cardinality: statement.outputCardinality)
+        
         return GeneratedQuery(
-            name: "\(definition.name)Query",
+            name: definition.name.description,
+            variableName: definition.name.lowercaseFirst,
+            typeName: queryTypeName(input: inputTypeName, output: outputTypeName),
+            typealiasName: "\(definition.name.capitalizedFirst)Query",
             input: input,
+            inputName: inputTypeName,
             output: output,
+            outputName: outputTypeName,
             outputCardinality: statement.outputCardinality,
             sourceSql: sql,
             isReadOnly: statement.isReadOnly,
@@ -230,9 +247,7 @@ extension Language {
 
 public typealias GenerationOptions = Set<GenerationOption>
 
-public enum GenerationOption: Hashable {
-    case namespaceGeneratedModels
-}
+public enum GenerationOption: Hashable {}
 
 public struct GeneratedModel {
     let name: String
@@ -261,8 +276,13 @@ public struct GeneratedField {
 
 public struct GeneratedQuery {
     let name: String
+    let variableName: String
+    let typeName: String
+    let typealiasName: String
     let input: BuiltinOrGenerated?
+    let inputName: String
     let output: BuiltinOrGenerated?
+    let outputName: String
     let outputCardinality: Cardinality
     let sourceSql: String
     let isReadOnly: Bool

Sources/Compiler/Gen/PositionalSequence.swift

@@ -6,13 +6,18 @@
 //
 
 struct PositionalSequence<Base: Collection>: Sequence {
-    typealias Element = (Position?, Base.Element)
+    typealias Element = (Position, Base.Element)
 
     let base: Base
 
-    enum Position {
-        case first
-        case last
+    struct Position: OptionSet {
+        let rawValue: UInt8
+        
+        static var first: Position { Position(rawValue: 1 << 0) }
+        static var last: Position { Position(rawValue: 1 << 1) }
+        
+        var isFirst: Bool { contains(.first) }
+        var isLast: Bool { contains(.last) }
     }
 
     func makeIterator() -> Iterator {
@@ -28,14 +33,17 @@ struct PositionalSequence<Base: Collection>: Sequence {
 
         mutating func next() -> Element? {
             guard let (offset, element) = base.next() else { return nil }
+            var position: Position = []
 
             if offset == 0 {
-                return (.first, element)
-            } else if offset == count - 1 {
-                return (.last, element)
-            } else {
-                return (nil, element)
+                position.insert(.first)
             }
+            
+            if offset == count - 1 {
+                position.insert(.last)
+            }
+            
+            return (position, element)
         }
     }
 }