@azrico/webobject 1.3.22 → 1.3.23

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

@@ -1,6 +1,5 @@
 import SimpleObject, { sendChangesType } from "../structs/SimpleObject";
 import MetaObject from "../structs/MetaObject";
-import WebObjectManager from "./WebObjectManager";
 export type deltaParams = {
     type?: string;
     isChild?: boolean;
@@ -67,9 +66,6 @@ export declare class WebObject extends SimpleObject {
     get_webtype: () => string;
     get_webpath: () => string;
     static get_webname(): string | undefined;
-    get manager(): WebObjectManager<any> | null;
-    get_managerClass: () => WebObjectManager<any> | null;
-    set_managerClass(mng: WebObjectManager<any> | any): void;
     onDelete(...p: any): Promise<any>;
     onLoad(...p: any): Promise<any>;
     onSave(...p: any): Promise<any>;

package/dist/src/WebObjects/WebObject.js

@@ -192,13 +192,6 @@ export class WebObject extends SimpleObject {
     static get_webname() {
         return this.__web_path || this.__web_type || this.__cache_name;
     }
-    get manager() {
-        return this.get_managerClass();
-    }
-    get_managerClass = () => null;
-    set_managerClass(mng) {
-        this.get_managerClass = () => mng;
-    }
     /* -------------------------------------------------------------------------- */
     async onDelete(...p) {
         this.isDeleted = true;

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

@@ -1,5 +1,7 @@
 import { MapableObject } from "./MapableObject";
 import ObjectManager from "./ObjectManager";
+import WebObject from "../WebObjects/WebObject";
+import WebObjectManager from "../WebObjects/WebObjectManager";
 export type saveResultType = "normal" | "nothing" | "error" | "canceled";
 export type saveType = "normal" | "quick";
 export type sendChangesType = boolean | "auto";
@@ -137,8 +139,8 @@ export declare class SimpleObject extends MapableObject {
     get isSaved(): boolean;
     get isNew(): boolean;
     get lastChanged(): string;
-    get manager(): ObjectManager<any> | null;
-    set_managerClass(mng: ObjectManager<any> | any): void;
+    get manager(): (this extends WebObject ? WebObjectManager<any> : ObjectManager<any>) | undefined;
+    set_managerClass(mng: (this extends WebObject ? WebObjectManager<any> : ObjectManager<any>) | any): void;
     static isDeleted<T extends SimpleObject>(obj: T): boolean;
     getIndexOrID(): number | string;
     getIndex(): number;

package/dist/src/structs/SimpleObject.js

@@ -2,6 +2,7 @@ import { gcache, gfunc } from "@azrico/global";
 import { object_clone, object_equals, object_isEmpty, object_isTrue, object_removeKeys, } from "@azrico/object";
 import { MapableObject } from "./MapableObject";
 import ObjectManager from "./ObjectManager";
+import WebObjectManager from "../WebObjects/WebObjectManager";
 import { combine_if_not_blank } from "@azrico/string";
 export class SimpleObject extends MapableObject {
     static __cache_name;
@@ -305,7 +306,7 @@ export class SimpleObject extends MapableObject {
         }
         this.__lastChanged = lc;
         /* --------------------------- notify the manager --------------------------- */
-        const manager_class = this.get_managerClass();
+        const manager_class = this.manager;
         if (manager_class instanceof ObjectManager) {
             await manager_class.notifyChanged(type, key, value, subvalue);
         }
@@ -502,11 +503,12 @@ export class SimpleObject extends MapableObject {
         return this.__lastChanged || "";
     }
     get manager() {
-        return this.#get_managerClass();
+        return this.#get_managerClass() || undefined;
     }
-    #get_managerClass = () => null;
+    #get_managerClass = () => undefined;
     set_managerClass(mng) {
-        if (mng instanceof ObjectManager && typeof mng.event_run === "function")
+        if ((mng instanceof ObjectManager || mng instanceof WebObjectManager) &&
+            typeof mng.event_run === "function")
             this.#get_managerClass = () => mng;
         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.3.22",
+    "version": "1.3.23",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",