@vived/app 4.30.0 → 4.32.0

package/lib/Components/StoredView/Controllers/restoreStoredView.d.ts

@@ -0,0 +1,2 @@
+import { AppObjectRepo } from "../../../AppObject";
+export declare function restoreStoredView(appObjects: AppObjectRepo): void;

package/lib/Components/StoredView/Controllers/restoreStoredView.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.restoreStoredView = void 0;
+const RestoreStoredViewUC_1 = require("../UC/RestoreStoredViewUC");
+function restoreStoredView(appObjects) {
+    const uc = RestoreStoredViewUC_1.RestoreStoredViewUC.get(appObjects);
+    if (!uc) {
+        appObjects.submitError("restoreStoredView", "Unable to find RestoreStoredViewUC");
+        return;
+    }
+    uc.restoreStoredView();
+}
+exports.restoreStoredView = restoreStoredView;

package/lib/Components/StoredView/Controllers/setViewInXR.d.ts

@@ -0,0 +1,2 @@
+import { AppObjectRepo } from "../../../AppObject";
+export declare function setViewInXR(appObjects: AppObjectRepo): void;

package/lib/Components/StoredView/Controllers/setViewInXR.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setViewInXR = void 0;
+const SetInXRUC_1 = require("../UC/SetInXRUC");
+function setViewInXR(appObjects) {
+    const uc = SetInXRUC_1.SetViewInXRUC.get(appObjects);
+    if (!uc) {
+        appObjects.submitError("setViewInXR", "Unable to find SetViewInXRUC");
+        return;
+    }
+    uc.setViewInXR();
+}
+exports.setViewInXR = setViewInXR;

package/lib/Components/StoredView/Controllers/storeCurrentView.d.ts

@@ -0,0 +1,2 @@
+import { AppObjectRepo } from "../../../AppObject";
+export declare function storeCurrentView(appObjects: AppObjectRepo): void;

package/lib/Components/StoredView/Controllers/storeCurrentView.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.storeCurrentView = void 0;
+const StoreCurrentViewUC_1 = require("../UC/StoreCurrentViewUC");
+function storeCurrentView(appObjects) {
+    const uc = StoreCurrentViewUC_1.StoreCurrentViewUC.get(appObjects);
+    if (!uc) {
+        appObjects.submitError("storeCurrentView", "Unable to find StoreCurrentViewUC");
+        return;
+    }
+    uc.storeCurrentView();
+}
+exports.storeCurrentView = storeCurrentView;

package/lib/Components/StoredView/Factories/index.d.ts

@@ -0,0 +1 @@
+export * from "./setupStoredView";

package/lib/Components/StoredView/Factories/index.js

@@ -0,0 +1,13 @@
+"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("./setupStoredView"), exports);

package/lib/Components/StoredView/Factories/setupStoredView.d.ts

@@ -0,0 +1,2 @@
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+export declare function setupStoredView(appObjects: AppObjectRepo): AppObject;

package/lib/Components/StoredView/Factories/setupStoredView.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupStoredView = void 0;
+const Entities_1 = require("../Entities");
+const PM_1 = require("../PM");
+const UC_1 = require("../UC");
+function setupStoredView(appObjects) {
+    const ao = appObjects.getOrCreate("StoredView");
+    // Entities
+    Entities_1.makeStoredView(ao);
+    // UCs
+    UC_1.makeStoreCurrentViewUC(ao);
+    UC_1.makeRestoreStoredViewUC(ao);
+    UC_1.makeClearStoredViewUC(ao);
+    UC_1.makeSetViewInXRUC(ao);
+    UC_1.makeSerializeStoredView(ao);
+    // PMs
+    PM_1.makeHasStoredViewPM(ao);
+    return ao;
+}
+exports.setupStoredView = setupStoredView;

package/lib/Components/StoredView/Mocks/ClearStoredViewUcMock.d.ts

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

package/lib/Components/StoredView/Mocks/ClearStoredViewUcMock.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeClearStoredViewUcMock = exports.ClearStoredViewUcMock = void 0;
+const ClearStoredViewUC_1 = require("../UC/ClearStoredViewUC");
+class ClearStoredViewUcMock extends ClearStoredViewUC_1.ClearStoredViewUC {
+    constructor(appObject) {
+        super(appObject, ClearStoredViewUC_1.ClearStoredViewUC.type);
+        this.clearStoredView = jest.fn();
+    }
+}
+exports.ClearStoredViewUcMock = ClearStoredViewUcMock;
+function makeClearStoredViewUcMock(appObjects) {
+    return new ClearStoredViewUcMock(appObjects.getOrCreate("ClearStoredViewUcMock"));
+}
+exports.makeClearStoredViewUcMock = makeClearStoredViewUcMock;

package/lib/Components/StoredView/Mocks/HasStoredViewPmMock.d.ts

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

package/lib/Components/StoredView/Mocks/HasStoredViewPmMock.js

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

package/lib/Components/StoredView/Mocks/RestoreStoredViewUcMock.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="jest" />
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { RestoreStoredViewUC } from "../UC/RestoreStoredViewUC";
+export declare class RestoreStoredViewUcMock extends RestoreStoredViewUC {
+    restoreStoredView: jest.Mock<any, any>;
+    ease: import("../../..").EaseFn;
+    constructor(appObject: AppObject);
+}
+export declare function makeRestoreStoredViewUcMock(appObjects: AppObjectRepo): RestoreStoredViewUcMock;

package/lib/Components/StoredView/Mocks/RestoreStoredViewUcMock.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeRestoreStoredViewUcMock = exports.RestoreStoredViewUcMock = void 0;
+const Utilities_1 = require("../../../Utilities");
+const RestoreStoredViewUC_1 = require("../UC/RestoreStoredViewUC");
+class RestoreStoredViewUcMock extends RestoreStoredViewUC_1.RestoreStoredViewUC {
+    constructor(appObject) {
+        super(appObject, RestoreStoredViewUC_1.RestoreStoredViewUC.type);
+        this.restoreStoredView = jest.fn();
+        this.ease = Utilities_1.easeLinear;
+    }
+}
+exports.RestoreStoredViewUcMock = RestoreStoredViewUcMock;
+function makeRestoreStoredViewUcMock(appObjects) {
+    return new RestoreStoredViewUcMock(appObjects.getOrCreate("RestoreStoredViewUcMock"));
+}
+exports.makeRestoreStoredViewUcMock = makeRestoreStoredViewUcMock;

package/lib/Components/StoredView/Mocks/SetViewInXRUcMock.d.ts

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

package/lib/Components/StoredView/Mocks/SetViewInXRUcMock.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeSetViewInXRUcMock = exports.SetViewInXRUcMock = void 0;
+const SetInXRUC_1 = require("../UC/SetInXRUC");
+class SetViewInXRUcMock extends SetInXRUC_1.SetViewInXRUC {
+    constructor(appObject) {
+        super(appObject, SetInXRUC_1.SetViewInXRUC.type);
+        this.setViewInXR = jest.fn();
+    }
+}
+exports.SetViewInXRUcMock = SetViewInXRUcMock;
+function makeSetViewInXRUcMock(appObjects) {
+    return new SetViewInXRUcMock(appObjects.getOrCreate("SetViewInXRUcMock"));
+}
+exports.makeSetViewInXRUcMock = makeSetViewInXRUcMock;

package/lib/Components/StoredView/Mocks/StoreCurrentViewUcMock.d.ts

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

package/lib/Components/StoredView/Mocks/StoreCurrentViewUcMock.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeStoreCurrentViewUcMock = exports.StoreCurrentViewUcMock = void 0;
+const StoreCurrentViewUC_1 = require("../UC/StoreCurrentViewUC");
+class StoreCurrentViewUcMock extends StoreCurrentViewUC_1.StoreCurrentViewUC {
+    constructor(appObject) {
+        super(appObject, StoreCurrentViewUC_1.StoreCurrentViewUC.type);
+        this.storeCurrentView = jest.fn();
+    }
+}
+exports.StoreCurrentViewUcMock = StoreCurrentViewUcMock;
+function makeStoreCurrentViewUcMock(appObjects) {
+    return new StoreCurrentViewUcMock(appObjects.getOrCreate("StoreCurrentViewUcMock"));
+}
+exports.makeStoreCurrentViewUcMock = makeStoreCurrentViewUcMock;

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

@@ -0,0 +1 @@
+export * from "./HasStoredViewPmMock";

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

@@ -0,0 +1,13 @@
+"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("./HasStoredViewPmMock"), exports);

package/lib/Components/StoredView/PM/HasStoredViewPM.js

@@ -14,6 +14,7 @@ function makeHasStoredViewPM(appObject) {
 exports.makeHasStoredViewPM = makeHasStoredViewPM;
 class HasStoredViewPMImp extends HasStoredViewPM {
     constructor(appObject) {
+        var _a;
         super(appObject, HasStoredViewPM.type);
         this.onRepoChange = () => {
             if (!this.storedView)
@@ -26,15 +27,12 @@ class HasStoredViewPMImp extends HasStoredViewPM {
             (_a = this.storedView) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onRepoChange);
             (_b = this.storedView) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
-        this.storedView = appObject.getComponent(Entities_1.StoredView.type);
-        if (this.storedView) {
-            this.storedView.addChangeObserver(this.onRepoChange);
-            this.storedView.addOnDisposeObserver(() => this.dispose());
-            this.onRepoChange();
-        }
-        else {
-            console.warn("[HasStoredViewPMImp] App Object does not have a StoredView Entity");
-        }
+        (_a = this.storedView) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onRepoChange);
+        this.onRepoChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get storedView() {
+        return this.getCachedSingleton(Entities_1.StoredView.type);
     }
     vmsAreEqual(a, b) {
         return a === b;

package/lib/Components/StoredView/UC/ClearStoredViewUC.d.ts

@@ -5,4 +5,3 @@ export declare abstract class ClearStoredViewUC extends AppObjectUC {
     abstract clearStoredView(): void;
 }
 export declare function makeClearStoredViewUC(appObject: AppObject): ClearStoredViewUC;
-export declare function clearStoredView(appObjects: AppObjectRepo): void;

package/lib/Components/StoredView/UC/ClearStoredViewUC.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearStoredView = exports.makeClearStoredViewUC = exports.ClearStoredViewUC = void 0;
+exports.makeClearStoredViewUC = exports.ClearStoredViewUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const ValueObjects_1 = require("../../../ValueObjects");
 const Dispatcher_1 = require("../../Dispatcher");
@@ -14,16 +14,6 @@ function makeClearStoredViewUC(appObject) {
     return new ClearStoredViewUCImp(appObject);
 }
 exports.makeClearStoredViewUC = makeClearStoredViewUC;
-function clearStoredView(appObjects) {
-    const uc = ClearStoredViewUC.get(appObjects);
-    if (uc) {
-        uc.clearStoredView();
-    }
-    else {
-        appObjects.submitWarning("clearStoredView", "Can't find ClearStoredViewUC");
-    }
-}
-exports.clearStoredView = clearStoredView;
 class ClearStoredViewUCImp extends ClearStoredViewUC {
     constructor(appObject) {
         super(appObject, ClearStoredViewUC.type);
@@ -36,9 +26,8 @@ class ClearStoredViewUCImp extends ClearStoredViewUC {
             this.storedView.hasStoredView = false;
             Dispatcher_1.dispatchStateChange(this.appObject.appObjectRepo);
         };
-        this.storedView = Entities_1.StoredView.get(appObject.appObjectRepo);
-        if (!this.storedView) {
-            this.warn("Unable to find stored view");
-        }
+    }
+    get storedView() {
+        return this.getCachedSingleton(Entities_1.StoredView.type);
     }
 }

package/lib/Components/StoredView/UC/RestoreStoredViewUC.d.ts

@@ -7,4 +7,3 @@ export declare abstract class RestoreStoredViewUC extends AppObjectUC {
     abstract ease: EaseFn;
 }
 export declare function makeRestoreStoredViewUC(appObject: AppObject): RestoreStoredViewUC;
-export declare function restoreStoredView(appObjects: AppObjectRepo): void;

package/lib/Components/StoredView/UC/RestoreStoredViewUC.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.restoreStoredView = exports.makeRestoreStoredViewUC = exports.RestoreStoredViewUC = void 0;
+exports.makeRestoreStoredViewUC = exports.RestoreStoredViewUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Utilities_1 = require("../../../Utilities");
 const ValueObjects_1 = require("../../../ValueObjects");
@@ -15,20 +15,10 @@ function makeRestoreStoredViewUC(appObject) {
     return new RestoreStoredViewUCImp(appObject);
 }
 exports.makeRestoreStoredViewUC = makeRestoreStoredViewUC;
-function restoreStoredView(appObjects) {
-    const uc = RestoreStoredViewUC.get(appObjects);
-    if (uc) {
-        uc.restoreStoredView();
-    }
-    else {
-        appObjects.submitWarning("restoreStoredView", "Can't find ClearStoredViewUC");
-    }
-}
-exports.restoreStoredView = restoreStoredView;
 class RestoreStoredViewUCImp extends RestoreStoredViewUC {
     constructor(appObject) {
         super(appObject, RestoreStoredViewUC.type);
-        this.ease = Utilities_1.expoOut;
+        this.ease = Utilities_1.cubicInOut;
         this.restoreStoredView = () => {
             if (this.storedView && this.sceneRoot) {
                 if (!this.storedView.hasStoredView)
@@ -47,15 +37,11 @@ class RestoreStoredViewUCImp extends RestoreStoredViewUC {
                 this.warn("Missing necessary entities");
             }
         };
-        this.sceneRoot = SceneRoot_1.SceneRootEntity.get(appObject.appObjectRepo);
-        if (!this.sceneRoot) {
-            this.error("Unable to find scene root");
-            return;
-        }
-        this.storedView = Entities_1.StoredView.get(appObject.appObjectRepo);
-        if (!this.storedView) {
-            this.error("Unable to find stored view");
-            return;
-        }
+    }
+    get storedView() {
+        return this.getCachedSingleton(Entities_1.StoredView.type);
+    }
+    get sceneRoot() {
+        return this.getCachedSingleton(SceneRoot_1.SceneRootEntity.type);
     }
 }

package/lib/Components/StoredView/UC/SerializeStoredView.js

@@ -21,12 +21,6 @@ class SerializeStoredViewImp extends SerializeStoredView {
     constructor(appObject) {
         super(appObject, SerializeStoredView.type);
         this.seriliziationVersion = 1;
-        this.storedView = appObject.getComponent(StoredView_1.StoredView.type);
-        if (!this.storedView) {
-            console.warn("SerializeStoredView UC has been added to an App Object that does not have a StoredView Entity. Add one before adding the UC");
-            this.dispose();
-            return;
-        }
         const stateMachine = StateMachineEntity_1.StateMachineEntity.get(appObject.appObjectRepo);
         if (stateMachine) {
             stateMachine.registerSerializedSystem(this);
@@ -35,6 +29,9 @@ class SerializeStoredViewImp extends SerializeStoredView {
             this.warn("Unable to find StateMachineEntity");
         }
     }
+    get storedView() {
+        return this.getCachedSingleton(StoredView_1.StoredView.type);
+    }
     getSystemState() {
         if (!this.storedView) {
             console.warn("[SerializeStoredView] No stored view entity");

package/lib/Components/StoredView/UC/SetInXRUC.d.ts

@@ -5,4 +5,3 @@ export declare abstract class SetViewInXRUC extends AppObjectUC {
     abstract setViewInXR(): void;
 }
 export declare function makeSetViewInXRUC(appObject: AppObject): SetViewInXRUC;
-export declare function setViewInXR(appObjects: AppObjectRepo): void;

package/lib/Components/StoredView/UC/SetInXRUC.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setViewInXR = exports.makeSetViewInXRUC = exports.SetViewInXRUC = void 0;
+exports.makeSetViewInXRUC = exports.SetViewInXRUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Dispatcher_1 = require("../../Dispatcher");
 class SetViewInXRUC extends AppObject_1.AppObjectUC {
@@ -12,16 +12,6 @@ function makeSetViewInXRUC(appObject) {
     return new SetViewInXRUCImp(appObject);
 }
 exports.makeSetViewInXRUC = makeSetViewInXRUC;
-function setViewInXR(appObjects) {
-    const uc = SetViewInXRUC.get(appObjects);
-    if (uc) {
-        uc.setViewInXR();
-    }
-    else {
-        appObjects.submitWarning("setViewInXR", "Can't find ClearStoredViewUC");
-    }
-}
-exports.setViewInXR = setViewInXR;
 class SetViewInXRUCImp extends SetViewInXRUC {
     constructor(appObject) {
         super(appObject, SetViewInXRUC.type);
@@ -33,9 +23,8 @@ class SetViewInXRUCImp extends SetViewInXRUC {
                 this.warn("Missing necessary entities");
             }
         };
-        this.dispatchStartZSpace = Dispatcher_1.DispatchStartZSpaceUC.get(appObject.appObjectRepo);
-        if (!this.dispatchStartZSpace) {
-            console.error("No DispatchStartZSpace");
-        }
+    }
+    get dispatchStartZSpace() {
+        return this.getCachedSingleton(Dispatcher_1.DispatchStartZSpaceUC.type);
     }
 }

package/lib/Components/StoredView/UC/StoreCurrentViewUC.d.ts

@@ -5,4 +5,3 @@ export declare abstract class StoreCurrentViewUC extends AppObjectUC {
     abstract storeCurrentView(): void;
 }
 export declare function makeStoreCurrentViewUC(appObject: AppObject): StoreCurrentViewUC;
-export declare function storeCurrentView(appObjects: AppObjectRepo): void;

package/lib/Components/StoredView/UC/StoreCurrentViewUC.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storeCurrentView = exports.makeStoreCurrentViewUC = exports.StoreCurrentViewUC = void 0;
+exports.makeStoreCurrentViewUC = exports.StoreCurrentViewUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Dispatcher_1 = require("../../Dispatcher");
 const SceneRoot_1 = require("../../SceneRoot");
@@ -14,16 +14,6 @@ function makeStoreCurrentViewUC(appObject) {
     return new StoreCurrentViewUCImp(appObject);
 }
 exports.makeStoreCurrentViewUC = makeStoreCurrentViewUC;
-function storeCurrentView(appObjects) {
-    const uc = StoreCurrentViewUC.get(appObjects);
-    if (uc) {
-        uc.storeCurrentView();
-    }
-    else {
-        appObjects.submitWarning("storeCurrentView", "Can't find StoreCurrentViewUC");
-    }
-}
-exports.storeCurrentView = storeCurrentView;
 class StoreCurrentViewUCImp extends StoreCurrentViewUC {
     constructor(appObject) {
         super(appObject, StoreCurrentViewUC.type);
@@ -36,13 +26,11 @@ class StoreCurrentViewUCImp extends StoreCurrentViewUC {
             this.storedView.hasStoredView = true;
             Dispatcher_1.dispatchStateChange(this.appObject.appObjectRepo);
         };
-        this.sceneRoot = SceneRoot_1.SceneRootEntity.get(appObject.appObjectRepo);
-        if (!this.sceneRoot) {
-            this.error("Unable to find scene root");
-        }
-        this.storedView = Entities_1.StoredView.get(appObject.appObjectRepo);
-        if (!this.storedView) {
-            this.error("Unable to find stored view");
-        }
+    }
+    get storedView() {
+        return this.getCachedSingleton(Entities_1.StoredView.type);
+    }
+    get sceneRoot() {
+        return this.getCachedSingleton(SceneRoot_1.SceneRootEntity.type);
     }
 }

package/lib/Components/StoredView/index.d.ts

@@ -1,3 +1,6 @@
+export * from "./Adapters";
+export * from "./Controllers";
 export * from "./Entities";
+export * from "./Factories";
 export * from "./PM";
 export * from "./UC";

package/lib/Components/StoredView/index.js

@@ -10,6 +10,9 @@ 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("./Adapters"), exports);
+__exportStar(require("./Controllers"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Factories"), exports);
 __exportStar(require("./PM"), exports);
 __exportStar(require("./UC"), exports);

package/lib/Components/Tools/Adapters/toolAdapter.d.ts

@@ -1,3 +1,3 @@
 import { PmAdapter } from "../../../Types";
 import { ToolVM } from "../PM/ToolPM";
-export declare function makeToolAdapter<ToolTypes>(): PmAdapter<ToolVM<ToolTypes>>;
+export declare const toolAdapter: PmAdapter<ToolVM>;

package/lib/Components/Tools/Adapters/toolAdapter.js

@@ -1,26 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeToolAdapter = void 0;
+exports.toolAdapter = void 0;
 const ToolPM_1 = require("../PM/ToolPM");
-function makeToolAdapter() {
-    return {
-        defaultVM: ToolPM_1.defaultToolVM,
-        subscribe: (id, appObjects, setVM) => {
-            const pm = ToolPM_1.ToolPM.get(id, appObjects);
-            if (!pm) {
-                appObjects.submitError("toolAdapter", "Unable to find ToolPM");
-                return;
-            }
-            pm.addView(setVM);
-        },
-        unsubscribe: (id, appObjects, setVM) => {
-            const pm = ToolPM_1.ToolPM.get(id, appObjects);
-            if (!pm) {
-                appObjects.submitError("toolAdapter", "Unable to find ToolPM");
-                return;
-            }
-            pm.removeView(setVM);
-        },
-    };
-}
-exports.makeToolAdapter = makeToolAdapter;
+exports.toolAdapter = {
+    defaultVM: ToolPM_1.defaultToolVM,
+    subscribe: (id, appObjects, setVM) => {
+        const pm = ToolPM_1.ToolPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("toolAdapter", "Unable to find ToolPM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (id, appObjects, setVM) => {
+        var _a;
+        (_a = ToolPM_1.ToolPM.get(id, appObjects)) === null || _a === void 0 ? void 0 : _a.removeView(setVM);
+    },
+};

package/lib/Components/Tools/Controller/ToolHotkeys.d.ts

@@ -1,7 +1,7 @@
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectController } from "../../../AppObject/AppObjectController";
 import { KeyboardController } from "../../KeyboardInput";
-export declare class ToolHotkeys<ToolTypes> extends AppObjectController implements KeyboardController {
+export declare class ToolHotkeys extends AppObjectController implements KeyboardController {
     static readonly type = "ToolHotkeys";
     private toolRepo?;
     onKeyDown: (e: KeyboardEvent) => void;

package/lib/Components/Tools/Controller/triggerTool.d.ts

@@ -1,2 +1,2 @@
 import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
-export declare function triggerTool<ToolTypes>(toolType: ToolTypes, appObjects: AppObjectRepo): void;
+export declare function triggerTool(toolType: string, appObjects: AppObjectRepo): void;

package/lib/Components/Tools/Entities/ToolEntity.d.ts

@@ -7,8 +7,8 @@ export declare enum ToolState {
     ENABLED = "ENABLED",
     ACTIVE = "ACTIVE"
 }
-export interface ToolData<ToolTypes> {
-    toolType: ToolTypes;
+export interface ToolData {
+    toolType: string;
     isDefault: boolean;
     label: string;
     shortcutLabel: string;
@@ -21,9 +21,9 @@ export interface HotKey {
     meta?: boolean;
     alt?: boolean;
 }
-export declare abstract class ToolEntity<ToolTypes> extends AppObjectEntity {
+export declare abstract class ToolEntity extends AppObjectEntity {
     static readonly type = "TOOL";
-    abstract get toolType(): ToolTypes | undefined;
+    abstract get toolType(): string | undefined;
     abstract get label(): string;
     abstract set label(toolLabel: string);
     abstract readonly isDefault: boolean;
@@ -36,7 +36,7 @@ export declare abstract class ToolEntity<ToolTypes> extends AppObjectEntity {
     abstract triggerActions(): void;
     abstract registerAction(action: () => void): void;
     abstract isMyHotkey(hotkey: HotKey): boolean;
-    abstract setupFromData(data: ToolData<ToolTypes>): void;
-    static get<ToolTypes>(id: string, appObjects: AppObjectRepo): ToolEntity<ToolTypes> | undefined;
+    abstract setupFromData(data: ToolData): void;
+    static get(id: string, appObjects: AppObjectRepo): ToolEntity | undefined;
 }
-export declare function makeToolEntity<ToolTypes>(appObject: AppObject): ToolEntity<ToolTypes>;
+export declare function makeToolEntity(appObject: AppObject): ToolEntity;

package/lib/Components/Tools/Entities/ToolEntity.js

@@ -13,8 +13,7 @@ var ToolState;
 class ToolEntity extends AppObjectEntity_1.AppObjectEntity {
     static get(id, appObjects) {
         var _a;
-        return (_a = appObjects
-            .get(id)) === null || _a === void 0 ? void 0 : _a.getComponent(ToolEntity.type);
+        return (_a = appObjects.get(id)) === null || _a === void 0 ? void 0 : _a.getComponent(ToolEntity.type);
     }
 }
 exports.ToolEntity = ToolEntity;