@vived/app 4.22.0 → 4.24.0

package/lib/Components/HoverLabel/PM/AllowHoverLabelPM.js

@@ -1,44 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultAllowHoverLabelVM = exports.AllowHoverLabelPM = void 0;
+exports.makeAllowHoverLabelPM = exports.AllowHoverLabelPM = void 0;
 const AppObject_1 = require("../../../AppObject");
-const HoverLabel_1 = require("../Entities/HoverLabel");
+const HoverLabelEntity_1 = require("../Entities/HoverLabelEntity");
 class AllowHoverLabelPM extends AppObject_1.AppObjectPM {
+}
+exports.AllowHoverLabelPM = AllowHoverLabelPM;
+AllowHoverLabelPM.type = "AllowHoverLabelPM";
+AllowHoverLabelPM.get = (appObjects) => AppObject_1.getSingletonComponent(AllowHoverLabelPM.type, appObjects);
+function makeAllowHoverLabelPM(appObject) {
+    return new AllowHoverLabelPMImp(appObject);
+}
+exports.makeAllowHoverLabelPM = makeAllowHoverLabelPM;
+class AllowHoverLabelPMImp extends AllowHoverLabelPM {
     constructor(appObject) {
+        var _a;
         super(appObject, AllowHoverLabelPM.type);
         this.onEntityChange = () => {
             if (!this.hoverLabelEntity)
                 return;
             this.doUpdateView(this.hoverLabelEntity.allowHoverLabel);
         };
-        this.dispose = () => {
-            var _a, _b;
-            super.dispose();
-            (_a = this.hoverLabelEntity) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEntityChange);
-            (_b = this.hoverLabelEntity) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
-        };
-        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
-        if (!this.hoverLabelEntity) {
-            this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
-            return;
-        }
-        this.hoverLabelEntity.addChangeObserver(this.onEntityChange);
-        this.hoverLabelEntity.addOnDisposeObserver(() => this.dispose());
+        (_a = this.hoverLabelEntity) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onEntityChange);
         this.onEntityChange();
+        this.appObjects.registerSingleton(this);
     }
-    static addIfMissing(appObj) {
-        const existing = appObj.getComponent(AllowHoverLabelPM.type);
-        if (existing) {
-            return existing;
-        }
-        else {
-            return new AllowHoverLabelPM(appObj);
-        }
+    get hoverLabelEntity() {
+        return this.getCachedSingleton(HoverLabelEntity_1.HoverLabelEntity.type);
     }
     vmsAreEqual(a, b) {
         return a === b;
     }
 }
-exports.AllowHoverLabelPM = AllowHoverLabelPM;
-AllowHoverLabelPM.type = "AllowHoverLabelPM";
-exports.defaultAllowHoverLabelVM = true;

package/lib/Components/HoverLabel/PM/ScreenHoverLabelPM.d.ts

@@ -7,13 +7,9 @@ export interface ScreenHoverLabelVM {
         y: number;
     };
 }
-export declare class ScreenHoverLabelPM extends AppObjectPM<ScreenHoverLabelVM> {
+export declare abstract class ScreenHoverLabelPM extends AppObjectPM<ScreenHoverLabelVM> {
     static readonly type = "ScreenHoverLabelPM";
     static get(appObjects: AppObjectRepo): ScreenHoverLabelPM | undefined;
-    private hoverLabelEntity?;
-    vmsAreEqual(a: ScreenHoverLabelVM, b: ScreenHoverLabelVM): boolean;
-    onEntityChange: () => void;
-    dispose: () => void;
-    constructor(appObject: AppObject);
 }
+export declare function makeScreenHoverLabelPM(appObject: AppObject): ScreenHoverLabelPM;
 export declare const defaultScreenHoverLabelVM: ScreenHoverLabelVM;

package/lib/Components/HoverLabel/PM/ScreenHoverLabelPM.js

@@ -1,10 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultScreenHoverLabelVM = exports.ScreenHoverLabelPM = void 0;
+exports.defaultScreenHoverLabelVM = exports.makeScreenHoverLabelPM = exports.ScreenHoverLabelPM = void 0;
 const AppObject_1 = require("../../../AppObject");
-const HoverLabel_1 = require("../Entities/HoverLabel");
+const HoverLabelEntity_1 = require("../Entities/HoverLabelEntity");
 class ScreenHoverLabelPM extends AppObject_1.AppObjectPM {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(ScreenHoverLabelPM.type, appObjects);
+    }
+}
+exports.ScreenHoverLabelPM = ScreenHoverLabelPM;
+ScreenHoverLabelPM.type = "ScreenHoverLabelPM";
+function makeScreenHoverLabelPM(appObject) {
+    return new ScreenHoverLabelPMImp(appObject);
+}
+exports.makeScreenHoverLabelPM = makeScreenHoverLabelPM;
+class ScreenHoverLabelPMImp extends ScreenHoverLabelPM {
     constructor(appObject) {
+        var _a;
         super(appObject, ScreenHoverLabelPM.type);
         this.onEntityChange = () => {
             if (!this.hoverLabelEntity)
@@ -14,7 +26,7 @@ class ScreenHoverLabelPM extends AppObject_1.AppObjectPM {
                 text: "",
                 screenPosition: { x: 0, y: 0 },
             };
-            if (this.hoverLabelEntity.mode === HoverLabel_1.HoverLabelMode.SCREEN &&
+            if (this.hoverLabelEntity.mode === HoverLabelEntity_1.HoverLabelMode.SCREEN &&
                 this.hoverLabelEntity.show) {
                 vm.show = true;
                 vm.text = this.hoverLabelEntity.label;
@@ -23,24 +35,12 @@ class ScreenHoverLabelPM extends AppObject_1.AppObjectPM {
             }
             this.doUpdateView(vm);
         };
-        this.dispose = () => {
-            var _a, _b;
-            super.dispose();
-            (_a = this.hoverLabelEntity) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEntityChange);
-            (_b = this.hoverLabelEntity) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
-        };
-        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
-        if (!this.hoverLabelEntity) {
-            this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
-            return;
-        }
-        this.hoverLabelEntity.addChangeObserver(this.onEntityChange);
-        this.hoverLabelEntity.addOnDisposeObserver(() => this.dispose());
+        (_a = this.hoverLabelEntity) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onEntityChange);
         this.onEntityChange();
         this.appObjects.registerSingleton(this);
     }
-    static get(appObjects) {
-        return AppObject_1.getSingletonComponent(ScreenHoverLabelPM.type, appObjects);
+    get hoverLabelEntity() {
+        return this.getCachedSingleton(HoverLabelEntity_1.HoverLabelEntity.type);
     }
     vmsAreEqual(a, b) {
         if (a.show !== b.show)
@@ -53,8 +53,6 @@ class ScreenHoverLabelPM extends AppObject_1.AppObjectPM {
         return true;
     }
 }
-exports.ScreenHoverLabelPM = ScreenHoverLabelPM;
-ScreenHoverLabelPM.type = "ScreenHoverLabelPM";
 exports.defaultScreenHoverLabelVM = {
     show: false,
     text: "",

package/lib/Components/HoverLabel/PM/WorldHoverLabelPM.d.ts

@@ -3,13 +3,9 @@ export interface WorldHoverLabelVM {
     show: boolean;
     text: string;
 }
-export declare class WorldHoverLabelPM extends AppObjectPM<WorldHoverLabelVM> {
+export declare abstract class WorldHoverLabelPM extends AppObjectPM<WorldHoverLabelVM> {
     static readonly type = "WorldHoverLabelPM";
     static get(appObjects: AppObjectRepo): WorldHoverLabelPM | undefined;
-    private hoverLabelEntity?;
-    vmsAreEqual(a: WorldHoverLabelVM, b: WorldHoverLabelVM): boolean;
-    onEntityChange: () => void;
-    dispose: () => void;
-    constructor(appObject: AppObject);
 }
+export declare function makeWorldHoverLabelPM(appObject: AppObject): WorldHoverLabelPM;
 export declare const defaultWorldHoverLabelVM: WorldHoverLabelVM;

package/lib/Components/HoverLabel/PM/WorldHoverLabelPM.js

@@ -1,10 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultWorldHoverLabelVM = exports.WorldHoverLabelPM = void 0;
+exports.defaultWorldHoverLabelVM = exports.makeWorldHoverLabelPM = exports.WorldHoverLabelPM = void 0;
 const AppObject_1 = require("../../../AppObject");
-const HoverLabel_1 = require("../Entities/HoverLabel");
+const HoverLabelEntity_1 = require("../Entities/HoverLabelEntity");
 class WorldHoverLabelPM extends AppObject_1.AppObjectPM {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(WorldHoverLabelPM.type, appObjects);
+    }
+}
+exports.WorldHoverLabelPM = WorldHoverLabelPM;
+WorldHoverLabelPM.type = "WorldHoverLabelPM";
+function makeWorldHoverLabelPM(appObject) {
+    return new WorldHoverLabelPMImp(appObject);
+}
+exports.makeWorldHoverLabelPM = makeWorldHoverLabelPM;
+class WorldHoverLabelPMImp extends WorldHoverLabelPM {
     constructor(appObject) {
+        var _a;
         super(appObject, WorldHoverLabelPM.type);
         this.onEntityChange = () => {
             if (!this.hoverLabelEntity)
@@ -13,31 +25,19 @@ class WorldHoverLabelPM extends AppObject_1.AppObjectPM {
                 show: false,
                 text: "",
             };
-            if (this.hoverLabelEntity.mode === HoverLabel_1.HoverLabelMode.WORLD &&
+            if (this.hoverLabelEntity.mode === HoverLabelEntity_1.HoverLabelMode.WORLD &&
                 this.hoverLabelEntity.show) {
                 vm.show = true;
                 vm.text = this.hoverLabelEntity.label;
             }
             this.doUpdateView(vm);
         };
-        this.dispose = () => {
-            var _a, _b;
-            super.dispose();
-            (_a = this.hoverLabelEntity) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onEntityChange);
-            (_b = this.hoverLabelEntity) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
-        };
-        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
-        if (!this.hoverLabelEntity) {
-            this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
-            return;
-        }
-        this.hoverLabelEntity.addChangeObserver(this.onEntityChange);
-        this.hoverLabelEntity.addOnDisposeObserver(() => this.dispose());
+        (_a = this.hoverLabelEntity) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onEntityChange);
         this.onEntityChange();
         this.appObjects.registerSingleton(this);
     }
-    static get(appObjects) {
-        return AppObject_1.getSingletonComponent(WorldHoverLabelPM.type, appObjects);
+    get hoverLabelEntity() {
+        return this.getCachedSingleton(HoverLabelEntity_1.HoverLabelEntity.type);
     }
     vmsAreEqual(a, b) {
         if (a.show !== b.show)
@@ -47,8 +47,6 @@ class WorldHoverLabelPM extends AppObject_1.AppObjectPM {
         return true;
     }
 }
-exports.WorldHoverLabelPM = WorldHoverLabelPM;
-WorldHoverLabelPM.type = "WorldHoverLabelPM";
 exports.defaultWorldHoverLabelVM = {
     show: false,
     text: "",

package/lib/Components/HoverLabel/UseCases/SerializeAllowHoverLabel.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerializeAllowHoverLabel = void 0;
 const AppObject_1 = require("../../../AppObject");
 const StateMachine_1 = require("../../StateMachine");
-const HoverLabel_1 = require("../Entities/HoverLabel");
+const HoverLabelEntity_1 = require("../Entities/HoverLabelEntity");
 class SerializeAllowHoverLabel extends AppObject_1.AppObjectUC {
     constructor(appObj) {
         super(appObj, SerializeAllowHoverLabel.type);
         this.name = "allowHoverLabel";
         this.seriliziationVersion = 1;
-        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabelEntity_1.HoverLabelEntity.type);
         if (!this.hoverLabelEntity) {
             this.warn("Serializer has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
             return;

package/lib/Components/HoverLabel/UseCases/ToggleAllowHoverLabel.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeToggleAllowHoverLabel = exports.ToggleAllowHoverLabelUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Dispatcher_1 = require("../../Dispatcher");
-const HoverLabel_1 = require("../Entities/HoverLabel");
+const HoverLabelEntity_1 = require("../Entities/HoverLabelEntity");
 class ToggleAllowHoverLabelUC extends AppObject_1.AppObjectUC {
     static get(appObjects) {
         return AppObject_1.getSingletonComponent(ToggleAllowHoverLabelUC.type, appObjects);
@@ -25,7 +25,7 @@ class ToggleAllowHoverLabelIMP extends ToggleAllowHoverLabelUC {
                 .allowHoverLabel;
             Dispatcher_1.dispatchStateChange(this.appObjects);
         };
-        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabelEntity_1.HoverLabelEntity.type);
         if (!this.hoverLabelEntity) {
             this.warn("PM has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
         }

package/lib/Components/HoverLabel/UseCases/TryShowHoverLabel.js

@@ -4,7 +4,7 @@ exports.makeTryShowHoverLabel = exports.TryShowHoverLabel = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Babylon_1 = require("../../Babylon");
 const Label_1 = require("../../Label");
-const HoverLabel_1 = require("../Entities/HoverLabel");
+const HoverLabelEntity_1 = require("../Entities/HoverLabelEntity");
 class TryShowHoverLabel extends AppObject_1.AppObjectUC {
     static get(appObjects) {
         return AppObject_1.getSingletonComponent(TryShowHoverLabel.type, appObjects);
@@ -45,7 +45,7 @@ class TryShowHoverLabelIMP extends TryShowHoverLabel {
                 this.hoverLabelEntity.hideHoverLabel();
             }
         };
-        this.hoverLabelEntity = this.appObject.getComponent(HoverLabel_1.HoverLabelEntity.type);
+        this.hoverLabelEntity = this.appObject.getComponent(HoverLabelEntity_1.HoverLabelEntity.type);
         if (!this.hoverLabelEntity) {
             this.warn("PM has been added to an App Object that does not have a HoverLabelEntity. Add the Entity first");
         }
@@ -63,7 +63,7 @@ class TryShowHoverLabelIMP extends TryShowHoverLabel {
         if (!appObj) {
             return;
         }
-        const label = Label_1.Label.get(appObj);
+        const label = Label_1.LabelEntity.get(appObj);
         if (!label) {
             return;
         }

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

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

package/lib/Components/HoverLabel/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("./Controllers"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
 __exportStar(require("./UseCases"), exports);

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

@@ -1 +1,2 @@
 export * from "./Entities";
+export * from "./Mocks";

package/lib/Components/KeyboardInput/index.js

@@ -11,3 +11,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);

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

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

package/lib/Components/{Landmarks/Mocks → Label/Adapters}/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("./MockLandmark"), exports);
+__exportStar(require("./labelAdapter"), exports);

package/lib/Components/Label/Adapters/labelAdapter.d.ts

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

package/lib/Components/Label/Adapters/labelAdapter.js

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

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

@@ -1,9 +1,10 @@
-import { AppObject, AppObjectEntity } from "../../../AppObject";
+import { AppObject, AppObjectEntity, AppObjectRepo } from "../../../AppObject";
 export declare class Label extends AppObjectEntity {
     static maxLabelLength: number;
     static readonly type = "LABEL";
     static addIfMissing(appObj: AppObject): Label;
     static get(appObj: AppObject): Label | undefined;
+    static getByID(id: string, appObjects: AppObjectRepo): Label | undefined;
     private memoizedDefault;
     get default(): string;
     set default(val: string);

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/{zSpace/Controllers → Label/Mocks}/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("./EmulateStylus"), exports);
+__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;