@azrico/webobject 1.5.3 → 1.5.5

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

@@ -28,7 +28,6 @@ export declare class SimpleObject extends MapableObject {
     _static(): Function;
     protected __originalobject?: this;
     protected __delta: Partial<this>;
-    protected __has_delta: boolean;
     protected __lastChanged?: string;
     protected __is_readonly?: boolean;
     protected __throw_errors?: boolean;
@@ -66,7 +65,6 @@ export declare class SimpleObject extends MapableObject {
      * if the field is not in delta  instantly calls the `apply` function to remove from delta
      * @param key
      * @param value
-     * @returns true if `apply` function is used
      */
     setPreferApply(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType): Promise<boolean>;
     /**

package/dist/src/structs/SimpleObject.js

@@ -52,7 +52,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     _defineProperty(_this, "__originalobject", void 0);
     //changes are saved here
     _defineProperty(_this, "__delta", {});
-    _defineProperty(_this, "__has_delta", false);
+    //// protected __has_delta: boolean = false;
     //the last thing that was changed on this object
     _defineProperty(_this, "__lastChanged", void 0);
     //is the object read only
@@ -136,7 +136,6 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
           old_value,
           needsChange,
           _this$manager,
-          __has_delta_isChanged,
           _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -163,15 +162,12 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
                 ignoredStartingWords: "_"
               });
               if (needsChange) {
-                __has_delta_isChanged = _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, value);
+                _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, value);
                 /**
                  * 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);
-                ////if (__has_delta_isChanged && this.manager) {
-                ////    this.manager.setOption("hasDelta", this.__has_delta);
-                ////}
+                (_this$manager = this.manager) === null || _this$manager === void 0 || _this$manager.checkIsChanged();
               }
               /**
                * if the field is not in delta
@@ -207,7 +203,6 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
      * if the field is not in delta  instantly calls the `apply` function to remove from delta
      * @param key
      * @param value
-     * @returns true if `apply` function is used
      */
     )
   }, {
@@ -832,7 +827,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     key: "clear_changes",
     value: function clear_changes() {
       this.__delta = {};
-      this.__has_delta = false;
+      ////this.__has_delta = false;
       return true;
     }
     /**
@@ -872,11 +867,11 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       ////if (!deltaIsBlank) return true; //delta is not blank, definitely changed
       ////if (this.__use_delta) return !deltaIsBlank; //trust the delta.
       if (this.__use_delta) {
-        return this.__has_delta;
-        ////for (const key in this.__delta) {
-        ////    return true;
-        ////}
-        ////return false;
+        ////return this.__has_delta;
+        for (var key in this.__delta) {
+          return true;
+        }
+        return false;
       }
       /* --------------------- check the properties one by one -------------------- */
       var orig = this.getOriginal();
@@ -891,9 +886,9 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
         }) != undefined;
       } else {
         /* check all fields */
-        for (var key in this) {
-          if (key.startsWith("__")) continue;
-          if (!(0, _object.object_equals)(this[key], orig[key])) return true;
+        for (var _key2 in this) {
+          if (_key2.startsWith("__")) continue;
+          if (!(0, _object.object_equals)(this[_key2], orig[_key2])) return true;
         }
         return false;
       }
@@ -1030,7 +1025,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
         var _this$manager2;
         var _len2,
           params,
-          _key2,
+          _key3,
           _args15 = arguments;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
@@ -1042,8 +1037,8 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
               if (this.__showErrors === true) console.error("you cant use events (".concat(eventName, ") if your object has no manager"));
               return _context15.abrupt("return");
             case 3:
-              for (_len2 = _args15.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-                params[_key2 - 1] = _args15[_key2];
+              for (_len2 = _args15.length, params = new Array(_len2 > 1 ? _len2 - 1 : 0), _key3 = 1; _key3 < _len2; _key3++) {
+                params[_key3 - 1] = _args15[_key3];
               }
               _context15.next = 6;
               return (_this$manager2 = this.manager).event_run.apply(_this$manager2, [eventName].concat(params));
@@ -1241,10 +1236,10 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
           delete obj[key];
         }
       } else if (_typeof(initObject) == "object") {
-        for (var _key3 in initObject) {
-          if (_key3.startsWith("__")) continue;
-          if (fullUpdate || Object.prototype.hasOwnProperty.call(obj, _key3)) {
-            obj[_key3] = initObject[_key3];
+        for (var _key4 in initObject) {
+          if (_key4.startsWith("__")) continue;
+          if (fullUpdate || Object.prototype.hasOwnProperty.call(obj, _key4)) {
+            obj[_key4] = initObject[_key4];
           }
         }
       }
@@ -1654,11 +1649,10 @@ function _getSubProperty(key, subkey) {
 }
 /**
  * update a property on this object by updating the `__delta`
- * or updating the object property directly depending on `__use_delta` setting
+ * or update the object property directly depending on `__use_delta` setting
  *
  * @param key
  * @param value
- * @returns true if state of `__has_delta` is changed, false otherwise
  */
 function _setProperty(key, value) {
   var checkIsChanged = false;
@@ -1669,7 +1663,7 @@ function _setProperty(key, value) {
        * no need to save it as delta
        */
       delete this.__delta[key];
-      checkIsChanged = true; //check if we should set __has_delta to false
+      ////checkIsChanged = true; //check if we should set __has_delta to false
     } else {
       this.__delta[key] = value; //always update delta to keep track of changes
     }
@@ -1677,24 +1671,25 @@ function _setProperty(key, value) {
     this[key] = value; //on noDelta mode update the object itself
     this.__delta[key] = value; //always update delta to keep track of changes
   }
-  if (checkIsChanged || this.__has_delta === false) {
-    /**
-     * if any key exists in the `__delta` then the object is changed
-     */
-    var next__has_delta = false;
-    for (var _key4 in this.__delta) {
-      next__has_delta = true;
-      break;
-    }
-    var previous__has_delta = this.__has_delta;
-    this.__has_delta = next__has_delta;
-    /**
-     * if the state of __has_delta is changed we return true
-     * so we can run the needed events
-     */
-    return previous__has_delta != this.__has_delta;
-  }
-  return false;
+  return true;
+  //// if (checkIsChanged || this.__has_delta === false) {
+  ////     /**
+  ////      * if any key exists in the `__delta` then the object is changed
+  ////      */
+  ////     let next__has_delta = false;
+  ////     for (const key in this.__delta) {
+  ////         next__has_delta = true;
+  ////         break;
+  ////     }
+  ////     let previous__has_delta = this.__has_delta;
+  ////     this.__has_delta = next__has_delta;
+  ////     /**
+  ////      * if the state of __has_delta is changed we return true
+  ////      * so we can run the needed events
+  ////      */
+  ////     return previous__has_delta != this.__has_delta;
+  //// }
+  //// return false;
 }
 function _setSaveResultObject(toObj) {
   if (toObj == null) toObj = null; //null or undefined

package/package.json

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