locter 0.5.2 → 0.6.0

package/dist/index.cjs.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var ebec = require('ebec');
 var url = require('url');
 var glob = require('glob');
 var util = require('util');
@@ -435,6 +436,9 @@ function removeFileNameExtension(input, extensions) {
 function hasOwnProperty(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
+function hasStringProperty(obj, prop) {
+  return hasOwnProperty(obj, prop) && typeof obj[prop] === 'string';
+}
 
 /*
  * Copyright (c) 2022.
@@ -725,11 +729,11 @@ function _loadScriptFile() {
           case 10:
             _context.prev = 10;
             _context.t0 = _context["catch"](4);
-            if (!(isObject(_context.t0) && hasOwnProperty(_context.t0, 'code'))) {
-              _context.next = 17;
+            if (!(isObject(_context.t0) && hasStringProperty(_context.t0, 'code'))) {
+              _context.next = 18;
               break;
             }
-            if (!(_context.t0.code === 'ERR_MODULE_NOT_FOUND' || _context.t0.code === 'MODULE_NOT_FOUND')) {
+            if (!(!options.withExtension && (_context.t0.code === 'ERR_MODULE_NOT_FOUND' || _context.t0.code === 'MODULE_NOT_FOUND'))) {
               _context.next = 15;
               break;
             }
@@ -737,7 +741,7 @@ function _loadScriptFile() {
               withExtension: true
             })));
           case 15:
-            if (!(_context.t0.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME' || _context.t0.code === '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;
             }
@@ -745,8 +749,14 @@ function _loadScriptFile() {
               withFilePrefix: true
             })));
           case 17:
-            return _context.abrupt("return", handleFileLoadError(_context.t0));
+            throw new ebec.BaseError({
+              code: _context.t0.code,
+              message: hasStringProperty(_context.t0, 'message') ? _context.t0.message : undefined,
+              stack: hasStringProperty(_context.t0, 'stack') ? _context.t0.stack : undefined
+            });
           case 18:
+            return _context.abrupt("return", handleFileLoadError(_context.t0));
+          case 19:
           case "end":
             return _context.stop();
         }
@@ -804,12 +814,18 @@ function loadScriptFileSync(data, options) {
     // 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') {
+    /* istanbul ignore next */
+    if (isObject(e) && hasStringProperty(e, 'code')) {
+      if (!options.withExtension && (e.code === 'ERR_MODULE_NOT_FOUND' || e.code === 'MODULE_NOT_FOUND')) {
         return loadScriptFileSync(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
           withExtension: true
         }));
       }
+      throw new ebec.BaseError({
+        code: e.code,
+        message: hasStringProperty(e, 'message') ? e.message : undefined,
+        stack: hasStringProperty(e, 'stack') ? e.stack : undefined
+      });
     }
     return handleFileLoadError(e);
   }
@@ -831,13 +847,17 @@ function loadJsonFile(_x) {
   return _loadJsonFile.apply(this, arguments);
 }
 function _loadJsonFile() {
-  _loadJsonFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(info) {
+  _loadJsonFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(input) {
     var filePath, file;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            filePath = buildLoaderFilePath(info, true);
+            if (typeof input === 'string') {
+              filePath = path.isAbsolute(input) ? input : path.resolve(process.cwd(), input);
+            } else {
+              filePath = buildLoaderFilePath(input, true);
+            }
             _context.prev = 1;
             _context.next = 4;
             return fs.promises.readFile(filePath);
@@ -857,8 +877,13 @@ function _loadJsonFile() {
   }));
   return _loadJsonFile.apply(this, arguments);
 }
-function loadJsonFileSync(info) {
-  var filePath = buildLoaderFilePath(info, true);
+function loadJsonFileSync(input) {
+  var filePath;
+  if (typeof input === 'string') {
+    filePath = path.isAbsolute(input) ? input : path.resolve(process.cwd(), input);
+  } else {
+    filePath = buildLoaderFilePath(input, true);
+  }
   try {
     var file = fs.readFileSync(filePath);
     return JSON.parse(file.toString('utf-8'));
@@ -925,6 +950,7 @@ exports.buildLocatorOptions = buildLocatorOptions;
 exports.getExportItem = getExportItem;
 exports.handleFileLoadError = handleFileLoadError;
 exports.hasOwnProperty = hasOwnProperty;
+exports.hasStringProperty = hasStringProperty;
 exports.isLocatorInfo = isLocatorInfo;
 exports.isObject = isObject;
 exports.loadFile = loadFile;

package/dist/index.esm.js

@@ -1,3 +1,4 @@
+import { BaseError } from 'ebec';
 import { pathToFileURL } from 'url';
 import { glob, sync } from 'glob';
 import { promisify } from 'util';
@@ -433,6 +434,9 @@ function removeFileNameExtension(input, extensions) {
 function hasOwnProperty(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
+function hasStringProperty(obj, prop) {
+  return hasOwnProperty(obj, prop) && typeof obj[prop] === 'string';
+}
 
 /*
  * Copyright (c) 2022.
@@ -723,11 +727,11 @@ function _loadScriptFile() {
           case 10:
             _context.prev = 10;
             _context.t0 = _context["catch"](4);
-            if (!(isObject(_context.t0) && hasOwnProperty(_context.t0, 'code'))) {
-              _context.next = 17;
+            if (!(isObject(_context.t0) && hasStringProperty(_context.t0, 'code'))) {
+              _context.next = 18;
               break;
             }
-            if (!(_context.t0.code === 'ERR_MODULE_NOT_FOUND' || _context.t0.code === 'MODULE_NOT_FOUND')) {
+            if (!(!options.withExtension && (_context.t0.code === 'ERR_MODULE_NOT_FOUND' || _context.t0.code === 'MODULE_NOT_FOUND'))) {
               _context.next = 15;
               break;
             }
@@ -735,7 +739,7 @@ function _loadScriptFile() {
               withExtension: true
             })));
           case 15:
-            if (!(_context.t0.code === 'ERR_UNSUPPORTED_ESM_URL_SCHEME' || _context.t0.code === '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;
             }
@@ -743,8 +747,14 @@ function _loadScriptFile() {
               withFilePrefix: true
             })));
           case 17:
-            return _context.abrupt("return", handleFileLoadError(_context.t0));
+            throw new BaseError({
+              code: _context.t0.code,
+              message: hasStringProperty(_context.t0, 'message') ? _context.t0.message : undefined,
+              stack: hasStringProperty(_context.t0, 'stack') ? _context.t0.stack : undefined
+            });
           case 18:
+            return _context.abrupt("return", handleFileLoadError(_context.t0));
+          case 19:
           case "end":
             return _context.stop();
         }
@@ -802,12 +812,18 @@ function loadScriptFileSync(data, options) {
     // 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') {
+    /* istanbul ignore next */
+    if (isObject(e) && hasStringProperty(e, 'code')) {
+      if (!options.withExtension && (e.code === 'ERR_MODULE_NOT_FOUND' || e.code === 'MODULE_NOT_FOUND')) {
         return loadScriptFileSync(locatorInfo, _objectSpread2(_objectSpread2({}, options), {}, {
           withExtension: true
         }));
       }
+      throw new BaseError({
+        code: e.code,
+        message: hasStringProperty(e, 'message') ? e.message : undefined,
+        stack: hasStringProperty(e, 'stack') ? e.stack : undefined
+      });
     }
     return handleFileLoadError(e);
   }
@@ -829,13 +845,17 @@ function loadJsonFile(_x) {
   return _loadJsonFile.apply(this, arguments);
 }
 function _loadJsonFile() {
-  _loadJsonFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(info) {
+  _loadJsonFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(input) {
     var filePath, file;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            filePath = buildLoaderFilePath(info, true);
+            if (typeof input === 'string') {
+              filePath = path.isAbsolute(input) ? input : path.resolve(process.cwd(), input);
+            } else {
+              filePath = buildLoaderFilePath(input, true);
+            }
             _context.prev = 1;
             _context.next = 4;
             return fs.promises.readFile(filePath);
@@ -855,8 +875,13 @@ function _loadJsonFile() {
   }));
   return _loadJsonFile.apply(this, arguments);
 }
-function loadJsonFileSync(info) {
-  var filePath = buildLoaderFilePath(info, true);
+function loadJsonFileSync(input) {
+  var filePath;
+  if (typeof input === 'string') {
+    filePath = path.isAbsolute(input) ? input : path.resolve(process.cwd(), input);
+  } else {
+    filePath = buildLoaderFilePath(input, true);
+  }
   try {
     var file = fs.readFileSync(filePath);
     return JSON.parse(file.toString('utf-8'));
@@ -918,4 +943,4 @@ function loadFileSync(input) {
   return loadScriptFileSync(info);
 }
 
-export { buildLoaderFilePath, buildLocatorOptions, getExportItem, handleFileLoadError, hasOwnProperty, isLocatorInfo, isObject, loadFile, loadFileSync, loadJsonFile, loadJsonFileSync, loadScriptFile, loadScriptFileExport, loadScriptFileExportSync, loadScriptFileSync, locateFile, locateFileSync, locateFiles, locateFilesSync, pathToLocatorInfo, removeFileNameExtension, toArray };
+export { buildLoaderFilePath, buildLocatorOptions, getExportItem, handleFileLoadError, hasOwnProperty, hasStringProperty, isLocatorInfo, isObject, loadFile, loadFileSync, loadJsonFile, loadJsonFileSync, loadScriptFile, loadScriptFileExport, loadScriptFileExportSync, loadScriptFileSync, locateFile, locateFileSync, locateFiles, locateFilesSync, pathToLocatorInfo, removeFileNameExtension, toArray };

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

@@ -1,3 +1,3 @@
 import { LocatorInfo } from '../../locator';
-export declare function loadJsonFile(info: LocatorInfo): Promise<unknown | undefined>;
-export declare function loadJsonFileSync(info: LocatorInfo): unknown | undefined;
+export declare function loadJsonFile(input: LocatorInfo | string): Promise<unknown | undefined>;
+export declare function loadJsonFileSync(input: LocatorInfo | string): unknown | undefined;

package/dist/types/utils/has-property.d.ts

@@ -0,0 +1,2 @@
+export declare function hasOwnProperty<X extends Record<string, any>, Y extends PropertyKey>(obj: X, prop: Y): obj is X & Record<Y, unknown>;
+export declare function hasStringProperty<X extends Record<string, any>, Y extends PropertyKey>(obj: X, prop: Y): obj is X & Record<Y, string>;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "locter",
-    "version": "0.5.2",
+    "version": "0.6.0",
     "description": "A library to locate a file by criteria and load it",
     "author": {
         "name": "Peter Placzek",
@@ -57,7 +57,7 @@
         "@types/glob": "^8.0.0",
         "@types/is-file-esm": "^1.0.0",
         "@types/jest": "^27.5.0",
-        "@types/node": "^18.11.9",
+        "@types/node": "^18.11.10",
         "@types/yargs": "^17.0.15",
         "coveralls": "^3.1.0",
         "cross-env": "^7.0.3",
@@ -65,13 +65,14 @@
         "husky": "^8.0.2",
         "jest": "^27.5.1",
         "rimraf": "^3.0.2",
-        "rollup": "^3.5.0",
+        "rollup": "^3.5.1",
         "semantic-release": "^19.0.5",
         "ts-jest": "^27.1.4",
         "ts-node": "^10.9.1",
         "typescript": "^4.9.3"
     },
     "dependencies": {
+        "ebec": "^0.1.0",
         "glob": "^8.0.3"
     },
     "config": {

package/dist/types/utils/has-own-property.d.ts

@@ -1 +0,0 @@
-export declare function hasOwnProperty<X extends Record<string, any>, Y extends PropertyKey>(obj: X, prop: Y): obj is X & Record<Y, unknown>;