roboto-js 1.5.3 → 1.5.4

package/dist/cjs/rbt_api.cjs

@@ -940,9 +940,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
       if (Array.isArray(response.data.items)) {
         //console.log('RBTAPI.query RESPONSE PRE', response.data.items);
         response.data.items = response.data.items.map(function (record) {
-          return new _rbt_object["default"](record, _this3.axios, {
-            isNew: true
-          });
+          return new _rbt_object["default"](record, _this3.axios);
         });
       }
 

package/dist/cjs/rbt_object.cjs

@@ -35,7 +35,7 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
     this.id_revision = record.id_revision;
     this.rpcMeta = {
       changes: [],
-      isNew: options.isNew || false
+      isNew: options.isNew || record.revision == 0 || false
     };
     if (record.data) {
       this._data = this._deepUnpackJson(record.data);
@@ -87,6 +87,9 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
 
       if (options.merge) {
         var mergedValue = _lodash["default"].mergeWith({}, currentValue, value, function (objValue, srcValue) {
+          if (srcValue === undefined) {
+            return undefined; // Indicate to delete when merging
+          }
           if (_lodash["default"].isArray(objValue)) {
             return srcValue; // Customize merging behavior for arrays
           }
@@ -95,12 +98,22 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
             return srcValue;
           }
         });
+        // Process merged object to remove any keys set explicitly to undefined
+        Object.keys(mergedValue).forEach(function (key) {
+          if (mergedValue[key] === undefined) {
+            _lodash["default"].unset(mergedValue, key);
+          }
+        });
         if (!_lodash["default"].isEqual(currentValue, mergedValue)) {
           _lodash["default"].set(this._data, path, mergedValue); // Set the merged value at the deep path
           this._addChange(path);
         }
       } else {
-        if (!_lodash["default"].isEqual(currentValue, value)) {
+        // If value is undefined and not merging, delete the key
+        if (value === undefined) {
+          _lodash["default"].unset(this._data, path);
+          this._addChange(path);
+        } else if (!_lodash["default"].isEqual(currentValue, value)) {
           _lodash["default"].set(this._data, path, value); // Set the value directly at the deep path
           this._addChange(path);
         }
@@ -267,6 +280,32 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
         rpcMeta: this.rpcMeta
       });
     }
+  }, {
+    key: "toDeltaRecord",
+    value: function toDeltaRecord() {
+      var changes = this.rpcMeta.changes;
+
+      // Initialize deltaData as an empty object
+      var sourceData = this._data;
+      var deltaData = {};
+
+      // Populate deltaData only with keys specified in changes
+      changes.forEach(function (path) {
+        // default value explicitly set to undefined
+        var value = _lodash["default"].get(sourceData, path, undefined);
+        // Use _.set to ensure nested keys are correctly assigned
+        _lodash["default"].set(deltaData, path, value);
+      });
+
+      // mark as delta
+      this.rpcMeta.delta = true;
+      var clonedData = _lodash["default"].cloneDeep(this._internalData);
+      clonedData.data = deltaData;
+      return _objectSpread(_objectSpread({}, clonedData), {}, {
+        dataJson: JSON.stringify(deltaData),
+        rpcMeta: this.rpcMeta
+      });
+    }
   }, {
     key: "clone",
     value: function clone() {
@@ -298,24 +337,29 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
               throw new Error('Cannot save object without type');
             case 2:
               _context3.prev = 2;
-              record = this.toRecord();
-              _context3.next = 6;
+              debugger;
+              if (this.rpcMeta.isNew) {
+                record = this.toRecord();
+              } else {
+                record = this.toDeltaRecord();
+              }
+              _context3.next = 7;
               return this._axios.post('/object_service/saveObject', [record]);
-            case 6:
+            case 7:
               response = _context3.sent;
               if (!(response.data.ok === false)) {
-                _context3.next = 9;
+                _context3.next = 10;
                 break;
               }
               throw new Error(response.data.message);
-            case 9:
+            case 10:
               if (!(((_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.result) == 'NO_CHANGES')) {
-                _context3.next = 12;
+                _context3.next = 13;
                 break;
               }
               this.rpcMeta.isNew = false;
               return _context3.abrupt("return", this);
-            case 12:
+            case 13:
               if ((_response$data2 = response.data) !== null && _response$data2 !== void 0 && _response$data2.newData) {
                 // apply new incoming data
                 this.setData(response.newData);
@@ -325,18 +369,18 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
               this.type = response.data.type;
               this.rpcMeta.isNew = false;
               return _context3.abrupt("return", this);
-            case 20:
-              _context3.prev = 20;
+            case 21:
+              _context3.prev = 21;
               _context3.t0 = _context3["catch"](2);
               console.log('RbtObject.save.error:', _context3.t0 === null || _context3.t0 === void 0 || (_e$response = _context3.t0.response) === null || _e$response === void 0 ? void 0 : _e$response.data);
               this._error = _context3.t0;
               //console.log(e.response.data);
               throw _context3.t0;
-            case 25:
+            case 26:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 20]]);
+        }, _callee3, this, [[2, 21]]);
       }));
       function save() {
         return _save.apply(this, arguments);

package/dist/esm/rbt_api.js

@@ -522,9 +522,7 @@ export default class RbtApi {
     if (Array.isArray(response.data.items)) {
       //console.log('RBTAPI.query RESPONSE PRE', response.data.items);
       response.data.items = response.data.items.map(record => {
-        return new RbtObject(record, this.axios, {
-          isNew: true
-        });
+        return new RbtObject(record, this.axios);
       });
     }
 

package/dist/esm/rbt_object.js

@@ -8,7 +8,7 @@ export default class RbtObject {
     this.id_revision = record.id_revision;
     this.rpcMeta = {
       changes: [],
-      isNew: options.isNew || false
+      isNew: options.isNew || record.revision == 0 || false
     };
     if (record.data) {
       this._data = this._deepUnpackJson(record.data);
@@ -51,6 +51,9 @@ export default class RbtObject {
 
     if (options.merge) {
       const mergedValue = _.mergeWith({}, currentValue, value, (objValue, srcValue) => {
+        if (srcValue === undefined) {
+          return undefined; // Indicate to delete when merging
+        }
         if (_.isArray(objValue)) {
           return srcValue; // Customize merging behavior for arrays
         }
@@ -59,12 +62,22 @@ export default class RbtObject {
           return srcValue;
         }
       });
+      // Process merged object to remove any keys set explicitly to undefined
+      Object.keys(mergedValue).forEach(key => {
+        if (mergedValue[key] === undefined) {
+          _.unset(mergedValue, key);
+        }
+      });
       if (!_.isEqual(currentValue, mergedValue)) {
         _.set(this._data, path, mergedValue); // Set the merged value at the deep path
         this._addChange(path);
       }
     } else {
-      if (!_.isEqual(currentValue, value)) {
+      // If value is undefined and not merging, delete the key
+      if (value === undefined) {
+        _.unset(this._data, path);
+        this._addChange(path);
+      } else if (!_.isEqual(currentValue, value)) {
         _.set(this._data, path, value); // Set the value directly at the deep path
         this._addChange(path);
       }
@@ -182,6 +195,31 @@ export default class RbtObject {
       rpcMeta: this.rpcMeta
     };
   }
+  toDeltaRecord() {
+    let changes = this.rpcMeta.changes;
+
+    // Initialize deltaData as an empty object
+    let sourceData = this._data;
+    let deltaData = {};
+
+    // Populate deltaData only with keys specified in changes
+    changes.forEach(path => {
+      // default value explicitly set to undefined
+      const value = _.get(sourceData, path, undefined);
+      // Use _.set to ensure nested keys are correctly assigned
+      _.set(deltaData, path, value);
+    });
+
+    // mark as delta
+    this.rpcMeta.delta = true;
+    const clonedData = _.cloneDeep(this._internalData);
+    clonedData.data = deltaData;
+    return {
+      ...clonedData,
+      dataJson: JSON.stringify(deltaData),
+      rpcMeta: this.rpcMeta
+    };
+  }
   clone() {
     // Create a deep copy of the current object's data
     const clonedData = _.cloneDeep(this._internalData);
@@ -201,7 +239,13 @@ export default class RbtObject {
       throw new Error('Cannot save object without type');
     }
     try {
-      const record = this.toRecord();
+      debugger;
+      let record;
+      if (this.rpcMeta.isNew) {
+        record = this.toRecord();
+      } else {
+        record = this.toDeltaRecord();
+      }
       const response = await this._axios.post('/object_service/saveObject', [record]);
       if (response.data.ok === false) {
         throw new Error(response.data.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboto-js",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "type": "module",
   "description": "",
   "main": "dist/cjs/index.cjs",

package/src/rbt_api.js

@@ -597,7 +597,7 @@ export default class RbtApi {
     if (Array.isArray(response.data.items)) {
       //console.log('RBTAPI.query RESPONSE PRE', response.data.items);
       response.data.items = response.data.items.map(record => {
-        return new RbtObject(record, this.axios, { isNew: true });
+        return new RbtObject(record, this.axios);
       });
     }
 

package/src/rbt_object.js

@@ -10,7 +10,7 @@ export default class RbtObject {
     this.id_revision = record.id_revision;
     this.rpcMeta = { 
       changes: [], 
-      isNew: options.isNew || false 
+      isNew: options.isNew || record.revision == 0 || false 
     };
     
     if(record.data){
@@ -57,6 +57,9 @@ export default class RbtObject {
 
     if (options.merge) {
         const mergedValue = _.mergeWith({}, currentValue, value, (objValue, srcValue) => {
+            if (srcValue === undefined) {
+                return undefined; // Indicate to delete when merging
+            }
             if (_.isArray(objValue)) {
                 return srcValue; // Customize merging behavior for arrays
             }
@@ -65,12 +68,22 @@ export default class RbtObject {
                 return srcValue;
             }
         });
+        // Process merged object to remove any keys set explicitly to undefined
+        Object.keys(mergedValue).forEach(key => {
+            if (mergedValue[key] === undefined) {
+                _.unset(mergedValue, key);
+            }
+        });
         if (!_.isEqual(currentValue, mergedValue)) {
             _.set(this._data, path, mergedValue);  // Set the merged value at the deep path
             this._addChange(path);
         }
     } else {
-        if (!_.isEqual(currentValue, value)) {
+        // If value is undefined and not merging, delete the key
+        if (value === undefined) {
+            _.unset(this._data, path);
+            this._addChange(path);
+        } else if (!_.isEqual(currentValue, value)) {
             _.set(this._data, path, value);  // Set the value directly at the deep path
             this._addChange(path);
         }
@@ -202,6 +215,34 @@ export default class RbtObject {
     };
   }
 
+  toDeltaRecord(){
+
+    let changes = this.rpcMeta.changes;
+
+    // Initialize deltaData as an empty object
+    let sourceData = this._data;
+    let deltaData = {};
+
+    // Populate deltaData only with keys specified in changes
+    changes.forEach(path => {
+      // default value explicitly set to undefined
+      const value = _.get(sourceData, path, undefined);
+      // Use _.set to ensure nested keys are correctly assigned
+      _.set(deltaData, path, value);
+    });
+
+    // mark as delta
+    this.rpcMeta.delta = true;
+    const clonedData = _.cloneDeep(this._internalData);
+    clonedData.data = deltaData;
+
+    return {
+      ...clonedData,
+      dataJson: JSON.stringify(deltaData),
+      rpcMeta: this.rpcMeta
+    }
+  }
+
   clone() {
     // Create a deep copy of the current object's data
     const clonedData = _.cloneDeep(this._internalData);
@@ -222,7 +263,17 @@ export default class RbtObject {
     }
 
     try {
-      const record = this.toRecord();
+
+      debugger;
+      let record;
+      if(this.rpcMeta.isNew){
+        record = this.toRecord();
+      }
+      else{
+        record = this.toDeltaRecord();
+      }
+
+
       const response = await this._axios.post('/object_service/saveObject', [record]);
 
       if (response.data.ok === false) {