@azrico/webobject 1.4.70 → 1.4.72

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

@@ -53,7 +53,7 @@ export declare class ObjectManager<ObjType extends SimpleObject> {
      */
     setSubValue(key: PropOf<ObjType>, objKey: string, subvalue: any): Promise<boolean>;
     pushValue(key: PropOf<ObjType>, value: any): Promise<false | NonNullable<Awaited<ObjType[any]>>>;
-    setTemp(key: string, value: any): Promise<any>;
+    setTemp(key: string, value: any): Promise<boolean>;
     getTemp(key: string): Promise<any>;
     getIndexOrID(): number | string;
     getIndex(): number;

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

@@ -52,7 +52,7 @@ export declare class SimpleObject extends MapableObject {
      */
     setValue(key: WriteablePropOf<this>, value: any, sendChanges?: sendChangesType): Promise<boolean>;
     set: (key: WriteablePropOf<this>, value: any, sendChanges?: sendChangesType) => Promise<boolean>;
-    setTemp: (key: string, value: any) => any;
+    setTemp(key: string, value: any, sendChanges?: sendChangesType): Promise<void>;
     setAll<K extends WriteablePropOf<this>>(setObj: {
         [key in K]: any;
     }): Promise<boolean>;
@@ -104,6 +104,12 @@ export declare class SimpleObject extends MapableObject {
      * Apply the changes and empty the delta object
      */
     apply_changes(): boolean;
+    /**
+     * apply changes for the given field
+     * @param key
+     * @returns
+     */
+    apply(key: string): boolean;
     /**
      * set the value to its original
      * @param key
@@ -185,7 +191,7 @@ export declare class SimpleObject extends MapableObject {
     setSaveResult(toObj: any, type?: saveResultType | "auto"): void;
     getSaveResult(original?: boolean): any;
     getSaveResultType(): saveResultType;
-    static setTemp(obj: any, key: string, value: any): any;
+    static setTemp(obj: any, key: string, value: any): Promise<void> | undefined;
     static factoryClear(obj: SimpleObject): void;
     static delete_cache(): void;
     static get_canModify(o: SimpleObject): boolean;

package/dist/src/structs/SimpleObject.js

@@ -46,7 +46,7 @@ var _getProperty = /*#__PURE__*/new WeakSet();
 var _getTempProperty = /*#__PURE__*/new WeakSet();
 var _setTempProperty = /*#__PURE__*/new WeakSet();
 var _setSaveResultObject = /*#__PURE__*/new WeakSet();
-var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _setSubValue, _pushValue, _notifyChanged, _reset, _resetAll, _event_run, _event_add) {
+var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setTemp, _setAll, _setSubValue, _pushValue, _notifyChanged, _reset, _resetAll, _event_run, _event_add) {
   _inherits(SimpleObject, _MapableObject);
   var _super = _createSuper(SimpleObject);
   function SimpleObject() {
@@ -97,7 +97,6 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
     _defineProperty(_assertThisInitialized(_this), "get", _classPrivateMethodGet(_assertThisInitialized(_this), _getProperty, _getProperty2));
     _defineProperty(_assertThisInitialized(_this), "getTemp", _classPrivateMethodGet(_assertThisInitialized(_this), _getTempProperty, _getTempProperty2));
     _defineProperty(_assertThisInitialized(_this), "set", _this.setValue);
-    _defineProperty(_assertThisInitialized(_this), "setTemp", _classPrivateMethodGet(_assertThisInitialized(_this), _setTempProperty, _setTempProperty2));
     /**
      * set value of a key only if the value is empty
      * @param key
@@ -189,39 +188,72 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
       }))).apply(this, arguments);
     }
   }, {
-    key: "setAll",
-    value: function setAll(_x3) {
-      return (_setAll = _setAll || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(setObj) {
-        var finalRes, key;
+    key: "setTemp",
+    value: function setTemp(_x3, _x4) {
+      return (_setTemp = _setTemp || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, value) {
+        var sendChanges,
+          isValueChanged,
+          _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              sendChanges = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : "auto";
+              isValueChanged = false;
+              _context2.prev = 2;
+              isValueChanged = _classPrivateMethodGet(this, _getTempProperty, _getTempProperty2).call(this, key) != value;
+              _classPrivateMethodGet(this, _setTempProperty, _setTempProperty2).call(this, key, value);
+              //console.log("SV:", isValueChanged, oldval, key, value);
+            case 5:
+              _context2.prev = 5;
+              if (!(sendChanges === true || sendChanges === "auto" && isValueChanged)) {
+                _context2.next = 9;
+                break;
+              }
+              _context2.next = 9;
+              return this.notifyChanged("temp", key, value);
+            case 9:
+              return _context2.finish(5);
+            case 10:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this, [[2,, 5, 10]]);
+      }))).apply(this, arguments);
+    }
+  }, {
+    key: "setAll",
+    value: function setAll(_x5) {
+      return (_setAll = _setAll || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(setObj) {
+        var finalRes, key;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               finalRes = true;
-              _context2.t0 = _regeneratorRuntime().keys(setObj);
+              _context3.t0 = _regeneratorRuntime().keys(setObj);
             case 2:
-              if ((_context2.t1 = _context2.t0()).done) {
-                _context2.next = 10;
+              if ((_context3.t1 = _context3.t0()).done) {
+                _context3.next = 10;
                 break;
               }
-              key = _context2.t1.value;
-              _context2.next = 6;
+              key = _context3.t1.value;
+              _context3.next = 6;
               return this.setValue(key, setObj[key]);
             case 6:
-              if (_context2.sent) {
-                _context2.next = 8;
+              if (_context3.sent) {
+                _context3.next = 8;
                 break;
               }
               finalRes = false;
             case 8:
-              _context2.next = 2;
+              _context3.next = 2;
               break;
             case 10:
-              return _context2.abrupt("return", finalRes);
+              return _context3.abrupt("return", finalRes);
             case 11:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }))).apply(this, arguments);
     }
     /**
@@ -245,30 +277,30 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
      * @param subvalue
      * @return true if changed , false otherwise
      */
-    function setSubValue(_x4, _x5, _x6) {
-      return (_setSubValue = _setSubValue || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, objKey, subvalue) {
+    function setSubValue(_x6, _x7, _x8) {
+      return (_setSubValue = _setSubValue || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, objKey, subvalue) {
         var sendChanges,
           isValueChanged,
           subval,
-          _args3 = arguments;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+          _args4 = arguments;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              sendChanges = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : "auto";
+              sendChanges = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : "auto";
               if (this.canModify) {
-                _context3.next = 7;
+                _context4.next = 7;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context3.next = 6;
+                _context4.next = 6;
                 break;
               }
               throw Error("Cant use setValue when on readonly mode");
             case 6:
-              return _context3.abrupt("return", false);
+              return _context4.abrupt("return", false);
             case 7:
               isValueChanged = false;
-              _context3.prev = 8;
+              _context4.prev = 8;
               //if accessing subval of an object, make sure the object is not null
               subval = _classPrivateMethodGet(this, _getSubProperty, _getSubProperty2).call(this, key, objKey);
               if (!(0, _object.object_equals)(subval, subvalue, {
@@ -279,22 +311,22 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
                 isValueChanged = true;
               } else isValueChanged = false;
             case 11:
-              _context3.prev = 11;
+              _context4.prev = 11;
               if (!(sendChanges === true || sendChanges === "auto" && isValueChanged)) {
-                _context3.next = 15;
+                _context4.next = 15;
                 break;
               }
-              _context3.next = 15;
+              _context4.next = 15;
               return this.notifyChanged("", key, objKey, subvalue);
             case 15:
-              return _context3.finish(11);
+              return _context4.finish(11);
             case 16:
-              return _context3.abrupt("return", isValueChanged);
+              return _context4.abrupt("return", isValueChanged);
             case 17:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[8,, 11, 16]]);
+        }, _callee4, this, [[8,, 11, 16]]);
       }))).apply(this, arguments);
     }
   }, {
@@ -307,74 +339,74 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
      * @param sendChanges
      * @returns
      */
-    function pushValue(_x7, _x8) {
-      return (_pushValue = _pushValue || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, value) {
+    function pushValue(_x9, _x10) {
+      return (_pushValue = _pushValue || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(key, value) {
         var sendChanges,
           tempArray,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              sendChanges = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : "auto";
+              sendChanges = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : "auto";
               if (!(value == null)) {
-                _context4.next = 3;
+                _context5.next = 3;
                 break;
               }
-              return _context4.abrupt("return", false);
+              return _context5.abrupt("return", false);
             case 3:
               if (this.canModify) {
-                _context4.next = 9;
+                _context5.next = 9;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context4.next = 8;
+                _context5.next = 8;
                 break;
               }
               throw Error("Cant use pushValue when on readonly mode");
             case 8:
-              return _context4.abrupt("return", false);
+              return _context5.abrupt("return", false);
             case 9:
               if (_classPrivateMethodGet(this, _getProperty, _getProperty2).call(this, key) == null) {
                 _classPrivateMethodGet(this, _setProperty, _setProperty2).call(this, key, []);
               }
               tempArray = _classPrivateMethodGet(this, _getProperty, _getProperty2).call(this, key);
               if (Array.isArray(tempArray)) {
-                _context4.next = 17;
+                _context5.next = 17;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context4.next = 16;
+                _context5.next = 16;
                 break;
               }
               throw Error("Cant use pushValue on non Array keys");
             case 16:
-              return _context4.abrupt("return", false);
+              return _context5.abrupt("return", false);
             case 17:
               _classPrivateMethodGet(this, _setProperty, _setProperty2).call(this, key, [].concat(_toConsumableArray(tempArray), [value]));
               if (!(sendChanges === true || sendChanges === "auto")) {
-                _context4.next = 21;
+                _context5.next = 21;
                 break;
               }
-              _context4.next = 21;
+              _context5.next = 21;
               return this.notifyChanged("", key, value);
             case 21:
-              return _context4.abrupt("return", tempArray);
+              return _context5.abrupt("return", tempArray);
             case 22:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }))).apply(this, arguments);
     }
   }, {
     key: "notifyChanged",
-    value: function notifyChanged(_x9, _x10, _x11, _x12) {
-      return (_notifyChanged = _notifyChanged || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(type, key, value, subvalue) {
+    value: function notifyChanged(_x11, _x12, _x13, _x14) {
+      return (_notifyChanged = _notifyChanged || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(type, key, value, subvalue) {
         var lc, manager_class;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              if (value === undefined && type != "meta") value = this.getValue(key);
+              if (value === undefined && type == "") value = this.getValue(key);
               this.__changed = true;
               lc = "";
               if (type) lc += "$".concat(String(type), "$");
@@ -387,16 +419,16 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
               /* --------------------------- notify the manager --------------------------- */
               manager_class = this.manager;
               if (!(manager_class instanceof _ObjectManager["default"])) {
-                _context5.next = 10;
+                _context6.next = 10;
                 break;
               }
-              _context5.next = 10;
+              _context6.next = 10;
               return manager_class.notifyChanged(type, key, value, subvalue);
             case 10:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }))).apply(this, arguments);
     }
     /**
@@ -434,29 +466,49 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
         this.clear_changes();
       }
     }
+    /**
+     * apply changes for the given field
+     * @param key
+     * @returns
+     */
+  }, {
+    key: "apply",
+    value: function apply(key) {
+      try {
+        if (!this.__use_delta) {
+          //in this mode , we track changes by updating the original
+          return true;
+        }
+        if (this.__delta != null && key in this.__delta) {
+          this[key] = this.__delta[key];
+          delete this.__delta[key];
+        }
+        return true;
+      } finally {}
+    }
     /**
      * set the value to its original
      * @param key
      */
   }, {
     key: "reset",
-    value: function reset(_x13) {
-      return (_reset = _reset || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(key) {
+    value: function reset(_x15) {
+      return (_reset = _reset || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(key) {
         var notifyChanged,
-          _args6 = arguments;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+          _args7 = arguments;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              notifyChanged = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : "auto";
-              _context6.next = 3;
+              notifyChanged = _args7.length > 1 && _args7[1] !== undefined ? _args7[1] : "auto";
+              _context7.next = 3;
               return this.setValue(key, this[key], notifyChanged);
             case 3:
-              return _context6.abrupt("return", _context6.sent);
+              return _context7.abrupt("return", _context7.sent);
             case 4:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }))).apply(this, arguments);
     }
     /**
@@ -467,43 +519,43 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
   }, {
     key: "resetAll",
     value: function resetAll() {
-      return (_resetAll = _resetAll || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      return (_resetAll = _resetAll || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var notifyChanged,
           fr,
           key,
-          _args7 = arguments;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+          _args8 = arguments;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              notifyChanged = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : "auto";
+              notifyChanged = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : "auto";
               fr = true;
-              _context7.t0 = _regeneratorRuntime().keys(this.__delta);
+              _context8.t0 = _regeneratorRuntime().keys(this.__delta);
             case 3:
-              if ((_context7.t1 = _context7.t0()).done) {
-                _context7.next = 13;
+              if ((_context8.t1 = _context8.t0()).done) {
+                _context8.next = 13;
                 break;
               }
-              key = _context7.t1.value;
-              _context7.t2 = fr;
-              if (!_context7.t2) {
-                _context7.next = 10;
+              key = _context8.t1.value;
+              _context8.t2 = fr;
+              if (!_context8.t2) {
+                _context8.next = 10;
                 break;
               }
-              _context7.next = 9;
+              _context8.next = 9;
               return this.reset(key, notifyChanged);
             case 9:
-              _context7.t2 = _context7.sent;
+              _context8.t2 = _context8.sent;
             case 10:
-              fr = _context7.t2;
-              _context7.next = 3;
+              fr = _context8.t2;
+              _context8.next = 3;
               break;
             case 13:
-              return _context7.abrupt("return", fr);
+              return _context8.abrupt("return", fr);
             case 14:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }))).apply(this, arguments);
     }
     /**
@@ -667,35 +719,35 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
     /* -------------------------------------------------------------------------- */
     /*                                   Events                                   */
     /* -------------------------------------------------------------------------- */
-    function event_run(_x14) {
-      return (_event_run = _event_run || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(eventName) {
+    function event_run(_x16) {
+      return (_event_run = _event_run || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(eventName) {
         var _this$manager;
         var _len,
           params,
           _key,
-          _args8 = arguments;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+          _args9 = arguments;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               if (this.manager) {
-                _context8.next = 3;
+                _context9.next = 3;
                 break;
               }
               if (this.__showErrors === true) console.error("you cant use events if your object has no manager");
-              return _context8.abrupt("return");
+              return _context9.abrupt("return");
             case 3:
-              for (_len = _args8.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                params[_key - 1] = _args8[_key];
+              for (_len = _args9.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                params[_key - 1] = _args9[_key];
               }
-              _context8.next = 6;
+              _context9.next = 6;
               return (_this$manager = this.manager).event_run.apply(_this$manager, [eventName].concat(params));
             case 6:
-              return _context8.abrupt("return", _context8.sent);
+              return _context9.abrupt("return", _context9.sent);
             case 7:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }))).apply(this, arguments);
     }
   }, {
@@ -720,30 +772,30 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setAll, _s
     }
   }, {
     key: "event_add",
-    value: function event_add(_x15, _x16, _x17) {
-      return (_event_add = _event_add || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(name, uname, runEvent) {
+    value: function event_add(_x17, _x18, _x19) {
+      return (_event_add = _event_add || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(name, uname, runEvent) {
         var onlyOn,
           runOnce,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _args10 = arguments;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              onlyOn = _args9.length > 3 && _args9[3] !== undefined ? _args9[3] : null;
-              runOnce = _args9.length > 4 && _args9[4] !== undefined ? _args9[4] : false;
+              onlyOn = _args10.length > 3 && _args10[3] !== undefined ? _args10[3] : null;
+              runOnce = _args10.length > 4 && _args10[4] !== undefined ? _args10[4] : false;
               if (this.manager) {
-                _context9.next = 5;
+                _context10.next = 5;
                 break;
               }
               if (this.__showErrors === true) console.error("you cant use events if your object has no manager");
-              return _context9.abrupt("return");
+              return _context10.abrupt("return");
             case 5:
-              _context9.next = 7;
+              _context10.next = 7;
               return this.manager.event_add(name, uname, runEvent, onlyOn, runOnce);
             case 7:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }))).apply(this, arguments);
     }
     /* -------------------------------------------------------------------------- */
@@ -1164,6 +1216,7 @@ function _getTempProperty2(key) {
 function _setTempProperty2(key, value) {
   if (this.__temp == null) this.__temp = {};
   if (value == null) delete this.__temp[key];else this.__temp[key] = value;
+  return true;
 }
 function _setSaveResultObject2(toObj) {
   if (toObj == null) toObj = null; //null or undefined

package/package.json

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