From a71202e1dc2adba0a20ec6bc8e8d8a67c8b4afc0 Mon Sep 17 00:00:00 2001 From: Sukka Date: Wed, 4 Mar 2020 18:13:12 +0800 Subject: [PATCH] refactor: es6 syntax (#57) --- lib/fs.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/fs.js b/lib/fs.js index 5d4ba1e..6c2ec2d 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -139,13 +139,13 @@ function trueFn() { function ignoreHiddenFiles(ignore) { if (!ignore) return trueFn; - return item => item.name[0] !== '.'; + return ({ name }) => !name.startsWith('.'); } function ignoreFilesRegex(regex) { if (!regex) return trueFn; - return item => !regex.test(item.name); + return ({ name }) => !regex.test(name); } function ignoreExcludeFiles(arr, parent) { @@ -153,7 +153,7 @@ function ignoreExcludeFiles(arr, parent) { const set = new Set(arr); - return item => !set.has(join(parent, item.name)); + return ({ name }) => !set.has(join(parent, name)); } function reduceFiles(result, item) { @@ -167,14 +167,14 @@ function reduceFiles(result, item) { async function _readAndFilterDir(path, options) { const { ignoreHidden = true, ignorePattern } = options; - return (await fsPromises.readdir(path, Object.assign(options, { withFileTypes: true }))) + return (await fsPromises.readdir(path, { ...options, withFileTypes: true })) .filter(ignoreHiddenFiles(ignoreHidden)) .filter(ignoreFilesRegex(ignorePattern)); } function _readAndFilterDirSync(path, options) { const { ignoreHidden = true, ignorePattern } = options; - return fs.readdirSync(path, Object.assign(options, { withFileTypes: true })) + return fs.readdirSync(path, { ...options, withFileTypes: true }) .filter(ignoreHiddenFiles(ignoreHidden)) .filter(ignoreFilesRegex(ignorePattern)); }