Skip to content

Fix dictionary deserialization crash on $-prefixed keys #9983

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

Merged
haiyuazhang merged 3 commits into from
Mar 17, 2026
Merged

Fix dictionary deserialization crash on $-prefixed keys #9983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d57d08
Fix dictionary deserialization crash on $-prefixed keys
haiyuazhang Mar 10, 2026
03ff4cf
Add test for $-prefixed dictionary keys in example values
haiyuazhang Mar 10, 2026
4794b7f
Merge branch 'main' into fix/dollar-prefix-dictionary-deserialization
haiyuazhang Mar 17, 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
31 changes: 31 additions & 0 deletions ...crosoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/Utf8JsonReaderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,37 @@ public static bool TryReadComplexType<T>(this ref Utf8JsonReader reader, string
return true;
}

public static bool TryReadComplexType<T>(this ref Utf8JsonReader reader, string propertyName, JsonSerializerOptions options, ref IReadOnlyDictionary<string, T>? value)
{
if (reader.TokenType != JsonTokenType.PropertyName)
{
throw new JsonException();
}

if (reader.GetString() != propertyName)
{
return false;
}

reader.Read();
if (reader.TokenType != JsonTokenType.StartObject)
{
throw new JsonException();
}
reader.Read();
var result = new Dictionary<string, T>();
while (reader.TokenType != JsonTokenType.EndObject)
{
var key = reader.GetString() ?? throw new JsonException("Dictionary key cannot be null");
reader.Read();
var item = reader.ReadWithConverter<T>(options);
result[key] = item ?? throw new JsonException();
}
reader.Read();
value = result;
return true;
}

public static T? ReadWithConverter<T>(this ref Utf8JsonReader reader, JsonSerializerOptions options)
{
var converter = (JsonConverter<T>)options.GetConverter(typeof(T));
Expand Down
8 changes: 8 additions & 0 deletions .../test/TestData/TypeSpecInputExampleConverterTests/LoadOperationExamples/tspCodeModel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6080,6 +6080,14 @@
"$ref": "203"
},
"value": {
"$filter": {
"$id": "2000",
"kind": "string",
"type": {
"$ref": "209"
},
"value": "status eq 'Active'"
},
"description": {
"$id": "471",
"kind": "string",
Expand Down
1 change: 1 addition & 0 deletions ...p/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputExampleConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ static void AssertStorageTaskClientExample(InputClient client)
{ "location", "westus" },
{ "properties.description", "My Storage task" },
{ "properties.enabled", true },
{ "properties.$filter", "status eq 'Active'" },
{ "properties.action.if.condition", "[[equals(AccessTier, 'Cool')]]" },
{ "properties.action.if.operations[0].name", "SetBlobTier" },
{ "properties.action.if.operations[0].onFailure", "break" },
Expand Down
Loading