flynx/diff.js
1
0
Fork 0
mirror of https://github.com/flynx/diff.js.git synced 2025-10-28 10:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

more experimenting...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2021-07-16 07:41:02 +03:00
parent 01c07bfe18
commit 112ca65a1d
1 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
diff2.js
View File

@ -760,6 +760,7 @@ function(A, B, cmp){
// [
// // change...
// [
// // XXX do we need the indexes???
// <a-index>, <a-chunk>,
// <b-index>, <b-chunk>,
// ],
@ -779,7 +780,9 @@ function(A, B, cmp){
var pa = 0
var pb = 0
return commonSections(A, B, cmp)
// remove length...
.slice(1)
// add rear block...
.concat([[A.length, B.length, 0]])
.reduce(function(gaps, [a, b, l]){
// only push changes of >0 length...
@ -797,6 +800,7 @@ function(A, B, cmp){
return gaps }, []) }
//
// XXX if two sub-trees are different, do we treat them as a big set of
// atomic changes or replace X with Y???
@ -838,7 +842,7 @@ function(A, B, options={}){
// XXX this completely ignores the path/key...
// XXX this works great for arrays but is questionable on other stuff...
var valueDiff =
function(A, B){
function(A, B, options={}){
return diffSections(
[...objectWalkerWithText(A)
.chain(serializePaths)],
@ -856,6 +860,31 @@ function(A, B){
var diff = keyValueDiff
// convert diff sections into diff...
//
// XXX add context lines...
var toDiff =
module.toDiff =
function*(A, B, options={}){
yield* diff(A, B, options)
.iter()
.map(function*([ia, ca, ib, cb]){
// XXX add pre-context...
// ...if changes are adjacent, then skip context...
yield ['=']
yield* ca
.map(function(change){
return ['-', ...change] })
yield* cb
.map(function(change){
return ['+', ...change] })
// XXX add post-context...
// ...if changes are adjacent, then skip context...
yield ['=']
}) }
//---------------------------------------------------------------------
// XXX move to test...
@ -1034,15 +1063,29 @@ console.log([
) ])
console.log('---')
console.dir(
[...toDiff(
keyValueDiff(
[['a', 'b'], 2, 3],
[1, 2, {x:1,y:2}],
))], {depth: null})
console.log('---')
// XXX BUG: no change is detected here...
console.dir(
keyValueDiff(
keyValueDiff(
[,,,1,2,3],
[1,2,{x:1,y:2}],
), {depth: null})
console.log('')
// XXX BUG: the first change is wrong, it should be "add 3 empty"...
console.dir(
[...toDiff(
[,,,1,2,3],
[1,2,3],
), {depth: null})
[1,2,{x:1,y:2}],
)], {depth: null})
console.log('---')