@vived/app 4.17.3 → 4.17.5

package/lib/Components/App/Mocks/MockAppRenderingUC.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="jest" />
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppRenderingUC } from "../UC/AppRenderingUC";
 export declare class MockAppRenderingUC extends AppRenderingUC {
@@ -6,3 +7,4 @@ export declare class MockAppRenderingUC extends AppRenderingUC {
     stopRendering: jest.Mock<any, any>;
     constructor(appObject: AppObject);
 }
+export declare function makeMockAppRenderingUC(appObjects: AppObjectRepo): MockAppRenderingUC;

package/lib/Components/App/Mocks/MockAppRenderingUC.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockAppRenderingUC = void 0;
+exports.makeMockAppRenderingUC = exports.MockAppRenderingUC = void 0;
 const AppRenderingUC_1 = require("../UC/AppRenderingUC");
 class MockAppRenderingUC extends AppRenderingUC_1.AppRenderingUC {
     constructor(appObject) {
@@ -10,3 +10,7 @@ class MockAppRenderingUC extends AppRenderingUC_1.AppRenderingUC {
     }
 }
 exports.MockAppRenderingUC = MockAppRenderingUC;
+function makeMockAppRenderingUC(appObjects) {
+    return new MockAppRenderingUC(appObjects.getOrCreate("MockAppRenderingUC"));
+}
+exports.makeMockAppRenderingUC = makeMockAppRenderingUC;

package/lib/Components/App/Mocks/MockRenderCanvasUC.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="jest" />
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { RenderCanvasUC } from "../UC/RenderCanvasUC";
 export declare class MockRenderUC extends RenderCanvasUC {
@@ -6,3 +7,4 @@ export declare class MockRenderUC extends RenderCanvasUC {
     clearCanvas: jest.Mock<any, any>;
     constructor(appObject: AppObject);
 }
+export declare function makeMockRenderUC(appObjects: AppObjectRepo): MockRenderUC;

package/lib/Components/App/Mocks/MockRenderCanvasUC.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockRenderUC = void 0;
+exports.makeMockRenderUC = exports.MockRenderUC = void 0;
 const RenderCanvasUC_1 = require("../UC/RenderCanvasUC");
 class MockRenderUC extends RenderCanvasUC_1.RenderCanvasUC {
     constructor(appObject) {
@@ -10,3 +10,7 @@ class MockRenderUC extends RenderCanvasUC_1.RenderCanvasUC {
     }
 }
 exports.MockRenderUC = MockRenderUC;
+function makeMockRenderUC(appObjects) {
+    return new MockRenderUC(appObjects.getOrCreate("MockRenderUC"));
+}
+exports.makeMockRenderUC = makeMockRenderUC;

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

@@ -37,6 +37,5 @@ export declare class ChannelModel extends AppObjectEntity {
     private _meshList;
     get meshList(): string[];
     set meshList(val: string[]);
-    dispose: () => void;
     constructor(appObject: AppObject);
 }

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

@@ -22,9 +22,6 @@ class ChannelModel extends AppObject_1.AppObjectEntity {
         this._defaultScale = new Entities_1.MemoizedNumber(1, this.notifyOnChange);
         this._state = new Entities_1.MemoizedString(ChannelModelState.INIT, this.notifyOnChange);
         this._meshList = [];
-        this.dispose = () => {
-            super.dispose();
-        };
     }
     static addIfMissing(appObj) {
         const existing = appObj.getComponent(this.type);

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

@@ -1,12 +1,11 @@
 import { AppObject, AppObjectEntityRepo, AppObjectRepo } from "../../../AppObject";
 import { ChannelModel } from "./ChannelModel";
-export declare class ChannelModelRepo extends AppObjectEntityRepo<ChannelModel> {
+export declare abstract class ChannelModelRepo extends AppObjectEntityRepo<ChannelModel> {
     static readonly type = "CHANNEL_MODEL_REPO";
+    abstract get isLoadingChannelModel(): boolean;
+    abstract set isLoadingChannelModel(val: boolean);
+    abstract getChannelModel(id: string, createIfMissing: boolean): ChannelModel | undefined;
+    abstract channelModelFactory(id: string): ChannelModel;
     static get: (appObjects: AppObjectRepo) => ChannelModelRepo | undefined;
-    static addToAO(appObj: AppObject): ChannelModelRepo;
-    private memoizedIsLoading;
-    get isLoadingChannelModel(): boolean;
-    set isLoadingChannelModel(val: boolean);
-    makeIfMissing(appObject: AppObject): ChannelModel;
-    constructor(appObject: AppObject);
 }
+export declare function makeChannelModelRepo(appObject: AppObject): ChannelModelRepo;

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

@@ -1,16 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChannelModelRepo = void 0;
+exports.makeChannelModelRepo = exports.ChannelModelRepo = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Entities_1 = require("../../../Entities");
 const ChannelModel_1 = require("./ChannelModel");
 class ChannelModelRepo extends AppObject_1.AppObjectEntityRepo {
+}
+exports.ChannelModelRepo = ChannelModelRepo;
+ChannelModelRepo.type = "CHANNEL_MODEL_REPO";
+ChannelModelRepo.get = (appObjects) => AppObject_1.getSingletonComponent(ChannelModelRepo.type, appObjects);
+function makeChannelModelRepo(appObject) {
+    return new ChannelModelRepoImp(appObject);
+}
+exports.makeChannelModelRepo = makeChannelModelRepo;
+class ChannelModelRepoImp extends ChannelModelRepo {
     constructor(appObject) {
         super(appObject, ChannelModelRepo.type);
         this.memoizedIsLoading = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
-    }
-    static addToAO(appObj) {
-        return new ChannelModelRepo(appObj);
+        this.getChannelModel = (id, createIfMissing) => {
+            let rVal = this.getForAppObject(id);
+            if (rVal === undefined && createIfMissing) {
+                rVal = this.channelModelFactory(id);
+                this.add(rVal);
+            }
+            return rVal;
+        };
+        this.channelModelFactory = (id) => {
+            const ao = this.appObjects.getOrCreate(id);
+            return new ChannelModel_1.ChannelModel(ao);
+        };
     }
     get isLoadingChannelModel() {
         return this.memoizedIsLoading.val;
@@ -18,18 +36,4 @@ class ChannelModelRepo extends AppObject_1.AppObjectEntityRepo {
     set isLoadingChannelModel(val) {
         this.memoizedIsLoading.val = val;
     }
-    makeIfMissing(appObject) {
-        const existing = this.getForAppObject(appObject.id);
-        if (existing) {
-            return existing;
-        }
-        else {
-            const newEntity = new ChannelModel_1.ChannelModel(appObject);
-            this.add(newEntity);
-            return newEntity;
-        }
-    }
 }
-exports.ChannelModelRepo = ChannelModelRepo;
-ChannelModelRepo.type = "CHANNEL_MODEL_REPO";
-ChannelModelRepo.get = (appObjects) => AppObject_1.getSingletonComponent(ChannelModelRepo.type, appObjects);

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

@@ -0,0 +1,8 @@
+/// <reference types="jest" />
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { ProcessChannelModelUC } from "../UC";
+export declare class ProcessChannelModelUCMock extends ProcessChannelModelUC {
+    processChannelModel: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}
+export declare function makeProcessChannelModelUCMock(appObjects: AppObjectRepo): ProcessChannelModelUCMock;

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeProcessChannelModelUCMock = exports.ProcessChannelModelUCMock = void 0;
+const UC_1 = require("../UC");
+class ProcessChannelModelUCMock extends UC_1.ProcessChannelModelUC {
+    constructor(appObject) {
+        super(appObject, UC_1.ProcessChannelModelUC.type);
+        this.processChannelModel = jest.fn().mockResolvedValue(undefined);
+    }
+}
+exports.ProcessChannelModelUCMock = ProcessChannelModelUCMock;
+function makeProcessChannelModelUCMock(appObjects) {
+    return new ProcessChannelModelUCMock(appObjects.getOrCreate("ProcessChannelModelUCMock"));
+}
+exports.makeProcessChannelModelUCMock = makeProcessChannelModelUCMock;

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

@@ -31,18 +31,20 @@ exports.makeSetupChannelModelUC = makeSetupChannelModelUC;
 class SetupChannelModelUCImp extends SetupChannelModelUC {
     constructor(appObject) {
         super(appObject, SetupChannelModelUC.type);
+        this.closeSpinner = () => {
+            // default spinner close
+        };
         this.setupChannelModel = (modelID) => __awaiter(this, void 0, void 0, function* () {
-            const channelModelRepo = this.appObject.getComponent(Entities_1.ChannelModelRepo.type);
+            const channelModelRepo = this.channelModelRepo;
             if (!channelModelRepo) {
                 this.warn("Unable to get channelModelRepo from the model repo App Object");
                 return Promise.reject(new Error("No Channel Model Repo"));
             }
-            const processModel = ProcessChannelModelUC_1.ProcessChannelModelUC.get(this.appObjects);
+            const processModel = this.processModel;
             if (!processModel) {
                 return Promise.reject(new Error("No Process ModelUC"));
             }
-            const appObj = this.appObjects.getOrCreate(modelID);
-            const channelModel = channelModelRepo.makeIfMissing(appObj);
+            const channelModel = channelModelRepo.getChannelModel(modelID, true);
             if (channelModel.state === Entities_1.ChannelModelState.LOADING) {
                 return Promise.resolve(channelModel);
             }
@@ -52,12 +54,8 @@ class SetupChannelModelUCImp extends SetupChannelModelUC {
             channelModel.modelError = undefined;
             channelModel.state = Entities_1.ChannelModelState.LOADING;
             channelModelRepo.isLoadingChannelModel = true;
-            const spinner = Dispatcher_1.ShowSpinnerUC.get(this.appObjects);
-            let closeSpinner = () => {
-                // done
-            };
-            if (spinner) {
-                closeSpinner = yield spinner.showSpinner("Loading active model and data", "Loading...");
+            if (this.showSpinnerUC) {
+                this.closeSpinner = yield this.showSpinnerUC.showSpinner("Loading active model and data", "Loading...");
             }
             try {
                 const { bounds_max, bounds_min, defaultPosition, defaultRotation, defaultScale, name, objects, } = yield this.modelDataLoader(modelID);
@@ -78,7 +76,7 @@ class SetupChannelModelUCImp extends SetupChannelModelUC {
                 channelModel.state = Entities_1.ChannelModelState.READY;
                 channelModelRepo.isLoadingChannelModel = false;
                 Dispatcher_1.dispatchStateChange(this.appObjects);
-                closeSpinner();
+                this.closeSpinner();
                 return Promise.resolve(channelModel);
             }
             catch (e) {
@@ -87,7 +85,7 @@ class SetupChannelModelUCImp extends SetupChannelModelUC {
                     channelModelRepo.isLoadingChannelModel = false;
                 }
                 channelModel.modelError = error;
-                closeSpinner();
+                this.closeSpinner();
                 const alertDTO = {
                     title: "Load Error",
                     message: `Failed to Load the Model and Data. Error message: ${error.message}`,
@@ -106,6 +104,16 @@ class SetupChannelModelUCImp extends SetupChannelModelUC {
                 return Promise.reject(error);
             }
         });
+        this.appObjects.registerSingleton(this);
+    }
+    get channelModelRepo() {
+        return this.getCachedSingleton(Entities_1.ChannelModelRepo.type);
+    }
+    get processModel() {
+        return this.getCachedSingleton(ProcessChannelModelUC_1.ProcessChannelModelUC.type);
+    }
+    get showSpinnerUC() {
+        return this.getCachedSingleton(Dispatcher_1.ShowSpinnerUC.type);
     }
     setupMeshObject(id, label, meshPaths) {
         const appObj = this.appObjects.getOrCreate(id);

package/lib/Types/ChannelModelData.d.ts

@@ -9,7 +9,6 @@ export interface ChannelModelDataMeshDTOv0 {
     meshPaths: string[];
     label: string;
 }
-export declare type ChannelModelDTO = ChannelModelDTOv0 | ChannelModelDTOv1;
 export interface ChannelModelDTOv0 {
     version: number;
     objects: ChannelModelDataMeshDTOv0[];

package/package.json

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