@azrico/webobject 1.3.15 → 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/package.json

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