feat($$messageFormat): module for MessageFormat extensions

$$messageFormat is now a new module due to size limitations (7Kb
minified with closure compiler's ADVANCED_OPTIMIZATIONS.)

Removed dependency on $interpolate.  The parser now parses over Angular
expressions to correctly skip over syntactical items (e.g. "}}" ocurring
in a string is skipped.)

The entire message including nested messages are parsed in a single pass
(they were delegated to $interpolate earlier which called back into this
parser.)

Author: chirayuk

Gruntfile.js

@@ -126,6 +126,9 @@ module.exports = function(grunt) {
       ngLocale: {
         files: { src: 'src/ngLocale/**/*.js' },
       },
+      ngMessageFormat: {
+        files: { src: 'src/ngMessageFormat/**/*.js' },
+      },
       ngMessages: {
         files: { src: 'src/ngMessages/**/*.js' },
       },
@@ -200,6 +203,10 @@ module.exports = function(grunt) {
         dest: 'build/angular-resource.js',
         src: util.wrap(files['angularModules']['ngResource'], 'module')
       },
+      messageformat: {
+        dest: 'build/angular-messageformat.js',
+        src: util.wrap(files['angularModules']['ngMessageFormat'], 'module')
+      },
       messages: {
         dest: 'build/angular-messages.js',
         src: util.wrap(files['angularModules']['ngMessages'], 'module')
@@ -232,6 +239,7 @@ module.exports = function(grunt) {
       animate: 'build/angular-animate.js',
       cookies: 'build/angular-cookies.js',
       loader: 'build/angular-loader.js',
+      messageformat: 'build/angular-messageformat.js',
       messages: 'build/angular-messages.js',
       touch: 'build/angular-touch.js',
       resource: 'build/angular-resource.js',

angularFiles.js

@@ -28,7 +28,6 @@ var angularFiles = {
     'src/ng/locale.js',
     'src/ng/location.js',
     'src/ng/log.js',
-    'src/ng/messageformat.js',
     'src/ng/parse.js',
     'src/ng/q.js',
     'src/ng/raf.js',
@@ -92,6 +91,9 @@ var angularFiles = {
     'ngCookies': [
       'src/ngCookies/cookies.js'
     ],
+    'ngMessageFormat': [
+      'src/ngMessageFormat/messageformat.js'
+    ],
     'ngMessages': [
       'src/ngMessages/messages.js'
     ],

lib/grunt/utils.js

@@ -185,14 +185,15 @@ module.exports = {
     var mapFileName = mapFile.match(/[^\/]+$/)[0];
     var errorFileName = file.replace(/\.js$/, '-errors.json');
     var versionNumber = grunt.config('NG_VERSION').full;
+    var compilationLevel = file === 'build/angular-messageformat.js' ? 'ADVANCED_OPTIMIZATIONS' : 'SIMPLE_OPTIMIZATIONS';
     shell.exec(
         'java ' +
             this.java32flags() + ' ' +
             '-Xmx2g ' +
             '-cp bower_components/closure-compiler/compiler.jar' + classPathSep +
             'bower_components/ng-closure-runner/ngcompiler.jar ' +
             'org.angularjs.closurerunner.NgClosureRunner ' +
-            '--compilation_level SIMPLE_OPTIMIZATIONS ' +
+            '--compilation_level ' + compilationLevel + ' ' +
             '--language_in ECMASCRIPT5_STRICT ' +
             '--minerr_pass ' +
             '--minerr_errors ' + errorFileName + ' ' +

src/AngularPublic.js

@@ -224,7 +224,6 @@ function publishExternalAPI(angular) {
         $httpBackend: $HttpBackendProvider,
         $location: $LocationProvider,
         $log: $LogProvider,
-        $$messageFormat: $$MessageFormatProvider,
         $parse: $ParseProvider,
         $rootScope: $RootScopeProvider,
         $q: $QProvider,

src/ng/interpolate.js

@@ -79,7 +79,8 @@ function $InterpolateProvider() {
   };
 
 
-  this.$get = ['$parse', '$exceptionHandler', '$sce', '$$messageFormat', function($parse, $exceptionHandler, $sce, $$messageFormat) {
+  this.$get = ['$injector', '$parse', '$exceptionHandler', '$sce', function($injector, $parse, $exceptionHandler, $sce) {
+    var $$messageFormat = $injector.has('$$messageFormat') ? $injector.get('$$messageFormat') : null;
     var startSymbolLength = startSymbol.length,
         endSymbolLength = endSymbol.length,
         escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'),
@@ -113,11 +114,11 @@ function $InterpolateProvider() {
 
     // Interpolation expressions support MessageFormat like extensions for plural and
     // select(gender).  Delegate to $$messageFormat is such extensions are being used.
-    function parseExtendedExpression(text, interceptorFn) {
-      if (text.search(fastIsMsgFormatTestRe) == -1) {
-        return $parse(text, interceptorFn);
+    function parse(text, interceptorFn) {
+      if ($$messageFormat && text.search(fastIsMsgFormatTestRe) != -1) {
+        return $$messageFormat.parseMustache("{{"+text+"}}");
       } else {
-        return $$messageFormat.parse(text);
+        return $parse(text, interceptorFn);
       }
     }
 
@@ -269,7 +270,7 @@ function $InterpolateProvider() {
           }
           exp = text.substring(startIndex + startSymbolLength, endIndex);
           expressions.push(exp);
-          parseFns.push(parseExtendedExpression(exp, parseStringifyInterceptor));
+          parseFns.push(parse(exp, parseStringifyInterceptor));
           index = endIndex + endSymbolLength;
           expressionPositions.push(concat.length);
           concat.push('');