Merge 4046430 into 65b6913

src/handlers/error.test.ts

@@ -17,6 +17,17 @@ describe('error handler', () => {
 
       expect(functionToTest).toThrowError('[ERROR] File <SOME PATH> not found!')
     })
+
+    it('should throw error if input is a string', () => {
+      // Arrange
+      const input = 'a generic error'
+
+      // Act
+      const functionToTest = () => scanFromFile('SOME PATH')(input)
+
+      // Assert
+      expect(functionToTest).toThrowError('a generic error')
+    })
   })
 
   describe('scanFromBitmap', () => {
@@ -43,5 +54,16 @@ describe('error handler', () => {
 
       expect(functionToTest).toThrowError('[WARNING]')
     })
+
+    it('should thow error from input', () => {
+      // Arrange
+      const input = new Error('a generic error')
+
+      // Act
+      const functionToTest = () => scanFromBitmap(input)
+
+      // Assert
+      expect(functionToTest).toThrowError(input)
+    })
   })
 })

src/handlers/error.ts

@@ -1,14 +1,16 @@
 export const scanFromFile =
   (filePath: string) =>
-  (error: Error): never => {
-    if (error.message.includes('no such file or directory'))
+  (error: Error | string): never => {
+    if (typeof error === 'string') throw new Error(error)
+
+    if (error?.message?.includes('no such file or directory'))
       throw new Error(`[ERROR] File <${filePath}> not found!`)
 
     throw error
   }
 
 export const scanFromBitmap = (error: Error | string): never => {
-  if (typeof error === 'string' && error.includes('0 patterns found'))
+  if (typeof error === 'string' && error?.includes('0 patterns found'))
     throw new Error('[WARNING] No pattern could be found! Is there a QR-Code?')
 
   throw error