@azrico/webobject 1.4.198 → 1.4.200

package/dist/src/WebObjects/WebObject.js

@@ -553,8 +553,7 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
     key: "get_deltaObject",
     value: (function () {
       var _get_deltaObject = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(p) {
-        var _this2 = this;
-        var final_object, isChild, useDelta, allProperties, needId, chkChangables, useExtraProps, dlt, key, allkeys, changableKeys, functionProps, index, fp, parseObj, _parseObj, _iterator, _step, _key, gotIndex, gotId, tempusers;
+        var final_object, isChild, useDelta, allProperties, needId, chkChangables, useExtraProps, dlt, key, changableKeys, functionProps, index, fp, parseObj, _parseObj, _iterator, _step, _key, gotIndex, gotId, tempusers;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -630,13 +629,15 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
               if (!p) p = {};
               final_object = {}; //@ts-ignore
               isChild = Boolean(p.isChild || p.ischild); //@ts-ignore
-              useDelta = this.__use_delta || Boolean(p.useDelta || p.usedelta); //@ts-ignore
-              allProperties = Boolean(p.allProperties || p.allproperties); //@ts-ignore
+              useDelta = this.__use_delta || Boolean(p.useDelta || p.usedelta);
+              allProperties = Boolean(
+              //@ts-ignore
+              p.allProperties || p.allproperties || isChild); //@ts-ignore
               needId = Boolean(p.needId || p.needid);
               chkChangables = this.__changeables != null || this.__unchangeables != null;
               useExtraProps = Boolean(p.extraProperties); //child objects usually dont update their __delta, so we read info from all of its properties
               dlt = allProperties || !useDelta && isChild && chkChangables ? _objectSpread({}, this.allproperties) : _objectSpread({}, this.__delta);
-              /* ------------- parse children that have WebObject as children ------------- */
+              /* ------------- parse children that have WebObject as delta ------------- */
               _context12.t0 = _regeneratorRuntime().keys(this);
             case 12:
               if ((_context12.t1 = _context12.t0()).done) {
@@ -659,21 +660,26 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
               _context12.next = 12;
               break;
             case 19:
-              allkeys = Object.keys(dlt);
-              changableKeys = chkChangables ? allkeys.filter(function (s) {
-                return _index3.SimpleObject.canChangeKey(_this2, s, {
-                  useExtraProps: useExtraProps,
-                  ignoreProtected: allProperties
-                });
-              }) : allkeys;
-              _context12.next = 23;
+              /* ------------------------- get all changeable keys ------------------------ */
+              changableKeys = (0, _object.array_intersection)(Object.keys(dlt), WebObject.getChangeableKeys(this, {
+                useExtraProps: useExtraProps,
+                ignoreProtected: allProperties
+              })); // chkChangables
+              //     ? allkeys.filter((s) =>
+              //           SimpleObject.canChangeKey(this, s, {
+              //               useExtraProps: useExtraProps,
+              //               ignoreProtected: allProperties,
+              //           }),
+              //       )
+              //     : allkeys;
+              _context12.next = 22;
               return _convert["default"].applyFormats({
                 inputobject: dlt,
                 formats: (0, _object.object_getStatic)(this, "__formatList"),
                 changableKeys: changableKeys,
                 applyDefaults: true
               });
-            case 23:
+            case 22:
               /* -------------------------------------------------------------------------- */
               /*                            __functionProperties                            */
               /* -------------------------------------------------------------------------- */
@@ -688,33 +694,33 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
               /*                           parse all changableKeys                          */
               /* -------------------------------------------------------------------------- */
               _iterator = _createForOfIteratorHelper(changableKeys);
-              _context12.prev = 26;
+              _context12.prev = 25;
               _iterator.s();
-            case 28:
+            case 27:
               if ((_step = _iterator.n()).done) {
-                _context12.next = 35;
+                _context12.next = 34;
                 break;
               }
               _key = _step.value;
-              _context12.next = 32;
+              _context12.next = 31;
               return parseObj(dlt[_key]);
-            case 32:
+            case 31:
               final_object[_key] = _context12.sent;
-            case 33:
-              _context12.next = 28;
+            case 32:
+              _context12.next = 27;
               break;
-            case 35:
-              _context12.next = 40;
+            case 34:
+              _context12.next = 39;
               break;
-            case 37:
-              _context12.prev = 37;
-              _context12.t2 = _context12["catch"](26);
+            case 36:
+              _context12.prev = 36;
+              _context12.t2 = _context12["catch"](25);
               _iterator.e(_context12.t2);
-            case 40:
-              _context12.prev = 40;
+            case 39:
+              _context12.prev = 39;
               _iterator.f();
-              return _context12.finish(40);
-            case 43:
+              return _context12.finish(39);
+            case 42:
               /* -------------------- add acrhived and date properties -------------------- */
               if (allProperties) {
                 final_object["_created_date"] = this["_created_date"];
@@ -740,11 +746,11 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
                 final_object["_users"] = (0, _object.wrap_array)(tempusers);
               }
               return _context12.abrupt("return", final_object);
-            case 47:
+            case 46:
             case "end":
               return _context12.stop();
           }
-        }, _callee12, this, [[26, 37, 40, 43]]);
+        }, _callee12, this, [[25, 36, 39, 42]]);
       }));
       function get_deltaObject(_x4) {
         return _get_deltaObject.apply(this, arguments);
@@ -1035,13 +1041,13 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
   }, {
     key: "getSaveResult",
     value: function getSaveResult() {
-      var _this3 = this;
+      var _this2 = 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 _this3.saveResultHasID(s);
+          return _this2.saveResultHasID(s);
         });
         if (actual_sr) srObject = actual_sr;
       }

package/dist/src/structs/SimpleObject.d.ts

@@ -7,6 +7,10 @@ export type saveType = "normal" | "quick";
 export type sendChangesType = boolean | "auto";
 export type WithManager<T extends SimpleObject> = Ensure<T, "manager">;
 export type WithManagerOrNot<T extends SimpleObject> = T | WithManager<T>;
+type getKeysProps = {
+    useExtraProps?: boolean;
+    ignoreProtected?: boolean;
+};
 export declare class SimpleObject extends MapableObject {
     #private;
     static readonly __db_name: string;
@@ -134,6 +138,7 @@ export declare class SimpleObject extends MapableObject {
      * @returns true if manager was notified. false otherwise
      */
     notifyChanged<MKey extends PropOf<this>>(type: string, key: MKey | string, value: any, subvalue?: any): Promise<false | any[] | undefined>;
+    static getChangeableKeys(object: SimpleObject, options: getKeysProps): any[];
     /**
      * check if a key can be changed on an object
      * @param object the object we are checking
@@ -141,10 +146,7 @@ export declare class SimpleObject extends MapableObject {
      * @param useExtraProps should we check extra props?
      * @returns
      */
-    static canChangeKey(object: SimpleObject, key: string, options: {
-        useExtraProps?: boolean;
-        ignoreProtected?: boolean;
-    }): boolean;
+    static canChangeKey(object: SimpleObject, key: string, options: getKeysProps): boolean;
     static hasIllegalChanges(referenceObject: any, changesObject: any, updaterUser: any): boolean;
     /**
      * Apply all the changes and empty the delta object

package/dist/src/structs/SimpleObject.js

@@ -10,6 +10,12 @@ var _global = require("@azrico/global");
 var _MapableObject2 = require("./MapableObject");
 var _ObjectManager = _interopRequireDefault(require("./ObjectManager"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -632,15 +638,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
         return _notifyChanged.apply(this, arguments);
       }
       return notifyChanged;
-    }()
-    /**
-     * check if a key can be changed on an object
-     * @param object the object we are checking
-     * @param key key of the object
-     * @param useExtraProps should we check extra props?
-     * @returns
-     */
-    )
+    }())
   }, {
     key: "apply_changes",
     value: /* -------------------------------------------------------------------------- */
@@ -1203,32 +1201,82 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       return true;
     }
   }, {
-    key: "canChangeKey",
-    value: function canChangeKey(object, key, options) {
-      if (!object || !key) return false;
+    key: "getChangeableKeys",
+    value: function getChangeableKeys(object, options) {
+      var _key_list2;
+      if (!object) return [];
       var useExtraProps = options.useExtraProps,
         ignoreProtected = options.ignoreProtected;
+      var key_list = [];
       if (useExtraProps) {
+        var _key_list;
         var __extraProperties = object.constructor["__extraProperties"];
-        if (__extraProperties != null && __extraProperties.includes(key)) return true;
+        if (!(0, _object.array_isEmpty)(__extraProperties)) (_key_list = key_list).push.apply(_key_list, _toConsumableArray(__extraProperties));
       }
       /* -------------------------------------------------------------------------- */
       var __changeables = object.constructor["__changeables"];
+      if (!(0, _object.array_isEmpty)(__changeables)) (_key_list2 = key_list).push.apply(_key_list2, _toConsumableArray(__changeables));
       var __unchangeables = object.constructor["__unchangeables"];
-      /* -------------------------------------------------------------------------- */
-      if (__changeables != null && !__changeables.includes(key)) return false;
-      if (__unchangeables != null && __unchangeables.includes(key)) return false;
+      if (!(0, _object.array_isEmpty)(__unchangeables)) {
+        key_list = key_list.filter(function (s) {
+          return !__unchangeables.includes(s);
+        });
+      }
       if (ignoreProtected !== true) {
         var __protectedProperties = object.constructor["__protectedProperties"];
-        if (__protectedProperties != null && __protectedProperties.includes(key)) {
-          //protected keys can only be changed by the creator of this object
-          //make sure you set the is_current_user function correctly
-          if (object.isNew) return true;
-          var creatorOfObject = object.get("_creator");
-          return Boolean(_global.gfunc.run_action_sync("is_current_user", creatorOfObject));
+        //protected keys can only be changed by the creator of this object
+        //make sure you set the is_current_user function correctly
+        if (!object.isNew && !(0, _object.array_isEmpty)(__protectedProperties) && !Boolean(_global.gfunc.run_action_sync("is_current_user", object.get("_creator")))) {
+          key_list = key_list.filter(function (s) {
+            return !__protectedProperties.includes(s);
+          });
         }
       }
-      return true;
+      return key_list;
+    }
+    /**
+     * check if a key can be changed on an object
+     * @param object the object we are checking
+     * @param key key of the object
+     * @param useExtraProps should we check extra props?
+     * @returns
+     */
+  }, {
+    key: "canChangeKey",
+    value: function canChangeKey(object, key, options) {
+      if (!object || !key) return false;
+      var keys = this.getChangeableKeys(object, options);
+      return keys.includes(key);
+      // const {useExtraProps, ignoreProtected} = options;
+      // if (useExtraProps) {
+      //     const __extraProperties = object.constructor["__extraProperties"];
+      //     if (__extraProperties != null && __extraProperties.includes(key))
+      //         return true;
+      // }
+      // /* -------------------------------------------------------------------------- */
+      // const __changeables = object.constructor["__changeables"];
+      // const __unchangeables = object.constructor["__unchangeables"];
+      // /* -------------------------------------------------------------------------- */
+      // if (__changeables != null && !__changeables.includes(key)) return false;
+      // if (__unchangeables != null && __unchangeables.includes(key))
+      //     return false;
+      // if (ignoreProtected !== true) {
+      //     const __protectedProperties =
+      //         object.constructor["__protectedProperties"];
+      //     if (
+      //         __protectedProperties != null &&
+      //         __protectedProperties.includes(key)
+      //     ) {
+      //         //protected keys can only be changed by the creator of this object
+      //         //make sure you set the is_current_user function correctly
+      //         if (object.isNew) return true;
+      //         const creatorOfObject = (object as any).get("_creator");
+      //         return Boolean(
+      //             gfunc.run_action_sync("is_current_user", creatorOfObject),
+      //         );
+      //     }
+      // }
+      // return true;
     }
   }, {
     key: "hasIllegalChanges",

package/package.json

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