@azrico/webobject 1.2.33 → 1.2.35

package/dist/src/structs/ObjectManager.d.ts

@@ -33,7 +33,7 @@ export declare class ObjectManager<ObjType extends SimpleObject> {
     getSaveResult(): any;
     getSaveResultType(): saveResultType | null;
     setSaveResult(toObj: any, type: saveResultType): void | undefined;
-    apply_changes(): boolean | undefined;
+    apply_changes(): boolean;
     getValue(key: PropOf<ObjType>, original?: boolean): import("./SimpleObject").PropType<ObjType, any> | undefined;
     get: (key: PropOf<ObjType>, original?: boolean) => import("./SimpleObject").PropType<ObjType, any> | undefined;
     /**

package/dist/src/structs/ObjectManager.js

@@ -161,7 +161,7 @@ var ObjectManager = /*#__PURE__*/function () {
     key: "apply_changes",
     value: function apply_changes() {
       var _this$obj5;
-      return (_this$obj5 = this.obj) === null || _this$obj5 === void 0 ? void 0 : _this$obj5.apply_changes();
+      return ((_this$obj5 = this.obj) === null || _this$obj5 === void 0 ? void 0 : _this$obj5.apply_changes()) || false;
     }
   }, {
     key: "getValue",

package/dist/src/structs/SimpleObject.js

@@ -355,22 +355,24 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
      * Apply the changes and empty the delta object
      */
     function apply_changes() {
-      if (!this.__use_delta) {
-        //in this mode , we track changes by updating the original product
-        this.setOriginal();
+      try {
+        if (!this.__use_delta) {
+          //in this mode , we track changes by updating the original product
+          this.setOriginal();
+          return true;
+        }
+        if (!this.isChanged) {
+          console.warn("No changes to apply");
+          return false;
+        }
+        for (var key in this.__delta) {
+          var nv = this.__delta[key];
+          this[key] = nv;
+        }
         return true;
-      }
-      if (!this.isChanged) {
-        console.warn("No changes to apply");
+      } finally {
         this.clear_changes();
-        return false;
-      }
-      for (var key in this.__delta) {
-        var nv = this.__delta[key];
-        this[key] = nv;
       }
-      this.clear_changes();
-      return true;
     }
   }, {
     key: "clear_changes",
@@ -398,23 +400,28 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
     /* -------------------------------------------------------------------------- */
     function get() {
       var _this2 = this;
-      if (this.__use_delta) return !(0, _object.object_isEmpty)(this.__delta);else {
-        var orig = this.getOriginal();
-        if (!orig) return false; //we dont know if anything has changed
-        /* if object is not using delta mode, check changes by comparing changable fields with original object */
-        if (Array.isArray(this.__changeables)) {
-          //console.log("chk", this.__changeables, "for changes");
-          return this.__changeables.find(function (c) {
-            return !(0, _object.object_equals)(_this2[c], orig[c]);
-          }) != undefined;
-        } else {
-          /* check all fields */
-          for (var key in this) {
-            if (key.startsWith("__")) continue;
-            if (!(0, _object.object_equals)(this[key], orig[key])) return true;
-          }
-          return false;
+      ////const deltaIsBlank = object_isEmpty(this.__delta);
+      ////if (!deltaIsBlank) return true; //delta is not blank, definitely changed
+      ////if (this.__use_delta) return !deltaIsBlank; //trust the delta.
+      if (this.__use_delta) return !(0, _object.object_isEmpty)(this.__delta);
+      /* -------------------------------------------------------------------------- */
+      /*                       check the properties one by one                      */
+      /* -------------------------------------------------------------------------- */
+      var orig = this.getOriginal();
+      if (!orig) return false; //we dont know if anything has changed
+      /* if object is not using delta mode, check changes by comparing changable fields with original object */
+      if (Array.isArray(this.__changeables)) {
+        //console.log("chk", this.__changeables, "for changes");
+        return this.__changeables.find(function (c) {
+          return !(0, _object.object_equals)(_this2[c], orig[c]);
+        }) != undefined;
+      } else {
+        /* check all fields */
+        for (var key in this) {
+          if (key.startsWith("__")) continue;
+          if (!(0, _object.object_equals)(this[key], orig[key])) return true;
         }
+        return false;
       }
       return false;
     }
@@ -819,7 +826,8 @@ function _getSubProperty2(key, subkey) {
   return subobj[subkey];
 }
 function _setProperty2(key, value) {
-  if (this.__use_delta) this.__delta[key] = value;else this[key] = value;
+  this.__delta[key] = value; //always update delta to keep track of changes
+  if (!this.__use_delta) this[key] = value; //on noDelta mode, also update the obj
   return true;
 }
 function _setDefaultProperty2(key, value) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.2.33",
+    "version": "1.2.35",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",