editorconfig 0.12.1 → 0.12.2

package/editorconfig.js

@@ -35,6 +35,17 @@ function getConfigFileNames(filepath, options) {
   return paths;
 }
 
+function getFilepathRoot(filepath) {
+  if (path.parse !== undefined) {
+    // Node.js >= 0.11.15
+    return path.parse(filepath).root;
+  }
+  if (os.platform() === 'win32') {
+    return path.resolve(filepath).match(/^(\\\\[^\\]+\\)?[^\\]+\\/)[0];
+  }
+  return '/';
+}
+
 function processMatches(matches, version) {
   // Set indent_size to "tab" if indent_size is unspecified and
   // indent_style is set to "tab".
@@ -64,12 +75,6 @@ function processOptions(options, filepath) {
     version: new Version(options.version || pkg.version),
     root: path.resolve(options.root || getFilepathRoot(filepath))
   };
-  function getFilepathRoot(filepath) {
-    if (os.platform() === 'win32') {
-      return path.resolve(filepath).match(/^[^\\]+\\/)[0];
-    }
-    return '/';
-  }
 }
 
 function parseFromFiles(filepath, files, options) {
@@ -95,6 +100,11 @@ function parseFromFiles(filepath, files, options) {
         try {
           value = JSON.parse(value);
         } catch(e) {}
+        if (typeof value === 'undefined' || value === null) {
+          // null and undefined are values specific to JSON (no special meaning
+          // in editorconfig) & should just be returned as regular strings.
+          value = String(value);
+        }
         matches[key] = value;
       }
     });
@@ -137,15 +147,19 @@ function readConfigFiles(filepaths) {
 }
 
 module.exports.parseFromFiles = function (filepath, files, options) {
-  filepath = path.resolve(filepath);
-  options = processOptions(options, filepath);
-  return parseFromFiles(filepath, files, options);
+  return new Promise (function (resolve, reject) {
+    filepath = path.resolve(filepath);
+    options = processOptions(options, filepath);
+    resolve(parseFromFiles(filepath, files, option));
+  });
 };
 
 module.exports.parse = function (filepath, options) {
-  filepath = path.resolve(filepath);
-  options = processOptions(options, filepath);
-  var filepaths = getConfigFileNames(filepath, options);
-  var files = readConfigFiles(filepaths);
-  return parseFromFiles(filepath, files, options);
+  return new Promise (function (resolve, reject) {
+    filepath = path.resolve(filepath);
+    options = processOptions(options, filepath);
+    var filepaths = getConfigFileNames(filepath, options);
+    var files = readConfigFiles(filepaths);
+    resolve(parseFromFiles(filepath, files, options));
+  });
 };

package/lib/ini.js

@@ -12,9 +12,9 @@ var fs = require('fs');
  * comment: ;this is a comment
  */
 var regex = {
-	section: /^\s*\[(([^#;]|\\#|\\;)+)\]\s*([#;].*)?$/,
-	param: /^\s*([\w\.\-\_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$/,
-	comment: /^\s*[#;].*$/
+  section: /^\s*\[(([^#;]|\\#|\\;)+)\]\s*([#;].*)?$/,
+  param: /^\s*([\w\.\-\_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$/,
+  comment: /^\s*[#;].*$/
 };
 
 /*
@@ -23,43 +23,43 @@ var regex = {
  * @param: {Function} callback, the function that will be called when parsing is done
  * @return: none
  */
-module.exports.parse = function(file, callback){
-	if(!callback){
-		return;
-	}
-	fs.readFile(file, 'utf8', function(err, data){
-		if(err){
-			callback(err);
-		}else{
-			callback(null, parse(data));
-		}
-	});
+module.exports.parse = function (file, callback) {
+  if (!callback) {
+    return;
+  }
+  fs.readFile(file, 'utf8', function (err, data) {
+    if (err) {
+      callback(err);
+    } else {
+      callback(null, parse(data));
+    }
+  });
 };
 
-module.exports.parseSync = function(file){
-	return parse(fs.readFileSync(file, 'utf8'));
+module.exports.parseSync = function (file) {
+  return parse(fs.readFileSync(file, 'utf8'));
 };
 
-function parse(data){
-	var sectionBody = {};
-	var sectionName = null;
-	var value = [[sectionName, sectionBody]];
-	var lines = data.split(/\r\n|\r|\n/);
-	lines.forEach(function(line){
-		var match;
-		if(regex.comment.test(line)){
-			return;
-		}else if(regex.param.test(line)){
-			match = line.match(regex.param);
-			sectionBody[match[1]] = match[2];
-		}else if(regex.section.test(line)){
-			match = line.match(regex.section);
-			sectionName = match[1];
-			sectionBody = {};
-			value.push([sectionName, sectionBody]);
-		}
-	});
-	return value;
+function parse (data) {
+  var sectionBody = {};
+  var sectionName = null;
+  var value = [[sectionName, sectionBody]];
+  var lines = data.split(/\r\n|\r|\n/);
+  lines.forEach(function (line) {
+    var match;
+    if (regex.comment.test(line)) {
+      return;
+    } else if (regex.param.test(line)) {
+      match = line.match(regex.param);
+      sectionBody[match[1]] = match[2];
+    } else if (regex.section.test(line)) {
+      match = line.match(regex.section);
+      sectionName = match[1];
+      sectionBody = {};
+      value.push([sectionName, sectionBody]);
+    }
+  });
+  return value;
 }
 
 module.exports.parseString = parse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "editorconfig",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "EditorConfig File Locator and Interpreter for Node.js",
   "keywords": [
     "editorconfig",