@azrico/webobject 1.4.150 → 1.4.152

package/dist/src/structs/ObjectManager.js

@@ -69,11 +69,12 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
             case 3:
               if (value === undefined && type != "meta") value = obj.getValue(key);
               typestr = (type ? "$".concat(type, "$") : "") + String(key);
-              _context.next = 7;
+              console.log("event_run", typestr, value);
+              _context.next = 8;
               return this.event_run("on_change", typestr, value);
-            case 7:
-              return _context.abrupt("return", _context.sent);
             case 8:
+              return _context.abrupt("return", _context.sent);
+            case 9:
             case "end":
               return _context.stop();
           }
@@ -113,9 +114,13 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
   }, {
     key: "setObject",
     value: function setObject(toObj) {
+      var _this2 = this;
       this.__currentObject = toObj;
-      if (this.__currentObject) {
-        this.__currentObject.set_managerClass(this);
+      if (this.obj) {
+        this.obj.get_managerClass = function () {
+          return _this2;
+        };
+        // this.obj.set_managerClass(this);
       }
       if (toObj == null && !this.__object_nullable) {
         console.warn("setObject was used to set null. try to use empty objects instead of null");
@@ -635,9 +640,9 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
   }, {
     key: "useOption",
     value: function useOption(key) {
-      var _this2 = this;
+      var _this3 = this;
       return this.event_use_getter("on_option_change", function () {
-        return _this2.getOption(key);
+        return _this3.getOption(key);
       }, [key]);
     }
     /**

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

@@ -200,7 +200,16 @@ export declare class SimpleObject extends MapableObject {
     get lastChanged(): string;
     get manager(): ObjectManager<any> | undefined;
     get_managerClass: () => ObjectManager<any> | undefined;
-    set_managerClass(mng: any): void;
+    /**
+     * @deprecated use setManager
+     * @param mng
+     */
+    set_managerClass(mng: any): boolean | undefined;
+    /**
+     * update the manager class for this object
+     * @param mng
+     */
+    setManager(mng: any): boolean | undefined;
     static isDeleted<T extends SimpleObject>(obj: T): boolean;
     getIndexOrID(): number | string;
     getIndex(): number;

package/dist/src/structs/SimpleObject.js

@@ -184,9 +184,8 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
               _context.next = 13;
               return this.notifyChanged("", key, value);
             case 13:
-              console.log("setValue", key, value, isValueChanged);
               return _context.abrupt("return", isValueChanged);
-            case 15:
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -617,16 +616,17 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
               /* --------------------------- notify the manager --------------------------- */
               manager_class = this.manager;
               if (!(typeof (manager_class === null || manager_class === void 0 ? void 0 : manager_class.notifyChanged) === "function")) {
-                _context11.next = 11;
+                _context11.next = 12;
                 break;
               }
-              _context11.next = 10;
+              console.log("notify manager", type, key, value);
+              _context11.next = 11;
               return manager_class.notifyChanged(type, key, value, subvalue);
-            case 10:
-              return _context11.abrupt("return", _context11.sent);
             case 11:
-              return _context11.abrupt("return", false);
+              return _context11.abrupt("return", _context11.sent);
             case 12:
+              return _context11.abrupt("return", false);
+            case 13:
             case "end":
               return _context11.stop();
           }
@@ -927,10 +927,25 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     }
   }, {
     key: "set_managerClass",
-    value: function set_managerClass(mng) {
-      if (mng instanceof _ObjectManager["default"] && typeof mng.event_run === "function") this.get_managerClass = function () {
-        return mng;
-      };else {
+    value:
+    /**
+     * @deprecated use setManager
+     * @param mng
+     */
+    function set_managerClass(mng) {
+      return this.setManager(mng);
+    }
+    /**
+     * update the manager class for this object
+     * @param mng
+     */
+  }, {
+    key: "setManager",
+    value: function setManager(mng) {
+      if (mng instanceof _ObjectManager["default"] && typeof mng.setObject === "function") {
+        //make sure the manager knows what object it is managing
+        return mng.setObject(this);
+      } else {
         console.error("set_managerClass was used with a bad manager. make sure the input to this function is a correct ObjectManager");
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.4.150",
+    "version": "1.4.152",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",
@@ -70,8 +70,8 @@
     },
     "dependencies": {
         "@azrico/convert": "^1.0.5",
-        "@azrico/event": "^1.2.34",
-        "@azrico/global": "^1.3.76",
+        "@azrico/event": "^1.2.43",
+        "@azrico/global": "^1.3.78",
         "@azrico/math": "^1.0.5",
         "@azrico/object": "^1.4.101",
         "@azrico/string": "^1.2.95",