Fixes #65 - batch processing with output path.

When an output path is given (via `-o` or `--output`) while batch processing is
turned on (via `-b` or `--batch`) then output files are written to a directory
under output path, while the root of input wildcard is used as a base, e.g.:

```bash
cleancss --batch --output dist/ source/**/*.css
```

will put `source/one.css` under `dist/one-min.css` and `source/vendor/two.css`
under `dist/vendor/two-min.css`.

In case of input path given explicitely they are written directly to output
path, e.g.

```bash
cleancss --batch --output dist/ source/one.css source/vendor/two.css
```

will put `source/one.css` under `dist/one-min.css` and `source/vendor/two.css`
under `dist/two-min.css`.

Author: jakubpawlowicz

History.md

@@ -1,3 +1,8 @@
+[5.3.0 / 2021-xx-xx](https://github.com/jakubpawlowicz/clean-css-cli/compare/5.2...HEAD)
+==================
+
+* Fixed issue [#65](https://github.com/jakubpawlowicz/clean-css-cli/issues/65) - batch processing with output path.
+
 [5.2.2 / 2021-03-19](https://github.com/jakubpawlowicz/clean-css-cli/compare/v5.2.1...v5.2.2)
 ==================
 

index.js

@@ -120,6 +120,10 @@ function cli(process, beforeMinifyCallback) {
     options.sourceMap = false;
   }
 
+  if (options.output && options.batch) {
+    fs.mkdirSync(options.output, {recursive: true});
+  }
+
   var configurations = {
     batchSuffix: inputOptions.batchSuffix,
     beforeMinifyCallback: beforeMinifyCallback,
@@ -179,34 +183,56 @@ function expandGlobs(paths) {
     .map(function (path) { return path.substring(1); });
 
   return globPatterns.reduce(function (accumulator, path) {
-    return accumulator.concat(glob.sync(path, { ignore: ignoredGlobPatterns, nodir: true, nonull: true }));
+    var expandedWithSource =
+      glob.sync(path, { ignore: ignoredGlobPatterns, nodir: true, nonull: true })
+      .map(function (expandedPath) { return { expanded: expandedPath, source: path }; });
+
+    return accumulator.concat(expandedWithSource);
   }, []);
 }
 
 function minify(process, options, configurations, data) {
   var cleanCss = new CleanCSS(options);
+  var input = typeof(data) == 'string' ?
+    data :
+    data.map(function (o) { return o.expanded; });
 
   applyNonBooleanCompatibilityFlags(cleanCss, options.compatibility);
   configurations.beforeMinifyCallback(cleanCss);
-  cleanCss.minify(data, getSourceMapContent(configurations.inputSourceMap), function (errors, minified) {
+  cleanCss.minify(input, getSourceMapContent(configurations.inputSourceMap), function (errors, minified) {
     var inputPath;
+    var outputPath;
 
     if (options.batch && !('styles' in minified)) {
       for (inputPath in minified) {
-        processMinified(process, configurations, minified[inputPath], inputPath, toOutputPath(inputPath, configurations.batchSuffix));
+        outputPath = options.batch && options.output ?
+          toBatchOutputPath(inputPath, configurations.batchSuffix, options.output, data) :
+          toSimpleOutputPath(inputPath, configurations.batchSuffix);
+
+        processMinified(process, configurations, minified[inputPath], inputPath, outputPath);
       }
     } else {
       processMinified(process, configurations, minified, null, options.output);
     }
   });
 }
 
-function toOutputPath(inputPath, batchSuffix) {
+function toSimpleOutputPath(inputPath, batchSuffix) {
   var extensionName = path.extname(inputPath);
 
   return inputPath.replace(new RegExp(extensionName + '$'), batchSuffix + extensionName);
 }
 
+function toBatchOutputPath(inputPath, batchSuffix, output, expandedWithSource) {
+  var extensionName = path.extname(inputPath);
+  var inputSource = expandedWithSource.find(function (ic) { return ic.expanded == inputPath; }).source;
+  var inputSourceRoot = inputSource.indexOf('*') > -1 ?
+    inputSource.substring(0, inputSource.indexOf('*')) :
+    path.dirname(inputSource);
+
+  return path.join(output, inputPath.replace(inputSourceRoot, '').replace(new RegExp(extensionName + '$'), batchSuffix + extensionName));
+}
+
 function processMinified(process, configurations, minified, inputPath, outputPath) {
   var mapOutputPath;
 

test/binary-test.js

@@ -844,20 +844,25 @@ vows.describe('cleancss')
     })
   })
   .addBatch({
-    'batch processing with output given': binaryContext('-b -o ./test ./test/fixtures-batch-4/partials/one.css ./test/fixtures-batch-4/partials/five.css', {
+    'batch processing with output given': binaryContext('-b -o ./test/fixtures-batch-4-output ./test/fixtures-batch-4/partials/one.css ./test/fixtures-batch-4/partials/five.css', {
       'setup': function () {
         execSync('cp -fr test/fixtures test/fixtures-batch-4');
       },
       'does not produce any errors': function (error) {
         assert.equal(error, '');
       },
       'creates two separate minified files': function () {
-        assert.isTrue(fs.existsSync('test/fixtures-batch-4/partials/one-min.css'));
+        assert.isFalse(fs.existsSync('test/fixtures-batch-4/partials/one-min.css'));
         assert.isFalse(fs.existsSync('test/fixtures-batch-4/partials/two-min.css'));
-        assert.isTrue(fs.existsSync('test/fixtures-batch-4/partials/five-min.css'));
+        assert.isFalse(fs.existsSync('test/fixtures-batch-4/partials/five-min.css'));
+
+        assert.isTrue(fs.existsSync('test/fixtures-batch-4-output/one-min.css'));
+        assert.isFalse(fs.existsSync('test/fixtures-batch-4-output/two-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures-batch-4-output/five-min.css'));
       },
       'teardown': function () {
         execSync('rm -fr test/fixtures-batch-4');
+        execSync('rm -fr test/fixtures-batch-4-output');
       }
     })
   })
@@ -879,4 +884,23 @@ vows.describe('cleancss')
       }
     })
   })
+  .addBatch({
+    'batch processing with output as a path': binaryContext('-b ./test/fixtures-batch-6/partials/\\*\\*/*.css -o test/fixtures-batch-6-output', {
+      'setup': function () {
+        execSync('cp -fr test/fixtures test/fixtures-batch-6');
+      },
+      'creates two separate minified files': function () {
+        assert.isTrue(fs.existsSync('test/fixtures-batch-6-output/extra/four-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures-batch-6-output/extra/three-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures-batch-6-output/one-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures-batch-6-output/two-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures-batch-6-output/quoted-svg-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures-batch-6-output/five-min.css'));
+      },
+      'teardown': function () {
+        execSync('rm -fr test/fixtures-batch-6');
+        execSync('rm -fr test/fixtures-batch-6-output');
+      }
+    })
+  })
   .export(module);