Merge pull request #6 from 0time/fix-require-all

v0.1.6
0time · Aug 5, 2020 · 94726c9 · 94726c9
2 parents a076951 + c348fa0
commit 94726c9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@0ti.me/tiny-pfp",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A tiny, minimalist lodash alternative library",
   "license": "GPL-3.0",
   "main": "src/index.js",

diff --git a/src/index.js b/src/index.js
@@ -1,3 +1,4 @@
+const path = require('path');
 const requireAll = require('./lib/require-all');
 
-module.exports = requireAll('./src/src');
+module.exports = requireAll(path.resolve(__dirname, './src'));
diff --git a/src/lib/require-all/reduce-to-types-sync.js b/src/lib/require-all/reduce-to-types-sync.js
@@ -5,9 +5,7 @@ const path = require('path');
 module.exports = dir => {
   const dirList = fs.readdirSync(dir);
 
-  const setsOfStats = dirList.map(each =>
-    fs.statSync(path.join(process.cwd(), dir, each)),
-  );
+  const setsOfStats = dirList.map(each => fs.statSync(path.resolve(dir, each)));
 
   return dirList.reduce(dirListReducer(dir, setsOfStats), {
     directories: [],

diff --git a/src/lib/require-all/require-all-file-reducer.js b/src/lib/require-all/require-all-file-reducer.js
@@ -3,8 +3,5 @@ const path = require('path');
 const set = require('../set');
 
 module.exports = dir => (acc, file) =>
-  set(
-    acc,
-    convertToCamelCase(file),
-    require(path.join(process.cwd(), dir, file)),
-  );
+  console.error(6, dir, file) ||
+  set(acc, convertToCamelCase(file), require(path.resolve(dir, file)));
diff --git a/src/lib/require-all/require-all-sync.js b/src/lib/require-all/require-all-sync.js
@@ -8,6 +8,6 @@ const requireAllFileReducer = require('./require-all-file-reducer');
 module.exports = dir =>
   flow([
     listFilesSync,
-    fpMap(fpStringReplace(dir, '')),
+    fpMap(fpStringReplace(dir, '.')),
     fpReduce(requireAllFileReducer(dir), {}),
   ])(dir);