Added strict type checking to the project. (#236)

* Implement strict typing (WIP).

* changes

* Finish type checks

* Fix notification icon, matugen settings and update tsconfig.

* OSD Styling updates and added the ability to configure OSD duration.

globals/network.ts

@@ -0,0 +1,16 @@
+export const WIFI_STATUS_MAP = {
+    unknown: "Status Unknown",
+    unmanaged: "Unmanaged",
+    unavailable: "Unavailable",
+    disconnected: "Disconnected",
+    prepare: "Preparing Connecting",
+    config: "Connecting",
+    need_auth: "Needs Authentication",
+    ip_config: "Requesting IP",
+    ip_check: "Checking Access",
+    secondaries: "Waiting on Secondaries",
+    activated: "Connected",
+    deactivating: "Disconnecting",
+    failed: "Connection Failed",
+} as const;
+

globals/notification.ts

@@ -0,0 +1,24 @@
+import icons from "modules/icons/index";
+
+export const getNotificationIcon = (app_name: string, app_icon: string, app_entry: string) => {
+    let icon: string = icons.fallback.notification;
+
+    if (Utils.lookUpIcon(app_name) || Utils.lookUpIcon(app_name.toLowerCase() || "")) {
+        icon = Utils.lookUpIcon(app_name)
+            ? app_name
+            : Utils.lookUpIcon(app_name.toLowerCase())
+                ? app_name.toLowerCase()
+                : "";
+    }
+
+    if (Utils.lookUpIcon(app_icon) && icon === "") {
+        icon = app_icon;
+    }
+
+    if (Utils.lookUpIcon(app_entry || "") && icon === "") {
+        icon = app_entry || "";
+    }
+
+    return icon;
+};
+

globals/useTheme.ts

@@ -3,6 +3,8 @@ import { bash, Notify } from "lib/utils";
 import icons from "lib/icons"
 import { filterConfigForThemeOnly, loadJsonFile, saveConfigToFile } from "widget/settings/shared/FileChooser";
 
+export const hexColorPattern = /^#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{8})$/;
+
 globalThis.useTheme = (filePath: string): void => {
     let importedConfig = loadJsonFile(filePath);
 

globals/variables.ts

@@ -0,0 +1,13 @@
+import { Opt } from "lib/option";
+import { HexColor, RecursiveOptionsObject } from "lib/types/options";
+
+export const isOpt = <T>(value: unknown): value is Opt<T> =>
+    typeof value === 'object' && value !== null && 'value' in value && value instanceof Opt;
+
+export const isRecursiveOptionsObject = (value: unknown): value is RecursiveOptionsObject => {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+export const isHexColor = (value: string): value is HexColor => {
+    return /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/.test(value);
+}

globals/weather.ts

@@ -1,9 +1,7 @@
 import options from "options";
-import { UnitType, Weather } from "lib/types/weather.js";
+import { UnitType, Weather, WeatherIconTitle, WeatherIcon } from "lib/types/weather.js";
 import { DEFAULT_WEATHER } from "lib/types/defaults/weather.js";
-import GLib from "gi://GLib?version=2.0"
-
-import icons from "../modules/icons/index.js";
+import GLib from "gi://GLib?version=2.0";
 import { weatherIcons } from "modules/icons/weather.js";
 
 const { key, interval, location } = options.menus.clock.weather;
@@ -26,16 +24,16 @@ const weatherIntervalFn = (weatherInterval: number, loc: string, weatherKey: str
             .then((res) => {
                 try {
                     if (typeof res !== "string") {
-                        return globalWeatherVar.value = DEFAULT_WEATHER;
+                        return (globalWeatherVar.value = DEFAULT_WEATHER);
                     }
 
                     const parsedWeather = JSON.parse(res);
 
                     if (Object.keys(parsedWeather).includes("error")) {
-                        return globalWeatherVar.value = DEFAULT_WEATHER;
+                        return (globalWeatherVar.value = DEFAULT_WEATHER);
                     }
 
-                    return globalWeatherVar.value = parsedWeather;
+                    return (globalWeatherVar.value = parsedWeather);
                 } catch (error) {
                     globalWeatherVar.value = DEFAULT_WEATHER;
                     console.warn(`Failed to parse weather data: ${error}`);
@@ -45,12 +43,12 @@ const weatherIntervalFn = (weatherInterval: number, loc: string, weatherKey: str
                 console.error(`Failed to fetch weather: ${err}`);
                 globalWeatherVar.value = DEFAULT_WEATHER;
             });
-    })
+    });
 };
 
 Utils.merge([key.bind("value"), interval.bind("value"), location.bind("value")], (weatherKey, weatherInterval, loc) => {
     if (!weatherKey) {
-        return globalWeatherVar.value = DEFAULT_WEATHER;
+        return (globalWeatherVar.value = DEFAULT_WEATHER);
     }
     weatherIntervalFn(weatherInterval, loc, weatherKey);
 });
@@ -70,23 +68,28 @@ export const getWeatherIcon = (fahren: number) => {
         50: "",
         25: "",
         0: "",
-    };
+    } as const;
     const colors = {
         100: "weather-color red",
         75: "weather-color orange",
         50: "weather-color lavender",
         25: "weather-color blue",
         0: "weather-color sky",
-    };
+    } as const;
 
-    const threshold =
+    type IconKeys = keyof typeof icons;
+
+    const threshold: IconKeys =
         fahren < 0
             ? 0
-            : [100, 75, 50, 25, 0].find((threshold) => threshold <= fahren);
+            : ([100, 75, 50, 25, 0] as IconKeys[]).find((threshold) => threshold <= fahren) || 0;
+
+    const icon = icons[threshold || 50];
+    const color = colors[threshold || 50];
 
     return {
-        icon: icons[threshold || 50],
-        color: colors[threshold || 50],
+        icon,
+        color,
     };
 };
 
@@ -95,11 +98,15 @@ export const getWindConditions = (wthr: Weather, unt: UnitType) => {
         return `${Math.floor(wthr.current.wind_mph)} mph`;
     }
     return `${Math.floor(wthr.current.wind_kph)} kph`;
-}
+};
 
 export const getRainChance = (wthr: Weather) => `${wthr.forecast.forecastday[0].day.daily_chance_of_rain}%`;
 
-export const getWeatherStatusTextIcon = (wthr: Weather) => {
+export const isValidWeatherIconTitle = (title: string): title is WeatherIconTitle => {
+    return title in weatherIcons;
+};
+
+export const getWeatherStatusTextIcon = (wthr: Weather): WeatherIcon => {
     let iconQuery = wthr.current.condition.text
         .trim()
         .toLowerCase()
@@ -108,7 +115,14 @@ export const getWeatherStatusTextIcon = (wthr: Weather) => {
     if (!wthr.current.is_day && iconQuery === "partly_cloudy") {
         iconQuery = "partly_cloudy_night";
     }
-    return weatherIcons[iconQuery];
+
+    if (isValidWeatherIconTitle(iconQuery)) {
+        return weatherIcons[iconQuery];
+    } else {
+        console.warn(`Unknown weather icon title: ${iconQuery}`);
+        return weatherIcons["warning"];
+    }
 };
 
 globalThis["globalWeatherVar"] = globalWeatherVar;
+

globals/window.ts

@@ -0,0 +1,10 @@
+export const WINDOW_LAYOUTS: string[] = [
+    'center',
+    'top',
+    'top-right',
+    'top-center',
+    'top-left',
+    'bottom-left',
+    'bottom-center',
+    'bottom-right'
+];