@vived/app 4.22.0 → 4.24.0

package/lib/Components/Label/UC/SetCustomLabelUC.d.ts

@@ -1,7 +1,7 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
 export declare class SetCustomLabelUC extends AppObjectUC {
     static readonly type = "SetCustomLabelUC";
-    private label?;
+    private get label();
     setCustomLabel: (customLabel: string) => void;
     constructor(appObject: AppObject);
     static get(appObj: AppObject): SetCustomLabelUC | undefined;

package/lib/Components/Label/UC/SetCustomLabelUC.js

@@ -18,10 +18,9 @@ class SetCustomLabelUC extends AppObject_1.AppObjectUC {
             new SetCustomLabelUndoRedo_1.SetCustomLabelUndoRedo(prevLabel, customLabel, this.appObject);
             Dispatcher_1.dispatchStateChange(this.appObjects);
         };
-        this.label = appObject.getComponent(Entities_1.Label.type);
-        if (!this.label) {
-            this.warn("SetCustomLabelUC has been added to an App Object that does not have a Label Entity. Add an Entity before adding the UC");
-        }
+    }
+    get label() {
+        return this.getCachedLocalComponent(Entities_1.LabelEntity.type);
     }
     static get(appObj) {
         return appObj.getComponent(this.type);

package/lib/Components/Label/UC/SetCustomLabelUndoRedo.js

@@ -21,7 +21,7 @@ class SetCustomLabelUndoRedo {
             this.label.custom = this.curLabel;
             Dispatcher_1.dispatchStateChange(this.appObject.appObjectRepo);
         };
-        this.label = Entities_1.Label.get(appObject);
+        this.label = Entities_1.LabelEntity.get(appObject);
         if (!this.label) {
             appObject.appObjectRepo.submitWarning("SetCustomLabelUndoRedo", "Unable to find LabelEntity");
             return;

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

@@ -1,4 +1,6 @@
+export * from "./Adapters";
+export * from "./Controller";
 export * from "./Entities";
+export * from "./Mocks";
 export * from "./PM";
-export * from "./Controller";
 export * from "./UC";

package/lib/Components/Label/index.js

@@ -10,7 +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("./Controller"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
-__exportStar(require("./Controller"), exports);
 __exportStar(require("./UC"), exports);

package/lib/Components/Landmarks/Entities/LandmarkEntity.d.ts

@@ -1,7 +1,7 @@
 import { AppObject, AppObjectEntity } from "../../../AppObject";
 import { Quaternion, QuaternionDTO, Vector3, Vector3DTO } from "../../../ValueObjects";
 import { Hideable } from "../../Hideable";
-import { Label } from "../../Label";
+import { LabelEntity } from "../../Label";
 import { OverlayColor, OverlayColorEnums } from "../../OverlayColor";
 import { Selectable } from "../../Selection";
 import { Transform3D } from "../../Transform3D";
@@ -25,7 +25,7 @@ export declare abstract class LandmarkEntity extends AppObjectEntity {
     abstract get size(): number;
     abstract set size(val: number);
     abstract readonly parentID: string;
-    abstract get label(): Label;
+    abstract get label(): LabelEntity;
     abstract get transform(): Transform3D;
     abstract get hideable(): Hideable;
     abstract get overlayColor(): OverlayColor;

package/lib/Components/Landmarks/Entities/LandmarkEntity.js

@@ -28,7 +28,7 @@ class LandmarkImp extends LandmarkEntity {
         super(appObject, LandmarkEntity.type);
         this.memoizedSize = new Entities_1.MemoizedNumber(1, this.notifyOnChange);
         this.parentID = parentID;
-        this._label = Label_1.Label.addIfMissing(appObject);
+        this._label = Label_1.LabelEntity.addIfMissing(appObject);
         this._label.addChangeObserver(this.notifyOnChange);
         this._transform = Transform3D_1.Transform3D.addIfMissing(appObject);
         this._transform.addChangeObserver(this.notifyOnChange);

package/lib/Components/Landmarks/Mocks/MockLandmark.d.ts

@@ -1,7 +1,7 @@
 import { AppObject } from "../../../AppObject";
 import { Quaternion, Vector3 } from "../../../ValueObjects";
 import { Hideable } from "../../Hideable";
-import { Label } from "../../Label";
+import { LabelEntity } from "../../Label";
 import { OverlayColor } from "../../OverlayColor";
 import { Selectable } from "../../Selection";
 import { Transform3D } from "../../Transform3D";
@@ -12,7 +12,7 @@ export declare class MockLandmark extends LandmarkEntity {
     get size(): number;
     set size(val: number);
     parentID: string;
-    get label(): Label;
+    get label(): LabelEntity;
     get transform(): Transform3D;
     get hideable(): Hideable;
     get overlayColor(): OverlayColor;

package/lib/Components/Landmarks/UseCases/AddLandmarkUC.js

@@ -28,7 +28,7 @@ class AddLandmarkUCImp extends AddLandmarkUC {
             this.warn("Transform3D App Object has not been added. Add to the Transform3D App Object before Adding Landmark.");
             return;
         }
-        this.label = appObject.getComponent(Label_1.Label.type); // Not required
+        this.label = appObject.getComponent(Label_1.LabelEntity.type); // Not required
     }
     addFromData(data) {
         if (!this.landmarkRepo || !this.transform3D)

package/lib/Components/Landmarks/UseCases/SerializeLandmarks.d.ts

@@ -1,5 +1,5 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
-import { SerializedSystem } from "../../StateMachine";
+import { SerializedSystem } from "../../StateMachine/Entities";
 import { LandmarkDTO } from "../Entities/LandmarkEntity";
 export declare class SerializeLandmarks extends AppObjectUC implements SerializedSystem {
     static readonly type = "SerializeLandmarks";

package/lib/Components/Landmarks/UseCases/SerializeLandmarks.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerializeLandmarks = void 0;
 const AppObject_1 = require("../../../AppObject");
-const Enablement_1 = require("../../Enablement");
-const StateMachine_1 = require("../../StateMachine");
+const Entities_1 = require("../../Enablement/Entities");
+const Entities_2 = require("../../StateMachine/Entities");
 const LandmarkEntity_1 = require("../Entities/LandmarkEntity");
 const LandmarkGlobals_1 = require("../Entities/LandmarkGlobals");
 const LandmarkRepo_1 = require("../Entities/LandmarkRepo");
@@ -13,7 +13,7 @@ class SerializeLandmarks extends AppObject_1.AppObjectUC {
         super(appObj, SerializeLandmarks.type);
         this.name = "landmarks";
         this.seriliziationVersion = 1;
-        const stateMachine = this.appObjects.getSingleton(StateMachine_1.StateMachineEntity.type);
+        const stateMachine = this.appObjects.getSingleton(Entities_2.StateMachineEntity.type);
         if (stateMachine) {
             stateMachine.registerSerializedSystem(this);
         }
@@ -25,7 +25,7 @@ class SerializeLandmarks extends AppObject_1.AppObjectUC {
         const repos = this.appObjects.getAllComponents(LandmarkRepo_1.LandmarkRepo.type);
         const landmarks = [];
         repos.forEach((repo) => {
-            const enabledEntity = repo.appObject.getComponent(Enablement_1.EnablablementEntity.type);
+            const enabledEntity = repo.appObject.getComponent(Entities_1.EnablementEntity.type);
             let enabled = false;
             if (enabledEntity) {
                 enabled = enabledEntity.enabled;

package/lib/Components/Landmarks/UseCases/TryAddNewLandmarkUC.js

@@ -46,7 +46,7 @@ class TryAddNewLandmarkUCImp extends TryAddNewLandmarkUC {
             newLandmark.size = globals.lastSize;
             newLandmark.overlayColor.overlayColor = globals.lastColor;
         }
-        const label = this.appObjects.getAppObjectComponent(pickAO, Label_1.Label.type);
+        const label = this.appObjects.getAppObjectComponent(pickAO, Label_1.LabelEntity.type);
         newLandmark.label.default = label ? label.default : "";
         newLandmark.selectable.selected = true;
         new AddLandmarkUndoRedo_1.AddLandmarkUndoRedo(newLandmark.data, this.appObject);

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

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

package/lib/Components/OverlayColor/Adapters/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("./overlayColorAdapter"), exports);

package/lib/Components/OverlayColor/Adapters/overlayColorAdapter.d.ts

@@ -0,0 +1,3 @@
+import { PmAdapter } from "../../../Types";
+import { OverlayColorEnums } from "../Entities";
+export declare const overlayColorAdapter: PmAdapter<OverlayColorEnums>;

package/lib/Components/OverlayColor/Adapters/overlayColorAdapter.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.overlayColorAdapter = void 0;
+const Entities_1 = require("../Entities");
+const OverlayColorPM_1 = require("../PM/OverlayColorPM");
+exports.overlayColorAdapter = {
+    defaultVM: Entities_1.OverlayColorEnums.NONE,
+    subscribe: (id, appObjects, setVM) => {
+        const pm = OverlayColorPM_1.OverlayColorPM.getForID(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("overlayColorAdapter", "Unable to find OverlayColorPM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (id, appObjects, setVM) => {
+        const pm = OverlayColorPM_1.OverlayColorPM.getForID(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("overlayColorAdapter", "Unable to find OverlayColorPM");
+            return;
+        }
+        pm.removeView(setVM);
+    },
+};

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

@@ -1,4 +1,4 @@
-import { AppObject, AppObjectEntity } from "../../../AppObject";
+import { AppObject, AppObjectEntity, AppObjectRepo } from "../../../AppObject";
 import { Color } from "../../../ValueObjects";
 export declare enum OverlayColorEnums {
     GREEN = "Green",
@@ -18,6 +18,7 @@ export declare class OverlayColor extends AppObjectEntity {
     static overlayColorEnumToColor(colorEnum: OverlayColorEnums): Color | undefined;
     static addIfMissing(appObj: AppObject): OverlayColor;
     static get(appObj: AppObject): OverlayColor | undefined;
+    static getByID(id: string, appObjects: AppObjectRepo): OverlayColor | undefined;
     private memoizedColor;
     get overlayColor(): OverlayColorEnums;
     set overlayColor(val: OverlayColorEnums);

package/lib/Components/OverlayColor/Entities/OverlayColor.js

@@ -37,6 +37,10 @@ class OverlayColor extends AppObject_1.AppObjectEntity {
     static get(appObj) {
         return appObj.getComponent(this.type);
     }
+    static getByID(id, appObjects) {
+        var _a;
+        return (_a = appObjects.get(id)) === null || _a === void 0 ? void 0 : _a.getComponent(this.type);
+    }
     get overlayColor() {
         return this.memoizedColor.val;
     }

package/lib/Components/OverlayColor/Mocks/OverlayColorPMMock.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="jest" />
+import { AppObject } from "../../../AppObject";
+import { OverlayColorPM } from "../PM/OverlayColorPM";
+export declare class OverlayColorPMMock extends OverlayColorPM {
+    vmsAreEqual: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}

package/lib/Components/OverlayColor/Mocks/OverlayColorPMMock.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OverlayColorPMMock = void 0;
+const OverlayColorPM_1 = require("../PM/OverlayColorPM");
+class OverlayColorPMMock extends OverlayColorPM_1.OverlayColorPM {
+    constructor(appObject) {
+        super(appObject, OverlayColorPM_1.OverlayColorPM.type);
+        this.vmsAreEqual = jest.fn();
+    }
+}
+exports.OverlayColorPMMock = OverlayColorPMMock;

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

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

package/lib/Components/OverlayColor/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("./OverlayColorPMMock"), exports);

package/lib/Components/OverlayColor/PM/OverlayColorPM.d.ts

@@ -2,12 +2,8 @@ import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectPM } from "../../../AppObject/AppObjectPM";
 import { AppObjectRepo } from "../../../AppObject/AppObjectRepo";
 import { OverlayColorEnums } from "../Entities/OverlayColor";
-export declare class OverlayColorPM extends AppObjectPM<OverlayColorEnums> {
+export declare abstract class OverlayColorPM extends AppObjectPM<OverlayColorEnums> {
     static readonly type = "OverlayColorPM";
-    private overlayColor?;
-    onColorChange: () => void;
-    vmsAreEqual(a: OverlayColorEnums, b: OverlayColorEnums): boolean;
-    dispose: () => void;
-    constructor(appObject: AppObject);
     static getForID(appObjID: string, appObjects: AppObjectRepo): OverlayColorPM | undefined;
 }
+export declare function makeOverlayColorPM(appObject: AppObject): OverlayColorPM;

package/lib/Components/OverlayColor/PM/OverlayColorPM.js

@@ -1,9 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OverlayColorPM = void 0;
+exports.makeOverlayColorPM = exports.OverlayColorPM = void 0;
 const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
 const OverlayColor_1 = require("../Entities/OverlayColor");
 class OverlayColorPM extends AppObjectPM_1.AppObjectPM {
+    static getForID(appObjID, appObjects) {
+        const appObj = appObjects.get(appObjID);
+        if (appObj === undefined) {
+            return undefined;
+        }
+        return appObj.getComponent(OverlayColorPM.type);
+    }
+}
+exports.OverlayColorPM = OverlayColorPM;
+OverlayColorPM.type = "OverlayColorPM";
+function makeOverlayColorPM(appObject) {
+    return new OverlayColorPMImp(appObject);
+}
+exports.makeOverlayColorPM = makeOverlayColorPM;
+class OverlayColorPMImp extends OverlayColorPM {
     constructor(appObject) {
         super(appObject, OverlayColorPM.type);
         this.onColorChange = () => {
@@ -17,9 +32,8 @@ class OverlayColorPM extends AppObjectPM_1.AppObjectPM {
             (_a = this.overlayColor) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onColorChange);
             (_b = this.overlayColor) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
-        this.overlayColor = OverlayColor_1.OverlayColor.get(appObject);
         if (!this.overlayColor) {
-            this.warn("[OverlayColorPM] Unable to find OverlayColor Entity");
+            this.error("[OverlayColorPM] Unable to find OverlayColor Entity");
             return;
         }
         else {
@@ -28,16 +42,10 @@ class OverlayColorPM extends AppObjectPM_1.AppObjectPM {
             this.onColorChange();
         }
     }
+    get overlayColor() {
+        return this.getCachedLocalComponent(OverlayColor_1.OverlayColor.type);
+    }
     vmsAreEqual(a, b) {
         return a === b;
     }
-    static getForID(appObjID, appObjects) {
-        const appObj = appObjects.get(appObjID);
-        if (appObj === undefined) {
-            return undefined;
-        }
-        return appObj.getComponent(OverlayColorPM.type);
-    }
 }
-exports.OverlayColorPM = OverlayColorPM;
-OverlayColorPM.type = "OverlayColorPM";

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

@@ -1,4 +1,6 @@
+export * from "./Adapters";
+export * from "./Controller";
 export * from "./Entities";
+export * from "./Mocks";
 export * from "./PM";
-export * from "./Controller";
 export * from "./UC";

package/lib/Components/OverlayColor/index.js

@@ -10,7 +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("./Controller"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
-__exportStar(require("./Controller"), exports);
 __exportStar(require("./UC"), exports);

package/lib/Components/RequestHandler/UC/SetAppStateUC.d.ts

@@ -1,12 +1,19 @@
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectUC } from "../../../AppObject/AppObjectUC";
 import { RequestHandler } from "../Entities";
-export declare type SetAppStateAction = (finalState: string, duration?: number) => void;
+export declare type SetAppStateAction = (data: StartAppPayload) => void;
 export declare abstract class SetAppStateBaseUC extends AppObjectUC implements RequestHandler {
     static readonly type = "SetAppStateBaseUC";
     readonly requestType = "SET_APP_STATE";
-    readonly payloadVersion = 2;
+    readonly payloadVersion = 3;
     abstract action: SetAppStateAction;
     abstract handleRequest: (version: number, payload?: unknown) => void;
 }
 export declare function makeSetAppStateUC(appObject: AppObject): SetAppStateBaseUC;
+export declare type StartAppPayload = {
+    finalState?: object;
+    hideNavigation: boolean;
+    hasNextSlide: boolean;
+    hasPreviousSlide: boolean;
+    duration?: number;
+};

package/lib/Components/RequestHandler/UC/SetAppStateUC.js

@@ -2,16 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSetAppStateUC = exports.SetAppStateBaseUC = void 0;
 const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
-const App_1 = require("../../App");
-const Dispatcher_1 = require("../../Dispatcher");
-const StateMachine_1 = require("../../StateMachine");
-const UndoRedo_1 = require("../../UndoRedo");
-const Entities_1 = require("../Entities");
+const Entity_1 = require("../../App/Entity");
+const Entities_1 = require("../../StateMachine/Entities");
+const Entities_2 = require("../../UndoRedo/Entities");
+const Entities_3 = require("../Entities");
 class SetAppStateBaseUC extends AppObjectUC_1.AppObjectUC {
     constructor() {
         super(...arguments);
         this.requestType = "SET_APP_STATE";
-        this.payloadVersion = 2;
+        this.payloadVersion = 3;
     }
 }
 exports.SetAppStateBaseUC = SetAppStateBaseUC;
@@ -23,45 +22,54 @@ exports.makeSetAppStateUC = makeSetAppStateUC;
 class SetAppStateBaseUCImp extends SetAppStateBaseUC {
     constructor(appObject) {
         super(appObject, SetAppStateBaseUC.type);
-        this.action = (finalState, duration) => {
-            var _a, _b;
-            const appObjects = this.appObject.appObjectRepo;
-            const baseApp = App_1.BaseAppState.get(appObjects);
-            if (!baseApp) {
-                this.warn("Unable to find BaseAppState");
+        this.action = (data) => {
+            var _a;
+            if (!this.stateMachine || !this.baseApp) {
+                this.error("Missing component");
                 return;
             }
-            const stateMachine = StateMachine_1.StateMachineEntity.get(appObjects);
-            if (!stateMachine) {
-                this.warn("Unable to find AppState");
-                return;
+            const { finalState, hasNextSlide, hasPreviousSlide, hideNavigation, duration, } = data;
+            if (finalState) {
+                this.stateMachine.setSerializedStates(finalState, duration !== null && duration !== void 0 ? duration : 0);
+            }
+            else {
+                this.stateMachine.setDefaultState(duration !== null && duration !== void 0 ? duration : 0);
             }
-            stateMachine.applySerializedStatesString(finalState, duration);
-            baseApp.isReviewing = false;
-            UndoRedo_1.clearUndoStack(appObjects);
-            (_a = Dispatcher_1.HasNextStateUC.get(appObjects)) === null || _a === void 0 ? void 0 : _a.doDispatch().then((hasNextState) => (baseApp.hasNextState = hasNextState));
-            (_b = Dispatcher_1.HasPreviousStateUC.get(appObjects)) === null || _b === void 0 ? void 0 : _b.doDispatch().then((hasPreviousState) => (baseApp.hasPreviousState = hasPreviousState));
+            this.baseApp.isReviewing = false;
+            this.baseApp.hasNextState = hasNextSlide;
+            this.baseApp.hasPreviousState = hasPreviousSlide;
+            this.baseApp.hideSlideNavigation = hideNavigation;
+            (_a = this.undoRedo) === null || _a === void 0 ? void 0 : _a.clearStack();
         };
         this.handleRequest = (version, payload) => {
             if (version === this.payloadVersion) {
-                const { finalState, duration } = this.castPayload(payload);
-                this.action(finalState, duration);
+                const data = this.castPayload(payload);
+                this.action(data);
             }
             else {
-                throw new Entities_1.UnsupportedRequestVersion(this.requestType, version);
+                throw new Entities_3.UnsupportedRequestVersion(this.requestType, version);
             }
         };
-        const handler = appObject.getComponent(Entities_1.AppHandlerEntity.type);
+        const handler = appObject.getComponent(Entities_3.AppHandlerEntity.type);
         if (!handler) {
             this.warn("SetAppStateBaseUC has been added to an app object that does not have an AppHandlerEntity. Add one first");
             return;
         }
         handler.registerRequestHandler(this);
     }
+    get baseApp() {
+        return this.getCachedSingleton(Entity_1.BaseAppState.type);
+    }
+    get stateMachine() {
+        return this.getCachedSingleton(Entities_1.StateMachineEntity.type);
+    }
+    get undoRedo() {
+        return this.getCachedSingleton(Entities_2.UndoRedoEntity.type);
+    }
     castPayload(payload) {
         const castPayload = payload;
-        if (castPayload.finalState === undefined) {
-            throw new Entities_1.UnableToParsePayload(this.requestType, 1, JSON.stringify(payload));
+        if (castPayload.hasNextSlide === undefined) {
+            throw new Entities_3.UnableToParsePayload(this.requestType, 1, JSON.stringify(payload));
         }
         return castPayload;
     }

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

@@ -0,0 +1,2 @@
+export * from "./selectableStateAdapter";
+export * from "./selectedObjectAdapter";

package/lib/Components/Selection/Adapters/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("./selectableStateAdapter"), exports);
+__exportStar(require("./selectedObjectAdapter"), exports);

package/lib/Components/Selection/Adapters/selectableStateAdapter.d.ts

@@ -0,0 +1,3 @@
+import { PmAdapter } from "../../../Types";
+import { SelectableStateVM } from "../PM/SelectableStatePM";
+export declare const selectableStateAdapter: PmAdapter<SelectableStateVM>;

package/lib/Components/Selection/Adapters/selectableStateAdapter.js

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

package/lib/Components/Selection/Adapters/selectedObjectAdapter.d.ts

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

package/lib/Components/Selection/Adapters/selectedObjectAdapter.js

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

package/lib/Components/Selection/Controller/MouseHoverOnAppObject.js

@@ -21,7 +21,7 @@ class MouseHoverOnAppObject extends AppObjectController_1.AppObjectController {
             if (!this.allow(e))
                 return;
             const ray = Babylon_1.pixelToSceneRay(e.position, this.appObjects);
-            this.hoverUC.tryHoverSceneObject(ray);
+            this.hoverUC.tryHoverAppObject(ray);
         };
         this.zSpaceEntity = ZSpaceEntity_1.ZSpaceEntity.get(this.appObjects);
         this.hoverUC = appObject.getComponent(HoverAppObjectUC_1.HoverAppObjectUC.type);

package/lib/Components/Selection/Controller/MousePressOnAppObject.js

@@ -34,7 +34,7 @@ class MousePressOnAppObject extends AppObjectController_1.AppObjectController {
             this.endPosition = this.startPosition;
             this.isPressed = true;
             const ray = Babylon_1.pixelToSceneRay(e.position, this.appObjects);
-            this.pressedID = (_a = this.pressUC) === null || _a === void 0 ? void 0 : _a.tryPressSceneObject(ray);
+            this.pressedID = (_a = this.pressUC) === null || _a === void 0 ? void 0 : _a.tryPressAppObject(ray);
         };
         this.onUp = (e) => {
             this.isPressed = false;
@@ -45,7 +45,7 @@ class MousePressOnAppObject extends AppObjectController_1.AppObjectController {
                 return;
             }
             // Set pressedID to null
-            this.pressUC.pressSceneObject(this.pressedID, this.isPressed);
+            this.pressUC.pressAppObject(this.pressedID, this.isPressed);
         };
         this.onMove = (e) => {
             if (!this.pressUC) {
@@ -57,7 +57,7 @@ class MousePressOnAppObject extends AppObjectController_1.AppObjectController {
                     .magnitued;
                 if (movement > MousePressOnAppObject.maxTapDistancePx) {
                     // Set pressedID to null
-                    this.pressUC.pressSceneObject(null, this.isPressed);
+                    this.pressUC.pressAppObject(null, this.isPressed);
                 }
             }
         };

package/lib/Components/Selection/Controller/MouseSelectAppObject.js

@@ -25,7 +25,7 @@ class MouseSelectAppObject extends AppObjectController_1.AppObjectController {
             if (!this.allow(e))
                 return;
             const ray = Babylon_1.pixelToSceneRay(e.position, this.appObjects);
-            this.selectUC.trySelectSceneObject(ray);
+            this.selectUC.trySelectAppObject(ray);
         };
         this.zSpaceEntity = ZSpaceEntity_1.ZSpaceEntity.get(this.appObjects);
         this.selectUC = appObject.getComponent(SelectAppObjectUC_1.SelectAppObjectUC.type);

package/lib/Components/Selection/Controller/{StylusHoverOnAppObject.d.ts → StylusHoverOnAppObjectSC.d.ts}

@@ -1,8 +1,8 @@
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectController } from "../../../AppObject/AppObjectController";
-import { ZSpaceStylusController } from "../../zSpace/Entities/ZSpaceStylusEntity";
-export declare class StylusHoverOnAppObject extends AppObjectController implements ZSpaceStylusController {
-    static readonly type = "StylusHoverOnAppObject";
+import { StylusController } from "../../Stylus";
+export declare class StylusHoverOnAppObjectSC extends AppObjectController implements StylusController {
+    static readonly type = "StylusHoverOnAppObjectSC";
     private stylus?;
     private hoverUC?;
     allow: () => boolean;