@vived/app 4.23.0 → 4.25.0

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

@@ -0,0 +1,17 @@
+"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("./HoverAppObjectUCMock"), exports);
+__exportStar(require("./PressAppObjectUCMock"), exports);
+__exportStar(require("./SelectableStatePMMock"), exports);
+__exportStar(require("./SelectAppObjectUCMock"), exports);
+__exportStar(require("./SelectedObjectPMMock"), exports);

package/lib/Components/Selection/PM/SelectableStatePM.d.ts

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectPM } from "../../../AppObject/AppObjectPM";
 export interface SelectableStateVM {
@@ -5,12 +6,9 @@ export interface SelectableStateVM {
     isPressed: boolean;
     isHovered: boolean;
 }
-export declare class SelectableStatePM extends AppObjectPM<SelectableStateVM> {
+export declare const defaultSelectableStateVM: SelectableStateVM;
+export declare abstract class SelectableStatePM extends AppObjectPM<SelectableStateVM> {
     static readonly type = "SelectableStatePM";
-    private selectable?;
-    onSelectionChange: () => void;
-    vmsAreEqual(a: SelectableStateVM, b: SelectableStateVM): boolean;
-    dispose: () => void;
-    constructor(appObject: AppObject);
-    static defaultVM: SelectableStateVM;
+    static get(id: string, appObjects: AppObjectRepo): SelectableStatePM | undefined;
 }
+export declare function makeSelectableStatePM(appObject: AppObject): SelectableStatePM;

package/lib/Components/Selection/PM/SelectableStatePM.js

@@ -1,10 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SelectableStatePM = void 0;
+exports.makeSelectableStatePM = exports.SelectableStatePM = exports.defaultSelectableStateVM = void 0;
 const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
 const Selectable_1 = require("../Entities/Selectable");
+exports.defaultSelectableStateVM = {
+    isHovered: false,
+    isPressed: false,
+    isSelected: false,
+};
 class SelectableStatePM extends AppObjectPM_1.AppObjectPM {
+    static get(id, appObjects) {
+        var _a;
+        return (_a = appObjects
+            .get(id)) === null || _a === void 0 ? void 0 : _a.getComponent(SelectableStatePM.type);
+    }
+}
+exports.SelectableStatePM = SelectableStatePM;
+SelectableStatePM.type = "SelectableStatePM";
+function makeSelectableStatePM(appObject) {
+    return new SelectableStatePMImp(appObject);
+}
+exports.makeSelectableStatePM = makeSelectableStatePM;
+class SelectableStatePMImp extends SelectableStatePM {
     constructor(appObject) {
+        var _a;
         super(appObject, SelectableStatePM.type);
         this.onSelectionChange = () => {
             if (!this.selectable)
@@ -17,21 +36,16 @@ class SelectableStatePM extends AppObjectPM_1.AppObjectPM {
             this.doUpdateView(vm);
         };
         this.dispose = () => {
-            var _a, _b;
+            var _a;
             super.dispose();
             (_a = this.selectable) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onSelectionChange);
-            (_b = this.selectable) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
         };
-        this.selectable = Selectable_1.Selectable.get(appObject);
-        if (!this.selectable) {
-            console.warn("[SelectablePM] App Object does not have a Selectable Entity");
-            this.dispose();
-            return;
-        }
-        this.selectable.addChangeObserver(this.onSelectionChange);
-        this.selectable.addOnDisposeObserver(this.dispose);
+        (_a = this.selectable) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onSelectionChange);
         this.onSelectionChange();
     }
+    get selectable() {
+        return this.getCachedLocalComponent(Selectable_1.Selectable.type);
+    }
     vmsAreEqual(a, b) {
         if (a.isHovered !== b.isHovered)
             return false;
@@ -42,10 +56,3 @@ class SelectableStatePM extends AppObjectPM_1.AppObjectPM {
         return true;
     }
 }
-exports.SelectableStatePM = SelectableStatePM;
-SelectableStatePM.type = "SelectableStatePM";
-SelectableStatePM.defaultVM = {
-    isHovered: false,
-    isPressed: false,
-    isSelected: false,
-};

package/lib/Components/Selection/PM/SelectedObjectPM.d.ts

@@ -1,6 +1,8 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectPM } from "../../../AppObject/AppObjectPM";
 export declare abstract class SelectedObjectPM extends AppObjectPM<string | null> {
     static readonly type = "SelectedObjectPM";
+    static get(appObjects: AppObjectRepo): SelectedObjectPM | undefined;
 }
 export declare function makeSelectedObjectPM(appObj: AppObject): SelectedObjectPM;

package/lib/Components/Selection/PM/SelectedObjectPM.js

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSelectedObjectPM = exports.SelectedObjectPM = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectPM_1 = require("../../../AppObject/AppObjectPM");
 const Selection_1 = require("../Entities/Selection");
 class SelectedObjectPM extends AppObjectPM_1.AppObjectPM {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(SelectedObjectPM.type, appObjects);
+    }
 }
 exports.SelectedObjectPM = SelectedObjectPM;
 SelectedObjectPM.type = "SelectedObjectPM";
@@ -13,27 +17,19 @@ function makeSelectedObjectPM(appObj) {
 exports.makeSelectedObjectPM = makeSelectedObjectPM;
 class SelectedObjectPMImp extends SelectedObjectPM {
     constructor(appObject) {
+        var _a;
         super(appObject, SelectedObjectPM.type);
         this.onSelectionChange = () => {
             if (!this.selection)
                 return;
             this.doUpdateView(this.selection.selectedObjectId);
         };
-        this.dispose = () => {
-            var _a, _b;
-            super.dispose();
-            (_a = this.selection) === null || _a === void 0 ? void 0 : _a.removeChangeObserver(this.onSelectionChange);
-            (_b = this.selection) === null || _b === void 0 ? void 0 : _b.removeOnDisposeObserver(this.dispose);
-        };
-        this.selection = appObject.getComponent(Selection_1.Selection.type);
-        if (!this.selection) {
-            console.warn("[SelectedObjectPM] App Object does not have a Selection Entity");
-            this.dispose();
-            return;
-        }
-        this.selection.addChangeObserver(this.onSelectionChange);
-        this.selection.addOnDisposeObserver(this.dispose);
+        (_a = this.selection) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onSelectionChange);
         this.onSelectionChange();
+        this.appObjects.registerSingleton(this);
+    }
+    get selection() {
+        return this.getCachedSingleton(Selection_1.Selection.type);
     }
     vmsAreEqual(a, b) {
         return a === b;

package/lib/Components/Selection/UC/HoverAppObjectUC.d.ts

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectUC } from "../../../AppObject/AppObjectUC";
 import { ParametricLine } from "../../../ValueObjects/ParametricLine";
@@ -5,7 +6,8 @@ export declare abstract class HoverAppObjectUC extends AppObjectUC {
     static readonly type = "HoverAppObjectUC";
     abstract allowHover(): boolean;
     abstract allowTryHover(): boolean;
-    abstract hoverSceneObject: (id: string, isHovered: boolean) => void;
-    abstract tryHoverSceneObject: (ray: ParametricLine) => void;
+    abstract hoverAppObject: (id: string, isHovered: boolean) => void;
+    abstract tryHoverAppObject: (ray: ParametricLine) => void;
+    static get(appObjects: AppObjectRepo): HoverAppObjectUC | undefined;
 }
 export declare function makeHoverAppObject(appObject: AppObject): HoverAppObjectUC;

package/lib/Components/Selection/UC/HoverAppObjectUC.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeHoverAppObject = exports.HoverAppObjectUC = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
 const Babylon_1 = require("../../Babylon");
 const Selectable_1 = require("../Entities/Selectable");
 const Selection_1 = require("../Entities/Selection");
 class HoverAppObjectUC extends AppObjectUC_1.AppObjectUC {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(HoverAppObjectUC.type, appObjects);
+    }
 }
 exports.HoverAppObjectUC = HoverAppObjectUC;
 HoverAppObjectUC.type = "HoverAppObjectUC";
@@ -22,7 +26,7 @@ class HoverAppObjectUCImp extends HoverAppObjectUC {
         this.allowTryHover = () => {
             return true;
         };
-        this.tryHoverSceneObject = (ray) => {
+        this.tryHoverAppObject = (ray) => {
             if (!this.selection)
                 return;
             if (!this.allowTryHover())
@@ -39,7 +43,7 @@ class HoverAppObjectUCImp extends HoverAppObjectUC {
             }
             this.selection.hoveredObjectId = rayPick.appObjectID;
         };
-        this.hoverSceneObject = (id, isHovered) => {
+        this.hoverAppObject = (id, isHovered) => {
             if (!this.selection)
                 return;
             if (!this.allowHover())
@@ -51,9 +55,9 @@ class HoverAppObjectUCImp extends HoverAppObjectUC {
                 this.selection.hoveredObjectId = null;
             }
         };
-        this.selection = appObject.getComponent(Selection_1.Selection.type);
-        if (!this.selection) {
-            console.warn("HoverAppObjectUCImp has been added to an App Object that does not have a Selection Entity. Add an Entity before adding the UC");
-        }
+        this.appObjects.registerSingleton(this);
+    }
+    get selection() {
+        return this.getCachedSingleton(Selection_1.Selection.type);
     }
 }

package/lib/Components/Selection/UC/PressAppObjectUC.d.ts

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectUC } from "../../../AppObject/AppObjectUC";
 import { ParametricLine } from "../../../ValueObjects/ParametricLine";
@@ -5,7 +6,8 @@ export declare abstract class PressAppObjectUC extends AppObjectUC {
     static readonly type = "PressAppObjectUC";
     abstract allowPress(): boolean;
     abstract allowTryPress(): boolean;
-    abstract pressSceneObject: (id: string | null, isPressed: boolean) => void;
-    abstract tryPressSceneObject: (ray: ParametricLine) => string | null;
+    abstract pressAppObject: (id: string | null, isPressed: boolean) => void;
+    abstract tryPressAppObject: (ray: ParametricLine) => string | null;
+    static get(appObjects: AppObjectRepo): PressAppObjectUC | undefined;
 }
 export declare function makePressAppObject(appObject: AppObject): PressAppObjectUC;

package/lib/Components/Selection/UC/PressAppObjectUC.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makePressAppObject = exports.PressAppObjectUC = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
 const Babylon_1 = require("../../Babylon");
 const Selectable_1 = require("../Entities/Selectable");
 const Selection_1 = require("../Entities/Selection");
 class PressAppObjectUC extends AppObjectUC_1.AppObjectUC {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(PressAppObjectUC.type, appObjects);
+    }
 }
 exports.PressAppObjectUC = PressAppObjectUC;
 PressAppObjectUC.type = "PressAppObjectUC";
@@ -22,7 +26,7 @@ class PressAppObjectUCImp extends PressAppObjectUC {
         this.allowTryPress = () => {
             return true;
         };
-        this.tryPressSceneObject = (ray) => {
+        this.tryPressAppObject = (ray) => {
             if (!this.selection)
                 return null;
             if (!this.allowTryPress())
@@ -40,7 +44,7 @@ class PressAppObjectUCImp extends PressAppObjectUC {
             this.selection.pressedObjectId = rayPick.appObjectID;
             return this.selection.pressedObjectId;
         };
-        this.pressSceneObject = (id, isPressed) => {
+        this.pressAppObject = (id, isPressed) => {
             if (!this.selection)
                 return;
             if (!this.allowPress())
@@ -52,9 +56,9 @@ class PressAppObjectUCImp extends PressAppObjectUC {
                 this.selection.pressedObjectId = null;
             }
         };
-        this.selection = appObject.getComponent(Selection_1.Selection.type);
-        if (!this.selection) {
-            console.warn("PressAppObjectUCImp has been added to an App Object that does not have a Selection Entity. Add an Entity before adding the UC");
-        }
+        this.appObjects.registerSingleton(this);
+    }
+    get selection() {
+        return this.getCachedSingleton(Selection_1.Selection.type);
     }
 }

package/lib/Components/Selection/UC/SelectAppObjectUC.d.ts

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectUC } from "../../../AppObject/AppObjectUC";
 import { ParametricLine } from "../../../ValueObjects/ParametricLine";
@@ -5,7 +6,8 @@ export declare abstract class SelectAppObjectUC extends AppObjectUC {
     static readonly type = "SelectAppObjectUC";
     abstract allowSelect(): boolean;
     abstract allowTrySelect(): boolean;
-    abstract selectSceneObject: (id: string, isSelected: boolean) => void;
-    abstract trySelectSceneObject: (ray: ParametricLine) => void;
+    abstract selectAppObject: (id: string, isSelected: boolean) => void;
+    abstract trySelectAppObject: (ray: ParametricLine) => void;
+    static get(appObjects: AppObjectRepo): SelectAppObjectUC | undefined;
 }
 export declare function makeSelectAppObject(appObject: AppObject): SelectAppObjectUC;

package/lib/Components/Selection/UC/SelectAppObjectUC.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSelectAppObject = exports.SelectAppObjectUC = void 0;
+const AppObject_1 = require("../../../AppObject");
 const AppObjectUC_1 = require("../../../AppObject/AppObjectUC");
 const Babylon_1 = require("../../Babylon");
 const Selectable_1 = require("../Entities/Selectable");
 const Selection_1 = require("../Entities/Selection");
 class SelectAppObjectUC extends AppObjectUC_1.AppObjectUC {
+    static get(appObjects) {
+        return AppObject_1.getSingletonComponent(SelectAppObjectUC.type, appObjects);
+    }
 }
 exports.SelectAppObjectUC = SelectAppObjectUC;
 SelectAppObjectUC.type = "SelectAppObjectUC";
@@ -22,7 +26,7 @@ class SelectAppObjectUCImp extends SelectAppObjectUC {
         this.allowTrySelect = () => {
             return true;
         };
-        this.trySelectSceneObject = (ray) => {
+        this.trySelectAppObject = (ray) => {
             if (!this.selection)
                 return;
             if (!this.allowTrySelect())
@@ -39,7 +43,7 @@ class SelectAppObjectUCImp extends SelectAppObjectUC {
             }
             this.selection.selectedObjectId = rayPick.appObjectID;
         };
-        this.selectSceneObject = (id, isSelected) => {
+        this.selectAppObject = (id, isSelected) => {
             if (!this.selection)
                 return;
             if (!this.allowSelect())
@@ -51,9 +55,9 @@ class SelectAppObjectUCImp extends SelectAppObjectUC {
                 this.selection.selectedObjectId = null;
             }
         };
-        this.selection = appObject.getComponent(Selection_1.Selection.type);
-        if (!this.selection) {
-            console.warn("SelectAppObjectUCImp has been added to an App Object that does not have a Selection Entity. Add an Entity before adding the UC");
-        }
+        this.appObjects.registerSingleton(this);
+    }
+    get selection() {
+        return this.getCachedSingleton(Selection_1.Selection.type);
     }
 }

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

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

package/lib/Components/Selection/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("./UC"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);
-__exportStar(require("./Controller"), exports);
+__exportStar(require("./UC"), exports);

package/lib/Components/StateMachine/Entities/StateMachineEntity.d.ts

@@ -13,7 +13,7 @@ export interface SystemState {
 export interface SerializedSystem {
     name: string;
     seriliziationVersion: number;
-    getSystemState(): object;
+    getSystemState(): object | undefined;
     applySystemState(state: object, version: number, transitionDuration: number): void;
     applyDefaultState(transitionDuration: number): void;
 }

package/lib/Components/StateMachine/Entities/StateMachineEntity.js

@@ -46,13 +46,17 @@ class StateMachineImp extends StateMachineEntity {
         };
         this.getSerializedStates = () => {
             const systems = Array.from(this.serializedSystems.values());
-            const serializedStates = systems.map((system) => {
+            const serializedStates = [];
+            systems.forEach((system) => {
                 const state = system.getSystemState();
-                return {
+                if (!state)
+                    return;
+                const systemState = {
                     seriliziationVersion: system.seriliziationVersion,
                     name: system.name,
                     state,
                 };
+                serializedStates.push(systemState);
             });
             return {
                 version: this.serilizationVersion,

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

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

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

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

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

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

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeToolAdapter = 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;

package/lib/Components/Tools/Controller/ToolHotkeys.js

@@ -20,7 +20,7 @@ class ToolHotkeys extends AppObjectController_1.AppObjectController {
                 shift: e.shiftKey,
             };
             const tool = this.toolRepo.getToolForHotkey(currentKey);
-            if (!tool)
+            if (!tool || !tool.toolType)
                 return;
             this.toolRepo.triggerTool(tool.toolType);
         };

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

@@ -1,3 +1,4 @@
+import { AppObjectRepo } from "../../../AppObject";
 import { AppObject } from "../../../AppObject/AppObject";
 import { AppObjectEntity } from "../../../AppObject/AppObjectEntity";
 export declare enum ToolState {
@@ -22,7 +23,7 @@ export interface HotKey {
 }
 export declare abstract class ToolEntity<ToolTypes> extends AppObjectEntity {
     static readonly type = "TOOL";
-    abstract readonly toolType: ToolTypes;
+    abstract get toolType(): ToolTypes | undefined;
     abstract get label(): string;
     abstract set label(toolLabel: string);
     abstract readonly isDefault: boolean;
@@ -35,5 +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;
 }
-export declare function makeToolEntity<ToolTypes>(data: ToolData<ToolTypes>, appObject: AppObject): ToolEntity<ToolTypes>;
+export declare function makeToolEntity<ToolTypes>(appObject: AppObject): ToolEntity<ToolTypes>;

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

@@ -11,16 +11,24 @@ var ToolState;
     ToolState["ACTIVE"] = "ACTIVE";
 })(ToolState = exports.ToolState || (exports.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);
+    }
 }
 exports.ToolEntity = ToolEntity;
 ToolEntity.type = "TOOL";
-function makeToolEntity(data, appObject) {
-    return new ToolEntityImp(data, appObject);
+function makeToolEntity(appObject) {
+    return new ToolEntityImp(appObject);
 }
 exports.makeToolEntity = makeToolEntity;
 class ToolEntityImp extends ToolEntity {
-    constructor(data, appObject) {
+    constructor(appObject) {
         super(appObject, ToolEntity.type);
+        this._isDefault = false;
+        this.memoizedLabel = new Entities_1.MemoizedString("", this.notifyOnChange);
+        this.memoizedShortcut = new Entities_1.MemoizedString("", this.notifyOnChange);
         this.memoizedState = new Entities_1.MemoizedString(ToolState.ENABLED, this.notifyOnChange);
         this.actions = [];
         this._isAction = false;
@@ -33,6 +41,7 @@ class ToolEntityImp extends ToolEntity {
                 action();
             });
         };
+        this._hotkeys = [];
         this.isMyHotkey = (hotkey) => {
             let isMine = false;
             this.hotkeys.forEach((myHotkey) => {
@@ -42,11 +51,19 @@ class ToolEntityImp extends ToolEntity {
             });
             return isMine;
         };
-        this.toolType = data.toolType;
-        this.memoizedLabel = new Entities_1.MemoizedString(data.label, this.notifyOnChange);
-        this.isDefault = data.isDefault;
-        this.memoizedShortcut = new Entities_1.MemoizedString(data.shortcutLabel, this.notifyOnChange);
-        this.hotkeys = data.hotkeys;
+        this.setupFromData = (data) => {
+            this._toolType = data.toolType;
+            this.memoizedLabel.val = data.label;
+            this._isDefault = data.isDefault;
+            this.memoizedShortcut.val = data.shortcutLabel;
+            this._hotkeys = data.hotkeys;
+        };
+    }
+    get toolType() {
+        return this._toolType;
+    }
+    get isDefault() {
+        return this._isDefault;
     }
     get label() {
         return this.memoizedLabel.val;
@@ -69,6 +86,9 @@ class ToolEntityImp extends ToolEntity {
     get isAction() {
         return this._isAction;
     }
+    get hotkeys() {
+        return this._hotkeys;
+    }
     hotkeysMatch(a, b) {
         if (a.keyCode !== b.keyCode)
             return false;

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

@@ -18,7 +18,10 @@ class ToolRepositoryImp extends ToolRepository {
         super(appObject, ToolRepository.type);
         this.toolLookup = new Map();
         this.toolFactory = (toolData) => {
-            throw new Error("Factory has not been injected");
+            const ao = this.appObjects.getOrCreate(toolData.toolType);
+            const toolEntity = ToolEntity_1.makeToolEntity(ao);
+            toolEntity.setupFromData(toolData);
+            return toolEntity;
         };
     }
     get allTools() {

package/lib/Components/Tools/Mocks/ToolPMMock.d.ts

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

package/lib/Components/Tools/Mocks/ToolPMMock.js

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

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

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

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