From f8cf9bad7d02e26628d28b63f14bc2b6010df037 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Thu, 23 Nov 2023 20:46:58 +0200
Subject: [PATCH] Fix crash on missing config sections

---
 src/config.ts          | 32 +++++++++++++++++---------------
 src/input.ts           |  2 +-
 src/types/WtcConfig.ts |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/config.ts b/src/config.ts
index 6055013..fe6f0f8 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -27,7 +27,7 @@ const defaultConfig: RawConfig = {
         hadLunch: true,
     },
     askInput: {
-        workDayLength: true,
+        workDayDuration: true,
         startTime: true,
         stopTime: true,
         logged: true,
@@ -38,30 +38,32 @@ const getConfig = (): WtcConfig => {
     const configDir = xdgConfig || path.join(process.env.HOME ?? './', '.config');
     let configFilePath = path.join(configDir, 'wtc', 'config.toml');
 
-    let configData: RawConfig;
+    let configData: Partial<RawConfig>;
     if (fs.existsSync(configFilePath)) {
         configData = toml.parse(fs.readFileSync(configFilePath, 'utf8')) as unknown as RawConfig;
     } else {
         configData = defaultConfig;
     }
 
+    const { language, timestampFormat, unpaidLunchBreakDuration, defaults, askInput } = configData;
+
     return {
-        language: configData.language ?? defaultConfig.language,
-        timestampFormat: configData.timestampFormat ?? defaultConfig.timestampFormat,
-        unpaidLunchBreakDuration: !configData.unpaidLunchBreakDuration ? undefined : parseDuration(configData.unpaidLunchBreakDuration),
+        language: language ?? defaultConfig.language,
+        timestampFormat: timestampFormat ?? defaultConfig.timestampFormat,
+        unpaidLunchBreakDuration: !unpaidLunchBreakDuration
+            ? undefined
+            : parseDuration(unpaidLunchBreakDuration),
         defaults: {
-            workDayDuration: parseDuration(
-                configData.defaults.workDayDuration ?? defaultConfig.defaults.workDayDuration,
-            ),
-            startTime: parseTimestamp(configData.defaults.startTime ?? defaultConfig.defaults.startTime),
-            stopTime: parseTimestamp(configData.defaults.stopTime ?? defaultConfig.defaults.stopTime),
-            hadLunch: configData.defaults.hadLunch ?? defaultConfig.defaults.hadLunch,
+            workDayDuration: parseDuration(defaults?.workDayDuration ?? defaultConfig.defaults.workDayDuration),
+            startTime: parseTimestamp(defaults?.startTime ?? defaultConfig.defaults.startTime),
+            stopTime: parseTimestamp(defaults?.stopTime ?? defaultConfig.defaults.stopTime),
+            hadLunch: defaults?.hadLunch ?? defaultConfig.defaults.hadLunch,
         },
         askInput: {
-            workDayLength: configData.askInput.workDayLength ?? defaultConfig.askInput.workDayLength,
-            startTime: configData.askInput.startTime ?? defaultConfig.askInput.startTime,
-            stopTime: configData.askInput.stopTime ?? defaultConfig.askInput.stopTime,
-            logged: configData.askInput.logged ?? defaultConfig.askInput.logged,
+            workDayDuration: askInput?.workDayDuration ?? defaultConfig.askInput.workDayDuration,
+            startTime: askInput?.startTime ?? defaultConfig.askInput.startTime,
+            stopTime: askInput?.stopTime ?? defaultConfig.askInput.stopTime,
+            logged: askInput?.logged ?? defaultConfig.askInput.logged,
         },
     };
 };
diff --git a/src/input.ts b/src/input.ts
index 5a2303c..035ed48 100644
--- a/src/input.ts
+++ b/src/input.ts
@@ -30,7 +30,7 @@ const input = async (config: WtcConfig): Promise<WtcPromptResult> => {
         // Get work day duration
         let workDayDuration: Duration | undefined = undefined;
 
-        if (askInput.workDayLength) {
+        if (askInput.workDayDuration) {
             const durationAnswer = await rl.question(
                 msg(
                     MessageKey.promptWorkDayDuration,
diff --git a/src/types/WtcConfig.ts b/src/types/WtcConfig.ts
index c0b9c62..15d6382 100644
--- a/src/types/WtcConfig.ts
+++ b/src/types/WtcConfig.ts
@@ -13,7 +13,7 @@ export default interface WtcConfig {
         hadLunch: boolean;
     };
     askInput: {
-        workDayLength: boolean;
+        workDayDuration: boolean;
         startTime: boolean;
         stopTime: boolean;
         logged: boolean;