Message: add date raw and skeleton support.

Author: nkovacs

src/core.js

@@ -17,12 +17,13 @@ define([
 	"./util/object/extend",
 	"./util/regexp/escape",
 	"./util/string/pad",
+	"./util/formatterfn/options",
 
 	"cldr/event"
 ], function( Cldr, createError, formatMessage, runtimeBind, validate, validateCldr,
 	validateDefaultLocale, validateParameterPresence, validateParameterRange, validateParameterType,
 	validateParameterTypeLocale, validateParameterTypePlainObject, alwaysArray, alwaysCldr,
-	isPlainObject, objectExtend, regexpEscape, stringPad ) {
+	isPlainObject, objectExtend, regexpEscape, stringPad, formatterfnOptions ) {
 
 function validateLikelySubtags( cldr ) {
 	cldr.once( "get", validateCldr );
@@ -88,8 +89,8 @@ Globalize.locale = function( locale ) {
 
 Globalize._messageFmts = {};
 
-Globalize.addMessageFormatterFunction = function( name, fn ) {
-	Globalize._messageFmts[name] = fn;
+Globalize.addMessageFormatterFunction = function( name, fn, options ) {
+	Globalize._messageFmts[name] = formatterfnOptions( fn, options );
 };
 
 /**

src/date.js

@@ -55,12 +55,14 @@ function validateOptionsPreset( options ) {
 	validateOptionsPresetEach( "datetime", options );
 }
 
+var presets = [ "short", "medium", "long", "full" ];
+
 function validateOptionsPresetEach( type, options ) {
 	var value = options[ type ];
 	validate(
 		"E_INVALID_OPTIONS",
 		"Invalid `{{type}: \"{value}\"}`.",
-		value === undefined || [ "short", "medium", "long", "full" ].indexOf( value ) !== -1,
+		value === undefined || presets.indexOf( value ) !== -1,
 		{ type: type, value: value }
 	);
 }
@@ -214,10 +216,18 @@ Globalize.prototype.dateToPartsFormatter = function( options ) {
 	Globalize.addMessageFormatterFunction( type, function( p ) {
 		var options = {};
 		if ( p ) {
-			options[type] = p;
+			var trimmed = p.trim();
+			if ( presets.indexOf( trimmed ) !== -1 ) {
+				options[type] = trimmed;
+			} else if ( trimmed.indexOf( "skeleton" ) === 0 && trimmed.indexOf( "," ) !== -1 ) {
+				var splitArgs = p.split( ",", 2 );
+				options.skeleton = splitArgs[1].trim();
+			} else {
+				options.raw = p;
+			}
 		}
 		return this.dateFormatter( options );
-	});
+	}, { split: false, trim: false });
 });
 
 /**

src/message/compiler.js

@@ -198,6 +198,10 @@ Compiler.prototype.compile = function( src, lc ) {
 
     // TODO: pc is only needed for validation, disable for now.
     var pc = { cardinal: [], ordinal: [] };
+
+    // Enable icu-compatible function parameter parsing so that commas
+    // can be used inside custom date formats.
+    pc.strictFunctionParams = true;
     var r = Parser.parse( src, pc ).map( function( token ) { return this.token( token ); }, this );
     return "function(d) { return " + ( r.join( " + " ) || "\"\"" ) + "; }";
 };

src/util/formatterfn/options.js

@@ -0,0 +1,19 @@
+define(function() {
+
+return function( fn, options ) {
+	options = options || {};
+	return function( ) {
+		var args = [].slice.call( arguments, 0 );
+		if ( args.length === 1 && ( options.split === undefined || options.split === true ) ) {
+			args = args[0].split( "," );
+		}
+		if ( options.trim === undefined || options.trim === true ) {
+			args = args.map( function( v ) {
+				return v.trim();
+			});
+		}
+		return fn.apply( this, args );
+	};
+};
+
+});

test/compiler/cases/message.js

@@ -62,7 +62,11 @@ module.exports = {
 				date: {
 					date: "date: {x, date, long}",
 					time: "time: {x, time, long}",
-					datetime: "datetime: {x, datetime, long}"
+					datetime: "datetime: {x, datetime, long}",
+					raw: "date raw: {x, date,  y-M-d HH:mm:ss zzzz  }",
+					rawComma: "date raw comma: {x, date,  y-M-d, HH:mm:ss zzzz  }",
+					skeleton: "date skeleton: {x, date, skeleton, GyMMMEdhms}",
+					skeletonInvalid: "date skeleton: {x, date, skeleton}"
 				},
 				relativetime: {
 					default: "relativetime: {x, relativetime, minute}",

test/functional/message/message-formatter.js

@@ -99,7 +99,11 @@ QUnit.module( ".messageFormatter( path )", {
 				date: {
 					date: "date: {x, date, long}",
 					time: "time: {x, time, long}",
-					datetime: "datetime: {x, datetime, long}"
+					datetime: "datetime: {x, datetime, long}",
+					raw: "date raw: {x, date,  y-M-d HH:mm:ss zzzz  }",
+					rawComma: "date raw comma: {x, date,  y-M-d, HH:mm:ss zzzz  }",
+					skeleton: "date skeleton: {x, date, skeleton, GyMMMEdhms}",
+					skeletonInvalid: "date skeleton: {x, date, skeleton}"
 				},
 				relativetime: {
 					default: "relativetime: {x, relativetime, minute}",
@@ -266,6 +270,18 @@ QUnit.test( "should support formatters in messages", function( assert ) {
 	assert.messageFormatter( "en", "date/datetime", {
 		x: date,
 	}, "datetime: September 15, 2010 at 5:35:07 PM GMT+2" );
+	assert.messageFormatter( "en", "date/raw", {
+		x: date,
+	}, "date raw:   2010-9-15 17:35:07 GMT+02:00  " );
+	assert.messageFormatter( "en", "date/rawComma", {
+		x: date,
+	}, "date raw comma:   2010-9-15, 17:35:07 GMT+02:00  " );
+	assert.messageFormatter( "en", "date/skeleton", {
+		x: date,
+	}, "date skeleton: Wed, Sep 15, 2010 AD, 5:35:07 PM" );
+	assert.messageFormatter( "en", "date/skeletonInvalid", {
+		x: date,
+	}, "date skeleton:  7174l4ton" );
 
 	assert.messageFormatter( "en", "relativetime/default", {
 		x: 2,