add CodingKey to SortEncoder

tayloraswift · Jun 23, 2024 · 272a316 · 272a316
1 parent 7400dd6
commit 272a316
Show file tree

Hide file tree

Showing 29 changed files with 236 additions and 178 deletions.
diff --git a/Snippets/ExampleAccumulators.swift b/Snippets/ExampleAccumulators.swift
@@ -8,7 +8,7 @@ func ExampleAccumulators()
         $0[.top] = .init
         {
             $0[.output] = "$field"
-            $0[.by] = .init
+            $0[.by, using: Mongo.AnyKeyPath.self]
             {
                 $0["x"] = (+)
                 $0["y"] = (-)
@@ -20,8 +20,8 @@ func ExampleAccumulators()
         $0[.top] = .init
         {
             $0[.output] = "$field"
-            $0[.count] = 5
-            $0[.by] = .init
+            $0[.n] = 5
+            $0[.by, using: Mongo.AnyKeyPath.self]
             {
                 $0["x"] = (+)
                 $0["y"] = (-)
@@ -33,7 +33,7 @@ func ExampleAccumulators()
         $0[.first] = .init
         {
             $0[.input] = "$field"
-            $0[.count] = 5
+            $0[.n] = 5
         }
     }
     let _:Mongo.Accumulator = .init

diff --git a/Snippets/ExampleExpressions.swift b/Snippets/ExampleExpressions.swift
@@ -368,7 +368,7 @@ func ExampleExpressions()
             $0[.sortArray] = .init
             {
                 $0[.input] = "$field"
-                $0[.by] = .init
+                $0[.by, using: Mongo.AnyKeyPath.self]
                 {
                     $0["x"] = (+)
                     $0["y"] = (-)

diff --git a/Sources/MongoBuiltins/Accumulators/Mongo.Accumulator.N.swift b/Sources/MongoBuiltins/Accumulators/Mongo.Accumulator.N.swift
@@ -0,0 +1,8 @@
+extension Mongo.Accumulator
+{
+    @frozen public
+    enum N:String, Sendable
+    {
+        case n
+    }
+}
diff --git a/Sources/MongoBuiltins/Accumulators/Mongo.Accumulator.SuperlativeDocument.swift b/Sources/MongoBuiltins/Accumulators/Mongo.Accumulator.SuperlativeDocument.swift
@@ -17,8 +17,14 @@ extension Mongo.Accumulator
 }
 extension Mongo.Accumulator.SuperlativeDocument
 {
+    @frozen public
+    enum Input:String, Sendable
+    {
+        case input
+    }
+
     @inlinable public
-    subscript<Encodable>(key:Mongo.SortDocument.Input) -> Encodable?
+    subscript<Encodable>(key:Input) -> Encodable?
         where Encodable:BSONEncodable
     {
         get
@@ -30,8 +36,11 @@ extension Mongo.Accumulator.SuperlativeDocument
             value?.encode(to: &self.bson[with: key])
         }
     }
+}
+extension Mongo.Accumulator.SuperlativeDocument
+{
     @inlinable public
-    subscript<Encodable>(key:Mongo.SortDocument.Count) -> Encodable?
+    subscript<Encodable>(key:Mongo.Accumulator.N) -> Encodable?
         where Encodable:BSONEncodable
     {
         get

diff --git a/Sources/MongoBuiltins/Accumulators/Mongo.Accumulator.SuperlativeSortDocument.swift b/Sources/MongoBuiltins/Accumulators/Mongo.Accumulator.SuperlativeSortDocument.swift
@@ -17,36 +17,48 @@ extension Mongo.Accumulator
 }
 extension Mongo.Accumulator.SuperlativeSortDocument
 {
+    @available(*, unavailable)
     @inlinable public
-    subscript(key:Mongo.SortDocument.By) -> Mongo.SortDocument?
+    subscript(key:Mongo.SortBy) -> Mongo.SortDocument<Mongo.AnyKeyPath>?
     {
-        get
-        {
-            nil
-        }
-        set(value)
+        nil
+    }
+
+    @inlinable public
+    subscript<CodingKey>(key:Mongo.SortBy,
+        using _:CodingKey.Type = CodingKey.self,
+        yield:(inout Mongo.SortEncoder<CodingKey>) -> ()) -> Void
+    {
+        mutating get
         {
-            value?.encode(to: &self.bson[with: key])
+            yield(&self.bson[with: key][as: Mongo.SortEncoder<CodingKey>.self])
         }
     }
+}
+extension Mongo.Accumulator.SuperlativeSortDocument
+{
+    @frozen public
+    enum Output:String, Hashable, Sendable
+    {
+        case output
+    }
+
     @inlinable public
-    subscript<Encodable>(key:Mongo.SortDocument.Output) -> Encodable?
+    subscript<Encodable>(key:Output) -> Encodable?
         where Encodable:BSONEncodable
     {
-        get
-        {
-            nil
-        }
-        set(value)
+        get { nil }
+        set (value)
         {
             value?.encode(to: &self.bson[with: key])
         }
     }
 }
-extension Mongo.Accumulator.SuperlativeSortDocument<Mongo.SortDocument.Count>
+extension Mongo.Accumulator.SuperlativeSortDocument<Mongo.Accumulator.N>
 {
+
     @inlinable public
-    subscript<Encodable>(key:Mongo.SortDocument.Count) -> Encodable?
+    subscript<Encodable>(key:Mongo.Accumulator.N) -> Encodable?
         where Encodable:BSONEncodable
     {
         get

diff --git a/Sources/MongoBuiltins/Accumulators/Mongo.Accumulator.swift b/Sources/MongoBuiltins/Accumulators/Mongo.Accumulator.swift
@@ -81,7 +81,7 @@ extension Mongo.Accumulator
     }
     @_disfavoredOverload
     @inlinable public
-    subscript(key:SuperlativeSort) -> SuperlativeSortDocument<Mongo.SortDocument.Count>?
+    subscript(key:SuperlativeSort) -> SuperlativeSortDocument<N>?
     {
         get
         {

diff --git a/...ocuments/Sort/Mongo.SortDocument.By.swift → ...uiltins/Documents/Sort/Mongo.SortBy.swift b/...ocuments/Sort/Mongo.SortDocument.By.swift → ...uiltins/Documents/Sort/Mongo.SortBy.swift
@@ -1,12 +1,12 @@
-extension Mongo.SortDocument
+extension Mongo
 {
     @frozen public
-    enum By:String, Hashable, Sendable
+    enum SortBy:String, Hashable, Sendable
     {
         case by = "sortBy"
     }
 }
-extension Mongo.SortDocument.By
+extension Mongo.SortBy
 {
     @available(*, unavailable, renamed: "by")
     public static

diff --git a/Sources/MongoBuiltins/Documents/Sort/Mongo.SortDocument.Count.swift b/Sources/MongoBuiltins/Documents/Sort/Mongo.SortDocument.Count.swift
diff --git a/Sources/MongoBuiltins/Documents/Sort/Mongo.SortDocument.Input.swift b/Sources/MongoBuiltins/Documents/Sort/Mongo.SortDocument.Input.swift
diff --git a/Sources/MongoBuiltins/Documents/Sort/Mongo.SortDocument.Output.swift b/Sources/MongoBuiltins/Documents/Sort/Mongo.SortDocument.Output.swift
diff --git a/Sources/MongoBuiltins/Documents/Sort/Mongo.SortDocument.swift b/Sources/MongoBuiltins/Documents/Sort/Mongo.SortDocument.swift
@@ -4,7 +4,7 @@ import MongoABI
 extension Mongo
 {
     @frozen public
-    struct SortDocument:Sendable
+    struct SortDocument<CodingKey>:Sendable where CodingKey:RawRepresentable<String>
     {
         public
         var bson:BSON.Document
@@ -19,5 +19,5 @@ extension Mongo
 extension Mongo.SortDocument:Mongo.EncodableDocument
 {
     public
-    typealias Encoder = Mongo.SortEncoder
+    typealias Encoder = Mongo.SortEncoder<CodingKey>
 }
diff --git a/Sources/MongoBuiltins/Documents/Sort/Mongo.SortEncoder.swift b/Sources/MongoBuiltins/Documents/Sort/Mongo.SortEncoder.swift
@@ -4,13 +4,13 @@ import MongoABI
 extension Mongo
 {
     @frozen public
-    struct SortEncoder:Sendable
+    struct SortEncoder<CodingKey>:Sendable where CodingKey:RawRepresentable<String>
     {
         @usableFromInline
-        var bson:BSON.DocumentEncoder<Mongo.AnyKeyPath>
+        var bson:BSON.DocumentEncoder<CodingKey>
 
         @inlinable internal
-        init(bson:BSON.DocumentEncoder<Mongo.AnyKeyPath>)
+        init(bson:BSON.DocumentEncoder<CodingKey>)
         {
             self.bson = bson
         }
@@ -36,7 +36,7 @@ extension Mongo.SortEncoder
         pass the `(+)` or `(-)` operator functions to specify sort direction.
         """)
     @inlinable public
-    subscript(path:Mongo.AnyKeyPath) -> Int?
+    subscript(path:CodingKey) -> Int?
     {
         get { nil }
         set {     }
@@ -67,27 +67,27 @@ extension Mongo.SortEncoder
 extension Mongo.SortEncoder
 {
     @inlinable public
-    subscript<Direction>(path:Mongo.AnyKeyPath) -> ((Direction) -> Never)?
+    subscript<Direction>(path:CodingKey) -> ((Direction) -> Never)?
         where Direction:Mongo.SortDirection
     {
         get { nil }
         set (value)
         {
             if  case _? = value
             {
-                Direction.code.encode(to: &self.bson[with: path.stem])
+                Direction.code.encode(to: &self.bson[with: path])
             }
         }
     }
 }
 extension Mongo.SortEncoder
 {
     @inlinable public
-    subscript(path:Mongo.AnyKeyPath, yield:(inout Mongo.SortOperatorEncoder) -> ()) -> Void
+    subscript(path:CodingKey, yield:(inout Mongo.SortOperatorEncoder) -> ()) -> Void
     {
         mutating get
         {
-            yield(&self.bson[with: path.stem][as: Mongo.SortOperatorEncoder.self])
+            yield(&self.bson[with: path][as: Mongo.SortOperatorEncoder.self])
         }
     }
 }
diff --git a/Sources/MongoBuiltins/Documents/SortArray/Mongo.SortArrayDocument.swift b/Sources/MongoBuiltins/Documents/SortArray/Mongo.SortArrayDocument.swift
@@ -1,4 +1,5 @@
 import BSON
+import MongoABI
 
 extension Mongo
 {
@@ -17,8 +18,14 @@ extension Mongo
 }
 extension Mongo.SortArrayDocument
 {
+    @frozen public
+    enum Input:String, Sendable
+    {
+        case input
+    }
+
     @inlinable public
-    subscript<Encodable>(key:Mongo.SortDocument.Input) -> Encodable?
+    subscript<Encodable>(key:Input) -> Encodable?
         where Encodable:BSONEncodable
     {
         get
@@ -30,16 +37,22 @@ extension Mongo.SortArrayDocument
             value?.encode(to: &self.bson[with: key])
         }
     }
+
     @inlinable public
-    subscript(key:Mongo.SortDocument.By) -> Mongo.SortDocument?
+    subscript<CodingKey>(key:Mongo.SortBy,
+        using _:CodingKey.Type = CodingKey.self,
+        yield:(inout Mongo.SortEncoder<CodingKey>) -> ()) -> Void
     {
-        get
+        mutating get
         {
-            nil
-        }
-        set(value)
-        {
-            value?.encode(to: &self.bson[with: key])
+            yield(&self.bson[with: key][as: Mongo.SortEncoder<CodingKey>.self])
         }
     }
+
+    @available(*, unavailable)
+    @inlinable public
+    subscript(key:Mongo.SortBy) -> Mongo.SortDocument<Mongo.AnyKeyPath>?
+    {
+        nil
+    }
 }
diff --git a/Sources/MongoBuiltins/Documents/Update/Mongo.UpdateArrayEncoder.swift b/Sources/MongoBuiltins/Documents/Update/Mongo.UpdateArrayEncoder.swift
@@ -82,11 +82,13 @@ extension Mongo.UpdateArrayEncoder
     }
 
     @inlinable public
-    subscript(key:Sort, yield:(inout Mongo.SortEncoder) -> ()) -> Void
+    subscript<CodingKey>(key:Sort,
+        using _:CodingKey.Type = CodingKey.self,
+        yield:(inout Mongo.SortEncoder<CodingKey>) -> ()) -> Void
     {
         mutating get
         {
-            yield(&self.bson[with: key][as: Mongo.SortEncoder.self])
+            yield(&self.bson[with: key][as: Mongo.SortEncoder<CodingKey>.self])
         }
     }
 }
diff --git a/Sources/MongoBuiltins/Pipelines/Mongo.PipelineEncoder.swift b/Sources/MongoBuiltins/Pipelines/Mongo.PipelineEncoder.swift
@@ -712,24 +712,25 @@ extension Mongo.PipelineEncoder
 extension Mongo.PipelineEncoder
 {
     @inlinable public
-    subscript(stage key:Mongo.Pipeline.Sort) -> Mongo.SortDocument?
+    subscript<CodingKey>(stage sort:Mongo.Pipeline.Sort,
+        using _:CodingKey.Type = CodingKey.self,
+        yield:(inout Mongo.SortEncoder<CodingKey>) -> ()) -> Void
     {
-        get { nil }
-        set (value)
+        mutating get
         {
-            guard
-            let value:Mongo.SortDocument
-            else
-            {
-                return
-            }
-
             self.list(Mongo.Pipeline.Sort.self)
             {
-                $0[.sort] = value
+                yield(&$0[with: sort][as: Mongo.SortEncoder<CodingKey>.self])
             }
         }
     }
+
+    @available(*, unavailable)
+    @inlinable public
+    subscript(stage key:Mongo.Pipeline.Sort) -> Mongo.SortDocument<Mongo.AnyKeyPath>?
+    {
+        nil
+    }
 }
 
 extension Mongo.PipelineEncoder