New JsonValue derived class for JSON primitives - #116798

Merged
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom
PranavSenthilnathan:jsonvalue-conversion
Jul 22, 2025
Merged

New JsonValue derived class for JSON primitives#116798
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom
PranavSenthilnathan:jsonvalue-conversion

Conversation

@PranavSenthilnathan

@PranavSenthilnathanPranavSenthilnathan commented Jun 18, 2025

Copy link
Copy Markdown
Member

Adds a new derived class that JsonValueConverter can use when the value is a primitive. Previously JsonElementOfValue was being used and more recently JsonValue. There are downsides with both. The JsonElement-backed class incurs overhead for the JsonDocument it needs to create and JsonValue does not allow common conversions in TryGet. The new class in this PR solves both by only storing necessary information and allowing conversions. It also preserves original escaping in WriteTo.

Fixes#116730

@PranavSenthilnathanPranavSenthilnathan added this to the 10.0.0 milestone Jun 18, 2025
CopilotAI review requested due to automatic review settings June 18, 2025 22:55
CopilotAI reviewed Jun 18, 2025
View reviewed changes

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR introduces a new JsonValueOfJsonPrimitive class to optimize handling of JSON primitive values by storing raw UTF-8 bytes and escaping info, refactors reader and converter logic to use it, and adds comprehensive tests for primitive behaviors and conversions.

  • Add JsonValueOfJsonPrimitive to store only needed data for primitives and preserve original escaping in WriteTo.
  • Update JsonValueConverter, JsonDocument, and Utf8JsonReader to delegate GUID parsing to a new JsonReaderHelper.TryGetValue helper.
  • Extend tests in JsonValueTests.cs to cover deserialization, TryGetValue, WriteTo, deep-cloning, and conversion for all primitive types using a new WrappedT<T> wrapper.

Reviewed Changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Show a summary per file
FileDescription
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.csAdded tests for primitive JSON values (string, bool, number), WriteTo, cloning, deep-equals, and conversion; introduced WrappedT<T> helper.
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Node/JsonValueConverter.csReplaced token-type switch with instantiation of JsonValueOfJsonPrimitive for primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.csReplaced inline GUID parsing logic with JsonReaderHelper.TryGetValue call.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.csAdded new overload TryGetValue(ReadOnlySpan<byte>, bool, out Guid) to centralize GUID parsing.
src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonValueOfJsonPrimitive.csNew internal sealed class implementing optimized storage and parsing for JSON primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.csSwitched inline GUID parsing in TryGetValue to JsonReaderHelper.TryGetValue.
src/libraries/System.Text.Json/src/System.Text.Json.csprojIncluded JsonValueOfJsonPrimitive.cs in project file.

Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs Outdated
@PranavSenthilnathan

PranavSenthilnathan commented Jun 18, 2025

Copy link
Copy Markdown
MemberAuthor

@eiriktsarpalis I can also take this PR one step further by adding separate derived classes for JSON string and numbers, and introducing the JsonNumber struct like we discussed offline.

@dotnet-policy-service

dotnet-policy-serviceBot commented Jun 18, 2025

Copy link
Copy Markdown
Contributor

Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis
See info in area-owners.md if you want to be subscribed.

This was referenced Jun 19, 2025
Closed
Open
Closed
This was referenced Jun 28, 2025
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
@PranavSenthilnathan

PranavSenthilnathan commented Jul 18, 2025

Copy link
Copy Markdown
MemberAuthor

Keeping this fix more targeted by matching the logic in JsonValueOfElement.

@build-analysisbuild-analysisBot mentioned this pull request Jul 18, 2025
Closed
This was referenced Jul 18, 2025
Open
Closed
Closed
eiriktsarpalis
eiriktsarpalis approved these changes Jul 22, 2025
View reviewed changes

@eiriktsarpaliseiriktsarpalis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@PranavSenthilnathan
PranavSenthilnathan enabled auto-merge (squash) July 22, 2025 07:38
@PranavSenthilnathan
PranavSenthilnathan merged commit 4ea1713 into dotnet:mainJul 22, 2025
83 of 87 checks passed
@PranavSenthilnathan

PranavSenthilnathan commented Jul 22, 2025

Copy link
Copy Markdown
MemberAuthor

/backport to release/10.0-preview7

@github-actions

github-actionsBot commented Jul 22, 2025

Copy link
Copy Markdown
Contributor

Started backporting to release/10.0-preview7: https://github.com/dotnet/runtime/actions/runs/16439281496

@github-actionsgithub-actionsBot mentioned this pull request Jul 22, 2025
Merged
4 tasks
@PranavSenthilnathanPranavSenthilnathan mentioned this pull request Jul 23, 2025
Closed
@LoopedBard3LoopedBard3 mentioned this pull request Jul 29, 2025
Closed
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 22, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

@PranavSenthilnathanPranavSenthilnathan

Labels

area-System.Text.Json

Projects

None yet

Milestone

10.0.0

3 participants

@PranavSenthilnathan@eiriktsarpalis
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
New JsonValue derived class for JSON primitives - #116798
Merged
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Jul 22, 2025
Merged
New JsonValue derived class for JSON primitives#116798
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Conversation
@PranavSenthilnathan
@PranavSenthilnathanPranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

Member
Adds a new derived class that JsonValueConverter can use when the value is a primitive. Previously JsonElementOfValue was being used and more recently JsonValue. There are downsides with both. The JsonElement-backed class incurs overhead for the JsonDocument it needs to create and JsonValue does not allow common conversions in TryGet. The new class in this PR solves both by only storing necessary information and allowing conversions. It also preserves original escaping in WriteTo.
Fixes#116730
@PranavSenthilnathanPranavSenthilnathan
added this to the 10.0.0 milestone
Jun 18, 2025
CopilotAI
review requested due to automatic review settings
June 18, 2025 22:55
CopilotAI
reviewed
Jun 18, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview
This PR introduces a new JsonValueOfJsonPrimitive class to optimize handling of JSON primitive values by storing raw UTF-8 bytes and escaping info, refactors reader and converter logic to use it, and adds comprehensive tests for primitive behaviors and conversions.
  • Add JsonValueOfJsonPrimitive to store only needed data for primitives and preserve original escaping in WriteTo.
  • Update JsonValueConverter, JsonDocument, and Utf8JsonReader to delegate GUID parsing to a new JsonReaderHelper.TryGetValue helper.
  • Extend tests in JsonValueTests.cs to cover deserialization, TryGetValue, WriteTo, deep-cloning, and conversion for all primitive types using a new WrappedT<T> wrapper.
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
FileDescription
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.csAdded tests for primitive JSON values (string, bool, number), WriteTo, cloning, deep-equals, and conversion; introduced WrappedT<T> helper.
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Node/JsonValueConverter.csReplaced token-type switch with instantiation of JsonValueOfJsonPrimitive for primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.csReplaced inline GUID parsing logic with JsonReaderHelper.TryGetValue call.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.csAdded new overload TryGetValue(ReadOnlySpan<byte>, bool, out Guid) to centralize GUID parsing.
src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonValueOfJsonPrimitive.csNew internal sealed class implementing optimized storage and parsing for JSON primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.csSwitched inline GUID parsing in TryGetValue to JsonReaderHelper.TryGetValue.
src/libraries/System.Text.Json/src/System.Text.Json.csprojIncluded JsonValueOfJsonPrimitive.cs in project file.
Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs
Outdated

@PranavSenthilnathan
PranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

MemberAuthor
@eiriktsarpalis I can also take this PR one step further by adding separate derived classes for JSON string and numbers, and introducing the JsonNumber struct like we discussed offline.
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 18, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis

See info in area-owners.md if you want to be subscribed.

This was referenced Jun 19, 2025

Closed


Open


Closed


This was referenced Jun 28, 2025

Closed


Closed


Closed


Closed


Closed


Closed


Closed


Closed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 18, 2025

Copy link


Copy Markdown

MemberAuthor
Keeping this fix more targeted by matching the logic in JsonValueOfElement.
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 18, 2025

Closed


This was referenced Jul 18, 2025

Open


Closed


Closed

eiriktsarpalis
eiriktsarpalis
approved these changes
Jul 22, 2025
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
@PranavSenthilnathan
PranavSenthilnathan
enabled auto-merge (squash)
July 22, 2025 07:38
@PranavSenthilnathan
PranavSenthilnathan
merged commit 4ea1713
into
dotnet:mainJul 22, 2025

83 of 87 checks passed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 22, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/10.0-preview7
@github-actions
github-actionsBot
commented
Jul 22, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/10.0-preview7: https://github.com/dotnet/runtime/actions/runs/16439281496
@github-actionsgithub-actionsBot
mentioned this pull request
Jul 22, 2025
 Merged

4 tasks
@PranavSenthilnathanPranavSenthilnathan
mentioned this pull request
Jul 23, 2025

Closed

@LoopedBard3LoopedBard3
mentioned this pull request
Jul 29, 2025

Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 22, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

@PranavSenthilnathanPranavSenthilnathan

Labels

area-System.Text.Json

Projects


None yet


Milestone

10.0.0

3 participants

@PranavSenthilnathan@eiriktsarpalis

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
New JsonValue derived class for JSON primitives - #116798
Merged
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Jul 22, 2025
Merged
New JsonValue derived class for JSON primitives#116798
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Conversation
@PranavSenthilnathan
@PranavSenthilnathanPranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

Member
Adds a new derived class that JsonValueConverter can use when the value is a primitive. Previously JsonElementOfValue was being used and more recently JsonValue. There are downsides with both. The JsonElement-backed class incurs overhead for the JsonDocument it needs to create and JsonValue does not allow common conversions in TryGet. The new class in this PR solves both by only storing necessary information and allowing conversions. It also preserves original escaping in WriteTo.
Fixes#116730
@PranavSenthilnathanPranavSenthilnathan
added this to the 10.0.0 milestone
Jun 18, 2025
CopilotAI
review requested due to automatic review settings
June 18, 2025 22:55
CopilotAI
reviewed
Jun 18, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview
This PR introduces a new JsonValueOfJsonPrimitive class to optimize handling of JSON primitive values by storing raw UTF-8 bytes and escaping info, refactors reader and converter logic to use it, and adds comprehensive tests for primitive behaviors and conversions.
  • Add JsonValueOfJsonPrimitive to store only needed data for primitives and preserve original escaping in WriteTo.
  • Update JsonValueConverter, JsonDocument, and Utf8JsonReader to delegate GUID parsing to a new JsonReaderHelper.TryGetValue helper.
  • Extend tests in JsonValueTests.cs to cover deserialization, TryGetValue, WriteTo, deep-cloning, and conversion for all primitive types using a new WrappedT<T> wrapper.
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
FileDescription
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.csAdded tests for primitive JSON values (string, bool, number), WriteTo, cloning, deep-equals, and conversion; introduced WrappedT<T> helper.
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Node/JsonValueConverter.csReplaced token-type switch with instantiation of JsonValueOfJsonPrimitive for primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.csReplaced inline GUID parsing logic with JsonReaderHelper.TryGetValue call.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.csAdded new overload TryGetValue(ReadOnlySpan<byte>, bool, out Guid) to centralize GUID parsing.
src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonValueOfJsonPrimitive.csNew internal sealed class implementing optimized storage and parsing for JSON primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.csSwitched inline GUID parsing in TryGetValue to JsonReaderHelper.TryGetValue.
src/libraries/System.Text.Json/src/System.Text.Json.csprojIncluded JsonValueOfJsonPrimitive.cs in project file.
Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs
Outdated

@PranavSenthilnathan
PranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

MemberAuthor
@eiriktsarpalis I can also take this PR one step further by adding separate derived classes for JSON string and numbers, and introducing the JsonNumber struct like we discussed offline.
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 18, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis

See info in area-owners.md if you want to be subscribed.

This was referenced Jun 19, 2025

Closed


Open


Closed


This was referenced Jun 28, 2025

Closed


Closed


Closed


Closed


Closed


Closed


Closed


Closed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 18, 2025

Copy link


Copy Markdown

MemberAuthor
Keeping this fix more targeted by matching the logic in JsonValueOfElement.
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 18, 2025

Closed


This was referenced Jul 18, 2025

Open


Closed


Closed

eiriktsarpalis
eiriktsarpalis
approved these changes
Jul 22, 2025
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
@PranavSenthilnathan
PranavSenthilnathan
enabled auto-merge (squash)
July 22, 2025 07:38
@PranavSenthilnathan
PranavSenthilnathan
merged commit 4ea1713
into
dotnet:mainJul 22, 2025

83 of 87 checks passed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 22, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/10.0-preview7
@github-actions
github-actionsBot
commented
Jul 22, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/10.0-preview7: https://github.com/dotnet/runtime/actions/runs/16439281496
@github-actionsgithub-actionsBot
mentioned this pull request
Jul 22, 2025
 Merged

4 tasks
@PranavSenthilnathanPranavSenthilnathan
mentioned this pull request
Jul 23, 2025

Closed

@LoopedBard3LoopedBard3
mentioned this pull request
Jul 29, 2025

Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 22, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

@PranavSenthilnathanPranavSenthilnathan

Labels

area-System.Text.Json

Projects


None yet


Milestone

10.0.0

3 participants

@PranavSenthilnathan@eiriktsarpalis

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
New JsonValue derived class for JSON primitives - #116798
Merged
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Jul 22, 2025
Merged
New JsonValue derived class for JSON primitives#116798
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Conversation
@PranavSenthilnathan
@PranavSenthilnathanPranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

Member
Adds a new derived class that JsonValueConverter can use when the value is a primitive. Previously JsonElementOfValue was being used and more recently JsonValue. There are downsides with both. The JsonElement-backed class incurs overhead for the JsonDocument it needs to create and JsonValue does not allow common conversions in TryGet. The new class in this PR solves both by only storing necessary information and allowing conversions. It also preserves original escaping in WriteTo.
Fixes#116730
@PranavSenthilnathanPranavSenthilnathan
added this to the 10.0.0 milestone
Jun 18, 2025
CopilotAI
review requested due to automatic review settings
June 18, 2025 22:55
CopilotAI
reviewed
Jun 18, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview
This PR introduces a new JsonValueOfJsonPrimitive class to optimize handling of JSON primitive values by storing raw UTF-8 bytes and escaping info, refactors reader and converter logic to use it, and adds comprehensive tests for primitive behaviors and conversions.
  • Add JsonValueOfJsonPrimitive to store only needed data for primitives and preserve original escaping in WriteTo.
  • Update JsonValueConverter, JsonDocument, and Utf8JsonReader to delegate GUID parsing to a new JsonReaderHelper.TryGetValue helper.
  • Extend tests in JsonValueTests.cs to cover deserialization, TryGetValue, WriteTo, deep-cloning, and conversion for all primitive types using a new WrappedT<T> wrapper.
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
FileDescription
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.csAdded tests for primitive JSON values (string, bool, number), WriteTo, cloning, deep-equals, and conversion; introduced WrappedT<T> helper.
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Node/JsonValueConverter.csReplaced token-type switch with instantiation of JsonValueOfJsonPrimitive for primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.csReplaced inline GUID parsing logic with JsonReaderHelper.TryGetValue call.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.csAdded new overload TryGetValue(ReadOnlySpan<byte>, bool, out Guid) to centralize GUID parsing.
src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonValueOfJsonPrimitive.csNew internal sealed class implementing optimized storage and parsing for JSON primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.csSwitched inline GUID parsing in TryGetValue to JsonReaderHelper.TryGetValue.
src/libraries/System.Text.Json/src/System.Text.Json.csprojIncluded JsonValueOfJsonPrimitive.cs in project file.
Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs
Outdated

@PranavSenthilnathan
PranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

MemberAuthor
@eiriktsarpalis I can also take this PR one step further by adding separate derived classes for JSON string and numbers, and introducing the JsonNumber struct like we discussed offline.
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 18, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis

See info in area-owners.md if you want to be subscribed.

This was referenced Jun 19, 2025

Closed


Open


Closed


This was referenced Jun 28, 2025

Closed


Closed


Closed


Closed


Closed


Closed


Closed


Closed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 18, 2025

Copy link


Copy Markdown

MemberAuthor
Keeping this fix more targeted by matching the logic in JsonValueOfElement.
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 18, 2025

Closed


This was referenced Jul 18, 2025

Open


Closed


Closed

eiriktsarpalis
eiriktsarpalis
approved these changes
Jul 22, 2025
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
@PranavSenthilnathan
PranavSenthilnathan
enabled auto-merge (squash)
July 22, 2025 07:38
@PranavSenthilnathan
PranavSenthilnathan
merged commit 4ea1713
into
dotnet:mainJul 22, 2025

83 of 87 checks passed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 22, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/10.0-preview7
@github-actions
github-actionsBot
commented
Jul 22, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/10.0-preview7: https://github.com/dotnet/runtime/actions/runs/16439281496
@github-actionsgithub-actionsBot
mentioned this pull request
Jul 22, 2025
 Merged

4 tasks
@PranavSenthilnathanPranavSenthilnathan
mentioned this pull request
Jul 23, 2025

Closed

@LoopedBard3LoopedBard3
mentioned this pull request
Jul 29, 2025

Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 22, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

@PranavSenthilnathanPranavSenthilnathan

Labels

area-System.Text.Json

Projects


None yet


Milestone

10.0.0

3 participants

@PranavSenthilnathan@eiriktsarpalis

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
New JsonValue derived class for JSON primitives - #116798
Merged
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Jul 22, 2025
Merged
New JsonValue derived class for JSON primitives#116798
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Conversation
@PranavSenthilnathan
@PranavSenthilnathanPranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

Member
Adds a new derived class that JsonValueConverter can use when the value is a primitive. Previously JsonElementOfValue was being used and more recently JsonValue. There are downsides with both. The JsonElement-backed class incurs overhead for the JsonDocument it needs to create and JsonValue does not allow common conversions in TryGet. The new class in this PR solves both by only storing necessary information and allowing conversions. It also preserves original escaping in WriteTo.
Fixes#116730
@PranavSenthilnathanPranavSenthilnathan
added this to the 10.0.0 milestone
Jun 18, 2025
CopilotAI
review requested due to automatic review settings
June 18, 2025 22:55
CopilotAI
reviewed
Jun 18, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview
This PR introduces a new JsonValueOfJsonPrimitive class to optimize handling of JSON primitive values by storing raw UTF-8 bytes and escaping info, refactors reader and converter logic to use it, and adds comprehensive tests for primitive behaviors and conversions.
  • Add JsonValueOfJsonPrimitive to store only needed data for primitives and preserve original escaping in WriteTo.
  • Update JsonValueConverter, JsonDocument, and Utf8JsonReader to delegate GUID parsing to a new JsonReaderHelper.TryGetValue helper.
  • Extend tests in JsonValueTests.cs to cover deserialization, TryGetValue, WriteTo, deep-cloning, and conversion for all primitive types using a new WrappedT<T> wrapper.
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
FileDescription
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.csAdded tests for primitive JSON values (string, bool, number), WriteTo, cloning, deep-equals, and conversion; introduced WrappedT<T> helper.
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Node/JsonValueConverter.csReplaced token-type switch with instantiation of JsonValueOfJsonPrimitive for primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.csReplaced inline GUID parsing logic with JsonReaderHelper.TryGetValue call.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.csAdded new overload TryGetValue(ReadOnlySpan<byte>, bool, out Guid) to centralize GUID parsing.
src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonValueOfJsonPrimitive.csNew internal sealed class implementing optimized storage and parsing for JSON primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.csSwitched inline GUID parsing in TryGetValue to JsonReaderHelper.TryGetValue.
src/libraries/System.Text.Json/src/System.Text.Json.csprojIncluded JsonValueOfJsonPrimitive.cs in project file.
Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs
Outdated

@PranavSenthilnathan
PranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

MemberAuthor
@eiriktsarpalis I can also take this PR one step further by adding separate derived classes for JSON string and numbers, and introducing the JsonNumber struct like we discussed offline.
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 18, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis

See info in area-owners.md if you want to be subscribed.

This was referenced Jun 19, 2025

Closed


Open


Closed


This was referenced Jun 28, 2025

Closed


Closed


Closed


Closed


Closed


Closed


Closed


Closed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 18, 2025

Copy link


Copy Markdown

MemberAuthor
Keeping this fix more targeted by matching the logic in JsonValueOfElement.
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 18, 2025

Closed


This was referenced Jul 18, 2025

Open


Closed


Closed

eiriktsarpalis
eiriktsarpalis
approved these changes
Jul 22, 2025
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
@PranavSenthilnathan
PranavSenthilnathan
enabled auto-merge (squash)
July 22, 2025 07:38
@PranavSenthilnathan
PranavSenthilnathan
merged commit 4ea1713
into
dotnet:mainJul 22, 2025

83 of 87 checks passed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 22, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/10.0-preview7
@github-actions
github-actionsBot
commented
Jul 22, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/10.0-preview7: https://github.com/dotnet/runtime/actions/runs/16439281496
@github-actionsgithub-actionsBot
mentioned this pull request
Jul 22, 2025
 Merged

4 tasks
@PranavSenthilnathanPranavSenthilnathan
mentioned this pull request
Jul 23, 2025

Closed

@LoopedBard3LoopedBard3
mentioned this pull request
Jul 29, 2025

Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 22, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

@PranavSenthilnathanPranavSenthilnathan

Labels

area-System.Text.Json

Projects


None yet


Milestone

10.0.0

3 participants

@PranavSenthilnathan@eiriktsarpalis

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
New JsonValue derived class for JSON primitives - #116798
Merged
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Jul 22, 2025
Merged
New JsonValue derived class for JSON primitives#116798
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Conversation
@PranavSenthilnathan
@PranavSenthilnathanPranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

Member
Adds a new derived class that JsonValueConverter can use when the value is a primitive. Previously JsonElementOfValue was being used and more recently JsonValue. There are downsides with both. The JsonElement-backed class incurs overhead for the JsonDocument it needs to create and JsonValue does not allow common conversions in TryGet. The new class in this PR solves both by only storing necessary information and allowing conversions. It also preserves original escaping in WriteTo.
Fixes#116730
@PranavSenthilnathanPranavSenthilnathan
added this to the 10.0.0 milestone
Jun 18, 2025
CopilotAI
review requested due to automatic review settings
June 18, 2025 22:55
CopilotAI
reviewed
Jun 18, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview
This PR introduces a new JsonValueOfJsonPrimitive class to optimize handling of JSON primitive values by storing raw UTF-8 bytes and escaping info, refactors reader and converter logic to use it, and adds comprehensive tests for primitive behaviors and conversions.
  • Add JsonValueOfJsonPrimitive to store only needed data for primitives and preserve original escaping in WriteTo.
  • Update JsonValueConverter, JsonDocument, and Utf8JsonReader to delegate GUID parsing to a new JsonReaderHelper.TryGetValue helper.
  • Extend tests in JsonValueTests.cs to cover deserialization, TryGetValue, WriteTo, deep-cloning, and conversion for all primitive types using a new WrappedT<T> wrapper.
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
FileDescription
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.csAdded tests for primitive JSON values (string, bool, number), WriteTo, cloning, deep-equals, and conversion; introduced WrappedT<T> helper.
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Node/JsonValueConverter.csReplaced token-type switch with instantiation of JsonValueOfJsonPrimitive for primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.csReplaced inline GUID parsing logic with JsonReaderHelper.TryGetValue call.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.csAdded new overload TryGetValue(ReadOnlySpan<byte>, bool, out Guid) to centralize GUID parsing.
src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonValueOfJsonPrimitive.csNew internal sealed class implementing optimized storage and parsing for JSON primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.csSwitched inline GUID parsing in TryGetValue to JsonReaderHelper.TryGetValue.
src/libraries/System.Text.Json/src/System.Text.Json.csprojIncluded JsonValueOfJsonPrimitive.cs in project file.
Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs
Outdated

@PranavSenthilnathan
PranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

MemberAuthor
@eiriktsarpalis I can also take this PR one step further by adding separate derived classes for JSON string and numbers, and introducing the JsonNumber struct like we discussed offline.
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 18, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis

See info in area-owners.md if you want to be subscribed.

This was referenced Jun 19, 2025

Closed


Open


Closed


This was referenced Jun 28, 2025

Closed


Closed


Closed


Closed


Closed


Closed


Closed


Closed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 18, 2025

Copy link


Copy Markdown

MemberAuthor
Keeping this fix more targeted by matching the logic in JsonValueOfElement.
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 18, 2025

Closed


This was referenced Jul 18, 2025

Open


Closed


Closed

eiriktsarpalis
eiriktsarpalis
approved these changes
Jul 22, 2025
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
@PranavSenthilnathan
PranavSenthilnathan
enabled auto-merge (squash)
July 22, 2025 07:38
@PranavSenthilnathan
PranavSenthilnathan
merged commit 4ea1713
into
dotnet:mainJul 22, 2025

83 of 87 checks passed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 22, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/10.0-preview7
@github-actions
github-actionsBot
commented
Jul 22, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/10.0-preview7: https://github.com/dotnet/runtime/actions/runs/16439281496
@github-actionsgithub-actionsBot
mentioned this pull request
Jul 22, 2025
 Merged

4 tasks
@PranavSenthilnathanPranavSenthilnathan
mentioned this pull request
Jul 23, 2025

Closed

@LoopedBard3LoopedBard3
mentioned this pull request
Jul 29, 2025

Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 22, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

@PranavSenthilnathanPranavSenthilnathan

Labels

area-System.Text.Json

Projects


None yet


Milestone

10.0.0

3 participants

@PranavSenthilnathan@eiriktsarpalis

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
New JsonValue derived class for JSON primitives - #116798
Merged
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Jul 22, 2025
Merged
New JsonValue derived class for JSON primitives#116798
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Conversation
@PranavSenthilnathan
@PranavSenthilnathanPranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

Member
Adds a new derived class that JsonValueConverter can use when the value is a primitive. Previously JsonElementOfValue was being used and more recently JsonValue. There are downsides with both. The JsonElement-backed class incurs overhead for the JsonDocument it needs to create and JsonValue does not allow common conversions in TryGet. The new class in this PR solves both by only storing necessary information and allowing conversions. It also preserves original escaping in WriteTo.
Fixes#116730
@PranavSenthilnathanPranavSenthilnathan
added this to the 10.0.0 milestone
Jun 18, 2025
CopilotAI
review requested due to automatic review settings
June 18, 2025 22:55
CopilotAI
reviewed
Jun 18, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview
This PR introduces a new JsonValueOfJsonPrimitive class to optimize handling of JSON primitive values by storing raw UTF-8 bytes and escaping info, refactors reader and converter logic to use it, and adds comprehensive tests for primitive behaviors and conversions.
  • Add JsonValueOfJsonPrimitive to store only needed data for primitives and preserve original escaping in WriteTo.
  • Update JsonValueConverter, JsonDocument, and Utf8JsonReader to delegate GUID parsing to a new JsonReaderHelper.TryGetValue helper.
  • Extend tests in JsonValueTests.cs to cover deserialization, TryGetValue, WriteTo, deep-cloning, and conversion for all primitive types using a new WrappedT<T> wrapper.
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
FileDescription
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.csAdded tests for primitive JSON values (string, bool, number), WriteTo, cloning, deep-equals, and conversion; introduced WrappedT<T> helper.
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Node/JsonValueConverter.csReplaced token-type switch with instantiation of JsonValueOfJsonPrimitive for primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.csReplaced inline GUID parsing logic with JsonReaderHelper.TryGetValue call.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.csAdded new overload TryGetValue(ReadOnlySpan<byte>, bool, out Guid) to centralize GUID parsing.
src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonValueOfJsonPrimitive.csNew internal sealed class implementing optimized storage and parsing for JSON primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.csSwitched inline GUID parsing in TryGetValue to JsonReaderHelper.TryGetValue.
src/libraries/System.Text.Json/src/System.Text.Json.csprojIncluded JsonValueOfJsonPrimitive.cs in project file.
Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs
Outdated

@PranavSenthilnathan
PranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

MemberAuthor
@eiriktsarpalis I can also take this PR one step further by adding separate derived classes for JSON string and numbers, and introducing the JsonNumber struct like we discussed offline.
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 18, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis

See info in area-owners.md if you want to be subscribed.

This was referenced Jun 19, 2025

Closed


Open


Closed


This was referenced Jun 28, 2025

Closed


Closed


Closed


Closed


Closed


Closed


Closed


Closed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 18, 2025

Copy link


Copy Markdown

MemberAuthor
Keeping this fix more targeted by matching the logic in JsonValueOfElement.
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 18, 2025

Closed


This was referenced Jul 18, 2025

Open


Closed


Closed

eiriktsarpalis
eiriktsarpalis
approved these changes
Jul 22, 2025
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
@PranavSenthilnathan
PranavSenthilnathan
enabled auto-merge (squash)
July 22, 2025 07:38
@PranavSenthilnathan
PranavSenthilnathan
merged commit 4ea1713
into
dotnet:mainJul 22, 2025

83 of 87 checks passed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 22, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/10.0-preview7
@github-actions
github-actionsBot
commented
Jul 22, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/10.0-preview7: https://github.com/dotnet/runtime/actions/runs/16439281496
@github-actionsgithub-actionsBot
mentioned this pull request
Jul 22, 2025
 Merged

4 tasks
@PranavSenthilnathanPranavSenthilnathan
mentioned this pull request
Jul 23, 2025

Closed

@LoopedBard3LoopedBard3
mentioned this pull request
Jul 29, 2025

Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 22, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

@PranavSenthilnathanPranavSenthilnathan

Labels

area-System.Text.Json

Projects


None yet


Milestone

10.0.0

3 participants

@PranavSenthilnathan@eiriktsarpalis

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
New JsonValue derived class for JSON primitives - #116798
Merged
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Jul 22, 2025
Merged
New JsonValue derived class for JSON primitives#116798
PranavSenthilnathan merged 15 commits into
dotnet:mainfrom 
PranavSenthilnathan:jsonvalue-conversion
Conversation
@PranavSenthilnathan
@PranavSenthilnathanPranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

Member
Adds a new derived class that JsonValueConverter can use when the value is a primitive. Previously JsonElementOfValue was being used and more recently JsonValue. There are downsides with both. The JsonElement-backed class incurs overhead for the JsonDocument it needs to create and JsonValue does not allow common conversions in TryGet. The new class in this PR solves both by only storing necessary information and allowing conversions. It also preserves original escaping in WriteTo.
Fixes#116730
@PranavSenthilnathanPranavSenthilnathan
added this to the 10.0.0 milestone
Jun 18, 2025
CopilotAI
review requested due to automatic review settings
June 18, 2025 22:55
CopilotAI
reviewed
Jun 18, 2025
View reviewed changes
CopilotAI
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview
This PR introduces a new JsonValueOfJsonPrimitive class to optimize handling of JSON primitive values by storing raw UTF-8 bytes and escaping info, refactors reader and converter logic to use it, and adds comprehensive tests for primitive behaviors and conversions.
  • Add JsonValueOfJsonPrimitive to store only needed data for primitives and preserve original escaping in WriteTo.
  • Update JsonValueConverter, JsonDocument, and Utf8JsonReader to delegate GUID parsing to a new JsonReaderHelper.TryGetValue helper.
  • Extend tests in JsonValueTests.cs to cover deserialization, TryGetValue, WriteTo, deep-cloning, and conversion for all primitive types using a new WrappedT<T> wrapper.
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
FileDescription
src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.csAdded tests for primitive JSON values (string, bool, number), WriteTo, cloning, deep-equals, and conversion; introduced WrappedT<T> helper.
src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Node/JsonValueConverter.csReplaced token-type switch with instantiation of JsonValueOfJsonPrimitive for primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/Utf8JsonReader.TryGet.csReplaced inline GUID parsing logic with JsonReaderHelper.TryGetValue call.
src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.csAdded new overload TryGetValue(ReadOnlySpan<byte>, bool, out Guid) to centralize GUID parsing.
src/libraries/System.Text.Json/src/System/Text/Json/Nodes/JsonValueOfJsonPrimitive.csNew internal sealed class implementing optimized storage and parsing for JSON primitives.
src/libraries/System.Text.Json/src/System/Text/Json/Document/JsonDocument.csSwitched inline GUID parsing in TryGetValue to JsonReaderHelper.TryGetValue.
src/libraries/System.Text.Json/src/System.Text.Json.csprojIncluded JsonValueOfJsonPrimitive.cs in project file.
Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonValueTests.cs
Outdated

@PranavSenthilnathan
PranavSenthilnathan
commented
Jun 18, 2025

Copy link


Copy Markdown

MemberAuthor
@eiriktsarpalis I can also take this PR one step further by adding separate derived classes for JSON string and numbers, and introducing the JsonNumber struct like we discussed offline.
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jun 18, 2025

Copy link


Copy Markdown

Contributor
Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis

See info in area-owners.md if you want to be subscribed.

This was referenced Jun 19, 2025

Closed


Open


Closed


This was referenced Jun 28, 2025

Closed


Closed


Closed


Closed


Closed


Closed


Closed


Closed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 18, 2025

Copy link


Copy Markdown

MemberAuthor
Keeping this fix more targeted by matching the logic in JsonValueOfElement.
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 18, 2025

Closed


This was referenced Jul 18, 2025

Open


Closed


Closed

eiriktsarpalis
eiriktsarpalis
approved these changes
Jul 22, 2025
View reviewed changes
@eiriktsarpaliseiriktsarpalis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
@PranavSenthilnathan
PranavSenthilnathan
enabled auto-merge (squash)
July 22, 2025 07:38
@PranavSenthilnathan
PranavSenthilnathan
merged commit 4ea1713
into
dotnet:mainJul 22, 2025

83 of 87 checks passed

@PranavSenthilnathan
PranavSenthilnathan
commented
Jul 22, 2025

Copy link


Copy Markdown

MemberAuthor
/backport to release/10.0-preview7
@github-actions
github-actionsBot
commented
Jul 22, 2025

Copy link


Copy Markdown

Contributor
Started backporting to release/10.0-preview7: https://github.com/dotnet/runtime/actions/runs/16439281496
@github-actionsgithub-actionsBot
mentioned this pull request
Jul 22, 2025
 Merged

4 tasks
@PranavSenthilnathanPranavSenthilnathan
mentioned this pull request
Jul 23, 2025

Closed

@LoopedBard3LoopedBard3
mentioned this pull request
Jul 29, 2025

Closed

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 22, 2025
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@eiriktsarpaliseiriktsarpaliseiriktsarpalis approved these changes

Assignees

@PranavSenthilnathanPranavSenthilnathan

Labels

area-System.Text.Json

Projects


None yet


Milestone

10.0.0

3 participants

@PranavSenthilnathan@eiriktsarpalis