Fixed applyPatch problems

Author: Vlad Balin

dist/index.js

@@ -11,7 +11,7 @@ export interface IORecord extends IONode {
 }
 export declare const IORecordMixin: {
     save(this: IORecord, options?: IOOptions): IOPromise<any>;
-    savePatch(this: IORecord, patch: object, options?: IOOptions): IOPromise<any>;
+    savePatch(this: any, patch: object, options?: IOOptions): any;
     fetch(options?: IOOptions): IOPromise<any>;
     destroy(options?: IOOptions): IOPromise<any>;
 };

dist/index.js.map

@@ -29,20 +29,22 @@ export const IORecordMixin = {
         );
     },
 
-    savePatch( this : IORecord, patch : object, options : IOOptions = {} ){
+    savePatch( this : any, patch : object, options : IOOptions = {} ){
         // Apply patch to the record...
-        ( this as any ).set( patch );
+        this.transaction( () => {
+            for( let key in patch ){
+                this.deepSet( key, patch[ key ] );
+            }
+        });
 
         const endpoint = this.getEndpoint();
 
         // Perform full save for the new models or if patch method is not supported...
         if( this.isNew() || !endpoint.patch ) return this.save();
 
-        const json = this.toJSON();
-
         return startIO(
             this,
-            endpoint.patch( this.id, patchToJson( patch, json ), options, this ),
+            endpoint.patch( this.id, patchToJson( patch, this.toJSON() ), options, this ),
             options,
 
             update => {
@@ -80,18 +82,22 @@ export const IORecordMixin = {
     }
 }
 
-function patchToJson( patch, json ){
+function deepGet( obj : object, path : string ){
+    let current = obj;
+
+    for( let key of path.split( '.' ) ){
+        current = current[ key ];
+        if( !current ) break;
+    }
+
+    return current;
+}
+
+function patchToJson( patch : object, json : object ){
     const res = {};
 
     for( let name in patch ){
-        const patchValue = patch[ name ];
-
-        if( patchValue && Object.getPrototypeOf( patchValue ) === Object.prototype ){
-            res[ name ] = patchToJson( patchValue, json[ name ] );
-        }
-        else{
-            res[ name ] = json[ name ];
-        }
+        res[ name ] = deepGet( json, name );
     }
 
     return res;

lib/record/io-mixin.d.ts

@@ -2101,12 +2101,15 @@ var IORecordMixin = {
     savePatch: function (patch, options) {
         var _this = this;
         if (options === void 0) { options = {}; }
-        this.set(patch);
+        this.transaction(function () {
+            for (var key in patch) {
+                _this.deepSet(key, patch[key]);
+            }
+        });
         var endpoint = this.getEndpoint();
         if (this.isNew() || !endpoint.patch)
             return this.save();
-        var json = this.toJSON();
-        return startIO(this, endpoint.patch(this.id, patchToJson(patch, json), options, this), options, function (update) {
+        return startIO(this, endpoint.patch(this.id, patchToJson(patch, this.toJSON()), options, this), options, function (update) {
             _this.set(update, __assign({ parse: true }, options));
         });
     },
@@ -2129,16 +2132,20 @@ var IORecordMixin = {
         });
     }
 };
+function deepGet(obj, path) {
+    var current = obj;
+    for (var _i = 0, _a = path.split('.'); _i < _a.length; _i++) {
+        var key = _a[_i];
+        current = current[key];
+        if (!current)
+            break;
+    }
+    return current;
+}
 function patchToJson(patch, json) {
     var res = {};
     for (var name_1 in patch) {
-        var patchValue = patch[name_1];
-        if (patchValue && Object.getPrototypeOf(patchValue) === Object.prototype) {
-            res[name_1] = patchToJson(patchValue, json[name_1]);
-        }
-        else {
-            res[name_1] = json[name_1];
-        }
+        res[name_1] = deepGet(json, name_1);
     }
     return res;
 }