@azrico/webobject 1.4.21 → 1.4.24

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

@@ -75,6 +75,7 @@ export declare class WebObject extends SimpleObject {
     onDelete(...p: any): Promise<any>;
     onLoad(...p: any): Promise<any>;
     onSave(...p: any): Promise<any>;
+    onAfterSave(...p: any): Promise<any>;
     getSaveResult(original?: boolean): any;
     onNew(...p: any): Promise<any>;
     /**

package/dist/src/WebObjects/WebObject.js

@@ -419,6 +419,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
         var _this$manager4;
         var srObject,
           _this$manager3,
+          srID,
           _len3,
           p,
           _key3,
@@ -427,32 +428,40 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (!this.isSaved) {
-                _context8.next = 8;
+                _context8.next = 10;
                 break;
               }
               this.apply_changes();
               srObject = this.getSaveResult(true);
               if (!_classPrivateMethodGet(this, _isValidSR, _isValidSR2).call(this, srObject)) {
-                _context8.next = 8;
+                _context8.next = 10;
                 break;
               }
-              if (srObject.insertedId || srObject._id) {
-                this._id = srObject.insertedId || srObject._id;
+              /* -------------------------------------------------------------------------- */
+              srID = srObject.insertedId || srObject._id;
+              if (srID) {
+                this._id = srID;
               }
+              /* -------------------------------------------------------------------------- */
               if (srObject._index_value && !Number.isNaN(srObject._index_value)) {
                 this._index_value = Number(srObject._index_value);
               }
-              _context8.next = 8;
+              /* -------------------------------------------------------------------------- */
+              if (srObject._index_key) {
+                this._index_key = srObject._index_key;
+              }
+              _context8.next = 10;
               return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.event_run("on_id_change");
-            case 8:
+            case 10:
               for (_len3 = _args8.length, p = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
                 p[_key3] = _args8[_key3];
               }
-              _context8.next = 11;
+              _context8.next = 13;
               return (_this$manager4 = this.manager) === null || _this$manager4 === void 0 ? void 0 : _this$manager4.onSave.apply(_this$manager4, p);
-            case 11:
-              return _context8.abrupt("return", _context8.sent);
-            case 12:
+            case 13:
+              _context8.next = 15;
+              return this.onAfterSave();
+            case 15:
             case "end":
               return _context8.stop();
           }
@@ -463,6 +472,36 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
       }
       return onSave;
     }()
+  }, {
+    key: "onAfterSave",
+    value: function () {
+      var _onAfterSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        var _this$manager5;
+        var _len4,
+          p,
+          _key4,
+          _args9 = arguments;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              for (_len4 = _args9.length, p = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+                p[_key4] = _args9[_key4];
+              }
+              _context9.next = 3;
+              return (_this$manager5 = this.manager) === null || _this$manager5 === void 0 ? void 0 : _this$manager5.onAfterSave.apply(_this$manager5, p);
+            case 3:
+              return _context9.abrupt("return", _context9.sent);
+            case 4:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function onAfterSave() {
+        return _onAfterSave.apply(this, arguments);
+      }
+      return onAfterSave;
+    }()
   }, {
     key: "getSaveResult",
     value: function getSaveResult() {
@@ -481,27 +520,27 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "onNew",
     value: function () {
-      var _onNew = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var _this$manager5;
-        var _len4,
+      var _onNew = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+        var _this$manager6;
+        var _len5,
           p,
-          _key4,
-          _args9 = arguments;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+          _key5,
+          _args10 = arguments;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              for (_len4 = _args9.length, p = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
-                p[_key4] = _args9[_key4];
+              for (_len5 = _args10.length, p = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+                p[_key5] = _args10[_key5];
               }
-              _context9.next = 3;
-              return (_this$manager5 = this.manager) === null || _this$manager5 === void 0 ? void 0 : _this$manager5.onNew.apply(_this$manager5, p);
+              _context10.next = 3;
+              return (_this$manager6 = this.manager) === null || _this$manager6 === void 0 ? void 0 : _this$manager6.onNew.apply(_this$manager6, p);
             case 3:
-              return _context9.abrupt("return", _context9.sent);
+              return _context10.abrupt("return", _context10.sent);
             case 4:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this);
+        }, _callee10, this);
       }));
       function onNew() {
         return _onNew.apply(this, arguments);
@@ -542,7 +581,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "saveList",
     value: function () {
-      var _saveList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(itemList) {
+      var _saveList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(itemList) {
         var _extraOptions$chunksi;
         var extraOptions,
           chunks,
@@ -559,11 +598,11 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
           _item,
           _index2,
           _item2,
-          _args10 = arguments;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+          _args11 = arguments;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              extraOptions = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : {};
+              extraOptions = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : {};
               if (!extraOptions) extraOptions = {};
               chunks = (0, _object.array_chunks)(itemList, (_extraOptions$chunksi = extraOptions.chunksize) !== null && _extraOptions$chunksi !== void 0 ? _extraOptions$chunksi : 50);
               delete extraOptions.chunksize;
@@ -571,7 +610,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
               index = 0;
             case 6:
               if (!(index < chunks.length)) {
-                _context10.next = 36;
+                _context11.next = 36;
                 break;
               }
               items_to_save = chunks[index];
@@ -579,81 +618,81 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
               k = 0;
             case 10:
               if (!(k < items_to_save.length)) {
-                _context10.next = 19;
+                _context11.next = 19;
                 break;
               }
               item = items_to_save[k];
-              _context10.next = 14;
+              _context11.next = 14;
               return item.get_deltaObject();
             case 14:
-              dlt = _context10.sent;
+              dlt = _context11.sent;
               save_array.push(item.isNew ? _objectSpread({}, dlt) : _objectSpread({
                 _id: item.getID()
               }, dlt));
             case 16:
               k++;
-              _context10.next = 10;
+              _context11.next = 10;
               break;
             case 19:
-              _context10.next = 21;
+              _context11.next = 21;
               return _global.gfunc.run_action("post", putAddress, _objectSpread({
                 __save_list: save_array
               }, extraOptions));
             case 21:
-              resultObject = _context10.sent;
+              resultObject = _context11.sent;
               if (!Array.isArray(resultObject)) {
-                _context10.next = 33;
+                _context11.next = 33;
                 break;
               }
               _index = 0;
             case 24:
               if (!(_index < Math.min(resultObject.length, items_to_save.length))) {
-                _context10.next = 33;
+                _context11.next = 33;
                 break;
               }
               res = resultObject[_index];
               _item = items_to_save[_index];
               _item.setSaveResult(res);
-              _context10.next = 30;
+              _context11.next = 30;
               return _item.onSave();
             case 30:
               _index++;
-              _context10.next = 24;
+              _context11.next = 24;
               break;
             case 33:
               index++;
-              _context10.next = 6;
+              _context11.next = 6;
               break;
             case 36:
               _index2 = 0;
             case 37:
               if (!(_index2 < itemList.length)) {
-                _context10.next = 46;
+                _context11.next = 46;
                 break;
               }
               _item2 = itemList[_index2];
               if (_item2.isSaved) {
-                _context10.next = 41;
+                _context11.next = 41;
                 break;
               }
-              return _context10.abrupt("return", false);
+              return _context11.abrupt("return", false);
             case 41:
               if (!(_item2.getSaveResultType() != "normal")) {
-                _context10.next = 43;
+                _context11.next = 43;
                 break;
               }
-              return _context10.abrupt("return", false);
+              return _context11.abrupt("return", false);
             case 43:
               _index2++;
-              _context10.next = 37;
+              _context11.next = 37;
               break;
             case 46:
-              return _context10.abrupt("return", true);
+              return _context11.abrupt("return", true);
             case 47:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
-        }, _callee10, this);
+        }, _callee11, this);
       }));
       function saveList(_x4) {
         return _saveList.apply(this, arguments);
@@ -677,64 +716,64 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "get_single",
     value: function () {
-      var _get_single = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-        var _len5,
+      var _get_single = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+        var _len6,
           p,
-          _key5,
+          _key6,
           search,
           readonly,
           fetchID,
           res,
           params,
-          _args11 = arguments;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
+          _args12 = arguments;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              for (_len5 = _args11.length, p = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-                p[_key5] = _args11[_key5];
+              for (_len6 = _args12.length, p = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
+                p[_key6] = _args12[_key6];
               }
               search = p.shift();
               readonly = p.shift();
               fetchID = p.shift();
               if (!(0, _object.object_isEmpty)(search)) {
-                _context11.next = 6;
+                _context12.next = 6;
                 break;
               }
-              return _context11.abrupt("return", undefined);
+              return _context12.abrupt("return", undefined);
             case 6:
               params = {};
               params.context = readonly ? "view" : "edit";
-              _context11.t0 = _typeof(search);
-              _context11.next = _context11.t0 === "string" ? 11 : _context11.t0 === "number" ? 11 : _context11.t0 === "object" ? 19 : 19;
+              _context12.t0 = _typeof(search);
+              _context12.next = _context12.t0 === "string" ? 11 : _context12.t0 === "number" ? 11 : _context12.t0 === "object" ? 19 : 19;
               break;
             case 11:
               search = String(search);
-              _context11.t1 = this;
-              _context11.t2 = this;
-              _context11.next = 16;
+              _context12.t1 = this;
+              _context12.t2 = this;
+              _context12.next = 16;
               return _global.gfunc.run_action("get", this.__web_path + "/" + search, params, {
                 fetchID: fetchID
               });
             case 16:
-              _context11.t3 = _context11.sent;
-              res = _context11.t1.ensure.call(_context11.t1, _context11.t2, _context11.t3);
-              return _context11.abrupt("break", 25);
+              _context12.t3 = _context12.sent;
+              res = _context12.t1.ensure.call(_context12.t1, _context12.t2, _context12.t3);
+              return _context12.abrupt("break", 25);
             case 19:
-              _context11.t4 = _object.object_first;
-              _context11.next = 22;
+              _context12.t4 = _object.object_first;
+              _context12.next = 22;
               return this.get_list(search, readonly, fetchID);
             case 22:
-              _context11.t5 = _context11.sent;
-              res = (0, _context11.t4)(_context11.t5);
-              return _context11.abrupt("break", 25);
+              _context12.t5 = _context12.sent;
+              res = (0, _context12.t4)(_context12.t5);
+              return _context12.abrupt("break", 25);
             case 25:
               WebObject.setReadonly(res, readonly);
-              return _context11.abrupt("return", res);
+              return _context12.abrupt("return", res);
             case 27:
             case "end":
-              return _context11.stop();
+              return _context12.stop();
           }
-        }, _callee11, this);
+        }, _callee12, this);
       }));
       function get_single() {
         return _get_single.apply(this, arguments);
@@ -748,42 +787,42 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "get_list",
     value: function () {
-      var _get_list = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        var _len6,
+      var _get_list = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        var _len7,
           p,
-          _key6,
+          _key7,
           search,
           readonly,
           fetchID,
           result_items,
           selftype,
           res,
-          _args12 = arguments;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+          _args13 = arguments;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              for (_len6 = _args12.length, p = new Array(_len6), _key6 = 0; _key6 < _len6; _key6++) {
-                p[_key6] = _args12[_key6];
+              for (_len7 = _args13.length, p = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
+                p[_key7] = _args13[_key7];
               }
               search = p.shift();
               readonly = p.shift();
               fetchID = p.shift();
               if (!search) search = {};
-              _context12.next = 7;
+              _context13.next = 7;
               return _global.gfunc.run_action("get", this.__web_path, search, {
                 fetchID: fetchID
               });
             case 7:
-              result_items = _context12.sent;
+              result_items = _context13.sent;
               selftype = this.prototype;
               res = WebObject.map_rowindex(WebObject.mapto(selftype, result_items, readonly));
               WebObject.setReadonly(res, readonly);
-              return _context12.abrupt("return", res);
+              return _context13.abrupt("return", res);
             case 12:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12, this);
+        }, _callee13, this);
       }));
       function get_list() {
         return _get_list.apply(this, arguments);

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

@@ -50,5 +50,6 @@ export declare class WebObjectManager<T extends WebObject> extends ObjectManager
      * @returns
      */
     onSave(...p: any): Promise<any>;
+    onAfterSave(...p: any): Promise<any>;
 }
 export default WebObjectManager;

package/dist/src/WebObjects/WebObjectManager.js

@@ -349,16 +349,10 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
               return this.event_run("on_change", true);
             case 4:
               _context8.next = 6;
-              return this.event_run("on_after_save");
-            case 6:
-              _context8.next = 8;
-              return this.event_run("on_save_finished");
-            case 8:
-              _context8.next = 10;
               return Promise.resolve(true);
-            case 10:
+            case 6:
               return _context8.abrupt("return", _context8.sent);
-            case 11:
+            case 7:
             case "end":
               return _context8.stop();
           }
@@ -369,6 +363,34 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
       }
       return onSave;
     }()
+  }, {
+    key: "onAfterSave",
+    value: function () {
+      var _onAfterSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              _context9.next = 2;
+              return this.event_run("on_after_save");
+            case 2:
+              _context9.next = 4;
+              return this.event_run("on_save_finished");
+            case 4:
+              _context9.next = 6;
+              return Promise.resolve(true);
+            case 6:
+              return _context9.abrupt("return", _context9.sent);
+            case 7:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function onAfterSave() {
+        return _onAfterSave.apply(this, arguments);
+      }
+      return onAfterSave;
+    }()
   }]);
   return WebObjectManager;
 }(_ObjectManager2["default"]);

package/package.json

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