@vived/app 6.6.0 → 6.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/BaseApp/UC/RenderCanvasUC.js +17 -36
- package/dist/cjs/BaseApp/UC/RenderCanvasUC.js.map +1 -1
- package/dist/cjs/BaseApp/UC/RenderCanvasUC.test.js +18 -18
- package/dist/cjs/BaseApp/UC/RenderCanvasUC.test.js.map +1 -1
- package/dist/cjs/Challenge/Factories/ChallengeFeatureFactory.js +9 -28
- package/dist/cjs/Challenge/Factories/ChallengeFeatureFactory.js.map +1 -1
- package/dist/cjs/Challenge/Factories/ChallengeFeatureFactory.test.js +51 -0
- package/dist/cjs/Challenge/Factories/ChallengeFeatureFactory.test.js.map +1 -0
- package/dist/cjs/EventSystem/Entities/EventEntity.js +12 -2
- package/dist/cjs/EventSystem/Entities/EventEntity.js.map +1 -1
- package/dist/cjs/EventSystem/Entities/EventEntity.test.js +45 -0
- package/dist/cjs/EventSystem/Entities/EventEntity.test.js.map +1 -1
- package/dist/cjs/EventSystem/Mocks/MockEventEntity.js +7 -2
- package/dist/cjs/EventSystem/Mocks/MockEventEntity.js.map +1 -1
- package/dist/cjs/EventSystem/types.js.map +1 -1
- package/dist/cjs/ObjectPick/Factories/setupObjectPick.js +18 -1
- package/dist/cjs/ObjectPick/Factories/setupObjectPick.js.map +1 -1
- package/dist/cjs/ObjectPick/Factories/setupObjectPick.test.js +55 -0
- package/dist/cjs/ObjectPick/Factories/setupObjectPick.test.js.map +1 -0
- package/dist/cjs/Procedure/Adapters/procedureAdapter.js +1 -0
- package/dist/cjs/Procedure/Adapters/procedureAdapter.js.map +1 -1
- package/dist/cjs/Procedure/Adapters/procedureAdapter.test.js +1 -0
- package/dist/cjs/Procedure/Adapters/procedureAdapter.test.js.map +1 -1
- package/dist/cjs/Procedure/Adapters/procedureAuthoringAdapter.js +2 -0
- package/dist/cjs/Procedure/Adapters/procedureAuthoringAdapter.js.map +1 -1
- package/dist/cjs/Procedure/Adapters/procedureAuthoringAdapter.test.js +3 -0
- package/dist/cjs/Procedure/Adapters/procedureAuthoringAdapter.test.js.map +1 -1
- package/dist/cjs/Procedure/Adapters/procedureHintAdapter.test.js +1 -0
- package/dist/cjs/Procedure/Adapters/procedureHintAdapter.test.js.map +1 -1
- package/dist/cjs/Procedure/Adapters/procedureProgressAdapter.js +2 -0
- package/dist/cjs/Procedure/Adapters/procedureProgressAdapter.js.map +1 -1
- package/dist/cjs/Procedure/Adapters/procedureProgressAdapter.test.js +3 -0
- package/dist/cjs/Procedure/Adapters/procedureProgressAdapter.test.js.map +1 -1
- package/dist/cjs/Procedure/Adapters/procedureQuizResultAdapter.js +2 -0
- package/dist/cjs/Procedure/Adapters/procedureQuizResultAdapter.js.map +1 -1
- package/dist/cjs/Procedure/Adapters/procedureQuizResultAdapter.test.js +3 -0
- package/dist/cjs/Procedure/Adapters/procedureQuizResultAdapter.test.js.map +1 -1
- package/dist/cjs/Procedure/Entities/ProcedureEntity.js +163 -24
- package/dist/cjs/Procedure/Entities/ProcedureEntity.js.map +1 -1
- package/dist/cjs/Procedure/Entities/ProcedureEntity.test.js +240 -0
- package/dist/cjs/Procedure/Entities/ProcedureEntity.test.js.map +1 -1
- package/dist/cjs/Procedure/Factories/ProcedureFeatureFactory.js +20 -0
- package/dist/cjs/Procedure/Factories/ProcedureFeatureFactory.js.map +1 -1
- package/dist/cjs/Procedure/Factories/ProcedureFeatureFactory.test.js +25 -0
- package/dist/cjs/Procedure/Factories/ProcedureFeatureFactory.test.js.map +1 -1
- package/dist/cjs/Procedure/Mocks/MockProcedureEntity.js +2 -0
- package/dist/cjs/Procedure/Mocks/MockProcedureEntity.js.map +1 -1
- package/dist/cjs/Procedure/PM/ProcedurePM.js +13 -1
- package/dist/cjs/Procedure/PM/ProcedurePM.js.map +1 -1
- package/dist/cjs/Procedure/PM/ProcedurePM.test.js +34 -0
- package/dist/cjs/Procedure/PM/ProcedurePM.test.js.map +1 -1
- package/dist/cjs/Procedure/UCs/UpdateProcedureEventsUCHook.test.js +3 -0
- package/dist/cjs/Procedure/UCs/UpdateProcedureEventsUCHook.test.js.map +1 -1
- package/dist/cjs/Procedure/types.js.map +1 -1
- package/dist/cjs/TouchController/UC/UpdateTouchInoutBound.test.js +37 -0
- package/dist/cjs/TouchController/UC/UpdateTouchInoutBound.test.js.map +1 -1
- package/dist/cjs/TouchController/UC/UpdateTouchInputBound.js +17 -4
- package/dist/cjs/TouchController/UC/UpdateTouchInputBound.js.map +1 -1
- package/dist/esm/BaseApp/UC/RenderCanvasUC.js +17 -36
- package/dist/esm/BaseApp/UC/RenderCanvasUC.js.map +1 -1
- package/dist/esm/BaseApp/UC/RenderCanvasUC.test.js +18 -18
- package/dist/esm/BaseApp/UC/RenderCanvasUC.test.js.map +1 -1
- package/dist/esm/Challenge/Factories/ChallengeFeatureFactory.js +9 -28
- package/dist/esm/Challenge/Factories/ChallengeFeatureFactory.js.map +1 -1
- package/dist/esm/Challenge/Factories/ChallengeFeatureFactory.test.js +49 -0
- package/dist/esm/Challenge/Factories/ChallengeFeatureFactory.test.js.map +1 -0
- package/dist/esm/EventSystem/Entities/EventEntity.js +12 -2
- package/dist/esm/EventSystem/Entities/EventEntity.js.map +1 -1
- package/dist/esm/EventSystem/Entities/EventEntity.test.js +45 -0
- package/dist/esm/EventSystem/Entities/EventEntity.test.js.map +1 -1
- package/dist/esm/EventSystem/Mocks/MockEventEntity.js +7 -2
- package/dist/esm/EventSystem/Mocks/MockEventEntity.js.map +1 -1
- package/dist/esm/EventSystem/types.js.map +1 -1
- package/dist/esm/ObjectPick/Factories/setupObjectPick.js +18 -1
- package/dist/esm/ObjectPick/Factories/setupObjectPick.js.map +1 -1
- package/dist/esm/ObjectPick/Factories/setupObjectPick.test.js +53 -0
- package/dist/esm/ObjectPick/Factories/setupObjectPick.test.js.map +1 -0
- package/dist/esm/Procedure/Adapters/procedureAdapter.js +1 -0
- package/dist/esm/Procedure/Adapters/procedureAdapter.js.map +1 -1
- package/dist/esm/Procedure/Adapters/procedureAdapter.test.js +1 -0
- package/dist/esm/Procedure/Adapters/procedureAdapter.test.js.map +1 -1
- package/dist/esm/Procedure/Adapters/procedureAuthoringAdapter.js +2 -0
- package/dist/esm/Procedure/Adapters/procedureAuthoringAdapter.js.map +1 -1
- package/dist/esm/Procedure/Adapters/procedureAuthoringAdapter.test.js +3 -0
- package/dist/esm/Procedure/Adapters/procedureAuthoringAdapter.test.js.map +1 -1
- package/dist/esm/Procedure/Adapters/procedureHintAdapter.test.js +1 -0
- package/dist/esm/Procedure/Adapters/procedureHintAdapter.test.js.map +1 -1
- package/dist/esm/Procedure/Adapters/procedureProgressAdapter.js +2 -0
- package/dist/esm/Procedure/Adapters/procedureProgressAdapter.js.map +1 -1
- package/dist/esm/Procedure/Adapters/procedureProgressAdapter.test.js +3 -0
- package/dist/esm/Procedure/Adapters/procedureProgressAdapter.test.js.map +1 -1
- package/dist/esm/Procedure/Adapters/procedureQuizResultAdapter.js +2 -0
- package/dist/esm/Procedure/Adapters/procedureQuizResultAdapter.js.map +1 -1
- package/dist/esm/Procedure/Adapters/procedureQuizResultAdapter.test.js +3 -0
- package/dist/esm/Procedure/Adapters/procedureQuizResultAdapter.test.js.map +1 -1
- package/dist/esm/Procedure/Entities/ProcedureEntity.js +163 -24
- package/dist/esm/Procedure/Entities/ProcedureEntity.js.map +1 -1
- package/dist/esm/Procedure/Entities/ProcedureEntity.test.js +240 -0
- package/dist/esm/Procedure/Entities/ProcedureEntity.test.js.map +1 -1
- package/dist/esm/Procedure/Factories/ProcedureFeatureFactory.js +20 -0
- package/dist/esm/Procedure/Factories/ProcedureFeatureFactory.js.map +1 -1
- package/dist/esm/Procedure/Factories/ProcedureFeatureFactory.test.js +26 -1
- package/dist/esm/Procedure/Factories/ProcedureFeatureFactory.test.js.map +1 -1
- package/dist/esm/Procedure/Mocks/MockProcedureEntity.js +2 -0
- package/dist/esm/Procedure/Mocks/MockProcedureEntity.js.map +1 -1
- package/dist/esm/Procedure/PM/ProcedurePM.js +13 -1
- package/dist/esm/Procedure/PM/ProcedurePM.js.map +1 -1
- package/dist/esm/Procedure/PM/ProcedurePM.test.js +34 -0
- package/dist/esm/Procedure/PM/ProcedurePM.test.js.map +1 -1
- package/dist/esm/Procedure/UCs/UpdateProcedureEventsUCHook.test.js +3 -0
- package/dist/esm/Procedure/UCs/UpdateProcedureEventsUCHook.test.js.map +1 -1
- package/dist/esm/Procedure/types.js.map +1 -1
- package/dist/esm/TouchController/UC/UpdateTouchInoutBound.test.js +37 -0
- package/dist/esm/TouchController/UC/UpdateTouchInoutBound.test.js.map +1 -1
- package/dist/esm/TouchController/UC/UpdateTouchInputBound.js +17 -4
- package/dist/esm/TouchController/UC/UpdateTouchInputBound.js.map +1 -1
- package/dist/types/Challenge/Factories/ChallengeFeatureFactory.d.ts +7 -16
- package/dist/types/Challenge/Factories/ChallengeFeatureFactory.d.ts.map +1 -1
- package/dist/types/Challenge/Factories/ChallengeFeatureFactory.test.d.ts +2 -0
- package/dist/types/Challenge/Factories/ChallengeFeatureFactory.test.d.ts.map +1 -0
- package/dist/types/EventSystem/Entities/EventEntity.d.ts +13 -2
- package/dist/types/EventSystem/Entities/EventEntity.d.ts.map +1 -1
- package/dist/types/EventSystem/Mocks/MockEventEntity.d.ts +3 -2
- package/dist/types/EventSystem/Mocks/MockEventEntity.d.ts.map +1 -1
- package/dist/types/EventSystem/types.d.ts +23 -0
- package/dist/types/EventSystem/types.d.ts.map +1 -1
- package/dist/types/ObjectPick/Factories/setupObjectPick.d.ts +10 -0
- package/dist/types/ObjectPick/Factories/setupObjectPick.d.ts.map +1 -1
- package/dist/types/ObjectPick/Factories/setupObjectPick.test.d.ts +2 -0
- package/dist/types/ObjectPick/Factories/setupObjectPick.test.d.ts.map +1 -0
- package/dist/types/Procedure/Adapters/procedureAdapter.d.ts.map +1 -1
- package/dist/types/Procedure/Adapters/procedureAuthoringAdapter.d.ts.map +1 -1
- package/dist/types/Procedure/Adapters/procedureProgressAdapter.d.ts.map +1 -1
- package/dist/types/Procedure/Adapters/procedureQuizResultAdapter.d.ts.map +1 -1
- package/dist/types/Procedure/Entities/ProcedureEntity.d.ts +10 -0
- package/dist/types/Procedure/Entities/ProcedureEntity.d.ts.map +1 -1
- package/dist/types/Procedure/Factories/ProcedureFeatureFactory.d.ts +6 -0
- package/dist/types/Procedure/Factories/ProcedureFeatureFactory.d.ts.map +1 -1
- package/dist/types/Procedure/Mocks/MockProcedureEntity.d.ts +3 -0
- package/dist/types/Procedure/Mocks/MockProcedureEntity.d.ts.map +1 -1
- package/dist/types/Procedure/types.d.ts +17 -1
- package/dist/types/Procedure/types.d.ts.map +1 -1
- package/dist/types/TouchController/UC/UpdateTouchInputBound.d.ts +11 -0
- package/dist/types/TouchController/UC/UpdateTouchInputBound.d.ts.map +1 -1
- package/package.json +6 -3
- package/src/EventSystem/CONTEXT.md +29 -17
- package/dist/cjs/FramedScreen/Factories/setupStandardFramedScreen.test.js +0 -31
- package/dist/cjs/FramedScreen/Factories/setupStandardFramedScreen.test.js.map +0 -1
- package/dist/cjs/StateMachine/Controller/clickRestoreScene.js +0 -14
- package/dist/cjs/StateMachine/Controller/clickRestoreScene.js.map +0 -1
- package/dist/cjs/StateMachine/Controller/clickRestoreScene.test.js +0 -26
- package/dist/cjs/StateMachine/Controller/clickRestoreScene.test.js.map +0 -1
- package/dist/cjs/TestUtils/index.js +0 -18
- package/dist/cjs/TestUtils/index.js.map +0 -1
- package/dist/cjs/TestUtils/setupFeatureForTesting.js +0 -60
- package/dist/cjs/TestUtils/setupFeatureForTesting.js.map +0 -1
- package/dist/esm/FramedScreen/Factories/setupStandardFramedScreen.test.js +0 -29
- package/dist/esm/FramedScreen/Factories/setupStandardFramedScreen.test.js.map +0 -1
- package/dist/esm/StateMachine/Controller/clickRestoreScene.js +0 -11
- package/dist/esm/StateMachine/Controller/clickRestoreScene.js.map +0 -1
- package/dist/esm/StateMachine/Controller/clickRestoreScene.test.js +0 -24
- package/dist/esm/StateMachine/Controller/clickRestoreScene.test.js.map +0 -1
- package/dist/esm/TestUtils/index.js +0 -2
- package/dist/esm/TestUtils/index.js.map +0 -1
- package/dist/esm/TestUtils/setupFeatureForTesting.js +0 -57
- package/dist/esm/TestUtils/setupFeatureForTesting.js.map +0 -1
- package/dist/types/FramedScreen/Factories/setupStandardFramedScreen.test.d.ts +0 -2
- package/dist/types/FramedScreen/Factories/setupStandardFramedScreen.test.d.ts.map +0 -1
- package/dist/types/StateMachine/Controller/clickRestoreScene.d.ts +0 -3
- package/dist/types/StateMachine/Controller/clickRestoreScene.d.ts.map +0 -1
- package/dist/types/StateMachine/Controller/clickRestoreScene.test.d.ts +0 -2
- package/dist/types/StateMachine/Controller/clickRestoreScene.test.d.ts.map +0 -1
- package/dist/types/TestUtils/index.d.ts +0 -2
- package/dist/types/TestUtils/index.d.ts.map +0 -1
- package/dist/types/TestUtils/setupFeatureForTesting.d.ts +0 -48
- package/dist/types/TestUtils/setupFeatureForTesting.d.ts.map +0 -1
|
@@ -13,26 +13,18 @@ export function makeRenderCanvasUC(appObject) {
|
|
|
13
13
|
class RenderCanvasUCImp extends RenderCanvasUC {
|
|
14
14
|
submitCanvas(canvas) {
|
|
15
15
|
const appObjects = this.appObject.appObjectRepo;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
// The DOM input subsystems are optional. A composition may decline them
|
|
17
|
+
// (input handled natively by the renderer, for example), so absence is a
|
|
18
|
+
// supported state and is skipped silently. hasSingleton is checked first
|
|
19
|
+
// because the entity getters warn when the lookup misses.
|
|
20
|
+
if (appObjects.hasSingleton(KeyboardInputEntity.type)) {
|
|
21
|
+
KeyboardInputEntity.get(appObjects)?.setEventElement(canvas);
|
|
19
22
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
const touchInput = TouchInputEntity.get(appObjects);
|
|
24
|
-
if (touchInput) {
|
|
25
|
-
touchInput.setEventElement(canvas);
|
|
26
|
-
}
|
|
27
|
-
else {
|
|
28
|
-
this.warn("Unable to find TouchInputEntity");
|
|
29
|
-
}
|
|
30
|
-
const mouseInput = MouseInputEntity.get(appObjects);
|
|
31
|
-
if (mouseInput) {
|
|
32
|
-
mouseInput.setEventElement(canvas);
|
|
23
|
+
if (appObjects.hasSingleton(TouchInputEntity.type)) {
|
|
24
|
+
TouchInputEntity.get(appObjects)?.setEventElement(canvas);
|
|
33
25
|
}
|
|
34
|
-
|
|
35
|
-
|
|
26
|
+
if (appObjects.hasSingleton(MouseInputEntity.type)) {
|
|
27
|
+
MouseInputEntity.get(appObjects)?.setEventElement(canvas);
|
|
36
28
|
}
|
|
37
29
|
const babylonRendering = BabylonRenderingUC.get(appObjects);
|
|
38
30
|
if (babylonRendering) {
|
|
@@ -47,26 +39,15 @@ class RenderCanvasUCImp extends RenderCanvasUC {
|
|
|
47
39
|
}
|
|
48
40
|
clearCanvas() {
|
|
49
41
|
const appObjects = this.appObject.appObjectRepo;
|
|
50
|
-
|
|
51
|
-
if (
|
|
52
|
-
|
|
42
|
+
// Optional input subsystems - see submitCanvas.
|
|
43
|
+
if (appObjects.hasSingleton(KeyboardInputEntity.type)) {
|
|
44
|
+
KeyboardInputEntity.get(appObjects)?.clearInputElement();
|
|
53
45
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
const touchInput = TouchInputEntity.get(appObjects);
|
|
58
|
-
if (touchInput) {
|
|
59
|
-
touchInput.clearInputElement();
|
|
60
|
-
}
|
|
61
|
-
else {
|
|
62
|
-
this.warn("Unable to find TouchInputEntity");
|
|
63
|
-
}
|
|
64
|
-
const mouseInput = MouseInputEntity.get(appObjects);
|
|
65
|
-
if (mouseInput) {
|
|
66
|
-
mouseInput.clearInputElement();
|
|
46
|
+
if (appObjects.hasSingleton(TouchInputEntity.type)) {
|
|
47
|
+
TouchInputEntity.get(appObjects)?.clearInputElement();
|
|
67
48
|
}
|
|
68
|
-
|
|
69
|
-
|
|
49
|
+
if (appObjects.hasSingleton(MouseInputEntity.type)) {
|
|
50
|
+
MouseInputEntity.get(appObjects)?.clearInputElement();
|
|
70
51
|
}
|
|
71
52
|
const babylonRendering = BabylonRenderingUC.get(appObjects);
|
|
72
53
|
if (babylonRendering) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderCanvasUC.js","sourceRoot":"","sources":["../../../../src/BaseApp/UC/RenderCanvasUC.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,WAAW,EACX,qBAAqB,GACtB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,OAAgB,cAAe,SAAQ,WAAW;;AACtC,mBAAI,GAAG,gBAAgB,CAAC;AAKjC,kBAAG,GAAG,CAAC,UAAyB,EAA8B,EAAE,CACrE,qBAAqB,CAAC,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAG3D,MAAM,UAAU,kBAAkB,CAAC,SAAoB;IACrD,OAAO,IAAI,iBAAiB,CAAC,SAAS,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,iBAAkB,SAAQ,cAAc;IAC5C,YAAY,CAAC,MAAyB;QACpC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;QAEhD,
|
|
1
|
+
{"version":3,"file":"RenderCanvasUC.js","sourceRoot":"","sources":["../../../../src/BaseApp/UC/RenderCanvasUC.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n AppObject,\r\n AppObjectRepo,\r\n AppObjectUC,\r\n getSingletonComponent,\r\n} from \"@vived/core\";\r\nimport { BabylonRenderingUC } from \"../../Babylon\";\r\nimport { KeyboardInputEntity } from \"../../KeyboardInput\";\r\nimport { TouchInputEntity } from \"../../TouchController\";\r\nimport { MouseInputEntity } from \"../../MouseInput\";\r\n\r\nexport abstract class RenderCanvasUC extends AppObjectUC {\r\n static readonly type = \"RenderCanvasUC\";\r\n\r\n abstract submitCanvas(canvas: HTMLCanvasElement): void;\r\n abstract clearCanvas(): void;\r\n\r\n static get = (appObjects: AppObjectRepo): RenderCanvasUC | undefined =>\r\n getSingletonComponent(RenderCanvasUC.type, appObjects);\r\n}\r\n\r\nexport function makeRenderCanvasUC(appObject: AppObject): RenderCanvasUC {\r\n return new RenderCanvasUCImp(appObject);\r\n}\r\n\r\nclass RenderCanvasUCImp extends RenderCanvasUC {\r\n submitCanvas(canvas: HTMLCanvasElement): void {\r\n const appObjects = this.appObject.appObjectRepo;\r\n\r\n // The DOM input subsystems are optional. A composition may decline them\r\n // (input handled natively by the renderer, for example), so absence is a\r\n // supported state and is skipped silently. hasSingleton is checked first\r\n // because the entity getters warn when the lookup misses.\r\n if (appObjects.hasSingleton(KeyboardInputEntity.type)) {\r\n KeyboardInputEntity.get(appObjects)?.setEventElement(canvas);\r\n }\r\n\r\n if (appObjects.hasSingleton(TouchInputEntity.type)) {\r\n TouchInputEntity.get(appObjects)?.setEventElement(canvas);\r\n }\r\n\r\n if (appObjects.hasSingleton(MouseInputEntity.type)) {\r\n MouseInputEntity.get(appObjects)?.setEventElement(canvas);\r\n }\r\n\r\n const babylonRendering = BabylonRenderingUC.get(appObjects);\r\n if (babylonRendering) {\r\n babylonRendering.submitRenderCanvas(canvas);\r\n } else {\r\n this.warn(\"Unable to find BabylonRenderingUC\");\r\n }\r\n\r\n canvas.addEventListener(\r\n \"contextmenu\",\r\n (e) => {\r\n e.preventDefault();\r\n },\r\n false,\r\n );\r\n }\r\n\r\n clearCanvas(): void {\r\n const appObjects = this.appObject.appObjectRepo;\r\n\r\n // Optional input subsystems - see submitCanvas.\r\n if (appObjects.hasSingleton(KeyboardInputEntity.type)) {\r\n KeyboardInputEntity.get(appObjects)?.clearInputElement();\r\n }\r\n\r\n if (appObjects.hasSingleton(TouchInputEntity.type)) {\r\n TouchInputEntity.get(appObjects)?.clearInputElement();\r\n }\r\n\r\n if (appObjects.hasSingleton(MouseInputEntity.type)) {\r\n MouseInputEntity.get(appObjects)?.clearInputElement();\r\n }\r\n\r\n const babylonRendering = BabylonRenderingUC.get(appObjects);\r\n if (babylonRendering) {\r\n babylonRendering.clearRenderCanvas();\r\n } else {\r\n this.warn(\"Unable to find BabylonRenderingUC\");\r\n }\r\n }\r\n\r\n constructor(appObject: AppObject) {\r\n super(appObject, RenderCanvasUC.type);\r\n }\r\n}\r\n"]}
|
|
@@ -37,23 +37,23 @@ describe("Render Canvas UC", () => {
|
|
|
37
37
|
renderUC.submitCanvas(renderCanvas);
|
|
38
38
|
expect(mockKeybaord.setEventElement).toHaveBeenCalledWith(renderCanvas);
|
|
39
39
|
});
|
|
40
|
-
it("
|
|
40
|
+
it("Skips the keyboard input silently when it is absent and a canvas is submitted", () => {
|
|
41
41
|
const { mockKeybaord, renderUC, mockWarn } = makeTestRig();
|
|
42
42
|
const renderCanvas = document.createElement("canvas");
|
|
43
43
|
mockKeybaord.dispose();
|
|
44
|
-
renderUC.submitCanvas(renderCanvas);
|
|
45
|
-
expect(mockWarn).toHaveBeenCalled();
|
|
44
|
+
expect(() => renderUC.submitCanvas(renderCanvas)).not.toThrow();
|
|
45
|
+
expect(mockWarn).not.toHaveBeenCalled();
|
|
46
46
|
});
|
|
47
47
|
it("Clears the input element from keyboard input", () => {
|
|
48
48
|
const { mockKeybaord, renderUC } = makeTestRig();
|
|
49
49
|
renderUC.clearCanvas();
|
|
50
50
|
expect(mockKeybaord.clearInputElement).toHaveBeenCalled();
|
|
51
51
|
});
|
|
52
|
-
it("
|
|
52
|
+
it("Skips the keyboard input silently when it is absent and a canvas is cleared", () => {
|
|
53
53
|
const { mockKeybaord, renderUC, mockWarn } = makeTestRig();
|
|
54
54
|
mockKeybaord.dispose();
|
|
55
|
-
renderUC.clearCanvas();
|
|
56
|
-
expect(mockWarn).toHaveBeenCalled();
|
|
55
|
+
expect(() => renderUC.clearCanvas()).not.toThrow();
|
|
56
|
+
expect(mockWarn).not.toHaveBeenCalled();
|
|
57
57
|
});
|
|
58
58
|
it("Submits the canvas to the mouse input", () => {
|
|
59
59
|
const { mockMouse, renderUC } = makeTestRig();
|
|
@@ -61,23 +61,23 @@ describe("Render Canvas UC", () => {
|
|
|
61
61
|
renderUC.submitCanvas(renderCanvas);
|
|
62
62
|
expect(mockMouse.setEventElement).toHaveBeenCalledWith(renderCanvas);
|
|
63
63
|
});
|
|
64
|
-
it("
|
|
64
|
+
it("Skips the mouse input silently when it is absent and a canvas is submitted", () => {
|
|
65
65
|
const { mockMouse, renderUC, mockWarn } = makeTestRig();
|
|
66
66
|
const renderCanvas = document.createElement("canvas");
|
|
67
67
|
mockMouse.dispose();
|
|
68
|
-
renderUC.submitCanvas(renderCanvas);
|
|
69
|
-
expect(mockWarn).toHaveBeenCalled();
|
|
68
|
+
expect(() => renderUC.submitCanvas(renderCanvas)).not.toThrow();
|
|
69
|
+
expect(mockWarn).not.toHaveBeenCalled();
|
|
70
70
|
});
|
|
71
71
|
it("Clears the input element from mouse input", () => {
|
|
72
72
|
const { mockMouse, renderUC } = makeTestRig();
|
|
73
73
|
renderUC.clearCanvas();
|
|
74
74
|
expect(mockMouse.clearInputElement).toHaveBeenCalled();
|
|
75
75
|
});
|
|
76
|
-
it("
|
|
76
|
+
it("Skips the mouse input silently when it is absent and a canvas is cleared", () => {
|
|
77
77
|
const { mockMouse, renderUC, mockWarn } = makeTestRig();
|
|
78
78
|
mockMouse.dispose();
|
|
79
|
-
renderUC.clearCanvas();
|
|
80
|
-
expect(mockWarn).toHaveBeenCalled();
|
|
79
|
+
expect(() => renderUC.clearCanvas()).not.toThrow();
|
|
80
|
+
expect(mockWarn).not.toHaveBeenCalled();
|
|
81
81
|
});
|
|
82
82
|
it("Submits the canvas to the touch input", () => {
|
|
83
83
|
const { mockTouch, renderUC } = makeTestRig();
|
|
@@ -85,23 +85,23 @@ describe("Render Canvas UC", () => {
|
|
|
85
85
|
renderUC.submitCanvas(renderCanvas);
|
|
86
86
|
expect(mockTouch.setEventElement).toHaveBeenCalledWith(renderCanvas);
|
|
87
87
|
});
|
|
88
|
-
it("
|
|
88
|
+
it("Skips the touch input silently when it is absent and a canvas is submitted", () => {
|
|
89
89
|
const { mockTouch, renderUC, mockWarn } = makeTestRig();
|
|
90
90
|
const renderCanvas = document.createElement("canvas");
|
|
91
91
|
mockTouch.dispose();
|
|
92
|
-
renderUC.submitCanvas(renderCanvas);
|
|
93
|
-
expect(mockWarn).toHaveBeenCalled();
|
|
92
|
+
expect(() => renderUC.submitCanvas(renderCanvas)).not.toThrow();
|
|
93
|
+
expect(mockWarn).not.toHaveBeenCalled();
|
|
94
94
|
});
|
|
95
95
|
it("Clears the input element from touch input", () => {
|
|
96
96
|
const { mockTouch, renderUC } = makeTestRig();
|
|
97
97
|
renderUC.clearCanvas();
|
|
98
98
|
expect(mockTouch.clearInputElement).toHaveBeenCalled();
|
|
99
99
|
});
|
|
100
|
-
it("
|
|
100
|
+
it("Skips the touch input silently when it is absent and a canvas is cleared", () => {
|
|
101
101
|
const { mockTouch, renderUC, mockWarn } = makeTestRig();
|
|
102
102
|
mockTouch.dispose();
|
|
103
|
-
renderUC.clearCanvas();
|
|
104
|
-
expect(mockWarn).toHaveBeenCalled();
|
|
103
|
+
expect(() => renderUC.clearCanvas()).not.toThrow();
|
|
104
|
+
expect(mockWarn).not.toHaveBeenCalled();
|
|
105
105
|
});
|
|
106
106
|
it("Submits the canvas to the babylon rendering", () => {
|
|
107
107
|
const { mockBabylon, renderUC } = makeTestRig();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderCanvasUC.test.js","sourceRoot":"","sources":["../../../../src/BaseApp/UC/RenderCanvasUC.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeAppObjectRepo } from \"@vived/core\";\nimport { makeRenderCanvasUC, RenderCanvasUC } from \"./RenderCanvasUC\";\nimport { MockKeyboardInput } from \"../../KeyboardInput/Mocks/MockKeyboardInput\";\nimport { MockMouseInput } from \"../../MouseInput/Mocks/MockMouseInput\";\nimport { MockTouchInputEntity } from \"../../TouchController/Mock/MockTouchInput\";\nimport { makeMockBabylonRenderingUC } from \"../../Babylon\";\n\nfunction makeTestRig() {\n const appObjects = makeAppObjectRepo();\n const app = appObjects.getOrCreate(\"App\");\n const renderUC = makeRenderCanvasUC(app);\n const mockKeybaord = new MockKeyboardInput(app);\n const mockBabylon = makeMockBabylonRenderingUC(appObjects);\n const mockMouse = new MockMouseInput(app);\n const mockTouch = new MockTouchInputEntity(app);\n\n // Convert mouse input methods to jest mocks\n mockMouse.setEventElement = jest.fn();\n mockMouse.clearInputElement = jest.fn();\n\n // Convert babylon rendering methods to jest mocks\n mockBabylon.submitRenderCanvas = jest.fn();\n mockBabylon.clearRenderCanvas = jest.fn();\n\n const mockWarn = jest.fn();\n appObjects.submitWarning = mockWarn;\n\n return {\n appObjects,\n renderUC,\n mockBabylon,\n mockKeybaord,\n mockWarn,\n mockTouch,\n mockMouse,\n };\n}\n\ndescribe(\"Render Canvas UC\", () => {\n it(\"Submits the canvas to the keyboard input\", () => {\n const { mockKeybaord, renderUC } = makeTestRig();\n const renderCanvas = document.createElement(\"canvas\");\n\n renderUC.submitCanvas(renderCanvas);\n\n expect(mockKeybaord.setEventElement).toHaveBeenCalledWith(renderCanvas);\n });\n\n it(\"Warns if it can't find the keyboard input when a canvas is submitted\", () => {\n const { mockKeybaord, renderUC, mockWarn } = makeTestRig();\n const renderCanvas = document.createElement(\"canvas\");\n mockKeybaord.dispose();\n renderUC.submitCanvas(renderCanvas);\n\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Clears the input element from keyboard input\", () => {\n const { mockKeybaord, renderUC } = makeTestRig();\n\n renderUC.clearCanvas();\n\n expect(mockKeybaord.clearInputElement).toHaveBeenCalled();\n });\n\n it(\"Warns if it can't find the keyboard input when a canvas is cleared\", () => {\n const { mockKeybaord, renderUC, mockWarn } = makeTestRig();\n\n mockKeybaord.dispose();\n renderUC.clearCanvas();\n\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Submits the canvas to the mouse input\", () => {\n const { mockMouse, renderUC } = makeTestRig();\n const renderCanvas = document.createElement(\"canvas\");\n\n renderUC.submitCanvas(renderCanvas);\n\n expect(mockMouse.setEventElement).toHaveBeenCalledWith(renderCanvas);\n });\n\n it(\"Warns if it can't find the mouse input when a canvas is submitted\", () => {\n const { mockMouse, renderUC, mockWarn } = makeTestRig();\n const renderCanvas = document.createElement(\"canvas\");\n mockMouse.dispose();\n renderUC.submitCanvas(renderCanvas);\n\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Clears the input element from mouse input\", () => {\n const { mockMouse, renderUC } = makeTestRig();\n\n renderUC.clearCanvas();\n\n expect(mockMouse.clearInputElement).toHaveBeenCalled();\n });\n\n it(\"Warns if it can't find the mouse input when a canvas is cleared\", () => {\n const { mockMouse, renderUC, mockWarn } = makeTestRig();\n\n mockMouse.dispose();\n renderUC.clearCanvas();\n\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Submits the canvas to the touch input\", () => {\n const { mockTouch, renderUC } = makeTestRig();\n const renderCanvas = document.createElement(\"canvas\");\n\n renderUC.submitCanvas(renderCanvas);\n\n expect(mockTouch.setEventElement).toHaveBeenCalledWith(renderCanvas);\n });\n\n it(\"Warns if it can't find the touch input when a canvas is submitted\", () => {\n const { mockTouch, renderUC, mockWarn } = makeTestRig();\n const renderCanvas = document.createElement(\"canvas\");\n mockTouch.dispose();\n renderUC.submitCanvas(renderCanvas);\n\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Clears the input element from touch input\", () => {\n const { mockTouch, renderUC } = makeTestRig();\n\n renderUC.clearCanvas();\n\n expect(mockTouch.clearInputElement).toHaveBeenCalled();\n });\n\n it(\"Warns if it can't find the touch input when a canvas is cleared\", () => {\n const { mockTouch, renderUC, mockWarn } = makeTestRig();\n\n mockTouch.dispose();\n renderUC.clearCanvas();\n\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Submits the canvas to the babylon rendering\", () => {\n const { mockBabylon, renderUC } = makeTestRig();\n const renderCanvas = document.createElement(\"canvas\");\n\n renderUC.submitCanvas(renderCanvas);\n\n expect(mockBabylon.submitRenderCanvas).toHaveBeenCalledWith(renderCanvas);\n });\n\n it(\"Warns if it can't find the babylon rendering when a canvas is submitted\", () => {\n const { mockBabylon, renderUC, mockWarn } = makeTestRig();\n const renderCanvas = document.createElement(\"canvas\");\n mockBabylon.dispose();\n renderUC.submitCanvas(renderCanvas);\n\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Clears the input element from babylon rendering\", () => {\n const { mockBabylon, renderUC } = makeTestRig();\n\n renderUC.clearCanvas();\n\n expect(mockBabylon.clearRenderCanvas).toHaveBeenCalled();\n });\n\n it(\"Warns if it can't find the babylon rendering when a canvas is cleared\", () => {\n const { mockBabylon, renderUC, mockWarn } = makeTestRig();\n\n mockBabylon.dispose();\n renderUC.clearCanvas();\n\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Gets the UC\", () => {\n const { renderUC, appObjects } = makeTestRig();\n\n expect(RenderCanvasUC.get(appObjects)).toEqual(renderUC);\n });\n\n it(\"Warns and returns undefined if there is no UC\", () => {\n const { renderUC, appObjects, mockWarn } = makeTestRig();\n renderUC.dispose();\n\n expect(RenderCanvasUC.get(appObjects)).toBeUndefined();\n expect(mockWarn).toHaveBeenCalled();\n });\n\n it(\"Warns if there are more than two UCs found\", () => {\n const { appObjects, mockWarn } = makeTestRig();\n const newAO = appObjects.getOrCreate(\"newAO\");\n\n makeRenderCanvasUC(newAO);\n\n expect(RenderCanvasUC.get(appObjects)).not.toBeUndefined();\n expect(mockWarn).toHaveBeenCalled();\n });\n});\n"]}
|
|
1
|
+
{"version":3,"file":"RenderCanvasUC.test.js","sourceRoot":"","sources":["../../../../src/BaseApp/UC/RenderCanvasUC.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeAppObjectRepo } from \"@vived/core\";\r\nimport { makeRenderCanvasUC, RenderCanvasUC } from \"./RenderCanvasUC\";\r\nimport { MockKeyboardInput } from \"../../KeyboardInput/Mocks/MockKeyboardInput\";\r\nimport { MockMouseInput } from \"../../MouseInput/Mocks/MockMouseInput\";\r\nimport { MockTouchInputEntity } from \"../../TouchController/Mock/MockTouchInput\";\r\nimport { makeMockBabylonRenderingUC } from \"../../Babylon\";\r\n\r\nfunction makeTestRig() {\r\n const appObjects = makeAppObjectRepo();\r\n const app = appObjects.getOrCreate(\"App\");\r\n const renderUC = makeRenderCanvasUC(app);\r\n const mockKeybaord = new MockKeyboardInput(app);\r\n const mockBabylon = makeMockBabylonRenderingUC(appObjects);\r\n const mockMouse = new MockMouseInput(app);\r\n const mockTouch = new MockTouchInputEntity(app);\r\n\r\n // Convert mouse input methods to jest mocks\r\n mockMouse.setEventElement = jest.fn();\r\n mockMouse.clearInputElement = jest.fn();\r\n\r\n // Convert babylon rendering methods to jest mocks\r\n mockBabylon.submitRenderCanvas = jest.fn();\r\n mockBabylon.clearRenderCanvas = jest.fn();\r\n\r\n const mockWarn = jest.fn();\r\n appObjects.submitWarning = mockWarn;\r\n\r\n return {\r\n appObjects,\r\n renderUC,\r\n mockBabylon,\r\n mockKeybaord,\r\n mockWarn,\r\n mockTouch,\r\n mockMouse,\r\n };\r\n}\r\n\r\ndescribe(\"Render Canvas UC\", () => {\r\n it(\"Submits the canvas to the keyboard input\", () => {\r\n const { mockKeybaord, renderUC } = makeTestRig();\r\n const renderCanvas = document.createElement(\"canvas\");\r\n\r\n renderUC.submitCanvas(renderCanvas);\r\n\r\n expect(mockKeybaord.setEventElement).toHaveBeenCalledWith(renderCanvas);\r\n });\r\n\r\n it(\"Skips the keyboard input silently when it is absent and a canvas is submitted\", () => {\r\n const { mockKeybaord, renderUC, mockWarn } = makeTestRig();\r\n const renderCanvas = document.createElement(\"canvas\");\r\n mockKeybaord.dispose();\r\n\r\n expect(() => renderUC.submitCanvas(renderCanvas)).not.toThrow();\r\n expect(mockWarn).not.toHaveBeenCalled();\r\n });\r\n\r\n it(\"Clears the input element from keyboard input\", () => {\r\n const { mockKeybaord, renderUC } = makeTestRig();\r\n\r\n renderUC.clearCanvas();\r\n\r\n expect(mockKeybaord.clearInputElement).toHaveBeenCalled();\r\n });\r\n\r\n it(\"Skips the keyboard input silently when it is absent and a canvas is cleared\", () => {\r\n const { mockKeybaord, renderUC, mockWarn } = makeTestRig();\r\n\r\n mockKeybaord.dispose();\r\n\r\n expect(() => renderUC.clearCanvas()).not.toThrow();\r\n expect(mockWarn).not.toHaveBeenCalled();\r\n });\r\n\r\n it(\"Submits the canvas to the mouse input\", () => {\r\n const { mockMouse, renderUC } = makeTestRig();\r\n const renderCanvas = document.createElement(\"canvas\");\r\n\r\n renderUC.submitCanvas(renderCanvas);\r\n\r\n expect(mockMouse.setEventElement).toHaveBeenCalledWith(renderCanvas);\r\n });\r\n\r\n it(\"Skips the mouse input silently when it is absent and a canvas is submitted\", () => {\r\n const { mockMouse, renderUC, mockWarn } = makeTestRig();\r\n const renderCanvas = document.createElement(\"canvas\");\r\n mockMouse.dispose();\r\n\r\n expect(() => renderUC.submitCanvas(renderCanvas)).not.toThrow();\r\n expect(mockWarn).not.toHaveBeenCalled();\r\n });\r\n\r\n it(\"Clears the input element from mouse input\", () => {\r\n const { mockMouse, renderUC } = makeTestRig();\r\n\r\n renderUC.clearCanvas();\r\n\r\n expect(mockMouse.clearInputElement).toHaveBeenCalled();\r\n });\r\n\r\n it(\"Skips the mouse input silently when it is absent and a canvas is cleared\", () => {\r\n const { mockMouse, renderUC, mockWarn } = makeTestRig();\r\n\r\n mockMouse.dispose();\r\n\r\n expect(() => renderUC.clearCanvas()).not.toThrow();\r\n expect(mockWarn).not.toHaveBeenCalled();\r\n });\r\n\r\n it(\"Submits the canvas to the touch input\", () => {\r\n const { mockTouch, renderUC } = makeTestRig();\r\n const renderCanvas = document.createElement(\"canvas\");\r\n\r\n renderUC.submitCanvas(renderCanvas);\r\n\r\n expect(mockTouch.setEventElement).toHaveBeenCalledWith(renderCanvas);\r\n });\r\n\r\n it(\"Skips the touch input silently when it is absent and a canvas is submitted\", () => {\r\n const { mockTouch, renderUC, mockWarn } = makeTestRig();\r\n const renderCanvas = document.createElement(\"canvas\");\r\n mockTouch.dispose();\r\n\r\n expect(() => renderUC.submitCanvas(renderCanvas)).not.toThrow();\r\n expect(mockWarn).not.toHaveBeenCalled();\r\n });\r\n\r\n it(\"Clears the input element from touch input\", () => {\r\n const { mockTouch, renderUC } = makeTestRig();\r\n\r\n renderUC.clearCanvas();\r\n\r\n expect(mockTouch.clearInputElement).toHaveBeenCalled();\r\n });\r\n\r\n it(\"Skips the touch input silently when it is absent and a canvas is cleared\", () => {\r\n const { mockTouch, renderUC, mockWarn } = makeTestRig();\r\n\r\n mockTouch.dispose();\r\n\r\n expect(() => renderUC.clearCanvas()).not.toThrow();\r\n expect(mockWarn).not.toHaveBeenCalled();\r\n });\r\n\r\n it(\"Submits the canvas to the babylon rendering\", () => {\r\n const { mockBabylon, renderUC } = makeTestRig();\r\n const renderCanvas = document.createElement(\"canvas\");\r\n\r\n renderUC.submitCanvas(renderCanvas);\r\n\r\n expect(mockBabylon.submitRenderCanvas).toHaveBeenCalledWith(renderCanvas);\r\n });\r\n\r\n it(\"Warns if it can't find the babylon rendering when a canvas is submitted\", () => {\r\n const { mockBabylon, renderUC, mockWarn } = makeTestRig();\r\n const renderCanvas = document.createElement(\"canvas\");\r\n mockBabylon.dispose();\r\n renderUC.submitCanvas(renderCanvas);\r\n\r\n expect(mockWarn).toHaveBeenCalled();\r\n });\r\n\r\n it(\"Clears the input element from babylon rendering\", () => {\r\n const { mockBabylon, renderUC } = makeTestRig();\r\n\r\n renderUC.clearCanvas();\r\n\r\n expect(mockBabylon.clearRenderCanvas).toHaveBeenCalled();\r\n });\r\n\r\n it(\"Warns if it can't find the babylon rendering when a canvas is cleared\", () => {\r\n const { mockBabylon, renderUC, mockWarn } = makeTestRig();\r\n\r\n mockBabylon.dispose();\r\n renderUC.clearCanvas();\r\n\r\n expect(mockWarn).toHaveBeenCalled();\r\n });\r\n\r\n it(\"Gets the UC\", () => {\r\n const { renderUC, appObjects } = makeTestRig();\r\n\r\n expect(RenderCanvasUC.get(appObjects)).toEqual(renderUC);\r\n });\r\n\r\n it(\"Warns and returns undefined if there is no UC\", () => {\r\n const { renderUC, appObjects, mockWarn } = makeTestRig();\r\n renderUC.dispose();\r\n\r\n expect(RenderCanvasUC.get(appObjects)).toBeUndefined();\r\n expect(mockWarn).toHaveBeenCalled();\r\n });\r\n\r\n it(\"Warns if there are more than two UCs found\", () => {\r\n const { appObjects, mockWarn } = makeTestRig();\r\n const newAO = appObjects.getOrCreate(\"newAO\");\r\n\r\n makeRenderCanvasUC(newAO);\r\n\r\n expect(RenderCanvasUC.get(appObjects)).not.toBeUndefined();\r\n expect(mockWarn).toHaveBeenCalled();\r\n });\r\n});\r\n"]}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { DomainFactory } from "@vived/core";
|
|
2
|
-
import { ObjectPickEntity } from "../../ObjectPick";
|
|
3
2
|
import { makeChallengeEntity } from "../Entities";
|
|
4
3
|
import { makeChallengeAuthorHelpPM, makeChallengeConsumerHelpPM, makeSelectedChallengePM, } from "../PMs";
|
|
5
4
|
import { makeSetChallengeUC, makeShowChallengeHelpUC, makeTryChallengeAgainUC, SerializeChallengeUC, } from "../UCs";
|
|
@@ -17,11 +16,9 @@ import { makeSetChallengeUC, makeShowChallengeHelpUC, makeTryChallengeAgainUC, S
|
|
|
17
16
|
* - 3 Presentation Models: makeChallengeAuthorHelpPM, makeChallengeConsumerHelpPM,
|
|
18
17
|
* makeSelectedChallengePM
|
|
19
18
|
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
23
|
-
* This factory provides equivalent functionality to the setupChallenge function
|
|
24
|
-
* while maintaining backwards compatibility.
|
|
19
|
+
* Challenge kinds are not registered here. Each kind self-registers with the
|
|
20
|
+
* Challenge entity from its own feature factory, so a composition that declines
|
|
21
|
+
* a kind simply never registers it.
|
|
25
22
|
*
|
|
26
23
|
* @extends DomainFactory
|
|
27
24
|
*/
|
|
@@ -37,7 +34,7 @@ export class ChallengeFeatureFactory extends DomainFactory {
|
|
|
37
34
|
* logic for challenge functionality and challenge registration.
|
|
38
35
|
*/
|
|
39
36
|
setupEntities() {
|
|
40
|
-
|
|
37
|
+
makeChallengeEntity(this.appObject);
|
|
41
38
|
}
|
|
42
39
|
/**
|
|
43
40
|
* Sets up all use cases for the Challenge Feature.
|
|
@@ -71,35 +68,19 @@ export class ChallengeFeatureFactory extends DomainFactory {
|
|
|
71
68
|
/**
|
|
72
69
|
* Performs final setup operations after all components are initialized.
|
|
73
70
|
*
|
|
74
|
-
*
|
|
75
|
-
*
|
|
76
|
-
*
|
|
77
|
-
*
|
|
78
|
-
* This method replicates the exact challenge registration logic and error
|
|
79
|
-
* handling patterns from the setupChallenge function to ensure functional
|
|
80
|
-
* equivalence.
|
|
71
|
+
* Nothing to do. Challenge kinds register themselves with the Challenge
|
|
72
|
+
* entity from their own feature factories, so this factory has no external
|
|
73
|
+
* wiring left to perform. Required by DomainFactory.
|
|
81
74
|
*/
|
|
82
75
|
finalSetup() {
|
|
83
|
-
|
|
84
|
-
return;
|
|
85
|
-
}
|
|
86
|
-
const appObjects = this.appObject.appObjectRepo;
|
|
87
|
-
const objectPick = ObjectPickEntity.get(appObjects);
|
|
88
|
-
if (!objectPick) {
|
|
89
|
-
appObjects.submitError("setupChallenge", "No ObjectPickEntity");
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
92
|
-
this.challengeEntity.registerChallenge(objectPick);
|
|
93
|
-
}
|
|
76
|
+
// Intentionally empty - challenge kinds self-register.
|
|
94
77
|
}
|
|
95
78
|
}
|
|
96
79
|
/**
|
|
97
80
|
* Factory function to create a new ChallengeFeatureFactory
|
|
98
81
|
*
|
|
99
82
|
* Creates and returns a new instance of ChallengeFeatureFactory that can be
|
|
100
|
-
* used to set up all Challenge Feature domain components.
|
|
101
|
-
* alternative to the legacy setupChallenge function while maintaining the
|
|
102
|
-
* same functionality and external challenge registration behavior.
|
|
83
|
+
* used to set up all Challenge Feature domain components.
|
|
103
84
|
*
|
|
104
85
|
* @param appObjectRepo The AppObjectRepo to create the Challenge AppObject from
|
|
105
86
|
* @returns A new ChallengeFeatureFactory instance
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChallengeFeatureFactory.js","sourceRoot":"","sources":["../../../../src/Challenge/Factories/ChallengeFeatureFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA4B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ChallengeFeatureFactory.js","sourceRoot":"","sources":["../../../../src/Challenge/Factories/ChallengeFeatureFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA4B,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EACL,yBAAyB,EACzB,2BAA2B,EAC3B,uBAAuB,GACxB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,QAAQ,CAAC;AAEhB;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,OAAO,uBAAwB,SAAQ,aAAa;IAA1D;;QACE,gBAAW,GAAG,yBAAyB,CAAC;IAqD1C,CAAC;IAnDC;;;;;OAKG;IACH,aAAa;QACX,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IAED;;;;;;;;OAQG;IACH,QAAQ;QACN,yEAAyE;QACzE,IAAI,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACH,QAAQ;QACN,MAAM;QACN,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1C,2BAA2B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5C,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACH,UAAU;QACR,uDAAuD;IACzD,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,2BAA2B,CACzC,aAA4B;IAE5B,MAAM,SAAS,GAAG,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACzD,OAAO,IAAI,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAChD,CAAC","sourcesContent":["import { DomainFactory, AppObject, AppObjectRepo } from \"@vived/core\";\r\nimport { makeChallengeEntity } from \"../Entities\";\r\nimport {\r\n makeChallengeAuthorHelpPM,\r\n makeChallengeConsumerHelpPM,\r\n makeSelectedChallengePM,\r\n} from \"../PMs\";\r\nimport {\r\n makeSetChallengeUC,\r\n makeShowChallengeHelpUC,\r\n makeTryChallengeAgainUC,\r\n SerializeChallengeUC,\r\n} from \"../UCs\";\r\n\r\n/**\r\n * Factory responsible for setting up the Challenge Feature domain components.\r\n *\r\n * This factory initializes all entities, use cases, and presentation models\r\n * required for the Challenge Feature functionality. It follows the domain-driven\r\n * design pattern by organizing components into their respective layers.\r\n *\r\n * The factory creates:\r\n * - 1 Entity: Challenge entity for managing challenge state and registration\r\n * - 4 Use Cases: SerializeChallengeUC (class constructor), makeSetChallengeUC,\r\n * makeShowChallengeHelpUC, makeTryChallengeAgainUC (factory functions)\r\n * - 3 Presentation Models: makeChallengeAuthorHelpPM, makeChallengeConsumerHelpPM,\r\n * makeSelectedChallengePM\r\n *\r\n * Challenge kinds are not registered here. Each kind self-registers with the\r\n * Challenge entity from its own feature factory, so a composition that declines\r\n * a kind simply never registers it.\r\n *\r\n * @extends DomainFactory\r\n */\r\nexport class ChallengeFeatureFactory extends DomainFactory {\r\n factoryName = \"ChallengeFeatureFactory\";\r\n\r\n /**\r\n * Sets up all entities required for the Challenge Feature.\r\n *\r\n * Initializes the Challenge entity that maintains the state and business\r\n * logic for challenge functionality and challenge registration.\r\n */\r\n setupEntities(): void {\r\n makeChallengeEntity(this.appObject);\r\n }\r\n\r\n /**\r\n * Sets up all use cases for the Challenge Feature.\r\n *\r\n * Initializes use cases that define the business operations and\r\n * workflows available in the challenge feature. This includes both\r\n * class constructor patterns (SerializeChallengeUC) and factory\r\n * function patterns (makeSetChallengeUC, makeShowChallengeHelpUC,\r\n * makeTryChallengeAgainUC).\r\n */\r\n setupUCs(): void {\r\n // UCs - mixed creation patterns (class constructor vs factory functions)\r\n new SerializeChallengeUC(this.appObject);\r\n makeSetChallengeUC(this.appObject);\r\n makeShowChallengeHelpUC(this.appObject);\r\n makeTryChallengeAgainUC(this.appObject);\r\n }\r\n\r\n /**\r\n * Sets up all presentation models for the Challenge Feature.\r\n *\r\n * Initializes presentation models that handle the view logic and\r\n * state management for UI components related to challenge help and\r\n * selection functionality.\r\n */\r\n setupPMs(): void {\r\n // PMs\r\n makeChallengeAuthorHelpPM(this.appObject);\r\n makeChallengeConsumerHelpPM(this.appObject);\r\n makeSelectedChallengePM(this.appObject);\r\n }\r\n\r\n /**\r\n * Performs final setup operations after all components are initialized.\r\n *\r\n * Nothing to do. Challenge kinds register themselves with the Challenge\r\n * entity from their own feature factories, so this factory has no external\r\n * wiring left to perform. Required by DomainFactory.\r\n */\r\n finalSetup(): void {\r\n // Intentionally empty - challenge kinds self-register.\r\n }\r\n}\r\n\r\n/**\r\n * Factory function to create a new ChallengeFeatureFactory\r\n *\r\n * Creates and returns a new instance of ChallengeFeatureFactory that can be\r\n * used to set up all Challenge Feature domain components.\r\n *\r\n * @param appObjectRepo The AppObjectRepo to create the Challenge AppObject from\r\n * @returns A new ChallengeFeatureFactory instance\r\n */\r\nexport function makeChallengeFeatureFactory(\r\n appObjectRepo: AppObjectRepo,\r\n): ChallengeFeatureFactory {\r\n const appObject = appObjectRepo.getOrCreate(\"Challenge\");\r\n return new ChallengeFeatureFactory(appObject);\r\n}\r\n"]}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { DomainFactoryRepo, makeAppObjectRepo, } from "@vived/core";
|
|
2
|
+
import { makeBaseAppState } from "../../BaseApp/Entity/BaseAppState";
|
|
3
|
+
import { makeObjectPickEntity } from "../../ObjectPick";
|
|
4
|
+
import { makeStateMachineEntity } from "../../StateMachine";
|
|
5
|
+
import { ChallengeEntity } from "../Entities/ChallengeEntity";
|
|
6
|
+
import { makeChallengeFeatureFactory, } from "./ChallengeFeatureFactory";
|
|
7
|
+
function setupFeature(appObjects) {
|
|
8
|
+
const factory = makeChallengeFeatureFactory(appObjects);
|
|
9
|
+
factory.setupEntities();
|
|
10
|
+
factory.setupUCs();
|
|
11
|
+
factory.setupPMs();
|
|
12
|
+
factory.finalSetup();
|
|
13
|
+
return factory;
|
|
14
|
+
}
|
|
15
|
+
function makeTestRig() {
|
|
16
|
+
const appObjects = makeAppObjectRepo();
|
|
17
|
+
// DomainFactory auto-registers with this on construction.
|
|
18
|
+
new DomainFactoryRepo(appObjects.getOrCreate("DomainFactory"));
|
|
19
|
+
// Boundary singletons the Challenge feature genuinely needs: the PMs read
|
|
20
|
+
// BaseAppState and SerializeChallengeUC registers with the StateMachine.
|
|
21
|
+
makeBaseAppState(appObjects.getOrCreate("BaseApp"));
|
|
22
|
+
makeStateMachineEntity(appObjects.getOrCreate("StateMachine"));
|
|
23
|
+
const mockError = jest.fn();
|
|
24
|
+
const mockWarn = jest.fn();
|
|
25
|
+
appObjects.submitError = mockError;
|
|
26
|
+
appObjects.submitWarning = mockWarn;
|
|
27
|
+
return { appObjects, mockError, mockWarn };
|
|
28
|
+
}
|
|
29
|
+
describe("Challenge Feature Factory", () => {
|
|
30
|
+
it("Creates the Challenge entity", () => {
|
|
31
|
+
const { appObjects } = makeTestRig();
|
|
32
|
+
setupFeature(appObjects);
|
|
33
|
+
expect(ChallengeEntity.get(appObjects)).toBeDefined();
|
|
34
|
+
});
|
|
35
|
+
it("Wires without complaint when no challenge kinds are present", () => {
|
|
36
|
+
const { appObjects, mockError, mockWarn } = makeTestRig();
|
|
37
|
+
setupFeature(appObjects);
|
|
38
|
+
expect(mockError).not.toHaveBeenCalled();
|
|
39
|
+
expect(mockWarn).not.toHaveBeenCalled();
|
|
40
|
+
});
|
|
41
|
+
it("Registers no challenge kinds itself - each kind self-registers", () => {
|
|
42
|
+
const { appObjects } = makeTestRig();
|
|
43
|
+
const objectPick = makeObjectPickEntity(appObjects.getOrCreate("ObjectPick"));
|
|
44
|
+
setupFeature(appObjects);
|
|
45
|
+
const registered = ChallengeEntity.get(appObjects).allChallenges.map((challenge) => challenge.challengeID);
|
|
46
|
+
expect(registered).not.toContain(objectPick.challengeID);
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
//# sourceMappingURL=ChallengeFeatureFactory.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ChallengeFeatureFactory.test.js","sourceRoot":"","sources":["../../../../src/Challenge/Factories/ChallengeFeatureFactory.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAEL,2BAA2B,GAC5B,MAAM,2BAA2B,CAAC;AAEnC,SAAS,YAAY,CAAC,UAAyB;IAC7C,MAAM,OAAO,GAAG,2BAA2B,CAAC,UAAU,CAAC,CAAC;IACxD,OAAO,CAAC,aAAa,EAAE,CAAC;IACxB,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnB,OAAO,CAAC,QAAQ,EAAE,CAAC;IACnB,OAAO,CAAC,UAAU,EAAE,CAAC;IACrB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,WAAW;IAClB,MAAM,UAAU,GAAG,iBAAiB,EAAE,CAAC;IAEvC,0DAA0D;IAC1D,IAAI,iBAAiB,CAAC,UAAU,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;IAE/D,0EAA0E;IAC1E,yEAAyE;IACzE,gBAAgB,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;IACpD,sBAAsB,CAAC,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAC3B,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC;IACnC,UAAU,CAAC,aAAa,GAAG,QAAQ,CAAC;IAEpC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAC7C,CAAC;AAED,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAC;QAErC,YAAY,CAAC,UAAU,CAAC,CAAC;QAEzB,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,WAAW,EAAE,CAAC;QAE1D,YAAY,CAAC,UAAU,CAAC,CAAC;QAEzB,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACzC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAC;QACrC,MAAM,UAAU,GAAG,oBAAoB,CACrC,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,CACrC,CAAC;QAEF,YAAY,CAAC,UAAU,CAAC,CAAC;QAEzB,MAAM,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,aAAa,CAAC,GAAG,CACnE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CACrC,CAAC;QACF,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import {\r\n AppObjectRepo,\r\n DomainFactoryRepo,\r\n makeAppObjectRepo,\r\n} from \"@vived/core\";\r\nimport { makeBaseAppState } from \"../../BaseApp/Entity/BaseAppState\";\r\nimport { makeObjectPickEntity } from \"../../ObjectPick\";\r\nimport { makeStateMachineEntity } from \"../../StateMachine\";\r\nimport { ChallengeEntity } from \"../Entities/ChallengeEntity\";\r\nimport {\r\n ChallengeFeatureFactory,\r\n makeChallengeFeatureFactory,\r\n} from \"./ChallengeFeatureFactory\";\r\n\r\nfunction setupFeature(appObjects: AppObjectRepo): ChallengeFeatureFactory {\r\n const factory = makeChallengeFeatureFactory(appObjects);\r\n factory.setupEntities();\r\n factory.setupUCs();\r\n factory.setupPMs();\r\n factory.finalSetup();\r\n return factory;\r\n}\r\n\r\nfunction makeTestRig() {\r\n const appObjects = makeAppObjectRepo();\r\n\r\n // DomainFactory auto-registers with this on construction.\r\n new DomainFactoryRepo(appObjects.getOrCreate(\"DomainFactory\"));\r\n\r\n // Boundary singletons the Challenge feature genuinely needs: the PMs read\r\n // BaseAppState and SerializeChallengeUC registers with the StateMachine.\r\n makeBaseAppState(appObjects.getOrCreate(\"BaseApp\"));\r\n makeStateMachineEntity(appObjects.getOrCreate(\"StateMachine\"));\r\n\r\n const mockError = jest.fn();\r\n const mockWarn = jest.fn();\r\n appObjects.submitError = mockError;\r\n appObjects.submitWarning = mockWarn;\r\n\r\n return { appObjects, mockError, mockWarn };\r\n}\r\n\r\ndescribe(\"Challenge Feature Factory\", () => {\r\n it(\"Creates the Challenge entity\", () => {\r\n const { appObjects } = makeTestRig();\r\n\r\n setupFeature(appObjects);\r\n\r\n expect(ChallengeEntity.get(appObjects)).toBeDefined();\r\n });\r\n\r\n it(\"Wires without complaint when no challenge kinds are present\", () => {\r\n const { appObjects, mockError, mockWarn } = makeTestRig();\r\n\r\n setupFeature(appObjects);\r\n\r\n expect(mockError).not.toHaveBeenCalled();\r\n expect(mockWarn).not.toHaveBeenCalled();\r\n });\r\n\r\n it(\"Registers no challenge kinds itself - each kind self-registers\", () => {\r\n const { appObjects } = makeTestRig();\r\n const objectPick = makeObjectPickEntity(\r\n appObjects.getOrCreate(\"ObjectPick\"),\r\n );\r\n\r\n setupFeature(appObjects);\r\n\r\n const registered = ChallengeEntity.get(appObjects)!.allChallenges.map(\r\n (challenge) => challenge.challengeID,\r\n );\r\n expect(registered).not.toContain(objectPick.challengeID);\r\n });\r\n});\r\n"]}
|
|
@@ -11,14 +11,24 @@ export function makeEventEntity(appObject) {
|
|
|
11
11
|
return new EventEntityImp(appObject);
|
|
12
12
|
}
|
|
13
13
|
class EventEntityImp extends EventEntity {
|
|
14
|
-
register(id, name) {
|
|
14
|
+
register(id, name, options) {
|
|
15
15
|
if (this.eventRegistry.has(id)) {
|
|
16
16
|
this.appObjects.submitWarning("EventEntity", `Event with id '${id}' is already registered`);
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
|
|
19
|
+
// Store the category only when the caller passed one, so the definitions
|
|
20
|
+
// handed to existing consumers (e.g. a Procedure's availableEvents) stay
|
|
21
|
+
// byte-identical; getEventCategory normalizes the default.
|
|
22
|
+
const definition = { id, name };
|
|
23
|
+
if (options?.category) {
|
|
24
|
+
definition.category = options.category;
|
|
25
|
+
}
|
|
26
|
+
this.eventRegistry.set(id, definition);
|
|
20
27
|
this.notifyOnChange();
|
|
21
28
|
}
|
|
29
|
+
getEventCategory(id) {
|
|
30
|
+
return this.eventRegistry.get(id)?.category ?? "assessed";
|
|
31
|
+
}
|
|
22
32
|
emit(id) {
|
|
23
33
|
if (!this.eventRegistry.has(id)) {
|
|
24
34
|
this.appObjects.submitWarning("EventEntity", `Cannot emit unknown event with id '${id}'`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EventEntity.js","sourceRoot":"","sources":["../../../../src/EventSystem/Entities/EventEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAEf,qBAAqB,EACrB,cAAc,GACf,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"EventEntity.js","sourceRoot":"","sources":["../../../../src/EventSystem/Entities/EventEntity.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n AppObject,\r\n AppObjectEntity,\r\n AppObjectRepo,\r\n getSingletonComponent,\r\n MemoizedString,\r\n} from \"@vived/core\";\r\nimport {\r\n EventCategory,\r\n EventDefinition,\r\n EventRegistrationOptions,\r\n} from \"../types\";\r\n\r\n/**\r\n * EventEntity represents a global singleton for event registration and logging.\r\n * Only one instance exists in the application.\r\n */\r\nexport abstract class EventEntity extends AppObjectEntity {\r\n static readonly type = \"EventEntity\";\r\n\r\n /**\r\n * Register an event. `options.category` classifies it for scoring\r\n * (`\"assessed\"` by default, or `\"instructional\"` for quiz-neutral guidance);\r\n * see `EventCategory`. The two-argument form is unchanged.\r\n */\r\n abstract register(\r\n id: string,\r\n name: string,\r\n options?: EventRegistrationOptions,\r\n ): void;\r\n abstract emit(id: string): void;\r\n abstract reset(): void;\r\n abstract getRegisteredEvents(): EventDefinition[];\r\n abstract getEmittedEvents(): string[];\r\n abstract getLastEmittedId(): string | null;\r\n\r\n /**\r\n * The category an event was registered with. Unregistered ids and\r\n * registrations that omitted the option are `\"assessed\"`, so every legacy\r\n * consumer is classified exactly as before categories existed.\r\n */\r\n abstract getEventCategory(id: string): EventCategory;\r\n\r\n /**\r\n * Register a callback that is invoked on every emission, with the emitted\r\n * event ID. Unlike addChangeObserver, this fires for every emit() call —\r\n * including consecutive emissions of the same event ID.\r\n */\r\n abstract addEmissionListener(callback: (eventId: string) => void): void;\r\n\r\n /** Remove a previously registered emission listener. */\r\n abstract removeEmissionListener(callback: (eventId: string) => void): void;\r\n\r\n static get = (appObjects: AppObjectRepo): EventEntity | undefined =>\r\n getSingletonComponent(EventEntity.type, appObjects);\r\n}\r\n\r\nexport function makeEventEntity(appObject: AppObject): EventEntity {\r\n return new EventEntityImp(appObject);\r\n}\r\n\r\nclass EventEntityImp extends EventEntity {\r\n private eventRegistry = new Map<string, EventDefinition>();\r\n private eventLog: string[] = [];\r\n private memoizedLastEmittedId = new MemoizedString(\"\", this.notifyOnChange);\r\n private emissionListeners = new Set<(eventId: string) => void>();\r\n\r\n register(\r\n id: string,\r\n name: string,\r\n options?: EventRegistrationOptions,\r\n ): void {\r\n if (this.eventRegistry.has(id)) {\r\n this.appObjects.submitWarning(\r\n \"EventEntity\",\r\n `Event with id '${id}' is already registered`,\r\n );\r\n return;\r\n }\r\n\r\n // Store the category only when the caller passed one, so the definitions\r\n // handed to existing consumers (e.g. a Procedure's availableEvents) stay\r\n // byte-identical; getEventCategory normalizes the default.\r\n const definition: EventDefinition = { id, name };\r\n if (options?.category) {\r\n definition.category = options.category;\r\n }\r\n\r\n this.eventRegistry.set(id, definition);\r\n this.notifyOnChange();\r\n }\r\n\r\n getEventCategory(id: string): EventCategory {\r\n return this.eventRegistry.get(id)?.category ?? \"assessed\";\r\n }\r\n\r\n emit(id: string): void {\r\n if (!this.eventRegistry.has(id)) {\r\n this.appObjects.submitWarning(\r\n \"EventEntity\",\r\n `Cannot emit unknown event with id '${id}'`,\r\n );\r\n return;\r\n }\r\n\r\n this.eventLog.push(id);\r\n this.memoizedLastEmittedId.val = id;\r\n\r\n for (const listener of this.emissionListeners) {\r\n listener(id);\r\n }\r\n }\r\n\r\n reset(): void {\r\n this.eventLog = [];\r\n this.memoizedLastEmittedId.val = \"\";\r\n }\r\n\r\n getRegisteredEvents(): EventDefinition[] {\r\n return Array.from(this.eventRegistry.values());\r\n }\r\n\r\n getEmittedEvents(): string[] {\r\n return [...this.eventLog];\r\n }\r\n\r\n getLastEmittedId(): string | null {\r\n const lastId = this.memoizedLastEmittedId.val;\r\n return lastId === \"\" ? null : lastId;\r\n }\r\n\r\n addEmissionListener(callback: (eventId: string) => void): void {\r\n this.emissionListeners.add(callback);\r\n }\r\n\r\n removeEmissionListener(callback: (eventId: string) => void): void {\r\n this.emissionListeners.delete(callback);\r\n }\r\n\r\n constructor(appObject: AppObject) {\r\n super(appObject, EventEntity.type);\r\n this.appObjects.registerSingleton(this);\r\n }\r\n}\r\n"]}
|
|
@@ -185,5 +185,50 @@ describe("EventEntity", () => {
|
|
|
185
185
|
expect(entity.getRegisteredEvents()).toHaveLength(1);
|
|
186
186
|
expect(entity.getEmittedEvents()).toHaveLength(1);
|
|
187
187
|
});
|
|
188
|
+
describe("event categories (#53)", () => {
|
|
189
|
+
it("stores an explicit category on the definition", () => {
|
|
190
|
+
entity.register("navigate-to-overhead", "Go to overhead", {
|
|
191
|
+
category: "instructional",
|
|
192
|
+
});
|
|
193
|
+
expect(entity.getRegisteredEvents()[0]).toEqual({
|
|
194
|
+
id: "navigate-to-overhead",
|
|
195
|
+
name: "Go to overhead",
|
|
196
|
+
category: "instructional",
|
|
197
|
+
});
|
|
198
|
+
expect(entity.getEventCategory("navigate-to-overhead")).toBe("instructional");
|
|
199
|
+
});
|
|
200
|
+
it("defaults an omitted category to assessed without adding a key to the definition", () => {
|
|
201
|
+
entity.register("lever", "Pull lever");
|
|
202
|
+
entity.register("valve", "Open valve", {});
|
|
203
|
+
expect(entity.getRegisteredEvents()).toEqual([
|
|
204
|
+
{ id: "lever", name: "Pull lever" },
|
|
205
|
+
{ id: "valve", name: "Open valve" },
|
|
206
|
+
]);
|
|
207
|
+
expect(Object.keys(entity.getRegisteredEvents()[0])).toEqual(["id", "name"]);
|
|
208
|
+
expect(entity.getEventCategory("lever")).toBe("assessed");
|
|
209
|
+
expect(entity.getEventCategory("valve")).toBe("assessed");
|
|
210
|
+
});
|
|
211
|
+
it("treats an unregistered id as assessed", () => {
|
|
212
|
+
expect(entity.getEventCategory("legacy-step")).toBe("assessed");
|
|
213
|
+
});
|
|
214
|
+
it("keeps the first registration's category on a duplicate registration", () => {
|
|
215
|
+
entity.register("lever", "Pull lever");
|
|
216
|
+
entity.register("lever", "Pull lever again", {
|
|
217
|
+
category: "instructional",
|
|
218
|
+
});
|
|
219
|
+
expect(entity.getEventCategory("lever")).toBe("assessed");
|
|
220
|
+
});
|
|
221
|
+
it("emits an instructional event exactly like an assessed one", () => {
|
|
222
|
+
entity.register("navigate-to-overhead", "Go to overhead", {
|
|
223
|
+
category: "instructional",
|
|
224
|
+
});
|
|
225
|
+
const listener = jest.fn();
|
|
226
|
+
entity.addEmissionListener(listener);
|
|
227
|
+
entity.emit("navigate-to-overhead");
|
|
228
|
+
expect(listener).toHaveBeenCalledWith("navigate-to-overhead");
|
|
229
|
+
expect(entity.getEmittedEvents()).toEqual(["navigate-to-overhead"]);
|
|
230
|
+
expect(entity.getLastEmittedId()).toBe("navigate-to-overhead");
|
|
231
|
+
});
|
|
232
|
+
});
|
|
188
233
|
});
|
|
189
234
|
//# sourceMappingURL=EventEntity.test.js.map
|