From 5b496536c64ea9542b5e5f0a09f50c77798a3a52 Mon Sep 17 00:00:00 2001 From: Daniel Perez Alvarez Date: Fri, 27 Sep 2019 20:06:46 +0000 Subject: [PATCH] update and fixes --- src/utilities/findIndexFiles.js | 3 ++- src/utilities/hasIndex.js | 4 ++-- src/utilities/readDirectory.js | 6 +++--- src/utilities/readIndexConfig.js | 6 +++--- src/utilities/validateTargetDirectory.js | 2 +- src/utilities/writeIndex.js | 6 +++--- src/utilities/writeIndexCli.js | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/utilities/findIndexFiles.js b/src/utilities/findIndexFiles.js index 7f9af10..a27b855 100644 --- a/src/utilities/findIndexFiles.js +++ b/src/utilities/findIndexFiles.js @@ -13,7 +13,8 @@ export default (directoryPath, options = {}) => { targetDirectories = _.filter(targetDirectories, (targetDirectoryPath) => { return validateTargetDirectory(path.dirname(targetDirectoryPath), { - silent: options.silent + silent: options.silent, + outputFile: options.fileName }); }); diff --git a/src/utilities/hasIndex.js b/src/utilities/hasIndex.js index 1146e4c..e8dc4f5 100644 --- a/src/utilities/hasIndex.js +++ b/src/utilities/hasIndex.js @@ -1,8 +1,8 @@ import fs from 'fs'; import path from 'path'; -export default (directoryPath) => { - const indexPath = path.resolve(directoryPath, 'index.js'); +export default (directoryPath, options = {}) => { + const indexPath = path.resolve(directoryPath, options.outputFile || 'index.js'); try { fs.statSync(indexPath); diff --git a/src/utilities/readDirectory.js b/src/utilities/readDirectory.js index 1fa333d..ddf5f41 100644 --- a/src/utilities/readDirectory.js +++ b/src/utilities/readDirectory.js @@ -72,7 +72,7 @@ const removeIgnoredFiles = (files, ignorePatterns = []) => { }; export default (directoryPath, options = {}) => { - if (!validateTargetDirectory(directoryPath, {silent: options.silent})) { + if (!validateTargetDirectory(directoryPath, options)) { return false; } @@ -102,7 +102,7 @@ export default (directoryPath, options = {}) => { return false; } - if (_.startsWith(fileName, 'index.js')) { + if (_.startsWith(fileName, options.outputFile || 'index.js')) { return false; } @@ -112,7 +112,7 @@ export default (directoryPath, options = {}) => { return false; } - if (isDirectory && (!hasIndex(absolutePath) || ignoreDirectories)) { + if (isDirectory && (!hasIndex(absolutePath, options) || ignoreDirectories)) { return false; } diff --git a/src/utilities/readIndexConfig.js b/src/utilities/readIndexConfig.js index 5bb8a2a..b702b73 100644 --- a/src/utilities/readIndexConfig.js +++ b/src/utilities/readIndexConfig.js @@ -3,12 +3,12 @@ import path from 'path'; import hasIndex from './hasIndex'; import {CREATE_INDEX_PATTERN} from './constants'; -export default (directoryPath) => { - if (!hasIndex(directoryPath)) { +export default (directoryPath, options = {}) => { + if (!hasIndex(directoryPath, options)) { return {}; } - const indexPath = path.resolve(directoryPath, 'index.js'); + const indexPath = path.resolve(directoryPath, options.outputFile || 'index.js'); const indexContents = fs.readFileSync(indexPath, 'utf-8'); const found = indexContents.match(CREATE_INDEX_PATTERN); const configLine = typeof found[1] === 'string' ? found[1].trim() : ''; diff --git a/src/utilities/validateTargetDirectory.js b/src/utilities/validateTargetDirectory.js index 99f457b..7649234 100644 --- a/src/utilities/validateTargetDirectory.js +++ b/src/utilities/validateTargetDirectory.js @@ -24,7 +24,7 @@ export default (targetDirectory, options = {}) => { } } - const indexFilePath = path.resolve(targetDirectory, './index.js'); + const indexFilePath = path.resolve(targetDirectory, './' + (options.outputFile || 'index.js')); try { fs.statSync(indexFilePath); diff --git a/src/utilities/writeIndex.js b/src/utilities/writeIndex.js index 89a9ccf..27e65aa 100644 --- a/src/utilities/writeIndex.js +++ b/src/utilities/writeIndex.js @@ -10,15 +10,15 @@ import sortByDepth from './sortByDepth'; export default (directoryPaths, options = {}) => { const sortedDirectoryPaths = sortByDepth(directoryPaths) .filter((directoryPath) => { - return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe}); + return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe, outputFile: options.outputFile}); }); _.forEach(sortedDirectoryPaths, (directoryPath) => { - const config = readIndexConfig(directoryPath); + const config = readIndexConfig(directoryPath, options); const optionsWithConfig = Object.assign({}, options, {config}); const siblings = readDirectory(directoryPath, optionsWithConfig); const indexCode = createIndexCode(siblings, optionsWithConfig); - const indexFilePath = path.resolve(directoryPath, optionsWithConfig.outputFile || 'index.js'); + const indexFilePath = path.resolve(directoryPath, options.outputFile || 'index.js'); fs.writeFileSync(indexFilePath, indexCode); }); diff --git a/src/utilities/writeIndexCli.js b/src/utilities/writeIndexCli.js index 12aae29..e69bd87 100644 --- a/src/utilities/writeIndexCli.js +++ b/src/utilities/writeIndexCli.js @@ -40,13 +40,13 @@ export default (directoryPaths, options = {}) => { } sortedDirectoryPaths = sortedDirectoryPaths.filter((directoryPath) => { - return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe}); + return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe, outputFile: options.outputFile}); }); _.forEach(sortedDirectoryPaths, (directoryPath) => { let existingIndexCode; - const config = readIndexConfig(directoryPath); + const config = readIndexConfig(directoryPath, options); const siblings = readDirectory(directoryPath, { config, @@ -60,7 +60,7 @@ export default (directoryPaths, options = {}) => { config }); - const indexFilePath = path.resolve(directoryPath, 'index.js'); + const indexFilePath = path.resolve(directoryPath, options.outputFile || 'index.js'); try { existingIndexCode = fs.readFileSync(indexFilePath, 'utf8');