Merge pull request #207 from P24L/fix-union-types-encoding

MasterJ93 · web-flow · commit 5ee0443e3701 · 2025-08-04T02:25:02.000-04:00
Fix: Add missing $type field to union type encoding across critical write operations
diff --git a/Sources/ATProtoKit/Models/Lexicons/app.bsky/Feed/AppBskyFeedPost.swift b/Sources/ATProtoKit/Models/Lexicons/app.bsky/Feed/AppBskyFeedPost.swift
@@ -217,19 +217,24 @@ extension AppBskyLexicon.Feed {
             }
 
             public func encode(to encoder: Encoder) throws {
-                var container = encoder.singleValueContainer()
+                var container = encoder.container(keyedBy: CodingKeys.self)
 
                 switch self {
                     case .images(let imagesValue):
-                        try container.encode(imagesValue)
+                        try container.encode("app.bsky.embed.images", forKey: .type)
+                        try imagesValue.encode(to: encoder)
                     case .video(let value):
-                        try container.encode(value)
+                        try container.encode("app.bsky.embed.video", forKey: .type)
+                        try value.encode(to: encoder)
                     case .external(let externalValue):
-                        try container.encode(externalValue)
+                        try container.encode("app.bsky.embed.external", forKey: .type)
+                        try externalValue.encode(to: encoder)
                     case .record(let recordValue):
-                        try container.encode(recordValue)
+                        try container.encode("app.bsky.embed.record", forKey: .type)
+                        try recordValue.encode(to: encoder)
                     case .recordWithMedia(let recordWithMediaValue):
-                        try container.encode(recordWithMediaValue)
+                        try container.encode("app.bsky.embed.recordWithMedia", forKey: .type)
+                        try recordWithMediaValue.encode(to: encoder)
                     default:
                         break
                 }
@@ -265,11 +270,12 @@ extension AppBskyLexicon.Feed {
             }
 
             public func encode(to encoder: Encoder) throws {
-                var container = encoder.singleValueContainer()
+                var container = encoder.container(keyedBy: CodingKeys.self)
 
                 switch self {
                     case .selfLabels(let value):
-                        try container.encode(value)
+                        try container.encode("com.atproto.label.defs#selfLabels", forKey: .type)
+                        try value.encode(to: encoder)
                     default:
                         break
                 }
diff --git a/Sources/ATProtoKit/Models/Lexicons/app.bsky/Feed/AppBskyFeedPostgate.swift b/Sources/ATProtoKit/Models/Lexicons/app.bsky/Feed/AppBskyFeedPostgate.swift
@@ -129,11 +129,12 @@ extension AppBskyLexicon.Feed {
             }
 
             public func encode(to encoder: Encoder) throws {
-                var container = encoder.singleValueContainer()
+                var container = encoder.container(keyedBy: CodingKeys.self)
 
                 switch self {
                     case .disabledRule(let disabledRule):
-                        try container.encode(disabledRule)
+                        try container.encode("app.bsky.feed.postgate#disableRule", forKey: .type)
+                        try disabledRule.encode(to: encoder)
                     default:
                         break
                 }
diff --git a/Sources/ATProtoKit/Models/Lexicons/app.bsky/Feed/AppBskyFeedThreadgate.swift b/Sources/ATProtoKit/Models/Lexicons/app.bsky/Feed/AppBskyFeedThreadgate.swift
@@ -186,17 +186,21 @@ extension AppBskyLexicon.Feed {
             }
 
             public func encode(to encoder: Encoder) throws {
-                var container = encoder.singleValueContainer()
+                var container = encoder.container(keyedBy: CodingKeys.self)
 
                 switch self {
                     case .mentionRule(let embedView):
-                        try container.encode(embedView)
+                        try container.encode("app.bsky.feed.threadgate#mentionRule", forKey: .type)
+                        try embedView.encode(to: encoder)
                     case .followerRule(let embedView):
-                        try container.encode(embedView)
+                        try container.encode("app.bsky.feed.threadgate#followerRule", forKey: .type)
+                        try embedView.encode(to: encoder)
                     case .followingRule(let embedView):
-                        try container.encode(embedView)
+                        try container.encode("app.bsky.feed.threadgate#followingRule", forKey: .type)
+                        try embedView.encode(to: encoder)
                     case .listRule(let embedView):
-                        try container.encode(embedView)
+                        try container.encode("app.bsky.feed.threadgate#listRule", forKey: .type)
+                        try embedView.encode(to: encoder)
                     default:
                         break
                 }
diff --git a/Sources/ATProtoKit/Models/Lexicons/app.bsky/Graph/AppBskyGraphList.swift b/Sources/ATProtoKit/Models/Lexicons/app.bsky/Graph/AppBskyGraphList.swift
@@ -131,11 +131,12 @@ extension AppBskyLexicon.Graph {
             }
 
             public func encode(to encoder: Encoder) throws {
-                var container = encoder.singleValueContainer()
+                var container = encoder.container(keyedBy: CodingKeys.self)
 
                 switch self {
                     case .selfLabels(let value):
-                        try container.encode(value)
+                        try container.encode("com.atproto.label.defs#selfLabels", forKey: .type)
+                        try value.encode(to: encoder)
                     default:
                         break
                 }
diff --git a/Sources/ATProtoKit/Models/Lexicons/com.atproto/Repo/ComAtprotoRepoApplyWrites.swift b/Sources/ATProtoKit/Models/Lexicons/com.atproto/Repo/ComAtprotoRepoApplyWrites.swift
@@ -249,15 +249,18 @@ extension ComAtprotoLexicon.Repository {
             }
 
             public func encode(to encoder: Encoder) throws {
-                var container = encoder.singleValueContainer()
+                var container = encoder.container(keyedBy: CodingKeys.self)
 
                 switch self {
                     case .create(let value):
-                        try container.encode(value)
+                        try container.encode("com.atproto.repo.applyWrites#create", forKey: .type)
+                        try value.encode(to: encoder)
                     case .update(let value):
-                        try container.encode(value)
+                        try container.encode("com.atproto.repo.applyWrites#update", forKey: .type)
+                        try value.encode(to: encoder)
                     case .delete(let value):
-                        try container.encode(value)
+                        try container.encode("com.atproto.repo.applyWrites#delete", forKey: .type)
+                        try value.encode(to: encoder)
                     default:
                         break
                 }
@@ -321,15 +324,18 @@ extension ComAtprotoLexicon.Repository {
             }
 
             public func encode(to encoder: any Encoder) throws {
-                var container = encoder.singleValueContainer()
+                var container = encoder.container(keyedBy: CodingKeys.self)
 
                 switch self {
                     case .createResult(let value):
-                        try container.encode(value)
+                        try container.encode("com.atproto.repo.applyWrites#createResult", forKey: .type)
+                        try value.encode(to: encoder)
                     case .updateResult(let value):
-                        try container.encode(value)
+                        try container.encode("com.atproto.repo.applyWrites#updateResult", forKey: .type)
+                        try value.encode(to: encoder)
                     case .deleteResult(let value):
-                        try container.encode(value)
+                        try container.encode("com.atproto.repo.applyWrites#deleteResult", forKey: .type)
+                        try value.encode(to: encoder)
                     default:
                         break
                 }

Original file line number	Diff line number	Diff line change
`@@ -129,11 +129,12 @@ extension AppBskyLexicon.Feed {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`public func encode(to encoder: Encoder) throws {`
`132`		`- var container = encoder.singleValueContainer()`
	`132`	`+ var container = encoder.container(keyedBy: CodingKeys.self)`
`133`	`133`
`134`	`134`	`switch self {`
`135`	`135`	`case .disabledRule(let disabledRule):`
`136`		`- try container.encode(disabledRule)`
	`136`	`+ try container.encode("app.bsky.feed.postgate#disableRule", forKey: .type)`
	`137`	`+ try disabledRule.encode(to: encoder)`
`137`	`138`	`default:`
`138`	`139`	`break`
`139`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,11 +131,12 @@ extension AppBskyLexicon.Graph {`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`public func encode(to encoder: Encoder) throws {`
`134`		`- var container = encoder.singleValueContainer()`
	`134`	`+ var container = encoder.container(keyedBy: CodingKeys.self)`
`135`	`135`
`136`	`136`	`switch self {`
`137`	`137`	`case .selfLabels(let value):`
`138`		`- try container.encode(value)`
	`138`	`+ try container.encode("com.atproto.label.defs#selfLabels", forKey: .type)`
	`139`	`+ try value.encode(to: encoder)`
`139`	`140`	`default:`
`140`	`141`	`break`
`141`	`142`	`}`