@hedia/recommendation-screen 2.0.1 → 2.1.0

package/src/utils/AttentionMessages.d.ts

@@ -1,13 +1,19 @@
-export declare class AttentionMessage {
-    static SevereHypoglycemia: () => string;
-    static Hypoglycemia: () => string;
-    static MildHypoglycemia: () => string;
-    static NormoglycemiaActivityUnder5MMOL: () => string;
-    static HyperglycemiaActivity: () => string;
-    static SevereHyperglycemia: () => string;
-    static SevereHyperglycemiaActivity: () => string;
-}
-export declare function addPostponeActivityMessageUnder5MMOL(message: AttentionMessage): string;
+export declare const AttentionMessage: {
+    SevereHypoglycemia: () => string;
+    Hypoglycemia: () => string;
+    MildHypoglycemia: () => string;
+    NormoglycemiaActivityUnder5MMOL: () => string;
+    HyperglycemiaActivity: () => string;
+    SevereHyperglycemia: () => string;
+    SevereHyperglycemiaActivity: () => string;
+    BGLevelNotProvided: null;
+    Hyperglycemia: null;
+    MildHyperglycemia: null;
+    Normoglycemia: null;
+    NormoglycemiaUnder5MMOL: null;
+    UnsupportedBGLevel: null;
+};
+export declare function addPostponeActivityMessageUnder5MMOL(message: string): string;
 export declare class Messages {
     static VeryLowBGL: () => string;
     static LowBGL: () => string;

package/src/utils/AttentionMessages.jsx

@@ -8,16 +8,21 @@ const types_1 = require("@hedia/types");
 const macro_1 = require("@lingui/macro");
 const moment_1 = __importDefault(require("moment"));
 const i18nUtils_1 = require("../locale/i18nUtils");
-class AttentionMessage {
-}
-exports.AttentionMessage = AttentionMessage;
-AttentionMessage.SevereHypoglycemia = () => `${Messages.VeryLowBGL()}${`\n`}${Messages.Reminder15Minutes()}`;
-AttentionMessage.Hypoglycemia = () => `${Messages.LowBGL()}${`\n`}${Messages.Reminder15Minutes()}`;
-AttentionMessage.MildHypoglycemia = () => Messages.Reminder15Minutes();
-AttentionMessage.NormoglycemiaActivityUnder5MMOL = () => Messages.PostponePhysicalActivityUnder5MMOL();
-AttentionMessage.HyperglycemiaActivity = () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}${Messages.Reminder15Minutes()}${`\n`}${Messages.PostponePhysicalActivity()}`;
-AttentionMessage.SevereHyperglycemia = () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}`;
-AttentionMessage.SevereHyperglycemiaActivity = () => AttentionMessage.HyperglycemiaActivity();
+exports.AttentionMessage = {
+    SevereHypoglycemia: () => `${Messages.VeryLowBGL()}${`\n`}${Messages.Reminder15Minutes()}`,
+    Hypoglycemia: () => `${Messages.LowBGL()}${`\n`}${Messages.Reminder15Minutes()}`,
+    MildHypoglycemia: () => Messages.Reminder15Minutes(),
+    NormoglycemiaActivityUnder5MMOL: () => Messages.PostponePhysicalActivityUnder5MMOL(),
+    HyperglycemiaActivity: () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}${Messages.Reminder15Minutes()}${`\n`}${Messages.PostponePhysicalActivity()}`,
+    SevereHyperglycemia: () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}`,
+    SevereHyperglycemiaActivity: () => `${Messages.HighBGL()}${`\n`}${Messages.InsulinKetones()}${`\n`}${Messages.Reminder15Minutes()}${`\n`}${Messages.PostponePhysicalActivity()}`,
+    BGLevelNotProvided: null,
+    Hyperglycemia: null,
+    MildHyperglycemia: null,
+    Normoglycemia: null,
+    NormoglycemiaUnder5MMOL: null,
+    UnsupportedBGLevel: null,
+};
 function addPostponeActivityMessageUnder5MMOL(message) {
     return `${message}${`\n`}${Messages.PostponePhysicalActivityUnder5MMOL()}`;
 }

package/src/utils/RecommendationError.d.ts

@@ -13,6 +13,7 @@ export declare const CarbohydrateLimitError: () => RecommendationError;
 export declare const InsulinSensitivityError: () => RecommendationError;
 export declare const InsulinToCarbsRatioError: () => RecommendationError;
 export declare const CurrentBGLError: () => RecommendationError;
+export declare const LatestLogbook6HoursBGLError: () => RecommendationError;
 export declare const CurrentBKLError: () => RecommendationError;
 export declare const TargetBGLError: () => RecommendationError;
 export declare const BolusInsulinDoseError: () => RecommendationError;

package/src/utils/RecommendationError.jsx

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BloodGlucoseUnitError = exports.BloodKetoneUnitError = exports.LanguageError = exports.InjectionMethodError = exports.UserReminderError = exports.RecentBolusError = exports.BolusInsulinSecondsPassedError = exports.BolusInsulinDoseError = exports.TargetBGLError = exports.CurrentBKLError = exports.CurrentBGLError = exports.InsulinToCarbsRatioError = exports.InsulinSensitivityError = exports.CarbohydrateLimitError = exports.ActivityTargetBGLError = exports.ActivityTypeError = exports.ActivityIntensityError = exports.ActivityDateError = exports.ActivityDurationError = exports.ActivitySettingsError = exports.RecommendationError = void 0;
+exports.BloodGlucoseUnitError = exports.BloodKetoneUnitError = exports.LanguageError = exports.InjectionMethodError = exports.UserReminderError = exports.RecentBolusError = exports.BolusInsulinSecondsPassedError = exports.BolusInsulinDoseError = exports.TargetBGLError = exports.CurrentBKLError = exports.LatestLogbook6HoursBGLError = exports.CurrentBGLError = exports.InsulinToCarbsRatioError = exports.InsulinSensitivityError = exports.CarbohydrateLimitError = exports.ActivityTargetBGLError = exports.ActivityTypeError = exports.ActivityIntensityError = exports.ActivityDateError = exports.ActivityDurationError = exports.ActivitySettingsError = exports.RecommendationError = void 0;
 const types_1 = require("@hedia/types");
 const macro_1 = require("@lingui/macro");
 const i18nUtils_1 = require("../locale/i18nUtils");
@@ -33,6 +33,8 @@ const InsulinToCarbsRatioError = () => new RecommendationError(i18nUtils_1.i18n.
 exports.InsulinToCarbsRatioError = InsulinToCarbsRatioError;
 const CurrentBGLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current blood glucose level.`), enum_1.RecommendationErrorEnum.CurrentBGL);
 exports.CurrentBGLError = CurrentBGLError;
+const LatestLogbook6HoursBGLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support the blood glucose level of your latest logbook entry from the last 6 hours.`), enum_1.RecommendationErrorEnum.LatestLogbook6HoursBGL);
+exports.LatestLogbook6HoursBGLError = LatestLogbook6HoursBGLError;
 const CurrentBKLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Hedia Calculator does not support your current blood ketone level.`), enum_1.RecommendationErrorEnum.CurrentBKL);
 exports.CurrentBKLError = CurrentBKLError;
 const TargetBGLError = () => new RecommendationError(i18nUtils_1.i18n._(macro_1.t `Error. Please verify that your target blood glucose value is correct.`), enum_1.RecommendationErrorEnum.TargetBGL);

package/src/utils/RecommendationUtils.d.ts

@@ -1,9 +1,8 @@
 import { BgLevel } from "../types/enum";
 import { IActivityParams, logbookEntry } from "../types/types";
-import { AttentionMessage, Messages } from "./AttentionMessages";
 export declare function getBGLevel(currentBGL: number, latestLogbookFrom6Hours: logbookEntry | null): BgLevel;
 export declare function getReminder(bgLevel: BgLevel, carbohydrates: number, userReminder: number, activity: IActivityParams | null): number;
-export declare function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams | null): AttentionMessage | null;
+export declare function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams | null): string | null;
 export declare function isSevereHyperglycemia(logbook?: logbookEntry | null): boolean;
 export declare function isActivityWithin15Minutes(activity: IActivityParams | null): boolean;
-export declare function getLimitationMessage(wasLimited: boolean, activityReduction: number | null): Messages | null;
+export declare function getLimitationMessage(wasLimited: boolean, activityReduction: number | null): string | null;

package/src/utils/RecommendationUtils.js

@@ -9,6 +9,7 @@ const enum_1 = require("../types/enum");
 const AttentionMessages_1 = require("./AttentionMessages");
 const Constants_1 = require("./Constants");
 const RecommendationError_1 = require("./RecommendationError");
+const Utils_1 = require("./Utils");
 function getBGLevel(currentBGL, latestLogbookFrom6Hours) {
     if (currentBGL === null) {
         return enum_1.BgLevel.BGLevelNotProvided;
@@ -65,23 +66,26 @@ function getReminder(bgLevel, carbohydrates, userReminder, activity) {
 }
 exports.getReminder = getReminder;
 function getAttentionMessage(bgLevel, activity) {
+    const key = Utils_1.Utils.getKeyFromValue(enum_1.BgLevel, bgLevel);
+    const isAttentionMessageNull = AttentionMessages_1.AttentionMessage[key] === null;
+    const isWithin15Minutes = isActivityWithin15Minutes(activity);
     switch (bgLevel) {
         case enum_1.BgLevel.BGLevelNotProvided:
         case enum_1.BgLevel.Normoglycemia:
         case enum_1.BgLevel.MildHyperglycemia:
             return null;
         case enum_1.BgLevel.NormoglycemiaUnder5MMOL:
-            return isActivityWithin15Minutes(activity) ? AttentionMessages_1.AttentionMessage.NormoglycemiaActivityUnder5MMOL() : null;
+            return isWithin15Minutes ? AttentionMessages_1.AttentionMessage.NormoglycemiaActivityUnder5MMOL() : null;
         case enum_1.BgLevel.SevereHypoglycemia:
         case enum_1.BgLevel.Hypoglycemia:
         case enum_1.BgLevel.MildHypoglycemia:
-            return isActivityWithin15Minutes(activity)
-                ? AttentionMessages_1.addPostponeActivityMessageUnder5MMOL(AttentionMessages_1.AttentionMessage[enum_1.BgLevel[bgLevel]]())
-                : AttentionMessages_1.AttentionMessage[enum_1.BgLevel[bgLevel]]();
+            return isWithin15Minutes && !isAttentionMessageNull
+                ? AttentionMessages_1.addPostponeActivityMessageUnder5MMOL(AttentionMessages_1.AttentionMessage[key]())
+                : AttentionMessages_1.AttentionMessage[key]();
         case enum_1.BgLevel.Hyperglycemia:
-            return isActivityWithin15Minutes(activity) ? AttentionMessages_1.AttentionMessage.HyperglycemiaActivity() : null;
+            return isWithin15Minutes ? AttentionMessages_1.AttentionMessage.HyperglycemiaActivity() : null;
         case enum_1.BgLevel.SevereHyperglycemia:
-            return isActivityWithin15Minutes(activity)
+            return isWithin15Minutes
                 ? AttentionMessages_1.AttentionMessage.SevereHyperglycemiaActivity()
                 : AttentionMessages_1.AttentionMessage.SevereHyperglycemia();
         default:

package/src/utils/Utils.d.ts

@@ -3,10 +3,11 @@ import { IInterval } from "../types/types";
 export declare class Utils {
     static getRounding(method: UserSettings.Enums.InjectionMethod): number;
     static roundValue(value: number, injectMethod: UserSettings.Enums.InjectionMethod): number;
-    static isInClosedInterval(value: number | null, interval: IInterval): boolean;
+    static isInRange(value: number | null, interval: IInterval): boolean;
     static convertBGLToMGDL(value: number): number;
     static displayedBGLValue(value: number, unit: BloodGlucoseUnit): number;
     static convertBKLToMGDL(value: number): number;
     static displayedBKLValue(value: number, unit: BloodKetonesUnit): number;
     static formatUnit: (unit: BloodGlucoseUnit | BloodKetonesUnit) => string;
+    static getKeyFromValue<T>(keys: T, value: T[keyof T]): keyof T;
 }

package/src/utils/Utils.js

@@ -22,7 +22,7 @@ class Utils {
         const rounding = Utils.getRounding(injectMethod);
         return Math.round(value * rounding) / rounding;
     }
-    static isInClosedInterval(value, interval) {
+    static isInRange(value, interval) {
         if (value === null) {
             return false;
         }
@@ -40,6 +40,10 @@ class Utils {
     static displayedBKLValue(value, unit) {
         return unit === types_1.BloodKetonesUnit.MMOL_L ? value : Utils.convertBKLToMGDL(value);
     }
+    static getKeyFromValue(keys, value) {
+        const values = Object.values(keys);
+        return Object.keys(keys)[values.indexOf(value)];
+    }
 }
 exports.Utils = Utils;
 Utils.formatUnit = (unit) => {

package/src/utils/Validations.d.ts

@@ -1,8 +1,9 @@
 import { Activity, BloodGlucoseUnit, BloodKetonesUnit, Languages, UserSettings } from "@hedia/types";
 import { IRecommendationProps } from "../RecommendationScreen";
-import { ActivitySettings, IActivityParams, IRecentBolus } from "../types/types";
+import { ActivitySettings, IActivityParams, IRecentBolus, logbookEntry } from "../types/types";
 export declare function validateParams(props: IRecommendationProps): void;
 export declare function checkLanguage(language: Languages): void;
+export declare function checkLatestLogbook6Hours(logbook: logbookEntry | null): void;
 export declare function checkInjectionMethod(injectionMethod: UserSettings.Enums.InjectionMethod): void;
 export declare function checkBGLUnit(unit: BloodGlucoseUnit): void;
 export declare function checkBKLUnit(unit: BloodKetonesUnit): void;

package/src/utils/Validations.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkCarbohydrates = exports.checkInsulinToCarbRatio = exports.checkInsulinSensitivity = exports.checkBloodKetoneLevel = exports.checkTargetBGL = exports.checkCurrentBGL = exports.checkActivityTargetBGL = exports.checkActivitySettings = exports.checkActivityDate = exports.checkActivityType = exports.checkActivityIntensity = exports.checkActivityDuration = exports.checkRecentBolusesSecondsPassed = exports.checkRecentBolusesInsulinDose = exports.checkRecentBolus = exports.checkActivity = exports.checkUserReminder = exports.checkBKLUnit = exports.checkBGLUnit = exports.checkInjectionMethod = exports.checkLanguage = exports.validateParams = void 0;
+exports.checkCarbohydrates = exports.checkInsulinToCarbRatio = exports.checkInsulinSensitivity = exports.checkBloodKetoneLevel = exports.checkTargetBGL = exports.checkCurrentBGL = exports.checkActivityTargetBGL = exports.checkActivitySettings = exports.checkActivityDate = exports.checkActivityType = exports.checkActivityIntensity = exports.checkActivityDuration = exports.checkRecentBolusesSecondsPassed = exports.checkRecentBolusesInsulinDose = exports.checkRecentBolus = exports.checkActivity = exports.checkUserReminder = exports.checkBKLUnit = exports.checkBGLUnit = exports.checkInjectionMethod = exports.checkLatestLogbook6Hours = exports.checkLanguage = exports.validateParams = void 0;
 const types_1 = require("@hedia/types");
 const moment_1 = __importDefault(require("moment"));
 const Constants_1 = require("./Constants");
@@ -19,6 +19,7 @@ function validateParams(props) {
     checkInjectionMethod(props.injectionMethod);
     checkUserReminder(props.userReminder);
     checkLanguage(props.language);
+    checkLatestLogbook6Hours(props.latestLogbookFrom6Hours);
     if (props?.calculatorParams?.activity && props?.activityDisplayProps) {
         checkActivityType(props.activityDisplayProps.activityType);
     }
@@ -30,6 +31,17 @@ function checkLanguage(language) {
     }
 }
 exports.checkLanguage = checkLanguage;
+function checkLatestLogbook6Hours(logbook) {
+    if (logbook === undefined) {
+        throw RecommendationError_1.LatestLogbook6HoursBGLError();
+    }
+    if (logbook !== null) {
+        if (!Utils_1.Utils.isInRange(logbook.blood_glucose_millimolar, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
+            throw RecommendationError_1.LatestLogbook6HoursBGLError();
+        }
+    }
+}
+exports.checkLatestLogbook6Hours = checkLatestLogbook6Hours;
 function checkInjectionMethod(injectionMethod) {
     const check = Object.values(types_1.UserSettings.Enums.InjectionMethod).some((method) => method === injectionMethod);
     if (!check) {
@@ -52,7 +64,7 @@ function checkBKLUnit(unit) {
 }
 exports.checkBKLUnit = checkBKLUnit;
 function checkUserReminder(userReminder) {
-    if (!Utils_1.Utils.isInClosedInterval(userReminder, Constants_1.REMINDER_HOURS_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(userReminder, Constants_1.REMINDER_HOURS_LIMITS)) {
         throw RecommendationError_1.UserReminderError();
     }
 }
@@ -86,7 +98,7 @@ function checkRecentBolus(recentBoluses) {
 exports.checkRecentBolus = checkRecentBolus;
 function checkRecentBolusesInsulinDose(recentBoluses) {
     recentBoluses.forEach((bolus) => {
-        if (!Utils_1.Utils.isInClosedInterval(bolus.insulinDose, Constants_1.INSULIN_DOSE_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(bolus.insulinDose, Constants_1.INSULIN_DOSE_LIMITS)) {
             throw RecommendationError_1.BolusInsulinDoseError();
         }
     });
@@ -94,14 +106,14 @@ function checkRecentBolusesInsulinDose(recentBoluses) {
 exports.checkRecentBolusesInsulinDose = checkRecentBolusesInsulinDose;
 function checkRecentBolusesSecondsPassed(recentBoluses) {
     recentBoluses.forEach((bolus) => {
-        if (!Utils_1.Utils.isInClosedInterval(bolus.secondsPassed, Constants_1.BOLUS_SECONDS_PASSED_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(bolus.secondsPassed, Constants_1.BOLUS_SECONDS_PASSED_LIMITS)) {
             throw RecommendationError_1.BolusInsulinSecondsPassedError();
         }
     });
 }
 exports.checkRecentBolusesSecondsPassed = checkRecentBolusesSecondsPassed;
 function checkActivityDuration(activityDuration) {
-    if (!Utils_1.Utils.isInClosedInterval(activityDuration, Constants_1.ACTIVITY_DURATION_MINUTES_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(activityDuration, Constants_1.ACTIVITY_DURATION_MINUTES_LIMITS)) {
         throw RecommendationError_1.ActivityDurationError();
     }
 }
@@ -134,7 +146,7 @@ function checkActivitySettings(activitySettings) {
         const reductionIntervals = activitySettings[intensity];
         for (const interval of Object.keys(reductionIntervals)) {
             const value = activitySettings[intensity][interval];
-            const isInInterval = Utils_1.Utils.isInClosedInterval(value, Constants_1.ACTIVITY_SETTINGS_INTERVAL_LIMITS);
+            const isInInterval = Utils_1.Utils.isInRange(value, Constants_1.ACTIVITY_SETTINGS_INTERVAL_LIMITS);
             if (intensity === hard && interval === fromFortysix) {
                 if (!isInInterval && value !== null) {
                     throw RecommendationError_1.ActivitySettingsError();
@@ -148,47 +160,47 @@ function checkActivitySettings(activitySettings) {
 }
 exports.checkActivitySettings = checkActivitySettings;
 function checkActivityTargetBGL(activitySettingsTargetBGL) {
-    if (!Utils_1.Utils.isInClosedInterval(activitySettingsTargetBGL, Constants_1.ACTIVITY_TARGET_BGL_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(activitySettingsTargetBGL, Constants_1.ACTIVITY_TARGET_BGL_MMOL_LIMITS)) {
         throw RecommendationError_1.ActivityTargetBGLError();
     }
 }
 exports.checkActivityTargetBGL = checkActivityTargetBGL;
 function checkCurrentBGL(currentBGL) {
     if (currentBGL !== null) {
-        if (!Utils_1.Utils.isInClosedInterval(currentBGL, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(currentBGL, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
             throw RecommendationError_1.CurrentBGLError();
         }
     }
 }
 exports.checkCurrentBGL = checkCurrentBGL;
 function checkTargetBGL(targetBGL) {
-    if (!Utils_1.Utils.isInClosedInterval(targetBGL, Constants_1.TARGET_BGL_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(targetBGL, Constants_1.TARGET_BGL_MMOL_LIMITS)) {
         throw RecommendationError_1.TargetBGLError();
     }
 }
 exports.checkTargetBGL = checkTargetBGL;
 function checkBloodKetoneLevel(currentBKL) {
     if (currentBKL !== null) {
-        if (!Utils_1.Utils.isInClosedInterval(currentBKL, Constants_1.CURRENT_BKL_MMOL_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(currentBKL, Constants_1.CURRENT_BKL_MMOL_LIMITS)) {
             throw RecommendationError_1.CurrentBKLError();
         }
     }
 }
 exports.checkBloodKetoneLevel = checkBloodKetoneLevel;
 function checkInsulinSensitivity(insulinSensitivity) {
-    if (!Utils_1.Utils.isInClosedInterval(insulinSensitivity, Constants_1.INSULIN_SENSITIVITY_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(insulinSensitivity, Constants_1.INSULIN_SENSITIVITY_MMOL_LIMITS)) {
         throw RecommendationError_1.InsulinSensitivityError();
     }
 }
 exports.checkInsulinSensitivity = checkInsulinSensitivity;
 function checkInsulinToCarbRatio(insulinToCarbRatio) {
-    if (!Utils_1.Utils.isInClosedInterval(insulinToCarbRatio, Constants_1.INSULIN_TO_CARBS_RATIO_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(insulinToCarbRatio, Constants_1.INSULIN_TO_CARBS_RATIO_LIMITS)) {
         throw RecommendationError_1.InsulinToCarbsRatioError();
     }
 }
 exports.checkInsulinToCarbRatio = checkInsulinToCarbRatio;
 function checkCarbohydrates(carbohydrates) {
-    if (!Utils_1.Utils.isInClosedInterval(carbohydrates, Constants_1.CARBOHYDRATES_LIMTS)) {
+    if (!Utils_1.Utils.isInRange(carbohydrates, Constants_1.CARBOHYDRATES_LIMTS)) {
         throw RecommendationError_1.CarbohydrateLimitError();
     }
 }

package/tsconfig.json

@@ -28,12 +28,13 @@
 
         /* Strict Type-Checking Options */
         //"strict": true,                           /* Enable all strict type-checking options. */
-        // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+        "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
         "strictNullChecks": true,              /* Enable strict null checks. */
-        // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+        "strictFunctionTypes": true,           /* Enable strict checking of function types. */
         "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
-        // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
-        // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+        "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+        "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+        "noStrictGenericChecks": true,
 
         /* Additional Checks */
         "noUnusedLocals": true,                /* Report errors on unused locals. */
@@ -61,7 +62,8 @@
         /* Experimental Options */
         "experimentalDecorators": true /* Enables experimental support for ES7 decorators. */,
         "emitDecoratorMetadata": true /* Enables experimental support for emitting type metadata for decorators. */,
-        "skipLibCheck": true
+        "skipLibCheck": true,
+        "noErrorTruncation": true
     },
     "exclude": [
         "src/locale/CleanLanguage.ts",

package/App.tsx

@@ -1,157 +0,0 @@
-import { Activity, BloodGlucoseUnit, BloodKetonesUnit, Languages, UserSettings } from "@hedia/types";
-import React from "react";
-import RecommendationScreen from "./src/RecommendationScreen";
-import { IActivityDisplayProps, IRecommendationParams, logbookEntry } from "./src/types/types";
-import { RecommendationError } from "./src/utils/RecommendationError";
-
-interface IState {
-	params: IRecommendationParams & IActivityDisplayProps;
-	carbs: number | null;
-	injectionMethod: UserSettings.Enums.InjectionMethod;
-	activityDisplayProps: IActivityDisplayProps;
-}
-
-const ActivityEnum = Activity.Enums.ActivityEnum;
-
-const { Cycling } = ActivityEnum;
-const { Pump } = UserSettings.Enums.InjectionMethod;
-
-export default class App extends React.Component<{}, IState> {
-	constructor(props) {
-		super(props);
-
-		const params: IState["params"] = {
-			carbohydrateRatio: 10,
-			currentBGL: 33, // in order to recommend insulin
-			carbohydrates: 1, // in order not to have entered carbs = 0
-			insulinSensitivity: 4,
-			targetBGL: 6,
-			recentBoluses: [
-				{
-					insulinDose: 2,
-					secondsPassed: 1000,
-				},
-				{
-					insulinDose: 1.7,
-					secondsPassed: 10000,
-				},
-			],
-			activityTitle: `Moderate Activity Test Title`,
-			activityType: Cycling,
-			activity: null,
-		};
-
-		this.state = {
-			params,
-			carbs: 25,
-			injectionMethod: Pump,
-			activityDisplayProps: {
-				activityType: params.activityType,
-				activityTitle: params.activityTitle,
-			},
-		};
-	}
-
-	public exitCallback = () => {
-		console.log(`exitcallback...`);
-	};
-
-	public closeCalculationCallback = () => {
-		console.log(`closeCalculationCallback...`);
-	};
-
-	public removeCarbs = () => {
-		this.setState({
-			carbs: null,
-		});
-	};
-
-	public changeCarbs = (carbs: number) => {
-		this.setState({
-			carbs,
-		});
-	};
-
-	public onYes = () => {
-		console.log(`Navigate to recent bolus screen`);
-	};
-
-	public updatedRecommendedInsulin = (val: number) => {
-		console.log(`Updated recommended insulin: `, val);
-	};
-
-	public transferToLogbook = (...params) => {
-		console.log(`Transfered:`, params);
-	};
-
-	public updateRemeasureTime = (remeasureTime: number) => {
-		console.log(`updateRemeasureTime:`, remeasureTime);
-	};
-
-	public recommendationAnswer = (carbRecommendationAnswer: boolean) => {
-		console.log("carbRecommendationAnswer", carbRecommendationAnswer);
-	};
-
-	public showBolusBar = (showBolusBar: boolean) => {
-		console.log("showBolusBar", showBolusBar);
-	};
-
-	public restartCalculation = () => {
-		console.log("restart calculation");
-	};
-
-	public handleError = (error: RecommendationError) => {
-		console.log(JSON.stringify(error));
-
-		switch (error.type) {
-			default:
-				throw error;
-		}
-	};
-
-	public render(): JSX.Element {
-		const logbook1: logbookEntry = {
-			blood_glucose_millimolar: 16,
-			carbohydrates_entered_grams: 25,
-			carbohydrates_suggested_grams: 25,
-			client_timestamp: `25`,
-			client_version: `25`,
-			entry_timestamp: `25`,
-			event_uuid: null,
-			insulin_entered_units: 25,
-			insulin_suggested_units: 25,
-			is_deleted: null,
-			mood: 2,
-			settings_uuid: `25`,
-			uuid: `aaa`,
-			device_and_os: `iOS 12.1.2`,
-			overwritten_by_id: null,
-			server_timestamp: null,
-			server_version: null,
-			utc_timezone_offset: null,
-			blood_ketones_millimolar: null,
-			carbohydrates_modified_suggested_grams: null,
-		};
-		return (
-			<RecommendationScreen
-				latestLogbookFrom6Hours={logbook1}
-				language={Languages.en}
-				injectionMethod={this.state.injectionMethod}
-				calculatorParams={this.state.params}
-				userReminder={5}
-				bloodGlucoseUnit={BloodGlucoseUnit.MMOL_L}
-				bloodKetoneUnit={BloodKetonesUnit.MG_DL}
-				currentBKL={0}
-				closeCalculationCallback={this.closeCalculationCallback}
-				exitCallback={this.exitCallback}
-				showBolusBar={this.showBolusBar}
-				onRecentInsulinYes={this.onYes}
-				transferToLogbook={this.transferToLogbook}
-				onError={this.handleError}
-				carbRecommendationAnswer={this.recommendationAnswer}
-				restartCalculation={this.restartCalculation}
-				activityDisplayProps={this.state.activityDisplayProps}
-			/>
-		);
-	}
-}

package/index.ts

@@ -1,6 +0,0 @@
-import RecommendationScreen from "./src/RecommendationScreen";
-import { RecommendationErrorEnum } from "./src/types/enum";
-import * as Errors from "./src/utils/RecommendationError";
-
-export default RecommendationScreen;
-export { Errors, RecommendationErrorEnum };