@azrico/webobject 1.4.13 → 1.4.15

package/dist/src/WebObjects/WebObject.js

@@ -274,7 +274,10 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
               dlt = allProperties || !useDelta && isChild && chkChangables ? _objectSpread({}, this.allproperties) : _objectSpread({}, this.__delta);
               allkeys = Object.keys(dlt);
               changableKeys = chkChangables ? allkeys.filter(function (s) {
-                return _SimpleObject2["default"].canChangeKey(_this2, s, useExtraProps);
+                return _SimpleObject2["default"].canChangeKey(_this2, s, {
+                  useExtraProps: useExtraProps,
+                  ignoreProtected: allProperties
+                });
               }) : allkeys;
               _iterator = _createForOfIteratorHelper(changableKeys);
               _context5.prev = 13;

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

@@ -95,7 +95,10 @@ export declare class SimpleObject extends MapableObject {
      * @param useExtraProps should we check extra props?
      * @returns
      */
-    static canChangeKey(object: SimpleObject, key: string, useExtraProps: boolean): boolean;
+    static canChangeKey(object: SimpleObject, key: string, options: {
+        useExtraProps?: boolean;
+        ignoreProtected?: boolean;
+    }): boolean;
     static hasIllegalChanges(referenceObject: any, changesObject: any, updaterUser: any): boolean;
     /**
      * Apply the changes and empty the delta object

package/dist/src/structs/SimpleObject.js

@@ -8,8 +8,6 @@ var _global = require("@azrico/global");
 var _object = require("@azrico/object");
 var _MapableObject2 = require("./MapableObject");
 var _ObjectManager = _interopRequireDefault(require("./ObjectManager"));
-var _WebObject = _interopRequireDefault(require("../WebObjects/WebObject"));
-var _WebObjectManager = _interopRequireDefault(require("../WebObjects/WebObjectManager"));
 var _string = require("@azrico/string");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -625,7 +623,7 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
   }, {
     key: "set_managerClass",
     value: function set_managerClass(mng) {
-      if ((mng instanceof _ObjectManager["default"] || mng instanceof _WebObjectManager["default"]) && typeof mng.event_run === "function") this.get_managerClass = function () {
+      if (mng instanceof _ObjectManager["default"] && typeof mng.event_run === "function") this.get_managerClass = function () {
         return mng;
       };else {
         console.error("set_managerClass was used with a bad manager. make sure the input to this function is a correct ObjectManager");
@@ -841,8 +839,10 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
     }
   }, {
     key: "canChangeKey",
-    value: function canChangeKey(object, key, useExtraProps) {
+    value: function canChangeKey(object, key, options) {
       if (!object || !key) return false;
+      var useExtraProps = options.useExtraProps,
+        ignoreProtected = options.ignoreProtected;
       if (useExtraProps) {
         var __extraProperties = object.constructor["__extraProperties"];
         if (__extraProperties != null && __extraProperties.includes(key)) return true;
@@ -850,16 +850,18 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
       /* -------------------------------------------------------------------------- */
       var __changeables = object.constructor["__changeables"];
       var __unchangeables = object.constructor["__unchangeables"];
-      var __protectedProperties = object.constructor["__protectedProperties"];
       /* -------------------------------------------------------------------------- */
       if (__changeables != null && !__changeables.includes(key)) return false;
       if (__unchangeables != null && __unchangeables.includes(key)) return false;
-      //protected keys can only be changed by the creator of this object
-      //make sure you set the is_current_user function correctly
-      if (__protectedProperties != null && __protectedProperties.includes(key)) {
-        if (object.isNew) return true;
-        var creatorOfObject = object.get("_creator");
-        return Boolean(_global.gfunc.run_action_sync("is_current_user", creatorOfObject));
+      if (!ignoreProtected) {
+        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));
+        }
       }
       return true;
     }
@@ -869,7 +871,7 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
       var __protectedProperties = (0, _object.object_getStatic)(referenceObject, "__protectedProperties");
       if (__protectedProperties == null) return false;
       var referenceUser = (0, _object.object_isClass)(referenceObject) ? (0, _object.object_get)(changesObject, "__user", "_creator") : (0, _object.object_get)(referenceObject, "__user", "_creator");
-      if (Boolean(_WebObject["default"].getID(referenceUser) == _WebObject["default"].getID(updaterUser))) {
+      if (Boolean(SimpleObject.getID(referenceUser) == SimpleObject.getID(updaterUser))) {
         return false;
       }
       for (var key in changesObject) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.4.13",
+    "version": "1.4.15",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",
@@ -70,8 +70,8 @@
     },
     "dependencies": {
         "@azrico/event": "^1.2.15",
-        "@azrico/global": "^1.3.17",
-        "@azrico/object": "^1.4.33",
+        "@azrico/global": "^1.3.22",
+        "@azrico/object": "^1.4.35",
         "@azrico/string": "^1.2.30",
         "@azrico/uid": "^1.0.5"
     }