Include CLDR data via NPM instead of Grunt/CURL

... and update CLDR to v27.0.3

Author: Turbo87

.gitignore

@@ -1,6 +1,3 @@
-# Pre-processed locale data output from Ldml2JsonConverter
-cldr/
-
 # test262 compiled python files
 *.pyc
 
@@ -15,6 +12,5 @@ node_modules
 
 lib/
 tmp/
-data/
 tests/test262/harness/
 tests/test262/test/

Gruntfile.js

@@ -4,16 +4,12 @@ module.exports = function (grunt) {
         pkg: grunt.file.readJSON('package.json'),
 
         clean: {
-            cldr   : ['tmp/cldr**', 'data/cldr**', 'locale-data/'],
+            cldr   : ['locale-data/'],
             test262: ['tmp/test262**', 'data/test262**', 'tests/test262/'],
             lib    : ['lib/', 'dist/'],
         },
 
         curl: {
-            cldr: {
-                src : 'http://www.unicode.org/Public/cldr/26/json-full.zip',
-                dest: 'tmp/cldr.zip',
-            },
             test262: {
                 src : 'https://github.com/tc39/test262/archive/master.zip',
                 dest: 'tmp/test262.zip',
@@ -32,18 +28,6 @@ module.exports = function (grunt) {
         },
 
         copy: {
-            cldr: {
-                expand: true,
-                cwd   : 'tmp/cldr/',
-                dest  : 'data/',
-                src   : [
-                    '*-license.*',
-                    'supplemental/parentLocales.json',
-                    'main/*/ca-*.json',
-                    'main/*/currencies.json',
-                    'main/*/numbers.json',
-                ]
-            },
             test262: {
                 expand: true,
                 cwd   : 'tmp/test262-master/',
@@ -115,14 +99,6 @@ module.exports = function (grunt) {
 
     grunt.registerTask('default', ['jshint', 'clean:lib', 'build']);
 
-    grunt.registerTask('update-cldr-data', [
-        'clean:cldr',
-        'curl:cldr',
-        'unzip:cldr',
-        'copy:cldr',
-        'cldr',
-    ]);
-
     grunt.registerTask('update-test262', [
         'clean:test262',
         'curl:test262',

package.json

@@ -9,6 +9,9 @@
   },
   "devDependencies": {
     "async": "^0.9.0",
+    "cldr-core": "^27.0.3",
+    "cldr-dates-full": "^27.0.3",
+    "cldr-numbers-full": "^27.0.3",
     "cli-color": "^1.0.0",
     "clui": "^0.3.1",
     "finalhandler": "^0.4.0",

tasks/extract-cldr-data.js

@@ -27,7 +27,7 @@ module.exports = function(grunt) {
     grunt.registerTask('extract-cldr-data', 'Extract Numbers and Calendars Data from CLDR', function() {
 
         try {
-            require('../data/supplemental/parentLocales.json');
+            require('cldr-core/supplemental/parentLocales.json');
         } catch (e) {
             throw new Error('Error locating cldr data, make sure you execute `grunt update-cldr-data` before.');
         }

tasks/utils/extract-calendars.js

@@ -86,7 +86,7 @@ module.exports = function extractCalendars(locales) {
 };
 
 function loadCalendars(locale) {
-    var dir = path.resolve(__dirname, '../../data/main', locale);
+    var dir = path.resolve(path.dirname(require.resolve('cldr-dates-full/package.json')), 'main', locale);
     var filenames = glob.sync("ca-*.json", {
             cwd: dir
         });

tasks/utils/extract-numbers.js

@@ -80,9 +80,8 @@ module.exports = function extractNumbersFields(locales) {
 };
 
 function loadNumbers(locale) {
-    var dir = path.resolve(__dirname, '../../data/main', locale);
     return assign(
-        require(path.join(dir, 'numbers.json')).main[locale].numbers,
-        require(path.join(dir, 'currencies.json')).main[locale].numbers
+        require('cldr-numbers-full/main/' + locale + '/numbers.json').main[locale].numbers,
+        require('cldr-numbers-full/main/' + locale + '/currencies.json').main[locale].numbers
     );
 }

tasks/utils/locales.js

@@ -9,32 +9,40 @@ exports.hasCalendars       = hasCalendars;
 exports.hasNumbersFields   = hasNumbersFields;
 exports.normalizeLocale    = normalizeLocale;
 
+var CLDR_DATES_DIR = path.dirname(require.resolve('cldr-dates-full/package.json'));
+var CLDR_NUMBERS_DIR = path.dirname(require.resolve('cldr-numbers-full/package.json'));
+
 // These are the exceptions to the default algorithm for determining a locale's
 // parent locale.
-var PARENT_LOCALES_HASH = require('../../data/supplemental/parentLocales.json')
+var PARENT_LOCALES_HASH = require('cldr-core/supplemental/parentLocales.json')
     .supplemental.parentLocales.parentLocale;
 
 var CALENDARS_LOCALES_HASH = glob.sync('*/ca-*.json', {
-    cwd: path.resolve(__dirname, '../../data/main'),
+    cwd: path.resolve(CLDR_DATES_DIR, 'main'),
 }).reduce(function (hash, filename) {
     hash[path.dirname(filename)] = true;
     return hash;
 }, {});
 
 var NUMBERS_LOCALES_HASH = glob.sync('*/numbers.json', {
-    cwd: path.resolve(__dirname, '../../data/main'),
+    cwd: path.resolve(CLDR_NUMBERS_DIR, 'main'),
 }).reduce(function (hash, filename) {
     hash[path.dirname(filename)] = true;
     return hash;
 }, {});
 
 var CURRENCIES_LOCALES_HASH = glob.sync('*/currencies.json', {
-    cwd: path.resolve(__dirname, '../../data/main'),
+    cwd: path.resolve(CLDR_NUMBERS_DIR, 'main'),
 }).reduce(function (hash, filename) {
     hash[path.dirname(filename)] = true;
     return hash;
 }, {});
 
+var DEFAULT_CONTENT_ARRAY = require('cldr-core/defaultContent.json')
+    .defaultContent.map(function (value) {
+        return value.replace(/_/g, '-');
+    });
+
 // Some locales that have a `pluralRuleFunction` don't have a `dateFields.json`
 // file, and visa versa, so this creates a unique collection of all locales in
 // the CLDR for which we need data from.
@@ -43,6 +51,7 @@ var ALL_LOCALES_HASH =
     .concat(Object.keys(CALENDARS_LOCALES_HASH))
     .concat(Object.keys(NUMBERS_LOCALES_HASH))
     .concat(Object.keys(CURRENCIES_LOCALES_HASH))
+    .concat(DEFAULT_CONTENT_ARRAY)
     .sort()
     .reduce(function (hash, locale) {
         hash[locale.toLowerCase()] = locale;