Skip to content

Commit 91c979b

Browse files
tayloraswifttayloraswift
committed
upgrade swift-bson
1 parent 31819ff commit 91c979b

19 files changed

+51
-57
lines changed

‎Package.resolved

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,19 @@ let package:Package = .init(
7979
],
8080
dependencies: [
8181
.package(url: "https://github.com/tayloraswift/swift-bson", .upToNextMinor(
82-
from: "0.8.0")),
82+
from: "0.9.0")),
8383
.package(url: "https://github.com/tayloraswift/swift-dom", .upToNextMinor(
8484
from: "1.1.0")),
8585
.package(url: "https://github.com/tayloraswift/swift-grammar", .upToNextMinor(
8686
from: "0.4.0")),
8787
.package(url: "https://github.com/tayloraswift/swift-hash", .upToNextMinor(
8888
from: "0.7.1")),
8989
.package(url: "https://github.com/tayloraswift/swift-ip", .upToNextMinor(
90-
from: "0.3.1")),
90+
from: "0.3.2")),
9191
.package(url: "https://github.com/tayloraswift/swift-json", .upToNextMinor(
9292
from: "1.1.0")),
9393
.package(url: "https://github.com/tayloraswift/swift-mongodb", .upToNextMinor(
94-
from: "0.29.0")),
94+
from: "0.29.1")),
9595
.package(url: "https://github.com/tayloraswift/swift-png", .upToNextMinor(
9696
from: "4.4.8")),
9797
.package(url: "https://github.com/tayloraswift/swift-ucf", .upToNextMinor(

‎Sources/SymbolGraphs/Declarations/Availability (ext).swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import Availability
22
import BSON
33

4-
extension Availability:BSONDocumentDecodable
4+
extension Availability:BSONKeyspaceDecodable
55
{
66
@inlinable public
7-
init(bson:BSON.DocumentDecoder<CodingKey>) throws
7+
init(bson:consuming BSON.KeyspaceDecoder<CodingKey>) throws
88
{
99
self.init()
1010

11-
for field:BSON.FieldDecoder<CodingKey> in bson
11+
while let field:BSON.FieldDecoder<CodingKey> = try bson[+]
1212
{
1313
switch field.key.domain
1414
{

‎Sources/SymbolGraphs/Declarations/Availability.CodingKey.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import Availability
2+
import BSON
23

34
extension Availability
45
{
56
/// Represents an ``Availability.AnyDomain`` in the BSON ABI. This has a
67
/// single-character raw value, for storage efficiency, and is not intended
78
/// to be human-readable.
89
@frozen public
9-
struct CodingKey:Equatable, Hashable, Sendable
10+
struct CodingKey:BSON.Keyspace
1011
{
1112
public
1213
let domain:AnyDomain

‎Sources/SymbolGraphs/Metadata/SHA1 (ext).swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extension SHA1:@retroactive BSONBinaryDecodable
2222
}
2323
else
2424
{
25-
throw BSON.ShapeError.init(invalid: bson.bytes.count, expected: .length(20))
25+
throw BSON.BinaryShapeError.init(invalid: bson.bytes.count, expected: .size(20))
2626
}
2727
}
2828
}

‎Sources/UnidocDB/Editions/Unidoc.EditionPlacementQuery.swift

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ extension Unidoc.EditionPlacementQuery:Mongo.PipelineQuery
4545
$0[Unidoc.EditionMetadata[.name]] = refname
4646
}
4747

48-
$0[stage: .replaceWith] = .init
48+
$0[stage: .replaceWith, using: Unidoc.EditionPlacement.CodingKey.self]
4949
{
50-
$0[Unidoc.EditionPlacement[.edition]] = Mongo.Pipeline.ROOT
50+
$0[.edition] = Mongo.Pipeline.ROOT
5151
}
5252
}
5353
$0[new]
@@ -59,12 +59,9 @@ extension Unidoc.EditionPlacementQuery:Mongo.PipelineQuery
5959

6060
$0[stage: .limit] = 1
6161

62-
$0[stage: .replaceWith] = .init
62+
$0[stage: .replaceWith, using: Unidoc.EditionPlacement.CodingKey.self]
6363
{
64-
$0[Unidoc.EditionPlacement[.coordinate]] = .expr
65-
{
66-
$0[.add] = (Unidoc.EditionMetadata[.version], 1)
67-
}
64+
$0[.coordinate] { $0[.add] = (Unidoc.EditionMetadata[.version], 1) }
6865
}
6966
}
7067
}

‎Sources/UnidocDB/Packages/Unidoc.AutoincrementQuery.swift

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ extension Unidoc.AutoincrementQuery:Mongo.PipelineQuery
3333
{
3434
$0[Aliases.Element[.id]] = self.symbol
3535
}
36-
pipeline[stage: .replaceWith] = .init
36+
pipeline[stage: .replaceWith, using: Output.CodingKey.self]
3737
{
38-
$0[Output[.id]] = Aliases.Element[.coordinate]
38+
$0[.id] = Aliases.Element[.coordinate]
3939
}
4040
pipeline[stage: .lookup]
4141
{
@@ -58,12 +58,9 @@ extension Unidoc.AutoincrementQuery:Mongo.PipelineQuery
5858

5959
$0[stage: .limit] = 1
6060

61-
$0[stage: .replaceWith] = .init
61+
$0[stage: .replaceWith, using: Output.CodingKey.self]
6262
{
63-
$0[Output[.id]] = .expr
64-
{
65-
$0[.add] = (Aliases.Element[.coordinate], 1)
66-
}
63+
$0[.id] { $0[.add] = (Aliases.Element[.coordinate], 1) }
6764
}
6865
}
6966
}

‎Sources/UnidocDB/Sitemaps/Unidoc.SitemapIndexQuery.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ extension Unidoc.SitemapIndexQuery:Mongo.PipelineQuery
3333

3434
pipeline[stage: .unwind] = Unidoc.SitemapIndexEntry[.symbol]
3535

36-
pipeline[stage: .replaceWith] = .init
36+
pipeline[stage: .replaceWith, using: Unidoc.SitemapIndexEntry.CodingKey.self]
3737
{
38-
$0[Unidoc.SitemapIndexEntry[.modified]] = Unidoc.Sitemap[.modified]
39-
$0[Unidoc.SitemapIndexEntry[.symbol]] =
40-
Unidoc.SitemapIndexEntry[.symbol] / Unidoc.PackageMetadata[.symbol]
38+
$0[.modified] = Unidoc.Sitemap[.modified]
39+
$0[.symbol] = Unidoc.SitemapIndexEntry[.symbol] / Unidoc.PackageMetadata[.symbol]
4140
}
4241
}
4342
}

‎Sources/UnidocDB/Snapshots/Unidoc.PinDependenciesQuery.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extension Unidoc.PinDependenciesQuery:Mongo.PipelineQuery
6767
let patch:Mongo.AnyKeyPath = "_patch"
6868

6969
// We are only interested in the coordinate value stored in the alias documents.
70-
pipeline[stage: .replaceWith] = .init
70+
pipeline[stage: .replaceWith]
7171
{
7272
$0[Output[.package]] = Unidoc.PackageAlias[.id]
7373
$0[coordinate] = Unidoc.PackageAlias[.coordinate]

‎Sources/UnidocQueries/Activity/Unidoc.PackagesCrawledQuery.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ extension Unidoc.PackagesCrawledQuery:Mongo.PipelineQuery
4545
}
4646
}
4747

48-
pipeline[stage: .replaceWith] = .init
48+
pipeline[stage: .replaceWith, using: Date.CodingKey.self]
4949
{
50-
$0[Date[.window]] = Mongo.Pipeline.ROOT
50+
$0[.window] = Mongo.Pipeline.ROOT
5151
}
5252

5353
let count:Mongo.AnyKeyPath = "_count"

‎Sources/UnidocQueries/Mongo.PipelineEncoder (ext).swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ extension Mongo.PipelineEncoder
103103

104104
$0[stage: .limit] = limit
105105

106-
$0[stage: .replaceWith] = .init
106+
$0[stage: .replaceWith]
107107
{
108108
$0[edition] = Mongo.Pipeline.ROOT
109109
}
@@ -141,7 +141,7 @@ extension Mongo.PipelineEncoder
141141

142142
$0[stage: .limit] = limit
143143

144-
$0[stage: .replaceWith] = .init
144+
$0[stage: .replaceWith]
145145
{
146146
$0[edition] = Mongo.Pipeline.ROOT
147147
}
@@ -178,7 +178,7 @@ extension Mongo.PipelineEncoder
178178
$0[.foreignField] = Unidoc.Snapshot[.id]
179179
$0[.pipeline]
180180
{
181-
$0[stage: .replaceWith] = .init(Unidoc.VersionState.Graph.CodingKey.self)
181+
$0[stage: .replaceWith, using: Unidoc.VersionState.Graph.CodingKey.self]
182182
{
183183
$0[.id] = Unidoc.Snapshot[.id]
184184
$0[.inlineBytes] = .expr

‎Sources/UnidocQueries/Packages/Unidoc.PackagesQuery.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ extension Unidoc.PackagesQuery:Mongo.PipelineQuery
4343
{
4444
self.package.extend(pipeline: &pipeline)
4545

46-
pipeline[stage: .replaceWith] = .init
46+
pipeline[stage: .replaceWith, using: Unidoc.EditionOutput.CodingKey.self]
4747
{
48-
$0[Unidoc.EditionOutput[.package]] = Mongo.Pipeline.ROOT
48+
$0[.package] = Mongo.Pipeline.ROOT
4949
}
5050

5151
pipeline.loadEdition(matching: .latest(.release),

‎Sources/UnidocQueries/Packages/Unidoc.RealmQuery.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ extension Unidoc.RealmQuery:Unidoc.AliasingQuery
6969
$0[.foreignField] = Unidoc.PackageMetadata[.realm]
7070
$0[.pipeline]
7171
{
72-
$0[stage: .replaceWith] = .init
72+
$0[stage: .replaceWith, using: Unidoc.EditionOutput.CodingKey.self]
7373
{
74-
$0[Unidoc.EditionOutput[.package]] = Mongo.Pipeline.ROOT
74+
$0[.package] = Mongo.Pipeline.ROOT
7575
}
7676

7777
$0.loadEdition(matching: .latest(.release),

‎Sources/UnidocQueries/Users/Unidoc.UserPropertyQuery.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ extension Unidoc.UserPropertyQuery:Mongo.PipelineQuery
4848
{
4949
$0[.packages]
5050
{
51-
$0[stage: .replaceWith] = .init
51+
$0[stage: .replaceWith, using: Unidoc.EditionOutput.CodingKey.self]
5252
{
53-
$0[Unidoc.EditionOutput[.package]] = Mongo.Pipeline.ROOT
53+
$0[.package] = Mongo.Pipeline.ROOT
5454
}
5555

5656
$0.loadEdition(matching: .latest(.release),

‎Sources/UnidocQueries/Versions/Unidoc.RefStateDirectQuery.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extension Unidoc.RefStateDirectQuery:Mongo.PipelineQuery
3131
{
3232
$0[Unidoc.PackageMetadata[.id]] = self.package
3333
}
34-
pipeline[stage: .replaceWith] = .init(Unidoc.RefState.CodingKey.self)
34+
pipeline[stage: .replaceWith, using: Unidoc.RefState.CodingKey.self]
3535
{
3636
$0[.package] = Mongo.Pipeline.ROOT
3737
}
@@ -56,9 +56,9 @@ extension Unidoc.RefStateDirectQuery:Mongo.PipelineQuery
5656
$0[Unidoc.EditionMetadata[.id]] = id
5757
}
5858

59-
$0[stage: .replaceWith] = .init
59+
$0[stage: .replaceWith, using: Unidoc.VersionState.CodingKey.self]
6060
{
61-
$0[Unidoc.VersionState[.edition]] = Mongo.Pipeline.ROOT
61+
$0[.edition] = Mongo.Pipeline.ROOT
6262
}
6363

6464
$0.loadResources(associatedTo: Unidoc.VersionState[.edition] /

‎Sources/UnidocRecords/Search/MD5 (ext).swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extension MD5:@retroactive BSONBinaryDecodable
2323
}
2424
else
2525
{
26-
throw BSON.ShapeError.init(invalid: bson.bytes.count, expected: .length(16))
26+
throw BSON.BinaryShapeError.init(invalid: bson.bytes.count, expected: .size(16))
2727
}
2828
}
2929
}

‎Sources/UnidocRecords/Volumes/Stats/Unidoc.Stats.Coverage.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ extension Unidoc.Stats.Coverage:ExpressibleByDictionaryLiteral
3434
}
3535
extension Unidoc.Stats.Coverage:Unidoc.StatsCounters,
3636
BSONDocumentEncodable,
37-
BSONDocumentDecodable
37+
BSONKeyspaceDecodable
3838
{
3939
@frozen public
40-
enum CodingKey:String, Sendable, CaseIterable
40+
enum CodingKey:String, CaseIterable, BSON.Keyspace
4141
{
4242
case undocumented = "U"
4343
case indirect = "I"

‎Sources/UnidocRecords/Volumes/Stats/Unidoc.Stats.Decl.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ extension Unidoc.Stats.Decl:ExpressibleByDictionaryLiteral
149149
}
150150
extension Unidoc.Stats.Decl:Unidoc.StatsCounters,
151151
BSONDocumentEncodable,
152-
BSONDocumentDecodable
152+
BSONKeyspaceDecodable
153153
{
154154
@frozen public
155-
enum CodingKey:String, Sendable, CaseIterable
155+
enum CodingKey:String, CaseIterable, BSON.Keyspace
156156
{
157157
case typealiases = "T"
158158
case structures = "V"

‎Sources/UnidocRecords/Volumes/Stats/Unidoc.StatsCounters.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extension Unidoc
55
public
66
protocol StatsCounters:ExpressibleByDictionaryLiteral where Value == Never
77
{
8-
associatedtype CodingKey:RawRepresentable<String>, CaseIterable
8+
associatedtype CodingKey:BSON.Keyspace, CaseIterable
99

1010
static
1111
subscript(key:CodingKey) -> WritableKeyPath<Self, Int> { get }
@@ -34,13 +34,13 @@ extension Unidoc.StatsCounters where Self:BSONDocumentEncodable
3434
}
3535
}
3636
}
37-
extension Unidoc.StatsCounters where Self:BSONDocumentDecodable
37+
extension Unidoc.StatsCounters where Self:BSONKeyspaceDecodable
3838
{
3939
@inlinable public
40-
init(bson:BSON.DocumentDecoder<CodingKey>) throws
40+
init(bson:consuming BSON.KeyspaceDecoder<CodingKey>) throws
4141
{
4242
self = [:]
43-
for field:BSON.FieldDecoder<CodingKey> in bson
43+
while let field:BSON.FieldDecoder<CodingKey> = try bson[+]
4444
{
4545
self[keyPath: Self[field.key]] = try field.decode()
4646
}

0 commit comments

Comments
 (0)