@azrico/webobject 1.4.16 → 1.4.18

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

@@ -52,7 +52,7 @@ export declare class WebObject extends SimpleObject {
      * @returns value or undefined
      */
     static getMetaValue(o: WebObject | null | undefined, key: string): any;
-    static saveList(itemList: WebObject[]): Promise<boolean>;
+    static saveList(itemList: WebObject[], extraOptions?: {}): Promise<boolean>;
     Save(): Promise<boolean>;
     Delete(): Promise<boolean>;
     canSave(deltaObj?: any): true | string;
@@ -73,6 +73,7 @@ export declare class WebObject extends SimpleObject {
     onDelete(...p: any): Promise<any>;
     onLoad(...p: any): Promise<any>;
     onSave(...p: any): Promise<any>;
+    getSaveResult(original?: boolean): any;
     onNew(...p: any): Promise<any>;
     /**
      * get a single web object

package/dist/src/WebObjects/WebObject.js

@@ -20,6 +20,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -407,10 +409,8 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     key: "onSave",
     value: function () {
       var _onSave = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _this3 = this,
-          _this$manager4;
+        var _this$manager4;
         var srObject,
-          actual_sr,
           _this$manager3,
           _len3,
           p,
@@ -420,25 +420,13 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               if (!this.isSaved) {
-                _context8.next = 10;
+                _context8.next = 8;
                 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;
+                _context8.next = 8;
                 break;
               }
               if (srObject.insertedId || srObject._id) {
@@ -447,17 +435,17 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
               if (srObject._index_value && !Number.isNaN(srObject._index_value)) {
                 this._index_value = Number(srObject._index_value);
               }
-              _context8.next = 10;
+              _context8.next = 8;
               return (_this$manager3 = this.manager) === null || _this$manager3 === void 0 ? void 0 : _this$manager3.event_run("on_id_change");
-            case 10:
+            case 8:
               for (_len3 = _args8.length, p = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
                 p[_key3] = _args8[_key3];
               }
-              _context8.next = 13;
+              _context8.next = 11;
               return (_this$manager4 = this.manager) === null || _this$manager4 === void 0 ? void 0 : _this$manager4.onSave.apply(_this$manager4, p);
-            case 13:
+            case 11:
               return _context8.abrupt("return", _context8.sent);
-            case 14:
+            case 12:
             case "end":
               return _context8.stop();
           }
@@ -468,6 +456,21 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
       }
       return onSave;
     }()
+  }, {
+    key: "getSaveResult",
+    value: function getSaveResult() {
+      var _this3 = this;
+      var original = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      var srObject = _get(_getPrototypeOf(WebObject.prototype), "getSaveResult", this).call(this, original);
+      if (!srObject) return false;
+      if (Array.isArray(srObject)) {
+        var actual_sr = srObject.find(function (s) {
+          return _classPrivateMethodGet(_this3, _isValidSR, _isValidSR2).call(_this3, s);
+        });
+        if (actual_sr) srObject = actual_sr;
+      }
+      return srObject;
+    }
   }, {
     key: "onNew",
     value: function () {
@@ -533,94 +536,110 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     key: "saveList",
     value: function () {
       var _saveList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(itemList) {
-        var chunks, putAddress, index, items_to_save, save_array, k, item, dlt, resultObject, _index, res, _item, _index2, _item2;
+        var extraOptions,
+          chunks,
+          putAddress,
+          index,
+          items_to_save,
+          save_array,
+          k,
+          item,
+          dlt,
+          resultObject,
+          _index,
+          res,
+          _item,
+          _index2,
+          _item2,
+          _args10 = arguments;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
+              extraOptions = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : {};
               chunks = (0, _object.array_chunks)(itemList, 30);
               putAddress = this.get_webname();
               index = 0;
-            case 3:
+            case 4:
               if (!(index < chunks.length)) {
-                _context10.next = 33;
+                _context10.next = 34;
                 break;
               }
               items_to_save = chunks[index];
               save_array = [];
               k = 0;
-            case 7:
+            case 8:
               if (!(k < items_to_save.length)) {
-                _context10.next = 16;
+                _context10.next = 17;
                 break;
               }
               item = items_to_save[k];
-              _context10.next = 11;
+              _context10.next = 12;
               return item.get_deltaObject();
-            case 11:
+            case 12:
               dlt = _context10.sent;
               save_array.push(item.isNew ? _objectSpread({}, dlt) : _objectSpread({
                 _id: item.getID()
               }, dlt));
-            case 13:
+            case 14:
               k++;
-              _context10.next = 7;
+              _context10.next = 8;
               break;
-            case 16:
-              _context10.next = 18;
-              return _global.gfunc.run_action("post", putAddress, {
+            case 17:
+              _context10.next = 19;
+              return _global.gfunc.run_action("post", putAddress, _objectSpread({
                 __save_list: save_array
-              });
-            case 18:
+              }, extraOptions));
+            case 19:
               resultObject = _context10.sent;
               if (!Array.isArray(resultObject)) {
-                _context10.next = 30;
+                _context10.next = 31;
                 break;
               }
               _index = 0;
-            case 21:
+            case 22:
               if (!(_index < Math.min(resultObject.length, items_to_save.length))) {
-                _context10.next = 30;
+                _context10.next = 31;
                 break;
               }
               res = resultObject[_index];
               _item = items_to_save[_index];
               _item.setSaveResult(res);
-              _context10.next = 27;
+              _context10.next = 28;
               return _item.onSave();
-            case 27:
+            case 28:
               _index++;
-              _context10.next = 21;
+              _context10.next = 22;
               break;
-            case 30:
+            case 31:
               index++;
-              _context10.next = 3;
+              _context10.next = 4;
               break;
-            case 33:
-              _index2 = 0;
             case 34:
+              _index2 = 0;
+            case 35:
               if (!(_index2 < itemList.length)) {
-                _context10.next = 43;
+                _context10.next = 44;
                 break;
               }
               _item2 = itemList[_index2];
               if (_item2.isSaved) {
-                _context10.next = 38;
+                _context10.next = 39;
                 break;
               }
               return _context10.abrupt("return", false);
-            case 38:
+            case 39:
               if (!(_item2.getSaveResultType() != "normal")) {
-                _context10.next = 40;
+                _context10.next = 41;
                 break;
               }
               return _context10.abrupt("return", false);
-            case 40:
+            case 41:
               _index2++;
-              _context10.next = 34;
+              _context10.next = 35;
               break;
-            case 43:
-              return _context10.abrupt("return", true);
             case 44:
+              return _context10.abrupt("return", true);
+            case 45:
             case "end":
               return _context10.stop();
           }
@@ -766,7 +785,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
 }(_SimpleObject2["default"]);
 exports.WebObject = WebObject;
 function _isValidSR2(s) {
-  if (_typeof(s) !== "object" && s == null) return false;
+  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", "");

package/package.json

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