52 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
Gajus Kuizinas 2450b7202e chore: use semantic-release 2016-11-29 17:51:38 +00:00
Gajus Kuizinas 707ae70240 style: sort properties alphabetically 2016-11-29 17:50:16 +00:00
Gajus Kuizinas c6952fa1e1 chore: add a precommit hook 2016-11-29 17:49:57 +00:00
Gajus Kuizinas e6ebaec387 chore: setup env when running scripts 2016-11-29 17:49:44 +00:00
Gajus Kuizinas 1f0a517797 style: fix style issues 2016-11-29 17:49:05 +00:00
Gajus Kuizinas 7867b8f8c7 chore: use default travis test script 2016-11-29 17:48:50 +00:00
Gajus Kuizinas 9cfc2ad367 Merge branch 'master' of github.com:gajus/create-index 2016-11-29 17:45:58 +00:00
Gajus Kuizinas ab6c399241 fix: correct all the references to @create-index 2016-11-29 17:45:54 +00:00
laggingreflexandGajus Kuizinas fdb17d0179 feat: ability to add banner (#20)
Lets you add a custom banner.

```sh
create-index src -u --banner "/* eslint-disable */"
```
```js
/* eslint-disable */

// @create-index

import xxx ...
```
2016-11-29 17:45:23 +00:00
laggingreflexandGajus Kuizinas d7e2528999 fix: rename --update-index to --update (fixes #10) (#15) 2016-11-28 15:36:37 +00:00
laggingreflexandGajus Kuizinas 974142c38c fix: use comment to target files (fixes #5) (#17) 2016-11-28 15:35:43 +00:00
Gajus Kuizinas be0e6fdc75 1.0.0 2016-11-01 15:59:44 +00:00
Gajus Kuizinas 91c2e4eae3 feat: use comment to target files (fixes #5) 2016-11-01 15:58:31 +00:00
Gajus Kuizinas c41edde1cd docs: update documentation to reflect new option names (fixes #10) 2016-11-01 15:57:08 +00:00
Gajus Kuizinas d05b635834 feat: add alias -u to --update (fixes #10) 2016-11-01 15:50:18 +00:00
Gajus Kuizinas 9278b25dcd feat: rename --update-index to --update (fixes #10) 2016-11-01 15:50:02 +00:00
Gajus Kuizinas 3c5e96f8c0 chore: ignore ./test instead of ./tests 2016-11-01 15:46:36 +00:00
Gajus Kuizinas 696b817ce4 chore: add missing babel plugins 2016-11-01 15:45:29 +00:00
Gajus Kuizinas 2faeba74b3 chore: fix the build script 2016-11-01 15:36:19 +00:00
Gajus Kuizinas eac728be0b chore: add missing babel plugins 2016-11-01 15:36:09 +00:00
Gajus Kuizinas 2fa0d6635f chore: update dependencies 2016-11-01 15:33:28 +00:00
Gajus Kuizinas 08b9abc45a chore: define .travis.yml test scripts 2016-11-01 15:33:05 +00:00
Gajus Kuizinas a61cb3a14e chore: add .eslintignore 2016-11-01 15:31:41 +00:00
Gajus Kuizinas 272a836c96 chore: rename ./tests to ./test 2016-11-01 15:31:00 +00:00
Gajus Kuizinas 78109764f7 chore: move ./fixtures folder under ./tests 2016-11-01 15:30:04 +00:00
Gajus Kuizinas 335152f0d4 chore: replace pragmatist with Mocha, ESLint, Babel 2016-11-01 15:27:12 +00:00
Gajus Kuizinas 858085656b style: fix code style 2016-11-01 15:26:29 +00:00
Gajus Kuizinas 7990da993f chore: define minimum node requirement v5 2016-11-01 14:55:36 +00:00
Gajus Kuizinas 057949b3db chore: define .eslintrc 2016-11-01 14:43:19 +00:00
Gajus Kuizinas 9579637f8e chore: enable tests for node.js 5, 6 and 7 2016-11-01 14:40:09 +00:00
Gajus Kuizinas 0fa96772a8 chore: define .editorconfig 2016-11-01 14:39:30 +00:00
Gajus Kuizinas 99fd807dfb 0.1.3 2016-04-10 18:03:22 +01:00
Gajus Kuizinas 67be5ec70c Updated dependencies. 2016-04-10 18:03:16 +01:00
Gajus Kuizinas a8a5332d5c Code style preferences. 2016-03-19 13:01:04 +02:00
Gajus Kuizinas 329533a130 Use type assertions for tests. 2016-03-19 12:56:31 +02:00
Gajus Kuizinas c5f0452f10 Updated dependencies. 2016-03-19 12:54:13 +02:00
Gajus Kuizinas 00c8312dc1 0.1.2 2016-01-29 21:40:21 +00:00
Gajus Kuizinas 36ea8228ee Name can include an underscore character. 2016-01-29 21:40:16 +00:00
Gajus Kuizinas f41753b978 Added example to the docs. 2016-01-29 13:22:39 +00:00
Gajus Kuizinas a23c3ad866 0.1.1 2016-01-29 13:15:56 +00:00
Gajus Kuizinas dc80afa816 Corrected dependencies. 2016-01-29 13:15:50 +00:00
111 changed files with 999 additions and 605 deletions
+8
View File
@@ -0,0 +1,8 @@
{
"plugins": [
"transform-es2015-modules-commonjs",
"transform-export-extensions",
"transform-es2015-destructuring",
"transform-es2015-parameters"
]
}
+7
View File
@@ -0,0 +1,7 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
+1
View File
@@ -0,0 +1 @@
./test/fixtures
+3
View File
@@ -0,0 +1,3 @@
{
"extends": "canonical"
}
+1
View File
@@ -0,0 +1 @@
* text eol=lf
+5 -2
View File
@@ -1,9 +1,12 @@
node_modules
coverage coverage
dist dist
node_modules
*.log *.log
.* .*
!.babelrc
!.editorconfig
!.eslintignore
!.eslintrc
!.gitignore !.gitignore
!.npmignore !.npmignore
!.babelrc
!.travis.yml !.travis.yml
+2 -2
View File
@@ -1,6 +1,6 @@
coverage
fixtures fixtures
src src
tests test
coverage
.* .*
*.log *.log
+7 -3
View File
@@ -1,7 +1,11 @@
language: node_js language: node_js
node_js: node_js:
- '5.0' - node
- '4.0' - 7
- 6
- 5
after_success:
- semantic-release pre && npm publish && semantic-release post
notifications: notifications:
email: false email: false
sudo: false sudo: false
+120 -19
View File
@@ -6,6 +6,72 @@
`create-index` program creates (and maintains) ES6 `./index.js` file in target directories that imports and exports sibling files and directories. `create-index` program creates (and maintains) ES6 `./index.js` file in target directories that imports and exports sibling files and directories.
## Example
```sh
> tree ./
./
├── bar.js
└── foo.js
0 directories, 2 files
> create-index ./
[13:17:34] Target directories [ './' ]
[13:17:34] Update index: false
[13:17:34] ./index.js [created index]
[13:17:34] Done
> tree
.
├── bar.js
├── foo.js
└── index.js
0 directories, 3 files
```
This created `index.js` with:
```js
// @create-index
export { default as bar } from './bar.js';
export { default as foo } from './foo.js';
```
Lets create a new file and re-run `create-index`:
```js
> touch baz.js
> tree ./
./
├── bar.js
├── baz.js
├── foo.js
└── index.js
0 directories, 4 files
> create-index ./
[13:21:55] Target directories [ './' ]
[13:21:55] Update index: false
[13:21:55] ./index.js [updated index]
[13:21:55] Done
```
This have updated `index.js` file:
```js
// @create-index
export { default as bar } from './bar.js';
export { default as baz } from './baz.js';
export { default as foo } from './foo.js';
```
## Usage ## Usage
### Using CLI Program ### Using CLI Program
@@ -16,20 +82,21 @@ npm install create-index
create-index --help create-index --help
Options: Options:
--update-index 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]
--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
create-index index file in the create-index index file in the target
target (./src, ./src/utilities) (./src, ./src/utilities) directories.
directories. create-index --update ./src ./tests Finds all create-index index files in the
create-index --update-index ./src Finds all create-index index files target directories and descending
./tests in the target directories and directories. Updates found index files.
descending directories. Updates
found index files.
``` ```
### Using `create-index` Programmatically ### Using `create-index` Programmatically
@@ -88,10 +155,10 @@ Note that the `writeIndex` function is synchronous.
If there is no `./index.js`, it will create a new file, e.g. If there is no `./index.js`, it will create a new file, e.g.
```js ```js
'create index'; // @create-index
``` ```
Created index file must start with `'create index';\n\n`. This is used to make sure that `create-index` does not accidentally overwrite your local files. Created index file must start with `// @create-index\n\n`. This is used to make sure that `create-index` does not accidentally overwrite your local files.
If there are sibling files, index file will `import` them and `export`, e.g. If there are sibling files, index file will `import` them and `export`, e.g.
@@ -108,10 +175,10 @@ drwxr-xr-x 2 gajus staff 68B 6 Jan 15:29 foo
Given the above directory contents, `./index.js` will be: 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,
@@ -123,6 +190,40 @@ When file has the same name as a sibling directory, file `import` takes preceden
Directories that do not have `./index.js` in themselves will be excluded. 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
};
```
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
// 'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
// 'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
@@ -1 +0,0 @@
'create index';
-1
View File
@@ -1 +0,0 @@
'create index';
-1
View File
@@ -1 +0,0 @@
'create index';
-5
View File
@@ -1,5 +0,0 @@
'create index';
export bar from './bar';
export foo from './foo.js';
+42 -32
View File
@@ -1,44 +1,54 @@
{ {
"name": "create-index", "author": {
"description": "Creates ES6 ./index.js file in target directories that imports and exports all sibling files and directories.", "email": "gajus@gajus.com",
"version": "0.1.0", "name": "Gajus Kuizinas",
"main": "./dist/index.js", "url": "http://gajus.com"
},
"bin": "./dist/bin/create-index.js", "bin": "./dist/bin/create-index.js",
"repository": { "dependencies": {
"type": "git", "chalk": "^1.1.3",
"url": "https://github.com/gajus/create-index" "glob": "^7.1.1",
"lodash": "^4.16.6",
"moment": "^2.15.2",
"yargs": "^6.3.0"
},
"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",
"cross-env": "^3.1.3",
"eslint": "^3.9.1",
"eslint-config-canonical": "^4.0.0",
"husky": "^0.11.9",
"mocha": "^3.1.2",
"semantic-release": "^6.3.2"
},
"engines": {
"node": ">=5"
}, },
"keywords": [ "keywords": [
"index", "index",
"import", "import",
"export" "export"
], ],
"author": {
"name": "Gajus Kuizinas",
"email": "gajus@gajus.com",
"url": "http://gajus.com"
},
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"main": "./dist/index.js",
"name": "create-index",
"repository": {
"type": "git",
"url": "https://github.com/gajus/create-index"
},
"scripts": { "scripts": {
"pragmatist": "node ./node_modules/.bin/pragmatist --es5", "build": "cross-env NODE_ENV=production babel --source-maps --copy-files ./src --out-dir ./dist",
"lint": "npm run pragmatist lint", "create-index": "node ./dist/bin/create-index ./src/utilities",
"test": "npm run pragmatist test", "lint": "cross-env NODE_ENV=development eslint ./src ./tests",
"build": "npm run pragmatist build", "precommit": "npm run test",
"watch": "npm run pragmatist watch", "test": "npm run build && npm run lint && cross-env NODE_ENV=development mocha --compilers js:babel-register"
"watch-lint": "npm run pragmatist watch-lint",
"watch-test": "npm run pragmatist watch-test",
"watch-build": "npm run pragmatist watch-build",
"create-index": "node ./dist/bin/create-index ./src/utilities"
}, },
"devDependencies": { "version": "1.1.0"
"chai": "^3.5.0",
"chalk": "^1.1.1",
"moment": "^2.11.1",
"pragmatist": "^3.0.3"
},
"dependencies": {
"glob": "^6.0.4",
"lodash": "^4.0.1",
"yargs": "^4.0.0-alpha1"
}
} }
+50 -16
View File
@@ -3,23 +3,57 @@
import yargs from 'yargs'; import yargs from 'yargs';
import { import {
writeIndexCli writeIndexCli
} from './../utilities'; } from '../utilities';
let argv; const argv = yargs
.demand(1)
argv = yargs .options({
.demand(1) recursive: {
.options({ alias: 'r',
'update-index': { default: false,
default: false, description: 'Create/update index files recursively. Halts on any unsafe "index.js" files.',
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.', type: 'boolean'
type: 'boolean' }
} })
}) .options({
.example('create-index ./src ./src/utilities', 'Creates or updates an existing create-index index file in the target (./src, ./src/utilities) directories.') ignoreUnsafe: {
.example('create-index --update-index ./src ./tests', 'Finds all create-index index files in the target directories and descending directories. Updates found index files.') alias: 'i',
.argv; default: false,
description: 'Ignores unsafe "index.js" files instead of halting.',
type: 'boolean'
}
})
.options({
update: {
alias: 'u',
default: false,
description: 'Updates only previously created index files (recursively).',
type: 'boolean'
}
})
.options({
banner: {
description: 'Add a custom banner at the top of the index file',
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 --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._, { writeIndexCli(argv._, {
updateIndex: argv.updateIndex banner: argv.banner,
extensions: argv.extensions,
ignoreUnsafe: argv.ignoreUnsafe,
recursive: argv.recursive,
updateIndex: argv.update
}); });
+2 -2
View File
@@ -1,4 +1,4 @@
export { export {
findIndexFiles, findIndexFiles,
writeIndex writeIndex
} from './utilities'; } from './utilities';
+2
View File
@@ -0,0 +1,2 @@
// eslint-disable-next-line
export const CREATE_INDEX_PATTERN = /(?:^|[\n\r]+)\/\/ @create-index\s?({.*})?[\n\r]+/;
+41 -29
View File
@@ -1,43 +1,55 @@
import _ from 'lodash'; import _ from 'lodash';
let buildExportBlock, const safeVariableName = (fileName) => {
safeVariableName; const indexOfDot = fileName.indexOf('.');
safeVariableName = (fileName) => { if (indexOfDot === -1) {
let indexOfDot; return fileName;
} else {
indexOfDot = fileName.indexOf('.'); return fileName.slice(0, indexOfDot);
}
if (indexOfDot === -1) {
return fileName;
} else {
return fileName.slice(0, indexOfDot);
}
}; };
buildExportBlock = (files) => { 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');
return importBlock;
};
export default (filePaths, options = {}) => {
let code;
let configCode;
code = '';
configCode = '';
if (options.banner) {
const banners = _.isArray(options.banner) ? options.banner : [options.banner];
banners.forEach((banner) => {
code += banner + '\n';
}); });
importBlock = importBlock.join('\n'); code += '\n';
}
return importBlock; if (options.config && _.size(options.config) > 0) {
}; configCode += ' ' + JSON.stringify(options.config);
}
export default (filePaths) => { code += '// @create-index' + configCode + '\n\n';
let code,
sortedFilePaths;
code = '\'create index\';\n\n'; if (filePaths.length) {
const sortedFilePaths = filePaths.sort();
if (filePaths.length) { code += buildExportBlock(sortedFilePaths) + '\n\n';
sortedFilePaths = filePaths.sort(); }
code += buildExportBlock(sortedFilePaths) + '\n\n'; return code;
}
return code;
}; };
+12 -17
View File
@@ -1,28 +1,23 @@
import path from 'path';
import _ from 'lodash'; import _ from 'lodash';
import glob from 'glob'; import glob from 'glob';
import path from 'path';
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 = _.filter(targetDirectories, (targetDirectoryPath) => { targetDirectories = glob.sync(path.join(directoryPath, fileName));
try {
validateTargetDirectory(path.dirname(targetDirectoryPath));
return true; targetDirectories = _.filter(targetDirectories, (targetDirectoryPath) => {
/* eslint-disable no-empty */ return validateTargetDirectory(path.dirname(targetDirectoryPath), {
} catch (error) { silent: options.silent
}
/* eslint-enable no-empty */
return false;
}); });
});
targetDirectories = _.map(targetDirectories, path.dirname); targetDirectories = _.map(targetDirectories, path.dirname);
return targetDirectories; return targetDirectories;
}; };
+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 -2
View File
@@ -1,4 +1,4 @@
'create index'; // @create-index
export createIndexCode from './createIndexCode.js'; export createIndexCode from './createIndexCode.js';
export findIndexFiles from './findIndexFiles.js'; export findIndexFiles from './findIndexFiles.js';
@@ -8,4 +8,3 @@ export sortByDepth from './sortByDepth.js';
export validateTargetDirectory from './validateTargetDirectory.js'; export validateTargetDirectory from './validateTargetDirectory.js';
export writeIndex from './writeIndex.js'; export writeIndex from './writeIndex.js';
export writeIndexCli from './writeIndexCli.js'; export writeIndexCli from './writeIndexCli.js';
+2 -3
View File
@@ -2,7 +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 */
}; };
+96 -68
View File
@@ -1,97 +1,125 @@
import fs from 'fs'; import fs from 'fs';
import _ from 'lodash';
import path from 'path'; import path from 'path';
import _ from 'lodash';
import hasIndex from './hasIndex';
import validateTargetDirectory from './validateTargetDirectory'; import validateTargetDirectory from './validateTargetDirectory';
let hasIndex, const hasNoExtension = (fileName) => {
hasMultipleExtensions, const matches = fileName.match(/\./g);
hasNoExtension,
isSafeName,
removeDuplicates;
hasIndex = (directoryPath) => { return !matches;
let indexPath; };
indexPath = path.resolve(directoryPath, 'index.js'); const hasMultipleExtensions = (fileName) => {
const matches = fileName.match(/\./g);
try { return matches && matches.length > 1;
fs.statSync(indexPath); };
return true; const isSafeName = (fileName) => {
} catch (error) { return /^[a-z][a-z0-9._]+$/i.test(fileName);
return false; };
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) => {
const withoutExtension = stripExtension(fileName);
const mainAlternative = withoutExtension + '.' + preferredExtension;
if (mainAlternative === fileName) {
return true;
} }
return !_.includes(files, mainAlternative);
});
}; };
hasNoExtension = (fileName) => { const removeIgnoredFiles = (files, ignorePatterns = []) => {
let matches; if (ignorePatterns.length === 0) {
return files;
}
matches = fileName.match(/\./g); const patterns = ignorePatterns.map((pattern) => {
if (_.startsWith(pattern, '/') && _.endsWith(pattern, '/')) {
const patternWithoutSlashes = pattern.slice(1, -1);
return !matches; 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;
});
}; };
hasMultipleExtensions = (fileName) => { export default (directoryPath, options = {}) => {
let matches; if (!validateTargetDirectory(directoryPath, {silent: options.silent})) {
return false;
}
matches = fileName.match(/\./g); const {
extensions = ['js'],
config = {}
} = options;
return matches && matches.length > 1; let children;
};
isSafeName = (fileName) => { children = fs.readdirSync(directoryPath);
return /^[a-z][a-z0-9\.]+$/i.test(fileName);
};
removeDuplicates = (files) => { children = _.filter(children, (fileName) => {
return _.filter(files, (fileName) => { const absolutePath = path.resolve(directoryPath, fileName);
return !_.includes(files, fileName + '.js'); const isDirectory = fs.statSync(absolutePath).isDirectory();
});
};
export default (directoryPath) => { if (!isSafeName(fileName)) {
let children; return false;
}
validateTargetDirectory(directoryPath); if (hasNoExtension(fileName) && !isDirectory) {
return false;
}
children = fs.readdirSync(directoryPath); if (hasMultipleExtensions(fileName)) {
return false;
}
children = _.filter(children, (fileName) => { if (_.startsWith(fileName, 'index.js')) {
let absolutePath, return false;
isDirectory; }
absolutePath = path.resolve(directoryPath, fileName); if (!isDirectory && !extensions.some((ext) => {
return _.endsWith(fileName, '.' + ext);
})) {
return false;
}
isDirectory = fs.statSync(absolutePath).isDirectory(); if (isDirectory && !hasIndex(absolutePath)) {
return false;
}
if (!isSafeName(fileName)) { return true;
return false; });
}
if (hasNoExtension(fileName) && !isDirectory) { children = removeDuplicates(children, extensions[0]);
return false; children = removeIgnoredFiles(children, config.ignore);
}
if (hasMultipleExtensions(fileName)) { return children.sort();
return false;
}
if (_.startsWith(fileName, 'index.js')) {
return false;
}
if (!isDirectory && !_.endsWith(fileName, '.js')) {
return false;
}
if (isDirectory && !hasIndex(absolutePath)) {
return false;
}
return true;
});
children = removeDuplicates(children);
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;
};
+3 -3
View File
@@ -1,7 +1,7 @@
import _ from 'lodash'; import _ from 'lodash';
export default (paths) => { export default (paths) => {
return _.sortBy(paths, (path) => { return _.sortBy(paths, (path) => {
return -path.split('/').length; return -path.split('/').length;
}); });
}; };
+36 -24
View File
@@ -1,35 +1,47 @@
import _ from 'lodash';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import {CREATE_INDEX_PATTERN} from './constants';
export default (targetDirectory) => { export default (targetDirectory, options = {}) => {
let indexFile, const silent = options.silent;
indexFilePath, let stats;
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.');
} }
}
indexFilePath = path.resolve(targetDirectory, './index.js'); const indexFilePath = path.resolve(targetDirectory, './index.js');
try {
fs.statSync(indexFilePath);
} catch (error) {
return true;
}
indexFile = fs.readFileSync(indexFilePath, 'utf8');
if (!_.startsWith(indexFile, '\'create index\';\n')) {
throw new Error('"' + indexFilePath + '" unsafe index.');
}
try {
fs.statSync(indexFilePath);
} catch (error) {
return true; return true;
}
const indexFile = fs.readFileSync(indexFilePath, 'utf8');
if (!indexFile.match(CREATE_INDEX_PATTERN)) {
if (silent) {
return false;
} else {
throw new Error('"' + indexFilePath + '" unsafe index.');
}
}
return true;
}; };
+15 -21
View File
@@ -1,31 +1,25 @@
import _ from 'lodash';
import createIndexCode from './createIndexCode';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import _ from 'lodash';
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 = {}) => {
let sortedDirectoryPaths; const sortedDirectoryPaths = sortByDepth(directoryPaths)
.filter((directoryPath) => {
sortedDirectoryPaths = sortByDepth(directoryPaths); return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe});
_.forEach(sortedDirectoryPaths, (directoryPath) => {
validateTargetDirectory(directoryPath);
}); });
_.forEach(sortedDirectoryPaths, (directoryPath) => { _.forEach(sortedDirectoryPaths, (directoryPath) => {
let indexCode, const config = readIndexConfig(directoryPath);
indexFilePath, const optionsWithConfig = Object.assign({}, options, {config});
siblings; const siblings = readDirectory(directoryPath, optionsWithConfig);
const indexCode = createIndexCode(siblings, optionsWithConfig);
const indexFilePath = path.resolve(directoryPath, 'index.js');
siblings = readDirectory(directoryPath); fs.writeFileSync(indexFilePath, indexCode);
});
indexCode = createIndexCode(siblings);
indexFilePath = path.resolve(directoryPath, 'index.js');
fs.writeFileSync(indexFilePath, indexCode);
});
}; };
+64 -44
View File
@@ -1,65 +1,85 @@
import _ from 'lodash';
import createIndexCode from './createIndexCode';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import _ from 'lodash';
import chalk from 'chalk';
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';
import chalk from 'chalk';
export default (directoryPaths, options = {}) => { export default (directoryPaths, options = {}) => {
let sortedDirectoryPaths; let sortedDirectoryPaths;
sortedDirectoryPaths = sortByDepth(directoryPaths); sortedDirectoryPaths = sortByDepth(directoryPaths);
log('Target directories', sortedDirectoryPaths); log('Target directories', sortedDirectoryPaths);
if (options.updateIndex) {
log('Update index:', options.updateIndex ? chalk.green('true') : chalk.red('false')); 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) { if (options.updateIndex || options.recursive) {
sortedDirectoryPaths = _.map(sortedDirectoryPaths, findIndexFiles); sortedDirectoryPaths = _.map(sortedDirectoryPaths, (dir) => {
sortedDirectoryPaths = _.flatten(sortedDirectoryPaths); return findIndexFiles(dir, {
sortedDirectoryPaths = _.uniq(sortedDirectoryPaths); fileName: options.updateIndex ? 'index.js' : '*',
sortedDirectoryPaths = sortByDepth(sortedDirectoryPaths); silent: options.updateIndex || options.ignoreUnsafe
});
});
sortedDirectoryPaths = _.flatten(sortedDirectoryPaths);
sortedDirectoryPaths = _.uniq(sortedDirectoryPaths);
sortedDirectoryPaths = sortByDepth(sortedDirectoryPaths);
log('Updating index files in:', sortedDirectoryPaths.reverse().join(', '));
}
sortedDirectoryPaths = sortedDirectoryPaths.filter((directoryPath) => {
return validateTargetDirectory(directoryPath, {silent: options.ignoreUnsafe});
});
_.forEach(sortedDirectoryPaths, (directoryPath) => {
let existingIndexCode;
const config = readIndexConfig(directoryPath);
const siblings = readDirectory(directoryPath, {
config,
extensions: options.extensions,
silent: options.ignoreUnsafe
});
const indexCode = createIndexCode(siblings, {
banner: options.banner,
config
});
const indexFilePath = path.resolve(directoryPath, 'index.js');
try {
existingIndexCode = fs.readFileSync(indexFilePath, 'utf8');
/* eslint-disable no-empty */
} catch (error) {
log('Found index file in:', sortedDirectoryPaths);
} }
_.forEach(sortedDirectoryPaths, (directoryPath) => {
validateTargetDirectory(directoryPath);
});
_.forEach(sortedDirectoryPaths, (directoryPath) => {
let existingIndexCode,
indexCode,
indexFilePath,
siblings;
siblings = readDirectory(directoryPath);
indexCode = createIndexCode(siblings);
indexFilePath = path.resolve(directoryPath, 'index.js');
try {
existingIndexCode = fs.readFileSync(indexFilePath, 'utf8');
/* eslint-disable no-empty */
} catch (error) {
}
/* eslint-enable no-empty */ /* eslint-enable no-empty */
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 {
log(indexFilePath, chalk.green('[created index]')); log(indexFilePath, chalk.green('[created index]'));
} }
}); });
log('Done'); log('Done');
}; };
+1 -1
View File
@@ -1,5 +1,5 @@
import _ from 'lodash'; import _ from 'lodash';
export default (code) => { export default (code) => {
return _.trim(code) + '\n\n'; return _.trim(code) + '\n\n';
}; };
+75
View File
@@ -0,0 +1,75 @@
/* eslint-disable no-restricted-syntax */
import {
expect
} from 'chai';
import createIndexCode from '../src/utilities/createIndexCode';
import codeExample from './codeExample';
describe('createIndexCode()', () => {
it('describes no children', () => {
const indexCode = createIndexCode([]);
expect(indexCode).to.equal(codeExample(`
// @create-index
`));
});
it('describes a single child', () => {
const indexCode = createIndexCode(['foo']);
expect(indexCode).to.equal(codeExample(`
// @create-index
export { default as foo } from './foo';
`));
});
it('describes multiple children', () => {
const indexCode = createIndexCode(['bar', 'foo']);
expect(indexCode).to.equal(codeExample(`
// @create-index
export { default as bar } from './bar';
export { default as foo } from './foo';
`));
});
context('file with extension', () => {
it('removes the extension from the export statement', () => {
const indexCode = createIndexCode(['foo.js']);
expect(indexCode).to.equal(codeExample(`
// @create-index
export { default as foo } from './foo.js';
`));
});
});
context('multiple, unsorted', () => {
it('sorts the files', () => {
const indexCode = createIndexCode(['foo', 'bar']);
expect(indexCode).to.equal(codeExample(`
// @create-index
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';
`));
});
});
});
+19
View File
@@ -0,0 +1,19 @@
import path from 'path';
import {
expect
} from 'chai';
import glob from 'glob';
import findIndexFiles from '../src/utilities/findIndexFiles';
const fixturesPath = path.resolve(__dirname, '../../fixtures/find-index-files');
describe('findIndexFiles()', () => {
it('finds only the directories that have an existing valid index file', () => {
let names;
names = findIndexFiles(path.resolve(fixturesPath));
names = names.sort();
expect(names).to.deep.equal(glob.sync(path.resolve(fixturesPath, '**/find-*')));
});
});
@@ -0,0 +1 @@
// @create-index
+1
View File
@@ -0,0 +1 @@
// create-index
+1
View File
@@ -0,0 +1 @@
// @create-index
@@ -0,0 +1 @@
// create-index
+1
View File
@@ -0,0 +1 @@
// @create-index
+1
View File
@@ -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
@@ -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
@@ -0,0 +1 @@
// @create-index
@@ -0,0 +1 @@
// @create-index
+1
View File
@@ -0,0 +1 @@
// @create-index
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
@@ -0,0 +1 @@
// @create-index
+1
View File
@@ -0,0 +1 @@
// @create-index
View File
+1
View File
@@ -0,0 +1 @@
// @create-index
+5
View File
@@ -0,0 +1,5 @@
// @create-index
export { default as bar } from './bar';
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';

Some files were not shown because too many files have changed in this diff Show More