Visitar URL original
Use Jumoo.Json for the json helpers by KevinJump · Pull Request #1014 · KevinJump/uSync · GitHub
Skip to content

Use Jumoo.Json for the json helpers - #1014

Merged
KevinJump merged 1 commit into
v18/mainfrom
v18/jumoo-json
Jul 29, 2026
Merged

KevinJump merged 1 commit into
v18/mainfrom
v18/jumoo-json

Conversation

@KevinJump

Copy link
Copy Markdown
Owner

uSync.Core/Extensions/JsonTextExtensions.cs was a copy of the Jumoo.Json package and had drifted behind it. uSync's own code now calls Jumoo.Json 18.0.3 directly, so there is one implementation to maintain, and uSync inherits the fixes and allocation work done there.

Depends on Jumoo/Jumoo.Json#9 (merged, published as 18.0.3).

What uSync gains

TryConvertToJsonNode returned false for any string containing a quote, backslash or control character it built its fallback with JsonNode.Parse($"\"{value}\""), which is invalid json for those inputs
TrySerializeJsonNode built a fresh JsonSerializerOptions on every call options instances build their own metadata cache
TryExpandJsonNodeValue deep-cloned at every level of recursion 685µs/2.1MB → 162µs/399KB on a 203KB payload
IsJsonEqual / IsValidJsonString allocated on the large object heap ~196 and ~92 Gen2 collections per 1000 ops → zero
property accessors called ToString() on whole subtrees before parsing GetPropertyValueOrDefault on a type mismatch: 1,509ns → 10ns

Numbers are from Jumoo.Json.Benchmarks/README.md.

Nothing downstream needs to change

uSync.Core.Extensions.JsonTextExtensions keeps its namespace, class name, signatures and behaviour — including the places where Jumoo.Json returns null and it returned string.Empty. Every method is now [Obsolete] and forwards, and they will be removed in v20. JsonSerializerOptionsTests covers those contracts, since that is what stands between uSync.Complete and a broken build.

To move a file over, replace using uSync.Core.Extensions; with using Jumoo.Json;. A file can't have both — they declare the same extension method signatures, so a call matching both is ambiguous (CS0121). Names that differ: TryGetPropertyAsObject → TryGetPropertyAsJsonObject, GetPropertyAsObject → GetPropertyAsJsonObject.

How the migration handles that ambiguity

uSync.Core.Extensions holds only four classes; everything else lives in namespace uSync.Core. So of the 42 migrated files:

  • 35 simply swap the using.
  • 4 take a using static for the one other class they needed (DictionaryExtensions / ObjectPropertyExtensions / ConversionExtensions).
  • 2 are themselves inside namespace uSync.Core.Extensions, where the shim wins on namespace proximity no matter what the usings say, so they call Jumoo.Json.JsonSerialization.TryGetValueAs fully qualified.
  • GlobalUsings.cs aliases the public uSyncTaskHelper once, rather than repeating an alias in fourteen files.

Zero CS0618/CS0619 warnings solution-wide, so nothing in uSync still routes through the shim.

Serialized output

This is the risk that matters — uSync detects changes by comparing serialized json, so a formatting difference makes every item report as changed.

Jumoo.Json lists the same converters in a different order, and STJ resolves first-match-wins, so I checked rather than assumed: every type resolves to the same converter as before (notably JsonObjectConverter coming before JsonUdiConverter does not steal Udi). JsonXElementConverter is the same implementation under a new namespace. That check is now JsonSerializerOptionsTests, which doubles as a guard against another Jumoo package calling JsonTextOptions.AddConverter and quietly reformatting everyone's .config files — those options are a process-wide static shared across the Jumoo packages.

Behaviour changes I had to make by hand

  • RichTextEditorMigratingSerializer.TopLevelEditor — SerializeJsonString returning null instead of string.Empty turned a continue into a dropped config key. Rewritten to fall through to the else branch as before.
  • uSyncHistoryNotificationHandler — now logs and skips instead of writing an empty history file if serialization fails.
  • ?? string.Empty where a caller needs non-null: ColourPickerMigratingConfigSerializer, RTEBlockDataContentMigrator, ContentSerializerBase, DataTypeTracker.
  • The config mergers already null-guarded DeserializeJson, which now returns default rather than throwing — the guards were already the intended path.

Also

  • Deletes uSync's copy of OrderedPropertiesJsonResolver (internal, byte identical upstream).
  • Obsoletes uSync.Core.Json.JsonXElementConverter.
  • SyncConfigMergerBase.cs:113's ToJsonArray() turned out to be Umbraco's own JsonNodeExtensions.ToJsonArray(IEnumerable<JsonNode?>), not uSync's string overload — untouched.

Testing

  • dotnet build uSync.slnx -c Release — clean, only the pre-existing CS8632 in TryGetValueAsTests.
  • dotnet test uSync.Tests — 177 passing (was 148).
  • dotnet pack uSync.Core — emits a single clean Jumoo.Json 18.0.3 dependency.

Still outstanding: the export diff. Run a full export from v18/main and from this branch against the same database and confirm git diff --no-index is empty, plus a report against a pre-change export showing zero changed items. The converter check above is strong evidence but it is not the same as a real export. Worth exercising block list/grid, an RTE with blocks, media picker 3 with crops, and a root data type config merge specifically.

🤖 Generated with Claude Code

uSync.Core/Extensions/JsonTextExtensions.cs was a copy of the Jumoo.Json
package, and had drifted behind it. uSync's own code now calls Jumoo.Json
(18.0.3) directly, so there is one implementation to maintain and uSync picks
up the fixes and allocation work done there:

- TryConvertToJsonNode returned false for any string containing a quote,
  backslash or control character - it built its fallback with
  JsonNode.Parse($"\"{value}\""), which is invalid json for those inputs.
- TrySerializeJsonNode built a fresh JsonSerializerOptions on every call.
- TryExpandJsonNodeValue deep-cloned at every level of recursion.
- IsJsonEqual and IsValidJsonString allocated on the large object heap for
  large values.

Nothing downstream needs to change. JsonTextExtensions keeps its namespace,
class name, signatures and behaviour - including where Jumoo.Json returns null
and it returned string.Empty - but every method is now [Obsolete] and forwards,
and they will be removed in v20. A file can't import both uSync.Core.Extensions
and Jumoo.Json, because they declare the same extension method signatures, so
the 42 migrated files import Jumoo.Json instead. Four take a using static for
the one other class they needed, two inside uSync.Core.Extensions call
Jumoo.Json fully qualified (the shim wins on namespace proximity there), and
GlobalUsings.cs aliases the public uSyncTaskHelper rather than repeating that
in fourteen files.

Also deletes uSync's copy of OrderedPropertiesJsonResolver (internal, byte
identical upstream) and obsoletes JsonXElementConverter.

Serialized output is unchanged. Jumoo.Json lists the converters in a different
order and order decides which one wins, so JsonSerializerOptionsTests pins the
converter uSync's serialization resolves for each type - that also guards
against another Jumoo package calling JsonTextOptions.AddConverter and quietly
reformatting everyone's .config files.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@KevinJump
KevinJump merged commit 22d3e36 into v18/main Jul 29, 2026
5 checks passed
@KevinJump
KevinJump deleted the v18/jumoo-json branch July 29, 2026 09:05
glitchedmob added a commit to sgfdevs/cms.methodconf.com that referenced this pull request Aug 23, 2026
Updated
[Microsoft.EntityFrameworkCore.Design](https://github.com/dotnet/dotnet)
from 10.0.10 to 10.0.11.

<details>
<summary>Release notes</summary>

_Sourced from [Microsoft.EntityFrameworkCore.Design's
releases](https://github.com/dotnet/dotnet/releases)._

No release notes found for this version range.

Commits viewable in [compare
view](https://github.com/dotnet/dotnet/commits).
</details>

Updated [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest)
from 18.8.1 to 18.9.0.

<details>
<summary>Release notes</summary>

_Sourced from [Microsoft.NET.Test.Sdk's
releases](https://github.com/microsoft/vstest/releases)._

## 18.9.0

## What's Changed
* Fix tilde/exclamation characters corrupted in TerminalLogger test
output by @​nohwnd in microsoft/vstest#16046
* Make TranslationLayer Native AOT-compatible by @​drewnoakes in
microsoft/vstest#16045
* Guard GenerateProgramFile target against UseWinUI/UseUwpTools
evaluation order by @​nohwnd in
microsoft/vstest#16072
* Add RequestingAssembly to AssemblyResolveEventArgs for binary compat
by @​nohwnd in microsoft/vstest#16076
* Remove stale Microsoft.Extensions.FileSystemGlobbing binding redirect
from testhost.x86 and datacollector by @​Evangelink in
microsoft/vstest#16082
* Fix TRX attachment paths when LogFileName contains a subdirectory by
@​nohwnd in microsoft/vstest#15791
* Fix missing dumps for .NET Framework child processes in
NetClientHangDumper by @​nohwnd in
microsoft/vstest#16098
* Fix data collection channels to use negotiated protocol version
instead of V1 by @​nohwnd in
microsoft/vstest#16096
* Fix race condition in BlameCollector: skip hang dump when testhost
hasn't launched yet by @​nohwnd in
microsoft/vstest#16065
* Replace TestSDKAutoGeneratedCode with ExcludeFromCodeCoverage in
auto-generated Program files by @​nohwnd in
microsoft/vstest#16101
* Include testhost process path in crash error messages by @​nohwnd in
microsoft/vstest#16108
* Fix DataDriven test results being double-counted in TRX logger totals
by @​nohwnd in microsoft/vstest#15766
* Fix datacollector crash visibility: replace Assert with throwable
exceptions by @​nohwnd in microsoft/vstest#16048
* Add TreatErrorMessagesAsWarnings parameter to TRX logger by @​nohwnd
in microsoft/vstest#16106
* Wait for testhost stderr to drain before reading its crash output by
@​nohwnd in microsoft/vstest#16128
* Handle runtimeconfig.dev.json without additionalProbingPaths by @​tmat
in microsoft/vstest#16166
* Suggest Microsoft.NET.Test.Sdk when a managed test project brings no
testhost by @​nohwnd in microsoft/vstest#16169
* Fix x86 testhost loading mismatched x64 hostfxr (0x800700C1) when run
via vstest.console.exe directly (#​16151) by @​azat-msft in
microsoft/vstest#16156
* Preserve the real exception (type + stack trace) when a test run
aborts in BaseRunTests by @​nohwnd in
microsoft/vstest#16167

## New Contributors
* @​drewnoakes made their first contribution in
microsoft/vstest#16045

**Full Changelog**:
microsoft/vstest@v18.8.0...v18.9.0

Commits viewable in [compare
view](microsoft/vstest@v18.8.1...v18.9.0).
</details>

Updated [Umbraco.Cms](https://github.com/umbraco/Umbraco-CMS) from
18.1.0 to 18.1.1.

<details>
<summary>Release notes</summary>

_Sourced from [Umbraco.Cms's
releases](https://github.com/umbraco/Umbraco-CMS/releases)._

## 18.1.1

## What's Changed

### 🔒 Security
* Resolved incorrect authorization lets Content-only backoffice users
modify Templates, enabling remote code execution from
GHSA-f7m5-5x7g-2p52
* Resolved insufficient authorization on Management API search endpoints
from
GHSA-w5q3-9wf8-43gg
 
### 🐛 Bug Fixes
* Routing: Don't retain the fallback default culture captured during an
upgrade boot (closes #​22581) by @​AndyButland in
umbraco/Umbraco-CMS#23653

**Full Changelog**:
umbraco/Umbraco-CMS@release-18.1.0-rc...release-18.1.1

Commits viewable in [compare
view](umbraco/Umbraco-CMS@release-18.1.0...release-18.1.1).
</details>

Updated [uSync](https://github.com/KevinJump/uSync) from 18.0.3 to
18.1.1.

<details>
<summary>Release notes</summary>

_Sourced from [uSync's
releases](https://github.com/KevinJump/uSync/releases)._

## 18.1.1

## Fixes

- **Import**: fixed a property that's been moved out of all groups (an
empty tab, no matching `<Tabs>` entry) not actually persisting that move
on import — it took a second import to stick.
([#​1043](KevinJump/uSync#1043))
- **Reliability**: save failures rejected by Umbraco (e.g. an invalid
ISO code, a rejected content/media/template save) were previously
discarded silently, so a failed import step could still get reported as
a success. These now surface as proper import failures across Language,
DictionaryItem, Webhook, ContentType/MediaType/MemberType, DataType,
Domain, Template, Media, and Content serializers.
([#​1040](KevinJump/uSync#1040),
[#​1042](KevinJump/uSync#1042))
- **Blueprints**: fixed bulk-imported content blueprints being saved
through the wrong path, which silently corrupted their object type and
caused duplicate-key errors on the next import. Blueprints saved during
the second-pass bulk import now go through `SaveBlueprint` like a normal
single-item save.
([#​1035](KevinJump/uSync#1035))

## Other

- Dependency bumps (chalk, vite-plugin-dts, and a few NuGet/npm
dependency-group updates).
- CI/CD: nightly builds are now automatically published to the [Azure
Artifacts nightly
feed](https://pkgs.dev.azure.com/jumoo/Public/_packaging/nightly/nuget/v3/index.json)
on every push to this branch.


## 18.1.0

This is a minor update to uSync for Umbraco 18 — an opt-in import
performance cache, a double-export fix for save-and-publish, several
allocation/perf improvements ported from v17, and a move to the
`Jumoo.Json` package for JSON handling.

## uSync 18.1.0

**Added**
- **Opt-in import state cache — `uSync:Settings:CacheImportState`
(default `false`).** uSync normally decides whether an item has changed
by loading it, serializing it, and hashing it — every item, every run.
With this on, uSync remembers the hash of items it has already confirmed
match, so unchanged items are skipped without a database lookup or
re-serialize on the next run. The first run after enabling it is no
faster than before; the benefit lands on the second run. Read
[`docs/perf/state-cache.md`](https://github.com/KevinJump/uSync/blob/v18/main/docs/perf/state-cache.md)
before enabling it, especially the limitations section.
([#​1016](KevinJump/uSync#1016))
- **Extender API:** the cancelable per-item notifications gain an
optional `Message` (used instead of uSync's generic cancel message) and,
on the import/report ones, `Force`, so a subscriber can stand down when
the user has asked for a forced import.

**Fixed**
- **Content and Library items are no longer exported twice by one editor
action.** Umbraco 18.1 raises the saved notification for a
save-and-publish as well as the published one
([umbraco/Umbraco-CMS#​23523](umbraco/Umbraco-CMS#23523));
uSync now shares a record of exported items across the notifications for
one operation, so each item is exported once.
([#​1018](KevinJump/uSync#1018))
- `HandlerSettings.Clone()` no longer drops `CreateClean` and
`FullFileOnDifference` — handlers that set either value in their own
block are now honoured.
- Property values containing a quote, backslash or control character are
now converted to valid JSON (previously produced invalid JSON in the
string fallback). Inherited with the move to `Jumoo.Json`.
- Restored backoffice guard and content paging fixes that were dropped
in the v17 → v18 merge.
([#​1012](KevinJump/uSync#1012))

**Performance**
- Ported the v17 allocation work: fewer redundant dictionary lookups on
hot paths, and `internal`/`private` classes are now `sealed` so the JIT
can devirtualize their calls. No behavioural changes.
([#​1019](KevinJump/uSync#1019),
[#​1020](KevinJump/uSync#1020))
> **Extender API:** `SyncHandlerRoot.SyncChangeInfo` is now `sealed`
(still `protected`, so handlers can still construct/return one from
`IsItemCurrentAsync`, just not derive from it).
- **Handler settings now inherit from `HandlerDefaults`.** A handler's
own settings block is layered over the set's defaults instead of
replacing them wholesale, so it only needs to specify what it wants to
change. ([#​1001](KevinJump/uSync#1001))
> **Breaking:** a handler block that previously reset settings back to
built-in defaults will now inherit the set's `HandlerDefaults` instead.
Review any set mixing `HandlerDefaults` with per-handler blocks.
- **JSON helpers now come from the `Jumoo.Json` package**, replacing
uSync's own copy which had drifted behind it.
`uSync.Core.Extensions.JsonTextExtensions` still works but is
`[Obsolete]` (removed in v20) — switch to `using Jumoo.Json;`. Note
`TryGetPropertyAsObject` → `TryGetPropertyAsJsonObject`,
`GetPropertyAsObject` → `GetPropertyAsJsonObject`, and missing/null
values now return `null` instead of `string.Empty`.
([#​1014](KevinJump/uSync#1014),
[#​1015](KevinJump/uSync#1015))
- Removed three O(n²) lookups from import (duplicate-key/"keys to keep"
checks now use set lookups; second-pass content/media imports index the
action list once instead of scanning it per item).
([#​1017](KevinJump/uSync#1017))
> Actions updated by a second pass are now updated in place, keeping
their original position in the results list, rather than being moved to
the end. Only display/reporting order is affected.
> **Extender API:** `List<uSyncAction>.CreateActionIndex()` and a
matching `UpdateActions(index, key, handlerAlias, attempt)` overload are
new.
- Serializing, comparing and expanding large property values allocates
far less, some previously on the large object heap. Inherited with the
move to `Jumoo.Json`.

**Extender API**
- `ISyncManagementService` gains `UnpackStreamAsync(Stream)`; the
synchronous `UnpackStream(Stream)` is now obsolete (removed in v19).
([#​1005](KevinJump/uSync#1005))

**Cleanup**
- Cleared the remaining build warnings left over from the Umbraco 18
upgrade: replaced `ITemplate.MasterTemplateAlias` with
`LayoutTemplateAlias`, and inlined the legacy `{localLink:x}` parsing
Umbraco is removing in v18. No behavioural changes.
([#​1002](KevinJump/uSync#1002),
[#​1003](KevinJump/uSync#1003),
[#​1004](KevinJump/uSync#1004))

**Full Changelog**:
KevinJump/uSync@v18.0.3...v18.1.0


Commits viewable in [compare
view](https://github.com/KevinJump/uSync/commits/v18.1.1).
</details>

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Levi Zitting <me@levizitting.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant