11 Commits
Author SHA1 Message Date
James LewisandGajus Kuizinas ed8e1d0699 feat: using writeIndex programatically was not respecting passed options configuration (#41)
* Create .gitattributes

* pass full options object to createIndexCode in writeIndex
2017-12-08 15:15:38 +00:00
Dawid KarabinandGajus Kuizinas bf45925380 feat: add ignore option (fix #31) (#37)
- Add functionality to ignore files based on provided
regular expressions
- Support writeIndex and writeIndexCli
- in index.js config must be specified as below

    // @create-index {"ignore":["/foo.js"]}
2017-03-13 20:42:46 +00:00
Guillaume BoddaertandGajus Kuizinas 5fea5e63d7 feat: add --extension/-x parameter overwrite default .js extension parser (#35) 2017-01-30 09:56:50 +00:00
Guillaume BoddaertandGajus Kuizinas 7353f04394 docs: apply current export format in README after 2.0.0 release (#34) 2017-01-29 14:05:09 +00:00
Guillaume BoddaertandGajus Kuizinas 65892e3bb8 feat: use es2015 syntax to re-export default export (#32)
BREAKING CHANGE:

This changes the output generated by create-index and can effect CI if it runs linting tests against create-index.
2017-01-27 14:44:07 +00:00
RaidokandGajus Kuizinas 893d9931d4 fix: correct a copy-paste error in a log message (#29) 2017-01-24 11:56:57 +00:00
laggingreflexandGajus Kuizinas 9113572a43 chore: add cross-env to scripts for cross platform support (#23) 2016-12-08 06:41:03 +00:00
Gajus Kuizinas cedb893e7c 1.1.0 2016-11-30 15:48:22 +00:00
laggingreflexandGajus Kuizinas 2bafc5bb85 chore: fix typo (#25) 2016-11-30 15:47:42 +00:00
laggingreflexandGajus Kuizinas 5839536cf0 fix: update stopped working with banner (#22)
With the addition of `--banner` option index files no longer start with '// @create-index'

This new regex looks for '// @create-index' that are either at the beginning of the file (old behavior) or if it is followed by a newline.
Basically it just checks whether it exists in a file or not.

Added a test for it now.

# Conflicts:
#	src/utilities/validateTargetDirectory.js
2016-11-30 13:20:50 +00:00
laggingreflexandGajus Kuizinas 219f546c67 feat: add --resursive and --ignore options (#24)
`--resursive`: Create/update index files recursively. Halts on any unsafe "index.js" files.

`--ignore-unsafe`: Ignores unsafe "index.js" files instead of halting.
2016-11-30 05:30:34 +00:00
34 changed files with 449 additions and 104 deletions
+1
View File
@@ -0,0 +1 @@
* text eol=lf
+48 -12
View File
@@ -36,8 +36,8 @@ This created `index.js` with:
```js ```js
// @create-index // @create-index
export bar from './bar.js'; export { default as bar } from './bar.js';
export foo from './foo.js'; export { default as foo } from './foo.js';
``` ```
@@ -66,9 +66,9 @@ This have updated `index.js` file:
```js ```js
// @create-index // @create-index
export bar from './bar.js'; export { default as bar } from './bar.js';
export baz from './baz.js'; export { default as baz } from './baz.js';
export foo from './foo.js'; export { default as foo } from './foo.js';
``` ```
@@ -82,11 +82,13 @@ npm install create-index
create-index --help create-index --help
Options: Options:
--update, -u Recursively iterates target directories looking for "index.js" --recursive, -r Create/update index files recursively. Halts on any unsafe
files that start with "// @create-index\n" (create-index index "index.js" files. [boolean] [default: false]
file). Updates found index files. Does not create new index --ignoreUnsafe, -i Ignores unsafe "index.js" files instead of halting.
files. [boolean] [default: false] [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]
Examples: Examples:
create-index ./src ./src/utilities Creates or updates an existing create-index ./src ./src/utilities Creates or updates an existing
@@ -175,8 +177,8 @@ Given the above directory contents, `./index.js` will be:
```js ```js
// @create-index // @create-index
import bar from './bar'; import { default as bar } from './bar';
import foo from './foo.js'; import { default as foo } from './foo.js';
export { export {
bar, bar,
@@ -191,3 +193,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`. 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. 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
};
```
+5 -4
View File
@@ -21,6 +21,7 @@
"babel-plugin-transform-export-extensions": "^6.8.0", "babel-plugin-transform-export-extensions": "^6.8.0",
"babel-register": "^6.18.0", "babel-register": "^6.18.0",
"chai": "^3.5.0", "chai": "^3.5.0",
"cross-env": "^3.1.3",
"eslint": "^3.9.1", "eslint": "^3.9.1",
"eslint-config-canonical": "^4.0.0", "eslint-config-canonical": "^4.0.0",
"husky": "^0.11.9", "husky": "^0.11.9",
@@ -43,11 +44,11 @@
"url": "https://github.com/gajus/create-index" "url": "https://github.com/gajus/create-index"
}, },
"scripts": { "scripts": {
"build": "NODE_ENV=production babel --source-maps --copy-files ./src --out-dir ./dist", "build": "cross-env NODE_ENV=production babel --source-maps --copy-files ./src --out-dir ./dist",
"create-index": "node ./dist/bin/create-index ./src/utilities", "create-index": "node ./dist/bin/create-index ./src/utilities",
"lint": "NODE_ENV=development eslint ./src ./tests", "lint": "cross-env NODE_ENV=development eslint ./src ./tests",
"precommit": "npm run test", "precommit": "npm run test",
"test": "npm run build && npm run lint && NODE_ENV=development mocha --compilers js:babel-register" "test": "npm run build && npm run lint && cross-env NODE_ENV=development mocha --compilers js:babel-register"
}, },
"version": "1.0.0" "version": "1.1.0"
} }
+29 -1
View File
@@ -7,11 +7,27 @@ import {
const argv = yargs const argv = yargs
.demand(1) .demand(1)
.options({
recursive: {
alias: 'r',
default: false,
description: 'Create/update index files recursively. Halts on any unsafe "index.js" files.',
type: 'boolean'
}
})
.options({
ignoreUnsafe: {
alias: 'i',
default: false,
description: 'Ignores unsafe "index.js" files instead of halting.',
type: 'boolean'
}
})
.options({ .options({
update: { update: {
alias: 'u', alias: 'u',
default: false, default: false,
description: 'Recursively iterates target directories looking for "index.js" files that start with "// @create-index\\n" (create-index index file). Updates found index files. Does not create new index files.', description: 'Updates only previously created index files (recursively).',
type: 'boolean' type: 'boolean'
} }
}) })
@@ -21,11 +37,23 @@ const argv = yargs
type: 'string' type: 'string'
} }
}) })
.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'
}
})
.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 ./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 --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; .argv;
writeIndexCli(argv._, { writeIndexCli(argv._, {
banner: argv.banner, banner: argv.banner,
extensions: argv.extensions,
ignoreUnsafe: argv.ignoreUnsafe,
recursive: argv.recursive,
updateIndex: argv.update updateIndex: argv.update
}); });
+2
View File
@@ -0,0 +1,2 @@
// eslint-disable-next-line
export const CREATE_INDEX_PATTERN = /(?:^|[\n\r]+)\/\/ @create-index\s?({.*})?[\n\r]+/;
+8 -2
View File
@@ -14,7 +14,7 @@ const buildExportBlock = (files) => {
let importBlock; let importBlock;
importBlock = _.map(files, (fileName) => { importBlock = _.map(files, (fileName) => {
return 'export ' + safeVariableName(fileName) + ' from \'./' + fileName + '\';'; return 'export { default as ' + safeVariableName(fileName) + ' } from \'./' + fileName + '\';';
}); });
importBlock = importBlock.join('\n'); importBlock = importBlock.join('\n');
@@ -24,8 +24,10 @@ const buildExportBlock = (files) => {
export default (filePaths, options = {}) => { export default (filePaths, options = {}) => {
let code; let code;
let configCode;
code = ''; code = '';
configCode = '';
if (options.banner) { if (options.banner) {
const banners = _.isArray(options.banner) ? options.banner : [options.banner]; const banners = _.isArray(options.banner) ? options.banner : [options.banner];
@@ -37,7 +39,11 @@ export default (filePaths, options = {}) => {
code += '\n'; 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) { if (filePaths.length) {
const sortedFilePaths = filePaths.sort(); const sortedFilePaths = filePaths.sort();
+9 -14
View File
@@ -3,23 +3,18 @@ import _ from 'lodash';
import glob from 'glob'; import glob from 'glob';
import validateTargetDirectory from './validateTargetDirectory'; import validateTargetDirectory from './validateTargetDirectory';
export default (directoryPath) => { export default (directoryPath, options = {}) => {
let targetDirectories; let fileName, targetDirectories;
targetDirectories = glob.sync(path.join(directoryPath, './**/index.js')); fileName = options.fileName || 'index.js';
fileName = './**/' + fileName;
targetDirectories = glob.sync(path.join(directoryPath, fileName));
targetDirectories = _.filter(targetDirectories, (targetDirectoryPath) => { targetDirectories = _.filter(targetDirectories, (targetDirectoryPath) => {
try { return validateTargetDirectory(path.dirname(targetDirectoryPath), {
validateTargetDirectory(path.dirname(targetDirectoryPath)); silent: options.silent
});
return true;
// eslint-disable-next-line no-empty
} catch (error) {
}
return false;
}); });
targetDirectories = _.map(targetDirectories, path.dirname); targetDirectories = _.map(targetDirectories, path.dirname);
+14
View File
@@ -0,0 +1,14 @@
import fs from 'fs';
import path from 'path';
export default (directoryPath) => {
const indexPath = path.resolve(directoryPath, 'index.js');
try {
fs.statSync(indexPath);
return true;
} catch (error) {
return false;
}
};
+1 -3
View File
@@ -2,8 +2,6 @@ import chalk from 'chalk';
import moment from 'moment'; import moment from 'moment';
export default (...append) => { export default (...append) => {
/* eslint-disable no-console */ // eslint-disable-next-line
console.log(chalk.dim('[' + moment().format('HH:mm:ss') + ']'), ...append); console.log(chalk.dim('[' + moment().format('HH:mm:ss') + ']'), ...append);
/* eslint-enable no-console */
}; };
+63 -19
View File
@@ -1,20 +1,9 @@
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import _ from 'lodash'; import _ from 'lodash';
import hasIndex from './hasIndex';
import validateTargetDirectory from './validateTargetDirectory'; 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 hasNoExtension = (fileName) => {
const matches = fileName.match(/\./g); const matches = fileName.match(/\./g);
@@ -31,16 +20,68 @@ const isSafeName = (fileName) => {
return /^[a-z][a-z0-9._]+$/i.test(fileName); return /^[a-z][a-z0-9._]+$/i.test(fileName);
}; };
const removeDuplicates = (files) => { const stripExtension = (fileName) => {
const pos = fileName.lastIndexOf('.');
if (pos === -1) {
return fileName;
}
return fileName.substr(0, pos);
};
const removeDuplicates = (files, preferredExtension) => {
return _.filter(files, (fileName) => { 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);
}); });
}; };
export default (directoryPath) => { const removeIgnoredFiles = (files, ignorePatterns = []) => {
let children; if (ignorePatterns.length === 0) {
return files;
}
validateTargetDirectory(directoryPath); 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 = {}) => {
if (!validateTargetDirectory(directoryPath, {silent: options.silent})) {
return false;
}
const {
extensions = ['js'],
config = {}
} = options;
let children;
children = fs.readdirSync(directoryPath); children = fs.readdirSync(directoryPath);
@@ -64,7 +105,9 @@ export default (directoryPath) => {
return false; return false;
} }
if (!isDirectory && !_.endsWith(fileName, '.js')) { if (!isDirectory && !extensions.some((ext) => {
return _.endsWith(fileName, '.' + ext);
})) {
return false; return false;
} }
@@ -75,7 +118,8 @@ export default (directoryPath) => {
return true; return true;
}); });
children = removeDuplicates(children); children = removeDuplicates(children, extensions[0]);
children = removeIgnoredFiles(children, config.ignore);
return children.sort(); return children.sort();
}; };
+32
View File
@@ -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) => {
if (!hasIndex(directoryPath)) {
return {};
}
const indexPath = path.resolve(directoryPath, '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 (error) {
throw new Error(
'"' + indexPath + '" contains invalid configuration object.\n' +
'Configuration object must be a valid JSON.'
);
}
return config;
};
+20 -6
View File
@@ -1,18 +1,27 @@
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import _ from 'lodash'; import {CREATE_INDEX_PATTERN} from './constants';
export default (targetDirectory) => { export default (targetDirectory, options = {}) => {
const silent = options.silent;
let stats; let stats;
try { try {
stats = fs.statSync(targetDirectory); stats = fs.statSync(targetDirectory);
} catch (error) { } catch (error) {
throw new Error('Directory "' + targetDirectory + '" does not exist.'); if (silent) {
return false;
} else {
throw new Error('Directory "' + targetDirectory + '" does not exist.');
}
} }
if (!stats.isDirectory()) { if (!stats.isDirectory()) {
throw new Error('"' + targetDirectory + '" is not a directory.'); if (silent) {
return false;
} else {
throw new Error('"' + targetDirectory + '" is not a directory.');
}
} }
const indexFilePath = path.resolve(targetDirectory, './index.js'); const indexFilePath = path.resolve(targetDirectory, './index.js');
@@ -25,9 +34,14 @@ export default (targetDirectory) => {
const indexFile = fs.readFileSync(indexFilePath, 'utf8'); const indexFile = fs.readFileSync(indexFilePath, 'utf8');
if (!_.startsWith(indexFile, '// @create-index\n')) { if (!indexFile.match(CREATE_INDEX_PATTERN)) {
throw new Error('"' + indexFilePath + '" unsafe index.'); if (silent) {
return false;
} else {
throw new Error('"' + indexFilePath + '" unsafe index.');
}
} }
return true; return true;
}; };
+10 -8
View File
@@ -4,18 +4,20 @@ import _ from 'lodash';
import createIndexCode from './createIndexCode'; import createIndexCode from './createIndexCode';
import validateTargetDirectory from './validateTargetDirectory'; import validateTargetDirectory from './validateTargetDirectory';
import readDirectory from './readDirectory'; import readDirectory from './readDirectory';
import readIndexConfig from './readIndexConfig';
import sortByDepth from './sortByDepth'; import sortByDepth from './sortByDepth';
export default (directoryPaths) => { export default (directoryPaths, options = {}) => {
const sortedDirectoryPaths = sortByDepth(directoryPaths); const sortedDirectoryPaths = sortByDepth(directoryPaths)
.filter((directoryPath) => {
return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe});
});
_.forEach(sortedDirectoryPaths, (directoryPath) => { _.forEach(sortedDirectoryPaths, (directoryPath) => {
validateTargetDirectory(directoryPath); const config = readIndexConfig(directoryPath);
}); const optionsWithConfig = Object.assign({}, options, {config});
const siblings = readDirectory(directoryPath, optionsWithConfig);
_.forEach(sortedDirectoryPaths, (directoryPath) => { const indexCode = createIndexCode(siblings, optionsWithConfig);
const siblings = readDirectory(directoryPath);
const indexCode = createIndexCode(siblings);
const indexFilePath = path.resolve(directoryPath, 'index.js'); const indexFilePath = path.resolve(directoryPath, 'index.js');
fs.writeFileSync(indexFilePath, indexCode); fs.writeFileSync(indexFilePath, indexCode);
+28 -9
View File
@@ -5,6 +5,7 @@ import chalk from 'chalk';
import createIndexCode from './createIndexCode'; import createIndexCode from './createIndexCode';
import validateTargetDirectory from './validateTargetDirectory'; import validateTargetDirectory from './validateTargetDirectory';
import readDirectory from './readDirectory'; import readDirectory from './readDirectory';
import readIndexConfig from './readIndexConfig';
import sortByDepth from './sortByDepth'; import sortByDepth from './sortByDepth';
import log from './log'; import log from './log';
import findIndexFiles from './findIndexFiles'; import findIndexFiles from './findIndexFiles';
@@ -15,28 +16,46 @@ export default (directoryPaths, options = {}) => {
sortedDirectoryPaths = sortByDepth(directoryPaths); sortedDirectoryPaths = sortByDepth(directoryPaths);
log('Target directories', sortedDirectoryPaths); log('Target directories', sortedDirectoryPaths);
log('Update index:', options.updateIndex ? chalk.green('true') : chalk.red('false'));
if (options.updateIndex) { if (options.updateIndex) {
sortedDirectoryPaths = _.map(sortedDirectoryPaths, findIndexFiles); log('Update index:', options.updateIndex ? chalk.green('true') : chalk.red('false'));
} else {
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 = _.flatten(sortedDirectoryPaths); sortedDirectoryPaths = _.flatten(sortedDirectoryPaths);
sortedDirectoryPaths = _.uniq(sortedDirectoryPaths); sortedDirectoryPaths = _.uniq(sortedDirectoryPaths);
sortedDirectoryPaths = sortByDepth(sortedDirectoryPaths); sortedDirectoryPaths = sortByDepth(sortedDirectoryPaths);
log('Found index file in:', sortedDirectoryPaths); log('Updating index files in:', sortedDirectoryPaths.reverse().join(', '));
} }
_.forEach(sortedDirectoryPaths, (directoryPath) => { sortedDirectoryPaths = sortedDirectoryPaths.filter((directoryPath) => {
validateTargetDirectory(directoryPath); return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe});
}); });
_.forEach(sortedDirectoryPaths, (directoryPath) => { _.forEach(sortedDirectoryPaths, (directoryPath) => {
let existingIndexCode; let existingIndexCode;
const siblings = readDirectory(directoryPath); const config = readIndexConfig(directoryPath);
const siblings = readDirectory(directoryPath, {
config,
extensions: options.extensions,
silent: options.ignoreUnsafe
});
const indexCode = createIndexCode(siblings, { const indexCode = createIndexCode(siblings, {
banner: options.banner banner: options.banner,
config
}); });
const indexFilePath = path.resolve(directoryPath, 'index.js'); const indexFilePath = path.resolve(directoryPath, 'index.js');
@@ -54,7 +73,7 @@ export default (directoryPaths, options = {}) => {
fs.writeFileSync(indexFilePath, indexCode); fs.writeFileSync(indexFilePath, indexCode);
if (existingIndexCode && existingIndexCode === 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) { } else if (existingIndexCode && existingIndexCode !== indexCode) {
log(indexFilePath, chalk.green('[updated index]')); log(indexFilePath, chalk.green('[updated index]'));
} else { } else {
+27 -11
View File
@@ -12,7 +12,7 @@ describe('createIndexCode()', () => {
expect(indexCode).to.equal(codeExample(` expect(indexCode).to.equal(codeExample(`
// @create-index // @create-index
`)); `));
}); });
it('describes a single child', () => { it('describes a single child', () => {
const indexCode = createIndexCode(['foo']); const indexCode = createIndexCode(['foo']);
@@ -20,8 +20,8 @@ describe('createIndexCode()', () => {
expect(indexCode).to.equal(codeExample(` expect(indexCode).to.equal(codeExample(`
// @create-index // @create-index
export foo from './foo'; export { default as foo } from './foo';
`)); `));
}); });
it('describes multiple children', () => { it('describes multiple children', () => {
const indexCode = createIndexCode(['bar', 'foo']); const indexCode = createIndexCode(['bar', 'foo']);
@@ -29,9 +29,9 @@ export foo from './foo';
expect(indexCode).to.equal(codeExample(` expect(indexCode).to.equal(codeExample(`
// @create-index // @create-index
export bar from './bar'; export { default as bar } from './bar';
export foo from './foo'; export { default as foo } from './foo';
`)); `));
}); });
context('file with extension', () => { context('file with extension', () => {
it('removes the extension from the export statement', () => { it('removes the extension from the export statement', () => {
@@ -40,8 +40,8 @@ export foo from './foo';
expect(indexCode).to.equal(codeExample(` expect(indexCode).to.equal(codeExample(`
// @create-index // @create-index
export foo from './foo.js'; export { default as foo } from './foo.js';
`)); `));
}); });
}); });
context('multiple, unsorted', () => { context('multiple, unsorted', () => {
@@ -51,9 +51,25 @@ export foo from './foo.js';
expect(indexCode).to.equal(codeExample(` expect(indexCode).to.equal(codeExample(`
// @create-index // @create-index
export bar from './bar'; export { default as bar } from './bar';
export foo from './foo'; 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';
`));
}); });
}); });
}); });
View File
+1
View File
@@ -0,0 +1 @@
// @create-index {"ignore": ["/foo.js$/"]}
@@ -0,0 +1 @@
// @create-index {ignore: 'foo'}
@@ -0,0 +1 @@
// @create-index
@@ -0,0 +1,3 @@
/* eslint-disable */
// @create-index
+2 -2
View File
@@ -1,5 +1,5 @@
// @create-index // @create-index
export bar from './bar'; export { default as bar } from './bar';
export foo from './foo.js'; export { default as foo } from './foo.js';
View File
View File
+4
View File
@@ -0,0 +1,4 @@
// @create-index {"ignore":["/bar.js$/"]}
export { default as foo } from './foo.js';
+39
View File
@@ -49,6 +49,45 @@ describe('readDirectory()', () => {
expect(names).to.deep.equal(['present.js']); 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', () => { context('target directory contains files with no extension', () => {
it('ignores files', () => { it('ignores files', () => {
const names = readDirectory(path.resolve(fixturesPath, 'children-files-no-extension')); const names = readDirectory(path.resolve(fixturesPath, 'children-files-no-extension'));
+56
View File
@@ -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);
});
});
});
+10
View File
@@ -36,6 +36,11 @@ describe('validateTargetDirectory()', () => {
expect(validateTargetDirectory(path.resolve(fixturesPath, 'safe-index'))).to.equal(true); expect(validateTargetDirectory(path.resolve(fixturesPath, 'safe-index'))).to.equal(true);
}); });
}); });
context('safe with banner', () => {
it('returns true', () => {
expect(validateTargetDirectory(path.resolve(fixturesPath, 'safe-index-with-banner'))).to.equal(true);
});
});
context('unsafe', () => { context('unsafe', () => {
it('throws an error', () => { it('throws an error', () => {
expect(() => { expect(() => {
@@ -43,5 +48,10 @@ describe('validateTargetDirectory()', () => {
}).to.throw(Error, '"' + path.resolve(fixturesPath, 'unsafe-index/index.js') + '" unsafe index.'); }).to.throw(Error, '"' + path.resolve(fixturesPath, 'unsafe-index/index.js') + '" unsafe index.');
}); });
}); });
context('unsafe ignored', () => {
it('returns false', () => {
expect(validateTargetDirectory(path.resolve(fixturesPath, 'unsafe-index'), {silent: true})).to.equal(false);
});
});
}); });
}); });
+35 -13
View File
@@ -8,29 +8,51 @@ import {
import writeIndex from '../src/utilities/writeIndex'; import writeIndex from '../src/utilities/writeIndex';
import codeExample from './codeExample'; 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'); const fixturesPath = path.resolve(__dirname, 'fixtures/write-index');
describe('writeIndex()', () => { describe('writeIndex()', () => {
it('creates index in target directory', () => { it('creates index in target directory', () => {
const indexFilePath = path.resolve(fixturesPath, 'mixed/index.js'); const indexFilePath = path.resolve(fixturesPath, 'mixed/index.js');
try { removeFile(indexFilePath);
fs.unlinkSync(indexFilePath);
// eslint-disable-next-line no-empty
} catch (error) {
}
writeIndex([path.resolve(fixturesPath, 'mixed')]); writeIndex([path.resolve(fixturesPath, 'mixed')]);
const indexCode = readFile(indexFilePath);
const indexCode = fs.readFileSync(indexFilePath, 'utf8');
expect(indexCode).to.equal(codeExample(` expect(indexCode).to.equal(codeExample(`
// @create-index // @create-index
export bar from './bar'; export { default as bar } from './bar';
export foo from './foo.js'; 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
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';
`));
}); });
}); });