Skip to content

Diffing tools #892

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

Jump to bottom
Merged
merged 68 commits into from
May 10, 2025
Merged

Diffing tools #892

merged 68 commits into from
May 10, 2025

Conversation

@streamich
Copy link
Owner

@streamich streamich commented May 10, 2025 •
edited
Loading

  • Generic string diff
  • Binary diff
  • Line/array element diff
  • JSON Patch diff
  • JSON CRDT diff

streamich added 30 commits May 2, 2025 00:57
@streamich
feat(json-crdt-peritext-ui): 🎸 implement text diff
395b4db
@streamich
feat(util): 🎸 add diff utility methods
0fb9c7c
@streamich
test(util): 💍 improve diff tests add fuzz tests
9f35ef7
@streamich
test(util): 💍 add fuzz testing for diff
016b166
@streamich
test(util): 💍 add diffEdit() tests
163278a
@streamich
feat(json-crdt-diff): 🎸 implement StrNode diff
f1db4d8
@streamich
feat(json-crdt-diff): 🎸 remove deleted "obj" keys
a0e148f
@streamich
feat(json-crdt-diff): 🎸 insert missing keys into "obj"
14e64fb
@streamich
feat(json-crdt-diff): 🎸 support entering "obj" entries
036b58e
@streamich
chore(json-crdt-diff): 🤖 add shorter implementation
8671b8c
@streamich
feat(json-crdt-diff): 🎸 handle case where "obj" value not compatible …
587d2c5 
…with dst value
@streamich
feat(json-hash): 🎸 produce hashes for binary data
3abcfcf
@streamich
test(json-hash): 💍 implement *structural hash* structHash() for any J…
3133a5f 
…SOn-like value
@streamich
feat(json-hash): 🎸 assert structural hash in variants
9187472
@streamich
feat(json-hash): 🎸 implement structural hashing for CRDT nodes
ada9067
@streamich
perf(json-hash): ⚡️ use custom insertion sort implementation
b55ff6a
@streamich
feat(json-crdt-diff): 🎸 implement "val" node diff
030023b
@streamich
feat(json-crdt-diff): 🎸 implement diff for "vec" nodes
4e3067e
@streamich
style: 💄 small codebase cleanup
d2489ad
@streamich
refactor(util): 💡 move tests
67f5c77
@streamich
feat(util): 🎸 implement binary to hex transforms
66c37c1
@streamich
feat(util): 🎸 implement diff for binary data
a740d02
@streamich
fix(json-crdt-diff): 🐛 use unicode encoding for binary data
1df2781
@streamich
feat(json-crdt-diff): 🎸 implement "bin" node diffing
c03ede5
@streamich
refactor(util): 💡 cleanup string diffing code
a262307
@streamich
feat(json-crdt-diff): 🎸 pass in source length on patch application
5968a47
@streamich
feat(json-crdt-diff): 🎸 implement initial "arr" node diff
fd88982
@streamich
feat(util): 🎸 initial, outer, implementation of array diff
2a40471
@streamich
feat(util): 🎸 implement array diff child element entry
1853633
@streamich
feat(json-crdt-diff): 🎸 implement array diff apply(), start using arr…
bc25ff6 
…ayd diff in CRDT
streamich added 26 commits May 7, 2025 15:39
@streamich
feat(util): 🎸 initial by-line diff implementation
d786e53
@streamich
test(json-patch-diff): 💍 add fuzz testing
5e500c1
@streamich
feat(util): 🎸 create line-by-line patch module
ca9ae65
@streamich
refactor(util): 💡 rename string diff operation type enum values
5ae14bb
@streamich
feat(util): 🎸 handle new line chars
5ff05bf
@streamich
fix(util): 🐛 do not emit empty operations
bdde345
@streamich
feat(util): 🎸 normalize line beginnings across inserts
b6f142a
@streamich
fix(util): 🐛 do not emit empty operations
7383d95
@streamich
fix(util): 🐛 keep new-line on line end fixes
b5a9b99
@streamich
feat(util): 🎸 match line in line patch
68f131e
@streamich
fix(util): 🐛 correct line diff line beginning normalization
a29b4b7
@streamich
test(util): 💍 add line diff fuzzer
5019ddf
@streamich
fix(util): 🐛 improve handling of line separators
33a8316
@streamich
fix(util): 🐛 correctly determini line operation on last line no-newli…
82a97fe 
…ne op
@streamich
fix(util): 🐛 correctly assign last line patch operation
20d1199
@streamich
test(util): 💍 pass line diff fuzz tests
33c6e57
@streamich
feat(json-patch-diff): 🎸 use line diff in JSON Patch diff
83694ad
@streamich
fix(util): 🐛 improve line diff assignment, use a newline char per line
11eaaa8
@streamich
feat(json-crdt-diff): 🎸 use line diff in JSON CRDT diff
ff97192
@streamich
test(json-crdt-diff): 💍 add fuzz testing for arrays
cc166d9
@streamich
test: 💍 fixup all tests
941dbd5
@streamich
perf(util): ⚡️ cleanup line diff algorithm
0330f0d
@streamich
fix(json-patch-diff): 🐛 allow string node type change
68b8b27
@streamich
refactor(json-patch-diff): 💡 rename Diff to JsonPatchDiff
12998ea
@streamich
refactor(json-crdt-diff): 💡 rename Diff to JsonCrdtDiff
414944c
@streamich
style: 💄 fix linter issues
cda9d78
@streamich streamich merged commit 35d1306 into master May 10, 2025
3 checks passed
@streamich streamich deleted the json-crdt-diff branch May 10, 2025 10:08
@github-actions
Copy link

github-actions bot commented May 10, 2025

🎉 This PR is included in version 17.41.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

released

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@streamich