Fixes #18 - allows batch processing of input files via --batch option.

Author: jakubpawlowicz

History.md

@@ -3,6 +3,7 @@
 
 * Bumps clean-css dependency to 5.0.
 * Bumps commander dependency to 7.0.
+* Fixed issue [#18](https://github.com/jakubpawlowicz/clean-css-cli/issues/18) - allows batch processing of input files.
 
 [4.3.0 / 2019-04-06](https://github.com/jakubpawlowicz/clean-css-cli/compare/4.2...v4.3.0)
 ==================

README.md

@@ -64,6 +64,7 @@ cleancss -o one.min.css one.css
 
 clean-css-cli 5.0 introduces the following changes / features:
 
+* adds `--batch` option (off by default) which processes input files one by one without joining them together;
 * clean-css 5.0 with loads of bugfixes;
 * drops official support for Node.js 4, 6, and 8;
 * `--skip-rebase` option has been removed as rebasing URLs is disabled by default now
@@ -115,6 +116,7 @@ clean-css-cli 4.3 introduces the following changes / features:
 ```shell
 -h, --help                     output usage information
 -v, --version                  output the version number
+-b, --batch                    If enabled, optimizes input files one by one instead of joining them together
 -c, --compatibility [ie7|ie8]  Force compatibility mode (see Readme for advanced examples)
 -d, --debug                    Shows debug information (minification time & compression efficiency)
 -f, --format <options>         Controls output formatting, see examples below

index.js

@@ -25,6 +25,7 @@ function cli(process, beforeMinifyCallback) {
   program
     .version(buildVersion, '-v, --version')
     .usage('[options] <source-file ...>')
+    .option('-b, --batch', 'If enabled, optimizes input files one by one instead of joining them together')
     .option('-c, --compatibility [ie7|ie8]', 'Force compatibility mode (see Readme for advanced examples)')
     .option('-d, --debug', 'Shows debug information (minification time & compression efficiency)')
     .option('-f, --format <options>', 'Controls output formatting, see examples below')
@@ -136,6 +137,7 @@ function cli(process, beforeMinifyCallback) {
   removeInlinedFiles = inputOptions.removeInlinedFiles;
 
   options = {
+    batch: inputOptions.batch,
     compatibility: inputOptions.compatibility,
     format: inputOptions.format,
     inline: typeof inputOptions.inline == 'string' ? inputOptions.inline : 'local',
@@ -232,41 +234,63 @@ function minify(process, options, configurations, data) {
   applyNonBooleanCompatibilityFlags(cleanCss, options.compatibility);
   configurations.beforeMinifyCallback(cleanCss);
   cleanCss.minify(data, getSourceMapContent(configurations.inputSourceMap), function (errors, minified) {
-    var mapFilename;
-
-    if (configurations.debugMode) {
-      console.error('Original: %d bytes', minified.stats.originalSize);
-      console.error('Minified: %d bytes', minified.stats.minifiedSize);
-      console.error('Efficiency: %d%', ~~(minified.stats.efficiency * 10000) / 100.0);
-      console.error('Time spent: %dms', minified.stats.timeSpent);
-
-      if (minified.inlinedStylesheets.length > 0) {
-        console.error('Inlined stylesheets:');
-        minified.inlinedStylesheets.forEach(function (uri) {
-          console.error('- %s', uri);
-        });
+    var inputPath;
+
+    if (options.batch && !('styles' in minified)) {
+      for (inputPath in minified) {
+        processMinified(process, configurations, minified[inputPath], inputPath, toOutputPath(inputPath));
       }
+    } else {
+      processMinified(process, configurations, minified, null, options.output);
     }
+  });
+}
+
+function toOutputPath(inputPath) {
+  return inputPath.replace(/\.css$/, '-min.css');
+}
 
-    outputFeedback(minified.errors, true);
-    outputFeedback(minified.warnings);
+function processMinified(process, configurations, minified, inputPath, outputPath) {
+  var mapOutputPath;
 
-    if (minified.errors.length > 0) {
-      process.exit(1);
+  if (configurations.debugMode) {
+    if (inputPath) {
+      console.error('File: %s', inputPath);
     }
 
-    if (configurations.removeInlinedFiles) {
-      minified.inlinedStylesheets.forEach(fs.unlinkSync);
-    }
+    console.error('Original: %d bytes', minified.stats.originalSize);
+    console.error('Minified: %d bytes', minified.stats.minifiedSize);
+    console.error('Efficiency: %d%', ~~(minified.stats.efficiency * 10000) / 100.0);
+    console.error('Time spent: %dms', minified.stats.timeSpent);
 
-    if (minified.sourceMap) {
-      mapFilename = path.basename(options.output) + '.map';
-      output(process, options, minified.styles + lineBreak + '/*# sourceMappingURL=' + mapFilename + ' */');
-      outputMap(options, minified.sourceMap, mapFilename);
-    } else {
-      output(process, options, minified.styles);
+    if (minified.inlinedStylesheets.length > 0) {
+      console.error('Inlined stylesheets:');
+      minified.inlinedStylesheets.forEach(function (uri) {
+        console.error('- %s', uri);
+      });
     }
-  });
+
+    console.error('');
+  }
+
+  outputFeedback(minified.errors, true);
+  outputFeedback(minified.warnings);
+
+  if (minified.errors.length > 0) {
+    process.exit(1);
+  }
+
+  if (configurations.removeInlinedFiles) {
+    minified.inlinedStylesheets.forEach(fs.unlinkSync);
+  }
+
+  if (minified.sourceMap) {
+    mapOutputPath = outputPath + '.map';
+    output(process, outputPath, minified.styles + lineBreak + '/*# sourceMappingURL=' + path.basename(mapOutputPath) + ' */');
+    outputMap(mapOutputPath, minified.sourceMap);
+  } else {
+    output(process, outputPath, minified.styles);
+  }
 }
 
 function applyNonBooleanCompatibilityFlags(cleanCss, compatibility) {
@@ -319,17 +343,16 @@ function getSourceMapContent(sourceMapPath) {
   return content;
 }
 
-function output(process, options, minified) {
-  if (options.output) {
-    fs.writeFileSync(options.output, minified, 'utf8');
+function output(process, outputPath, minified) {
+  if (outputPath) {
+    fs.writeFileSync(outputPath, minified, 'utf8');
   } else {
     process.stdout.write(minified);
   }
 }
 
-function outputMap(options, sourceMap, mapFilename) {
-  var mapPath = path.join(path.dirname(options.output), mapFilename);
-  fs.writeFileSync(mapPath, sourceMap.toString(), 'utf-8');
+function outputMap(mapOutputPath, sourceMap) {
+  fs.writeFileSync(mapOutputPath, sourceMap.toString(), 'utf-8');
 }
 
 module.exports = cli;

test/binary-test.js

@@ -719,7 +719,7 @@ vows.describe('cleancss')
   })
   .addBatch({
     'content of input-source-map': pipedContext(fs.readFileSync('./test/fixtures/source-maps/map/styles.css'), '-o ./test/styles.min.css --input-source-map ./test/fixtures/source-maps/map/input.map', {
-      'includes the right content of the source map': function() {
+      'processes content normally': function() {
         assert.isTrue(fs.existsSync('test/styles.min.css.map'));
         var sourceMap = new SourceMapConsumer(fs.readFileSync('./test/styles.min.css.map', 'utf-8'));
 
@@ -739,4 +739,42 @@ vows.describe('cleancss')
       }
     })
   })
+  .addBatch({
+    'batch processing in piped mode': pipedContext(fs.readFileSync('./test/fixtures/partials/one.css'), '-b', {
+      'includes the right content of the source map': function (error, stdout) {
+        assert.equal(stdout, '.one{color:red}');
+      }
+    }),
+    'batch processing with explicitely given paths': binaryContext('-b ./test/fixtures/partials/one.css ./test/fixtures/partials/five.css', {
+      'creates two separate minified files': function () {
+        assert.isTrue(fs.existsSync('test/fixtures/partials/one-min.css'));
+        assert.isFalse(fs.existsSync('test/fixtures/partials/two-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures/partials/five-min.css'));
+      },
+      'teardown': function () {
+        deleteFile('test/fixtures/partials/one-min.css');
+        deleteFile('test/fixtures/partials/five-min.css');
+      }
+    })
+  })
+  .addBatch({
+    'batch processing with wildard paths': binaryContext('-b ./test/fixtures/partials/\\*\\*/*.css', {
+      'creates two separate minified files': function () {
+        assert.isTrue(fs.existsSync('test/fixtures/partials/extra/four-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures/partials/extra/three-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures/partials/one-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures/partials/two-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures/partials/quoted-svg-min.css'));
+        assert.isTrue(fs.existsSync('test/fixtures/partials/five-min.css'));
+      },
+      'teardown': function () {
+        deleteFile('test/fixtures/partials/extra/four-min.css');
+        deleteFile('test/fixtures/partials/extra/three-min.css');
+        deleteFile('test/fixtures/partials/one-min.css');
+        deleteFile('test/fixtures/partials/two-min.css');
+        deleteFile('test/fixtures/partials/quoted-svg-min.css');
+        deleteFile('test/fixtures/partials/five-min.css');
+      }
+    })
+  })
   .export(module);