@azrico/webobject 1.3.14 → 1.3.16

package/dist/src/WebObjects/WebObject.js

@@ -410,9 +410,10 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     value: function () {
       var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var _this3 = this,
-          _this$manager3;
+          _this$manager4;
         var srObject,
           actual_sr,
+          _this$manager3,
           _len3,
           p,
           _key3,
@@ -420,36 +421,45 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              if (this.isSaved) {
-                this.apply_changes();
-                srObject = this.getSaveResult(true);
-                if (srObject != null) {
-                  //we may have some extra data in the save result.
-                  //try to find the main data
-                  if (Array.isArray(srObject)) {
-                    actual_sr = srObject.find(function (s) {
-                      return _classPrivateMethodGet(_this3, _isValidSR, _isValidSR2).call(_this3, s);
-                    });
-                    if (actual_sr) srObject = actual_sr;
-                  }
-                  if (_classPrivateMethodGet(this, _isValidSR, _isValidSR2).call(this, srObject)) {
-                    if (srObject.insertedId || srObject._id) {
-                      this._id = srObject.insertedId || srObject._id;
-                    }
-                    if (srObject._index_value && !Number.isNaN(srObject._index_value)) {
-                      this._index_value = Number(srObject._index_value);
-                    }
-                  }
-                }
+              if (!this.isSaved) {
+                _context8.next = 10;
+                break;
+              }
+              this.apply_changes();
+              srObject = this.getSaveResult(true);
+              if (!(srObject != null)) {
+                _context8.next = 10;
+                break;
+              }
+              //we may have some extra data in the save result.
+              //try to find the main data
+              if (Array.isArray(srObject)) {
+                actual_sr = srObject.find(function (s) {
+                  return _classPrivateMethodGet(_this3, _isValidSR, _isValidSR2).call(_this3, s);
+                });
+                if (actual_sr) srObject = actual_sr;
               }
+              if (!_classPrivateMethodGet(this, _isValidSR, _isValidSR2).call(this, srObject)) {
+                _context8.next = 10;
+                break;
+              }
+              if (srObject.insertedId || srObject._id) {
+                this._id = srObject.insertedId || srObject._id;
+              }
+              if (srObject._index_value && !Number.isNaN(srObject._index_value)) {
+                this._index_value = Number(srObject._index_value);
+              }
+              _context8.next = 10;
+              return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.event_run("on_id_change");
+            case 10:
               for (_len3 = _args8.length, p = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
                 p[_key3] = _args8[_key3];
               }
-              _context8.next = 4;
-              return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.onSave.apply(_this$manager3, p);
-            case 4:
+              _context8.next = 13;
+              return (_this$manager4 = this.manager) === null || _this$manager4 === void 0 ? void 0 : _this$manager4.onSave.apply(_this$manager4, p);
+            case 13:
               return _context8.abrupt("return", _context8.sent);
-            case 5:
+            case 14:
             case "end":
               return _context8.stop();
           }
@@ -464,7 +474,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     key: "onNew",
     value: function () {
       var _onNew = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var _this$manager4;
+        var _this$manager5;
         var _len4,
           p,
           _key4,
@@ -476,7 +486,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
                 p[_key4] = _args9[_key4];
               }
               _context9.next = 3;
-              return (_this$manager4 = this.manager) === null || _this$manager4 === void 0 ? void 0 : _this$manager4.onNew.apply(_this$manager4, p);
+              return (_this$manager5 = this.manager) === null || _this$manager5 === void 0 ? void 0 : _this$manager5.onNew.apply(_this$manager5, p);
             case 3:
               return _context9.abrupt("return", _context9.sent);
             case 4:

package/dist/src/WebObjects/WebObjectManager.js

@@ -315,10 +315,13 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
               return this.event_run("on_after_load");
             case 7:
               _context7.next = 9;
-              return Promise.resolve(true);
+              return this.event_run("on_load_finished");
             case 9:
+              _context7.next = 11;
+              return Promise.resolve(true);
+            case 11:
               return _context7.abrupt("return", _context7.sent);
-            case 10:
+            case 12:
             case "end":
               return _context7.stop();
           }
@@ -351,10 +354,13 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
               return this.event_run("on_after_save");
             case 6:
               _context8.next = 8;
-              return Promise.resolve(true);
+              return this.event_run("on_save_finished");
             case 8:
+              _context8.next = 10;
+              return Promise.resolve(true);
+            case 10:
               return _context8.abrupt("return", _context8.sent);
-            case 9:
+            case 11:
             case "end":
               return _context8.stop();
           }

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

@@ -64,24 +64,12 @@ export declare class SimpleObject extends MapableObject {
      * set the value to its original
      * @param key
      */
-    resetValue(key: WriteablePropOf<this>): Promise<boolean>;
+    reset(key: WriteablePropOf<this>, notifyChanged?: sendChangesType): Promise<boolean>;
     /**
-     * set the value to its original
-     * @param key
-     */
-    reset: (key: WriteablePropOf<this>) => Promise<boolean>;
-    /**
-     * clear any changes related to the key
-     * only works in when useDelta is true
-     * @param key
-     */
-    clearDeltaValue(key: WriteablePropOf<this>): boolean;
-    /**
-     * clear any changes related to the key
-     * only works in when useDelta is true
+     * reset all values back to their original
      * @param key
      */
-    clear: (key: WriteablePropOf<this>) => boolean;
+    resetAll(notifyChanged?: sendChangesType): Promise<boolean>;
     /**
      * set key of subObject
      * @param key

package/dist/src/structs/SimpleObject.js

@@ -41,7 +41,6 @@ function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(
 var _setSubProperty = /*#__PURE__*/new WeakSet();
 var _getSubProperty = /*#__PURE__*/new WeakSet();
 var _setProperty = /*#__PURE__*/new WeakSet();
-var _clearDeltaProperty = /*#__PURE__*/new WeakSet();
 var _setDefaultProperty = /*#__PURE__*/new WeakSet();
 var _getProperty = /*#__PURE__*/new WeakSet();
 var _getTempProperty = /*#__PURE__*/new WeakSet();
@@ -64,7 +63,6 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _getTempProperty);
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _getProperty);
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _setDefaultProperty);
-    _classPrivateMethodInitSpec(_assertThisInitialized(_this), _clearDeltaProperty);
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _setProperty);
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _getSubProperty);
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _setSubProperty);
@@ -107,17 +105,6 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
      * @returns
      */
     _defineProperty(_assertThisInitialized(_this), "setDefault", _this.setDefaultValue);
-    /**
-     * set the value to its original
-     * @param key
-     */
-    _defineProperty(_assertThisInitialized(_this), "reset", _this.resetValue);
-    /**
-     * clear any changes related to the key
-     * only works in when useDelta is true
-     * @param key
-     */
-    _defineProperty(_assertThisInitialized(_this), "clear", _this.clearDeltaValue);
     _defineProperty(_assertThisInitialized(_this), "get_managerClass", function () {
       return null;
     });
@@ -223,29 +210,85 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
       return _classPrivateMethodGet(this, _setDefaultProperty, _setDefaultProperty2).call(this, key, value);
     }
   }, {
-    key: "resetValue",
+    key: "reset",
     value:
     /**
      * set the value to its original
      * @param key
      */
-    function resetValue(key) {
-      return this.setValue(key, _classPrivateMethodGet(this, _getProperty, _getProperty2).call(this, key, true));
-    }
-  }, {
-    key: "clearDeltaValue",
-    value:
+    function () {
+      var _reset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key) {
+        var notifyChanged,
+          _args2 = arguments;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              notifyChanged = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : "auto";
+              _context2.next = 3;
+              return this.setValue(key, this[key], notifyChanged);
+            case 3:
+              return _context2.abrupt("return", _context2.sent);
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function reset(_x3) {
+        return _reset.apply(this, arguments);
+      }
+      return reset;
+    }()
     /**
-     * clear any changes related to the key
-     * only works in when useDelta is true
+     * reset all values back to their original
      * @param key
      */
-    function clearDeltaValue(key) {
-      return _classPrivateMethodGet(this, _clearDeltaProperty, _clearDeltaProperty2).call(this, key);
-    }
   }, {
-    key: "setSubValue",
-    value:
+    key: "resetAll",
+    value: function () {
+      var _resetAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var notifyChanged,
+          fr,
+          key,
+          _args3 = arguments;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              notifyChanged = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : "auto";
+              fr = true;
+              _context3.t0 = _regeneratorRuntime().keys(this.__delta);
+            case 3:
+              if ((_context3.t1 = _context3.t0()).done) {
+                _context3.next = 13;
+                break;
+              }
+              key = _context3.t1.value;
+              _context3.t2 = fr;
+              if (!_context3.t2) {
+                _context3.next = 10;
+                break;
+              }
+              _context3.next = 9;
+              return this.reset(key, notifyChanged);
+            case 9:
+              _context3.t2 = _context3.sent;
+            case 10:
+              fr = _context3.t2;
+              _context3.next = 3;
+              break;
+            case 13:
+              return _context3.abrupt("return", fr);
+            case 14:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function resetAll() {
+        return _resetAll.apply(this, arguments);
+      }
+      return resetAll;
+    }()
     /**
      * set key of subObject
      * @param key
@@ -253,30 +296,32 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
      * @param subvalue
      * @return true if changed , false otherwise
      */
-    function () {
-      var _setSubValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, objKey, subvalue) {
+  }, {
+    key: "setSubValue",
+    value: function () {
+      var _setSubValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, objKey, subvalue) {
         var sendChanges,
           isValueChanged,
           subval,
-          _args2 = arguments;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+          _args4 = arguments;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              sendChanges = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : "auto";
+              sendChanges = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : "auto";
               if (this.canModify) {
-                _context2.next = 7;
+                _context4.next = 7;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context2.next = 6;
+                _context4.next = 6;
                 break;
               }
               throw Error("Cant use setValue when on readonly mode");
             case 6:
-              return _context2.abrupt("return", false);
+              return _context4.abrupt("return", false);
             case 7:
               isValueChanged = false;
-              _context2.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, {
@@ -286,24 +331,24 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
                 isValueChanged = true;
               } else isValueChanged = false;
             case 11:
-              _context2.prev = 11;
+              _context4.prev = 11;
               if (!(sendChanges === true || sendChanges === "auto" && isValueChanged)) {
-                _context2.next = 15;
+                _context4.next = 15;
                 break;
               }
-              _context2.next = 15;
+              _context4.next = 15;
               return this.notifyChanged("", String(key), objKey, subvalue);
             case 15:
-              return _context2.finish(11);
+              return _context4.finish(11);
             case 16:
-              return _context2.abrupt("return", isValueChanged);
+              return _context4.abrupt("return", isValueChanged);
             case 17:
             case "end":
-              return _context2.stop();
+              return _context4.stop();
           }
-        }, _callee2, this, [[8,, 11, 16]]);
+        }, _callee4, this, [[8,, 11, 16]]);
       }));
-      function setSubValue(_x3, _x4, _x5) {
+      function setSubValue(_x4, _x5, _x6) {
         return _setSubValue.apply(this, arguments);
       }
       return setSubValue;
@@ -318,64 +363,64 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
   }, {
     key: "pushValue",
     value: function () {
-      var _pushValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, value) {
+      var _pushValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(key, value) {
         var sendChanges,
           tempArray,
-          _args3 = arguments;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              sendChanges = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : "auto";
+              sendChanges = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : "auto";
               if (!(value == null)) {
-                _context3.next = 3;
+                _context5.next = 3;
                 break;
               }
-              return _context3.abrupt("return", false);
+              return _context5.abrupt("return", false);
             case 3:
               if (this.canModify) {
-                _context3.next = 9;
+                _context5.next = 9;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context3.next = 8;
+                _context5.next = 8;
                 break;
               }
               throw Error("Cant use pushValue when on readonly mode");
             case 8:
-              return _context3.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)) {
-                _context3.next = 17;
+                _context5.next = 17;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context3.next = 16;
+                _context5.next = 16;
                 break;
               }
               throw Error("Cant use pushValue on non Array keys");
             case 16:
-              return _context3.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")) {
-                _context3.next = 21;
+                _context5.next = 21;
                 break;
               }
-              _context3.next = 21;
+              _context5.next = 21;
               return this.notifyChanged("", String(key), value);
             case 21:
-              return _context3.abrupt("return", tempArray);
+              return _context5.abrupt("return", tempArray);
             case 22:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
-        }, _callee3, this);
+        }, _callee5, this);
       }));
-      function pushValue(_x6, _x7) {
+      function pushValue(_x7, _x8) {
         return _pushValue.apply(this, arguments);
       }
       return pushValue;
@@ -390,10 +435,10 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
   }, {
     key: "notifyChanged",
     value: function () {
-      var _notifyChanged = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, key, value, subvalue) {
+      var _notifyChanged = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(type, key, value, subvalue) {
         var lc, manager_class;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.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);
               this.__changed = true;
@@ -408,18 +453,18 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
               /* --------------------------- notify the manager --------------------------- */
               manager_class = this.get_managerClass();
               if (!(manager_class instanceof _ObjectManager["default"])) {
-                _context4.next = 10;
+                _context6.next = 10;
                 break;
               }
-              _context4.next = 10;
+              _context6.next = 10;
               return manager_class.notifyChanged(type, key, value, subvalue);
             case 10:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this);
+        }, _callee6, this);
       }));
-      function notifyChanged(_x8, _x9, _x10, _x11) {
+      function notifyChanged(_x9, _x10, _x11, _x12) {
         return _notifyChanged.apply(this, arguments);
       }
       return notifyChanged;
@@ -934,13 +979,6 @@ function _setProperty2(key, value) {
     return true;
   }
 }
-function _clearDeltaProperty2(key) {
-  if (this.__use_delta) {
-    delete this.__delta[key];
-    return true;
-  }
-  return false;
-}
 function _setDefaultProperty2(key, value) {
   //@ts-ignore
   if (this[key] == undefined || this[key] === "" || this[key] === 0) {
@@ -952,11 +990,9 @@ function _setDefaultProperty2(key, value) {
 function _getProperty2(key) {
   var original = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   //check if we should use delta version or normal version for this property
-  if (this.__use_delta && !original && key in this.__delta) {
-    //@ts-ignore
-    return this.__delta[key];
-  }
-  return this[key];
+  if (original || !this.__use_delta || !(key in this.__delta)) return this[key];
+  //@ts-ignore
+  return this.__delta[key];
 }
 function _getTempProperty2(key) {
   if (this.__temp == null) return undefined;

package/package.json

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