tayloraswift · tayloraswift · Jan 15, 2025 · Jan 15, 2025
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -79,19 +79,19 @@ let package:Package = .init(
  ],
  dependencies: [
  .package(url: "https://github.com/tayloraswift/swift-bson", .upToNextMinor(
- from: "0.8.0")),
+ from: "0.9.0")),
  .package(url: "https://github.com/tayloraswift/swift-dom", .upToNextMinor(
  from: "1.1.0")),
  .package(url: "https://github.com/tayloraswift/swift-grammar", .upToNextMinor(
  from: "0.4.0")),
  .package(url: "https://github.com/tayloraswift/swift-hash", .upToNextMinor(
  from: "0.7.1")),
  .package(url: "https://github.com/tayloraswift/swift-ip", .upToNextMinor(
- from: "0.3.1")),
+ from: "0.3.2")),
  .package(url: "https://github.com/tayloraswift/swift-json", .upToNextMinor(
  from: "1.1.0")),
  .package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
- from: "0.29.0")),
+ from: "0.29.1")),
  .package(url: "https://github.com/tayloraswift/swift-png", .upToNextMinor(
  from: "4.4.8")),
  .package(url: "https://github.com/tayloraswift/swift-ucf", .upToNextMinor(

diff --git a/Sources/SymbolGraphs/Declarations/Availability (ext).swift b/Sources/SymbolGraphs/Declarations/Availability (ext).swift
@@ -1,14 +1,14 @@
 import Availability
 import BSON
 
-extension Availability:BSONDocumentDecodable
+extension Availability:BSONKeyspaceDecodable
 {
  @inlinable public
- init(bson:BSON.DocumentDecoder<CodingKey>) throws
+ init(bson:consuming BSON.KeyspaceDecoder<CodingKey>) throws
  {
  self.init()
 
- for field:BSON.FieldDecoder<CodingKey> in bson
+ while let field:BSON.FieldDecoder<CodingKey> = try bson[+]
  {
  switch field.key.domain
  {

diff --git a/Sources/SymbolGraphs/Declarations/Availability.CodingKey.swift b/Sources/SymbolGraphs/Declarations/Availability.CodingKey.swift
@@ -1,12 +1,13 @@
 import Availability
+import BSON
 
 extension Availability
 {
  /// Represents an ``Availability.AnyDomain`` in the BSON ABI. This has a
  /// single-character raw value, for storage efficiency, and is not intended
  /// to be human-readable.
  @frozen public
- struct CodingKey:Equatable, Hashable, Sendable
+ struct CodingKey:BSON.Keyspace
  {
  public
  let domain:AnyDomain

diff --git a/Sources/SymbolGraphs/Metadata/SHA1 (ext).swift b/Sources/SymbolGraphs/Metadata/SHA1 (ext).swift
@@ -22,7 +22,7 @@ extension SHA1:@retroactive BSONBinaryDecodable
  }
  else
  {
- throw BSON.ShapeError.init(invalid: bson.bytes.count, expected: .length(20))
+ throw BSON.BinaryShapeError.init(invalid: bson.bytes.count, expected: .size(20))
  }
  }
 }
diff --git a/Sources/UnidocDB/Editions/Unidoc.EditionPlacementQuery.swift b/Sources/UnidocDB/Editions/Unidoc.EditionPlacementQuery.swift
@@ -45,9 +45,9 @@ extension Unidoc.EditionPlacementQuery:Mongo.PipelineQuery
  $0[Unidoc.EditionMetadata[.name]] = refname
  }
 
- $0[stage: .replaceWith] = .init
+ $0[stage: .replaceWith, using: Unidoc.EditionPlacement.CodingKey.self]
  {
- $0[Unidoc.EditionPlacement[.edition]] = Mongo.Pipeline.ROOT
+ $0[.edition] = Mongo.Pipeline.ROOT
  }
  }
  $0[new]
@@ -59,12 +59,9 @@ extension Unidoc.EditionPlacementQuery:Mongo.PipelineQuery
 
  $0[stage: .limit] = 1
 
- $0[stage: .replaceWith] = .init
+ $0[stage: .replaceWith, using: Unidoc.EditionPlacement.CodingKey.self]
  {
- $0[Unidoc.EditionPlacement[.coordinate]] = .expr
- {
- $0[.add] = (Unidoc.EditionMetadata[.version], 1)
- }
+ $0[.coordinate] { $0[.add] = (Unidoc.EditionMetadata[.version], 1) }
  }
  }
  }

diff --git a/Sources/UnidocDB/Packages/Unidoc.AutoincrementQuery.swift b/Sources/UnidocDB/Packages/Unidoc.AutoincrementQuery.swift
@@ -33,9 +33,9 @@ extension Unidoc.AutoincrementQuery:Mongo.PipelineQuery
  {
  $0[Aliases.Element[.id]] = self.symbol
  }
- pipeline[stage: .replaceWith] = .init
+ pipeline[stage: .replaceWith, using: Output.CodingKey.self]
  {
- $0[Output[.id]] = Aliases.Element[.coordinate]
+ $0[.id] = Aliases.Element[.coordinate]
  }
  pipeline[stage: .lookup]
  {
@@ -58,12 +58,9 @@ extension Unidoc.AutoincrementQuery:Mongo.PipelineQuery
 
  $0[stage: .limit] = 1
 
- $0[stage: .replaceWith] = .init
+ $0[stage: .replaceWith, using: Output.CodingKey.self]
  {
- $0[Output[.id]] = .expr
- {
- $0[.add] = (Aliases.Element[.coordinate], 1)
- }
+ $0[.id] { $0[.add] = (Aliases.Element[.coordinate], 1) }
  }
  }
  }

diff --git a/Sources/UnidocDB/Sitemaps/Unidoc.SitemapIndexQuery.swift b/Sources/UnidocDB/Sitemaps/Unidoc.SitemapIndexQuery.swift
@@ -33,11 +33,10 @@ extension Unidoc.SitemapIndexQuery:Mongo.PipelineQuery
 
  pipeline[stage: .unwind] = Unidoc.SitemapIndexEntry[.symbol]
 
- pipeline[stage: .replaceWith] = .init
+ pipeline[stage: .replaceWith, using: Unidoc.SitemapIndexEntry.CodingKey.self]
  {
- $0[Unidoc.SitemapIndexEntry[.modified]] = Unidoc.Sitemap[.modified]
- $0[Unidoc.SitemapIndexEntry[.symbol]] =
- Unidoc.SitemapIndexEntry[.symbol] / Unidoc.PackageMetadata[.symbol]
+ $0[.modified] = Unidoc.Sitemap[.modified]
+ $0[.symbol] = Unidoc.SitemapIndexEntry[.symbol] / Unidoc.PackageMetadata[.symbol]
  }
  }
 }
diff --git a/Sources/UnidocDB/Snapshots/Unidoc.PinDependenciesQuery.swift b/Sources/UnidocDB/Snapshots/Unidoc.PinDependenciesQuery.swift
@@ -67,7 +67,7 @@ extension Unidoc.PinDependenciesQuery:Mongo.PipelineQuery
  let patch:Mongo.AnyKeyPath = "_patch"
 
  // We are only interested in the coordinate value stored in the alias documents.
- pipeline[stage: .replaceWith] = .init
+ pipeline[stage: .replaceWith]
  {
  $0[Output[.package]] = Unidoc.PackageAlias[.id]
  $0[coordinate] = Unidoc.PackageAlias[.coordinate]

diff --git a/Sources/UnidocQueries/Activity/Unidoc.PackagesCrawledQuery.swift b/Sources/UnidocQueries/Activity/Unidoc.PackagesCrawledQuery.swift
@@ -45,9 +45,9 @@ extension Unidoc.PackagesCrawledQuery:Mongo.PipelineQuery
  }
  }
 
- pipeline[stage: .replaceWith] = .init
+ pipeline[stage: .replaceWith, using: Date.CodingKey.self]
  {
- $0[Date[.window]] = Mongo.Pipeline.ROOT
+ $0[.window] = Mongo.Pipeline.ROOT
  }
 
  let count:Mongo.AnyKeyPath = "_count"

diff --git a/Sources/UnidocQueries/Mongo.PipelineEncoder (ext).swift b/Sources/UnidocQueries/Mongo.PipelineEncoder (ext).swift
@@ -103,7 +103,7 @@ extension Mongo.PipelineEncoder
 
  $0[stage: .limit] = limit
 
- $0[stage: .replaceWith] = .init
+ $0[stage: .replaceWith]
  {
  $0[edition] = Mongo.Pipeline.ROOT
  }
@@ -141,7 +141,7 @@ extension Mongo.PipelineEncoder
 
  $0[stage: .limit] = limit
 
- $0[stage: .replaceWith] = .init
+ $0[stage: .replaceWith]
  {
  $0[edition] = Mongo.Pipeline.ROOT
  }
@@ -178,7 +178,7 @@ extension Mongo.PipelineEncoder
  $0[.foreignField] = Unidoc.Snapshot[.id]
  $0[.pipeline]
  {
- $0[stage: .replaceWith] = .init(Unidoc.VersionState.Graph.CodingKey.self)
+ $0[stage: .replaceWith, using: Unidoc.VersionState.Graph.CodingKey.self]
  {
  $0[.id] = Unidoc.Snapshot[.id]
  $0[.inlineBytes] = .expr

diff --git a/Sources/UnidocQueries/Packages/Unidoc.PackagesQuery.swift b/Sources/UnidocQueries/Packages/Unidoc.PackagesQuery.swift
@@ -43,9 +43,9 @@ extension Unidoc.PackagesQuery:Mongo.PipelineQuery
  {
  self.package.extend(pipeline: &pipeline)
 
- pipeline[stage: .replaceWith] = .init
+ pipeline[stage: .replaceWith, using: Unidoc.EditionOutput.CodingKey.self]
  {
- $0[Unidoc.EditionOutput[.package]] = Mongo.Pipeline.ROOT
+ $0[.package] = Mongo.Pipeline.ROOT
  }
 
  pipeline.loadEdition(matching: .latest(.release),

diff --git a/Sources/UnidocQueries/Packages/Unidoc.RealmQuery.swift b/Sources/UnidocQueries/Packages/Unidoc.RealmQuery.swift
@@ -69,9 +69,9 @@ extension Unidoc.RealmQuery:Unidoc.AliasingQuery
  $0[.foreignField] = Unidoc.PackageMetadata[.realm]
  $0[.pipeline]
  {
- $0[stage: .replaceWith] = .init
+ $0[stage: .replaceWith, using: Unidoc.EditionOutput.CodingKey.self]
  {
- $0[Unidoc.EditionOutput[.package]] = Mongo.Pipeline.ROOT
+ $0[.package] = Mongo.Pipeline.ROOT
  }
 
  $0.loadEdition(matching: .latest(.release),

diff --git a/Sources/UnidocQueries/Users/Unidoc.UserPropertyQuery.swift b/Sources/UnidocQueries/Users/Unidoc.UserPropertyQuery.swift
@@ -48,9 +48,9 @@ extension Unidoc.UserPropertyQuery:Mongo.PipelineQuery
  {
  $0[.packages]
  {
- $0[stage: .replaceWith] = .init
+ $0[stage: .replaceWith, using: Unidoc.EditionOutput.CodingKey.self]
  {
- $0[Unidoc.EditionOutput[.package]] = Mongo.Pipeline.ROOT
+ $0[.package] = Mongo.Pipeline.ROOT
  }
 
  $0.loadEdition(matching: .latest(.release),

diff --git a/Sources/UnidocQueries/Versions/Unidoc.RefStateDirectQuery.swift b/Sources/UnidocQueries/Versions/Unidoc.RefStateDirectQuery.swift
@@ -31,7 +31,7 @@ extension Unidoc.RefStateDirectQuery:Mongo.PipelineQuery
  {
  $0[Unidoc.PackageMetadata[.id]] = self.package
  }
- pipeline[stage: .replaceWith] = .init(Unidoc.RefState.CodingKey.self)
+ pipeline[stage: .replaceWith, using: Unidoc.RefState.CodingKey.self]
  {
  $0[.package] = Mongo.Pipeline.ROOT
  }
@@ -56,9 +56,9 @@ extension Unidoc.RefStateDirectQuery:Mongo.PipelineQuery
  $0[Unidoc.EditionMetadata[.id]] = id
  }
 
- $0[stage: .replaceWith] = .init
+ $0[stage: .replaceWith, using: Unidoc.VersionState.CodingKey.self]
  {
- $0[Unidoc.VersionState[.edition]] = Mongo.Pipeline.ROOT
+ $0[.edition] = Mongo.Pipeline.ROOT
  }
 
  $0.loadResources(associatedTo: Unidoc.VersionState[.edition] /

diff --git a/Sources/UnidocRecords/Search/MD5 (ext).swift b/Sources/UnidocRecords/Search/MD5 (ext).swift
@@ -23,7 +23,7 @@ extension MD5:@retroactive BSONBinaryDecodable
  }
  else
  {
- throw BSON.ShapeError.init(invalid: bson.bytes.count, expected: .length(16))
+ throw BSON.BinaryShapeError.init(invalid: bson.bytes.count, expected: .size(16))
  }
  }
 }
diff --git a/Sources/UnidocRecords/Volumes/Stats/Unidoc.Stats.Coverage.swift b/Sources/UnidocRecords/Volumes/Stats/Unidoc.Stats.Coverage.swift
@@ -34,10 +34,10 @@ extension Unidoc.Stats.Coverage:ExpressibleByDictionaryLiteral
 }
 extension Unidoc.Stats.Coverage:Unidoc.StatsCounters,
  BSONDocumentEncodable,
- BSONDocumentDecodable
+ BSONKeyspaceDecodable
 {
  @frozen public
- enum CodingKey:String, Sendable, CaseIterable
+ enum CodingKey:String, CaseIterable, BSON.Keyspace
  {
  case undocumented = "U"
  case indirect = "I"

diff --git a/Sources/UnidocRecords/Volumes/Stats/Unidoc.Stats.Decl.swift b/Sources/UnidocRecords/Volumes/Stats/Unidoc.Stats.Decl.swift
@@ -149,10 +149,10 @@ extension Unidoc.Stats.Decl:ExpressibleByDictionaryLiteral
 }
 extension Unidoc.Stats.Decl:Unidoc.StatsCounters,
  BSONDocumentEncodable,
- BSONDocumentDecodable
+ BSONKeyspaceDecodable
 {
  @frozen public
- enum CodingKey:String, Sendable, CaseIterable
+ enum CodingKey:String, CaseIterable, BSON.Keyspace
  {
  case typealiases = "T"
  case structures = "V"

diff --git a/Sources/UnidocRecords/Volumes/Stats/Unidoc.StatsCounters.swift b/Sources/UnidocRecords/Volumes/Stats/Unidoc.StatsCounters.swift
@@ -5,7 +5,7 @@ extension Unidoc
  public
  protocol StatsCounters:ExpressibleByDictionaryLiteral where Value == Never
  {
- associatedtype CodingKey:RawRepresentable<String>, CaseIterable
+ associatedtype CodingKey:BSON.Keyspace, CaseIterable
 
  static
  subscript(key:CodingKey) -> WritableKeyPath<Self, Int> { get }
@@ -34,13 +34,13 @@ extension Unidoc.StatsCounters where Self:BSONDocumentEncodable
  }
  }
 }
-extension Unidoc.StatsCounters where Self:BSONDocumentDecodable
+extension Unidoc.StatsCounters where Self:BSONKeyspaceDecodable
 {
  @inlinable public
- init(bson:BSON.DocumentDecoder<CodingKey>) throws
+ init(bson:consuming BSON.KeyspaceDecoder<CodingKey>) throws
  {
  self = [:]
- for field:BSON.FieldDecoder<CodingKey> in bson
+ while let field:BSON.FieldDecoder<CodingKey> = try bson[+]
  {
  self[keyPath: Self[field.key]] = try field.decode()
  }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ extension SHA1:@retroactive BSONBinaryDecodable @@
   }
   else
   {
-  throw BSON.ShapeError.init(invalid: bson.bytes.count, expected: .length(20))
+  throw BSON.BinaryShapeError.init(invalid: bson.bytes.count, expected: .size(20))
   }
   }
  }