Runtime: Fix unitFormatter with numberFormatter

JSON.stringify omits functions, so the generated runtimeKey
did not depend on the value of the numberFormatter option,
causing different unitFormatters to have an identical runtimeKey.

Fixes #704

Author: nkovacs

src/common/runtime-bind.js

@@ -1,11 +1,12 @@
 define([
 	"./runtime-key",
+	"./runtime-stringify",
 	"../util/function-name"
-], function( runtimeKey, functionName ) {
+], function( runtimeKey, runtimeStringify, functionName ) {
 
 return function( args, cldr, fn, runtimeArgs ) {
 
-	var argsStr = JSON.stringify( args ),
+	var argsStr = runtimeStringify( args ),
 		fnName = functionName( fn ),
 		locale = cldr.locale;
 

src/common/runtime-key.js

@@ -1,10 +1,11 @@
 define([
+	"./runtime-stringify",
 	"../util/string/hash"
-], function( stringHash ) {
+], function( runtimeStringify, stringHash ) {
 
 return function( fnName, locale, args, argsStr ) {
 	var hash;
-	argsStr = argsStr || JSON.stringify( args );
+	argsStr = argsStr || runtimeStringify( args );
 	hash = stringHash( fnName + locale + argsStr );
 	return hash > 0 ? "a" + hash : "b" + Math.abs( hash );
 };

src/common/runtime-stringify.js

@@ -0,0 +1,12 @@
+define([], function( ) {
+
+return function( args ) {
+	return JSON.stringify( args, function( key, value ) {
+		if ( typeof value === "function" ) {
+			return value.runtimeKey; // if undefined, the value will be filtered out.
+		}
+		return value;
+	} );
+};
+
+});

src/core-runtime.js

@@ -30,6 +30,14 @@ Globalize.locale = function( locale ) {
 	return this._locale;
 };
 
+Globalize._loadRuntimeFn = function( key ) {
+	var fn = Globalize[ key ];
+	if ( typeof fn === "function" ) {
+		fn.runtimeKey = key;
+	}
+	return fn;
+};
+
 Globalize._createError = createError;
 Globalize._formatMessage = formatMessage;
 Globalize._regexpEscape = regexpEscape;

src/currency-runtime.js

@@ -16,7 +16,9 @@ Globalize._currencyNameFormat = currencyNameFormat;
 Globalize.currencyFormatter =
 Globalize.prototype.currencyFormatter = function( currency, options ) {
 	options = options || {};
-	return Globalize[ runtimeKey( "currencyFormatter", this._locale, [ currency, options ] ) ];
+	return Globalize._loadRuntimeFn(
+		runtimeKey( "currencyFormatter", this._locale, [ currency, options ] )
+	);
 };
 
 Globalize.formatCurrency =

src/date-runtime.js

@@ -36,13 +36,15 @@ Globalize.prototype.dateFormatter = function( options ) {
 Globalize.dateToPartsFormatter =
 Globalize.prototype.dateToPartsFormatter = function( options ) {
 	options = options || { skeleton: "yMd" };
-	return Globalize[ runtimeKey( "dateToPartsFormatter", this._locale, [ options ] ) ];
+	return Globalize._loadRuntimeFn(
+		runtimeKey( "dateToPartsFormatter", this._locale, [ options ] )
+	);
 };
 
 Globalize.dateParser =
 Globalize.prototype.dateParser = function( options ) {
 	options = options || { skeleton: "yMd" };
-	return Globalize[ runtimeKey( "dateParser", this._locale, [ options ] ) ];
+	return Globalize._loadRuntimeFn( runtimeKey( "dateParser", this._locale, [ options ] ) );
 };
 
 Globalize.formatDate =

src/message-runtime.js

@@ -11,9 +11,9 @@ Globalize._validateParameterTypeMessageVariables = validateParameterTypeMessageV
 
 Globalize.messageFormatter =
 Globalize.prototype.messageFormatter = function( /* path */ ) {
-	return Globalize[
+	return Globalize._loadRuntimeFn(
 		runtimeKey( "messageFormatter", this._locale, [].slice.call( arguments, 0 ) )
-	];
+	);
 };
 
 Globalize.formatMessage =

src/number-runtime.js

@@ -29,13 +29,13 @@ Globalize._validateParameterTypeString = validateParameterTypeString;
 Globalize.numberFormatter =
 Globalize.prototype.numberFormatter = function( options ) {
 	options = options || {};
-	return Globalize[ runtimeKey( "numberFormatter", this._locale, [ options ] ) ];
+	return Globalize._loadRuntimeFn( runtimeKey( "numberFormatter", this._locale, [ options ] ) );
 };
 
 Globalize.numberParser =
 Globalize.prototype.numberParser = function( options ) {
 	options = options || {};
-	return Globalize[ runtimeKey( "numberParser", this._locale, [ options ] ) ];
+	return Globalize._loadRuntimeFn( runtimeKey( "numberParser", this._locale, [ options ] ) );
 };
 
 Globalize.formatNumber =

src/plural-runtime.js

@@ -20,7 +20,7 @@ Globalize.prototype.plural = function( value, options ) {
 Globalize.pluralGenerator =
 Globalize.prototype.pluralGenerator = function( options ) {
 	options = options || {};
-	return Globalize[ runtimeKey( "pluralGenerator", this._locale, [ options ] ) ];
+	return Globalize._loadRuntimeFn( runtimeKey( "pluralGenerator", this._locale, [ options ] ) );
 };
 
 return Globalize;

src/relative-time-runtime.js

@@ -23,7 +23,9 @@ Globalize.prototype.formatRelativeTime = function( value, unit, options ) {
 Globalize.relativeTimeFormatter =
 Globalize.prototype.relativeTimeFormatter = function( unit, options ) {
 	options = options || {};
-	return Globalize[ runtimeKey( "relativeTimeFormatter", this._locale, [ unit, options ] ) ];
+	return Globalize._loadRuntimeFn(
+		runtimeKey( "relativeTimeFormatter", this._locale, [ unit, options ] )
+	);
 };
 
 return Globalize;