Message: Remove duplication in compiled formatters

messageformatterFn now uses the runtimeArgs generated by
globalize-compiler instead of having them duplicated
by messageFormatterRuntimeBind.

Author: nkovacs

src/message.js

@@ -109,16 +109,19 @@ Globalize.prototype.messageFormatter = function( path ) {
 
 	/* jshint evil:true */
 	formatter = new Function(
-		"number, plural, select, fmt", messageCompiler.funcname( cldr.locale ),
-		"return " + formatterSrc )(
-			runtime.number, runtime.plural, runtime.select, compiler.formatters, pluralGenerator
-		);
+		"number, plural, select", messageCompiler.funcname( cldr.locale ),
+		"  var fmt = [].slice.call( arguments, 4 );\n" +
+		"  return " + formatterSrc + "\n"
+	);
 
-	returnFn = messageFormatterFn( formatter );
+	returnFn = messageFormatterFn.apply( this, [
+		formatter,
+		runtime.number, runtime.plural, runtime.select, pluralGenerator
+	].concat( compiler.formatters ) );
 
 	var runtimeArgs = [
 		messageFormatterRuntimeBind(
-			cldr, formatter, compiler.runtime, pluralType, cldr.locale, compiler.formatters
+			formatter, formatterSrc, compiler.runtime, pluralType, cldr.locale, compiler.formatters
 		)
 	];
 

src/message/formatter-fn.js

@@ -3,6 +3,7 @@ define([
 ], function( validateParameterTypeMessageVariables ) {
 
 return function( formatter ) {
+	formatter = formatter.apply( null, [].slice.call( arguments, 1 ) );
 	return function messageFormatter( variables ) {
 		if ( typeof variables === "number" || typeof variables === "string" ) {
 			variables = [].slice.call( arguments, 0 );

src/message/formatter-runtime-bind.js

@@ -1,46 +1,35 @@
 define(function() {
 
-return function( cldr, messageformatter, runtime, pluralType, locale, embeddedFormatters ) {
-	var origToString = messageformatter.toString;
+return function( messageformatter, formatterSrc, runtime, pluralType, locale, formatters ) {
+	var hasFormatters = formatters.length > 0;
 
 	messageformatter.toString = function() {
-		var argNames, argValues, output,
-			args = {};
-
-		// Properly adjust SlexAxton/messageformat.js compiled variables with Globalize variables:
-		output = origToString.call( messageformatter );
+		var locals = [];
+		var argCount = 0,
+			args = [];
 
 		if ( runtime.number ) {
-			args.number = "messageFormat.number";
+			locals.push( "var number = messageFormat.number;" );
 		}
 
 		if ( runtime.plural ) {
-			args.plural = "messageFormat.plural";
+			locals.push( "var plural = messageFormat.plural;" );
 		}
 
 		if ( runtime.select ) {
-			args.select = "messageFormat.select";
-		}
-
-		if ( embeddedFormatters.length ) {
-			args.fmt = "[" + embeddedFormatters.map( function( fn ) {
-				return fn.generatorString();
-			} ).join( ", " ) + "]";
+			locals.push( "var select = messageFormat.select;" );
 		}
 
 		if ( pluralType !== false ) {
-			args[locale] = "Globalize(\"" + locale + "\")." +
-				"pluralGenerator( { type: \"" + pluralType + "\" } )";
+			args.push( locale );
+			argCount++;
 		}
 
-		argNames = Object.keys( args ).join( ", " );
-		argValues = Object.keys( args ).map(function( key ) {
-			return args[ key ];
-		}).join( ", " );
-
-		return "(function( " + argNames + " ) {\n" +
-			"  return " + output + "\n" +
-			"})(" + argValues + ")";
+		return "(function( " + args.join( ", " ) + " ) {\n" +
+			( locals.length ? ( locals.join( "\n" ) + "\n" ) : "" ) +
+			( hasFormatters ? "  var fmt = [].slice.call( arguments, " + argCount + " );\n" : "" ) +
+			"  return " + formatterSrc + "\n" +
+			"})";
 	};
 
 	return messageformatter;