@azrico/webobject 1.4.166 → 1.4.167

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

@@ -96,7 +96,14 @@ export declare class ObjectManager<ObjType extends SimpleObject> extends RawObje
      * @returns
      */
     toggleOption(key: string, value: any): Promise<void>;
-    setOption(key: string, value: any): Promise<any[] | undefined>;
+    getOption(key: string): any;
+    /**
+     * updates `__options` and runs the `event_run`
+     * @param key
+     * @param value
+     * @returns true if changed, false otherwise
+     */
+    setOption(key: string, value: any): Promise<boolean>;
     /**
      * use an option and detect its changes in real time. similar to recat state
      * @param key name of the option
@@ -112,7 +119,6 @@ export declare class ObjectManager<ObjType extends SimpleObject> extends RawObje
      * @param action
      */
     holdOption(key: string, value: any, nextvalue: any, action: Function): Promise<void>;
-    getOption(key: string): any;
     addError(title?: string, message?: string, sendToRegister?: boolean | "auto"): any[] | undefined;
     getErrors(): any[];
     clearErrors(): boolean;

package/dist/src/structs/ObjectManager.js

@@ -596,24 +596,40 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
       }
       return toggleOption;
     }())
+  }, {
+    key: "getOption",
+    value: function getOption(key) {
+      if (this.__options == null) return undefined;
+      key = key.toLowerCase();
+      return this.__options[key];
+    }
+    /**
+     * updates `__options` and runs the `event_run`
+     * @param key
+     * @param value
+     * @returns true if changed, false otherwise
+     */
   }, {
     key: "setOption",
-    value: function () {
+    value: (function () {
       var _setOption = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(key, value) {
+        var isChanged;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               if (this.__options == null) this.__options = {};
+              key = key.toLowerCase();
+              isChanged = this.__options[key] !== value;
               if (value == null) {
                 delete this.__options[key];
               } else {
                 this.__options[key] = value;
               }
-              _context10.next = 4;
+              _context10.next = 6;
               return this.event_run("on_option_change", key, value);
-            case 4:
-              return _context10.abrupt("return", _context10.sent);
-            case 5:
+            case 6:
+              return _context10.abrupt("return", isChanged);
+            case 7:
             case "end":
               return _context10.stop();
           }
@@ -629,6 +645,7 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
      * @param key name of the option
      * @returns value of the option
      */
+    )
   }, {
     key: "useOption",
     value: function useOption(key) {
@@ -674,16 +691,11 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
         return _holdOption.apply(this, arguments);
       }
       return holdOption;
-    }())
-  }, {
-    key: "getOption",
-    value: function getOption(key) {
-      if (this.__options == null) return undefined;
-      return this.__options[key];
-    }
+    }()
     /* -------------------------------------------------------------------------- */
     /*                                   Errors                                   */
     /* -------------------------------------------------------------------------- */
+    )
   }, {
     key: "addError",
     value: function addError(title, message) {
@@ -708,10 +720,8 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
   }, {
     key: "useIsChanged",
     value: function useIsChanged() {
-      var _this4 = this;
-      return this.event_use("on_{change,save,load}", function () {
-        return _this4.isChanged;
-      });
+      return this.useOption("ischanged");
+      //// return this.event_use("on_{change,save,load}", () => this.isChanged);
     }
     /* -------------------------------------------------------------------------- */
   }], [{

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

@@ -24,7 +24,7 @@ export declare class SimpleObject extends MapableObject {
     _static(): Function;
     protected __originalobject?: this;
     protected __delta: Partial<this>;
-    protected __changed: boolean;
+    protected __has_delta: boolean;
     protected __lastChanged?: string;
     protected __is_readonly?: boolean;
     protected __throw_errors?: boolean;
@@ -44,31 +44,27 @@ export declare class SimpleObject extends MapableObject {
     _index_key: string;
     _index_value: number;
     constructor(is_readonly?: boolean);
-    /**
-     * load all properties in `initObject` into the current object
-     * @param initObject
-     * @param fullUpdate
-     * @returns
-     */
-    loadValues(initObject: any, fullUpdate?: boolean): boolean;
-    static loadValues(obj: SimpleObject, initObject: any, fullUpdate?: boolean): boolean;
-    static getValue<T extends SimpleObject, MKey extends PropOf<T>>(o: T, key: MKey, original?: boolean): PropType<T, MKey> | undefined;
     getValue: <MKey extends keyof this>(key: MKey, original?: boolean) => PropType<this, MKey>;
     get: <MKey extends keyof this>(key: MKey, original?: boolean) => PropType<this, MKey>;
+    static getValue<T extends SimpleObject, MKey extends PropOf<T>>(o: T, key: MKey, original?: boolean): PropType<T, MKey> | undefined;
     /**
-     * set value
-     * @param key
-     * @param value
+     * set value and run the event handlers if needed
      * @return true if changed , false otherwise
      */
     setValue(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType): Promise<boolean>;
     /**
-     * set value
-     * @param key
-     * @param value
+     * set value and run the event handlers if needed
      * @return true if changed , false otherwise
      */
     set: (key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType) => Promise<boolean>;
+    /**
+     * load all properties in `initObject` into the current object
+     * @param initObject
+     * @param fullUpdate
+     * @returns
+     */
+    loadValues(initObject: any, fullUpdate?: boolean): boolean;
+    static loadValues(obj: SimpleObject, initObject: any, fullUpdate?: boolean): boolean;
     setTemp(key: string, value: any, sendChanges?: sendChangesType): Promise<boolean>;
     clearRefreshFunction(): Promise<void>;
     setRefreshFunction(new_fnc: any): Promise<any>;

package/dist/src/structs/SimpleObject.js

@@ -46,7 +46,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     _defineProperty(_this, "__originalobject", void 0);
     //changes are saved here
     _defineProperty(_this, "__delta", {});
-    _defineProperty(_this, "__changed", false);
+    _defineProperty(_this, "__has_delta", false);
     //the last thing that was changed on this object
     _defineProperty(_this, "__lastChanged", void 0);
     //is the object read only
@@ -77,9 +77,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     _defineProperty(_this, "getValue", _assertClassBrand(_SimpleObject_brand, _this, _getProperty));
     _defineProperty(_this, "get", _assertClassBrand(_SimpleObject_brand, _this, _getProperty));
     /**
-     * set value
-     * @param key
-     * @param value
+     * set value and run the event handlers if needed
      * @return true if changed , false otherwise
      */
     _defineProperty(_this, "set", _this.setValue);
@@ -112,35 +110,20 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     value: function _static() {
       return this.constructor;
     }
-  }, {
-    key: "loadValues",
-    value: /* -------------------------------------------------------------------------- */
-    /*                                    Load                                    */
-    /* -------------------------------------------------------------------------- */
-    /**
-     * load all properties in `initObject` into the current object
-     * @param initObject
-     * @param fullUpdate
-     * @returns
-     */
-    function loadValues(initObject) {
-      var fullUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      return SimpleObject.loadValues(this, initObject, fullUpdate);
-    }
   }, {
     key: "setValue",
     value: (
     /**
-     * set value
-     * @param key
-     * @param value
+     * set value and run the event handlers if needed
      * @return true if changed , false otherwise
      */
     function () {
       var _setValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, value) {
         var shouldNotify,
-          isValueChanged,
-          oldval,
+          old_value,
+          needsChange,
+          _this$manager,
+          __has_delta_isChanged,
           _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -158,25 +141,32 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
             case 6:
               return _context.abrupt("return", false);
             case 7:
-              isValueChanged = false;
               /* --------------------------- set if not changed --------------------------- */
-              oldval = this.getValue(key);
-              if (!(0, _object.object_equals)(oldval, value, {
+              old_value = this.getValue(key);
+              needsChange = !(0, _object.object_equals)(old_value, value, {
                 strictArrayCheck: true,
                 ignoredStartingWords: "_"
-              })) {
-                _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, value);
-                isValueChanged = true;
-              } else isValueChanged = false;
+              });
+              if (needsChange) {
+                __has_delta_isChanged = _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, value);
+                /**
+                 * notify the manager when the state of `__has_delta` is changed
+                 * managers can use this to detect if they need to save
+                 */
+                (_this$manager = this.manager) === null || _this$manager === void 0 || _this$manager.setOption("ischanged", this.isChanged);
+                ////if (__has_delta_isChanged && this.manager) {
+                ////    this.manager.setOption("hasDelta", this.__has_delta);
+                ////}
+              }
               /* --------------------------------- notify --------------------------------- */
-              if (!(shouldNotify === true || shouldNotify === "auto" && isValueChanged)) {
+              if (!(shouldNotify === true || shouldNotify === "auto" && needsChange)) {
                 _context.next = 13;
                 break;
               }
               _context.next = 13;
               return this.notifyChanged("", key, value);
             case 13:
-              return _context.abrupt("return", isValueChanged);
+              return _context.abrupt("return", needsChange);
             case 14:
             case "end":
               return _context.stop();
@@ -188,6 +178,21 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       }
       return setValue;
     }())
+  }, {
+    key: "loadValues",
+    value: /* -------------------------------------------------------------------------- */
+    /*                                    Load                                    */
+    /* -------------------------------------------------------------------------- */
+    /**
+     * load all properties in `initObject` into the current object
+     * @param initObject
+     * @param fullUpdate
+     * @returns
+     */
+    function loadValues(initObject) {
+      var fullUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      return SimpleObject.loadValues(this, initObject, fullUpdate);
+    }
   }, {
     key: "setTemp",
     value: function () {
@@ -596,7 +601,6 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               if (value === undefined && type == "") value = this.getValue(key);
-              this.__changed = true;
               lc = "";
               if (type) lc += "$".concat(String(type), "$");
               if (subvalue) {
@@ -608,16 +612,16 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
               /* --------------------------- notify the manager --------------------------- */
               manager_class = this.manager;
               if (!(typeof (manager_class === null || manager_class === void 0 ? void 0 : manager_class.notifyChanged) === "function")) {
-                _context11.next = 11;
+                _context11.next = 10;
                 break;
               }
-              _context11.next = 10;
+              _context11.next = 9;
               return manager_class.notifyChanged(type, key, value, subvalue);
-            case 10:
+            case 9:
               return _context11.abrupt("return", _context11.sent);
-            case 11:
+            case 10:
               return _context11.abrupt("return", false);
-            case 12:
+            case 11:
             case "end":
               return _context11.stop();
           }
@@ -779,7 +783,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     key: "clear_changes",
     value: function clear_changes() {
       this.__delta = {};
-      this.__changed = false;
+      this.__has_delta = false;
       return true;
     }
     /**
@@ -811,7 +815,6 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     get: function get() {
       return this.constructor["__db_name"] || this.constructor["__web_path"];
     }
-    /* -------------------------------------------------------------------------- */
   }, {
     key: "isChanged",
     get: function get() {
@@ -819,13 +822,20 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       ////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                      */
-      /* -------------------------------------------------------------------------- */
+      if (this.__use_delta) {
+        return this.__has_delta;
+        ////for (const key in this.__delta) {
+        ////    return true;
+        ////}
+        ////return false; 
+      }
+      /* --------------------- 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 object is not using delta mode,
+       * check changes by comparing changable fields with original object
+       */
       if (Array.isArray(this.__changeables)) {
         return this.__changeables.find(function (c) {
           return !(0, _object.object_equals)(_this3[c], orig[c]);
@@ -838,7 +848,6 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
         }
         return false;
       }
-      return false;
     }
   }, {
     key: "isArchived",
@@ -969,7 +978,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     /* -------------------------------------------------------------------------- */
     function () {
       var _event_run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(eventName) {
-        var _this$manager;
+        var _this$manager2;
         var _len2,
           params,
           _key2,
@@ -988,7 +997,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
                 params[_key2 - 1] = _args14[_key2];
               }
               _context14.next = 6;
-              return (_this$manager = this.manager).event_run.apply(_this$manager, [eventName].concat(params));
+              return (_this$manager2 = this.manager).event_run.apply(_this$manager2, [eventName].concat(params));
             case 6:
               return _context14.abrupt("return", _context14.sent);
             case 7:
@@ -1152,6 +1161,21 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     /*                                   statics                                  */
     /* -------------------------------------------------------------------------- */
   }], [{
+    key: "getValue",
+    value: function getValue(o, key) {
+      var original = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      if (o == null) return undefined;
+      if (o instanceof SimpleObject && typeof o.getValue === "function") return o.getValue(key, original);
+      if (!original && o.__use_delta != false && _typeof(o.__delta) === "object" && key in o.__delta) {
+        //@ts-ignore
+        return o.__delta[key];
+      }
+      return o[key];
+    }
+    /* -------------------------------------------------------------------------- */
+    /*                                  setValue                                  */
+    /* -------------------------------------------------------------------------- */
+  }, {
     key: "loadValues",
     value: function loadValues(obj, initObject) {
       var fullUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -1177,19 +1201,6 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       }
       return true;
     }
-    /* -------------------------------------------------------------------------- */
-  }, {
-    key: "getValue",
-    value: function getValue(o, key) {
-      var original = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      if (o == null) return undefined;
-      if (o instanceof SimpleObject && typeof o.getValue === "function") return o.getValue(key, original);
-      if (!original && o.__use_delta != false && _typeof(o.__delta) === "object" && key in o.__delta) {
-        //@ts-ignore
-        return o.__delta[key];
-      }
-      return o[key];
-    }
   }, {
     key: "canChangeKey",
     value: function canChangeKey(object, key, options) {
@@ -1497,37 +1508,6 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     }
   }]);
 }(_MapableObject2.MapableObject);
-function _setSubProperty(key, subkey, value) {
-  var subobj = _assertClassBrand(_SimpleObject_brand, this, _getProperty).call(this, key);
-  //@ts-ignore
-  if (subobj == null || _typeof(subobj) !== "object") subobj = {};else subobj = _objectSpread({}, subobj); //make a clone so we dont update the original
-  subobj[subkey] = value;
-  _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, subobj);
-}
-function _getSubProperty(key, subkey) {
-  var original = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var subobj = _assertClassBrand(_SimpleObject_brand, this, _getProperty).call(this, key, original);
-  if (subobj == null || _typeof(subobj) !== "object") return undefined;
-  return subobj[subkey];
-}
-function _setProperty(key, value) {
-  if (!this.__use_delta) {
-    this[key] = value; //on noDelta mode, also update the obj
-    this.__delta[key] = value; //always update delta to keep track of changes
-    return true;
-  } else {
-    if (this[key] === value) {
-      /**
-       * We set something back to its original value so no need to save it as Delta
-       */
-      delete this.__delta[key];
-      return false;
-    } else {
-      this.__delta[key] = value; //always update delta to keep track of changes
-      return true;
-    }
-  }
-}
 function _setDefaultProperty(key, value) {
   //@ts-ignore
   if (this[key] == undefined || this[key] === "" || this[key] === 0) {
@@ -1544,6 +1524,9 @@ function _setDefaultPropertyNow(key) {
   }
   return false;
 }
+/* -------------------------------------------------------------------------- */
+/*                                 getProperty                                */
+/* -------------------------------------------------------------------------- */
 function _getProperty(key) {
   var original = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   //check if we should treat the prop as a function
@@ -1557,6 +1540,63 @@ function _getProperty(key) {
   if (use_orig) return this[key];
   return this.__delta[key];
 }
+function _setSubProperty(key, subkey, value) {
+  var subobj = _assertClassBrand(_SimpleObject_brand, this, _getProperty).call(this, key);
+  //@ts-ignore
+  if (subobj == null || _typeof(subobj) !== "object") subobj = {};else subobj = _objectSpread({}, subobj); //make a clone so we dont update the original
+  subobj[subkey] = value;
+  _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, subobj);
+}
+function _getSubProperty(key, subkey) {
+  var original = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var subobj = _assertClassBrand(_SimpleObject_brand, this, _getProperty).call(this, key, original);
+  if (subobj == null || _typeof(subobj) !== "object") return undefined;
+  return subobj[subkey];
+}
+/**
+ * update a property on this object by updating the `__delta`
+ * or updating the object property directly depending on `__use_delta` setting
+ *
+ * @param key
+ * @param value
+ * @returns true if state of `__has_delta` is changed, false otherwise
+ */
+function _setProperty(key, value) {
+  var checkIsChanged = false;
+  if (this.__use_delta) {
+    if (this[key] === value) {
+      /**
+       * we set something back to its original value
+       * no need to save it as delta
+       */
+      delete this.__delta[key];
+      checkIsChanged = true; //check if we should set __has_delta to false
+    } else {
+      this.__delta[key] = value; //always update delta to keep track of changes
+    }
+  } else {
+    this[key] = value; //on noDelta mode update the object itself
+    this.__delta[key] = value; //always update delta to keep track of changes
+  }
+  if (checkIsChanged || this.__has_delta === false) {
+    /**
+     * if any key exists in the `__delta` then the object is changed
+     */
+    var next__has_delta = false;
+    for (var _key4 in this.__delta) {
+      next__has_delta = true;
+      break;
+    }
+    var previous__has_delta = this.__has_delta;
+    this.__has_delta = next__has_delta;
+    /**
+     * if the state of __has_delta is changed we return true
+     * so we can run the needed events
+     */
+    return previous__has_delta != this.__has_delta;
+  }
+  return false;
+}
 function _setSaveResultObject(toObj) {
   if (toObj == null) toObj = null; //null or undefined
   this.__saveResultObject = toObj;

package/package.json

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