@azrico/webobject 1.5.5 → 1.5.6

package/dist/src/WebObjects/WebObject.js

@@ -125,10 +125,10 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
               return _context.abrupt("return", false);
             case 16:
               //same value, no changes
-              new_metalist = _objectSpread({}, this.getValue("meta_data"));
+              new_metalist = _objectSpread({}, this.get("meta_data"));
               new_metalist[key] = value;
               _context.next = 20;
-              return this.setValue("meta_data", new_metalist);
+              return this.set("meta_data", new_metalist);
             case 20:
               if (!(sendChange !== false)) {
                 _context.next = 23;
@@ -1105,7 +1105,7 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
       if (!key || typeof key != "string") return undefined;
       var metalist = {};
       if (_typeof(o) === "object") {
-        metalist = typeof o.getValue === "function" ? o.getValue("meta_data") : o.meta_data;
+        metalist = typeof o.get === "function" ? o.get("meta_data") : o.meta_data;
       }
       return metalist[key];
     }

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

@@ -47,15 +47,14 @@ export declare class ObjectManager<ObjType extends SimpleObject> extends RawObje
     getSaveResultType(): saveResultType | null;
     setSaveResult(toObj: any, type: saveResultType): saveResultType | undefined;
     apply_changes(): boolean;
-    getValue(key: PropOf<ObjType>, original?: boolean): import("@azrico/types").PropType<ObjType, any> | null;
-    get: (key: PropOf<ObjType>, original?: boolean) => import("@azrico/types").PropType<ObjType, any> | null;
+    get(key: PropOf<ObjType>, original?: boolean): import("@azrico/types").PropType<ObjType, any> | null;
     /**
      * set value
      * @param key
      * @param value
      * @return true if changed , false otherwise
      */
-    setValue(key: WriteablePropOf<ObjType>, value: any): Promise<boolean>;
+    set(key: WriteablePropOf<ObjType>, value: any): Promise<boolean>;
     /**
      * set key of subObject
      * @param key

package/dist/src/structs/ObjectManager.js

@@ -46,7 +46,6 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
     _defineProperty(_this, "__options", void 0);
     //can the current object be set to null safely?
     _defineProperty(_this, "__object_nullable", false);
-    _defineProperty(_this, "get", _this.getValue);
     _this.setObject(defaultObject);
     return _this;
   }
@@ -66,7 +65,7 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
               }
               return _context.abrupt("return", false);
             case 3:
-              if (value === undefined && type != "meta") value = obj.getValue(key);
+              if (value === undefined && type != "meta") value = obj.get(key);
               typestr = (type ? "$".concat(type, "$") : "") + String(key);
               _context.next = 7;
               return this.event_run("on_change", typestr, value);
@@ -196,41 +195,40 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
       return ((_this$obj7 = this.obj) === null || _this$obj7 === void 0 ? void 0 : _this$obj7.apply_changes()) || false;
     }
   }, {
-    key: "getValue",
-    value: function getValue(key) {
+    key: "get",
+    value: function get(key) {
       var original = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var thisobj = this.obj;
-      if (thisobj == null || typeof thisobj.getValue != "function") {
-        if (!this.__object_nullable) console.error("cant use getValue when object is not defined. maybe you have to use New() ?");
+      if (thisobj == null || typeof thisobj.get != "function") {
+        if (!this.__object_nullable) console.error("cant use get when object is not defined. maybe you have to use New() ?");
         return null;
       }
-      return thisobj.getValue(key, original);
+      return thisobj.get(key, original);
     }
-  }, {
-    key: "setValue",
-    value: (
     /**
      * set value
      * @param key
      * @param value
      * @return true if changed , false otherwise
      */
-    function () {
-      var _setValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, value) {
+  }, {
+    key: "set",
+    value: (function () {
+      var _set = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, value) {
         var thisobj;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               thisobj = this.obj;
-              if (!(thisobj == null || typeof thisobj.setValue != "function")) {
+              if (!(thisobj == null || typeof thisobj.set != "function")) {
                 _context2.next = 4;
                 break;
               }
-              if (!this.__object_nullable) console.error("cant use setValue when object is not defined. maybe you have to use New() ?");
+              if (!this.__object_nullable) console.error("cant use set when object is not defined. maybe you have to use New() ?");
               return _context2.abrupt("return", false);
             case 4:
               _context2.next = 6;
-              return thisobj.setValue(key, value);
+              return thisobj.set(key, value);
             case 6:
               _context2.t0 = _context2.sent;
               if (_context2.t0) {
@@ -246,10 +244,10 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
           }
         }, _callee2, this);
       }));
-      function setValue(_x5, _x6) {
-        return _setValue.apply(this, arguments);
+      function set(_x5, _x6) {
+        return _set.apply(this, arguments);
       }
-      return setValue;
+      return set;
     }()
     /**
      * set key of subObject

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

@@ -1,4 +1,4 @@
-import { PropType, WriteablePropOf, PropOf, Ensure } from "@azrico/types";
+import { PropType, WriteablePropOf, PropOf, Ensure, PropOnlyPrefixedOf } from "@azrico/types";
 import { formatObject } from "@azrico/convert";
 import { MapableObject } from "./MapableObject";
 import ObjectManager from "./ObjectManager";
@@ -47,9 +47,9 @@ export declare class SimpleObject extends MapableObject {
     _index_key: string;
     _index_value: number;
     constructor(is_readonly?: boolean);
-    getValue: <MKey extends keyof this>(key: MKey, original?: boolean) => PropType<this, MKey>;
-    get: <MKey extends keyof this>(key: MKey, original?: boolean) => PropType<this, MKey>;
-    static getValue<T extends SimpleObject, MKey extends PropOf<T>>(o: T, key: MKey, original?: boolean): PropType<T, MKey> | undefined;
+    get<MKey extends PropOf<this>>(key: MKey, original?: boolean): PropType<this, MKey>;
+    get<MKey extends PropOnlyPrefixedOf<this>>(key: MKey, original?: boolean): any;
+    static get<T extends SimpleObject, MKey extends PropOf<T>>(o: T, key: MKey, original?: boolean): PropType<T, MKey> | undefined;
     /**
      * set value and run the event handlers if needed
      * @param key
@@ -58,7 +58,7 @@ export declare class SimpleObject extends MapableObject {
      * @param autoApply if the field is not in delta, instantly calls the `apply` function to remove from delta
      * @returns
      */
-    setValue(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType, autoApply?: boolean): Promise<boolean>;
+    set(key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType, autoApply?: boolean): Promise<boolean>;
     /**
      * set value and run the event handlers if needed
      *
@@ -71,7 +71,7 @@ export declare class SimpleObject extends MapableObject {
      * set value and run the event handlers if needed
      * @return true if changed , false otherwise
      */
-    set: (key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType, autoApply?: boolean) => Promise<boolean>;
+    setValue: (key: WriteablePropOf<this>, value: any, shouldNotify?: sendChangesType, autoApply?: boolean) => Promise<boolean>;
     /**
      * load all properties in `initObject` into the current object
      * @param initObject
@@ -86,7 +86,7 @@ export declare class SimpleObject extends MapableObject {
     addRefreshFunction(new_fnc: any): any;
     runRefreshFunction(...params: any): Promise<void>;
     /**
-     * calls `setValue` function for all props of `setObj`
+     * calls `set` function for all props of `setObj`
      * @param setObj
      * @param changeablesOnly only updates the `__changeables` fields
      * @returns

package/dist/src/structs/SimpleObject.js

@@ -81,13 +81,11 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     _defineProperty(_this, "_index_key", "");
     //sequence value , used to index the object with increasing numbers
     _defineProperty(_this, "_index_value", -1);
-    _defineProperty(_this, "getValue", _assertClassBrand(_SimpleObject_brand, _this, _getProperty));
-    _defineProperty(_this, "get", _assertClassBrand(_SimpleObject_brand, _this, _getProperty));
     /**
      * set value and run the event handlers if needed
      * @return true if changed , false otherwise
      */
-    _defineProperty(_this, "set", _this.setValue);
+    _defineProperty(_this, "setValue", _this.set);
     /**
      * set value of a key to now date time
      * @param key
@@ -118,7 +116,29 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       return this.constructor;
     }
   }, {
-    key: "setValue",
+    key: "get",
+    value: function get(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
+      var used_value;
+      if (typeof key === "string" && key.includes(".")) {
+        /* ----------------------------- using sub value ---------------------------- */
+        var keysp = key.split(".");
+        var subkey_part = keysp.pop();
+        var key_part = keysp.join(".");
+        used_value = _assertClassBrand(_SimpleObject_brand, this, _getSubProperty).call(this, key_part, subkey_part);
+      } else {
+        /* --------------------------- using this or delta -------------------------- */
+        var self_key = key;
+        var use_orig = original || !this.__use_delta || !(self_key in this.__delta);
+        used_value = use_orig ? this[self_key] : this.__delta[self_key];
+      }
+      return is_fnc ? (0, _object.fn_eval_this)(this, used_value) : used_value;
+    }
+  }, {
+    key: "set",
     value: (
     /**
      * set value and run the event handlers if needed
@@ -129,7 +149,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
      * @returns
      */
     function () {
-      var _setValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, value) {
+      var _set = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, value) {
         var shouldNotify,
           autoApply,
           keyExists,
@@ -150,13 +170,13 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
                 _context.next = 7;
                 break;
               }
-              throw Error("Cant use setValue (".concat(String(key), ") when on readonly mode"));
+              throw Error("Cant use set (".concat(String(key), ") when on readonly mode"));
             case 7:
               return _context.abrupt("return", false);
             case 8:
               /* --------------------------- set if not changed --------------------------- */
               keyExists = key in this.__delta;
-              old_value = this.getValue(key);
+              old_value = this.get(key);
               needsChange = !(0, _object.object_equals)(old_value, value, {
                 strictArrayCheck: true,
                 ignoredStartingWords: "_"
@@ -192,10 +212,10 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
           }
         }, _callee, this);
       }));
-      function setValue(_x, _x2) {
-        return _setValue.apply(this, arguments);
+      function set(_x, _x2) {
+        return _set.apply(this, arguments);
       }
-      return setValue;
+      return set;
     }()
     /**
      * set value and run the event handlers if needed
@@ -400,7 +420,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     }()
     /* -------------------------------------------------------------------------- */
     /**
-     * calls `setValue` function for all props of `setObj`
+     * calls `set` function for all props of `setObj`
      * @param setObj
      * @param changeablesOnly only updates the `__changeables` fields
      * @returns
@@ -429,7 +449,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
               }
               key = checkKeys[index];
               _context8.next = 8;
-              return this.setValue(key, setObj[key]);
+              return this.set(key, setObj[key]);
             case 8:
               if (_context8.sent) {
                 _context8.next = 10;
@@ -601,8 +621,8 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
             case 8:
               return _context11.abrupt("return", false);
             case 9:
-              if (_assertClassBrand(_SimpleObject_brand, this, _getProperty).call(this, key) == null) _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, []);
-              tempArray = _assertClassBrand(_SimpleObject_brand, this, _getProperty).call(this, key);
+              if (this.get(key) == null) _assertClassBrand(_SimpleObject_brand, this, _setProperty).call(this, key, []);
+              tempArray = this.get(key);
               if (Array.isArray(tempArray)) {
                 _context11.next = 17;
                 break;
@@ -652,7 +672,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              if (value === undefined && type == "") value = this.getValue(key);
+              if (value === undefined && type == "") value = this.get(key);
               lc = "";
               if (type) lc += "$".concat(String(type), "$");
               if (subvalue) {
@@ -751,7 +771,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
             case 0:
               shouldNotify = _args13.length > 1 && _args13[1] !== undefined ? _args13[1] : "auto";
               _context13.next = 3;
-              return this.setValue(key, this[key], shouldNotify);
+              return this.set(key, this[key], shouldNotify);
             case 3:
               return _context13.abrupt("return", _context13.sent);
             case 4:
@@ -1205,11 +1225,12 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     /*                                   statics                                  */
     /* -------------------------------------------------------------------------- */
   }], [{
-    key: "getValue",
-    value: function getValue(o, key) {
+    key: "get",
+    value: function get(o, key) {
       var original = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       if (o == null) return undefined;
-      if (o instanceof SimpleObject && typeof o.getValue === "function") return o.getValue(key, original);
+      if (o instanceof SimpleObject && typeof o.get === "function") return o.get(key, original);
+      /* ------------------------------- manual get ------------------------------- */
       if (!original && o.__use_delta != false && _typeof(o.__delta) === "object" && key in o.__delta) {
         //@ts-ignore
         return o.__delta[key];
@@ -1217,7 +1238,7 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
       return o[key];
     }
     /* -------------------------------------------------------------------------- */
-    /*                                  setValue                                  */
+    /*                                  set                                  */
     /* -------------------------------------------------------------------------- */
   }, {
     key: "loadValues",
@@ -1618,24 +1639,8 @@ function _setDefaultPropertyNow(key) {
   }
   return false;
 }
-/* -------------------------------------------------------------------------- */
-/*                                 getProperty                                */
-/* -------------------------------------------------------------------------- */
-function _getProperty(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
-  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 _setSubProperty(key, subkey, value) {
-  var subobj = _assertClassBrand(_SimpleObject_brand, this, _getProperty).call(this, key);
+  var subobj = this.get(key);
   //@ts-ignore
   if (subobj == null || _typeof(subobj) !== "object") subobj = {};else subobj = _objectSpread({}, subobj); //make a clone so we dont update the original
   subobj[subkey] = value;
@@ -1643,7 +1648,7 @@ function _setSubProperty(key, subkey, value) {
 }
 function _getSubProperty(key, subkey) {
   var original = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var subobj = _assertClassBrand(_SimpleObject_brand, this, _getProperty).call(this, key, original);
+  var subobj = this.get(key, original);
   if (subobj == null || _typeof(subobj) !== "object") return undefined;
   return subobj[subkey];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.5.5",
+    "version": "1.5.6",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",
@@ -69,13 +69,13 @@
         "@azrico/uid": "*"
     },
     "dependencies": {
-        "@azrico/convert": "^1.0.9",
-        "@azrico/event": "^1.2.44",
-        "@azrico/global": "^1.3.79",
+        "@azrico/convert": "^1.0.13",
+        "@azrico/event": "^1.2.52",
+        "@azrico/global": "^1.3.85",
         "@azrico/math": "^1.0.5",
-        "@azrico/object": "^1.4.107",
-        "@azrico/string": "^1.2.102",
-        "@azrico/types": "^1.0.9",
+        "@azrico/object": "^1.4.112",
+        "@azrico/string": "^1.2.115",
+        "@azrico/types": "^1.0.11",
         "@azrico/uid": "^1.0.8"
     },
     "packageManager": "yarn@3.5.0"