fix: improve undefined handling (#83)

golota60 · Jun 18, 2022 · f567131 · f567131
1 parent c64b3c8
commit f567131
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/helpers/systeminformation.ts b/src/helpers/systeminformation.ts
@@ -30,7 +30,8 @@ export const getDisplaysAndGraphicsCards =
       const gpu = await sysinf.graphics();
 
       const gpuInfo = gpu.controllers.map(
-        (gpu: sysinf.Systeminformation.GraphicsControllerData) => gpu.model
+        (gpu: sysinf.Systeminformation.GraphicsControllerData) =>
+          gpu?.model || ''
       );
       const displays = gpu.displays
         .map((gpu: sysinf.Systeminformation.GraphicsDisplayData) =>
@@ -127,7 +128,7 @@ export const getSysInfOsInfo = async (): Promise<OSInfoInterface> => {
 export const getHWInfo = async (): Promise<string> => {
   try {
     const hwInfo = await sysinf.system();
-    return hwInfo.model;
+    return hwInfo?.model || '';
   } catch (err) {
     console.error(`Error when reading hardware info: ${err}`);
     return errorMessage;

diff --git a/src/yayfetch.ts b/src/yayfetch.ts
@@ -154,7 +154,7 @@ async function returnPickedData(
   if (valuesToDisplay.includes('CPUs')) {
     pickedVals.push(
       `${color ? getColoredText('CPU:', color, { bolded: true }) : 'CPU:'} ${
-        os.cpus()[0].model
+        os.cpus()?.[0]?.model || ''
       }`
     );
   }
@@ -163,7 +163,7 @@ async function returnPickedData(
     pickedVals.push(
       `${
         color ? getColoredText('GPU(s):', color, { bolded: true }) : 'GPU(s)'
-      } ${allData.graphicsInfo.gpuInfo}`
+      } ${allData?.graphicsInfo?.gpuInfo}`
     );
   }
 
@@ -173,7 +173,7 @@ async function returnPickedData(
         color
           ? getColoredText('Display(s):', color, { bolded: true })
           : 'Display(s):'
-      } ${allData.graphicsInfo.displays}`
+      } ${allData?.graphicsInfo?.displays}`
     );
   }
 
@@ -279,6 +279,8 @@ yargs
         );
       }
 
+      infoToPrint = infoToPrint.filter((e) => e);
+
       /* Add custom lines if specified */
       if (customLines) {
         const customLinesParsed =