@azrico/webobject 1.4.19 → 1.4.21

package/dist/src/WebObjects/WebObject.js

@@ -193,7 +193,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
     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, _iterator, _step, key;
+        var final_object, isChild, useDelta, allProperties, chkChangables, useExtraProps, dlt, allkeys, changableKeys, parseObj, _parseObj, functionProps, index, fp, _iterator, _step, key;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -281,46 +281,53 @@ var WebObject = /*#__PURE__*/function (_SimpleObject) {
                   ignoreProtected: allProperties
                 });
               }) : allkeys;
+              functionProps = (0, _object.object_getStatic)(this, "__functionProperties");
+              if (Array.isArray(functionProps)) {
+                for (index = 0; index < functionProps.length; index++) {
+                  fp = functionProps[index];
+                  if (dlt[fp]) dlt[fp] = (0, _object.fn_eval_this)(this, dlt[fp]);
+                }
+              }
               _iterator = _createForOfIteratorHelper(changableKeys);
-              _context5.prev = 13;
+              _context5.prev = 15;
               _iterator.s();
-            case 15:
+            case 17:
               if ((_step = _iterator.n()).done) {
-                _context5.next = 22;
+                _context5.next = 24;
                 break;
               }
               key = _step.value;
-              _context5.next = 19;
+              _context5.next = 21;
               return parseObj(dlt[key]);
-            case 19:
+            case 21:
               final_object[key] = _context5.sent;
-            case 20:
-              _context5.next = 15;
-              break;
             case 22:
-              _context5.next = 27;
+              _context5.next = 17;
               break;
             case 24:
-              _context5.prev = 24;
-              _context5.t0 = _context5["catch"](13);
+              _context5.next = 29;
+              break;
+            case 26:
+              _context5.prev = 26;
+              _context5.t0 = _context5["catch"](15);
               _iterator.e(_context5.t0);
-            case 27:
-              _context5.prev = 27;
+            case 29:
+              _context5.prev = 29;
               _iterator.f();
-              return _context5.finish(27);
-            case 30:
+              return _context5.finish(29);
+            case 32:
               if (allProperties) {
                 final_object["_id"] = this.getID();
-                final_object["_index_value"] = this.getIndex();
                 final_object["_index_key"] = this["_index_key"];
+                final_object["_index_value"] = this.getIndex();
                 final_object["_created_date"] = this["_created_date"];
               }
               return _context5.abrupt("return", final_object);
-            case 32:
+            case 34:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[13, 24, 27, 30]]);
+        }, _callee5, this, [[15, 26, 29, 32]]);
       }));
       function get_deltaObject(_x) {
         return _get_deltaObject.apply(this, arguments);

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

@@ -7,9 +7,10 @@ import { saveResultType } from "./SimpleObject";
 export declare class ObjectManager<ObjType extends SimpleObject> {
     __eventList: any;
     __eventPrefix?: string;
-    __sendEvents: boolean;
+    __stopEvents?: boolean;
     __currentObject?: ObjType | null;
     __options?: object;
+    __object_nullable: boolean;
     notifyChanged(type: string, key: PropOf<ObjType> | string, value?: any, subvalue?: string): Promise<false | any[] | undefined>;
     get obj(): ObjType | undefined;
     /**
@@ -59,6 +60,7 @@ export declare class ObjectManager<ObjType extends SimpleObject> {
     event_use(name: string, runEvent: (...inputdata: any) => any, onlyOn?: any, runOnce?: boolean): any;
     event_remove(name: string, uname: string): boolean;
     event_add(name: string, uname: string, runEvent: (...inputdata: any) => any, onlyOn?: any, runOnce?: boolean): Promise<void>;
+    events_start(): void;
     events_stop(): void;
     events_clear(): void;
     static events_clear(obj: ObjectManager<any>): void;

package/dist/src/structs/ObjectManager.js

@@ -28,9 +28,11 @@ var ObjectManager = /*#__PURE__*/function () {
     _classCallCheck(this, ObjectManager);
     _defineProperty(this, "__eventList", void 0);
     _defineProperty(this, "__eventPrefix", void 0);
-    _defineProperty(this, "__sendEvents", true);
+    _defineProperty(this, "__stopEvents", void 0);
     _defineProperty(this, "__currentObject", void 0);
     _defineProperty(this, "__options", void 0);
+    //can the current object be set to null safely?
+    _defineProperty(this, "__object_nullable", false);
     _defineProperty(this, "get", this.getValue);
   }
   _createClass(ObjectManager, [{
@@ -92,7 +94,7 @@ var ObjectManager = /*#__PURE__*/function () {
       if (this.__currentObject) {
         this.__currentObject.set_managerClass(this);
       }
-      if (toObj == null) {
+      if (toObj == null && !this.__object_nullable) {
         console.warn("setObject was used to set null. try to use empty objects instead of null");
       }
       return true;
@@ -169,7 +171,7 @@ var ObjectManager = /*#__PURE__*/function () {
       var original = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var thisobj = this.obj;
       if (thisobj == null || typeof thisobj.getValue != "function") {
-        console.error("cant use getValue when object is not defined. maybe you have to use New() ?");
+        if (!this.__object_nullable) console.error("cant use getValue when object is not defined. maybe you have to use New() ?");
         return null;
       }
       return thisobj.getValue(key, original);
@@ -194,7 +196,7 @@ var ObjectManager = /*#__PURE__*/function () {
                 _context2.next = 4;
                 break;
               }
-              console.error("cant use setValue when object is not defined. maybe you have to use New() ?");
+              if (!this.__object_nullable) console.error("cant use setValue when object is not defined. maybe you have to use New() ?");
               return _context2.abrupt("return", false);
             case 4:
               _context2.next = 6;
@@ -318,7 +320,7 @@ var ObjectManager = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              if (this.__sendEvents) {
+              if (!(this.__stopEvents === true)) {
                 _context5.next = 2;
                 break;
               }
@@ -379,10 +381,15 @@ var ObjectManager = /*#__PURE__*/function () {
       }
       return event_add;
     }()
+  }, {
+    key: "events_start",
+    value: function events_start() {
+      delete this.__stopEvents;
+    }
   }, {
     key: "events_stop",
     value: function events_stop() {
-      this.__sendEvents = false;
+      this.__stopEvents = true;
     }
   }, {
     key: "events_clear",

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

@@ -12,6 +12,7 @@ export declare class SimpleObject extends MapableObject {
     static readonly __unchangeables?: string[];
     static readonly __changeables?: string[];
     static readonly __protectedProperties?: string[];
+    static readonly __functionProperties?: string[];
     static readonly __extraProperties?: string[];
     static readonly __use_delta: boolean;
     _static(): Function;

package/dist/src/structs/SimpleObject.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.SimpleObject = void 0;
-var _global = require("@azrico/global");
 var _object = require("@azrico/object");
+var _global = require("@azrico/global");
 var _MapableObject2 = require("./MapableObject");
 var _ObjectManager = _interopRequireDefault(require("./ObjectManager"));
 var _string = require("@azrico/string");
@@ -1108,9 +1108,15 @@ function _setDefaultProperty2(key, value) {
 }
 function _getProperty2(key) {
   var original = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  //check if we should treat the prop as a function
+  var is_fnc = this.constructor["__functionProperties"] != null && this.constructor["__functionProperties"].includes(key);
   //check if we should use delta version or normal version for this property
-  if (original || !this.__use_delta || !(key in this.__delta)) return this[key];
-  //@ts-ignore
+  var use_orig = original || !this.__use_delta || !(key in this.__delta);
+  if (is_fnc) {
+    if (use_orig) return (0, _object.fn_eval_this)(this, this[key]);
+    return (0, _object.fn_eval_this)(this, this.__delta[key]);
+  }
+  if (use_orig) return this[key];
   return this.__delta[key];
 }
 function _getTempProperty2(key) {
@@ -1131,6 +1137,8 @@ _defineProperty(SimpleObject, "__unchangeables", void 0);
 _defineProperty(SimpleObject, "__changeables", void 0);
 //these properties can only be changed by the _creator
 _defineProperty(SimpleObject, "__protectedProperties", void 0);
+//these properties will be evaluated when needed
+_defineProperty(SimpleObject, "__functionProperties", void 0);
 //these properties usually are not directly changed and sometimes are included in deltaObject
 _defineProperty(SimpleObject, "__extraProperties", void 0);
 _defineProperty(SimpleObject, "__use_delta", true);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.4.19",
+    "version": "1.4.21",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",
@@ -71,8 +71,8 @@
     "dependencies": {
         "@azrico/event": "^1.2.15",
         "@azrico/global": "^1.3.22",
-        "@azrico/object": "^1.4.35",
-        "@azrico/string": "^1.2.30",
+        "@azrico/object": "^1.4.41",
+        "@azrico/string": "^1.2.32",
         "@azrico/uid": "^1.0.5"
     }
 }