Enhanced exceptions

Author: MoOx

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.0 - 2014-11-25
+
+- Enhanced exceptions
+
 # 1.0.0 - 2014-10-04
 
 Initial release from [postcss-color](https://github.com/postcss/postcss-color)

index.js

@@ -3,43 +3,25 @@
  */
 var balanced = require("balanced-match")
 var colorFn = require("css-color-function")
+var helpers = require("postcss-message-helpers")
 
 /**
  * PostCSS plugin to transform color()
  */
 module.exports = function plugin() {
   return function(style) {
-    style.eachDecl(function transformDecl(dec) {
-      if (!dec.value) {
+    style.eachDecl(function transformDecl(decl) {
+      if (!decl.value || decl.value.indexOf("color(") === -1) {
         return
       }
 
-      dec.value = transform(dec.value, dec.source)
+      decl.value = helpers.try(function transformColorValue() {
+        return transformColor(decl.value, decl.source)
+      }, decl.source)
     })
   }
 }
 
-/**
- * Transform colors to rgb() or rgba() on a declaration value
- *
- * @param {String} string
- * @return {String}
- */
-function transform(string, source) {
-  // order of transformation is important
-
-  try {
-    if (string.indexOf("color(") > -1) {
-      string = transformColor(string, source)
-    }
-  }
-  catch (e) {
-    throw new Error(gnuMessage(e.message, source))
-  }
-
-  return string
-}
-
 /**
  * Transform color() to rgb()
  *
@@ -55,19 +37,8 @@ function transformColor(string, source) {
   var fn = string.slice(index)
   var balancedMatches = balanced("(", ")", fn)
   if (!balancedMatches) {
-    throw new SyntaxError(gnuMessage("Missing closing parentheses in '" + string + "'", source))
+    throw new Error("Missing closing parentheses in '" + string + "'", source)
   }
 
   return string.slice(0, index) + colorFn.convert("color(" + balancedMatches.body + ")") + transformColor(balancedMatches.post)
 }
-
-
-/**
- * return GNU style message
- *
- * @param {String} message
- * @param {Object} source
- */
-function gnuMessage(message, source) {
-  return (source ? (source.file ? source.file : "<css input>") + ":" + source.start.line + ":" + source.start.column + " " : "") + message
-}

package.json

@@ -23,7 +23,8 @@
   ],
   "dependencies": {
     "balanced-match": "^0.1.0",
-    "css-color-function": "^1.1.1"
+    "css-color-function": "^1.1.1",
+    "postcss-message-helpers": "^1.1.0"
   },
   "devDependencies": {
     "jscs": "^1.6.2",

test/index.js

@@ -26,7 +26,9 @@ test("color()", function(t) {
 test("throw errors", function(t) {
   t.throws(function() {
     return postcss(plugin()).process(read(filename("fixtures/error"))).css
-  }, /Unable to parse color from string/, "throws a readable error when a color can't be parsed")
+  },
+  /Unable to parse color from string/,
+  "throws a readable error when a color can't be parsed")
 
   t.end()
 })