@azrico/webobject 1.4.32 → 1.4.34

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

@@ -9,7 +9,6 @@ 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[];
@@ -61,7 +60,6 @@ export declare class WebObject extends SimpleObject {
     Delete(): Promise<boolean>;
     canSave(deltaObj?: any): true | string;
     deltaIsValid(d: any): true | string;
-    static isResultValid(result_object: any): boolean;
     /**
      * You will post this to the server for saving
      * automatically removes unchangable fields
@@ -80,6 +78,21 @@ export declare class WebObject extends SimpleObject {
     onAfterSave(...p: any): Promise<any>;
     getSaveResult(original?: boolean): any;
     onNew(...p: any): Promise<any>;
+    saveResultHasID(s: any): any;
+    static saveResultHasID(s: any): any;
+    /**
+     * check if the web result of a save action is acknowledged
+     * @param result_object
+     * @returns
+     */
+    static isResultValid(result_object: any): boolean;
+    /**
+     * Load Id and _index_value from the given save result into our object
+     * @param o
+     * @param srObject
+     * @returns
+     */
+    static LoadIdsFromSaveResult(o: WebObject, srObject: any): void;
     /**
      * get a single web object
      * default order of parameters : search,readonly,fetchID

package/dist/src/WebObjects/WebObject.js

@@ -30,13 +30,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();
 var WebObject = /*#__PURE__*/function (_SimpleObject) {
   _inherits(WebObject, _SimpleObject);
   var _super = _createSuper(WebObject);
@@ -45,7 +41,6 @@ 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), "_creator", void 0);
@@ -183,15 +178,14 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     value: function deltaIsValid(d) {
       return true;
     }
-  }, {
-    key: "get_deltaObject",
-    value:
     /**
      * You will post this to the server for saving
      * automatically removes unchangable fields
      * @returns
      */
-    function () {
+  }, {
+    key: "get_deltaObject",
+    value: function () {
       var _get_deltaObject = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(p) {
         var _this2 = this;
         var final_object, isChild, useDelta, allProperties, chkChangables, useExtraProps, dlt, allkeys, changableKeys, parseObj, _parseObj, functionProps, index, fp, _iterator, _step, key;
@@ -420,7 +414,6 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
         var _this$manager4;
         var srObject,
           _this$manager3,
-          srID,
           _len3,
           p,
           _key3,
@@ -429,42 +422,31 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (!this.isSaved) {
-                _context8.next = 10;
+                _context8.next = 7;
                 break;
               }
               this.apply_changes();
               srObject = this.getSaveResult(true);
-              if (!_classPrivateMethodGet(this, _isValidSR, _isValidSR2).call(this, srObject)) {
-                _context8.next = 10;
+              if (!this.saveResultHasID(srObject)) {
+                _context8.next = 7;
                 break;
               }
               /* -------------------------------------------------------------------------- */
-              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);
-              }
-              /* -------------------------------------------------------------------------- */
-              if (srObject._index_key) {
-                this._index_key = srObject._index_key;
-              }
-              _context8.next = 10;
+              WebObject.LoadIdsFromSaveResult(this, srObject);
+              _context8.next = 7;
               return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.event_run("on_id_change");
-            case 10:
+            case 7:
               for (_len3 = _args8.length, p = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
                 p[_key3] = _args8[_key3];
               }
-              _context8.next = 13;
+              _context8.next = 10;
               return (_this$manager4 = this.manager) === null || _this$manager4 === void 0 ? void 0 : _this$manager4.onSave.apply(_this$manager4, p);
-            case 13:
-              _context8.next = 15;
+            case 10:
+              _context8.next = 12;
               return this.onAfterSave();
-            case 15:
+            case 12:
               return _context8.abrupt("return", true);
-            case 16:
+            case 13:
             case "end":
               return _context8.stop();
           }
@@ -514,7 +496,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
       if (!srObject) return false;
       if (Array.isArray(srObject)) {
         var actual_sr = srObject.find(function (s) {
-          return _classPrivateMethodGet(_this3, _isValidSR, _isValidSR2).call(_this3, s);
+          return _this3.saveResultHasID(s);
         });
         if (actual_sr) srObject = actual_sr;
       }
@@ -549,12 +531,12 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
         return _onNew.apply(this, arguments);
       }
       return onNew;
-    }()
-    /* -------------------------------------------------------------------------- */
-    /**
-     * get a single web object
-     * default order of parameters : search,readonly,fetchID
-     */
+    }() /* -------------------------------------------------------------------------- */
+  }, {
+    key: "saveResultHasID",
+    value: function saveResultHasID(s) {
+      return WebObject.saveResultHasID(s);
+    }
   }], [{
     key: "getMeta",
     value: function getMeta(o, key) {
@@ -591,7 +573,11 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     key: "unzipSaveList",
     value: function unzipSaveList(svlist) {
       try {
-        if (_typeof(svlist) === "object") return svlist;
+        if (_typeof(svlist) === "object") {
+          if (Array.isArray(svlist)) return svlist;
+          if (svlist.__save_list) return this.unzipSaveList(svlist.__save_list);
+          return svlist;
+        }
         if (typeof svlist === "string") return JSON.parse((0, _string.string_decompress)(svlist));
       } catch (_unused) {}
       return svlist;
@@ -717,6 +703,22 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
       }
       return saveList;
     }()
+  }, {
+    key: "get_webname",
+    value: function get_webname() {
+      return this.__web_path || this.__web_type || this.__cache_name;
+    }
+  }, {
+    key: "saveResultHasID",
+    value: function saveResultHasID(s) {
+      if (_typeof(s) !== "object" || s == null || !s) return false;
+      return s.insertedId || s._id || s._index_value && !Number.isNaN(s._index_value);
+    }
+    /**
+     * check if the web result of a save action is acknowledged
+     * @param result_object
+     * @returns
+     */
   }, {
     key: "isResultValid",
     value: function isResultValid(result_object) {
@@ -726,11 +728,35 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
       }
       return false;
     }
+    /**
+     * Load Id and _index_value from the given save result into our object
+     * @param o
+     * @param srObject
+     * @returns
+     */
   }, {
-    key: "get_webname",
-    value: function get_webname() {
-      return this.__web_path || this.__web_type || this.__cache_name;
+    key: "LoadIdsFromSaveResult",
+    value: function LoadIdsFromSaveResult(o, srObject) {
+      if (_typeof(o) !== "object" || _typeof(srObject) !== "object") return;
+      /* -------------------------------------------------------------------------- */
+      var srID = srObject.insertedId || srObject._id || WebObject.getID(srObject);
+      if (srID) {
+        o._id = srID;
+      }
+      /* -------------------------------------------------------------------------- */
+      if (srObject._index_value && !Number.isNaN(srObject._index_value)) {
+        o._index_value = Number(srObject._index_value);
+      }
+      /* -------------------------------------------------------------------------- */
+      if (srObject._index_key) {
+        o._index_key = srObject._index_key;
+      }
     }
+    /* -------------------------------------------------------------------------- */
+    /**
+     * get a single web object
+     * default order of parameters : search,readonly,fetchID
+     */
   }, {
     key: "get_single",
     value: function () {
@@ -851,10 +877,6 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
   return WebObject;
 }(_SimpleObject2["default"]);
 exports.WebObject = WebObject;
-function _isValidSR2(s) {
-  if (_typeof(s) !== "object" || s == null || !s) 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/structs/SimpleObject.js

@@ -969,7 +969,7 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
           if (o._bsontype == "ObjectID" && typeof o.toString === "function") {
             return o.toString();
           }
-          return String(o._id || o.ID || o.id || o.__data_id || "");
+          return String(o._id || o.ID || o.id || o.__data_id || o.insertedId || "");
         case "string":
         case "number":
           return String(o);

package/package.json

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