Compare commits
@@ -1,8 +1,9 @@
|
||||
{
|
||||
"plugins": [
|
||||
"transform-es2015-modules-commonjs",
|
||||
"transform-export-extensions",
|
||||
"transform-es2015-destructuring",
|
||||
"transform-es2015-parameters"
|
||||
"@babel/plugin-transform-modules-commonjs",
|
||||
"@babel/plugin-proposal-export-default-from",
|
||||
"@babel/plugin-proposal-export-namespace-from",
|
||||
"@babel/plugin-transform-destructuring",
|
||||
"@babel/plugin-transform-parameters"
|
||||
]
|
||||
}
|
||||
|
||||
+4
-2
@@ -1,7 +1,9 @@
|
||||
root = true
|
||||
|
||||
[*]
|
||||
charset = utf-8
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
indent_style = space
|
||||
insert_final_newline = true
|
||||
trim_trailing_whitespace = true
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
./test/fixtures
|
||||
test/fixtures
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
* text eol=lf
|
||||
+5
-1
@@ -4,8 +4,12 @@ node_js:
|
||||
- 7
|
||||
- 6
|
||||
- 5
|
||||
script:
|
||||
- npm run lint
|
||||
- npm run test
|
||||
- npm run build
|
||||
after_success:
|
||||
- semantic-release pre && npm publish && semantic-release post
|
||||
- semantic-release
|
||||
notifications:
|
||||
email: false
|
||||
sudo: false
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Copyright (c) 2016, Gajus Kuizinas (http://gajus.com/)
|
||||
Copyright (c) 2020, Gajus Kuizinas (http://gajus.com/)
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
|
||||
@@ -36,8 +36,8 @@ This created `index.js` with:
|
||||
```js
|
||||
// @create-index
|
||||
|
||||
export bar from './bar.js';
|
||||
export foo from './foo.js';
|
||||
export { default as bar } from './bar.js';
|
||||
export { default as foo } from './foo.js';
|
||||
|
||||
```
|
||||
|
||||
@@ -66,9 +66,9 @@ This have updated `index.js` file:
|
||||
```js
|
||||
// @create-index
|
||||
|
||||
export bar from './bar.js';
|
||||
export baz from './baz.js';
|
||||
export foo from './foo.js';
|
||||
export { default as bar } from './bar.js';
|
||||
export { default as baz } from './baz.js';
|
||||
export { default as foo } from './foo.js';
|
||||
|
||||
```
|
||||
|
||||
@@ -82,21 +82,35 @@ npm install create-index
|
||||
create-index --help
|
||||
|
||||
Options:
|
||||
--recursive, -r Create/update index files recursively. Halts on any unsafe
|
||||
"index.js" files. [boolean] [default: false]
|
||||
--recursive, -r Create/update index files recursively. Halts on any
|
||||
unsafe "index.js" files. [boolean] [default: false]
|
||||
--ignoreUnsafe, -i Ignores unsafe "index.js" files instead of halting.
|
||||
[boolean] [default: false]
|
||||
--update, -u Updates only previously created index files (recursively).
|
||||
--ignoreDirectories, -d Ignores importing directories into the index file,
|
||||
even if they have a safe "index.js".
|
||||
[boolean] [default: false]
|
||||
--banner Add a custom banner at the top of the index file [string]
|
||||
--update, -u Updates only previously created index files
|
||||
(recursively). [boolean] [default: false]
|
||||
--banner Add a custom banner at the top of the index file
|
||||
[string]
|
||||
--extensions, -x Allows some extensions to be parsed as valid source.
|
||||
First extension will always be preferred to homonyms
|
||||
with another allowed extension.
|
||||
[array] [default: ["js"]]
|
||||
--outputFile, -o Output file [string] [default: "index.js"] [array] [default: ["js"]]
|
||||
|
||||
Examples:
|
||||
create-index ./src ./src/utilities Creates or updates an existing
|
||||
create-index index file in the target
|
||||
(./src, ./src/utilities) directories.
|
||||
create-index --update ./src ./tests Finds all create-index index files in the
|
||||
target directories and descending
|
||||
directories. Updates found index files.
|
||||
create-index --update ./src ./tests Finds all create-index index files in
|
||||
the target directories and descending
|
||||
directories. Updates found index
|
||||
files.
|
||||
create-index ./src --extensions js jsx Creates or updates an existing
|
||||
create-index index file in the target
|
||||
(./src) directory for both .js and
|
||||
.jsx extensions.
|
||||
```
|
||||
|
||||
### Using `create-index` Programmatically
|
||||
@@ -177,8 +191,8 @@ Given the above directory contents, `./index.js` will be:
|
||||
```js
|
||||
// @create-index
|
||||
|
||||
import bar from './bar';
|
||||
import foo from './foo.js';
|
||||
import { default as bar } from './bar';
|
||||
import { default as foo } from './foo.js';
|
||||
|
||||
export {
|
||||
bar,
|
||||
@@ -193,3 +207,37 @@ Directories that do not have `./index.js` in themselves will be excluded.
|
||||
When run again, `create-index` will update existing `./index.js` if it starts with `// @create-index\n\n`.
|
||||
|
||||
If `create-index` is executed against a directory that contains `./index.js`, which does not start with `// @create-index\n\n`, an error will be thrown.
|
||||
|
||||
## Ignore files on `--update`
|
||||
|
||||
`create-index` can ignore files in a directory if `./index.js` contains special object with defined `ignore` property which takes `an array` of `regular expressions` defined as `strings`, e.g.
|
||||
|
||||
```js
|
||||
> cat index.js
|
||||
// @create-index {"ignore": ["/baz.js$/"]}
|
||||
```
|
||||
|
||||
```js
|
||||
> tree ./
|
||||
./
|
||||
├── bar.js
|
||||
├── baz.js
|
||||
├── foo.js
|
||||
└── index.js
|
||||
|
||||
0 directories, 4 files
|
||||
```
|
||||
|
||||
Given the above directory contents, after running `create-index` with `--update` flag, `./index.js` will be:
|
||||
|
||||
```js
|
||||
// @create-index {"ignore": ["/baz.js$/"]}
|
||||
|
||||
import { default as bar } from './bar.js';
|
||||
import { default as foo } from './foo.js';
|
||||
|
||||
export {
|
||||
bar,
|
||||
foo
|
||||
};
|
||||
```
|
||||
|
||||
+30
-24
@@ -6,26 +6,28 @@
|
||||
},
|
||||
"bin": "./dist/bin/create-index.js",
|
||||
"dependencies": {
|
||||
"chalk": "^1.1.3",
|
||||
"glob": "^7.1.1",
|
||||
"lodash": "^4.16.6",
|
||||
"moment": "^2.15.2",
|
||||
"yargs": "^6.3.0"
|
||||
"chalk": "^4.0.0",
|
||||
"glob": "^7.1.6",
|
||||
"lodash": "^4.17.15",
|
||||
"moment": "^2.25.3",
|
||||
"yargs": "^15.3.1"
|
||||
},
|
||||
"description": "Creates ES6 ./index.js file in target directories that imports and exports all sibling files and directories.",
|
||||
"devDependencies": {
|
||||
"babel-cli": "^6.18.0",
|
||||
"babel-plugin-transform-es2015-destructuring": "^6.18.0",
|
||||
"babel-plugin-transform-es2015-modules-commonjs": "^6.18.0",
|
||||
"babel-plugin-transform-es2015-parameters": "^6.18.0",
|
||||
"babel-plugin-transform-export-extensions": "^6.8.0",
|
||||
"babel-register": "^6.18.0",
|
||||
"chai": "^3.5.0",
|
||||
"eslint": "^3.9.1",
|
||||
"eslint-config-canonical": "^4.0.0",
|
||||
"husky": "^0.11.9",
|
||||
"mocha": "^3.1.2",
|
||||
"semantic-release": "^6.3.2"
|
||||
"@babel/cli": "^7.0.0",
|
||||
"@babel/core": "^7.0.0",
|
||||
"@babel/plugin-proposal-export-default-from": "^7.0.0",
|
||||
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
|
||||
"@babel/plugin-transform-destructuring": "^7.0.0",
|
||||
"@babel/plugin-transform-modules-commonjs": "^7.0.0",
|
||||
"@babel/plugin-transform-parameters": "^7.0.0",
|
||||
"@babel/register": "^7.0.0",
|
||||
"chai": "^4.2.0",
|
||||
"eslint": "^7.0.0",
|
||||
"eslint-config-canonical": "^20.0.4",
|
||||
"husky": "^4.2.5",
|
||||
"mocha": "^7.1.2",
|
||||
"semantic-release": "^17.0.7"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=5"
|
||||
@@ -42,12 +44,16 @@
|
||||
"type": "git",
|
||||
"url": "https://github.com/gajus/create-index"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "NODE_ENV=production babel --source-maps --copy-files ./src --out-dir ./dist",
|
||||
"create-index": "node ./dist/bin/create-index ./src/utilities",
|
||||
"lint": "NODE_ENV=development eslint ./src ./tests",
|
||||
"precommit": "npm run test",
|
||||
"test": "npm run build && npm run lint && NODE_ENV=development mocha --compilers js:babel-register"
|
||||
"husky": {
|
||||
"hooks": {
|
||||
"pre-commit": "npm run test"
|
||||
}
|
||||
},
|
||||
"version": "1.0.0"
|
||||
"scripts": {
|
||||
"build": "rm -fr ./dist && NODE_ENV=production babel --source-maps --copy-files ./src --out-dir ./dist",
|
||||
"create-index": "node ./dist/bin/create-index ./src/utilities",
|
||||
"lint": "NODE_ENV=development eslint ./src ./test",
|
||||
"test": "NODE_ENV=development mocha --require @babel/register"
|
||||
},
|
||||
"version": "0.0.0-development"
|
||||
}
|
||||
|
||||
+51
-12
@@ -1,8 +1,10 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
/* eslint-disable filenames/match-regex */
|
||||
|
||||
import yargs from 'yargs';
|
||||
import {
|
||||
writeIndexCli
|
||||
writeIndexCli,
|
||||
} from '../utilities';
|
||||
|
||||
const argv = yargs
|
||||
@@ -12,38 +14,75 @@ const argv = yargs
|
||||
alias: 'r',
|
||||
default: false,
|
||||
description: 'Create/update index files recursively. Halts on any unsafe "index.js" files.',
|
||||
type: 'boolean'
|
||||
}
|
||||
type: 'boolean',
|
||||
},
|
||||
})
|
||||
.options({
|
||||
ignoreUnsafe: {
|
||||
alias: 'i',
|
||||
default: false,
|
||||
description: 'Ignores unsafe "index.js" files instead of halting.',
|
||||
type: 'boolean'
|
||||
}
|
||||
type: 'boolean',
|
||||
},
|
||||
})
|
||||
.options({
|
||||
ignoreDirectories: {
|
||||
alias: 'd',
|
||||
default: false,
|
||||
description: 'Ignores importing directories into the index file, even if they have a safe "index.js".',
|
||||
type: 'boolean',
|
||||
},
|
||||
})
|
||||
.options({
|
||||
update: {
|
||||
alias: 'u',
|
||||
default: false,
|
||||
description: 'Updates only previously created index files (recursively).',
|
||||
type: 'boolean'
|
||||
}
|
||||
type: 'boolean',
|
||||
},
|
||||
})
|
||||
.options({
|
||||
banner: {
|
||||
description: 'Add a custom banner at the top of the index file',
|
||||
type: 'string'
|
||||
}
|
||||
type: 'string',
|
||||
},
|
||||
})
|
||||
.example('create-index ./src ./src/utilities', 'Creates or updates an existing create-index index file in the target (./src, ./src/utilities) directories.')
|
||||
.example('create-index --update ./src ./tests', 'Finds all create-index index files in the target directories and descending directories. Updates found index files.')
|
||||
.options({
|
||||
extensions: {
|
||||
alias: 'x',
|
||||
default: ['js'],
|
||||
description: 'Allows some extensions to be parsed as valid source. First extension will always be preferred to homonyms with another allowed extension.',
|
||||
type: 'array',
|
||||
},
|
||||
})
|
||||
.options({
|
||||
outputFile: {
|
||||
alias: 'o',
|
||||
default: 'index.js',
|
||||
description: 'Output file',
|
||||
type: 'string',
|
||||
},
|
||||
})
|
||||
.example(
|
||||
'create-index ./src ./src/utilities',
|
||||
'Creates or updates an existing create-index index file in the target (./src, ./src/utilities) directories.',
|
||||
)
|
||||
.example(
|
||||
'create-index --update ./src ./tests',
|
||||
'Finds all create-index index files in the target directories and descending directories. Updates found index files.',
|
||||
)
|
||||
.example(
|
||||
'create-index ./src --extensions js jsx',
|
||||
'Creates or updates an existing create-index index file in the target (./src) directory for both .js and .jsx extensions.',
|
||||
)
|
||||
.argv;
|
||||
|
||||
writeIndexCli(argv._, {
|
||||
banner: argv.banner,
|
||||
extensions: argv.extensions,
|
||||
ignoreDirectories: argv.ignoreDirectories,
|
||||
ignoreUnsafe: argv.ignoreUnsafe,
|
||||
outputFile: argv.outputFile,
|
||||
recursive: argv.recursive,
|
||||
updateIndex: argv.update
|
||||
updateIndex: argv.update,
|
||||
});
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
export {
|
||||
findIndexFiles,
|
||||
writeIndex
|
||||
writeIndex,
|
||||
} from './utilities';
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export const CREATE_INDEX_PATTERN = /(?:^|[\n\r]+)\/\/ @create-index\s?({.*})?[\n\r]+/;
|
||||
@@ -14,7 +14,7 @@ const buildExportBlock = (files) => {
|
||||
let importBlock;
|
||||
|
||||
importBlock = _.map(files, (fileName) => {
|
||||
return 'export ' + safeVariableName(fileName) + ' from \'./' + fileName + '\';';
|
||||
return 'export { default as ' + safeVariableName(fileName) + ' } from \'./' + fileName + '\';';
|
||||
});
|
||||
|
||||
importBlock = importBlock.join('\n');
|
||||
@@ -24,8 +24,10 @@ const buildExportBlock = (files) => {
|
||||
|
||||
export default (filePaths, options = {}) => {
|
||||
let code;
|
||||
let configCode;
|
||||
|
||||
code = '';
|
||||
configCode = '';
|
||||
|
||||
if (options.banner) {
|
||||
const banners = _.isArray(options.banner) ? options.banner : [options.banner];
|
||||
@@ -37,7 +39,11 @@ export default (filePaths, options = {}) => {
|
||||
code += '\n';
|
||||
}
|
||||
|
||||
code += '// @create-index\n\n';
|
||||
if (options.config && _.size(options.config) > 0) {
|
||||
configCode += ' ' + JSON.stringify(options.config);
|
||||
}
|
||||
|
||||
code += '// @create-index' + configCode + '\n\n';
|
||||
|
||||
if (filePaths.length) {
|
||||
const sortedFilePaths = filePaths.sort();
|
||||
|
||||
@@ -4,7 +4,8 @@ import glob from 'glob';
|
||||
import validateTargetDirectory from './validateTargetDirectory';
|
||||
|
||||
export default (directoryPath, options = {}) => {
|
||||
let fileName, targetDirectories;
|
||||
let fileName;
|
||||
let targetDirectories;
|
||||
|
||||
fileName = options.fileName || 'index.js';
|
||||
fileName = './**/' + fileName;
|
||||
@@ -13,7 +14,8 @@ export default (directoryPath, options = {}) => {
|
||||
|
||||
targetDirectories = _.filter(targetDirectories, (targetDirectoryPath) => {
|
||||
return validateTargetDirectory(path.dirname(targetDirectoryPath), {
|
||||
silent: options.silent
|
||||
outputFile: options.fileName,
|
||||
silent: options.silent,
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
|
||||
export default (directoryPath, options = {}) => {
|
||||
const indexPath = path.resolve(directoryPath, options.outputFile || 'index.js');
|
||||
|
||||
try {
|
||||
fs.statSync(indexPath);
|
||||
|
||||
return true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
@@ -1,10 +1,10 @@
|
||||
// @create-index
|
||||
|
||||
export createIndexCode from './createIndexCode.js';
|
||||
export findIndexFiles from './findIndexFiles.js';
|
||||
export log from './log.js';
|
||||
export readDirectory from './readDirectory.js';
|
||||
export sortByDepth from './sortByDepth.js';
|
||||
export validateTargetDirectory from './validateTargetDirectory.js';
|
||||
export writeIndex from './writeIndex.js';
|
||||
export writeIndexCli from './writeIndexCli.js';
|
||||
export createIndexCode from './createIndexCode';
|
||||
export findIndexFiles from './findIndexFiles';
|
||||
export log from './log';
|
||||
export readDirectory from './readDirectory';
|
||||
export sortByDepth from './sortByDepth';
|
||||
export validateTargetDirectory from './validateTargetDirectory';
|
||||
export writeIndex from './writeIndex';
|
||||
export writeIndexCli from './writeIndexCli';
|
||||
|
||||
@@ -2,8 +2,6 @@ import chalk from 'chalk';
|
||||
import moment from 'moment';
|
||||
|
||||
export default (...append) => {
|
||||
/* eslint-disable no-console */
|
||||
// eslint-disable-next-line no-console
|
||||
console.log(chalk.dim('[' + moment().format('HH:mm:ss') + ']'), ...append);
|
||||
|
||||
/* eslint-enable no-console */
|
||||
};
|
||||
|
||||
@@ -1,20 +1,9 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import _ from 'lodash';
|
||||
import hasIndex from './hasIndex';
|
||||
import validateTargetDirectory from './validateTargetDirectory';
|
||||
|
||||
const hasIndex = (directoryPath) => {
|
||||
const indexPath = path.resolve(directoryPath, 'index.js');
|
||||
|
||||
try {
|
||||
fs.statSync(indexPath);
|
||||
|
||||
return true;
|
||||
} catch (error) {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
const hasNoExtension = (fileName) => {
|
||||
const matches = fileName.match(/\./g);
|
||||
|
||||
@@ -28,22 +17,73 @@ const hasMultipleExtensions = (fileName) => {
|
||||
};
|
||||
|
||||
const isSafeName = (fileName) => {
|
||||
return /^[a-z][a-z0-9._]+$/i.test(fileName);
|
||||
return /^[_a-z][\w.]*$/i.test(fileName);
|
||||
};
|
||||
|
||||
const removeDuplicates = (files) => {
|
||||
const stripExtension = (fileName) => {
|
||||
const pos = fileName.lastIndexOf('.');
|
||||
|
||||
if (pos === -1) {
|
||||
return fileName;
|
||||
}
|
||||
|
||||
return fileName.slice(0, Math.max(0, pos));
|
||||
};
|
||||
|
||||
const removeDuplicates = (files, preferredExtension) => {
|
||||
return _.filter(files, (fileName) => {
|
||||
return !_.includes(files, fileName + '.js');
|
||||
const withoutExtension = stripExtension(fileName);
|
||||
const mainAlternative = withoutExtension + '.' + preferredExtension;
|
||||
|
||||
if (mainAlternative === fileName) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !_.includes(files, mainAlternative);
|
||||
});
|
||||
};
|
||||
|
||||
const removeIgnoredFiles = (files, ignorePatterns = []) => {
|
||||
if (ignorePatterns.length === 0) {
|
||||
return files;
|
||||
}
|
||||
|
||||
const patterns = ignorePatterns.map((pattern) => {
|
||||
if (_.startsWith(pattern, '/') && _.endsWith(pattern, '/')) {
|
||||
const patternWithoutSlashes = pattern.slice(1, -1);
|
||||
|
||||
return new RegExp(patternWithoutSlashes);
|
||||
}
|
||||
|
||||
return new RegExp(pattern);
|
||||
});
|
||||
|
||||
return _.filter(files, (fileName) => {
|
||||
let pattern;
|
||||
|
||||
for (pattern of patterns) {
|
||||
if (fileName.match(pattern) !== null) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
};
|
||||
|
||||
export default (directoryPath, options = {}) => {
|
||||
let children;
|
||||
|
||||
if (!validateTargetDirectory(directoryPath, {silent: options.silent})) {
|
||||
if (!validateTargetDirectory(directoryPath, options)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const {
|
||||
extensions = ['js'],
|
||||
config = {},
|
||||
ignoreDirectories = false,
|
||||
} = options;
|
||||
|
||||
let children;
|
||||
|
||||
children = fs.readdirSync(directoryPath);
|
||||
|
||||
children = _.filter(children, (fileName) => {
|
||||
@@ -62,22 +102,25 @@ export default (directoryPath, options = {}) => {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (_.startsWith(fileName, 'index.js')) {
|
||||
if (_.startsWith(fileName, options.outputFile || 'index.js')) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!isDirectory && !_.endsWith(fileName, '.js')) {
|
||||
if (!isDirectory && !extensions.some((extension) => {
|
||||
return _.endsWith(fileName, '.' + extension);
|
||||
})) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isDirectory && !hasIndex(absolutePath)) {
|
||||
if (isDirectory && (!hasIndex(absolutePath, options) || ignoreDirectories)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
children = removeDuplicates(children);
|
||||
children = removeDuplicates(children, extensions[0]);
|
||||
children = removeIgnoredFiles(children, config.ignore);
|
||||
|
||||
return children.sort();
|
||||
};
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import hasIndex from './hasIndex';
|
||||
import {CREATE_INDEX_PATTERN} from './constants';
|
||||
|
||||
export default (directoryPath, options = {}) => {
|
||||
if (!hasIndex(directoryPath, options)) {
|
||||
return {};
|
||||
}
|
||||
|
||||
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() : '';
|
||||
|
||||
if (configLine.length === 0) {
|
||||
return {};
|
||||
}
|
||||
|
||||
let config;
|
||||
|
||||
try {
|
||||
config = JSON.parse(configLine);
|
||||
} catch {
|
||||
throw new Error(
|
||||
'"' + indexPath + '" contains invalid configuration object.\n' +
|
||||
'Configuration object must be a valid JSON.',
|
||||
);
|
||||
}
|
||||
|
||||
return config;
|
||||
};
|
||||
@@ -1,5 +1,6 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import {CREATE_INDEX_PATTERN} from './constants';
|
||||
|
||||
export default (targetDirectory, options = {}) => {
|
||||
const silent = options.silent;
|
||||
@@ -7,7 +8,7 @@ export default (targetDirectory, options = {}) => {
|
||||
|
||||
try {
|
||||
stats = fs.statSync(targetDirectory);
|
||||
} catch (error) {
|
||||
} catch {
|
||||
if (silent) {
|
||||
return false;
|
||||
} else {
|
||||
@@ -23,17 +24,17 @@ export default (targetDirectory, options = {}) => {
|
||||
}
|
||||
}
|
||||
|
||||
const indexFilePath = path.resolve(targetDirectory, './index.js');
|
||||
const indexFilePath = path.resolve(targetDirectory, './' + (options.outputFile || 'index.js'));
|
||||
|
||||
try {
|
||||
fs.statSync(indexFilePath);
|
||||
} catch (error) {
|
||||
} catch {
|
||||
return true;
|
||||
}
|
||||
|
||||
const indexFile = fs.readFileSync(indexFilePath, 'utf8');
|
||||
|
||||
if (!indexFile.match(/(?:^|[\n\r]+)\/\/ @create-index[\n\r]+/)) {
|
||||
if (!indexFile.match(CREATE_INDEX_PATTERN)) {
|
||||
if (silent) {
|
||||
return false;
|
||||
} else {
|
||||
|
||||
@@ -4,18 +4,22 @@ import _ from 'lodash';
|
||||
import createIndexCode from './createIndexCode';
|
||||
import validateTargetDirectory from './validateTargetDirectory';
|
||||
import readDirectory from './readDirectory';
|
||||
import readIndexConfig from './readIndexConfig';
|
||||
import sortByDepth from './sortByDepth';
|
||||
|
||||
export default (directoryPaths, options = {}) => {
|
||||
const sortedDirectoryPaths = sortByDepth(directoryPaths)
|
||||
.filter((directoryPath) => {
|
||||
return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe});
|
||||
return validateTargetDirectory(directoryPath, {outputFile: options.outputFile,
|
||||
silent: options.ignoreUnsafe});
|
||||
});
|
||||
|
||||
_.forEach(sortedDirectoryPaths, (directoryPath) => {
|
||||
const siblings = readDirectory(directoryPath);
|
||||
const indexCode = createIndexCode(siblings);
|
||||
const indexFilePath = path.resolve(directoryPath, 'index.js');
|
||||
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, options.outputFile || 'index.js');
|
||||
|
||||
fs.writeFileSync(indexFilePath, indexCode);
|
||||
});
|
||||
|
||||
@@ -5,6 +5,7 @@ import chalk from 'chalk';
|
||||
import createIndexCode from './createIndexCode';
|
||||
import validateTargetDirectory from './validateTargetDirectory';
|
||||
import readDirectory from './readDirectory';
|
||||
import readIndexConfig from './readIndexConfig';
|
||||
import sortByDepth from './sortByDepth';
|
||||
import log from './log';
|
||||
import findIndexFiles from './findIndexFiles';
|
||||
@@ -15,18 +16,20 @@ export default (directoryPaths, options = {}) => {
|
||||
sortedDirectoryPaths = sortByDepth(directoryPaths);
|
||||
|
||||
log('Target directories', sortedDirectoryPaths);
|
||||
log('Output file', options.outputFile);
|
||||
if (options.updateIndex) {
|
||||
log('Update index:', options.updateIndex ? chalk.green('true') : chalk.red('false'));
|
||||
} else {
|
||||
log('Recursive:', options.ignoreUnsafe ? chalk.green('true') : chalk.red('false'));
|
||||
log('Recursive:', options.recursive ? chalk.green('true') : chalk.red('false'));
|
||||
log('Ignore unsafe:', options.ignoreUnsafe ? chalk.green('true') : chalk.red('false'));
|
||||
log('Extensions:', chalk.green(options.extensions));
|
||||
}
|
||||
|
||||
if (options.updateIndex || options.recursive) {
|
||||
sortedDirectoryPaths = _.map(sortedDirectoryPaths, (dir) => {
|
||||
return findIndexFiles(dir, {
|
||||
fileName: options.updateIndex ? 'index.js' : '*',
|
||||
silent: options.updateIndex || options.ignoreUnsafe
|
||||
sortedDirectoryPaths = _.map(sortedDirectoryPaths, (directory) => {
|
||||
return findIndexFiles(directory, {
|
||||
fileName: options.updateIndex ? options.outputFile || 'index.js' : '*',
|
||||
silent: options.updateIndex || options.ignoreUnsafe,
|
||||
});
|
||||
});
|
||||
sortedDirectoryPaths = _.flatten(sortedDirectoryPaths);
|
||||
@@ -37,25 +40,34 @@ export default (directoryPaths, options = {}) => {
|
||||
}
|
||||
|
||||
sortedDirectoryPaths = sortedDirectoryPaths.filter((directoryPath) => {
|
||||
return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe});
|
||||
return validateTargetDirectory(directoryPath, {outputFile: options.outputFile,
|
||||
silent: options.ignoreUnsafe});
|
||||
});
|
||||
|
||||
_.forEach(sortedDirectoryPaths, (directoryPath) => {
|
||||
let existingIndexCode;
|
||||
|
||||
const siblings = readDirectory(directoryPath, {silent: options.ignoreUnsafe});
|
||||
const config = readIndexConfig(directoryPath, options);
|
||||
|
||||
const indexCode = createIndexCode(siblings, {
|
||||
banner: options.banner
|
||||
const siblings = readDirectory(directoryPath, {
|
||||
config,
|
||||
extensions: options.extensions,
|
||||
ignoreDirectories: options.ignoreDirectories,
|
||||
silent: options.ignoreUnsafe,
|
||||
});
|
||||
|
||||
const indexFilePath = path.resolve(directoryPath, 'index.js');
|
||||
const indexCode = createIndexCode(siblings, {
|
||||
banner: options.banner,
|
||||
config,
|
||||
});
|
||||
|
||||
const indexFilePath = path.resolve(directoryPath, options.outputFile || 'index.js');
|
||||
|
||||
try {
|
||||
existingIndexCode = fs.readFileSync(indexFilePath, 'utf8');
|
||||
|
||||
/* eslint-disable no-empty */
|
||||
} catch (error) {
|
||||
} catch {
|
||||
|
||||
}
|
||||
|
||||
@@ -64,7 +76,7 @@ export default (directoryPaths, options = {}) => {
|
||||
fs.writeFileSync(indexFilePath, indexCode);
|
||||
|
||||
if (existingIndexCode && existingIndexCode === indexCode) {
|
||||
log(indexFilePath, chalk.yellow('[index have not changed]'));
|
||||
log(indexFilePath, chalk.yellow('[index has not changed]'));
|
||||
} else if (existingIndexCode && existingIndexCode !== indexCode) {
|
||||
log(indexFilePath, chalk.green('[updated index]'));
|
||||
} else {
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"extends": "canonical/mocha"
|
||||
}
|
||||
+23
-7
@@ -1,7 +1,7 @@
|
||||
/* eslint-disable no-restricted-syntax */
|
||||
|
||||
import {
|
||||
expect
|
||||
expect,
|
||||
} from 'chai';
|
||||
import createIndexCode from '../src/utilities/createIndexCode';
|
||||
import codeExample from './codeExample';
|
||||
@@ -20,7 +20,7 @@ describe('createIndexCode()', () => {
|
||||
expect(indexCode).to.equal(codeExample(`
|
||||
// @create-index
|
||||
|
||||
export foo from './foo';
|
||||
export { default as foo } from './foo';
|
||||
`));
|
||||
});
|
||||
it('describes multiple children', () => {
|
||||
@@ -29,8 +29,8 @@ export foo from './foo';
|
||||
expect(indexCode).to.equal(codeExample(`
|
||||
// @create-index
|
||||
|
||||
export bar from './bar';
|
||||
export foo from './foo';
|
||||
export { default as bar } from './bar';
|
||||
export { default as foo } from './foo';
|
||||
`));
|
||||
});
|
||||
context('file with extension', () => {
|
||||
@@ -40,7 +40,7 @@ export foo from './foo';
|
||||
expect(indexCode).to.equal(codeExample(`
|
||||
// @create-index
|
||||
|
||||
export foo from './foo.js';
|
||||
export { default as foo } from './foo.js';
|
||||
`));
|
||||
});
|
||||
});
|
||||
@@ -51,8 +51,24 @@ export foo from './foo.js';
|
||||
expect(indexCode).to.equal(codeExample(`
|
||||
// @create-index
|
||||
|
||||
export bar from './bar';
|
||||
export foo from './foo';
|
||||
export { default as bar } from './bar';
|
||||
export { default as foo } from './foo';
|
||||
`));
|
||||
});
|
||||
});
|
||||
|
||||
context('with config', () => {
|
||||
it('should append config', () => {
|
||||
const config = {
|
||||
ignore: ['/^zoo/'],
|
||||
};
|
||||
const indexCode = createIndexCode(['foo', 'bar'], {config});
|
||||
|
||||
expect(indexCode).to.equal(codeExample(`
|
||||
// @create-index {"ignore":["/^zoo/"]}
|
||||
|
||||
export { default as bar } from './bar';
|
||||
export { default as foo } from './foo';
|
||||
`));
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import path from 'path';
|
||||
import {
|
||||
expect
|
||||
expect,
|
||||
} from 'chai';
|
||||
import glob from 'glob';
|
||||
import findIndexFiles from '../src/utilities/findIndexFiles';
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
// @create-index
|
||||
@@ -0,0 +1 @@
|
||||
// @create-index
|
||||
@@ -0,0 +1 @@
|
||||
// @create-index
|
||||
@@ -0,0 +1 @@
|
||||
// @create-index
|
||||
@@ -0,0 +1 @@
|
||||
// @create-index {"ignore": ["/foo.js$/"]}
|
||||
@@ -0,0 +1 @@
|
||||
// @create-index {ignore: 'foo'}
|
||||
@@ -0,0 +1 @@
|
||||
// @create-index
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
// @create-index
|
||||
|
||||
export bar from './bar';
|
||||
export foo from './foo.js';
|
||||
export { default as bar } from './bar';
|
||||
export { default as foo } from './foo.js';
|
||||
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
// @create-index {"ignore":["/bar.js$/"]}
|
||||
|
||||
export { default as foo } from './foo.js';
|
||||
|
||||
+53
-1
@@ -1,6 +1,6 @@
|
||||
import path from 'path';
|
||||
import {
|
||||
expect
|
||||
expect,
|
||||
} from 'chai';
|
||||
import readDirectory from '../src/utilities/readDirectory';
|
||||
|
||||
@@ -21,6 +21,13 @@ describe('readDirectory()', () => {
|
||||
expect(names).to.deep.equal(['present.js']);
|
||||
});
|
||||
});
|
||||
context('target directory contains child directories (short safe name)', () => {
|
||||
it('gets names of the children directories', () => {
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-directories-short-name'));
|
||||
|
||||
expect(names).to.deep.equal(['F', 'T', '__', 'o']);
|
||||
});
|
||||
});
|
||||
context('target directory contains child directories (unsafe name)', () => {
|
||||
it('gets names of the children directories', () => {
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-directories-unsafe-name'));
|
||||
@@ -34,6 +41,12 @@ describe('readDirectory()', () => {
|
||||
|
||||
expect(names).to.deep.equal(['bar', 'foo']);
|
||||
});
|
||||
|
||||
it('excludes directories if ignoreDirectories = true', () => {
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-index'), {ignoreDirectories: true});
|
||||
|
||||
expect(names).to.deep.equal([]);
|
||||
});
|
||||
});
|
||||
context('target directory contains files', () => {
|
||||
it('refers to the files (with extension)', () => {
|
||||
@@ -49,6 +62,45 @@ describe('readDirectory()', () => {
|
||||
expect(names).to.deep.equal(['present.js']);
|
||||
});
|
||||
});
|
||||
context('target directory contains non js files, and not configured to allow that', () => {
|
||||
it('prefers file', () => {
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-files-alt-extension'));
|
||||
|
||||
expect(names).to.deep.equal(['present.js']);
|
||||
});
|
||||
});
|
||||
context('target directory contains non js files, and allowing only jsx', () => {
|
||||
it('prefers file', () => {
|
||||
const options = {extensions: ['jsx']};
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-files-alt-extension'), options);
|
||||
|
||||
expect(names).to.deep.equal(['bar.jsx']);
|
||||
});
|
||||
});
|
||||
context('target directory contains non js files, and allowing both js and jsx', () => {
|
||||
it('prefers file', () => {
|
||||
const options = {extensions: ['js', 'jsx']};
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-files-alt-extension'), options);
|
||||
|
||||
expect(names).to.deep.equal(['bar.jsx', 'present.js']);
|
||||
});
|
||||
});
|
||||
context('target directory contains homonyms files, and allowing both js and jsx, will prefer JS as it is first extension listed', () => {
|
||||
it('prefers file', () => {
|
||||
const options = {extensions: ['js', 'jsx']};
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-files-alt-extension-with-homonyms'), options);
|
||||
|
||||
expect(names).to.deep.equal(['bar.js', 'present.js']);
|
||||
});
|
||||
});
|
||||
context('target directory contains homonyms files, and allowing both js and jsx, will prefer JSX as it is first extension listed', () => {
|
||||
it('prefers file', () => {
|
||||
const options = {extensions: ['jsx', 'js']};
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-files-alt-extension-with-homonyms'), options);
|
||||
|
||||
expect(names).to.deep.equal(['bar.jsx', 'present.js']);
|
||||
});
|
||||
});
|
||||
context('target directory contains files with no extension', () => {
|
||||
it('ignores files', () => {
|
||||
const names = readDirectory(path.resolve(fixturesPath, 'children-files-no-extension'));
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
import path from 'path';
|
||||
import {
|
||||
expect,
|
||||
} from 'chai';
|
||||
import readIndexConfig from '../src/utilities/readIndexConfig';
|
||||
|
||||
const fixtures = {
|
||||
noIndex: path.resolve(__dirname, 'fixtures/read-index-config/no-index'),
|
||||
withConfig: path.resolve(__dirname, 'fixtures/read-index-config/with-config'),
|
||||
withInvalidConfig: path.resolve(__dirname, 'fixtures/read-index-config/with-invalid-config'),
|
||||
withoutConfig: path.resolve(__dirname, 'fixtures/read-index-config/without-config'),
|
||||
};
|
||||
|
||||
const expectedValues = {
|
||||
noIndex: {},
|
||||
withConfig: {
|
||||
ignore: ['/foo.js$/'],
|
||||
},
|
||||
withoutConfig: {},
|
||||
};
|
||||
|
||||
describe('readIndexConfig()', () => {
|
||||
context('When valid config is defined', () => {
|
||||
it('reads config object', () => {
|
||||
const config = readIndexConfig(fixtures.withConfig);
|
||||
|
||||
expect(config).to.deep.equal(expectedValues.withConfig);
|
||||
});
|
||||
});
|
||||
|
||||
context('When invalid config is defined', () => {
|
||||
it('should throw an error', () => {
|
||||
const wrappedReadIndexConfig = () => {
|
||||
readIndexConfig(fixtures.withInvalidConfig);
|
||||
};
|
||||
|
||||
expect(wrappedReadIndexConfig).to.throw(/Configuration object must be a valid JSON./);
|
||||
});
|
||||
});
|
||||
|
||||
context('When config is NOT defined', () => {
|
||||
it('returns an empty object', () => {
|
||||
const config = readIndexConfig(fixtures.withoutConfig);
|
||||
|
||||
expect(config).to.deep.equal(expectedValues.withoutConfig);
|
||||
});
|
||||
});
|
||||
|
||||
context('When index file doesn\'t exist', () => {
|
||||
it('returns an empty object', () => {
|
||||
const config = readIndexConfig(fixtures.withoutConfig);
|
||||
|
||||
expect(config).to.deep.equal(expectedValues.noIndex);
|
||||
});
|
||||
});
|
||||
});
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
import {
|
||||
expect
|
||||
expect,
|
||||
} from 'chai';
|
||||
import sortByDepth from './../src/utilities/sortByDepth';
|
||||
import sortByDepth from '../src/utilities/sortByDepth';
|
||||
|
||||
describe('sortByDepth()', () => {
|
||||
it('sorts from deepest to the most shallow', () => {
|
||||
@@ -9,7 +9,7 @@ describe('sortByDepth()', () => {
|
||||
'/b',
|
||||
'/a',
|
||||
'/a/b/c',
|
||||
'/a/b'
|
||||
'/a/b',
|
||||
];
|
||||
|
||||
const sortedPaths = sortByDepth(paths);
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import path from 'path';
|
||||
import {
|
||||
expect
|
||||
expect,
|
||||
} from 'chai';
|
||||
import validateTargetDirectory from '../src/utilities/validateTargetDirectory';
|
||||
|
||||
|
||||
+35
-13
@@ -3,34 +3,56 @@
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import {
|
||||
expect
|
||||
expect,
|
||||
} from 'chai';
|
||||
import writeIndex from '../src/utilities/writeIndex';
|
||||
import codeExample from './codeExample';
|
||||
|
||||
const readFile = (filePath) => {
|
||||
return fs.readFileSync(filePath, 'utf8');
|
||||
};
|
||||
|
||||
const removeFile = (filePath) => {
|
||||
fs.unlinkSync(filePath);
|
||||
};
|
||||
|
||||
const appendToFile = (filePath, content) => {
|
||||
fs.appendFileSync(filePath, content, 'utf-8');
|
||||
};
|
||||
|
||||
const fixturesPath = path.resolve(__dirname, 'fixtures/write-index');
|
||||
|
||||
describe('writeIndex()', () => {
|
||||
it('creates index in target directory', () => {
|
||||
const indexFilePath = path.resolve(fixturesPath, 'mixed/index.js');
|
||||
|
||||
try {
|
||||
fs.unlinkSync(indexFilePath);
|
||||
|
||||
// eslint-disable-next-line no-empty
|
||||
} catch (error) {
|
||||
|
||||
}
|
||||
|
||||
removeFile(indexFilePath);
|
||||
writeIndex([path.resolve(fixturesPath, 'mixed')]);
|
||||
|
||||
const indexCode = fs.readFileSync(indexFilePath, 'utf8');
|
||||
const indexCode = readFile(indexFilePath);
|
||||
|
||||
expect(indexCode).to.equal(codeExample(`
|
||||
// @create-index
|
||||
|
||||
export bar from './bar';
|
||||
export foo from './foo.js';
|
||||
export { default as bar } from './bar';
|
||||
export { default as foo } from './foo.js';
|
||||
`));
|
||||
});
|
||||
|
||||
it('creates index with config in target directory', () => {
|
||||
const indexFilePath = path.resolve(fixturesPath, 'with-config/index.js');
|
||||
// eslint-disable-next-line quotes
|
||||
const ignoredExportLine = `export { default as bar } from './bar.js';`;
|
||||
|
||||
appendToFile(indexFilePath, ignoredExportLine);
|
||||
expect(readFile(indexFilePath).includes(ignoredExportLine)).to.equal(true);
|
||||
|
||||
writeIndex([path.resolve(fixturesPath, 'with-config')]);
|
||||
const indexCode = readFile(indexFilePath);
|
||||
|
||||
expect(indexCode).to.equal(codeExample(`
|
||||
// @create-index {"ignore":["/bar.js$/"]}
|
||||
|
||||
export { default as foo } from './foo.js';
|
||||
`));
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user