better loading error handling + use full file paths with extension fo…

…r loading files

src/loader/file-type/json.ts

@@ -6,14 +6,14 @@
  */
 
 import fs from 'fs';
+import { handleFileLoadError } from '../../utils';
 
 export async function loadJsonFile(filePath: string) : Promise<unknown | undefined> {
     try {
         const file = await fs.promises.readFile(filePath);
         return JSON.parse(file.toString('utf-8'));
     } catch (e) {
-        /* istanbul ignore next */
-        return undefined;
+        return handleFileLoadError(e);
     }
 }
 
@@ -22,7 +22,6 @@ export function loadJsonFileSync(filePath: string) : unknown | undefined {
         const file = fs.readFileSync(filePath);
         return JSON.parse(file.toString('utf-8'));
     } catch (e) {
-        /* istanbul ignore next */
-        return undefined;
+        return handleFileLoadError(e);
     }
 }

src/loader/file-type/script/async.ts

@@ -9,6 +9,7 @@ import { getExportItem } from './utils';
 import { LoaderFilterFn, ScriptFileExportItem } from './type';
 import { LocatorInfo, isLocatorInfo } from '../../../locator';
 import { buildLoaderFilePath } from '../../utils';
+import { handleFileLoadError } from '../../../utils';
 
 export async function loadScriptFile(data: LocatorInfo | string) : Promise<unknown | undefined> {
     const filePath = isLocatorInfo(data) ?
@@ -18,8 +19,7 @@ export async function loadScriptFile(data: LocatorInfo | string) : Promise<unkno
     try {
         return await import(filePath);
     } catch (e) {
-        /* istanbul ignore next */
-        return undefined;
+        return handleFileLoadError(e);
     }
 }
 
@@ -36,7 +36,6 @@ export async function loadScriptFileExport(
 
         return getExportItem(data, filterFn);
     } catch (e) {
-        /* istanbul ignore next */
-        return undefined;
+        return handleFileLoadError(e);
     }
 }

src/loader/file-type/script/sync.ts

@@ -9,6 +9,7 @@ import { LoaderFilterFn, ScriptFileExportItem } from './type';
 import { getExportItem } from './utils';
 import { LocatorInfo, isLocatorInfo } from '../../../locator';
 import { buildLoaderFilePath } from '../../utils';
+import { handleFileLoadError } from '../../../utils';
 
 export function loadScriptFileSync(data: LocatorInfo | string) : unknown | undefined {
     const filePath = isLocatorInfo(data) ?
@@ -19,8 +20,7 @@ export function loadScriptFileSync(data: LocatorInfo | string) : unknown | undef
         // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require,import/no-dynamic-require
         return require(filePath);
     } catch (e) {
-        /* istanbul ignore next */
-        return undefined;
+        return handleFileLoadError(e);
     }
 }
 
@@ -37,7 +37,6 @@ export function loadScriptFileExportSync(
 
         return getExportItem(data, filterFn);
     } catch (e) {
-        /* istanbul ignore next */
-        return undefined;
+        return handleFileLoadError(e);
     }
 }

src/loader/utils.ts

@@ -9,6 +9,5 @@ import path from 'path';
 import { LocatorInfo } from '../locator';
 
 export function buildLoaderFilePath(info: LocatorInfo) {
-    return path.join(info.path, info.fileName) +
-        (info.fileExtension === '.json' ? '.json' : '');
+    return path.join(info.path, info.fileName) + info.fileExtension;
 }

src/utils/error.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */
+
+/* istanbul ignore next */
+export function handleFileLoadError(e: unknown) : undefined {
+    if (e instanceof Error) {
+        throw e;
+    }
+
+    if (typeof e === 'string') {
+        throw new Error(e);
+    }
+
+    return undefined;
+}

src/utils/index.ts

@@ -5,5 +5,6 @@
  * view the LICENSE file that was distributed with this source code.
  */
 
+export * from './error';
 export * from './has-own-property';
 export * from './to-array';