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

fixed a couple of potential issues...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-08-26 21:02:18 +03:00
parent 68301017bf
commit ad3443dd0d
1 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
diff.js
View File

@ -231,20 +231,24 @@ var proxy = function(path, func){
//---------------------------------------------------------------------
// Placeholders...
var NONE = {type: 'NONE_PLACEHOLDER'}
var EMPTY = {type: 'EMPTY_PLACEHOLDER'}
//---------------------------------------------------------------------
// Logic patterns...
//
// NOTE: there seems to be no actual benefit from splitting patterns
// into a separate module...
// - pointless without cmp(..) and thus diff.js
// - importing it alone is a mistake waiting to happen...
// - more work more abstraction, more code, more structure,
// more notes and more maintenance...
// - more files to download/upload/...
// ...the only thing in favor of the split are the warm-and-fuzzies
// of being modular, but in this case it's modularity for the sake
// of modularity.
//
// XXX add use-case docs...
// XXX need to avoid recursion...
// XXX should we avoid backtracking when pattern matching???
// ...specifically when working with IN and OF...
//
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
var LogicTypeClassPrototype = {
@ -529,6 +533,27 @@ object.makeConstructor('OF', Object.assign(new LogicType(), {
//---------------------------------------------------------------------
// Placeholders...
//
// NOTE: these can be anything as long as they are unique and JSON
// compatible. This is done specifically to enable replacing the
// actual values before diffing to avoid clashes with the input
// objects -- this can occur as we use cmp(..) to structurally
// compare values on the patch stage rather than identity
// compares (i.e. '===') as all object linking can/will be severed
// by JSON.stringify(..).
// NOTE: using Symbol(..) here is a bad idea because symbols are not
// serializable to JSON.
// Used to represen non-existent items.
var NONE = {type: 'NONE_PLACEHOLDER'}
// Used to represent empty item slots (in sparse arrays).
var EMPTY = {type: 'EMPTY_PLACEHOLDER'}
//---------------------------------------------------------------------
// Diff framework...
//
@ -1559,6 +1584,7 @@ Types.set(Object, {
},
// XXX add object compatibility checks...
patch: function(obj, key, change, ...rest){
var EMPTY = this.EMPTY
// object attr...
if(typeof(key) == typeof('str')){
if(this.cmp(change.B, EMPTY)){
@ -1682,6 +1708,9 @@ Types.set(Array, {
// XXX add object compatibility checks...
// XXX revise...
patch: function(obj, key, change){
var NONE = this.NONE
var EMPTY = this.EMPTY
var i = key instanceof Array ? key[0] : key
var j = key instanceof Array ? key[1] : key
@ -2212,7 +2241,11 @@ var DiffPrototype = {
check: function(obj){
return Object.create(this.constructor.types).check(this.diff, obj) },
patch: function(obj){
return Object.create(this.constructor.types).patch(this, obj) },
return Object.assign(
Object.create(this.constructor.types),
// get the actual placeholders...
this.placeholders)
.patch(this, obj) },
unpatch: function(obj){
return this.reverse().patch(obj) },