Readme

Author: wickwirew

README.md

@@ -108,6 +108,20 @@ func main() async throws {
 > As of now it is not recommended for larger projects. There are quite a few limitations 
 that won't scale well beyond a fairly simple schema and a handfull of queries.
 
+#### Anatomy of a @Query
+```swift
+@Query(
+    "SELECT * FROM foo WHERE id IN ?", // 1.
+    inputName: "CustomInputName", // 2.
+    outputName: "CustomOutputName" // 3.
+)
+var variableName: any MyQuery // 4.
+```
+1. The raw SQL to execute
+2. Optionally supply a custom type name for the generated input type.
+3. Optionally supply a custom type name for the generated output type.
+4. The `variableName` can be anything and does not affect any of the generated code.
+
 #### Current Limitations
 * Since macros operate purely on the syntax, all queries must be within the `@Database` itself so it has access to the schema.
 * All generated types will be nested under the `@Database` struct.

Sources/Compiler/Utils/String+Extensions.swift

@@ -6,14 +6,14 @@
 //
 
 extension StringProtocol {
-    var capitalizedFirst: String {
+    public var capitalizedFirst: String {
         guard !isEmpty else { return self.description }
         let first = self[startIndex]
         let rest = self[index(after: startIndex)..<endIndex]
         return "\(first.uppercased())\(rest)"
     }
 
-    var lowercaseFirst: String {
+    public var lowercaseFirst: String {
         guard !isEmpty else { return self.description }
         let first = self[startIndex]
         let rest = self[index(after: startIndex)..<endIndex]

Sources/OtterMacros/DatabaseMacro.swift

@@ -46,7 +46,7 @@ extension DatabaseMacro: MemberMacro {
 
         for variable in variables.values {
             guard let queryMacro = variable.queryMacroInputsIfIsQuery(in: context),
-                  let typeName = variable.typeName?.removingQuerySuffix() else { continue }
+                  let typeName = variable.typeName?.removingQuerySuffix().lowercaseFirst else { continue }
 
             let (statement, diagnostics) = compiler.compile(
                 query: queryMacro.source,

Sources/OtterMacros/QueryMacro.swift

@@ -19,15 +19,13 @@ public struct QueryMacro: AccessorMacro {
         in context: some MacroExpansionContext
     ) throws -> [AccessorDeclSyntax] {
         guard let property = declaration.as(VariableDeclSyntax.self),
-              let binding = property.bindings.first,
-              let identifier = binding.pattern.as(IdentifierPatternSyntax.self)?.identifier,
-              binding.accessorBlock == nil
+              let typeName = property.typeName?.removingQuerySuffix().lowercaseFirst
         else {
             return []
         }
 
         return [
-            "get { return _\(raw: identifier.text.removingQuerySuffix()) }",
+            "get { return _\(raw: typeName) }",
         ]
     }
 }