Merge pull request #298 from turusuke/base-option

feat: base option

Author: Scrum

package.json

@@ -23,7 +23,7 @@
     "build": "rimraf lib && babel src -d lib",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "pretest": "npm run build",
-    "test": "nyc ava --verbose"
+    "test": "nyc ava --timeout=1m --verbose"
   },
   "files": [
     "lib/"

readme.md

@@ -23,11 +23,13 @@ $ posthtml --help
     $ posthtml <patterns>
 
   Options:
-    --output -o    Output File or Folder
-    --config -c    Path to config file
-    --use -u       PostHTML plugin name
-    --help -h      CLI Help
-    --version -v   CLI Version
+    --output -o      Output File or Folder
+    --config -c      Path to config file
+    --use -u         PostHTML plugin name
+    --root -r        Mirror the directory structure relative to this path in the output directory(default: .)
+    --allInOutput -a Save the nesting structure for output
+    --help -h        CLI Help
+    --version -v     CLI Version
 
   Examples:
     $ posthtml input.html
@@ -36,7 +38,8 @@ $ posthtml --help
     $ posthtml input.html -o output.html -c posthtml.js
     $ posthtml input.html -o output.html -u posthtml-bem --posthtml-bem.elemPrefix __
     $ posthtml inputFolder/*.html -o outputFolder
-    $ posthtml inputFolder/**/*.html -o outputFolder
+    $ posthtml inputFolder/**/*.html -o outputFolder -a
+    $ posthtml inputFolder/**/*.html -o outputFolder -a -r inputFolder
 ```
 
 ## Options

src/cfg-resolve.js

@@ -4,7 +4,7 @@ import mergeOptions from 'merge-options';
 
 export default ({input, flags = {}}) => {
   const explorer = cosmiconfigSync('posthtml');
-  let {config, use, output} = flags;
+  let {config, use, output, root, allInOutput} = flags;
 
   if (config) {
     ({config} = explorer.load(config));
@@ -20,6 +20,8 @@ export default ({input, flags = {}}) => {
 
   return mergeOptions({
     input,
-    output
+    output,
+    root,
+    allInOutput
   }, use || {}, config || {});
 };

src/cli.js

@@ -13,11 +13,13 @@ const cli = meow(`
   Usage: posthtml <patterns>
 
   Options:
-    --output -o    Output File or Folder
-    --config -c    Path to config file
-    --use -u       PostHTML plugin name
-    --help -h      CLI Help
-    --version -v   CLI Version
+    --output -o      Output File or Folder
+    --config -c      Path to config file
+    --use -u         PostHTML plugin name
+    --root -r        Mirror the directory structure relative to this path in the output directory(default: .)
+    --allInOutput -a Save the nesting structure for output
+    --help -h        CLI Help
+    --version -v     CLI Version
 
   Examples:
     $ posthtml input.html
@@ -26,7 +28,8 @@ const cli = meow(`
     $ posthtml input.html -o output.html -c posthtml.js
     $ posthtml input.html -o output.html -u posthtml-bem --posthtml-bem.elemPrefix __
     $ posthtml inputFolder/*.html -o outputFolder
-    $ posthtml inputFolder/**/*.html -o outputFolder
+    $ posthtml inputFolder/**/*.html -o outputFolder -a
+    $ posthtml inputFolder/**/*.html -o outputFolder -a -r inputFolder
 `, {
   flags: {
     config: {
@@ -48,6 +51,15 @@ const cli = meow(`
     use: {
       type: 'array',
       alias: 'u'
+    },
+    root: {
+      type: 'string',
+      alias: 'r',
+      default: '.'
+    },
+    allInOutput: {
+      type: 'boolean',
+      alias: 'a'
     }
   }
 });
@@ -68,7 +80,7 @@ const getPlugins = config => Object.keys(config.plugins || {})
 const config = cfgResolve(cli);
 
 const processing = async file => {
-  const output = await outResolve(file, config.output);
+  const output = await outResolve(file, config);
   const plugins = Array.isArray(config.plugins) ? config.plugins : getPlugins(config);
 
   makeDir(path.dirname(output))

src/out-resolve.js

@@ -1,13 +1,19 @@
 import path from 'path';
 
-export default (input, output) => new Promise(resolve => {
+export default (input, {output, root, allInOutput} = {}) => new Promise(resolve => {
   if (output && path.extname(output)) {
     return resolve(output);
   }
 
   if (output) {
-    return resolve(path.join(output, path.basename(input)));
+    let inputPath = path.basename(input);
+
+    if (allInOutput) {
+      inputPath = path.relative(root, input);
+    }
+
+    return resolve(path.join(output, inputPath));
   }
 
-  resolve(input);
+  return resolve(input);
 });

test/expected/output-nesting-root/input-nesting-child/input-nesting.html

@@ -0,0 +1 @@
+<div>input-nesting-child/index</div>

test/expected/output-nesting-root/input-nesting.html

@@ -0,0 +1 @@
+<div>input-nesting-index</div>

test/expected/output-nesting/test/fixtures/input-nesting/input-nesting-child/input-nesting.html

@@ -0,0 +1 @@
+<div>input-nesting-child/index</div>

test/expected/output-nesting/test/fixtures/input-nesting/input-nesting.html

@@ -0,0 +1 @@
+<div>input-nesting-index</div>

test/fixtures/input-nesting/input-nesting-child/input-nesting.html

@@ -0,0 +1 @@
+<div>input-nesting-child/index</div>