Merge pull request #395 from tayloraswift/keeping-up-with-the-kardashians

track updates to swift-bson and swift-nio

Author: tayloraswift

Package.resolved

@@ -79,7 +79,7 @@ let package:Package = .init(
     ],
     dependencies: [
         .package(url: "https://github.com/tayloraswift/swift-bson", .upToNextMinor(
-            from: "0.6.0")),
+            from: "0.8.0")),
         .package(url: "https://github.com/tayloraswift/swift-dom", .upToNextMinor(
             from: "1.1.0")),
         .package(url: "https://github.com/tayloraswift/swift-grammar", .upToNextMinor(
@@ -91,7 +91,7 @@ let package:Package = .init(
         .package(url: "https://github.com/tayloraswift/swift-json", .upToNextMinor(
             from: "1.1.0")),
         .package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
-            from: "0.28.3")),
+            from: "0.29.0")),
         .package(url: "https://github.com/tayloraswift/swift-png", .upToNextMinor(
             from: "4.4.8")),
         .package(url: "https://github.com/tayloraswift/swift-ucf", .upToNextMinor(

Package.swift

@@ -9,7 +9,7 @@ extension BSON
     /// To defend against SQL injection, the `Key` type should never be allowed to contain null
     /// bytes.
     @frozen public
-    struct HomogenousFields<Key, Value> where Key:RawRepresentable<String>, Key:Sendable
+    struct HomogenousFields<Key, Value> where Key:Keyspace
     {
         public
         let ordered:[(key:Key, value:Value)]
@@ -40,21 +40,15 @@ extension BSON.HomogenousFields:ExpressibleByDictionaryLiteral
         self.init(ordered: dictionaryLiteral)
     }
 }
-extension BSON.HomogenousFields:BSONDecodable where Value:BSONDecodable
+extension BSON.HomogenousFields:BSONDecodable, BSONKeyspaceDecodable where Value:BSONDecodable
 {
     @inlinable public
-    init(bson:BSON.AnyValue) throws
-    {
-        try self.init(bson: try .init(bson: consume bson))
-    }
-    @inlinable public
-    init(bson:BSON.Document) throws
+    init(bson:consuming BSON.KeyspaceDecoder<Key>) throws
     {
         var ordered:[(key:Key, value:Value)] = []
-        try bson.parse
+        while let field:BSON.FieldDecoder<Key> = try bson[+]
         {
-            let field:BSON.FieldDecoder<Key> = .init(key: $0, value: $1)
-            ordered.append(($0, try field.decode(to: Value.self)))
+            ordered.append((field.key, try field.decode(to: Value.self)))
         }
         self.init(ordered: ordered)
     }

Sources/UnidocRecords/BSON.HomogenousFields.swift

@@ -100,8 +100,9 @@ extension Unidoc.Outline:BSONDocumentDecodable
             /// Note: need to handle legacy array encoding
             let id:Unidoc.Scalar? = try bson[.scalar]?.decode() ?? bson[.scalars]?.decode
             {
-                try $0.shape.expect(length: 1)
-                return try $0[0].decode()
+                let first:Unidoc.Scalar = try $0[+].decode()
+                try $0[+]?.decode(to: Never.self)
+                return first
             }
             if  let id:Unidoc.Scalar
             {

Sources/UnidocRecords/Volumes/Passages/Unidoc.Outline.swift

@@ -1,3 +1,5 @@
+import BSON
+
 extension Unidoc.Census
 {
     @frozen public
@@ -57,3 +59,6 @@ extension Unidoc.Census.Interface:RawRepresentable
         }
     }
 }
+extension Unidoc.Census.Interface:BSON.Keyspace
+{
+}

Sources/UnidocRecords/Volumes/Stats/Unidoc.Census.Interface.swift

@@ -9,7 +9,7 @@ extension Mongo.DriverBootstrap
     {
         MongoDB / ["unidoc-mongod"] /?
         {
-            $0.executors = .shared(MultiThreadedEventLoopGroup.singleton)
+            $0.executors = MultiThreadedEventLoopGroup.singleton
             $0.appname = "example app"
         }
     }

Sources/UnidocTesting/Mongo.DriverBootstrap (ext).swift

@@ -53,7 +53,7 @@ extension Main:AsyncParsableCommand
 
         let mongodb:Mongo.DriverBootstrap = MongoDB / [self.db.mongod] /?
         {
-            $0.executors = .shared(MultiThreadedEventLoopGroup.singleton)
+            $0.executors = MultiThreadedEventLoopGroup.singleton
             $0.appname = "unidoc-linkerd"
 
             $0.connectionTimeout = .milliseconds(5_000)

Sources/unidoc-linkerd/Main.swift

@@ -81,7 +81,7 @@ extension Unidoc.PreviewCommand:AsyncParsableCommand
 
         let mongodb:Mongo.DriverBootstrap = MongoDB / [self.db.mongod] /?
         {
-            $0.executors = .shared(MultiThreadedEventLoopGroup.singleton)
+            $0.executors = MultiThreadedEventLoopGroup.singleton
             $0.appname = "Unidoc Preview"
 
             $0.connectionTimeout = .milliseconds(5_000)