allow message to be specified as an arg.

ebdrup · ebdrup · commit 4e36116a61d8 · 2012-12-16T16:37:50.000+01:00
diff --git a/lib/util/makeErrorFunction.js b/lib/util/makeErrorFunction.js
@@ -10,8 +10,20 @@ module.exports = function makeErrorFunction(errorCodeName, errorCodeSpec) {
 	return function () {
 		var error = new Error(""), message;
 		error.id = "myId";
-		error.internal = {nodeErrors:true};
 		error.name = errorCodeName;
+		//get error message
+		if (errorCodeSpec.args) {
+			var numberOfFormatArguments = (errorCodeSpec.message.match(/\%s|\%d|\%j/g) || []).length;
+			var formatArguments = [errorCodeSpec.message];
+			var nonInternalArguments = Array.prototype.slice.call(arguments, 0, numberOfFormatArguments);
+			formatArguments.push.apply(formatArguments, nonInternalArguments);
+			message = format.apply(format, formatArguments);
+		} else {
+			message = errorCodeSpec.message;
+		}
+		error.message = message;
+		error.id = uuid.v4();
+		//add arguments
 		var i = 0;
 		if (errorCodeSpec.args) {
 			for (i = 0; i < errorCodeSpec.args.length; i++) {
@@ -24,17 +36,8 @@ module.exports = function makeErrorFunction(errorCodeName, errorCodeSpec) {
 		if(arguments[i]){
 			error.internal = arguments[i]; //always allow additional last argument to be stored as internal
 		}
-		//get error message
-		if (errorCodeSpec.args) {
-			var formatArguments = [errorCodeSpec.message];
-			var nonInternalArguments = Array.prototype.slice.call(arguments, 0, errorCodeSpec.args.length);
-			formatArguments.push.apply(formatArguments, nonInternalArguments);
-			message = format.apply(format, formatArguments);
-		} else {
-			message = errorCodeSpec.message;
-		}
-		error.message = message;
-		error.id = uuid.v4();
+		error.internal = error.internal || {};
+		error.internal.nodeErrors = true;
 		//add additional error code spec properties
 		var properties = Object.keys(errorCodeSpec);
 		for(i=0; i<properties.length; i++){
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Allan Ebdrup",
   "name": "nodeerrors",
   "description": "error handling module for node",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/Muscula/nodeerrors"
