feat: add allInOutput option

#298 (review)

Author: turusuke

readme.md

@@ -26,7 +26,8 @@ $ posthtml --help
     --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
+    --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
 
@@ -37,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, root} = flags;
+  let {config, use, output, root, allInOutput} = flags;
 
   if (config) {
     ({config} = explorer.load(config));
@@ -21,6 +21,7 @@ export default ({input, flags = {}}) => {
   return mergeOptions({
     input,
     output,
-    root
+    root,
+    allInOutput
   }, use || {}, config || {});
 };

src/cli.js

@@ -13,12 +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
-    --root -r      Mirror the directory structure relative to this path in the output directory
-    --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
@@ -27,8 +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 -r inputFolder
+    $ posthtml inputFolder/**/*.html -o outputFolder -a
+    $ posthtml inputFolder/**/*.html -o outputFolder -a -r inputFolder
 `, {
   flags: {
     config: {
@@ -53,7 +54,12 @@ const cli = meow(`
     },
     root: {
       type: 'string',
-      alias: 'r'
+      alias: 'r',
+      default: '.'
+    },
+    allInOutput: {
+      type: 'boolean',
+      alias: 'a'
     }
   }
 });
@@ -74,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, config.root);
+  const output = await outResolve(file, config.output, config.root, config.allInOutput);
   const plugins = Array.isArray(config.plugins) ? config.plugins : getPlugins(config);
 
   makeDir(path.dirname(output))

src/out-resolve.js

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