@ui5/webcomponents-localization 1.13.0-rc.0 → 1.13.0-rc.2

package/dist/sap/ui/core/LocaleData.js

@@ -6,6 +6,16 @@ import Locale from './Locale.js';
 import assert from '../../base/assert.js';
 import LoaderExtensions from '../../base/util/LoaderExtensions.js';
 import Configuration from './Configuration.js';
+var rEIgnoreCase = /e/i, mLegacyUnit2CurrentUnit = {
+        'acceleration-meter-per-second-squared': 'acceleration-meter-per-square-second',
+        'concentr-milligram-per-deciliter': 'concentr-milligram-ofglucose-per-deciliter',
+        'concentr-part-per-million': 'concentr-permillion',
+        'consumption-liter-per-100kilometers': 'consumption-liter-per-100-kilometer',
+        'pressure-millimeter-of-mercury': 'pressure-millimeter-ofhg',
+        'pressure-pound-per-square-inch': 'pressure-pound-force-per-square-inch',
+        'pressure-inch-hg': 'pressure-inch-ofhg',
+        'torque-pound-foot': 'torque-pound-force-foot'
+    }, rNumberInScientificNotation = /^([+-]?)((\d+)(?:\.(\d+))?)[eE]([+-]?\d+)$/, rTrailingZeroes = /0+$/;
 var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
     constructor: function (oLocale) {
         this.oLocale = oLocale;
@@ -642,11 +652,14 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
                     oTimeEntry = oScale[sEntry];
                     iSign = sEntry.substr(18) === 'past' ? -1 : 1;
                     aPluralCategories.forEach(function (sKey) {
-                        aPatterns.push({
-                            scale: sScale,
-                            sign: iSign,
-                            pattern: oTimeEntry['relativeTimePattern-count-' + sKey]
-                        });
+                        var sPattern = oTimeEntry['relativeTimePattern-count-' + sKey];
+                        if (sPattern) {
+                            aPatterns.push({
+                                scale: sScale,
+                                sign: iSign,
+                                pattern: sPattern
+                            });
+                        }
                     });
                 }
             }
@@ -769,7 +782,11 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
         return this.getUnitFormat(sUnit);
     },
     getUnitFormat: function (sUnit) {
-        return this._get('units', 'short', sUnit);
+        var oResult = this._get('units', 'short', sUnit);
+        if (!oResult && mLegacyUnit2CurrentUnit[sUnit]) {
+            oResult = this._get('units', 'short', mLegacyUnit2CurrentUnit[sUnit]);
+        }
+        return oResult;
     },
     getUnitFormats: function () {
         return this._getMerged('units', 'short');
@@ -801,7 +818,7 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
         return this.oLocale.getLanguage() === 'en' && this.oLocale.getRegion() === 'US';
     },
     getPreferredCalendarType: function () {
-        var sCalendarPreference = this._get('calendarPreference'), aCalendars = sCalendarPreference ? sCalendarPreference.split(' ') : [], sCalendarName, sType, i;
+        var sCalendarName, sType, i, aCalendars = this._get('calendarPreference') || [];
         for (i = 0; i < aCalendars.length; i++) {
             sCalendarName = aCalendars[i].split('-')[0];
             for (sType in CalendarType) {
@@ -834,14 +851,14 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
                 fnTest = this._parsePluralRule(oPlurals[sCategory]);
                 this._pluralTest[sCategory] = fnTest;
             }
-            if (fnTest(sNumber)) {
+            if (fnTest(sNumber).bMatch) {
                 return sCategory;
             }
         }
         return 'other';
     },
     _parsePluralRule: function (sRule) {
-        var OP_OR = 'or', OP_AND = 'and', OP_MOD = '%', OP_EQ = '=', OP_NEQ = '!=', OPD_N = 'n', OPD_I = 'i', OPD_F = 'f', OPD_T = 't', OPD_V = 'v', OPD_W = 'w', RANGE = '..', SEP = ',';
+        var OP_OR = 'or', OP_AND = 'and', OP_MOD = '%', OP_EQ = '=', OP_NEQ = '!=', OPD_N = 'n', OPD_I = 'i', OPD_F = 'f', OPD_T = 't', OPD_V = 'v', OPD_W = 'w', OPD_C = 'c', OPD_E = 'e', RANGE = '..', SEP = ',';
         var i = 0, aTokens;
         aTokens = sRule.split(' ');
         function accept(sToken) {
@@ -935,6 +952,14 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
                 return function (o) {
                     return o.w;
                 };
+            } else if (accept(OPD_C)) {
+                return function (o) {
+                    return o.c;
+                };
+            } else if (accept(OPD_E)) {
+                return function (o) {
+                    return o.c;
+                };
             } else {
                 throw new Error('Unknown operand: ' + consume());
             }
@@ -962,28 +987,57 @@ var LocaleData = BaseObject.extend('sap.ui.core.LocaleData', {
             throw new Error('Not completely parsed');
         }
         return function (sValue) {
-            var iDotPos = sValue.indexOf('.'), sDecimal, sFraction, sFractionNoZeros, o;
+            var iDotPos, iExponent, sFraction, sFractionNoZeros, sInteger, o, iExponentPos = sValue.search(rEIgnoreCase);
+            iExponent = iExponentPos < 0 ? 0 : parseInt(sValue.slice(iExponentPos + 1));
+            sValue = LocaleData.convertToDecimal(sValue);
+            iDotPos = sValue.indexOf('.');
             if (iDotPos === -1) {
-                sDecimal = sValue;
+                sInteger = sValue;
                 sFraction = '';
                 sFractionNoZeros = '';
             } else {
-                sDecimal = sValue.substr(0, iDotPos);
-                sFraction = sValue.substr(iDotPos + 1);
-                sFractionNoZeros = sFraction.replace(/0+$/, '');
+                sInteger = sValue.slice(0, iDotPos);
+                sFraction = sValue.slice(iDotPos + 1);
+                sFractionNoZeros = sFraction.replace(rTrailingZeroes, '');
             }
             o = {
                 n: parseFloat(sValue),
-                i: parseInt(sDecimal),
+                i: parseInt(sInteger),
                 v: sFraction.length,
                 w: sFractionNoZeros.length,
-                f: parseInt(sFraction),
-                t: parseInt(sFractionNoZeros)
+                f: sFraction === '' ? 0 : parseInt(sFraction),
+                t: sFractionNoZeros === '' ? 0 : parseInt(sFractionNoZeros),
+                c: iExponent
+            };
+            return {
+                bMatch: fnOr(o),
+                oOperands: o
             };
-            return fnOr(o);
         };
     }
 });
+LocaleData.convertToDecimal = function (vValue) {
+    var iIntegerLength, iExponent, iFractionLength, bNegative, iNewIntegerLength, aResult, sValue = String(vValue);
+    if (!sValue.includes('e') && !sValue.includes('E')) {
+        return sValue;
+    }
+    aResult = sValue.match(rNumberInScientificNotation);
+    bNegative = aResult[1] === '-';
+    sValue = aResult[2].replace('.', '');
+    iIntegerLength = aResult[3] ? aResult[3].length : 0;
+    iFractionLength = aResult[4] ? aResult[4].length : 0;
+    iExponent = parseInt(aResult[5]);
+    iNewIntegerLength = iIntegerLength + iExponent;
+    if (iExponent > 0) {
+        sValue = iExponent < iFractionLength ? sValue.slice(0, iNewIntegerLength) + '.' + sValue.slice(iNewIntegerLength) : sValue = sValue.padEnd(iNewIntegerLength, '0');
+    } else {
+        sValue = -iExponent < iIntegerLength ? sValue = sValue.slice(0, iNewIntegerLength) + '.' + sValue.slice(iNewIntegerLength) : sValue = '0.' + sValue.padStart(iFractionLength - iExponent, '0');
+    }
+    if (bNegative) {
+        sValue = '-' + sValue;
+    }
+    return sValue;
+};
 var mCLDRSymbolGroups = {
     'Era': {
         field: 'era',
@@ -1267,7 +1321,7 @@ function getData(oLocale) {
                     obj[name] = fallbackValue;
                 } else if (value === null) {
                     delete obj[name];
-                } else if (typeof value === 'object' && typeof fallbackValue === 'object') {
+                } else if (typeof value === 'object' && typeof fallbackValue === 'object' && !Array.isArray(value)) {
                     merge(value, fallbackValue);
                 }
             }

package/dist/sap/ui/core/date/UI5Date.js

@@ -0,0 +1,305 @@
+import Configuration from '../Configuration.js';
+import TimezoneUtil from '../format/TimezoneUtil.js';
+var aAllParts = [
+        'year',
+        'month',
+        'day',
+        'hour',
+        'minute',
+        'second',
+        'fractionalSecond'
+    ], rIsUTCString = /Z|GMT|:.*[\+|\-]|^([\+|\-]\d{2})?\d{4}(-\d{2}){0,2}$/, aWeekday = [
+        'Sun',
+        'Mon',
+        'Tue',
+        'Wed',
+        'Thu',
+        'Fri',
+        'Sat'
+    ], aMonths = [
+        'Jan',
+        'Feb',
+        'Mar',
+        'Apr',
+        'May',
+        'Jun',
+        'Jul',
+        'Aug',
+        'Sep',
+        'Oct',
+        'Nov',
+        'Dec'
+    ], mWeekdayToDay = {
+        Sun: 0,
+        Mon: 1,
+        Tue: 2,
+        Wed: 3,
+        Thu: 4,
+        Fri: 5,
+        Sat: 6
+    };
+function addLeadingZeros(iValue, iLength) {
+    return (iValue < 0 ? '-' : '') + Math.abs(iValue).toString().padStart(iLength, '0');
+}
+function UI5Date(vDateParts, sTimezoneID) {
+    var oDateInstance = UI5Date._createDateInstance(vDateParts);
+    Object.defineProperties(this, {
+        sTimezoneID: { value: sTimezoneID },
+        oDate: {
+            value: oDateInstance,
+            writable: true
+        },
+        oDateParts: {
+            value: undefined,
+            writable: true
+        }
+    });
+    if (isNaN(oDateInstance)) {
+        return;
+    }
+    if (vDateParts.length > 1 || vDateParts.length === 1 && typeof vDateParts[0] === 'string' && !rIsUTCString.test(vDateParts[0])) {
+        this._setParts(aAllParts, [
+            oDateInstance.getFullYear(),
+            oDateInstance.getMonth(),
+            oDateInstance.getDate(),
+            oDateInstance.getHours(),
+            oDateInstance.getMinutes(),
+            oDateInstance.getSeconds(),
+            oDateInstance.getMilliseconds()
+        ]);
+    }
+}
+UI5Date.prototype = Object.create(Date.prototype, { constructor: { value: Date } });
+UI5Date.prototype[Symbol.toStringTag] = 'Date';
+UI5Date.prototype._getPart = function (sPart) {
+    var iResult;
+    if (isNaN(this.oDate)) {
+        return NaN;
+    }
+    this.oDateParts = this.oDateParts || TimezoneUtil._getParts(this.oDate, this.sTimezoneID);
+    if (sPart === 'weekday') {
+        return mWeekdayToDay[this.oDateParts.weekday];
+    }
+    iResult = parseInt(this.oDateParts[sPart]);
+    if (sPart === 'month') {
+        iResult -= 1;
+    } else if (sPart === 'year') {
+        if (this.oDateParts.era === 'B') {
+            iResult = 1 - iResult;
+        }
+    }
+    return iResult;
+};
+UI5Date.prototype._setParts = function (aParts, aValues) {
+    var i, oCurrentDateParts, oNewDateAsUTCTimestamp, iNewTimestamp, sPart, vValue, oDateParts = {}, iMaxLength = Math.min(aParts.length, aValues.length);
+    if (iMaxLength === 0) {
+        return this.setTime(NaN);
+    }
+    for (i = 0; i < iMaxLength; i += 1) {
+        vValue = parseInt(+aValues[i]);
+        sPart = aParts[i];
+        if (isNaN(vValue)) {
+            return this.setTime(NaN);
+        }
+        if (sPart === 'month') {
+            vValue += 1;
+        } else if (sPart === 'year') {
+            if (vValue <= 0) {
+                vValue = 1 - vValue;
+                oDateParts.era = 'B';
+            } else {
+                oDateParts.era = 'A';
+            }
+        }
+        oDateParts[sPart] = vValue.toString();
+    }
+    if (this.oDateParts) {
+        oCurrentDateParts = this.oDateParts;
+    } else if (isNaN(this.oDate)) {
+        oCurrentDateParts = {
+            day: '1',
+            fractionalSecond: '0',
+            hour: '0',
+            minute: '0',
+            month: '1',
+            second: '0'
+        };
+    } else {
+        oCurrentDateParts = TimezoneUtil._getParts(this.oDate, this.sTimezoneID);
+    }
+    oDateParts = Object.assign({}, oCurrentDateParts, oDateParts);
+    oNewDateAsUTCTimestamp = TimezoneUtil._getDateFromParts(oDateParts);
+    if (isNaN(oNewDateAsUTCTimestamp)) {
+        return this.setTime(NaN);
+    }
+    iNewTimestamp = oNewDateAsUTCTimestamp.getTime() + TimezoneUtil.calculateOffset(oNewDateAsUTCTimestamp, this.sTimezoneID) * 1000;
+    return this.setTime(iNewTimestamp);
+};
+UI5Date.prototype.clone = function () {
+    return UI5Date.getInstance(this);
+};
+UI5Date.prototype.getDate = function () {
+    return this._getPart('day');
+};
+UI5Date.prototype.getDay = function () {
+    return this._getPart('weekday');
+};
+UI5Date.prototype.getFullYear = function () {
+    return this._getPart('year');
+};
+UI5Date.prototype.getHours = function () {
+    return this._getPart('hour');
+};
+UI5Date.prototype.getMilliseconds = function () {
+    return this._getPart('fractionalSecond');
+};
+UI5Date.prototype.getMinutes = function () {
+    return this._getPart('minute');
+};
+UI5Date.prototype.getMonth = function () {
+    return this._getPart('month');
+};
+UI5Date.prototype.getSeconds = function () {
+    return this._getPart('second');
+};
+UI5Date.prototype.getTimezoneOffset = function () {
+    return TimezoneUtil.calculateOffset(this.oDate, this.sTimezoneID) / 60;
+};
+UI5Date.prototype.getYear = function () {
+    return this._getPart('year') - 1900;
+};
+UI5Date.prototype.setDate = function (iDay) {
+    return this._setParts(['day'], arguments);
+};
+UI5Date.prototype.setFullYear = function (iYear, iMonth, iDay) {
+    return this._setParts([
+        'year',
+        'month',
+        'day'
+    ], arguments);
+};
+UI5Date.prototype.setHours = function (iHours, iMinutes, iSeconds, iMilliseconds) {
+    return this._setParts([
+        'hour',
+        'minute',
+        'second',
+        'fractionalSecond'
+    ], arguments);
+};
+UI5Date.prototype.setMilliseconds = function (iMilliseconds) {
+    return this._setParts(['fractionalSecond'], arguments);
+};
+UI5Date.prototype.setMinutes = function (iMinutes, iSeconds, iMilliseconds) {
+    return this._setParts([
+        'minute',
+        'second',
+        'fractionalSecond'
+    ], arguments);
+};
+UI5Date.prototype.setMonth = function (iMonth, iDay) {
+    return this._setParts([
+        'month',
+        'day'
+    ], arguments);
+};
+UI5Date.prototype.setSeconds = function (iSeconds, iMilliseconds) {
+    return this._setParts([
+        'second',
+        'fractionalSecond'
+    ], arguments);
+};
+UI5Date.prototype.setTime = function (iTime) {
+    this.oDateParts = undefined;
+    return this.oDate.setTime(iTime);
+};
+UI5Date.prototype.setYear = function (iYear) {
+    return this._setParts(['year'], [parseInt(iYear) + 1900]);
+};
+UI5Date.prototype.toDateString = function () {
+    if (isNaN(this.oDate)) {
+        return this.oDate.toDateString();
+    }
+    return aWeekday[this.getDay()] + ' ' + aMonths[this.getMonth()] + ' ' + addLeadingZeros(this.getDate(), 2) + ' ' + addLeadingZeros(this.getFullYear(), 4);
+};
+UI5Date.prototype.toString = function () {
+    if (isNaN(this.oDate)) {
+        return this.oDate.toString();
+    }
+    return this.toDateString() + ' ' + this.toTimeString();
+};
+UI5Date.prototype.toTimeString = function () {
+    var iHours, iMinutes, sSign, iTimeZoneOffset;
+    if (isNaN(this.oDate)) {
+        return this.oDate.toTimeString();
+    }
+    iTimeZoneOffset = this.getTimezoneOffset();
+    sSign = iTimeZoneOffset > 0 ? '-' : '+';
+    iHours = Math.floor(Math.abs(iTimeZoneOffset) / 60);
+    iMinutes = Math.abs(iTimeZoneOffset) % 60;
+    return addLeadingZeros(this.getHours(), 2) + ':' + addLeadingZeros(this.getMinutes(), 2) + ':' + addLeadingZeros(this.getSeconds(), 2) + ' GMT' + sSign + addLeadingZeros(iHours, 2) + addLeadingZeros(iMinutes, 2);
+};
+[
+    'getTime',
+    'getUTCDate',
+    'getUTCDay',
+    'getUTCFullYear',
+    'getUTCHours',
+    'getUTCMilliseconds',
+    'getUTCMinutes',
+    'getUTCMonth',
+    'getUTCSeconds',
+    'toGMTString',
+    'toISOString',
+    'toJSON',
+    'toUTCString',
+    'valueOf'
+].forEach(function (sMethod) {
+    UI5Date.prototype[sMethod] = function () {
+        return this.oDate[sMethod].apply(this.oDate, arguments);
+    };
+});
+[
+    'toLocaleDateString',
+    'toLocaleString',
+    'toLocaleTimeString'
+].forEach(function (sMethod) {
+    UI5Date.prototype[sMethod] = function (sLocale, oOptions) {
+        return this.oDate[sMethod](sLocale || Configuration.getLanguageTag(), Object.assign({ timeZone: this.sTimezoneID }, oOptions));
+    };
+});
+[
+    'setUTCDate',
+    'setUTCFullYear',
+    'setUTCHours',
+    'setUTCMilliseconds',
+    'setUTCMinutes',
+    'setUTCMonth',
+    'setUTCSeconds'
+].forEach(function (sMethod) {
+    UI5Date.prototype[sMethod] = function () {
+        this.oDateParts = undefined;
+        return this.oDate[sMethod].apply(this.oDate, arguments);
+    };
+});
+UI5Date._createDateInstance = function (vParts) {
+    if (vParts[0] instanceof Date) {
+        vParts[0] = vParts[0].valueOf();
+    }
+    return new (Function.prototype.bind.apply(Date, [].concat.apply([null], vParts)))();
+};
+UI5Date.getInstance = function () {
+    var sTimezone = Configuration.getTimezone();
+    if (sTimezone !== TimezoneUtil.getLocalTimezone()) {
+        return new UI5Date(arguments, sTimezone);
+    }
+    return UI5Date._createDateInstance(arguments);
+};
+UI5Date.checkDate = function (oDate) {
+    if (isNaN(oDate.getTime())) {
+        throw new Error('The given Date is not valid');
+    }
+    if (!(oDate instanceof UI5Date) && Configuration.getTimezone() !== TimezoneUtil.getLocalTimezone()) {
+        throw new Error('Configured time zone requires the parameter \'oDate\' to be an instance of' + ' sap.ui.core.date.UI5Date');
+    }
+};
+export default UI5Date;

package/dist/sap/ui/core/date/UniversalDate.js

@@ -1,10 +1,10 @@
 import BaseObject from '../../base/Object.js';
 import Configuration from '../Configuration.js';
-import Locale from '../Locale.js';
 import LocaleData from '../LocaleData.js';
 import _Calendars from './_Calendars.js';
 import CalendarUtils from './CalendarUtils.js';
 import CalendarWeekNumbering from './CalendarWeekNumbering.js';
+import UI5Date from './UI5Date.js';
 var UniversalDate = BaseObject.extend('sap.ui.core.date.UniversalDate', {
     constructor: function () {
         var clDate = UniversalDate.getClass();
@@ -19,6 +19,9 @@ UniversalDate.now = function () {
     return Date.now();
 };
 UniversalDate.prototype.createDate = function (clDate, aArgs) {
+    if (clDate === Date) {
+        return UI5Date.getInstance.apply(null, aArgs);
+    }
     switch (aArgs.length) {
     case 0:
         return new clDate();
@@ -42,10 +45,8 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
     var clDate, oInstance;
     if (oDate instanceof UniversalDate) {
         oDate = oDate.getJSDate();
-    } else if (!oDate) {
-        oDate = new Date();
     }
-    if (isNaN(oDate.getTime())) {
+    if (oDate && isNaN(oDate.getTime())) {
         throw new Error('The given date object is invalid');
     }
     if (!sCalendarType) {
@@ -53,7 +54,7 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
     }
     clDate = UniversalDate.getClass(sCalendarType);
     oInstance = Object.create(clDate.prototype);
-    oInstance.oDate = oDate;
+    oInstance.oDate = oDate ? UI5Date.getInstance(oDate) : UI5Date.getInstance();
     oInstance.sCalendarType = sCalendarType;
     return oInstance;
 };
@@ -288,7 +289,7 @@ UniversalDate.getEraByDate = function (sCalendarType, iYear, iMonth, iDay) {
     }
 };
 UniversalDate.getCurrentEra = function (sCalendarType) {
-    var oNow = new Date();
+    var oNow = UI5Date.getInstance();
     return this.getEraByDate(sCalendarType, oNow.getFullYear(), oNow.getMonth(), oNow.getDate());
 };
 UniversalDate.getEraStartDate = function (sCalendarType, iEra) {