@azrico/webobject 1.5.37 → 1.5.40

package/dist/src/WebObjects/WebObject.js

@@ -695,15 +695,14 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
                * intersection of keys in delta and keys that are defined as changeable
                */
               changableKeys = (0, _object.array_intersection)(Object.keys(changedFields), WebObject.getChangeableKeys(this, p));
-              _context13.next = 17;
-              return _convert["default"].applyFormats({
+              _convert["default"].format({
+                original: this,
                 inputobject: changedFields,
                 formats: (0, _object.object_getStatic)(this, "__formatList"),
                 isNew: this.isNew,
                 changableKeys: changableKeys,
                 applyDefaults: true
               });
-            case 17:
               /* -------------------------------------------------------------------------- */
               /*                            __functionProperties                            */
               /* -------------------------------------------------------------------------- */
@@ -716,33 +715,33 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
               /*                           parse all changableKeys                          */
               /* -------------------------------------------------------------------------- */
               _iterator = _createForOfIteratorHelper(changableKeys);
-              _context13.prev = 20;
+              _context13.prev = 19;
               _iterator.s();
-            case 22:
+            case 21:
               if ((_step = _iterator.n()).done) {
-                _context13.next = 29;
+                _context13.next = 28;
                 break;
               }
               _key = _step.value;
-              _context13.next = 26;
+              _context13.next = 25;
               return parseObj(changedFields[_key]);
-            case 26:
+            case 25:
               final_object[_key] = _context13.sent;
-            case 27:
-              _context13.next = 22;
+            case 26:
+              _context13.next = 21;
               break;
-            case 29:
-              _context13.next = 34;
+            case 28:
+              _context13.next = 33;
               break;
-            case 31:
-              _context13.prev = 31;
-              _context13.t2 = _context13["catch"](20);
+            case 30:
+              _context13.prev = 30;
+              _context13.t2 = _context13["catch"](19);
               _iterator.e(_context13.t2);
-            case 34:
-              _context13.prev = 34;
+            case 33:
+              _context13.prev = 33;
               _iterator.f();
-              return _context13.finish(34);
-            case 37:
+              return _context13.finish(33);
+            case 36:
               /* -------------------- add acrhived and date properties -------------------- */
               if (p.allProperties) {
                 final_object["_created_date"] = this["_created_date"];
@@ -768,17 +767,17 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
                 final_object["_users"] = (0, _object.wrap_array)(tempusers);
               }
               if (!p.clean) {
-                _context13.next = 42;
+                _context13.next = 41;
                 break;
               }
               return _context13.abrupt("return", (0, _object.object_clean)(final_object, false, true));
-            case 42:
+            case 41:
               return _context13.abrupt("return", final_object);
-            case 43:
+            case 42:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[20, 31, 34, 37]]);
+        }, _callee13, this, [[19, 30, 33, 36]]);
       }));
       function get_deltaObject(_x5) {
         return _get_deltaObject.apply(this, arguments);

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

@@ -197,16 +197,18 @@ export declare class SimpleObject extends MapableObject {
      * set the value to its original
      * @param key
      */
-    reset(key: WriteablePropOf<this>, shouldNotify?: sendChangesType): Promise<boolean>;
+    discard(key: WriteablePropOf<this>, shouldNotify?: sendChangesType): Promise<boolean>;
     /**
      * reset all values back to their original
-     * difference between this and clear_changes is that this function also calls on_change
+     *
+     * this function also calls `on_change` and then `clear_changes`
      * @param key
      */
-    resetAll(shouldNotify?: sendChangesType): Promise<boolean>;
+    discardAll(shouldNotify?: sendChangesType): Promise<boolean>;
     /**
      * clear and discard all changes
-     * does not call any on_change functions
+     *
+     * does not call `on_change` functions
      * @returns
      */
     clear_changes(): boolean;

package/dist/src/structs/SimpleObject.js

@@ -772,49 +772,54 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
      * @param key
      */
   }, {
-    key: "reset",
+    key: "discard",
     value: (function () {
-      var _reset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(key) {
+      var _discard = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(key) {
         var shouldNotify,
+          originalValue,
           _args13 = arguments;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
               shouldNotify = _args13.length > 1 && _args13[1] !== undefined ? _args13[1] : "auto";
-              _context13.next = 3;
-              return this.set(key, this[key], shouldNotify);
-            case 3:
-              return _context13.abrupt("return", _context13.sent);
+              if (this.__use_delta) {
+                originalValue = this[key];
+              } else if (this.__originalobject) originalValue = this.__originalobject[key];else originalValue = this[key];
+              _context13.next = 4;
+              return this.set(key, originalValue, shouldNotify);
             case 4:
+              return _context13.abrupt("return", _context13.sent);
+            case 5:
             case "end":
               return _context13.stop();
           }
         }, _callee13, this);
       }));
-      function reset(_x22) {
-        return _reset.apply(this, arguments);
+      function discard(_x22) {
+        return _discard.apply(this, arguments);
       }
-      return reset;
+      return discard;
     }()
     /**
      * reset all values back to their original
-     * difference between this and clear_changes is that this function also calls on_change
+     *
+     * this function also calls `on_change` and then `clear_changes`
      * @param key
      */
     )
   }, {
-    key: "resetAll",
+    key: "discardAll",
     value: (function () {
-      var _resetAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      var _discardAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var shouldNotify,
-          fr,
+          final_result,
           key,
           _args14 = arguments;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
               shouldNotify = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : "auto";
-              fr = true;
+              final_result = true;
               _context14.t0 = _regeneratorRuntime().keys(this.__delta);
             case 3:
               if ((_context14.t1 = _context14.t0()).done) {
@@ -822,35 +827,37 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
                 break;
               }
               key = _context14.t1.value;
-              _context14.t2 = fr;
+              _context14.t2 = final_result;
               if (!_context14.t2) {
                 _context14.next = 10;
                 break;
               }
               _context14.next = 9;
-              return this.reset(key, shouldNotify);
+              return this.discard(key, shouldNotify);
             case 9:
               _context14.t2 = _context14.sent;
             case 10:
-              fr = _context14.t2;
+              final_result = _context14.t2;
               _context14.next = 3;
               break;
             case 13:
-              return _context14.abrupt("return", fr);
-            case 14:
+              if (final_result) this.clear_changes();
+              return _context14.abrupt("return", final_result);
+            case 15:
             case "end":
               return _context14.stop();
           }
         }, _callee14, this);
       }));
-      function resetAll() {
-        return _resetAll.apply(this, arguments);
+      function discardAll() {
+        return _discardAll.apply(this, arguments);
       }
-      return resetAll;
+      return discardAll;
     }()
     /**
      * clear and discard all changes
-     * does not call any on_change functions
+     *
+     * does not call `on_change` functions
      * @returns
      */
     )

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.5.37",
+    "version": "1.5.40",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",
@@ -69,12 +69,12 @@
         "@azrico/uid": "*"
     },
     "dependencies": {
-        "@azrico/convert": "^1.0.19",
-        "@azrico/event": "^1.2.62",
+        "@azrico/convert": "^1.1.3",
+        "@azrico/event": "^1.2.67",
         "@azrico/global": "^1.3.85",
         "@azrico/math": "^1.0.5",
-        "@azrico/object": "^1.4.128",
-        "@azrico/string": "^1.3.4",
+        "@azrico/object": "^1.4.135",
+        "@azrico/string": "^1.3.7",
         "@azrico/types": "^1.0.11",
         "@azrico/uid": "^1.0.8"
     },