Only compile required plural generators

Author: nkovacs

src/message.js

@@ -84,14 +84,26 @@ Globalize.prototype.messageFormatter = function( path ) {
 	}
 	validateMessageType( path, message );
 
-	// Is plural module present? Yes, use its generator. Nope, use an error generator.
-	pluralGenerator = this.plural !== undefined ?
-		this.pluralGenerator( { type: "both" } ) :
-		createErrorPluralModulePresence;
-
 	var compiler = new messageCompiler( this, Globalize._messageFmts );
 	var formatterSrc = compiler
-		.compile( message, cldr.locale, pluralGenerator );
+		.compile( message, cldr.locale );
+
+	var pluralType = false;
+	if ( compiler.pluralTypes.cardinal && compiler.pluralTypes.ordinal ) {
+		pluralType = "both";
+	} else if ( compiler.pluralTypes.cardinal ) {
+		pluralType = "cardinal";
+	} else if ( compiler.pluralTypes.ordinal ) {
+		pluralType = "ordinal";
+	}
+
+	if ( pluralType !== false ) {
+
+		// Is plural module present? Yes, use its generator. Nope, use an error generator.
+		pluralGenerator = this.plural !== undefined ?
+			this.pluralGenerator( { type: pluralType } ) :
+			createErrorPluralModulePresence;
+	}
 
 	var runtime = new messageFormatterRuntime( compiler.strictNumberSign );
 
@@ -104,15 +116,20 @@ Globalize.prototype.messageFormatter = function( path ) {
 
 	returnFn = messageFormatterFn( formatter );
 
-	runtimeBind( args, cldr, returnFn,
-		[
-			messageFormatterRuntimeBind(
-				cldr, formatter, compiler.runtime, compiler.locales, compiler.formatters
-			),
-			pluralGenerator
-		].concat(
-			compiler.formatters
-		));
+	var runtimeArgs = [
+		messageFormatterRuntimeBind(
+			cldr, formatter, compiler.runtime, pluralType, cldr.locale, compiler.formatters
+		)
+	];
+
+	if ( pluralGenerator ) {
+		runtimeArgs.push( pluralGenerator );
+	}
+	runtimeArgs = runtimeArgs.concat(
+		compiler.formatters
+	);
+
+	runtimeBind( args, cldr, returnFn, runtimeArgs );
 
 	return returnFn;
 };

src/message/compiler.js

@@ -9,15 +9,18 @@ define([
  * @class
  * @param {object} context - Context (this) for formatter functions
  * @param {array} fmtFuncs - Formatter functions
- * @property {object} locales - The locale identifiers used by the compiled functions
  * @property {object} runtime - Names of the core runtime functions used by the compiled functions
  * @property {array} formatters - The formatter functions used by the compiled functions
+ * @property {object} pluralTypes - The plural types used by the compiled functions
  */
 function Compiler( context, fmtFuncs ) {
     this._globalize = Globalize;
     this.fmt = fmtFuncs;
-    this.locales = {};
     this.runtime = {};
+    this.pluralTypes = {
+        ordinal: false,
+        cardinal: false
+    };
     this.formatters = [];
     this.context = context;
 }
@@ -136,8 +139,8 @@ Compiler.prototype.token = function( token, plural ) {
         case "selectordinal":
             fn = "plural";
             args.push( 0, Compiler.funcname( this.lc ), this.cases( token, token ), 1 );
-            this.locales[ this.lc ] = true;
             this.runtime.plural = true;
+            this.pluralTypes.ordinal = true;
             break;
 
         case "plural":
@@ -146,8 +149,8 @@ Compiler.prototype.token = function( token, plural ) {
                 token.offset || 0,
                 Compiler.funcname( this.lc ), this.cases( token, token )
             );
-            this.locales[ this.lc ] = true;
             this.runtime.plural = true;
+            this.pluralTypes.cardinal = true;
             break;
 
         case "function":

src/message/formatter-runtime-bind.js

@@ -1,10 +1,10 @@
 define(function() {
 
-return function( cldr, messageformatter, runtime, pluralLocales, embeddedFormatters ) {
+return function( cldr, messageformatter, runtime, pluralType, locale, embeddedFormatters ) {
 	var origToString = messageformatter.toString;
 
 	messageformatter.toString = function() {
-		var argNames, argValues, output, locale,
+		var argNames, argValues, output,
 			args = {};
 
 		// Properly adjust SlexAxton/messageformat.js compiled variables with Globalize variables:
@@ -28,9 +28,9 @@ return function( cldr, messageformatter, runtime, pluralLocales, embeddedFormatt
 			} ).join( ", " ) + "]";
 		}
 
-		for ( locale in pluralLocales ) {
+		if ( pluralType !== false ) {
 			args[locale] = "Globalize(\"" + locale + "\")." +
-				"pluralGenerator( { type: \"both\" } )";
+				"pluralGenerator( { type: \"" + pluralType + "\" } )";
 		}
 
 		argNames = Object.keys( args ).join( ", " );

test/functional/message/message-formatter.js

@@ -236,7 +236,7 @@ QUnit.test( "should allow for runtime compilation", function( assert ) {
 		function( runtimeArgs ) {
 			assert.equal(
 				runtimeArgs[ 0 ].toString(),
-				"(function( number, plural, en ) {\n  return function (d) { return plural(d.count, 1, en, { \"0\": \"Be the first to like this\", \"1\": \"You liked this\", one: \"You and \" + d.someone + \" liked this\", other: \"You and \" + number(d.count, \"count\", 1) + \" others liked this\" }); }\n})(messageFormat.number, messageFormat.plural, Globalize(\"en\").pluralGenerator( { type: \"both\" } ))"
+				"(function( number, plural, en ) {\n  return function (d) { return plural(d.count, 1, en, { \"0\": \"Be the first to like this\", \"1\": \"You liked this\", one: \"You and \" + d.someone + \" liked this\", other: \"You and \" + number(d.count, \"count\", 1) + \" others liked this\" }); }\n})(messageFormat.number, messageFormat.plural, Globalize(\"en\").pluralGenerator( { type: \"cardinal\" } ))"
 			);
 		}
 	);