@vived/app 4.15.0 → 4.16.0

package/lib/Components/Challenge/Controller/index.d.ts

@@ -1 +1,2 @@
 export * from "./setChallenge";
+export * from "./showChallengeHelp";

package/lib/Components/Challenge/Controller/index.js

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

package/lib/Components/Challenge/Controller/setChallenge.js

@@ -4,10 +4,10 @@ exports.setChallenge = void 0;
 const SetChallengeUC_1 = require("../UCs/SetChallengeUC");
 function setChallenge(challenge, appObjects) {
     const uc = SetChallengeUC_1.SetChallengeUC.get(appObjects);
-    if (!challenge) {
+    if (!uc) {
         appObjects.submitWarning("setChallenge", "Unable to find SetChallengeUC");
         return;
     }
-    uc === null || uc === void 0 ? void 0 : uc.setChallenge(challenge);
+    uc.setChallenge(challenge);
 }
 exports.setChallenge = setChallenge;

package/lib/Components/Challenge/Controller/showChallengeHelp.d.ts

@@ -0,0 +1,2 @@
+import { AppObjectRepo } from "../../../AppObject";
+export declare function showChallengeHelp(appObjects: AppObjectRepo): void;

package/lib/Components/Challenge/Controller/showChallengeHelp.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.showChallengeHelp = void 0;
+const UCs_1 = require("../UCs");
+function showChallengeHelp(appObjects) {
+    const uc = UCs_1.ShowChallengeHelpUC.get(appObjects);
+    if (!uc) {
+        appObjects.submitWarning("showChallengeHelp", "Unable to find ShowChallengeHelpUC");
+        return;
+    }
+    uc.showChallengeHelp();
+}
+exports.showChallengeHelp = showChallengeHelp;

package/lib/Components/Challenge/Entities/ChallengeEntity.d.ts

@@ -1,8 +1,9 @@
 import { AppObject, AppObjectEntity, AppObjectRepo } from "../../../AppObject";
 export declare abstract class ChallengeEntity<CT> extends AppObjectEntity {
     static type: string;
-    abstract get selectedChallenge(): CT | undefined;
-    abstract set selectedChallenge(val: CT | undefined);
+    abstract readonly defaultChallenge: CT;
+    abstract get selectedChallenge(): CT;
+    abstract set selectedChallenge(val: CT);
     abstract get selectedChallengeName(): string;
     abstract get allChallengeNames(): Map<CT, string>;
     abstract setChallengeNames(list: {
@@ -26,4 +27,4 @@ export declare abstract class ChallengeEntity<CT> extends AppObjectEntity {
     }[]): void;
     static get<ChallengeType>(appObjects: AppObjectRepo): ChallengeEntity<ChallengeType> | undefined;
 }
-export declare function makeChallengeEntity<CT>(appObject: AppObject): ChallengeEntity<CT>;
+export declare function makeChallengeEntity<CT>(appObject: AppObject, defaultChallenge: CT): ChallengeEntity<CT>;

package/lib/Components/Challenge/Entities/ChallengeEntity.js

@@ -9,24 +9,22 @@ class ChallengeEntity extends AppObject_1.AppObjectEntity {
 }
 exports.ChallengeEntity = ChallengeEntity;
 ChallengeEntity.type = "ChallengeEntity";
-function makeChallengeEntity(appObject) {
-    return new ChallengeEntityImp(appObject);
+function makeChallengeEntity(appObject, defaultChallenge) {
+    return new ChallengeEntityImp(appObject, defaultChallenge);
 }
 exports.makeChallengeEntity = makeChallengeEntity;
 class ChallengeEntityImp extends ChallengeEntity {
-    constructor(appObject) {
+    constructor(appObject, defaultChallenge) {
         super(appObject, ChallengeEntity.type);
         this.challengeNameLookup = new Map();
         this.helpTextLookup = new Map();
         this.authorHelpLookup = new Map();
         this.helpHeadingLookup = new Map();
+        this.defaultChallenge = defaultChallenge;
         this.appObjects.registerSingleton(this);
     }
     get selectedChallengeName() {
         var _a;
-        if (this.selectedChallenge === undefined) {
-            return "";
-        }
         return (_a = this.challengeNameLookup.get(this.selectedChallenge)) !== null && _a !== void 0 ? _a : "";
     }
     get allChallengeNames() {
@@ -39,9 +37,6 @@ class ChallengeEntityImp extends ChallengeEntity {
     }
     get helpText() {
         var _a;
-        if (this.selectedChallenge === undefined) {
-            return "";
-        }
         return (_a = this.helpTextLookup.get(this.selectedChallenge)) !== null && _a !== void 0 ? _a : "";
     }
     setHelpText(list) {
@@ -51,9 +46,6 @@ class ChallengeEntityImp extends ChallengeEntity {
     }
     get authorHelp() {
         var _a;
-        if (this.selectedChallenge === undefined) {
-            return "";
-        }
         return (_a = this.authorHelpLookup.get(this.selectedChallenge)) !== null && _a !== void 0 ? _a : "";
     }
     setAuthorHelp(list) {
@@ -63,9 +55,6 @@ class ChallengeEntityImp extends ChallengeEntity {
     }
     get helpHeading() {
         var _a;
-        if (this.selectedChallenge === undefined) {
-            return "";
-        }
         return (_a = this.helpHeadingLookup.get(this.selectedChallenge)) !== null && _a !== void 0 ? _a : "";
     }
     setHelpHeading(list) {
@@ -74,7 +63,12 @@ class ChallengeEntityImp extends ChallengeEntity {
         });
     }
     get selectedChallenge() {
-        return this._selectedChallenge;
+        if (!this._selectedChallenge) {
+            return this.defaultChallenge;
+        }
+        else {
+            return this._selectedChallenge;
+        }
     }
     set selectedChallenge(val) {
         if (this._selectedChallenge === val)

package/lib/Components/Challenge/Mocks/MockShowChallengeHelpUC.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="jest" />
+import { AppObject, AppObjectRepo } from "../../../AppObject";
+import { ShowChallengeHelpUC } from "../UCs";
+export declare class MockShowChallengeHelpUC extends ShowChallengeHelpUC {
+    showChallengeHelp: jest.Mock<any, any>;
+    constructor(appObject: AppObject);
+}
+export declare function makeMockShowChallengeHelpUC(appObjects: AppObjectRepo): MockShowChallengeHelpUC;

package/lib/Components/Challenge/Mocks/MockShowChallengeHelpUC.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeMockShowChallengeHelpUC = exports.MockShowChallengeHelpUC = void 0;
+const UCs_1 = require("../UCs");
+class MockShowChallengeHelpUC extends UCs_1.ShowChallengeHelpUC {
+    constructor(appObject) {
+        super(appObject, UCs_1.ShowChallengeHelpUC.type);
+        this.showChallengeHelp = jest.fn();
+    }
+}
+exports.MockShowChallengeHelpUC = MockShowChallengeHelpUC;
+function makeMockShowChallengeHelpUC(appObjects) {
+    return new MockShowChallengeHelpUC(appObjects.getOrCreate("MockShowChallengeHelpUC"));
+}
+exports.makeMockShowChallengeHelpUC = makeMockShowChallengeHelpUC;

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

@@ -2,3 +2,4 @@ export * from "./MockChallengeAuthorHelpPM";
 export * from "./MockChallengeConsumerHelpPM";
 export * from "./MockSelectedChallengePM";
 export * from "./MockSetChallengeUC";
+export * from "./MockShowChallengeHelpUC";

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

@@ -14,3 +14,4 @@ __exportStar(require("./MockChallengeAuthorHelpPM"), exports);
 __exportStar(require("./MockChallengeConsumerHelpPM"), exports);
 __exportStar(require("./MockSelectedChallengePM"), exports);
 __exportStar(require("./MockSetChallengeUC"), exports);
+__exportStar(require("./MockShowChallengeHelpUC"), exports);

package/lib/Components/Challenge/UCs/SerializeChallenge.d.ts

@@ -1,7 +1,6 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
 import { SerializedSystem } from "../../StateMachine";
 export declare class SerializeChallengeUC<CT> extends AppObjectUC implements SerializedSystem {
-    private defaultChallenge;
     static readonly type = "SerializeChallengeUC";
     name: string;
     seriliziationVersion: number;
@@ -10,7 +9,7 @@ export declare class SerializeChallengeUC<CT> extends AppObjectUC implements Ser
     applySystemState(state: object, version: number): void;
     private applyVersion1;
     applyDefaultState(): void;
-    constructor(appObject: AppObject, defaultChallenge: CT);
+    constructor(appObject: AppObject);
 }
 export interface SerializedStateV1 {
     challenge: string;

package/lib/Components/Challenge/UCs/SerializeChallenge.js

@@ -5,9 +5,8 @@ const AppObject_1 = require("../../../AppObject");
 const StateMachine_1 = require("../../StateMachine");
 const ChallengeEntity_1 = require("../Entities/ChallengeEntity");
 class SerializeChallengeUC extends AppObject_1.AppObjectUC {
-    constructor(appObject, defaultChallenge) {
+    constructor(appObject) {
         super(appObject, SerializeChallengeUC.type);
-        this.defaultChallenge = defaultChallenge;
         this.name = "challenge";
         this.seriliziationVersion = 1;
         const stateMachine = StateMachine_1.StateMachineEntity.get(appObject.appObjectRepo);
@@ -24,12 +23,13 @@ class SerializeChallengeUC extends AppObject_1.AppObjectUC {
     getSystemState() {
         if (!this.challenge)
             return {};
-        let challenge = this.defaultChallenge;
+        let challenge = this.challenge
+            .defaultChallenge;
         if (this.challenge.selectedChallenge) {
             challenge = this.challenge.selectedChallenge;
         }
         const state = {
-            challenge
+            challenge,
         };
         return state;
     }
@@ -49,7 +49,7 @@ class SerializeChallengeUC extends AppObject_1.AppObjectUC {
     applyDefaultState() {
         if (!this.challenge)
             return;
-        this.challenge.selectedChallenge = this.defaultChallenge;
+        this.challenge.selectedChallenge = this.challenge.defaultChallenge;
     }
 }
 exports.SerializeChallengeUC = SerializeChallengeUC;

package/lib/Components/Challenge/UCs/ShowChallengeHelpUC.d.ts

@@ -0,0 +1,7 @@
+import { AppObject, AppObjectRepo, AppObjectUC } from "../../../AppObject";
+export declare abstract class ShowChallengeHelpUC extends AppObjectUC {
+    static readonly type = "ShowChallengeHelpUC";
+    abstract showChallengeHelp(): void;
+    static get: (appObjects: AppObjectRepo) => ShowChallengeHelpUC | undefined;
+}
+export declare function makeShowChallengeHelpUC<CT>(appObject: AppObject): ShowChallengeHelpUC;

package/lib/Components/Challenge/UCs/ShowChallengeHelpUC.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeShowChallengeHelpUC = exports.ShowChallengeHelpUC = void 0;
+const AppObject_1 = require("../../../AppObject");
+const ShowAlertUC_1 = require("../../Dispatcher/UC/ShowAlertUC");
+const Entities_1 = require("../Entities");
+class ShowChallengeHelpUC extends AppObject_1.AppObjectUC {
+}
+exports.ShowChallengeHelpUC = ShowChallengeHelpUC;
+ShowChallengeHelpUC.type = "ShowChallengeHelpUC";
+ShowChallengeHelpUC.get = (appObjects) => AppObject_1.getSingletonComponent(ShowChallengeHelpUC.type, appObjects);
+function makeShowChallengeHelpUC(appObject) {
+    return new ShowChallengeHelpUCImp(appObject);
+}
+exports.makeShowChallengeHelpUC = makeShowChallengeHelpUC;
+class ShowChallengeHelpUCImp extends ShowChallengeHelpUC {
+    constructor(appObject) {
+        super(appObject, ShowChallengeHelpUC.type);
+        this.showChallengeHelp = () => {
+            if (!this.challengeEntity || !this.showAlertUC)
+                return;
+            ShowAlertUC_1.ShowAlertUC.get(this.appObjects);
+            const title = this.challengeEntity.helpHeading;
+            const message = this.challengeEntity.helpText;
+            if (!title || !message) {
+                this.warn("Title or message is empty");
+                return;
+            }
+            const alertDTO = {
+                title,
+                message,
+                closeButtonLabel: "Close",
+                closeCallback: () => { },
+            };
+            this.showAlertUC.showAlert(alertDTO);
+        };
+        this.appObjects.registerSingleton(this);
+    }
+    get challengeEntity() {
+        return this.getCachedSingleton(Entities_1.ChallengeEntity.type);
+    }
+    get showAlertUC() {
+        return this.getCachedSingleton(ShowAlertUC_1.ShowAlertUC.type);
+    }
+}

package/lib/Components/Challenge/UCs/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./SerializeChallenge";
 export * from "./SetChallengeUC";
 export * from "./SetChallengeUndo";
+export * from "./ShowChallengeHelpUC";

package/lib/Components/Challenge/UCs/index.js

@@ -13,3 +13,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./SerializeChallenge"), exports);
 __exportStar(require("./SetChallengeUC"), exports);
 __exportStar(require("./SetChallengeUndo"), exports);
+__exportStar(require("./ShowChallengeHelpUC"), exports);

package/lib/Components/Dispatcher/Mocks/MockShowAlert.js

@@ -10,6 +10,6 @@ class MockShowAlert extends UC_1.ShowAlertUC {
 }
 exports.MockShowAlert = MockShowAlert;
 function makeMockShowAlert(appObjects) {
-    return new MockShowAlert(appObjects.getOrCreate("Dispatcher"));
+    return new MockShowAlert(appObjects.getOrCreate("MockShowAlert"));
 }
 exports.makeMockShowAlert = makeMockShowAlert;

package/lib/Components/Dispatcher/UC/ShowAlertUC.d.ts

@@ -8,7 +8,7 @@ export interface ShowAlertDTO {
     closeCallback: () => void;
 }
 export declare abstract class ShowAlertUC extends AppObjectUC {
-    static readonly type = "ShowAlertUC";
+    static type: string;
     readonly requestType = "SHOW_ALERT";
     abstract showAlert(data: ShowAlertDTO): void;
     static get: (appObjects: AppObjectRepo) => ShowAlertUC | undefined;

package/lib/Components/FramedScreen/Entities/FramedScreenContainer.js

@@ -17,7 +17,7 @@ class FramedScreenContainerImp extends FramedScreenContainer {
         super(appObject, FramedScreenContainer.type);
         this.memoizedPos = new Entities_1.MemoizedVector2(ValueObjects_1.Vector2.Zero(), this.notifyOnChange);
         this.memoizedSize = new Entities_1.MemoizedVector2(ValueObjects_1.Vector2.Zero(), this.notifyOnChange);
-        this.memoizedShow = new Entities_1.MemoizedBoolean(true, this.notifyOnChange);
+        this.memoizedShow = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
     }
     get id() {
         return this.appObject.id;

package/lib/Components/ThemeColors/Controllers/getOnPrimaryColor.d.ts

@@ -0,0 +1,3 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { Color } from "../../../ValueObjects";
+export declare function getOnPrimaryColor(appObjects: AppObjectRepo): Color;

package/lib/Components/ThemeColors/Controllers/getOnPrimaryColor.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOnPrimaryColor = void 0;
+const ValueObjects_1 = require("../../../ValueObjects");
+const Entities_1 = require("../Entities");
+function getOnPrimaryColor(appObjects) {
+    const theme = Entities_1.ThemeColors.get(appObjects);
+    if (theme) {
+        return theme.getColorForType(Entities_1.ThemeColorType.onPrimary);
+    }
+    else {
+        appObjects.submitError("getOnPrimaryColor", "Unable to find ThemeColors");
+        return ValueObjects_1.Color.RGB(0, 0, 0);
+    }
+}
+exports.getOnPrimaryColor = getOnPrimaryColor;

package/lib/Components/ThemeColors/Controllers/getOnSurfaceColor.d.ts

@@ -0,0 +1,3 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { Color } from "../../../ValueObjects";
+export declare function getOnSurfaceColor(appObjects: AppObjectRepo): Color;

package/lib/Components/ThemeColors/Controllers/getOnSurfaceColor.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOnSurfaceColor = void 0;
+const ValueObjects_1 = require("../../../ValueObjects");
+const Entities_1 = require("../Entities");
+function getOnSurfaceColor(appObjects) {
+    const theme = Entities_1.ThemeColors.get(appObjects);
+    if (theme) {
+        return theme.getColorForType(Entities_1.ThemeColorType.onSurface);
+    }
+    else {
+        appObjects.submitError("getOnSurfaceColor", "Unable to find ThemeColors");
+        return ValueObjects_1.Color.RGB(0, 0, 0);
+    }
+}
+exports.getOnSurfaceColor = getOnSurfaceColor;

package/lib/Components/ThemeColors/Controllers/getPrimaryColor.d.ts

@@ -0,0 +1,3 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { Color } from "../../../ValueObjects";
+export declare function getPrimaryColor(appObjects: AppObjectRepo): Color;

package/lib/Components/ThemeColors/Controllers/getPrimaryColor.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPrimaryColor = void 0;
+const ValueObjects_1 = require("../../../ValueObjects");
+const Entities_1 = require("../Entities");
+function getPrimaryColor(appObjects) {
+    const theme = Entities_1.ThemeColors.get(appObjects);
+    if (theme) {
+        return theme.getColorForType(Entities_1.ThemeColorType.primary);
+    }
+    else {
+        appObjects.submitError("getPrimaryColor", "Unable to find ThemeColors");
+        return ValueObjects_1.Color.RGB(0, 0, 0);
+    }
+}
+exports.getPrimaryColor = getPrimaryColor;

package/lib/Components/ThemeColors/Controllers/getSurfaceColor.d.ts

@@ -0,0 +1,3 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { Color } from "../../../ValueObjects";
+export declare function getSurfaceColor(appObjects: AppObjectRepo): Color;

package/lib/Components/ThemeColors/Controllers/getSurfaceColor.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSurfaceColor = void 0;
+const ValueObjects_1 = require("../../../ValueObjects");
+const Entities_1 = require("../Entities");
+function getSurfaceColor(appObjects) {
+    const theme = Entities_1.ThemeColors.get(appObjects);
+    if (theme) {
+        return theme.getColorForType(Entities_1.ThemeColorType.surface);
+    }
+    else {
+        appObjects.submitError("getSurfaceColor", "Unable to find ThemeColors");
+        return ValueObjects_1.Color.RGB(0, 0, 0);
+    }
+}
+exports.getSurfaceColor = getSurfaceColor;

package/lib/Components/ThemeColors/Controllers/getSurfaceContainerColor.d.ts

@@ -0,0 +1,3 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { Color } from "../../../ValueObjects";
+export declare function getSurfaceContainerColor(appObjects: AppObjectRepo): Color;

package/lib/Components/ThemeColors/Controllers/getSurfaceContainerColor.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSurfaceContainerColor = void 0;
+const ValueObjects_1 = require("../../../ValueObjects");
+const Entities_1 = require("../Entities");
+function getSurfaceContainerColor(appObjects) {
+    const theme = Entities_1.ThemeColors.get(appObjects);
+    if (theme) {
+        return theme.getColorForType(Entities_1.ThemeColorType.surfaceContainer);
+    }
+    else {
+        appObjects.submitError("getSurfaceColor", "Unable to find ThemeColors");
+        return ValueObjects_1.Color.RGB(0, 0, 0);
+    }
+}
+exports.getSurfaceContainerColor = getSurfaceContainerColor;

package/lib/Components/ThemeColors/Controllers/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./getOnPrimaryColor";
+export * from "./getOnSurfaceColor";
+export * from "./getPrimaryColor";
+export * from "./getSurfaceColor";
+export * from "./getSurfaceContainerColor";

package/lib/Components/ThemeColors/Controllers/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("./getOnPrimaryColor"), exports);
+__exportStar(require("./getOnSurfaceColor"), exports);
+__exportStar(require("./getPrimaryColor"), exports);
+__exportStar(require("./getSurfaceColor"), exports);
+__exportStar(require("./getSurfaceContainerColor"), exports);

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

@@ -1,2 +1,3 @@
+export * from "./Controllers";
 export * from "./Entities";
 export * from "./PM";

package/lib/Components/ThemeColors/index.js

@@ -10,5 +10,6 @@ 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("./Controllers"), exports);
 __exportStar(require("./Entities"), exports);
 __exportStar(require("./PM"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/app",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "description": "Public package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",