Skip to content

Fix issue where struct associated values in enums couldn't be encoded/decoded automatically #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ben-p-commits wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix issue where struct associated values in enums couldn't be encoded/decoded automatically #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9456eb0
Fix issue where struct associated values in enums couldnt be encoded/…
ben-p-commits Feb 16, 2026
718be54
clean up junk comments
ben-p-commits Feb 16, 2026
d1ae692
more comment tidying
ben-p-commits Feb 16, 2026
fa441e3
move test case types for associated value enums up to class scope to …
ben-p-commits Feb 17, 2026
75bd7b4
Merge branch 'main' into associated-struct-in-enum-case-codable-issue
ben-p-commits Feb 19, 2026
c69e508
Revert "move test case types for associated value enums up to class s…
ben-p-commits Feb 19, 2026
a2eb807
Merge branch 'main' into associated-struct-in-enum-case-codable-issue
ben-p-commits Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/Automerge/Codable/Encoding/AutomergeKeyedEncodingContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ struct AutomergeKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProt
guard let objectId = objectId else {
throw reportBestError()
}
let newPath = impl.codingPath + [key]
let newPath = codingPath + [key]
// this is where we need to figure out what the encodable type is in order to create
// the correct Automerge objectType underneath the covers.
// For example - for encoding another struct, class, or dict - we'd want to make it .map,
Expand Down Expand Up @@ -397,7 +397,7 @@ struct AutomergeKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProt
mutating func nestedContainer<NestedKey>(keyedBy _: NestedKey.Type, forKey key: Self.Key) ->
KeyedEncodingContainer<NestedKey> where NestedKey: CodingKey
{
let newPath = impl.codingPath + [key]
let newPath = codingPath + [key]
let nestedContainer = AutomergeKeyedEncodingContainer<NestedKey>(
impl: impl,
codingPath: newPath,
Expand All @@ -407,7 +407,7 @@ struct AutomergeKeyedEncodingContainer<K: CodingKey>: KeyedEncodingContainerProt
}

mutating func nestedUnkeyedContainer(forKey key: Self.Key) -> UnkeyedEncodingContainer {
let newPath = impl.codingPath + [key]
let newPath = codingPath + [key]
let nestedContainer = AutomergeUnkeyedEncodingContainer(
impl: impl,
codingPath: newPath,
Expand Down
6 changes: 3 additions & 3 deletions Sources/Automerge/Codable/Encoding/AutomergeUnkeyedEncodingContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ struct AutomergeUnkeyedEncodingContainer: UnkeyedEncodingContainer {
}
impl.highestUnkeyedIndexWritten = UInt64(count)
default:
let newPath = impl.codingPath + [AnyCodingKey(UInt64(count))]
let newPath = codingPath + [AnyCodingKey(UInt64(count))]
let newEncoder = AutomergeEncoderImpl(
userInfo: impl.userInfo,
codingPath: newPath,
Expand Down Expand Up @@ -220,7 +220,7 @@ struct AutomergeUnkeyedEncodingContainer: UnkeyedEncodingContainer {
mutating func nestedContainer<NestedKey>(keyedBy _: NestedKey.Type) ->
KeyedEncodingContainer<NestedKey> where NestedKey: CodingKey
{
let newPath = impl.codingPath + [AnyCodingKey(UInt64(count))]
let newPath = codingPath + [AnyCodingKey(UInt64(count))]
let nestedContainer = AutomergeKeyedEncodingContainer<NestedKey>(
impl: impl,
codingPath: newPath,
Expand All @@ -230,7 +230,7 @@ struct AutomergeUnkeyedEncodingContainer: UnkeyedEncodingContainer {
}

mutating func nestedUnkeyedContainer() -> UnkeyedEncodingContainer {
let newPath = impl.codingPath + [AnyCodingKey(UInt64(count))]
let newPath = codingPath + [AnyCodingKey(UInt64(count))]
let nestedContainer = AutomergeUnkeyedEncodingContainer(
impl: impl,
codingPath: newPath,
Expand Down
Loading
Loading