@azrico/webobject 1.5.8 → 1.5.9

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

@@ -1,4 +1,4 @@
-import { PropType, WriteablePropOf, PropOf, Ensure, PropOnlyPrefixedOf } from "@azrico/types";
+import { PropType, WriteablePropOf, PropOf, Ensure, PropPrefixedOf, PropOnlyPrefixedOf } from "@azrico/types";
 import { formatObject } from "@azrico/convert";
 import { MapableObject } from "./MapableObject";
 import ObjectManager from "./ObjectManager";
@@ -66,13 +66,13 @@ export declare class SimpleObject extends MapableObject {
      * @param autoApply if the field is not in delta, instantly calls the `apply` function to remove from delta
      * @returns
      */
-    set(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType, autoApply?: boolean): Promise<boolean>;
+    set<MKey extends PropPrefixedOf<this>>(key: MKey, value: any, shouldNotify?: sendChangesType, autoApply?: boolean): Promise<boolean>;
     /**
      * @deprecated use `set`
      * set value and run the event handlers if needed
      * @return true if changed , false otherwise
      */
-    setValue: (key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType, autoApply?: boolean) => Promise<boolean>;
+    setValue: <MKey extends PropPrefixedOf<this>>(key: MKey, value: any, shouldNotify?: sendChangesType, autoApply?: boolean) => Promise<boolean>;
     /**
      * set value and run the event handlers if needed
      *
@@ -81,6 +81,15 @@ export declare class SimpleObject extends MapableObject {
      * @param value
      */
     setPreferApply(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType): Promise<boolean>;
+    /**
+     * set key of subObject
+     * @param key
+     * @param value
+     * @param subvalue
+     * @param sendChanges
+     * @return true if changed , false otherwise
+     */
+    setSubValue<MKey extends PropOf<this>>(key: MKey, objKey: string, subvalue: any, sendChanges?: sendChangesType): Promise<boolean>;
     setTemp(key: string, value: any, sendChanges?: sendChangesType): Promise<boolean>;
     /**
      * load all properties in `initObject` into the current object
@@ -124,15 +133,6 @@ export declare class SimpleObject extends MapableObject {
      * @returns
      */
     setDefault: (key: WriteablePropOf<this>, value: any) => boolean;
-    /**
-     * set key of subObject
-     * @param key
-     * @param value
-     * @param subvalue
-     * @param sendChanges
-     * @return true if changed , false otherwise
-     */
-    setSubValue<MKey extends PropOf<this>>(key: MKey, objKey: string, subvalue: any, sendChanges?: sendChangesType): Promise<boolean>;
     /**
      * Push a single value to array property
      * @param key

package/dist/src/structs/SimpleObject.js

@@ -160,12 +160,13 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       var _set = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, value) {
         var shouldNotify,
           autoApply,
+          isValueChanged,
+          mkey,
+          keyExists,
           keysp,
-          key_part,
           subkey_part,
-          keyExists,
+          subval,
           old_value,
-          needsChange,
           _this$manager,
           _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -185,51 +186,59 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
             case 7:
               return _context.abrupt("return", false);
             case 8:
-              if (!(typeof key === "string" && key.includes("."))) {
-                _context.next = 15;
-                break;
+              keyExists = false;
+              if (typeof key === "string" && key.includes(".")) {
+                /* -------------------------------------------------------------------------- */
+                /*                             set value of object                            */
+                /* -------------------------------------------------------------------------- */
+                keysp = key.split(".");
+                mkey = keysp.shift();
+                keyExists = mkey in this.__delta;
+                subkey_part = keysp.shift(); //if accessing subval of an object, make sure the object is not null
+                subval = _assertClassBrand(_SimpleObject_brand, this, _getSubProperty).call(this, mkey, subkey_part);
+                isValueChanged = !(0, _object.object_equals)(subval, value, {
+                  ignoredStartingWords: "_",
+                  strictArrayCheck: true
+                });
+                if (isValueChanged) _assertClassBrand(_SimpleObject_brand, this, _setSubProperty).call(this, mkey, subkey_part, value);
+              } else {
+                /* -------------------------------------------------------------------------- */
+                /*                               set basic value                              */
+                /* -------------------------------------------------------------------------- */
+                mkey = key;
+                keyExists = mkey in this.__delta;
+                old_value = this.get(mkey);
+                isValueChanged = !(0, _object.object_equals)(old_value, value, {
+                  strictArrayCheck: true,
+                  ignoredStartingWords: "_"
+                });
+                if (isValueChanged) _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, mkey, value);
               }
-              keysp = key.split(".");
-              key_part = keysp.shift();
-              subkey_part = keysp.shift();
-              _context.next = 14;
-              return this.setSubValue(key_part, subkey_part, value, shouldNotify);
-            case 14:
-              return _context.abrupt("return", _context.sent);
-            case 15:
-              /* --------------------------- set if not changed --------------------------- */
-              keyExists = key in this.__delta;
-              old_value = this.get(key);
-              needsChange = !(0, _object.object_equals)(old_value, value, {
-                strictArrayCheck: true,
-                ignoredStartingWords: "_"
-              });
-              if (needsChange) {
-                _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, value);
+              if (autoApply && keyExists === false) {
+                /**
+                 * if the field is not in delta
+                 * instantly calls the `apply` function to remove from delta
+                 */
+                this.apply(mkey);
+                if (shouldNotify === "auto") shouldNotify = false;
+              }
+              if (isValueChanged) {
                 /**
                  * 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.checkIsChanged();
               }
-              /**
-               * if the field is not in delta
-               * instantly calls the `apply` function to remove from delta
-               */
-              if (autoApply && !keyExists) {
-                this.apply(key);
-                if (shouldNotify === "auto") shouldNotify = false;
-              }
               /* --------------------------------- notify --------------------------------- */
-              if (!(shouldNotify === true || shouldNotify === "auto" && needsChange)) {
-                _context.next = 23;
+              if (!(shouldNotify === true || shouldNotify === "auto" && isValueChanged)) {
+                _context.next = 15;
                 break;
               }
-              _context.next = 23;
+              _context.next = 15;
               return this.notifyChanged("", key, value);
-            case 23:
-              return _context.abrupt("return", needsChange);
-            case 24:
+            case 15:
+              return _context.abrupt("return", isValueChanged);
+            case 16:
             case "end":
               return _context.stop();
           }
@@ -273,6 +282,40 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       }
       return setPreferApply;
     }()
+    /**
+     * set key of subObject
+     * @param key
+     * @param value
+     * @param subvalue
+     * @param sendChanges
+     * @return true if changed , false otherwise
+     */
+    )
+  }, {
+    key: "setSubValue",
+    value: (function () {
+      var _setSubValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, objKey, subvalue) {
+        var sendChanges,
+          _args3 = arguments;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              sendChanges = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : "auto";
+              _context3.next = 3;
+              return this.set("".concat(String(key), ".").concat(objKey), subvalue, sendChanges);
+            case 3:
+              return _context3.abrupt("return", _context3.sent);
+            case 4:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function setSubValue(_x5, _x6, _x7) {
+        return _setSubValue.apply(this, arguments);
+      }
+      return setSubValue;
+    }()
     /* -------------------------------------------------------------------------- */
     /*                                    Load                                    */
     /* -------------------------------------------------------------------------- */
@@ -280,33 +323,33 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
   }, {
     key: "setTemp",
     value: (function () {
-      var _setTemp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, value) {
+      var _setTemp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, value) {
         var sendChanges,
           isValueChanged,
-          _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 > 2 && _args3[2] !== undefined ? _args3[2] : false;
-              _context3.next = 3;
+              sendChanges = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : false;
+              _context4.next = 3;
               return _get(_getPrototypeOf(SimpleObject.prototype), "setTemp", this).call(this, key, value);
             case 3:
-              isValueChanged = _context3.sent;
+              isValueChanged = _context4.sent;
               if (!(sendChanges === true || sendChanges === "auto" && isValueChanged)) {
-                _context3.next = 7;
+                _context4.next = 7;
                 break;
               }
-              _context3.next = 7;
+              _context4.next = 7;
               return this.notifyChanged("temp", key, value);
             case 7:
-              return _context3.abrupt("return", isValueChanged);
+              return _context4.abrupt("return", isValueChanged);
             case 8:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function setTemp(_x5, _x6) {
+      function setTemp(_x8, _x9) {
         return _setTemp.apply(this, arguments);
       }
       return setTemp;
@@ -328,16 +371,16 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
   }, {
     key: "clearRefreshFunction",
     value: ( /* ---------------------------- refresh functions --------------------------- */function () {
-      var _clearRefreshFunction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _clearRefreshFunction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               this.__refresh_functions = undefined;
             case 1:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function clearRefreshFunction() {
         return _clearRefreshFunction.apply(this, arguments);
@@ -347,21 +390,21 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
   }, {
     key: "setRefreshFunction",
     value: function () {
-      var _setRefreshFunction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(new_fnc) {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _setRefreshFunction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(new_fnc) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.next = 2;
+              _context6.next = 2;
               return this.addRefreshFunction(new_fnc);
             case 2:
-              return _context5.abrupt("return", _context5.sent);
+              return _context6.abrupt("return", _context6.sent);
             case 3:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function setRefreshFunction(_x7) {
+      function setRefreshFunction(_x10) {
         return _setRefreshFunction.apply(this, arguments);
       }
       return setRefreshFunction;
@@ -369,10 +412,10 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
   }, {
     key: "addRefreshFunction",
     value: function () {
-      var _addRefreshFunction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(key, new_fnc) {
+      var _addRefreshFunction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(key, new_fnc) {
         var oldFunctions;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (typeof key === "function") {
                 new_fnc = key;
@@ -385,11 +428,11 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
               this.__refresh_functions = oldFunctions;
             case 6:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function addRefreshFunction(_x8, _x9) {
+      function addRefreshFunction(_x11, _x12) {
         return _addRefreshFunction.apply(this, arguments);
       }
       return addRefreshFunction;
@@ -397,7 +440,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
   }, {
     key: "runRefreshFunction",
     value: function () {
-      var _runRefreshFunction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _runRefreshFunction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var oldFunctions,
           fncArray,
           _len,
@@ -405,39 +448,39 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
           _key,
           index,
           fnc,
-          _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:
               oldFunctions = this.__refresh_functions;
               if (!(oldFunctions == null || _typeof(oldFunctions) !== "object")) {
-                _context7.next = 3;
+                _context8.next = 3;
                 break;
               }
-              return _context7.abrupt("return");
+              return _context8.abrupt("return");
             case 3:
               fncArray = Object.values(oldFunctions);
-              for (_len = _args7.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
-                params[_key] = _args7[_key];
+              for (_len = _args8.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+                params[_key] = _args8[_key];
               }
               index = 0;
             case 6:
               if (!(index < fncArray.length)) {
-                _context7.next = 13;
+                _context8.next = 13;
                 break;
               }
               fnc = fncArray[index];
-              _context7.next = 10;
+              _context8.next = 10;
               return _object.fn_eval.apply(void 0, [fnc].concat(params));
             case 10:
               index++;
-              _context7.next = 6;
+              _context8.next = 6;
               break;
             case 13:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function runRefreshFunction() {
         return _runRefreshFunction.apply(this, arguments);
@@ -454,47 +497,47 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
   }, {
     key: "setAll",
     value: (function () {
-      var _setAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(setObj) {
+      var _setAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(setObj) {
         var changeablesOnly,
           finalRes,
           checkKeys,
           index,
           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:
-              changeablesOnly = _args8.length > 1 && _args8[1] !== undefined ? _args8[1] : true;
+              changeablesOnly = _args9.length > 1 && _args9[1] !== undefined ? _args9[1] : true;
               finalRes = true;
               checkKeys = changeablesOnly ? (0, _object.array_intersection)(this.__changeables, Object.keys(setObj)) : Object.keys(setObj);
               index = 0;
             case 4:
               if (!(index < checkKeys.length)) {
-                _context8.next = 13;
+                _context9.next = 13;
                 break;
               }
               key = checkKeys[index];
-              _context8.next = 8;
+              _context9.next = 8;
               return this.set(key, setObj[key]);
             case 8:
-              if (_context8.sent) {
-                _context8.next = 10;
+              if (_context9.sent) {
+                _context9.next = 10;
                 break;
               }
               finalRes = false;
             case 10:
               index++;
-              _context8.next = 4;
+              _context9.next = 4;
               break;
             case 13:
-              return _context8.abrupt("return", finalRes);
+              return _context9.abrupt("return", finalRes);
             case 14:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function setAll(_x10) {
+      function setAll(_x13) {
         return _setAll.apply(this, arguments);
       }
       return setAll;
@@ -512,72 +555,8 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       return _assertClassBrand(_SimpleObject_brand, this, _setDefaultProperty).call(this, key, value);
     }
   }, {
-    key: "setSubValue",
+    key: "pushValue",
     value: (
-    /**
-     * set key of subObject
-     * @param key
-     * @param value
-     * @param subvalue
-     * @param sendChanges
-     * @return true if changed , false otherwise
-     */
-    function () {
-      var _setSubValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(key, objKey, subvalue) {
-        var sendChanges,
-          isValueChanged,
-          subval,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
-            case 0:
-              sendChanges = _args9.length > 3 && _args9[3] !== undefined ? _args9[3] : "auto";
-              if (this.canModify) {
-                _context9.next = 7;
-                break;
-              }
-              if (!(this.__throw_errors !== false)) {
-                _context9.next = 6;
-                break;
-              }
-              throw Error("Cant use setSubValue (".concat(String(key), ") when on readonly mode"));
-            case 6:
-              return _context9.abrupt("return", false);
-            case 7:
-              isValueChanged = false;
-              _context9.prev = 8;
-              //if accessing subval of an object, make sure the object is not null
-              subval = _assertClassBrand(_SimpleObject_brand, this, _getSubProperty).call(this, key, objKey);
-              if (!(0, _object.object_equals)(subval, subvalue, {
-                ignoredStartingWords: "_",
-                strictArrayCheck: true
-              })) {
-                _assertClassBrand(_SimpleObject_brand, this, _setSubProperty).call(this, key, objKey, subvalue);
-                isValueChanged = true;
-              } else isValueChanged = false;
-            case 11:
-              _context9.prev = 11;
-              if (!(sendChanges === true || sendChanges === "auto" && isValueChanged)) {
-                _context9.next = 15;
-                break;
-              }
-              _context9.next = 15;
-              return this.notifyChanged("", key, objKey, subvalue);
-            case 15:
-              return _context9.finish(11);
-            case 16:
-              return _context9.abrupt("return", isValueChanged);
-            case 17:
-            case "end":
-              return _context9.stop();
-          }
-        }, _callee9, this, [[8,, 11, 16]]);
-      }));
-      function setSubValue(_x11, _x12, _x13) {
-        return _setSubValue.apply(this, arguments);
-      }
-      return setSubValue;
-    }()
     /**
      * Push a single value to array property
      * @param key
@@ -585,10 +564,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
      * @param sendChanges
      * @returns
      */
-    )
-  }, {
-    key: "pushValue",
-    value: (function () {
+    function () {
       var _pushValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(key, value) {
         var sendChanges,
           _args10 = arguments;
@@ -1264,9 +1240,6 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       }
       return obj[key];
     }
-    /* -------------------------------------------------------------------------- */
-    /*                                  set                                  */
-    /* -------------------------------------------------------------------------- */
   }, {
     key: "loadValues",
     value: function loadValues(obj, initObject) {
@@ -1666,6 +1639,15 @@ function _setDefaultPropertyNow(key) {
   }
   return false;
 }
+function _getSubProperty(key, subkey) {
+  var original = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var subobj = this.get(key, original);
+  if (subobj == null || _typeof(subobj) !== "object") return undefined;
+  return subobj[subkey];
+}
+/* -------------------------------------------------------------------------- */
+/*                                  set                                  	  */
+/* -------------------------------------------------------------------------- */
 function _setSubProperty(key, subkey, value) {
   var subobj = this.get(key);
   //@ts-ignore
@@ -1673,12 +1655,6 @@ function _setSubProperty(key, subkey, value) {
   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 = this.get(key, original);
-  if (subobj == null || _typeof(subobj) !== "object") return undefined;
-  return subobj[subkey];
-}
 /**
  * update a property on this object by updating the `__delta`
  * or update the object property directly depending on `__use_delta` setting

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.5.8",
+    "version": "1.5.9",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",
@@ -70,7 +70,7 @@
     },
     "dependencies": {
         "@azrico/convert": "^1.0.13",
-        "@azrico/event": "^1.2.52",
+        "@azrico/event": "^1.2.56",
         "@azrico/global": "^1.3.85",
         "@azrico/math": "^1.0.5",
         "@azrico/object": "^1.4.112",