locter 0.5.0 → 0.5.2

package/dist/index.cjs.js

@@ -1,12 +1,32 @@
 'use strict';
 
-var isFileEsm = require('is-file-esm');
 var url = require('url');
 var glob = require('glob');
 var util = require('util');
 var path = require('path');
 var fs = require('fs');
 
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
+}
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
     return exports;
@@ -347,6 +367,34 @@ function _asyncToGenerator(fn) {
     });
   };
 }
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
 
 /*
  * Copyright (c) 2022.
@@ -395,8 +443,8 @@ function hasOwnProperty(obj, prop) {
  * view the LICENSE file that was distributed with this source code.
  */
 
-function toArray(input) {
-  return Array.isArray(input) ? input : [input];
+function isObject(item) {
+  return !!item && _typeof(item) === 'object' && !Array.isArray(item);
 }
 
 /*
@@ -405,26 +453,9 @@ function toArray(input) {
  * For the full copyright and license information,
  * view the LICENSE file that was distributed with this source code.
  */
-function getExportItem(data, filterFn) {
-  if (filterFn) {
-    var keys = Object.keys(data);
-    for (var i = 0; i < keys.length; i++) {
-      if (filterFn(keys[i], data[keys[i]])) {
-        return {
-          key: keys[i],
-          value: data[keys[i]]
-        };
-      }
-    }
-  } else {
-    return {
-      key: 'default',
-      value: hasOwnProperty(data, 'default') ? data["default"] : data
-    };
-  }
 
-  /* istanbul ignore next */
-  return undefined;
+function toArray(input) {
+  return Array.isArray(input) ? input : [input];
 }
 
 function buildLocatorOptions(options) {
@@ -638,59 +669,93 @@ function buildLoaderFilePath(info, withExtension) {
   return path.join(info.path, info.name);
 }
 
-function loadScriptFile(_x) {
+/*
+ * 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 getExportItem(data, filterFn) {
+  if (filterFn) {
+    var keys = Object.keys(data);
+    for (var i = 0; i < keys.length; i++) {
+      if (filterFn(keys[i], data[keys[i]])) {
+        return {
+          key: keys[i],
+          value: data[keys[i]]
+        };
+      }
+    }
+  } else {
+    return {
+      key: 'default',
+      value: hasOwnProperty(data, 'default') ? data["default"] : data
+    };
+  }
+
+  /* istanbul ignore next */
+  return undefined;
+}
+
+function loadScriptFile(_x, _x2) {
   return _loadScriptFile.apply(this, arguments);
 }
 function _loadScriptFile() {
-  _loadScriptFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-    var locatorInfo, filePath, check;
+  _loadScriptFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, options) {
+    var locatorInfo, filePath;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             if (typeof data === 'string') {
-              filePath = data;
               locatorInfo = pathToLocatorInfo(data);
             } else {
-              filePath = buildLoaderFilePath(data, true);
               locatorInfo = data;
             }
-            _context.prev = 1;
-            if (!(['.js', '.mjs', '.cjs'].indexOf(locatorInfo.extension) !== -1)) {
-              _context.next = 10;
+            options = options || {};
+            filePath = buildLoaderFilePath(locatorInfo, options.withExtension);
+            if (options.withFilePrefix) {
+              filePath = url.pathToFileURL(filePath).href;
+            }
+            _context.prev = 4;
+            _context.next = 7;
+            return import(filePath);
+          case 7:
+            return _context.abrupt("return", _context.sent);
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](4);
+            if (!(isObject(_context.t0) && hasOwnProperty(_context.t0, 'code'))) {
+              _context.next = 17;
               break;
             }
-            _context.next = 5;
-            return isFileEsm(filePath);
-          case 5:
-            check = _context.sent;
-            if (!check.esm) {
-              _context.next = 10;
+            if (!(_context.t0.code === 'ERR_MODULE_NOT_FOUND' || _context.t0.code === 'MODULE_NOT_FOUND')) {
+              _context.next = 15;
               break;
             }
-            _context.next = 9;
-            return import(url.pathToFileURL(filePath).href);
-          case 9:
-            return _context.abrupt("return", _context.sent);
-          case 10:
-            _context.next = 12;
-            return import(filePath);
-          case 12:
-            return _context.abrupt("return", _context.sent);
+            return _context.abrupt("return", loadScriptFile(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
+              withExtension: true
+            })));
           case 15:
-            _context.prev = 15;
-            _context.t0 = _context["catch"](1);
+            if (!(_context.t0.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME' || _context.t0.code === 'UNSUPPORTED_ESM_URL_SCHEME')) {
+              _context.next = 17;
+              break;
+            }
+            return _context.abrupt("return", loadScriptFile(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
+              withFilePrefix: true
+            })));
+          case 17:
             return _context.abrupt("return", handleFileLoadError(_context.t0));
           case 18:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 15]]);
+    }, _callee, null, [[4, 10]]);
   }));
   return _loadScriptFile.apply(this, arguments);
 }
-function loadScriptFileExport(_x2, _x3) {
+function loadScriptFileExport(_x3, _x4) {
   return _loadScriptFileExport.apply(this, arguments);
 }
 function _loadScriptFileExport() {
@@ -726,12 +791,26 @@ 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) {
+    if (isObject(e) && hasOwnProperty(e, 'code')) {
+      if (e.code === 'ERR_MODULE_NOT_FOUND' || e.code === 'MODULE_NOT_FOUND') {
+        return loadScriptFileSync(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
+          withExtension: true
+        }));
+      }
+    }
     return handleFileLoadError(e);
   }
 }
@@ -847,6 +926,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

@@ -1,10 +1,30 @@
-import isFileEsm from 'is-file-esm';
 import { pathToFileURL } from 'url';
 import { glob, sync } from 'glob';
 import { promisify } from 'util';
 import path from 'path';
 import fs from 'fs';
 
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+  return keys;
+}
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+  return target;
+}
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
     return exports;
@@ -345,6 +365,34 @@ function _asyncToGenerator(fn) {
     });
   };
 }
+function _defineProperty(obj, key, value) {
+  key = _toPropertyKey(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+function _toPrimitive(input, hint) {
+  if (typeof input !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (typeof res !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return typeof key === "symbol" ? key : String(key);
+}
 
 /*
  * Copyright (c) 2022.
@@ -393,8 +441,8 @@ function hasOwnProperty(obj, prop) {
  * view the LICENSE file that was distributed with this source code.
  */
 
-function toArray(input) {
-  return Array.isArray(input) ? input : [input];
+function isObject(item) {
+  return !!item && _typeof(item) === 'object' && !Array.isArray(item);
 }
 
 /*
@@ -403,26 +451,9 @@ function toArray(input) {
  * For the full copyright and license information,
  * view the LICENSE file that was distributed with this source code.
  */
-function getExportItem(data, filterFn) {
-  if (filterFn) {
-    var keys = Object.keys(data);
-    for (var i = 0; i < keys.length; i++) {
-      if (filterFn(keys[i], data[keys[i]])) {
-        return {
-          key: keys[i],
-          value: data[keys[i]]
-        };
-      }
-    }
-  } else {
-    return {
-      key: 'default',
-      value: hasOwnProperty(data, 'default') ? data["default"] : data
-    };
-  }
 
-  /* istanbul ignore next */
-  return undefined;
+function toArray(input) {
+  return Array.isArray(input) ? input : [input];
 }
 
 function buildLocatorOptions(options) {
@@ -636,59 +667,93 @@ function buildLoaderFilePath(info, withExtension) {
   return path.join(info.path, info.name);
 }
 
-function loadScriptFile(_x) {
+/*
+ * 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 getExportItem(data, filterFn) {
+  if (filterFn) {
+    var keys = Object.keys(data);
+    for (var i = 0; i < keys.length; i++) {
+      if (filterFn(keys[i], data[keys[i]])) {
+        return {
+          key: keys[i],
+          value: data[keys[i]]
+        };
+      }
+    }
+  } else {
+    return {
+      key: 'default',
+      value: hasOwnProperty(data, 'default') ? data["default"] : data
+    };
+  }
+
+  /* istanbul ignore next */
+  return undefined;
+}
+
+function loadScriptFile(_x, _x2) {
   return _loadScriptFile.apply(this, arguments);
 }
 function _loadScriptFile() {
-  _loadScriptFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-    var locatorInfo, filePath, check;
+  _loadScriptFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, options) {
+    var locatorInfo, filePath;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             if (typeof data === 'string') {
-              filePath = data;
               locatorInfo = pathToLocatorInfo(data);
             } else {
-              filePath = buildLoaderFilePath(data, true);
               locatorInfo = data;
             }
-            _context.prev = 1;
-            if (!(['.js', '.mjs', '.cjs'].indexOf(locatorInfo.extension) !== -1)) {
-              _context.next = 10;
+            options = options || {};
+            filePath = buildLoaderFilePath(locatorInfo, options.withExtension);
+            if (options.withFilePrefix) {
+              filePath = pathToFileURL(filePath).href;
+            }
+            _context.prev = 4;
+            _context.next = 7;
+            return import(filePath);
+          case 7:
+            return _context.abrupt("return", _context.sent);
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](4);
+            if (!(isObject(_context.t0) && hasOwnProperty(_context.t0, 'code'))) {
+              _context.next = 17;
               break;
             }
-            _context.next = 5;
-            return isFileEsm(filePath);
-          case 5:
-            check = _context.sent;
-            if (!check.esm) {
-              _context.next = 10;
+            if (!(_context.t0.code === 'ERR_MODULE_NOT_FOUND' || _context.t0.code === 'MODULE_NOT_FOUND')) {
+              _context.next = 15;
               break;
             }
-            _context.next = 9;
-            return import(pathToFileURL(filePath).href);
-          case 9:
-            return _context.abrupt("return", _context.sent);
-          case 10:
-            _context.next = 12;
-            return import(filePath);
-          case 12:
-            return _context.abrupt("return", _context.sent);
+            return _context.abrupt("return", loadScriptFile(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
+              withExtension: true
+            })));
           case 15:
-            _context.prev = 15;
-            _context.t0 = _context["catch"](1);
+            if (!(_context.t0.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME' || _context.t0.code === 'UNSUPPORTED_ESM_URL_SCHEME')) {
+              _context.next = 17;
+              break;
+            }
+            return _context.abrupt("return", loadScriptFile(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
+              withFilePrefix: true
+            })));
+          case 17:
             return _context.abrupt("return", handleFileLoadError(_context.t0));
           case 18:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 15]]);
+    }, _callee, null, [[4, 10]]);
   }));
   return _loadScriptFile.apply(this, arguments);
 }
-function loadScriptFileExport(_x2, _x3) {
+function loadScriptFileExport(_x3, _x4) {
   return _loadScriptFileExport.apply(this, arguments);
 }
 function _loadScriptFileExport() {
@@ -724,12 +789,26 @@ 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) {
+    if (isObject(e) && hasOwnProperty(e, 'code')) {
+      if (e.code === 'ERR_MODULE_NOT_FOUND' || e.code === 'MODULE_NOT_FOUND') {
+        return loadScriptFileSync(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
+          withExtension: true
+        }));
+      }
+    }
     return handleFileLoadError(e);
   }
 }
@@ -839,4 +918,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,4 +1,4 @@
-import { LoaderFilterFn, ScriptFileExportItem } from './type';
 import { LocatorInfo } from '../../../locator';
-export declare function loadScriptFile(data: LocatorInfo | string): Promise<unknown | undefined>;
+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>;

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.0",
+    "version": "0.5.2",
     "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",
@@ -72,8 +72,7 @@
         "typescript": "^4.9.3"
     },
     "dependencies": {
-        "glob": "^8.0.3",
-        "is-file-esm": "^1.0.0"
+        "glob": "^8.0.3"
     },
     "config": {
         "commitizen": {