@azrico/webobject 1.4.53 → 1.4.54

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

@@ -12,6 +12,7 @@ export declare class WebObject extends SimpleObject {
     static readonly __web_path: string;
     static readonly __web_type: string;
     static readonly __protectedProperties: string[];
+    static readonly __requiredProperties: never[];
     meta_data: MetaObject[];
     _id: string;
     _created_date?: string | Date;

package/dist/src/WebObjects/WebObject.js

@@ -206,7 +206,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     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, tempusers;
+        var final_object, isChild, useDelta, allProperties, chkChangables, useExtraProps, dlt, allkeys, changableKeys, parseObj, _parseObj, functionProps, index, fp, _iterator, _step, key, tempusers, simpleProps;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -342,8 +342,18 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
                 });
                 final_object["_users"] = (0, _object.wrap_array)(tempusers);
               }
+              simpleProps = (0, _object.object_getStatic)(this, "__simpleProperties");
+              if (Array.isArray(simpleProps)) {
+                simpleProps.forEach(function (sp) {
+                  if (final_object[sp] == null) return;
+                  var oldValue = final_object[sp];
+                  var newKey = "simple_" + sp;
+                  var newValue = typeof oldValue === "string" ? (0, _string.convert_to_simple_string)(oldValue) : undefined;
+                  final_object[newKey] = newValue;
+                });
+              }
               return _context5.abrupt("return", final_object);
-            case 35:
+            case 37:
             case "end":
               return _context5.stop();
           }
@@ -894,5 +904,7 @@ exports.WebObject = WebObject;
 _defineProperty(WebObject, "__web_path", "");
 _defineProperty(WebObject, "__web_type", "");
 _defineProperty(WebObject, "__protectedProperties", ["_users"]);
+//you cant create a new weboject without these properties
+_defineProperty(WebObject, "__requiredProperties", []);
 var _default = WebObject;
 exports["default"] = _default;

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

@@ -13,6 +13,7 @@ export declare class SimpleObject extends MapableObject {
     static readonly __changeables?: string[];
     static readonly __protectedProperties?: string[];
     static readonly __functionProperties?: string[];
+    static readonly __simpleProperties?: string[];
     static readonly __extraProperties?: string[];
     static readonly __childTypes?: any[];
     static readonly __importColumns?: string[];
@@ -65,16 +66,6 @@ export declare class SimpleObject extends MapableObject {
      * @returns
      */
     setDefault: (key: WriteablePropOf<this>, value: any) => boolean;
-    /**
-     * set the value to its original
-     * @param key
-     */
-    reset(key: WriteablePropOf<this>, notifyChanged?: sendChangesType): Promise<boolean>;
-    /**
-     * reset all values back to their original
-     * @param key
-     */
-    resetAll(notifyChanged?: sendChangesType): Promise<boolean>;
     /**
      * set key of subObject
      * @param key
@@ -109,8 +100,20 @@ export declare class SimpleObject extends MapableObject {
      * Apply the changes and empty the delta object
      */
     apply_changes(): boolean;
+    /**
+     * set the value to its original
+     * @param key
+     */
+    reset(key: WriteablePropOf<this>, notifyChanged?: sendChangesType): Promise<boolean>;
+    /**
+     * reset all values back to their original
+     * difference between this and clear_changes is that this function also calls on_change
+     * @param key
+     */
+    resetAll(notifyChanged?: sendChangesType): Promise<boolean>;
     /**
      * clear and discard all changes
+     * does not call any on_change functions
      * @returns
      */
     clear_changes(): boolean;

package/dist/src/structs/SimpleObject.js

@@ -205,85 +205,8 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
       return _classPrivateMethodGet(this, _setDefaultProperty, _setDefaultProperty2).call(this, key, value);
     }
   }, {
-    key: "reset",
+    key: "setSubValue",
     value:
-    /**
-     * set the value to its original
-     * @param key
-     */
-    function () {
-      var _reset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key) {
-        var notifyChanged,
-          _args2 = arguments;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              notifyChanged = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : "auto";
-              _context2.next = 3;
-              return this.setValue(key, this[key], notifyChanged);
-            case 3:
-              return _context2.abrupt("return", _context2.sent);
-            case 4:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function reset(_x3) {
-        return _reset.apply(this, arguments);
-      }
-      return reset;
-    }()
-    /**
-     * reset all values back to their original
-     * @param key
-     */
-  }, {
-    key: "resetAll",
-    value: function () {
-      var _resetAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var notifyChanged,
-          fr,
-          key,
-          _args3 = arguments;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              notifyChanged = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : "auto";
-              fr = true;
-              _context3.t0 = _regeneratorRuntime().keys(this.__delta);
-            case 3:
-              if ((_context3.t1 = _context3.t0()).done) {
-                _context3.next = 13;
-                break;
-              }
-              key = _context3.t1.value;
-              _context3.t2 = fr;
-              if (!_context3.t2) {
-                _context3.next = 10;
-                break;
-              }
-              _context3.next = 9;
-              return this.reset(key, notifyChanged);
-            case 9:
-              _context3.t2 = _context3.sent;
-            case 10:
-              fr = _context3.t2;
-              _context3.next = 3;
-              break;
-            case 13:
-              return _context3.abrupt("return", fr);
-            case 14:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function resetAll() {
-        return _resetAll.apply(this, arguments);
-      }
-      return resetAll;
-    }()
     /**
      * set key of subObject
      * @param key
@@ -291,32 +214,30 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
      * @param subvalue
      * @return true if changed , false otherwise
      */
-  }, {
-    key: "setSubValue",
-    value: function () {
-      var _setSubValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, objKey, subvalue) {
+    function () {
+      var _setSubValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, objKey, subvalue) {
         var sendChanges,
           isValueChanged,
           subval,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          _args2 = arguments;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              sendChanges = _args4.length > 3 && _args4[3] !== undefined ? _args4[3] : "auto";
+              sendChanges = _args2.length > 3 && _args2[3] !== undefined ? _args2[3] : "auto";
               if (this.canModify) {
-                _context4.next = 7;
+                _context2.next = 7;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context4.next = 6;
+                _context2.next = 6;
                 break;
               }
               throw Error("Cant use setValue when on readonly mode");
             case 6:
-              return _context4.abrupt("return", false);
+              return _context2.abrupt("return", false);
             case 7:
               isValueChanged = false;
-              _context4.prev = 8;
+              _context2.prev = 8;
               //if accessing subval of an object, make sure the object is not null
               subval = _classPrivateMethodGet(this, _getSubProperty, _getSubProperty2).call(this, key, objKey);
               if (!(0, _object.object_equals)(subval, subvalue, {
@@ -327,24 +248,24 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
                 isValueChanged = true;
               } else isValueChanged = false;
             case 11:
-              _context4.prev = 11;
+              _context2.prev = 11;
               if (!(sendChanges === true || sendChanges === "auto" && isValueChanged)) {
-                _context4.next = 15;
+                _context2.next = 15;
                 break;
               }
-              _context4.next = 15;
+              _context2.next = 15;
               return this.notifyChanged("", key, objKey, subvalue);
             case 15:
-              return _context4.finish(11);
+              return _context2.finish(11);
             case 16:
-              return _context4.abrupt("return", isValueChanged);
+              return _context2.abrupt("return", isValueChanged);
             case 17:
             case "end":
-              return _context4.stop();
+              return _context2.stop();
           }
-        }, _callee4, this, [[8,, 11, 16]]);
+        }, _callee2, this, [[8,, 11, 16]]);
       }));
-      function setSubValue(_x4, _x5, _x6) {
+      function setSubValue(_x3, _x4, _x5) {
         return _setSubValue.apply(this, arguments);
       }
       return setSubValue;
@@ -360,64 +281,64 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
      * @returns
      */
     function () {
-      var _pushValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(key, value) {
+      var _pushValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, value) {
         var sendChanges,
           tempArray,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args3 = arguments;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              sendChanges = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : "auto";
+              sendChanges = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : "auto";
               if (!(value == null)) {
-                _context5.next = 3;
+                _context3.next = 3;
                 break;
               }
-              return _context5.abrupt("return", false);
+              return _context3.abrupt("return", false);
             case 3:
               if (this.canModify) {
-                _context5.next = 9;
+                _context3.next = 9;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context5.next = 8;
+                _context3.next = 8;
                 break;
               }
               throw Error("Cant use pushValue when on readonly mode");
             case 8:
-              return _context5.abrupt("return", false);
+              return _context3.abrupt("return", false);
             case 9:
               if (_classPrivateMethodGet(this, _getProperty, _getProperty2).call(this, key) == null) {
                 _classPrivateMethodGet(this, _setProperty, _setProperty2).call(this, key, []);
               }
               tempArray = _classPrivateMethodGet(this, _getProperty, _getProperty2).call(this, key);
               if (Array.isArray(tempArray)) {
-                _context5.next = 17;
+                _context3.next = 17;
                 break;
               }
               if (!(this.__throw_errors !== false)) {
-                _context5.next = 16;
+                _context3.next = 16;
                 break;
               }
               throw Error("Cant use pushValue on non Array keys");
             case 16:
-              return _context5.abrupt("return", false);
+              return _context3.abrupt("return", false);
             case 17:
               _classPrivateMethodGet(this, _setProperty, _setProperty2).call(this, key, [].concat(_toConsumableArray(tempArray), [value]));
               if (!(sendChanges === true || sendChanges === "auto")) {
-                _context5.next = 21;
+                _context3.next = 21;
                 break;
               }
-              _context5.next = 21;
+              _context3.next = 21;
               return this.notifyChanged("", key, value);
             case 21:
-              return _context5.abrupt("return", tempArray);
+              return _context3.abrupt("return", tempArray);
             case 22:
             case "end":
-              return _context5.stop();
+              return _context3.stop();
           }
-        }, _callee5, this);
+        }, _callee3, this);
       }));
-      function pushValue(_x7, _x8) {
+      function pushValue(_x6, _x7) {
         return _pushValue.apply(this, arguments);
       }
       return pushValue;
@@ -425,10 +346,10 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
   }, {
     key: "notifyChanged",
     value: function () {
-      var _notifyChanged = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(type, key, value, subvalue) {
+      var _notifyChanged = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, key, value, subvalue) {
         var lc, manager_class;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (value === undefined && type != "meta") value = this.getValue(key);
               this.__changed = true;
@@ -443,18 +364,18 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
               /* --------------------------- notify the manager --------------------------- */
               manager_class = this.manager;
               if (!(manager_class instanceof _ObjectManager["default"])) {
-                _context6.next = 10;
+                _context4.next = 10;
                 break;
               }
-              _context6.next = 10;
+              _context4.next = 10;
               return manager_class.notifyChanged(type, key, value, subvalue);
             case 10:
             case "end":
-              return _context6.stop();
+              return _context4.stop();
           }
-        }, _callee6, this);
+        }, _callee4, this);
       }));
-      function notifyChanged(_x9, _x10, _x11, _x12) {
+      function notifyChanged(_x8, _x9, _x10, _x11) {
         return _notifyChanged.apply(this, arguments);
       }
       return notifyChanged;
@@ -494,8 +415,89 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject) {
         this.clear_changes();
       }
     }
+    /**
+     * set the value to its original
+     * @param key
+     */
+  }, {
+    key: "reset",
+    value: function () {
+      var _reset = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(key) {
+        var notifyChanged,
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              notifyChanged = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : "auto";
+              _context5.next = 3;
+              return this.setValue(key, this[key], notifyChanged);
+            case 3:
+              return _context5.abrupt("return", _context5.sent);
+            case 4:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function reset(_x12) {
+        return _reset.apply(this, arguments);
+      }
+      return reset;
+    }()
+    /**
+     * reset all values back to their original
+     * difference between this and clear_changes is that this function also calls on_change
+     * @param key
+     */
+  }, {
+    key: "resetAll",
+    value: function () {
+      var _resetAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        var notifyChanged,
+          fr,
+          key,
+          _args6 = arguments;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              notifyChanged = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : "auto";
+              fr = true;
+              _context6.t0 = _regeneratorRuntime().keys(this.__delta);
+            case 3:
+              if ((_context6.t1 = _context6.t0()).done) {
+                _context6.next = 13;
+                break;
+              }
+              key = _context6.t1.value;
+              _context6.t2 = fr;
+              if (!_context6.t2) {
+                _context6.next = 10;
+                break;
+              }
+              _context6.next = 9;
+              return this.reset(key, notifyChanged);
+            case 9:
+              _context6.t2 = _context6.sent;
+            case 10:
+              fr = _context6.t2;
+              _context6.next = 3;
+              break;
+            case 13:
+              return _context6.abrupt("return", fr);
+            case 14:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function resetAll() {
+        return _resetAll.apply(this, arguments);
+      }
+      return resetAll;
+    }()
     /**
      * clear and discard all changes
+     * does not call any on_change functions
      * @returns
      */
   }, {
@@ -1173,6 +1175,8 @@ _defineProperty(SimpleObject, "__changeables", void 0);
 _defineProperty(SimpleObject, "__protectedProperties", void 0);
 //these properties will be evaluated when needed
 _defineProperty(SimpleObject, "__functionProperties", void 0);
+//a lowercase copy of these properties will be saved
+_defineProperty(SimpleObject, "__simpleProperties", void 0);
 //these properties usually are not directly changed and sometimes are included in deltaObject
 _defineProperty(SimpleObject, "__extraProperties", void 0);
 //types for children can be used when importing children

package/package.json

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