Merge pull request #134 from tayloraswift/convert-let

convert LetDocument to LetEncoder
tayloraswift · Jun 23, 2024 · 7400dd6 · 7400dd6
2 parents 4cda88e + 3aa3f0c
commit 7400dd6
Show file tree

Hide file tree

Showing 11 changed files with 147 additions and 86 deletions.
diff --git a/Sources/MongoBuiltins/Documents/Let/Mongo.LetDocument.swift b/Sources/MongoBuiltins/Documents/Let/Mongo.LetDocument.swift
@@ -4,7 +4,7 @@ import MongoABI
 extension Mongo
 {
     @frozen public
-    struct LetDocument:Mongo.EncodableDocument, Sendable
+    struct LetDocument:Sendable
     {
         public
         var bson:BSON.Document
@@ -16,32 +16,8 @@ extension Mongo
         }
     }
 }
-extension Mongo.LetDocument
+extension Mongo.LetDocument:Mongo.EncodableDocument
 {
-    @inlinable public
-    subscript<Encodable>(path:Mongo.AnyKeyPath) -> Encodable?
-        where Encodable:BSONEncodable
-    {
-        get
-        {
-            nil
-        }
-        set(value)
-        {
-            value?.encode(to: &self.bson[with: path.stem])
-        }
-    }
-    @inlinable public
-    subscript<Encodable>(`let` binding:Mongo.Variable<some Any>) -> Encodable?
-        where Encodable:BSONEncodable
-    {
-        get
-        {
-            nil
-        }
-        set(value)
-        {
-            value?.encode(to: &self.bson[with: binding.name])
-        }
-    }
+    public
+    typealias Encoder = Mongo.LetEncoder
 }
diff --git a/Sources/MongoBuiltins/Documents/Let/Mongo.LetEncoder.swift b/Sources/MongoBuiltins/Documents/Let/Mongo.LetEncoder.swift
@@ -0,0 +1,55 @@
+import BSON
+import MongoABI
+
+extension Mongo
+{
+    @frozen public
+    struct LetEncoder:Sendable
+    {
+        @usableFromInline
+        var bson:BSON.DocumentEncoder<BSON.Key>
+
+        @inlinable internal
+        init(bson:BSON.DocumentEncoder<BSON.Key>)
+        {
+            self.bson = bson
+        }
+    }
+}
+extension Mongo.LetEncoder:BSON.Encoder
+{
+    @inlinable public
+    init(_ output:consuming BSON.Output)
+    {
+        self.init(bson: .init(output))
+    }
+
+    @inlinable public consuming
+    func move() -> BSON.Output { self.bson.move() }
+
+    @inlinable public static
+    var frame:BSON.DocumentFrame { .document }
+}
+extension Mongo.LetEncoder
+{
+    @inlinable public
+    subscript(`let` binding:Mongo.Variable<some Any>,
+        yield:(inout Mongo.ExpressionEncoder) -> ()) -> Void
+    {
+        mutating get
+        {
+            yield(&self.bson[with: binding.name][as: Mongo.ExpressionEncoder.self])
+        }
+    }
+
+    @inlinable public
+    subscript<Encodable>(`let` binding:Mongo.Variable<some Any>) -> Encodable?
+        where Encodable:BSONEncodable
+    {
+        get { nil }
+        set (value)
+        {
+            value?.encode(to: &self.bson[with: binding.name])
+        }
+    }
+}
diff --git a/Sources/MongoBuiltins/Documents/Lookup/Mongo.LookupEncoder.swift b/Sources/MongoBuiltins/Documents/Lookup/Mongo.LookupEncoder.swift
@@ -78,23 +78,26 @@ extension Mongo.LookupEncoder
 extension Mongo.LookupEncoder
 {
     @frozen public
-    enum Let:String, Hashable, Sendable
+    enum Let:String, Sendable
     {
         case `let`
     }
 
     @inlinable public
-    subscript(key:Let) -> Mongo.LetDocument?
+    subscript(key:Let, yield:(inout Mongo.LetEncoder) -> ()) -> Void
     {
-        get
-        {
-            nil
-        }
-        set(value)
+        mutating get
         {
-            value?.encode(to: &self.bson[with: key])
+            yield(&self.bson[with: key][as: Mongo.LetEncoder.self])
         }
     }
+
+    @available(*, unavailable)
+    @inlinable public
+    subscript(key:Let) -> Mongo.LetDocument?
+    {
+        nil
+    }
 }
 extension Mongo.LookupEncoder
 {

diff --git a/Sources/MongoBuiltins/Documents/Merge/Mongo.MergeDocument.Let.swift b/Sources/MongoBuiltins/Documents/Merge/Mongo.MergeDocument.Let.swift
@@ -1,7 +1,7 @@
 extension Mongo.MergeDocument
 {
     @frozen public
-    enum Let:String, Hashable, Sendable
+    enum Let:String, Sendable
     {
         case `let`
     }

diff --git a/Sources/MongoBuiltins/Documents/Merge/Mongo.MergeDocument.swift b/Sources/MongoBuiltins/Documents/Merge/Mongo.MergeDocument.swift
@@ -69,18 +69,21 @@ extension Mongo.MergeDocument
     }
 
     @inlinable public
-    subscript(key:Let) -> Mongo.LetDocument?
+    subscript(key:Let, yield:(inout Mongo.LetEncoder) -> ()) -> Void
     {
-        get
-        {
-            nil
-        }
-        set(value)
+        mutating get
         {
-            value?.encode(to: &self.bson[with: key])
+            yield(&self.bson[with: key][as: Mongo.LetEncoder.self])
         }
     }
 
+    @available(*, unavailable)
+    @inlinable public
+    subscript(key:Let) -> Mongo.LetDocument?
+    {
+        nil
+    }
+
     @inlinable public
     subscript(key:WhenMatched) -> Mongo.Pipeline?
     {

diff --git a/Sources/MongoQL/Commands/Aggregate/Mongo.Aggregate.swift b/Sources/MongoQL/Commands/Aggregate/Mongo.Aggregate.swift
@@ -215,21 +215,24 @@ extension Mongo.Aggregate
 extension Mongo.Aggregate
 {
     @frozen public
-    enum Let:String, Hashable, Sendable
+    enum Let:String, Sendable
     {
         case `let`
     }
 
     @inlinable public
-    subscript(key:Let) -> Mongo.LetDocument?
+    subscript(key:Let, yield:(inout Mongo.LetEncoder) -> ()) -> Void
     {
-        get
+        mutating get
         {
-            nil
-        }
-        set(value)
-        {
-            value?.encode(to: &self.fields[with: key])
+            yield(&self.fields[with: key][as: Mongo.LetEncoder.self])
         }
     }
+
+    @available(*, unavailable)
+    @inlinable public
+    subscript(key:Let) -> Mongo.LetDocument?
+    {
+        nil
+    }
 }
diff --git a/Sources/MongoQL/Commands/Delete/Mongo.Delete.swift b/Sources/MongoQL/Commands/Delete/Mongo.Delete.swift
@@ -92,21 +92,24 @@ extension Mongo.Delete
 extension Mongo.Delete
 {
     @frozen public
-    enum Let:String, Equatable, Hashable, Sendable
+    enum Let:String, Sendable
     {
         case `let`
     }
 
     @inlinable public
-    subscript(key:Let) -> Mongo.LetDocument?
+    subscript(key:Let, yield:(inout Mongo.LetEncoder) -> ()) -> Void
     {
-        get
-        {
-            nil
-        }
-        set(value)
+        mutating get
         {
-            value?.encode(to: &self.fields[with: key])
+            yield(&self.fields[with: key][as: Mongo.LetEncoder.self])
         }
     }
+
+    @available(*, unavailable)
+    @inlinable public
+    subscript(key:Let) -> Mongo.LetDocument?
+    {
+        nil
+    }
 }
diff --git a/Sources/MongoQL/Commands/Find/Mongo.Find.swift b/Sources/MongoQL/Commands/Find/Mongo.Find.swift
@@ -226,23 +226,26 @@ extension Mongo.Find
 extension Mongo.Find
 {
     @frozen public
-    enum Let:String, Hashable, Sendable
+    enum Let:String, Sendable
     {
         case `let`
     }
 
     @inlinable public
-    subscript(key:Let) -> Mongo.LetDocument?
+    subscript(key:Let, yield:(inout Mongo.LetEncoder) -> ()) -> Void
     {
-        get
+        mutating get
         {
-            nil
-        }
-        set(value)
-        {
-            value?.encode(to: &self.fields[with: key])
+            yield(&self.fields[with: key][as: Mongo.LetEncoder.self])
         }
     }
+
+    @available(*, unavailable)
+    @inlinable public
+    subscript(key:Let) -> Mongo.LetDocument?
+    {
+        nil
+    }
 }
 extension Mongo.Find
 {

diff --git a/Sources/MongoQL/Commands/FindAndModify/Mongo.FindAndModify.swift b/Sources/MongoQL/Commands/FindAndModify/Mongo.FindAndModify.swift
@@ -177,23 +177,26 @@ extension Mongo.FindAndModify
 extension Mongo.FindAndModify
 {
     @frozen public
-    enum Let:String, Hashable, Sendable
+    enum Let:String, Sendable
     {
         case `let`
     }
 
     @inlinable public
-    subscript(key:Let) -> Mongo.LetDocument?
+    subscript(key:Let, yield:(inout Mongo.LetEncoder) -> ()) -> Void
     {
-        get
+        mutating get
         {
-            nil
-        }
-        set(value)
-        {
-            value?.encode(to: &self.fields[with: key])
+            yield(&self.fields[with: key][as: Mongo.LetEncoder.self])
         }
     }
+
+    @available(*, unavailable)
+    @inlinable public
+    subscript(key:Let) -> Mongo.LetDocument?
+    {
+        nil
+    }
 }
 extension Mongo.FindAndModify
 {

diff --git a/Sources/MongoQL/Commands/Update/Mongo.Update.swift b/Sources/MongoQL/Commands/Update/Mongo.Update.swift
@@ -96,21 +96,24 @@ extension Mongo.Update
 extension Mongo.Update
 {
     @frozen public
-    enum Let:String, Hashable, Sendable
+    enum Let:String, Sendable
     {
         case `let`
     }
 
     @inlinable public
-    subscript(key:Let) -> Mongo.LetDocument?
+    subscript(key:Let, yield:(inout Mongo.LetEncoder) -> ()) -> Void
     {
-        get
-        {
-            nil
-        }
-        set(value)
+        mutating get
         {
-            value?.encode(to: &self.fields[with: key])
+            yield(&self.fields[with: key][as: Mongo.LetEncoder.self])
         }
     }
+
+    @available(*, unavailable)
+    @inlinable public
+    subscript(key:Let) -> Mongo.LetDocument?
+    {
+        nil
+    }
 }
diff --git a/Sources/MongoQL/Commands/Update/Mongo.UpdateStatementEncoder.swift b/Sources/MongoQL/Commands/Update/Mongo.UpdateStatementEncoder.swift
@@ -46,11 +46,20 @@ extension Mongo.UpdateStatementEncoder
         case c
     }
 
+    @inlinable public
+    subscript(key:C, yield:(inout Mongo.LetEncoder) -> ()) -> Void
+    {
+        mutating get
+        {
+            yield(&self.bson[with: key][as: Mongo.LetEncoder.self])
+        }
+    }
+
+    @available(*, unavailable)
     @inlinable public
     subscript(key:C) -> Mongo.LetDocument?
     {
-        get { nil }
-        set (value) { value?.encode(to: &self.bson[with: key]) }
+        nil
     }
 }
 extension Mongo.UpdateStatementEncoder