@azrico/webobject 1.5.2 → 1.5.4

package/dist/src/WebObjects/WebObjectManager.d.ts

@@ -32,12 +32,6 @@ export declare class WebObjectManager<ObjType extends WebObject> extends ObjectM
     get __object_name(): string;
     get_webpath(): string;
     private __getObjectData;
-    /**
-     * Use this when you load new Object
-     * @param p
-     * @returns
-     */
-    onNew(...p: any): Promise<any>;
     /**
      * Use this when you delete Object
      * @param p
@@ -48,6 +42,12 @@ export declare class WebObjectManager<ObjType extends WebObject> extends ObjectM
     onUnArchive(...p: any): Promise<any>;
     onLock(...p: any): Promise<any>;
     onUnLock(...p: any): Promise<any>;
+    /**
+     * Use this when you load new Object
+     * @param p
+     * @returns
+     */
+    onNew(...p: any): Promise<any>;
     /**
      * Use this when you load data to the object
      * @param p

package/dist/src/WebObjects/WebObjectManager.js

@@ -550,65 +550,51 @@ var WebObjectManager = exports.WebObjectManager = /*#__PURE__*/function (_Object
     /*                               Default Events                               */
     /* -------------------------------------------------------------------------- */
     /**
-     * Use this when you load new Object
+     * Use this when you delete Object
      * @param p
      * @returns
      */
   }, {
-    key: "onNew",
+    key: "onDelete",
     value: (function () {
-      var _onNew = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _this$obj11;
+      var _onDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+        var srt;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              if (this.canModify) {
-                (_this$obj11 = this.obj) === null || _this$obj11 === void 0 || _this$obj11.setOriginal();
-              }
+              srt = this.getSaveResultType();
               _context14.next = 3;
-              return this.event_run("on_new");
+              return this.event_run("on_delete", srt);
             case 3:
               _context14.next = 5;
-              return this.event_run("on_change", true);
+              return this.event_run("on_after_delete", srt);
             case 5:
-              _context14.next = 7;
-              return this.event_run("on_after_new");
-            case 7:
-              _context14.next = 9;
-              return Promise.resolve(true);
-            case 9:
-              return _context14.abrupt("return", _context14.sent);
-            case 10:
+              return _context14.abrupt("return", true);
+            case 6:
             case "end":
               return _context14.stop();
           }
         }, _callee14, this);
       }));
-      function onNew() {
-        return _onNew.apply(this, arguments);
+      function onDelete() {
+        return _onDelete.apply(this, arguments);
       }
-      return onNew;
-    }()
-    /**
-     * Use this when you delete Object
-     * @param p
-     * @returns
-     */
-    )
+      return onDelete;
+    }())
   }, {
-    key: "onDelete",
-    value: (function () {
-      var _onDelete = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+    key: "onArchive",
+    value: function () {
+      var _onArchive = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
         var srt;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
               srt = this.getSaveResultType();
               _context15.next = 3;
-              return this.event_run("on_delete", srt);
+              return this.event_run("on_archive", srt);
             case 3:
               _context15.next = 5;
-              return this.event_run("on_after_delete", srt);
+              return this.event_run("on_after_archive", srt);
             case 5:
               return _context15.abrupt("return", true);
             case 6:
@@ -617,25 +603,25 @@ var WebObjectManager = exports.WebObjectManager = /*#__PURE__*/function (_Object
           }
         }, _callee15, this);
       }));
-      function onDelete() {
-        return _onDelete.apply(this, arguments);
+      function onArchive() {
+        return _onArchive.apply(this, arguments);
       }
-      return onDelete;
-    }())
+      return onArchive;
+    }()
   }, {
-    key: "onArchive",
+    key: "onUnArchive",
     value: function () {
-      var _onArchive = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+      var _onUnArchive = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
         var srt;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
               srt = this.getSaveResultType();
               _context16.next = 3;
-              return this.event_run("on_archive", srt);
+              return this.event_run("on_unarchive", srt);
             case 3:
               _context16.next = 5;
-              return this.event_run("on_after_archive", srt);
+              return this.event_run("on_after_unarchive", srt);
             case 5:
               return _context16.abrupt("return", true);
             case 6:
@@ -644,25 +630,25 @@ var WebObjectManager = exports.WebObjectManager = /*#__PURE__*/function (_Object
           }
         }, _callee16, this);
       }));
-      function onArchive() {
-        return _onArchive.apply(this, arguments);
+      function onUnArchive() {
+        return _onUnArchive.apply(this, arguments);
       }
-      return onArchive;
+      return onUnArchive;
     }()
   }, {
-    key: "onUnArchive",
+    key: "onLock",
     value: function () {
-      var _onUnArchive = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+      var _onLock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
         var srt;
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
               srt = this.getSaveResultType();
               _context17.next = 3;
-              return this.event_run("on_unarchive", srt);
+              return this.event_run("on_lock", srt);
             case 3:
               _context17.next = 5;
-              return this.event_run("on_after_unarchive", srt);
+              return this.event_run("on_after_lock", srt);
             case 5:
               return _context17.abrupt("return", true);
             case 6:
@@ -671,25 +657,25 @@ var WebObjectManager = exports.WebObjectManager = /*#__PURE__*/function (_Object
           }
         }, _callee17, this);
       }));
-      function onUnArchive() {
-        return _onUnArchive.apply(this, arguments);
+      function onLock() {
+        return _onLock.apply(this, arguments);
       }
-      return onUnArchive;
+      return onLock;
     }()
   }, {
-    key: "onLock",
+    key: "onUnLock",
     value: function () {
-      var _onLock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+      var _onUnLock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
         var srt;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
               srt = this.getSaveResultType();
               _context18.next = 3;
-              return this.event_run("on_lock", srt);
+              return this.event_run("on_unlock", srt);
             case 3:
               _context18.next = 5;
-              return this.event_run("on_after_lock", srt);
+              return this.event_run("on_after_unlock", srt);
             case 5:
               return _context18.abrupt("return", true);
             case 6:
@@ -698,43 +684,60 @@ var WebObjectManager = exports.WebObjectManager = /*#__PURE__*/function (_Object
           }
         }, _callee18, this);
       }));
-      function onLock() {
-        return _onLock.apply(this, arguments);
+      function onUnLock() {
+        return _onUnLock.apply(this, arguments);
       }
-      return onLock;
+      return onUnLock;
     }()
+    /**
+     * Use this when you load new Object
+     * @param p
+     * @returns
+     */
   }, {
-    key: "onUnLock",
-    value: function () {
-      var _onUnLock = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
-        var srt;
+    key: "onNew",
+    value: (function () {
+      var _onNew = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        var _this$obj11;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              srt = this.getSaveResultType();
+              if (this.canModify) {
+                (_this$obj11 = this.obj) === null || _this$obj11 === void 0 || _this$obj11.setOriginal();
+              }
               _context19.next = 3;
-              return this.event_run("on_unlock", srt);
+              return this.event_run("on_new");
             case 3:
               _context19.next = 5;
-              return this.event_run("on_after_unlock", srt);
+              return this.event_run("on_change", true);
             case 5:
-              return _context19.abrupt("return", true);
-            case 6:
+              _context19.next = 7;
+              return this.event_run("on_after_new");
+            case 7:
+              _context19.next = 9;
+              return this.checkIsChanged();
+            case 9:
+              _context19.next = 11;
+              return Promise.resolve(true);
+            case 11:
+              return _context19.abrupt("return", _context19.sent);
+            case 12:
             case "end":
               return _context19.stop();
           }
         }, _callee19, this);
       }));
-      function onUnLock() {
-        return _onUnLock.apply(this, arguments);
+      function onNew() {
+        return _onNew.apply(this, arguments);
       }
-      return onUnLock;
+      return onNew;
     }()
     /**
      * Use this when you load data to the object
      * @param p
      * @returns
      */
+    )
   }, {
     key: "onLoad",
     value: (function () {
@@ -758,8 +761,11 @@ var WebObjectManager = exports.WebObjectManager = /*#__PURE__*/function (_Object
               _context20.next = 9;
               return this.event_run("on_load_finished");
             case 9:
+              _context20.next = 11;
+              return this.checkIsChanged();
+            case 11:
               return _context20.abrupt("return", true);
-            case 10:
+            case 12:
             case "end":
               return _context20.stop();
           }
@@ -792,10 +798,13 @@ var WebObjectManager = exports.WebObjectManager = /*#__PURE__*/function (_Object
               return this.event_run("on_change", true);
             case 5:
               _context21.next = 7;
-              return Promise.resolve(true);
+              return this.checkIsChanged();
             case 7:
+              _context21.next = 9;
+              return Promise.resolve(true);
+            case 9:
               return _context21.abrupt("return", _context21.sent);
-            case 8:
+            case 10:
             case "end":
               return _context21.stop();
           }

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

@@ -123,10 +123,10 @@ export declare class ObjectManager<ObjType extends SimpleObject> extends RawObje
     getErrors(): any[];
     clearErrors(): boolean;
     /**
-     *
      * @returns isChanged
      */
     useIsChanged(): any;
+    checkIsChanged(): Promise<void>;
     static addError(o?: ObjectManager<any>, title?: string, message?: string, sendToRegister?: boolean | "auto"): any[] | undefined;
     static getErrors(o: ObjectManager<any>): any[];
     static clearErrors(o: ObjectManager<any>): boolean;

package/dist/src/structs/ObjectManager.js

@@ -712,18 +712,35 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
     value: function clearErrors() {
       return ObjectManager.clearErrors(this);
     }
-    /* -------------------------------------------------------------------------- */
+    /* ------------------------------ useIsChanged; ----------------------------- */
     /**
-     *
      * @returns isChanged
      */
   }, {
     key: "useIsChanged",
     value: function useIsChanged() {
       return this.useOption("ischanged");
-      //// return this.event_use("on_{change,save,load}", () => this.isChanged);
     }
-    /* -------------------------------------------------------------------------- */
+  }, {
+    key: "checkIsChanged",
+    value: function () {
+      var _checkIsChanged = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              _context12.next = 2;
+              return this.setOption("ischanged", this.isChanged);
+            case 2:
+            case "end":
+              return _context12.stop();
+          }
+        }, _callee12, this);
+      }));
+      function checkIsChanged() {
+        return _checkIsChanged.apply(this, arguments);
+      }
+      return checkIsChanged;
+    }()
   }, {
     key: "getObjectType",
     value: /* -------------------------------------------------------------------------- */

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

@@ -53,9 +53,13 @@ export declare class SimpleObject extends MapableObject {
     static getValue<T extends SimpleObject, MKey extends PropOf<T>>(o: T, key: MKey, original?: boolean): PropType<T, MKey> | undefined;
     /**
      * set value and run the event handlers if needed
-     * @return true if changed , false otherwise
+     * @param key
+     * @param value
+     * @param shouldNotify
+     * @param autoApply if the field is not in delta, instantly calls the `apply` function to remove from delta
+     * @returns
      */
-    setValue(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType): Promise<boolean>;
+    setValue(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType, autoApply?: boolean): Promise<boolean>;
     /**
      * set value and run the event handlers if needed
      *
@@ -63,12 +67,12 @@ export declare class SimpleObject extends MapableObject {
      * @param key
      * @param value
      */
-    setPreferApply(key: WriteablePropOf<this>, value: any): Promise<boolean>;
+    setPreferApply(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType): Promise<boolean>;
     /**
      * 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>;
+    set: (key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType, autoApply?: boolean) => Promise<boolean>;
     /**
      * load all properties in `initObject` into the current object
      * @param initObject

package/dist/src/structs/SimpleObject.js

@@ -122,11 +122,17 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     value: (
     /**
      * set value and run the event handlers if needed
-     * @return true if changed , false otherwise
+     * @param key
+     * @param value
+     * @param shouldNotify
+     * @param autoApply if the field is not in delta, instantly calls the `apply` function to remove from delta
+     * @returns
      */
     function () {
       var _setValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, value) {
         var shouldNotify,
+          autoApply,
+          keyExists,
           old_value,
           needsChange,
           _this$manager,
@@ -136,19 +142,21 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
           while (1) switch (_context.prev = _context.next) {
             case 0:
               shouldNotify = _args.length > 2 && _args[2] !== undefined ? _args[2] : "auto";
+              autoApply = _args.length > 3 && _args[3] !== undefined ? _args[3] : false;
               if (this.canModify) {
-                _context.next = 7;
+                _context.next = 8;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context.next = 6;
+                _context.next = 7;
                 break;
               }
               throw Error("Cant use setValue (".concat(String(key), ") when on readonly mode"));
-            case 6:
-              return _context.abrupt("return", false);
             case 7:
+              return _context.abrupt("return", false);
+            case 8:
               /* --------------------------- set if not changed --------------------------- */
+              keyExists = key in this.__delta;
               old_value = this.getValue(key);
               needsChange = !(0, _object.object_equals)(old_value, value, {
                 strictArrayCheck: true,
@@ -160,21 +168,29 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
                  * 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);
+                (_this$manager = this.manager) === null || _this$manager === void 0 || _this$manager.checkIsChanged();
                 ////if (__has_delta_isChanged && this.manager) {
                 ////    this.manager.setOption("hasDelta", this.__has_delta);
                 ////}
               }
+              /**
+               * 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 = 13;
+                _context.next = 16;
                 break;
               }
-              _context.next = 13;
+              _context.next = 16;
               return this.notifyChanged("", key, value);
-            case 13:
+            case 16:
               return _context.abrupt("return", needsChange);
-            case 14:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -197,20 +213,17 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     key: "setPreferApply",
     value: (function () {
       var _setPreferApply = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, value) {
-        var keyExists, res;
+        var shouldNotify,
+          _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              keyExists = key in this.__delta;
+              shouldNotify = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : "auto";
               _context2.next = 3;
-              return this.set(key, value, keyExists ? "auto" : false);
+              return this.set(key, value, shouldNotify, true);
             case 3:
-              res = _context2.sent;
-              if (!keyExists) {
-                this.apply(key);
-              }
-              return _context2.abrupt("return", res);
-            case 6:
+              return _context2.abrupt("return", _context2.sent);
+            case 4:
             case "end":
               return _context2.stop();
           }

package/package.json

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