Skip to content

Commit

Permalink
fresh build
Browse files Browse the repository at this point in the history
  • Loading branch information
@warpech
warpech committed Jul 25, 2019
1 parent 8e59102 commit 14b27e0
Show file tree
Hide file tree
Showing 3 changed files with 401 additions and 1,896 deletions.
68 changes: 26 additions & 42 deletions dist/fast-json-patch.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -722,8 +722,7 @@ exports.unobserve = unobserve;
/**
* Observes changes made to an object, which can then be retrieved using generate
*/
function observe(obj, callback, inversible) {
if (inversible === void 0) { inversible = false; }
function observe(obj, callback) {
var patches = [];
var observer;
var mirror = getMirror(obj);
Expand All @@ -738,7 +737,7 @@ function observe(obj, callback, inversible) {
if (observer) {
return observer;
}
observer = { inversible: inversible };
observer = {};
mirror.value = helpers_1._deepClone(obj);
if (callback) {
observer.callback = callback;
Expand All @@ -751,20 +750,11 @@ function observe(obj, callback, inversible) {
observer.next = setTimeout(dirtyCheck);
};
if (typeof window !== 'undefined') { //not Node
if (window.addEventListener) { //standards
window.addEventListener('mouseup', fastCheck);
window.addEventListener('keyup', fastCheck);
window.addEventListener('mousedown', fastCheck);
window.addEventListener('keydown', fastCheck);
window.addEventListener('change', fastCheck);
}
else { //IE8
document.documentElement.attachEvent('onmouseup', fastCheck);
document.documentElement.attachEvent('onkeyup', fastCheck);
document.documentElement.attachEvent('onmousedown', fastCheck);
document.documentElement.attachEvent('onkeydown', fastCheck);
document.documentElement.attachEvent('onchange', fastCheck);
}
window.addEventListener('mouseup', fastCheck);
window.addEventListener('keyup', fastCheck);
window.addEventListener('mousedown', fastCheck);
window.addEventListener('keydown', fastCheck);
window.addEventListener('change', fastCheck);
}
}
observer.patches = patches;
Expand All @@ -774,18 +764,11 @@ function observe(obj, callback, inversible) {
clearTimeout(observer.next);
removeObserverFromMirror(mirror, observer);
if (typeof window !== 'undefined') {
if (window.removeEventListener) {
window.removeEventListener('mouseup', fastCheck);
window.removeEventListener('keyup', fastCheck);
window.removeEventListener('mousedown', fastCheck);
window.removeEventListener('keydown', fastCheck);
}
else {
document.documentElement.detachEvent('onmouseup', fastCheck);
document.documentElement.detachEvent('onkeyup', fastCheck);
document.documentElement.detachEvent('onmousedown', fastCheck);
document.documentElement.detachEvent('onkeydown', fastCheck);
}
window.removeEventListener('mouseup', fastCheck);
window.removeEventListener('keyup', fastCheck);
window.removeEventListener('mousedown', fastCheck);
window.removeEventListener('keydown', fastCheck);
window.removeEventListener('change', fastCheck);
}
};
mirror.observers.set(callback, new ObserverInfo(callback, observer));
Expand All @@ -795,11 +778,10 @@ exports.observe = observe;
/**
* Generate an array of patches from an observer
*/
function generate(observer, opts) {
if (opts === void 0) { opts = {}; }
function generate(observer, invertible) {
if (invertible === void 0) { invertible = false; }
var mirror = beforeDict.get(observer.object);
var inversible = typeof opts.inversible !== "undefined" ? opts.inversible : observer.inversible;
_generate(mirror.value, observer.object, observer.patches, "", { inversible: inversible });
_generate(mirror.value, observer.object, observer.patches, "", invertible);
if (observer.patches.length) {
core_1.applyPatch(mirror.value, observer.patches);
}
Expand All @@ -814,8 +796,7 @@ function generate(observer, opts) {
}
exports.generate = generate;
// Dirty check if obj is different from mirror, generate patches and update mirror
function _generate(mirror, obj, patches, path, opts) {
if (opts === void 0) { opts = { inversible: false }; }
function _generate(mirror, obj, patches, path, invertible) {
if (obj === mirror) {
return;
}
Expand All @@ -826,34 +807,36 @@ function _generate(mirror, obj, patches, path, opts) {
var oldKeys = helpers_1._objectKeys(mirror);
var changed = false;
var deleted = false;
var inversible = opts.inversible;
//if ever "move" operation is implemented here, make sure this test runs OK: "should not generate the same patch twice (move)"
for (var t = oldKeys.length - 1; t >= 0; t--) {
var key = oldKeys[t];
var oldVal = mirror[key];
if (helpers_1.hasOwnProperty(obj, key) && !(obj[key] === undefined && oldVal !== undefined && Array.isArray(obj) === false)) {
var newVal = obj[key];
if (typeof oldVal == "object" && oldVal != null && typeof newVal == "object" && newVal != null) {
_generate(oldVal, newVal, patches, path + "/" + helpers_1.escapePathComponent(key), opts);
_generate(oldVal, newVal, patches, path + "/" + helpers_1.escapePathComponent(key), invertible);
}
else {
if (oldVal !== newVal) {
changed = true;
if (inversible)
if (invertible) {
patches.push({ op: "test", path: path + "/" + helpers_1.escapePathComponent(key), value: helpers_1._deepClone(oldVal) });
}
patches.push({ op: "replace", path: path + "/" + helpers_1.escapePathComponent(key), value: helpers_1._deepClone(newVal) });
}
}
}
else if (Array.isArray(mirror) === Array.isArray(obj)) {
if (inversible)
if (invertible) {
patches.push({ op: "test", path: path + "/" + helpers_1.escapePathComponent(key), value: helpers_1._deepClone(oldVal) });
}
patches.push({ op: "remove", path: path + "/" + helpers_1.escapePathComponent(key) });
deleted = true; // property has been deleted
}
else {
if (inversible)
if (invertible) {
patches.push({ op: "test", path: path, value: mirror });
}
patches.push({ op: "replace", path: path, value: obj });
changed = true;
}
Expand All @@ -871,9 +854,10 @@ function _generate(mirror, obj, patches, path, opts) {
/**
* Create an array of patches from the differences in two objects
*/
function compare(tree1, tree2, opts) {
function compare(tree1, tree2, invertible) {
if (invertible === void 0) { invertible = false; }
var patches = [];
_generate(tree1, tree2, patches, '', opts);
_generate(tree1, tree2, patches, '', invertible);
return patches;
}
exports.compare = compare;
Expand Down
Loading

0 comments on commit 14b27e0

Please sign in to comment.