@vived/app 4.21.0 → 4.22.0

package/lib/Components/ChannelModel/Adapters/activeModelAdapter.d.ts

@@ -0,0 +1,2 @@
+import { SingletonPmAdapter } from "../../../Types";
+export declare const activeModelAdapter: SingletonPmAdapter<string>;

package/lib/Components/ChannelModel/Adapters/activeModelAdapter.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.activeModelAdapter = void 0;
+const ActiveModelPM_1 = require("../PMs/ActiveModelPM");
+exports.activeModelAdapter = {
+    defaultVM: "",
+    subscribe: (appObjects, setVM) => {
+        const pm = ActiveModelPM_1.ActiveModelPM.get(appObjects);
+        if (!pm) {
+            appObjects.submitError("animationFrameAdapter", "Unable to find ActiveModelPM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (appObjects, setVM) => {
+        const pm = ActiveModelPM_1.ActiveModelPM.get(appObjects);
+        if (!pm) {
+            appObjects.submitError("animationFrameAdapter", "Unable to find ActiveModelPM");
+            return;
+        }
+        pm.removeView(setVM);
+    },
+};

package/lib/Components/ChannelModel/Adapters/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./activeModelAdapter";
 export * from "./channelModelAdapter";
 export * from "./channelModelObjectAdapter";

package/lib/Components/ChannelModel/Adapters/index.js

@@ -10,5 +10,6 @@ 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("./activeModelAdapter"), exports);
 __exportStar(require("./channelModelAdapter"), exports);
 __exportStar(require("./channelModelObjectAdapter"), exports);

package/lib/Components/ChannelModel/Entities/ChannelModelRepo.d.ts

@@ -2,8 +2,8 @@ import { AppObject, AppObjectEntityRepo, AppObjectRepo } from "../../../AppObjec
 import { ChannelModelEntity } from "./ChannelModel";
 export declare abstract class ChannelModelRepo extends AppObjectEntityRepo<ChannelModelEntity> {
     static readonly type = "CHANNEL_MODEL_REPO";
-    abstract get isLoadingChannelModel(): boolean;
-    abstract set isLoadingChannelModel(val: boolean);
+    abstract get activeModel(): string;
+    abstract set activeModel(val: string);
     abstract getChannelModel(id: string, createIfMissing: boolean): ChannelModelEntity | undefined;
     abstract channelModelFactory(id: string): ChannelModelEntity;
     abstract createChannelModel(id?: string): ChannelModelEntity;

package/lib/Components/ChannelModel/Entities/ChannelModelRepo.js

@@ -17,7 +17,7 @@ exports.makeChannelModelRepo = makeChannelModelRepo;
 class ChannelModelRepoImp extends ChannelModelRepo {
     constructor(appObject) {
         super(appObject, ChannelModelRepo.type);
-        this.memoizedIsLoading = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
+        this.memoizedIsLoading = new Entities_1.MemoizedString("", this.notifyOnChange);
         this.getChannelModel = (id, createIfMissing) => {
             let rVal = this.getForAppObject(id);
             if (rVal === undefined && createIfMissing) {
@@ -37,10 +37,10 @@ class ChannelModelRepoImp extends ChannelModelRepo {
             return ChannelModel_1.makeChannelModelEntity(ao);
         };
     }
-    get isLoadingChannelModel() {
+    get activeModel() {
         return this.memoizedIsLoading.val;
     }
-    set isLoadingChannelModel(val) {
+    set activeModel(val) {
         this.memoizedIsLoading.val = val;
     }
 }

package/lib/Components/ChannelModel/Mocks/ActiveModelMock.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="jest" />
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { ActiveModelPM } from "../PMs";
+export declare class ActiveModelMock extends ActiveModelPM {
+    vmsAreEqual: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}
+export declare function makeActiveModelMock(appObjects: AppObjectRepo): ActiveModelMock;

package/lib/Components/ChannelModel/Mocks/ActiveModelMock.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeActiveModelMock = exports.ActiveModelMock = void 0;
+const PMs_1 = require("../PMs");
+class ActiveModelMock extends PMs_1.ActiveModelPM {
+    constructor(appObject) {
+        super(appObject, PMs_1.ActiveModelPM.type);
+        this.vmsAreEqual = jest.fn();
+    }
+}
+exports.ActiveModelMock = ActiveModelMock;
+function makeActiveModelMock(appObjects) {
+    return new ActiveModelMock(appObjects.getOrCreate("ActiveModelMock"));
+}
+exports.makeActiveModelMock = makeActiveModelMock;

package/lib/Components/ChannelModel/Mocks/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./ActiveModelMock";
 export * from "./ChannelModelObjectPMMock";
 export * from "./ChannelModelPMMock";
 export * from "./ChannelModelViewFactoryMock";

package/lib/Components/ChannelModel/Mocks/index.js

@@ -10,6 +10,7 @@ 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("./ActiveModelMock"), exports);
 __exportStar(require("./ChannelModelObjectPMMock"), exports);
 __exportStar(require("./ChannelModelPMMock"), exports);
 __exportStar(require("./ChannelModelViewFactoryMock"), exports);

package/lib/Components/ChannelModel/PMs/ActiveModelPM.d.ts

@@ -0,0 +1,13 @@
+import { AppObject, AppObjectPM, AppObjectRepo } from "../../../AppObject";
+export declare abstract class ActiveModelPM extends AppObjectPM<string> {
+    static readonly type = "ActiveModelPM";
+    static get(appObjects: AppObjectRepo): ActiveModelPM | undefined;
+}
+export declare function makeActiveModelPM(appObject: AppObject): ActiveModelPMImp;
+declare class ActiveModelPMImp extends ActiveModelPM {
+    private get repo();
+    vmsAreEqual(a: string, b: string): boolean;
+    onEntityChange: () => void;
+    constructor(appObject: AppObject);
+}
+export {};

package/lib/Components/ChannelModel/PMs/ActiveModelPM.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeActiveModelPM = exports.ActiveModelPM = void 0;
+const AppObject_1 = require("../../../AppObject");
+const Entities_1 = require("../Entities");
+class ActiveModelPM extends AppObject_1.AppObjectPM {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(ActiveModelPM.type, appObjects);
+    }
+}
+exports.ActiveModelPM = ActiveModelPM;
+ActiveModelPM.type = "ActiveModelPM";
+function makeActiveModelPM(appObject) {
+    return new ActiveModelPMImp(appObject);
+}
+exports.makeActiveModelPM = makeActiveModelPM;
+class ActiveModelPMImp extends ActiveModelPM {
+    constructor(appObject) {
+        var _a;
+        super(appObject, ActiveModelPM.type);
+        this.onEntityChange = () => {
+            if (!this.repo)
+                return;
+            this.doUpdateView(this.repo.activeModel);
+        };
+        (_a = this.repo) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onEntityChange);
+        this.onEntityChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get repo() {
+        return this.getCachedSingleton(Entities_1.ChannelModelRepo.type);
+    }
+    vmsAreEqual(a, b) {
+        return a === b;
+    }
+}

package/lib/Components/ChannelModel/PMs/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./ActiveModelPM";
 export * from "./ChannelModelObjectPM";
 export * from "./ChannelModelPM";

package/lib/Components/ChannelModel/PMs/index.js

@@ -10,5 +10,6 @@ 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("./ActiveModelPM"), exports);
 __exportStar(require("./ChannelModelObjectPM"), exports);
 __exportStar(require("./ChannelModelPM"), exports);

package/lib/Components/ChannelModel/UC/SelectChannelModelUC.js

@@ -4,6 +4,7 @@ exports.makeSelectChannelModelUC = exports.SelectChannelModelUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Dispatcher_1 = require("../../Dispatcher");
 const SceneRoot_1 = require("../../SceneRoot");
+const Entities_1 = require("../Entities");
 const LoadChannelModelUC_1 = require("./LoadChannelModelUC");
 class SelectChannelModelUC extends AppObject_1.AppObjectUC {
 }
@@ -21,7 +22,8 @@ class SelectChannelModelUCImp extends SelectChannelModelUC {
             const showSelectModel = this.showSelectModel;
             const loadChannelModel = this.loadChannelModel;
             const sceneRoot = this.sceneRoot;
-            if (!showSelectModel || !loadChannelModel || !sceneRoot) {
+            const repo = this.repo;
+            if (!showSelectModel || !loadChannelModel || !sceneRoot || !repo) {
                 return Promise.reject(new Error("Missing Components"));
             }
             return showSelectModel
@@ -33,6 +35,7 @@ class SelectChannelModelUCImp extends SelectChannelModelUC {
                 sceneRoot.position = channelModel.defaultPosition;
                 sceneRoot.rotation = channelModel.defaultRotation;
                 sceneRoot.scale = channelModel.defaultScale;
+                repo.activeModel = channelModel.id;
                 return channelModel.id;
             });
         };
@@ -48,4 +51,7 @@ class SelectChannelModelUCImp extends SelectChannelModelUC {
     get sceneRoot() {
         return this.getCachedSingleton(SceneRoot_1.SceneRootEntity.type);
     }
+    get repo() {
+        return this.getCachedSingleton(Entities_1.ChannelModelRepo.type);
+    }
 }

package/lib/Components/ChannelModel/UC/SerializeActiveModel.d.ts

@@ -0,0 +1,26 @@
+import { AppObject, AppObjectUC } from "../../../AppObject";
+import { SerializedSystem } from "../../StateMachine";
+export declare abstract class SerializeActiveModel extends AppObjectUC implements SerializedSystem {
+    static readonly type = "SerializeDemoState";
+    name: string;
+    abstract seriliziationVersion: number;
+    abstract getSystemState(): object;
+    abstract applySystemState(state: object, version: number, transitionDuration: number): void;
+    abstract applyDefaultState(transitionDuration: number): void;
+}
+export declare function makeSerializeActiveModel(appObject: AppObject): SerializeActiveModel;
+export declare class SerializeActiveModelImp extends SerializeActiveModel {
+    seriliziationVersion: number;
+    private get repo();
+    private get stateMachine();
+    private get loadChannelModel();
+    private get showSelectModel();
+    getSystemState(): object;
+    applySystemState(state: object, version: number): void;
+    applyStateV1(state: SerializedActiveModelStateV1): void;
+    applyDefaultState(): void;
+    constructor(appObject: AppObject);
+}
+export interface SerializedActiveModelStateV1 {
+    modelID: string;
+}

package/lib/Components/ChannelModel/UC/SerializeActiveModel.js

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SerializeActiveModelImp = exports.makeSerializeActiveModel = exports.SerializeActiveModel = void 0;
+const AppObject_1 = require("../../../AppObject");
+const StateMachine_1 = require("../../StateMachine");
+const Entities_1 = require("../Entities");
+const LoadChannelModelUC_1 = require("./LoadChannelModelUC");
+const SelectChannelModelUC_1 = require("./SelectChannelModelUC");
+class SerializeActiveModel extends AppObject_1.AppObjectUC {
+    constructor() {
+        super(...arguments);
+        this.name = "active-model";
+    }
+}
+exports.SerializeActiveModel = SerializeActiveModel;
+SerializeActiveModel.type = "SerializeDemoState";
+function makeSerializeActiveModel(appObject) {
+    return new SerializeActiveModelImp(appObject);
+}
+exports.makeSerializeActiveModel = makeSerializeActiveModel;
+class SerializeActiveModelImp extends SerializeActiveModel {
+    constructor(appObject) {
+        var _a;
+        super(appObject, SerializeActiveModel.type);
+        this.seriliziationVersion = 1;
+        (_a = this.stateMachine) === null || _a === void 0 ? void 0 : _a.registerSerializedSystem(this);
+    }
+    get repo() {
+        return this.getCachedSingleton(Entities_1.ChannelModelRepo.type);
+    }
+    get stateMachine() {
+        return this.getCachedSingleton(StateMachine_1.StateMachineEntity.type);
+    }
+    get loadChannelModel() {
+        var _a;
+        return (_a = this.getCachedSingleton(LoadChannelModelUC_1.LoadChannelModelUC.type)) === null || _a === void 0 ? void 0 : _a.loadChannelModel;
+    }
+    get showSelectModel() {
+        var _a;
+        return (_a = this.getCachedSingleton(SelectChannelModelUC_1.SelectChannelModelUC.type)) === null || _a === void 0 ? void 0 : _a.selectChannelModel;
+    }
+    getSystemState() {
+        if (!this.repo)
+            return {};
+        const appState = {
+            modelID: this.repo.activeModel,
+        };
+        return appState;
+    }
+    applySystemState(state, version) {
+        if (version === 1) {
+            this.applyStateV1(state);
+        }
+        else {
+            // Unsupported version
+            this.warn(`Unsupported data version ${version} for serialized system ${this.name}. Reverting to default state`);
+            this.applyDefaultState();
+        }
+    }
+    applyStateV1(state) {
+        const { modelID } = state;
+        if (!modelID) {
+            this.applyDefaultState();
+            return;
+        }
+        if (!this.repo || !this.loadChannelModel) {
+            return;
+        }
+        this.repo.activeModel = modelID;
+        this.loadChannelModel(modelID);
+    }
+    applyDefaultState() {
+        if (!this.repo || !this.showSelectModel) {
+            return;
+        }
+        this.repo.activeModel = "";
+        this.showSelectModel();
+    }
+}
+exports.SerializeActiveModelImp = SerializeActiveModelImp;

package/lib/Components/ChannelModel/UC/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./ChannelModelViewFactory";
 export * from "./LoadChannelModelUC";
 export * from "./SelectChannelModelUC";
+export * from "./SerializeActiveModel";

package/lib/Components/ChannelModel/UC/index.js

@@ -13,3 +13,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ChannelModelViewFactory"), exports);
 __exportStar(require("./LoadChannelModelUC"), exports);
 __exportStar(require("./SelectChannelModelUC"), exports);
+__exportStar(require("./SerializeActiveModel"), exports);

package/package.json

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