@azrico/webobject 1.3.0 → 1.3.2

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

@@ -9,6 +9,7 @@ export type deltaParams = {
     extraProperties?: boolean;
 };
 export declare class WebObject extends SimpleObject {
+    #private;
     static readonly __web_path: string;
     static readonly __web_type: string;
     meta_data: MetaObject[];

package/dist/src/WebObjects/WebObject.js

@@ -27,9 +27,13 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
+var _isValidSR = /*#__PURE__*/new WeakSet();
 var WebObject = /*#__PURE__*/function (_SimpleObject) {
   _inherits(WebObject, _SimpleObject);
   var _super = _createSuper(WebObject);
@@ -38,6 +42,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     var is_readonly = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     _classCallCheck(this, WebObject);
     _this = _super.call(this, is_readonly);
+    _classPrivateMethodInitSpec(_assertThisInitialized(_this), _isValidSR);
     _defineProperty(_assertThisInitialized(_this), "meta_data", void 0);
     _defineProperty(_assertThisInitialized(_this), "_id", "");
     _defineProperty(_assertThisInitialized(_this), "_created_date", "");
@@ -372,22 +377,47 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     key: "onSave",
     value: function () {
       var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        var _this$manager2;
-        var _len2,
+        var _this3 = this,
+          _this$manager2;
+        var srObject,
+          actual_sr,
+          _len2,
           p,
           _key2,
           _args7 = arguments;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.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);
+                    }
+                  }
+                }
+              }
               for (_len2 = _args7.length, p = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
                 p[_key2] = _args7[_key2];
               }
-              _context7.next = 3;
+              _context7.next = 4;
               return (_this$manager2 = this.manager) === null || _this$manager2 === void 0 ? void 0 : _this$manager2.onSave.apply(_this$manager2, p);
-            case 3:
-              return _context7.abrupt("return", _context7.sent);
             case 4:
+              return _context7.abrupt("return", _context7.sent);
+            case 5:
             case "end":
               return _context7.stop();
           }
@@ -590,6 +620,10 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   return WebObject;
 }(_SimpleObject2["default"]);
 exports.WebObject = WebObject;
+function _isValidSR2(s) {
+  if (_typeof(s) !== "object" && s == null) return false;
+  return s.insertedId || s._id || s._index_value && !Number.isNaN(s._index_value);
+}
 _defineProperty(WebObject, "__web_path", "");
 _defineProperty(WebObject, "__web_type", "");
 var _default = WebObject;

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

@@ -5,7 +5,6 @@ import WebObject from "./WebObject";
  * This class manages the events of an Simple Object
  */
 export declare class WebObjectManager<T extends WebObject> extends ObjectManager<T> {
-    #private;
     static readonly __web_path: string;
     static readonly __web_type: string;
     /**

package/dist/src/WebObjects/WebObjectManager.js

@@ -20,13 +20,9 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
-var _isValidSR = /*#__PURE__*/new WeakSet();
 /**
  * This class manages the events of an Simple Object
  */
@@ -34,18 +30,15 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
   _inherits(WebObjectManager, _ObjectManager);
   var _super = _createSuper(WebObjectManager);
   function WebObjectManager() {
-    var _this;
     _classCallCheck(this, WebObjectManager);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _classPrivateMethodInitSpec(_assertThisInitialized(_this), _isValidSR);
-    return _this;
+    return _super.apply(this, arguments);
   }
   _createClass(WebObjectManager, [{
     key: "setMetaValue",
-    value: /* -------------------------------------------------------------------------- */
+    value:
+    //we use this as backup
+
+    /* -------------------------------------------------------------------------- */
     /* -------------------------------------------------------------------------- */
     /*                                  Meta data                                 */
     /* -------------------------------------------------------------------------- */
@@ -201,10 +194,13 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
               return this.event_run("on_change", true);
             case 5:
               _context4.next = 7;
-              return Promise.resolve(true);
+              return this.event_run("on_after_new");
             case 7:
+              _context4.next = 9;
+              return Promise.resolve(true);
+            case 9:
               return _context4.abrupt("return", _context4.sent);
-            case 8:
+            case 10:
             case "end":
               return _context4.stop();
           }
@@ -238,10 +234,13 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
               return this.event_run("on_change", true);
             case 5:
               _context5.next = 7;
-              return Promise.resolve(true);
+              return this.event_run("on_after_load");
             case 7:
+              _context5.next = 9;
+              return Promise.resolve(true);
+            case 9:
               return _context5.abrupt("return", _context5.sent);
-            case 8:
+            case 10:
             case "end":
               return _context5.stop();
           }
@@ -252,55 +251,32 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
       }
       return onLoad;
     }()
-  }, {
-    key: "onSave",
-    value:
     /**
      * Use this after succesful save to Database
      * @param p
      * @returns
      */
-    function () {
+  }, {
+    key: "onSave",
+    value: function () {
       var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _this2 = this;
-        var srObject, actual_sr;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              if (this.isSaved && this.obj) {
-                this.apply_changes();
-                srObject = this.obj.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(_this2, _isValidSR, _isValidSR2).call(_this2, s);
-                    });
-                    if (actual_sr) srObject = actual_sr;
-                  }
-                  if (_classPrivateMethodGet(this, _isValidSR, _isValidSR2).call(this, srObject)) {
-                    if (srObject.insertedId || srObject._id) {
-                      this.obj._id = srObject.insertedId || srObject._id;
-                    }
-                    if (srObject._index_value && !Number.isNaN(srObject._index_value)) {
-                      this.obj._index_value = Number(srObject._index_value);
-                    }
-                  }
-                }
-                //this.loadValues(srObject);
-              }
-              _context6.next = 3;
+              _context6.next = 2;
               return this.event_run("on_save");
-            case 3:
-              _context6.next = 5;
+            case 2:
+              _context6.next = 4;
               return this.event_run("on_change", true);
-            case 5:
-              _context6.next = 7;
+            case 4:
+              _context6.next = 6;
+              return this.event_run("on_after_save");
+            case 6:
+              _context6.next = 8;
               return Promise.resolve(true);
-            case 7:
-              return _context6.abrupt("return", _context6.sent);
             case 8:
+              return _context6.abrupt("return", _context6.sent);
+            case 9:
             case "end":
               return _context6.stop();
           }
@@ -315,11 +291,6 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager) {
   return WebObjectManager;
 }(_ObjectManager2["default"]);
 exports.WebObjectManager = WebObjectManager;
-function _isValidSR2(s) {
-  if (_typeof(s) !== "object" && s == null) return false;
-  return s.insertedId || s._id || s._index_value && !Number.isNaN(s._index_value);
-}
-//we use this as backup
 _defineProperty(WebObjectManager, "__web_path", "");
 _defineProperty(WebObjectManager, "__web_type", "");
 var _default = WebObjectManager;

package/package.json

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