locter 0.5.1 → 0.5.3

package/dist/index.cjs.js

@@ -436,6 +436,17 @@ function hasOwnProperty(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
+/*
+ * 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.
+ */
+
+function isObject(item) {
+  return !!item && _typeof(item) === 'object' && !Array.isArray(item);
+}
+
 /*
  * Copyright (c) 2022.
  * Author Peter Placzek (tada5hi)
@@ -714,11 +725,11 @@ function _loadScriptFile() {
           case 10:
             _context.prev = 10;
             _context.t0 = _context["catch"](4);
-            if (!(_context.t0 instanceof Error && hasOwnProperty(_context.t0, 'code'))) {
+            if (!(isObject(_context.t0) && hasOwnProperty(_context.t0, 'code'))) {
               _context.next = 17;
               break;
             }
-            if (!(_context.t0.code === 'ERR_MODULE_NOT_FOUND')) {
+            if (!(!options.withExtension && (_context.t0.code === 'ERR_MODULE_NOT_FOUND' || _context.t0.code === 'MODULE_NOT_FOUND'))) {
               _context.next = 15;
               break;
             }
@@ -726,7 +737,7 @@ function _loadScriptFile() {
               withExtension: true
             })));
           case 15:
-            if (!(_context.t0.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME')) {
+            if (!(!options.withFilePrefix && (_context.t0.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME' || _context.t0.code === 'UNSUPPORTED_ESM_URL_SCHEME'))) {
               _context.next = 17;
               break;
             }
@@ -780,12 +791,27 @@ function _loadScriptFileExport() {
   return _loadScriptFileExport.apply(this, arguments);
 }
 
-function loadScriptFileSync(data) {
-  var filePath = isLocatorInfo(data) ? buildLoaderFilePath(data) : data;
+function loadScriptFileSync(data, options) {
+  var locatorInfo;
+  if (typeof data === 'string') {
+    locatorInfo = pathToLocatorInfo(data);
+  } else {
+    locatorInfo = data;
+  }
+  options = options || {};
+  var filePath = buildLoaderFilePath(locatorInfo, options.withExtension);
   try {
     // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require,import/no-dynamic-require
     return require(filePath);
   } catch (e) {
+    /* istanbul ignore next */
+    if (isObject(e) && hasOwnProperty(e, 'code')) {
+      if (!options.withExtension && (e.code === 'ERR_MODULE_NOT_FOUND' || e.code === 'MODULE_NOT_FOUND')) {
+        return loadScriptFileSync(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
+          withExtension: true
+        }));
+      }
+    }
     return handleFileLoadError(e);
   }
 }
@@ -901,6 +927,7 @@ exports.getExportItem = getExportItem;
 exports.handleFileLoadError = handleFileLoadError;
 exports.hasOwnProperty = hasOwnProperty;
 exports.isLocatorInfo = isLocatorInfo;
+exports.isObject = isObject;
 exports.loadFile = loadFile;
 exports.loadFileSync = loadFileSync;
 exports.loadJsonFile = loadJsonFile;

package/dist/index.esm.js

@@ -434,6 +434,17 @@ function hasOwnProperty(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
+/*
+ * 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.
+ */
+
+function isObject(item) {
+  return !!item && _typeof(item) === 'object' && !Array.isArray(item);
+}
+
 /*
  * Copyright (c) 2022.
  * Author Peter Placzek (tada5hi)
@@ -712,11 +723,11 @@ function _loadScriptFile() {
           case 10:
             _context.prev = 10;
             _context.t0 = _context["catch"](4);
-            if (!(_context.t0 instanceof Error && hasOwnProperty(_context.t0, 'code'))) {
+            if (!(isObject(_context.t0) && hasOwnProperty(_context.t0, 'code'))) {
               _context.next = 17;
               break;
             }
-            if (!(_context.t0.code === 'ERR_MODULE_NOT_FOUND')) {
+            if (!(!options.withExtension && (_context.t0.code === 'ERR_MODULE_NOT_FOUND' || _context.t0.code === 'MODULE_NOT_FOUND'))) {
               _context.next = 15;
               break;
             }
@@ -724,7 +735,7 @@ function _loadScriptFile() {
               withExtension: true
             })));
           case 15:
-            if (!(_context.t0.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME')) {
+            if (!(!options.withFilePrefix && (_context.t0.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME' || _context.t0.code === 'UNSUPPORTED_ESM_URL_SCHEME'))) {
               _context.next = 17;
               break;
             }
@@ -778,12 +789,27 @@ function _loadScriptFileExport() {
   return _loadScriptFileExport.apply(this, arguments);
 }
 
-function loadScriptFileSync(data) {
-  var filePath = isLocatorInfo(data) ? buildLoaderFilePath(data) : data;
+function loadScriptFileSync(data, options) {
+  var locatorInfo;
+  if (typeof data === 'string') {
+    locatorInfo = pathToLocatorInfo(data);
+  } else {
+    locatorInfo = data;
+  }
+  options = options || {};
+  var filePath = buildLoaderFilePath(locatorInfo, options.withExtension);
   try {
     // eslint-disable-next-line @typescript-eslint/no-var-requires, global-require,import/no-dynamic-require
     return require(filePath);
   } catch (e) {
+    /* istanbul ignore next */
+    if (isObject(e) && hasOwnProperty(e, 'code')) {
+      if (!options.withExtension && (e.code === 'ERR_MODULE_NOT_FOUND' || e.code === 'MODULE_NOT_FOUND')) {
+        return loadScriptFileSync(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
+          withExtension: true
+        }));
+      }
+    }
     return handleFileLoadError(e);
   }
 }
@@ -893,4 +919,4 @@ function loadFileSync(input) {
   return loadScriptFileSync(info);
 }
 
-export { buildLoaderFilePath, buildLocatorOptions, getExportItem, handleFileLoadError, hasOwnProperty, isLocatorInfo, loadFile, loadFileSync, loadJsonFile, loadJsonFileSync, loadScriptFile, loadScriptFileExport, loadScriptFileExportSync, loadScriptFileSync, locateFile, locateFileSync, locateFiles, locateFilesSync, pathToLocatorInfo, removeFileNameExtension, toArray };
+export { buildLoaderFilePath, buildLocatorOptions, getExportItem, handleFileLoadError, hasOwnProperty, isLocatorInfo, isObject, loadFile, loadFileSync, loadJsonFile, loadJsonFileSync, loadScriptFile, loadScriptFileExport, loadScriptFileExportSync, loadScriptFileSync, locateFile, locateFileSync, locateFiles, locateFilesSync, pathToLocatorInfo, removeFileNameExtension, toArray };

package/dist/types/loader/file-type/script/async.d.ts

@@ -1,9 +1,4 @@
 import { LocatorInfo } from '../../../locator';
-import { LoaderFilterFn, ScriptFileExportItem } from './type';
-type ScriptFileLoadOptions = {
-    withExtension?: boolean;
-    withFilePrefix?: boolean;
-};
+import { LoaderFilterFn, ScriptFileExportItem, ScriptFileLoadOptions } from './type';
 export declare function loadScriptFile(data: LocatorInfo | string, options?: ScriptFileLoadOptions): Promise<unknown | undefined>;
 export declare function loadScriptFileExport(data: LocatorInfo | string, filterFn?: LoaderFilterFn): Promise<ScriptFileExportItem | undefined>;
-export {};

package/dist/types/loader/file-type/script/sync.d.ts

@@ -1,4 +1,4 @@
-import { LoaderFilterFn, ScriptFileExportItem } from './type';
+import { LoaderFilterFn, ScriptFileExportItem, ScriptFileLoadOptions } from './type';
 import { LocatorInfo } from '../../../locator';
-export declare function loadScriptFileSync(data: LocatorInfo | string): unknown | undefined;
+export declare function loadScriptFileSync(data: LocatorInfo | string, options?: ScriptFileLoadOptions): unknown | undefined;
 export declare function loadScriptFileExportSync(data: LocatorInfo | string, filterFn?: LoaderFilterFn): ScriptFileExportItem | undefined;

package/dist/types/loader/file-type/script/type.d.ts

@@ -3,3 +3,7 @@ export type ScriptFileExportItem = {
     key: string;
     value: unknown;
 };
+export type ScriptFileLoadOptions = {
+    withExtension?: boolean;
+    withFilePrefix?: boolean;
+};

package/dist/types/utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from './error';
 export * from './file-name';
 export * from './has-own-property';
+export * from './object';
 export * from './to-array';

package/dist/types/utils/object.d.ts

@@ -0,0 +1 @@
+export declare function isObject(item: unknown): item is Record<string, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "locter",
-    "version": "0.5.1",
+    "version": "0.5.3",
     "description": "A library to locate a file by criteria and load it",
     "author": {
         "name": "Peter Placzek",
@@ -58,7 +58,7 @@
         "@types/is-file-esm": "^1.0.0",
         "@types/jest": "^27.5.0",
         "@types/node": "^18.11.9",
-        "@types/yargs": "^17.0.14",
+        "@types/yargs": "^17.0.15",
         "coveralls": "^3.1.0",
         "cross-env": "^7.0.3",
         "eslint": "^8.28.0",