@js-joda/locale 4.0.0 → 4.2.1

package/examples/usage_node_build.js

@@ -8,7 +8,7 @@ require('@js-joda/timezone');
 
 function outputDateInDifferentLocales(zdt) {
     var { Locale } = require('./build/js-joda-locale');
-    console.log('Times in ' + zdt.zone());
+    console.log(`Times in ${zdt.zone()}`);
     console.log('');
     console.log('en_US formatted string:', zdt.format(joda.DateTimeFormatter.ofPattern('eeee MMMM dd yyyy GGGG, hh:mm:ss a zzzz, zz, OOOO \'Week: \' ww, \'Quarter: \' QQQ').withLocale(Locale.US)));
     console.log('en_GB formatted string:', zdt.format(joda.DateTimeFormatter.ofPattern('eeee MMMM dd yyyy GGGG, hh:mm:ss a zzzz, zz, OOOO \'Week: \' ww, \'Quarter: \' QQQ').withLocale(Locale.UK)));
@@ -27,7 +27,7 @@ try {
     var { Locale } = require('./build/js-joda-locale');
     console.log('locale', Locale);
 
-    console.log('availableLocales:' + JSON.stringify(Locale.getAvailableLocales(), null, 4));
+    console.log(`availableLocales:${JSON.stringify(Locale.getAvailableLocales(), null, 4)}`);
 
     var zdt = joda.ZonedDateTime.of(2017, 1, 1, 0, 0, 0, 0, joda.ZoneId.of('Europe/Berlin'));
     outputDateInDifferentLocales(zdt);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@js-joda/locale",
-  "version": "4.0.0+36.0.0",
+  "version": "4.2.1",
   "description": "plugin for locale functionality for js-joda",
   "repository": {
     "type": "git",
@@ -9,20 +9,21 @@
   "main": "dist/js-joda-locale.js",
   "typings": "dist/js-joda-locale.d.ts",
   "scripts": {
-    "version": "npm run build-all",
-    "test": "./node_modules/.bin/mocha --timeout 5000 --require @babel/register ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js test/pluginTest_mochaOnly.js",
-    "test-coverage": "NODE_ENV=test COVERAGE=1 ../../node_modules/.bin/nyc --report-dir=build/coverage --reporter=lcov --reporter html ./node_modules/.bin/mocha --timeout 5000 --require @babel/register --reporter progress ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js",
-    "test-browser": "./node_modules/.bin/karma start --reporters=dots --single-run",
-    "test-saucelabs": "./node_modules/.bin/karma start --reporters=\"dots,saucelabs\" --browsers=\"sl_chrome,sl_ie,sl_firefox,sl_ios_simulator\" --single-run=true",
+    "version": "npm run build-locale-dist",
+    "test": "npx mocha --timeout 5000 --require @babel/register ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js test/pluginTest_mochaOnly.js",
+    "test-coverage": "NODE_ENV=test COVERAGE=1 npx nyc --report-dir=build/coverage --reporter=lcov --reporter html npx mocha --timeout 5000 --require @babel/register --reporter progress ./test/*Test.js ./test/**/*Test.js ./test/**/**/*Test.js",
+    "test-browser": "npx karma start --reporters=dots --single-run",
+    "test-saucelabs": "npx karma start --reporters=\"dots,saucelabs\" --browsers=\"sl_chrome,sl_ie,sl_firefox,sl_ios_simulator\" --single-run=true",
     "test-ts-definitions": "tsc -p test/typescript_definitions",
-    "build-dist-es5": "./node_modules/.bin/babel src -d build/es5",
-    "build-dist": "./node_modules/.bin/webpack --progress --colors --bail && DIST_MIN=1 ./node_modules/.bin/webpack --progress --colors --bail",
+    "test-ci": "npm run build-dist && npm run test && npm run test-browser && npm run test-ts-definitions && npm run test-coverage",
+    "build-dist-es5": "npx babel src -d build/es5",
+    "build-dist": "npx webpack --progress --colors --bail && DIST_MIN=1 npx webpack --progress --colors --bail",
     "build-examples": "node ./utils/build_package.js -o examples/build/js-joda-locale -m node_modules -c utils/load_cldrData.prebuilt.js -l \"en.*\" de fr es zh hi ru",
     "build-prebuilt": "rm -rf dist/prebuilt/*;node utils/build_package.js --config build_package.prebuilt.json",
     "build_package": "node ./utils/build_package.js",
-    "build-all": "npm run build-dist-es5 && npm run build-dist && npm run build-examples && npm run build-prebuilt && npm run create-packages",
+    "build-locale-dist": "npm run build-dist-es5 && npm run build-dist && npm run build-examples && npm run build-prebuilt && npm run create-packages",
     "create-packages": "rm -rf packages/*;node utils/create_packages.js --config build_package.prebuilt.json",
-    "lint": "../../node_modules/.bin/eslint ."
+    "lint": "npx eslint ."
   },
   "keywords": [
     "date",
@@ -47,45 +48,18 @@
   },
   "homepage": "https://github.com/js-joda/js-joda-locale#readme",
   "peerDependencies": {
-    "cldr-data": "*",
-    "cldrjs": "^0.5.4",
     "@js-joda/core": ">=3.2.0",
-    "@js-joda/timezone": "^2.3.0"
+    "@js-joda/timezone": "^2.3.0",
+    "cldr-data": "*",
+    "cldrjs": "^0.5.4"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.7.4",
-    "@babel/polyfill": "^7.7.0",
-    "@babel/preset-env": "^7.7.4",
-    "@babel/register": "^7.7.4",
-    "@js-joda/core": ">=1.11.0",
-    "@js-joda/timezone": "^2.2.0",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-istanbul": "^5.2.0",
-    "chai": "^4.2.0",
+    "@js-joda/core": "^4.2.1",
+    "@js-joda/timezone": "^2.7.1",
     "cldr-data": "^36.0.0",
-    "cldrjs": "^0.5.1",
-    "coveralls": "^3.1.1",
-    "karma": "^4.4.1",
-    "karma-chai-plugins": "^0.9.0",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-firefox-launcher": "^1.2.0",
-    "karma-mocha": "^1.3.0",
-    "karma-phantomjs-launcher": "^1.0.4",
-    "karma-sauce-launcher": "^2.0.2",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-webpack": "^4.0.2",
-    "mocha": "^6.2.2",
-    "phantomjs-prebuilt": "^2.1.16",
-    "requirejs": "^2.3.6",
-    "requirejs-json": "0.0.3",
-    "requirejs-text": "^2.0.15",
-    "typescript": "^3.7.5",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10",
-    "yargs": "^15.0.2"
+    "cldrjs": "^0.5.5"
   },
   "cldr-data-coverage": "core",
-  "cldr-data-urls-filter": "(cldr-core|cldr-numbers-modern|cldr-dates-modern)"
+  "cldr-data-urls-filter": "(cldr-core|cldr-numbers-modern|cldr-dates-modern)",
+  "gitHead": "485c4b2be852563615e2d2a8c3f0bca22d86bcd4"
 }

package/src/_init.js

@@ -5,6 +5,7 @@
 
 import { _init as localeInit } from './Locale';
 import { _init as weekFieldsInit } from './temporal/WeekFields';
+import { _init as dateTimeFormatterInit } from './format/LocaleDateTimeFormatter';
 
 let isInit = false;
 
@@ -18,6 +19,7 @@ function init() {
 
     localeInit();
     weekFieldsInit();
+    dateTimeFormatterInit();
 }
 
 init();

package/src/format/LocaleDateTimeFormatter.js

@@ -3,9 +3,16 @@
  * @license BSD-3-Clause (see LICENSE.md in the root directory of this source tree)
  */
 
-import { _ as jodaInternal, DateTimeFormatter } from '@js-joda/core';
+import {
+    _ as jodaInternal,
+    DateTimeFormatter,
+    ChronoField,
+    ResolverStyle,
+    IsoChronology,
+} from '@js-joda/core';
 // eslint-disable-next-line no-unused-vars
 import Locale from '../Locale';
+import CldrDateTimeFormatterBuilder from './cldr/CldrDateTimeFormatterBuilder';
 
 const { assert: { requireNonNull } } = jodaInternal;
 
@@ -29,6 +36,55 @@ export default class LocaleDateTimeFormatter extends DateTimeFormatter {
         }
         return new DateTimeFormatter(this._printerParser, locale, this._decimalStyle, this._resolverStyle, this._resolverFields, this._chrono, this._zone);
     }
+}
+
+export function _init() {
+    const dow = {
+        1: 'Mon',
+        2: 'Tue',
+        3: 'Wed',
+        4: 'Thu',
+        5: 'Fri',
+        6: 'Sat',
+        7: 'Sun',
+    };
 
+    const moy = {
+        1: 'Jan',
+        2: 'Feb',
+        3: 'Mar',
+        4: 'Apr',
+        5: 'May',
+        6: 'Jun',
+        7: 'Jul',
+        8: 'Aug',
+        9: 'Sep',
+        10: 'Oct',
+        11: 'Nov',
+        12: 'Dec',
+    };
 
+    LocaleDateTimeFormatter.RFC_1123_DATE_TIME = new CldrDateTimeFormatterBuilder()
+        .parseCaseInsensitive()
+        .parseLenient()
+        .optionalStart()
+        .appendText(ChronoField.DAY_OF_WEEK, dow)
+        .appendLiteral(', ')
+        .optionalEnd()
+        .appendValue(ChronoField.DAY_OF_MONTH, 2)
+        .appendLiteral(' ')
+        .appendText(ChronoField.MONTH_OF_YEAR, moy)
+        .appendLiteral(' ')
+        .appendValue(ChronoField.YEAR, 4)  // 2 digit year not handled
+        .appendLiteral(' ')
+        .appendValue(ChronoField.HOUR_OF_DAY, 2)
+        .appendLiteral(':')
+        .appendValue(ChronoField.MINUTE_OF_HOUR, 2)
+        .optionalStart()
+        .appendLiteral(':')
+        .appendValue(ChronoField.SECOND_OF_MINUTE, 2)
+        .optionalEnd()
+        .appendLiteral(' ')
+        .appendZoneId()
+        .toFormatter(ResolverStyle.SMART).withChronology(IsoChronology.INSTANCE);
 }

package/src/format/LocaleStore.js

@@ -5,6 +5,8 @@
 
 
 /**
+ * @private
+ *
  * Helper method to create an immutable entry.
  *
  * @param text  the text, not null
@@ -16,7 +18,7 @@ export const createEntry = (text, field) => {
         key: text,
         value: field,
         toString: function () {
-            return text + '->' + field;
+            return `${text}->${field}`;
         }
     };
 };
@@ -49,7 +51,7 @@ export class LocaleStore {
             Object.keys(valueTextMap[style]).forEach((key) => {
                 const value = valueTextMap[style][key];
                 if (reverse[value] === undefined) {
-                    reverse[value] = createEntry(value, Number.parseInt(key));
+                    reverse[value] = createEntry(value, parseInt(key));
                     list.push(reverse[value]);
                 }
             });

package/src/format/cldr/CldrCache.js

@@ -8,6 +8,8 @@ import Cldr from 'cldrjs';
 
 const cldrDataLoaded = new Set();
 /**
+ * @private
+ *
 * Loads the Cldr data for the given path if it hasn't been loaded before.
 */
 export const loadCldrData = (path) => {
@@ -19,6 +21,8 @@ export const loadCldrData = (path) => {
 
 const localeToCldrInstanceCache = {};
 /**
+ * @private
+ *
 * Returns a Cldr instance for the given locale.
 * Memoized, so a given locale will always return the exact same cldr instance.
 */
@@ -32,6 +36,8 @@ export const getOrCreateCldrInstance = (locale) => {
 
 const localeToMapZonesCache = {};
 /**
+ * @private
+ *
 * Returns a map zones object for a Cldr instance.
 * Memoized, so for any given Cldr instance locale, the same object will be returned.
 */

package/src/format/cldr/CldrDateTimeFormatterBuilder.js

@@ -16,7 +16,7 @@ import {
 import TextPrinterParser from '../parser/TextPrinterParser';
 import CldrDateTimeTextProvider from './CldrDateTimeTextProvider';
 import CldrZoneTextPrinterParser from './CldrZoneTextPrinterParser';
-import {LocaleStore} from '../LocaleStore';
+import { LocaleStore } from '../LocaleStore';
 import LocalizedOffsetPrinterParser from '../parser/LocalizedOffsetPrinterParser';
 import WeekFieldsPrinterParser from '../parser/WeekFieldsPrinterParser';
 

package/src/format/cldr/CldrDateTimeTextProvider.js

@@ -7,8 +7,8 @@ import { ChronoField, IsoFields, TextStyle } from '@js-joda/core';
 
 import cldrData from 'cldr-data';
 
-import {LocaleStore, createEntry} from '../LocaleStore';
-import {getOrCreateCldrInstance, loadCldrData} from './CldrCache';
+import { LocaleStore, createEntry } from '../LocaleStore';
+import { getOrCreateCldrInstance, loadCldrData } from './CldrCache';
 
 /**
  * The Service Provider Implementation to obtain date-time text for a field.

package/src/format/cldr/CldrZoneTextPrinterParser.js

@@ -12,7 +12,7 @@ import {
     ZoneRulesProvider,
 } from '@js-joda/core';
 
-import {getOrCreateCldrInstance, getOrCreateMapZones, loadCldrData} from './CldrCache';
+import { getOrCreateCldrInstance, getOrCreateMapZones, loadCldrData } from './CldrCache';
 
 const { assert: { requireNonNull, requireInstance } } = jodaInternal;
 
@@ -27,7 +27,7 @@ const LENGTH_COMPARATOR = (str1, str2) => {
 
 /**
  * Cache for `_cachedResolveZoneIdText`.
- * 
+ *
  * Its basic structure is:
  * Obj { locale: zoneId }
  * Obj { zoneId: style}
@@ -46,6 +46,7 @@ export default class CldrZoneTextPrinterParser {
         requireNonNull(textStyle, 'textStyle');
         requireInstance(textStyle, TextStyle, 'textStyle');
         this._textStyle = textStyle;
+        this._zoneIdsLocales = {};
         loadCldrData('supplemental/likelySubtags.json');
         loadCldrData('supplemental/metaZones.json');
     }
@@ -153,10 +154,13 @@ export default class CldrZoneTextPrinterParser {
         return true;
     }
 
-    parse(context, text, position) {
+    _resolveZoneIds(localString) {
+        if(this._zoneIdsLocales[localString] != null) {
+            return this._zoneIdsLocales[localString];
+        }
         const ids = {};
-        loadCldrData(`main/${context.locale().localeString()}/timeZoneNames.json`);
-        const cldr = getOrCreateCldrInstance(context.locale().localeString());
+        loadCldrData(`main/${localString}/timeZoneNames.json`);
+        const cldr = getOrCreateCldrInstance(localString);
 
         for (const id of ZoneRulesProvider.getAvailableZoneIds()) {
             ids[id] = id;
@@ -177,6 +181,20 @@ export default class CldrZoneTextPrinterParser {
         }
         // threeten is using a (sorted) TreeMap... so we need to sort the keys
         const sortedKeys = Object.keys(ids).sort(LENGTH_COMPARATOR);
+
+        this._zoneIdsLocales[localString] = { ids, sortedKeys };
+        return this._zoneIdsLocales[localString];
+    }
+
+    // That's a very poor implementation, there are missing bug fixes and functionality from threeten and jdk
+    parse(context, text, position) {
+        for (const name of ['UTC', 'GMT']) {
+            if (context.subSequenceEquals(text, position, name, 0, name.length)) {
+                context.setParsedZone(ZoneId.of(name));
+                return position + name.length;
+            }
+        }
+        const { ids, sortedKeys } = this._resolveZoneIds(context.locale().localeString());
         for (const name of sortedKeys) {
             if (context.subSequenceEquals(text, position, name, 0, name.length)) {
                 context.setParsedZone(ZoneId.of(ids[name]));

package/src/plug.js

@@ -11,6 +11,8 @@ import LocaleDateTimeFormatter from './format/LocaleDateTimeFormatter';
 import './_init';
 
 /**
+ * @private
+ *
  * plugin Function, call using js-jodas use()
  *
  * @param jsJoda
@@ -28,4 +30,6 @@ export default function (jsJoda) {
             jsJoda.DateTimeFormatter.prototype[prop] = LocaleDateTimeFormatter.prototype[prop];
         }
     });
+    // copy statics manually
+    jsJoda.DateTimeFormatter.RFC_1123_DATE_TIME = LocaleDateTimeFormatter.RFC_1123_DATE_TIME;
 }

package/src/temporal/WeekFields.js

@@ -480,7 +480,7 @@ export class ComputedDayOfField {
 
     //-----------------------------------------------------------------------
     toString() {
-        return this._name + '[' + this._weekDef.toString() + ']';
+        return `${this._name}[${this._weekDef.toString()}]`;
     }
 }
 
@@ -946,7 +946,7 @@ export class WeekFields {
      * @return the string representation, not null
      */
     toString() {
-        return 'WeekFields[' + this._firstDayOfWeek + ',' + this._minimalDays + ']';
+        return `WeekFields[${this._firstDayOfWeek},${this._minimalDays}]`;
     }
 
 }

package/utils/load_cldrData.prebuilt.js

@@ -1,3 +1,6 @@
+/* eslint-disable */
+// we must use es5 compatible code in this post install file
+
 /*
  * @copyright (c) 2018, Philipp Thuerwaechter & Pattrick Hueper
  * @license BSD-3-Clause (see LICENSE.md in the root directory of this source tree)
@@ -11,5 +14,5 @@
  * that cldr-data is installed in parallel!
  */
 module.exports = function (cldrPath) {
-    return require('../node_modules/cldr-data/' + cldrPath);
+    return require('../node_modules/cldr-data/'.concat(cldrPath));
 };

package/utils/load_cldrData.postinstall.js

@@ -1,15 +0,0 @@
-/*
- * @copyright (c) 2017, Philipp Thuerwaechter & Pattrick Hueper
- * @license BSD-3-Clause (see LICENSE.md in the root directory of this source tree)
- */
-
-/* since the npm cldrData load is using `fs` and other modules not available in browser,
- * we define our own cldrData "load" function that just `requires` a cldr-data file
- */
-
-/* NOTE: the path is relative to the installed js-joda-locale package and assuming,
- * that cldr-data is installed in parallel!
- */
-module.exports = function (cldrPath) {
-    return require('../../cldr-data/' + cldrPath);
-};