@vived/app 4.23.0 → 4.25.0

package/lib/Components/Label/Entities/Label.js

@@ -21,6 +21,12 @@ class Label extends AppObject_1.AppObjectEntity {
     static get(appObj) {
         return appObj.getComponent(this.type);
     }
+    static getByID(id, appObjects) {
+        const appObj = appObjects.get(id);
+        if (!appObj)
+            return;
+        return appObj.getComponent(this.type);
+    }
     get default() {
         return this.memoizedDefault.val;
     }

package/lib/Components/Label/Entities/LabelEntity.d.ts

@@ -0,0 +1,16 @@
+import { AppObject, AppObjectEntity, AppObjectRepo } from "../../../AppObject";
+export declare abstract class LabelEntity extends AppObjectEntity {
+    static readonly type = "LabelEntity";
+    abstract get default(): string;
+    abstract set default(val: string);
+    abstract get custom(): string;
+    abstract set custom(val: string);
+    abstract get display(): string;
+    abstract get hasCustomLabel(): boolean;
+    abstract get customLabelValidationMessage(): string | null;
+    abstract customLabelValidator(val: string): string | null;
+    static addIfMissing(appObj: AppObject): LabelEntity;
+    static get(appObj: AppObject): LabelEntity | undefined;
+    static getByID(id: string, appObjects: AppObjectRepo): LabelEntity | undefined;
+}
+export declare function makeLabelEntity(appObject: AppObject): LabelEntity;

package/lib/Components/Label/Entities/LabelEntity.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeLabelEntity = exports.LabelEntity = void 0;
+const AppObject_1 = require("../../../AppObject");
+const Entities_1 = require("../../../Entities");
+class LabelEntity extends AppObject_1.AppObjectEntity {
+    static addIfMissing(appObj) {
+        const existing = appObj.getComponent(this.type);
+        if (existing) {
+            return existing;
+        }
+        else {
+            return makeLabelEntity(appObj);
+        }
+    }
+    static get(appObj) {
+        return appObj.getComponent(this.type);
+    }
+    static getByID(id, appObjects) {
+        const appObj = appObjects.get(id);
+        if (!appObj)
+            return;
+        return appObj.getComponent(this.type);
+    }
+}
+exports.LabelEntity = LabelEntity;
+LabelEntity.type = "LabelEntity";
+function makeLabelEntity(appObject) {
+    return new LabelEntityImp(appObject);
+}
+exports.makeLabelEntity = makeLabelEntity;
+class LabelEntityImp extends LabelEntity {
+    constructor(appObject) {
+        super(appObject, LabelEntity.type);
+        this.memoizedDefault = new Entities_1.MemoizedString("", this.notifyOnChange);
+        this.memoizedCustom = new Entities_1.MemoizedString("", this.notifyOnChange);
+        this.customLabelValidator = (val) => {
+            return null;
+        };
+    }
+    get default() {
+        return this.memoizedDefault.val;
+    }
+    set default(val) {
+        this.memoizedDefault.val = val;
+    }
+    get custom() {
+        return this.memoizedCustom.val;
+    }
+    set custom(val) {
+        this.memoizedCustom.val = val;
+    }
+    get display() {
+        if (this.memoizedCustom.val) {
+            return this.memoizedCustom.val;
+        }
+        else {
+            return this.memoizedDefault.val;
+        }
+    }
+    get hasCustomLabel() {
+        return this.memoizedCustom.val ? true : false;
+    }
+    get customLabelValidationMessage() {
+        return this.customLabelValidator(this.memoizedCustom.val);
+    }
+}

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

@@ -1 +1 @@
-export * from "./Label";
+export * from "./LabelEntity";

package/lib/Components/Label/Entities/index.js

@@ -10,4 +10,4 @@ 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("./Label"), exports);
+__exportStar(require("./LabelEntity"), exports);

package/lib/Components/Label/Mocks/LabelPMMock.d.ts

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

package/lib/Components/Label/Mocks/LabelPMMock.js

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

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

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

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

package/lib/Components/Label/PM/LabelPM.d.ts

@@ -7,13 +7,9 @@ export interface LabelVM {
     hasCustomLabel: boolean;
     displayLabel: string;
 }
-export declare class LabelPM extends AppObjectPM<LabelVM> {
+export declare const defaultLabelVM: LabelVM;
+export declare abstract class LabelPM extends AppObjectPM<LabelVM> {
     static readonly type = "LabelPM";
-    private label?;
-    vmsAreEqual(a: LabelVM, b: LabelVM): boolean;
-    onLabelChange: () => void;
-    dispose: () => void;
-    constructor(appObject: AppObject);
-    static defaultVM: LabelVM;
     static getForID(appObjID: string, appObjects: AppObjectRepo): LabelPM | undefined;
 }
+export declare function makeLabelPM(appObject: AppObject): LabelPM;

package/lib/Components/Label/PM/LabelPM.js

@@ -1,15 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LabelPM = void 0;
+exports.makeLabelPM = exports.LabelPM = exports.defaultLabelVM = void 0;
 const AppObject_1 = require("../../../AppObject");
-const Label_1 = require("../Entities/Label");
+const LabelEntity_1 = require("../Entities/LabelEntity");
+exports.defaultLabelVM = {
+    customLabel: "",
+    defaultLabel: "",
+    displayLabel: "",
+    hasCustomLabel: false,
+    labelValidation: null,
+};
 class LabelPM extends AppObject_1.AppObjectPM {
+    static getForID(appObjID, appObjects) {
+        const appObj = appObjects.get(appObjID);
+        if (appObj === undefined) {
+            return undefined;
+        }
+        return appObj.getComponent(LabelPM.type);
+    }
+}
+exports.LabelPM = LabelPM;
+LabelPM.type = "LabelPM";
+function makeLabelPM(appObject) {
+    return new LabelPMImp(appObject);
+}
+exports.makeLabelPM = makeLabelPM;
+class LabelPMImp extends LabelPM {
     constructor(appObject) {
         super(appObject, LabelPM.type);
         this.onLabelChange = () => {
             if (!this.label)
                 return;
-            const { custom: customLabel, display: displayLabel, hasCustomLabel, labelValidationMessage: labelValidation, default: defaultLabel, } = this.label;
+            const { custom: customLabel, display: displayLabel, hasCustomLabel, customLabelValidationMessage: labelValidation, default: defaultLabel, } = this.label;
             const vm = {
                 customLabel,
                 displayLabel,
@@ -25,7 +47,7 @@ class LabelPM extends AppObject_1.AppObjectPM {
             (_a = this.label) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onLabelChange);
             (_b = this.label) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
-        this.label = Label_1.Label.get(appObject);
+        this.label = LabelEntity_1.LabelEntity.get(appObject);
         if (this.label) {
             this.label.addChangeObserver(this.onLabelChange);
             this.label.addOnDisposeObserver(this.dispose);
@@ -43,20 +65,4 @@ class LabelPM extends AppObject_1.AppObjectPM {
         // Note the rest of the VM is derived from these two values
         return true;
     }
-    static getForID(appObjID, appObjects) {
-        const appObj = appObjects.get(appObjID);
-        if (appObj === undefined) {
-            return undefined;
-        }
-        return appObj.getComponent(LabelPM.type);
-    }
 }
-exports.LabelPM = LabelPM;
-LabelPM.type = "LabelPM";
-LabelPM.defaultVM = {
-    customLabel: "",
-    defaultLabel: "",
-    displayLabel: "",
-    hasCustomLabel: false,
-    labelValidation: null,
-};

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

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

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

@@ -20,10 +20,9 @@ class ClearCustomLabelUC extends AppObject_1.AppObjectUC {
             new ClearCustomLabelUndoRedo_1.ClearCustomLabelUndoRedo(prevLabel, this.appObject);
             Dispatcher_1.dispatchStateChange(this.appObjects);
         };
-        this.label = appObject.getComponent(Entities_1.Label.type);
-        if (!this.label) {
-            this.warn("ClearCustomLabelUC 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/ClearCustomLabelUndoRedo.js

@@ -20,7 +20,7 @@ class ClearCustomLabelUndoRedo {
             this.label.custom = "";
             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("ClearCustomLabelUndoRedo", "Unable to find LabelEntity");
             return;

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";