API: Resolve input, output and map w.r.t. cwd.

Issue URL: #731.
Pull Request: #732.

lib/index.js

@@ -27,25 +27,48 @@ function getBinding() {
 }
 
 /**
- * Get outfile
+ * Get input file
  *
  * @param {Object} options
  * @api private
  */
 
-function getOutFile(options) {
-  var file = options.file;
+function getInputFile(options) {
+  return options.file ? path.resolve(options.file) : null;
+}
+
+/**
+ * Get output file
+ *
+ * @param {Object} options
+ * @api private
+ */
+
+function getOutputFile(options) {
   var outFile = options.outFile;
 
-  if (!outFile || typeof outFile !== 'string' || (!options.data && !file)) {
+  if (!outFile || typeof outFile !== 'string' || (!options.data && !options.file)) {
     return null;
   }
 
-  if (path.resolve(outFile) === path.normalize(outFile).replace(/(.+)([\/|\\])$/, '$1')) {
-    return outFile;
+  return path.resolve(outFile);
+}
+
+/**
+ * Get source map
+ *
+ * @param {Object} options
+ * @api private
+ */
+
+function getSourceMap(options) {
+  var sourceMap = options.sourceMap;
+
+  if (sourceMap && typeof sourceMap !== 'string' && options.outFile) {
+    sourceMap = options.outFile + '.map';
   }
 
-  return path.resolve(path.dirname(file), outFile);
+  return sourceMap ? path.resolve(sourceMap) : null;
 }
 
 /**
@@ -99,29 +122,6 @@ function getStyle(options) {
 }
 
 /**
- * Get source map
- *
- * @param {Object} options
- * @api private
- */
-
-function getSourceMap(options) {
-  var file = options.file;
-  var outFile = options.outFile;
-  var sourceMap = options.sourceMap;
-
-  if (sourceMap) {
-    if (typeof sourceMap !== 'string') {
-      sourceMap = outFile ? outFile + '.map' : '';
-    } else if (outFile) {
-      sourceMap = path.resolve(path.dirname(file), sourceMap);
-    }
-  }
-
-  return sourceMap;
-}
-
-/**
  * Get options
  *
  * @param {Object} options
@@ -132,8 +132,8 @@ function getOptions(options, cb) {
   options = options || {};
   options.sourceComments = options.sourceComments || false;
   options.data = options.data || null;
-  options.file = options.file || null;
-  options.outFile = getOutFile(options);
+  options.file = getInputFile(options);
+  options.outFile = getOutputFile(options);
   options.includePaths = (options.includePaths || []).join(path.delimiter);
   options.precision = parseInt(options.precision) || 5;
   options.sourceMap = getSourceMap(options);