See #61 - fixes invalid rebasing when --output is a directory.

In such cases there `rebaseTo` option passed to `clean-css` is just the output
directory.

Author: jakubpawlowicz

History.md

@@ -1,6 +1,7 @@
 [5.3.0 / 2021-xx-xx](https://github.com/jakubpawlowicz/clean-css-cli/compare/5.2...HEAD)
 ==================
 
+* Fixed issue [#61](https://github.com/jakubpawlowicz/clean-css-cli/issues/61) - source maps, rebasing, and batch processing.
 * 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

@@ -92,9 +92,7 @@ function cli(process, beforeMinifyCallback) {
     level: { 1: true },
     output: inputOptions.output,
     rebase: inputOptions.withRebase ? true : false,
-    rebaseTo: inputOptions.withRebase && ('output' in inputOptions) && inputOptions.output.length > 0 ?
-      path.dirname(path.resolve(inputOptions.output)) :
-      (inputOptions.withRebase ? process.cwd() : undefined),
+    rebaseTo: undefined,
     sourceMap: inputOptions.sourceMap,
     sourceMapInlineSources: inputOptions.sourceMapInlineSources
   };
@@ -124,6 +122,18 @@ function cli(process, beforeMinifyCallback) {
     fs.mkdirSync(options.output, {recursive: true});
   }
 
+  if (inputOptions.withRebase && ('output' in inputOptions) && inputOptions.output.length > 0) {
+    if (isDirectory(path.resolve(inputOptions.output))) {
+      options.rebaseTo = path.resolve(inputOptions.output);
+    } else {
+      options.rebaseTo = path.dirname(path.resolve(inputOptions.output));
+    }
+  } else {
+    if (inputOptions.withRebase) {
+      options.rebaseTo = process.cwd();
+    }
+  }
+
   var configurations = {
     batchSuffix: inputOptions.batchSuffix,
     beforeMinifyCallback: beforeMinifyCallback,
@@ -148,6 +158,18 @@ function cli(process, beforeMinifyCallback) {
   }
 }
 
+function isDirectory(path) {
+  try {
+    return fs.statSync(path).isDirectory();
+  } catch (e) {
+    if (e.code == 'ENOENT') {
+      return false;
+    } else {
+      throw e;
+    }
+  }
+}
+
 function findArgumentTo(option, rawArgs, args) {
   var value = true;
   var optionAt = rawArgs.indexOf(option);

test/binary-test.js

@@ -948,4 +948,25 @@ vows.describe('cleancss')
       }
     })
   })
+  .addBatch({
+    'batch processing with source maps, rebase and output as a path': binaryContext('-b ./test/fixtures-batch-9/partials-relative/\\*\\*/included.css --source-map --with-rebase -o test/fixtures-batch-9-output', {
+      'setup': function () {
+        execSync('cp -fr test/fixtures test/fixtures-batch-9');
+      },
+      'does not raise an error': function (error, stdout, stderr) {
+        assert.equal(stderr, '');
+      },
+      'rebases output correctly': function () {
+        var minimized = fs.readFileSync('./test/fixtures-batch-9-output/extra/included-min.css', 'utf-8');
+        assert.equal(minimized, 'a{background:url(../fixtures-batch-9/partials/extra/down.gif) 0 0 no-repeat}\n/*# sourceMappingURL=included-min.css.map */');
+      },
+      'creates source map files': function () {
+        assert.isTrue(fs.existsSync('test/fixtures-batch-9-output/extra/included-min.css.map'));
+      },
+      'teardown': function () {
+        execSync('rm -fr test/fixtures-batch-9');
+        execSync('rm -fr test/fixtures-batch-9-output');
+      }
+    })
+  })
   .export(module);