@vived/app 3.1.1 → 3.2.0

package/lib/AppObject/AppObject.d.ts

@@ -3,8 +3,7 @@ import { AppObjectComponent } from "./AppObjectComponent";
 import { AppObjectRepo } from "./AppObjectRepo";
 export declare abstract class AppObject extends ObservableEntity {
     abstract readonly id: string;
-    abstract get enabled(): boolean;
-    abstract set enabled(val: boolean);
+    abstract readonly appObjectRepo: AppObjectRepo;
     abstract hasComponent(type: string): boolean;
     abstract addComponent(component: AppObjectComponent): void;
     abstract getComponent<T extends AppObjectComponent>(type: string): T | undefined;

package/lib/AppObject/AppObject.js

@@ -12,25 +12,18 @@ exports.makeAppObject = makeAppObject;
 class AppObjectImp extends AppObject {
     constructor(id, repo) {
         super();
-        this.repo = repo;
-        this.memoizedEnabled = new Entities_1.MemoizedBoolean(true, this.notify);
         this.componentLookup = new Map();
         this.dispose = () => {
             const components = Array.from(this.componentLookup.values());
             this.componentLookup.clear();
             components.forEach(c => c.dispose());
-            if (this.repo.has(this.id)) {
-                this.repo.remove(this.id);
+            if (this.appObjectRepo.has(this.id)) {
+                this.appObjectRepo.remove(this.id);
             }
         };
         this.id = id;
-        this.repo.add(this);
-    }
-    get enabled() {
-        return this.memoizedEnabled.val;
-    }
-    set enabled(val) {
-        this.memoizedEnabled.val = val;
+        this.appObjectRepo = repo;
+        this.appObjectRepo.add(this);
     }
     hasComponent(type) {
         return this.componentLookup.has(type);

package/lib/AppObject/index.d.ts

@@ -5,4 +5,3 @@ export * from "./AppObjectPM";
 export * from "./AppObjectRepo";
 export * from "./AppObjectUC";
 export * from "./AppObjectController";
-export * from "./IsEnabledPM";

package/lib/AppObject/index.js

@@ -17,4 +17,3 @@ __exportStar(require("./AppObjectPM"), exports);
 __exportStar(require("./AppObjectRepo"), exports);
 __exportStar(require("./AppObjectUC"), exports);
 __exportStar(require("./AppObjectController"), exports);
-__exportStar(require("./IsEnabledPM"), exports);

package/lib/AppObjectComponents/Enablement/Entities/EnablablementEntity.d.ts

@@ -0,0 +1,16 @@
+import { AppObject } from "../../../AppObject/AppObject";
+import { AppObjectEntity } from "../../../AppObject/AppObjectEntity";
+export declare abstract class EnablablementEntity extends AppObjectEntity {
+    static readonly type = "EnablablementEntity";
+    abstract get enabled(): boolean;
+    abstract set enabled(enabled: boolean);
+    static get(appObj: AppObject): EnablablementEntity | undefined;
+}
+export declare function makeEnablableEntity(appObject: AppObject): EnablableImp;
+declare class EnablableImp extends EnablablementEntity {
+    private memoizedEnabled;
+    get enabled(): boolean;
+    set enabled(enabled: boolean);
+    constructor(appObject: AppObject);
+}
+export {};

package/lib/AppObjectComponents/Enablement/Entities/EnablablementEntity.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeEnablableEntity = exports.EnablablementEntity = void 0;
+const AppObjectEntity_1 = require("../../../AppObject/AppObjectEntity");
+const Entities_1 = require("../../../Entities");
+class EnablablementEntity extends AppObjectEntity_1.AppObjectEntity {
+    static get(appObj) {
+        return appObj.getComponent(this.type);
+    }
+}
+exports.EnablablementEntity = EnablablementEntity;
+EnablablementEntity.type = "EnablablementEntity";
+function makeEnablableEntity(appObject) {
+    return new EnablableImp(appObject);
+}
+exports.makeEnablableEntity = makeEnablableEntity;
+class EnablableImp extends EnablablementEntity {
+    constructor(appObject) {
+        super(appObject, EnablablementEntity.type);
+        this.memoizedEnabled = new Entities_1.MemoizedBoolean(true, this.notifyOnChange);
+    }
+    get enabled() {
+        return this.memoizedEnabled.val;
+    }
+    set enabled(enabled) {
+        this.memoizedEnabled.val = enabled;
+    }
+}

package/lib/AppObjectComponents/Enablement/PM/EnablableStatePM.d.ts

@@ -0,0 +1,14 @@
+import { AppObject } from "../../../AppObject/AppObject";
+import { AppObjectPM } from "../../../AppObject/AppObjectPM";
+export interface EnablableStateVM {
+    enabled: boolean;
+}
+export declare class EnablableStatePM extends AppObjectPM<EnablableStateVM> {
+    static readonly type = "EnablableStatePM";
+    private enablable?;
+    onEnablableStateChange: () => void;
+    vmsAreEqual(a: EnablableStateVM, b: EnablableStateVM): boolean;
+    dispose: () => void;
+    constructor(appObject: AppObject);
+    static defaultVM: EnablableStateVM;
+}

package/lib/AppObjectComponents/Enablement/PM/EnablableStatePM.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnablableStatePM = void 0;
+const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
+const EnablablementEntity_1 = require("../Entities/EnablablementEntity");
+class EnablableStatePM extends AppObjectPM_1.AppObjectPM {
+    constructor(appObject) {
+        super(appObject, EnablableStatePM.type);
+        this.onEnablableStateChange = () => {
+            if (!this.enablable)
+                return;
+            const vm = {
+                enabled: this.enablable.enabled
+            };
+            this.doUpdateView(vm);
+        };
+        this.dispose = () => {
+            var _a, _b;
+            super.dispose();
+            (_a = this.enablable) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEnablableStateChange);
+            (_b = this.enablable) === null || _b === void 0 ? void 0 : _b.removeChangeObserver(this.dispose);
+        };
+        this.enablable = EnablablementEntity_1.EnablablementEntity.get(appObject);
+        if (!this.enablable) {
+            console.warn("[EnablableStatePM] App Object does not have a Enablable Entity");
+            this.dispose();
+            return;
+        }
+        this.enablable.addChangeObserver(this.onEnablableStateChange);
+        this.enablable.addOnDisposeObserver(this.dispose);
+        this.onEnablableStateChange();
+    }
+    vmsAreEqual(a, b) {
+        return a.enabled === b.enabled;
+    }
+}
+exports.EnablableStatePM = EnablableStatePM;
+EnablableStatePM.type = "EnablableStatePM";
+EnablableStatePM.defaultVM = {
+    enabled: false
+};

package/lib/AppObjectComponents/Enablement/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./Entities/EnablablementEntity";
+export * from "./PM/EnablableStatePM";

package/lib/AppObjectComponents/Enablement/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Entities/EnablablementEntity"), exports);
+__exportStar(require("./PM/EnablableStatePM"), exports);

package/lib/AppObjectComponents/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./ChannelModel";
+export * from "./Enablement";
 export * from "./Hideable";
 export * from "./Label";
 export * from "./Mesh";

package/lib/AppObjectComponents/index.js

@@ -11,6 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ChannelModel"), exports);
+__exportStar(require("./Enablement"), exports);
 __exportStar(require("./Hideable"), exports);
 __exportStar(require("./Label"), exports);
 __exportStar(require("./Mesh"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/app",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "description": "Public package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",