wip

Author: stephencelis

Sources/StructuredQueries/Macros.swift

@@ -91,7 +91,7 @@ public macro Ephemeral() =
 /// or common table expression.
 @attached(
   extension,
-  conformances: Selection,
+  conformances: _Selection,
   names: named(Columns),
   named(init(decoder:))
 )

Sources/StructuredQueriesCore/Statements/Insert.swift

@@ -991,7 +991,7 @@ public enum InsertValuesBuilder<Value> {
   public static func buildExpression(
     _ expression: Value.Columns
   ) -> [[QueryFragment]]
-  where Value: Selection {
+  where Value: _Selection {
     [expression.selection.map(\.expression)]
   }
 

Sources/StructuredQueriesCore/Selection.swift renamed to Sources/StructuredQueriesCore/_Selection.swift

@@ -1,12 +1,12 @@
-public protocol Selection: QueryRepresentable {
-  associatedtype Columns: SelectedColumns<Self>
+public protocol _Selection: QueryRepresentable {
+  associatedtype Columns: _SelectedColumns<Self>
 }
 
-public protocol SelectedColumns<QueryValue>: QueryExpression {
+public protocol _SelectedColumns<QueryValue>: QueryExpression {
   var selection: [(aliasName: String, expression: QueryFragment)] { get }
 }
 
-extension SelectedColumns {
+extension _SelectedColumns {
   public var queryFragment: QueryFragment {
     selection.map { "\($1) AS \(quote: $0)" as QueryFragment }.joined(separator: ", ")
   }

Sources/StructuredQueriesMacros/SelectionMacro.swift

@@ -155,7 +155,7 @@ extension SelectionMacro: ExtensionMacro {
     }
 
     var conformances: [TypeSyntax] = []
-    let protocolNames: [TokenSyntax] = ["Selection"]
+    let protocolNames: [TokenSyntax] = ["_Selection"]
     if let inheritanceClause = declaration.inheritanceClause {
       for type in protocolNames {
         if !inheritanceClause.inheritedTypes.contains(where: {
@@ -300,8 +300,8 @@ extension SelectionMacro: MemberMacro {
     }
 
     var conformances: [TypeSyntax] = []
-    let protocolNames: [TokenSyntax] = ["Selection"]
-    let schemaConformances: [ExprSyntax] = ["\(moduleName).SelectedColumns"]
+    let protocolNames: [TokenSyntax] = ["_Selection"]
+    let schemaConformances: [ExprSyntax] = ["\(moduleName)._SelectedColumns"]
     if let inheritanceClause = declaration.inheritanceClause {
       for type in protocolNames {
         if !inheritanceClause.inheritedTypes.contains(where: {

Tests/StructuredQueriesMacrosTests/SelectionMacroTests.swift

@@ -19,7 +19,7 @@ extension SnapshotTests {
           let player: Player
           let team: Team
 
-          public struct Columns: StructuredQueriesCore.SelectedColumns {
+          public struct Columns: StructuredQueriesCore._SelectedColumns {
             public typealias QueryValue = PlayerAndTeam
             public let selection: [(aliasName: String, expression: StructuredQueriesCore.QueryFragment)]
             public init(
@@ -31,7 +31,7 @@ extension SnapshotTests {
           }
         }
 
-        extension PlayerAndTeam: StructuredQueriesCore.Selection {
+        extension PlayerAndTeam: StructuredQueriesCore._Selection {
           public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
             let player = try decoder.decode(Player.self)
             let team = try decoder.decode(Team.self)
@@ -80,7 +80,7 @@ extension SnapshotTests {
           var reminderTitle: String 
           var listTitle: String?
 
-          public struct Columns: StructuredQueriesCore.SelectedColumns {
+          public struct Columns: StructuredQueriesCore._SelectedColumns {
             public typealias QueryValue = ReminderTitleAndListTitle
             public let selection: [(aliasName: String, expression: StructuredQueriesCore.QueryFragment)]
             public init(
@@ -92,7 +92,7 @@ extension SnapshotTests {
           }
         }
 
-        extension ReminderTitleAndListTitle: StructuredQueriesCore.Selection {
+        extension ReminderTitleAndListTitle: StructuredQueriesCore._Selection {
           public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
             let reminderTitle = try decoder.decode(String.self)
             let listTitle = try decoder.decode(String.self)
@@ -120,7 +120,7 @@ extension SnapshotTests {
         struct ReminderDate {
           var date: Date
 
-          public struct Columns: StructuredQueriesCore.SelectedColumns {
+          public struct Columns: StructuredQueriesCore._SelectedColumns {
             public typealias QueryValue = ReminderDate
             public let selection: [(aliasName: String, expression: StructuredQueriesCore.QueryFragment)]
             public init(
@@ -131,7 +131,7 @@ extension SnapshotTests {
           }
         }
 
-        extension ReminderDate: StructuredQueriesCore.Selection {
+        extension ReminderDate: StructuredQueriesCore._Selection {
           public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
             let date = try decoder.decode(Date.UnixTimeRepresentation.self)
             guard let date else {

Tests/StructuredQueriesMacrosTests/TableSelectionMacroTests.swift

@@ -35,7 +35,7 @@ extension SnapshotTests {
             }
           }
 
-          public struct Columns: StructuredQueriesCore.SelectedColumns {
+          public struct Columns: StructuredQueriesCore._SelectedColumns {
             public typealias QueryValue = ReminderListWithCount
             public let selection: [(aliasName: String, expression: StructuredQueriesCore.QueryFragment)]
             public init(
@@ -58,7 +58,7 @@ extension SnapshotTests {
           }
         }
 
-        extension ReminderListWithCount: StructuredQueriesCore.Selection {
+        extension ReminderListWithCount: StructuredQueriesCore._Selection {
           public init(decoder: inout some StructuredQueriesCore.QueryDecoder) throws {
             let reminderList = try decoder.decode(ReminderList.self)
             let remindersCount = try decoder.decode(Int.self)