@ui5/webcomponents-localization 0.0.0-2c7615fe9 → 0.0.0-2f7664755

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

@@ -117,11 +117,5 @@ Buddhist.prototype.setUTCFullYear = function (iYear, iMonth, iDay) {
     }
     return this._setUTCBuddhist(oBuddhist);
 };
-Buddhist.prototype.getWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getFullYear(), this.getMonth(), this.getDate());
-};
-Buddhist.prototype.getUTCWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate());
-};
 _Calendars.set(CalendarType.Buddhist, Buddhist);
 export default Buddhist;

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

@@ -0,0 +1,36 @@
+import CalendarWeekNumbering from './CalendarWeekNumbering.js';
+import Configuration from '../Configuration.js';
+import LocaleData from '../LocaleData.js';
+var mWeekNumberingConfiguration = {
+    ISO_8601: {
+        firstDayOfWeek: 1,
+        minimalDaysInFirstWeek: 4
+    },
+    MiddleEastern: {
+        firstDayOfWeek: 6,
+        minimalDaysInFirstWeek: 1
+    },
+    WesternTraditional: {
+        firstDayOfWeek: 0,
+        minimalDaysInFirstWeek: 1
+    }
+};
+var CalendarUtils = {
+    getWeekConfigurationValues: function (sCalendarWeekNumbering, oLocale) {
+        var oLocaleData;
+        if (mWeekNumberingConfiguration.hasOwnProperty(sCalendarWeekNumbering)) {
+            return mWeekNumberingConfiguration[sCalendarWeekNumbering];
+        }
+        sCalendarWeekNumbering = sCalendarWeekNumbering || CalendarWeekNumbering.Default;
+        if (sCalendarWeekNumbering === CalendarWeekNumbering.Default) {
+            oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+            oLocaleData = LocaleData.getInstance(oLocale);
+            return {
+                firstDayOfWeek: oLocaleData.getFirstDayOfWeek(),
+                minimalDaysInFirstWeek: oLocaleData.getMinimalDaysInFirstWeek()
+            };
+        }
+        return undefined;
+    }
+};
+export default CalendarUtils;

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

@@ -0,0 +1,7 @@
+var CalendarWeekNumbering = {
+  Default: "Default",
+  ISO_8601: "ISO_8601",
+  MiddleEastern: "MiddleEastern",
+  WesternTraditional: "WesternTraditional"
+};
+export default CalendarWeekNumbering;

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

@@ -1,8 +1,8 @@
-import Core from '../Core.js';
 import UniversalDate from './UniversalDate.js';
 import CalendarType from '../CalendarType.js';
 import Log from '../../../base/Log.js';
 import _Calendars from './_Calendars.js';
+import Configuration from '../Configuration.js';
 var Islamic = UniversalDate.extend('sap.ui.core.date.Islamic', {
     constructor: function () {
         var aArgs = arguments;
@@ -102,9 +102,9 @@ function toGregorianArguments(aArgs) {
 function initCustomizationMap() {
     var sDateFormat, oCustomizationJSON;
     oCustomizationMap = {};
-    sDateFormat = Core.getConfiguration().getFormatSettings().getLegacyDateFormat();
+    sDateFormat = Configuration.getFormatSettings().getLegacyDateFormat();
     sDateFormat = _isSupportedIslamicCalendarType(sDateFormat) ? sDateFormat : 'A';
-    oCustomizationJSON = Core.getConfiguration().getFormatSettings().getLegacyDateCalendarCustomizing();
+    oCustomizationJSON = Configuration.getFormatSettings().getLegacyDateCalendarCustomizing();
     oCustomizationJSON = oCustomizationJSON || [];
     if (!oCustomizationJSON.length) {
         Log.warning('No calendar customizations.');

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

@@ -152,11 +152,11 @@ Japanese.prototype.setUTCEra = function (iEra, iYear, iMonth, iDay) {
     }
     return this._setUTCJapanese(oJapanese);
 };
-Japanese.prototype.getWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getFullYear(), this.getMonth(), this.getDate());
+Japanese.prototype.getWeek = function (oLocale, vCalendarWeekNumbering) {
+    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getFullYear(), this.getMonth(), this.getDate(), oLocale, vCalendarWeekNumbering);
 };
-Japanese.prototype.getUTCWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate());
+Japanese.prototype.getUTCWeek = function (oLocale, vCalendarWeekNumbering) {
+    return UniversalDate.getWeekByDate(this.sCalendarType, this.oDate.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate(), oLocale, vCalendarWeekNumbering);
 };
 _Calendars.set(CalendarType.Japanese, Japanese);
 export default Japanese;

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

@@ -1,7 +1,10 @@
-import Core from '../Core.js';
 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';
 var UniversalDate = BaseObject.extend('sap.ui.core.date.UniversalDate', {
     constructor: function () {
         var clDate = UniversalDate.getClass();
@@ -42,8 +45,11 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
     } else if (!oDate) {
         oDate = new Date();
     }
+    if (isNaN(oDate.getTime())) {
+        throw new Error('The given date object is invalid');
+    }
     if (!sCalendarType) {
-        sCalendarType = Core.getConfiguration().getCalendarType();
+        sCalendarType = Configuration.getCalendarType();
     }
     clDate = UniversalDate.getClass(sCalendarType);
     oInstance = Object.create(clDate.prototype);
@@ -53,7 +59,7 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
 };
 UniversalDate.getClass = function (sCalendarType) {
     if (!sCalendarType) {
-        sCalendarType = Core.getConfiguration().getCalendarType();
+        sCalendarType = Configuration.getCalendarType();
     }
     return _Calendars.get(sCalendarType);
 };
@@ -116,18 +122,22 @@ UniversalDate.prototype.getUTCEra = function () {
 };
 UniversalDate.prototype.setUTCEra = function (iEra) {
 };
-UniversalDate.prototype.getWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.getFullYear(), this.getMonth(), this.getDate());
+UniversalDate.prototype.getWeek = function (oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    return UniversalDate.getWeekByDate(this.sCalendarType, this.getFullYear(), this.getMonth(), this.getDate(), oLocale, vCalendarWeekNumbering);
 };
-UniversalDate.prototype.setWeek = function (oWeek) {
-    var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week);
+UniversalDate.prototype.setWeek = function (oWeek, oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week, oLocale, vCalendarWeekNumbering);
     this.setFullYear(oDate.year, oDate.month, oDate.day);
 };
-UniversalDate.prototype.getUTCWeek = function () {
-    return UniversalDate.getWeekByDate(this.sCalendarType, this.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate());
+UniversalDate.prototype.getUTCWeek = function (oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    return UniversalDate.getWeekByDate(this.sCalendarType, this.getUTCFullYear(), this.getUTCMonth(), this.getUTCDate(), oLocale, vCalendarWeekNumbering);
 };
-UniversalDate.prototype.setUTCWeek = function (oWeek) {
-    var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week);
+UniversalDate.prototype.setUTCWeek = function (oWeek, oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    var oDate = UniversalDate.getFirstDateOfWeek(this.sCalendarType, oWeek.year || this.getFullYear(), oWeek.week, oLocale, vCalendarWeekNumbering);
     this.setUTCFullYear(oDate.year, oDate.month, oDate.day);
 };
 UniversalDate.prototype.getQuarter = function () {
@@ -161,15 +171,21 @@ UniversalDate.prototype.getTimezoneLong = function () {
     }
 };
 var iMillisecondsInWeek = 7 * 24 * 60 * 60 * 1000;
-UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(clDate.UTC(iYear, iMonth, iDay)), iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
-    if (oLocale.getRegion() === 'US') {
+UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay, oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+    var clDate = this.getClass(sCalendarType);
+    var oFirstDay = getFirstDayOfFirstWeek(clDate, iYear, oLocale, vCalendarWeekNumbering);
+    var oDate = new clDate(clDate.UTC(iYear, iMonth, iDay));
+    var iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
+    var bSplitWeek = isSplitWeek(vCalendarWeekNumbering, oLocale);
+    if (bSplitWeek) {
         iWeek = calculateWeeks(oFirstDay, oDate);
     } else {
         iLastYear = iYear - 1;
         iNextYear = iYear + 1;
-        oLastFirstDay = getFirstDayOfFirstWeek(clDate, iLastYear);
-        oNextFirstDay = getFirstDayOfFirstWeek(clDate, iNextYear);
+        oLastFirstDay = getFirstDayOfFirstWeek(clDate, iLastYear, oLocale, vCalendarWeekNumbering);
+        oNextFirstDay = getFirstDayOfFirstWeek(clDate, iNextYear, oLocale, vCalendarWeekNumbering);
         if (oDate >= oNextFirstDay) {
             iYear = iNextYear;
             iWeek = 0;
@@ -185,9 +201,14 @@ UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
         week: iWeek
     };
 };
-UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek);
-    if (oLocale.getRegion() === 'US' && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
+UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek, oLocale, vCalendarWeekNumbering) {
+    checkWeekConfig(vCalendarWeekNumbering);
+    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+    var clDate = this.getClass(sCalendarType);
+    var oFirstDay = getFirstDayOfFirstWeek(clDate, iYear, oLocale, vCalendarWeekNumbering);
+    var oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek);
+    var bSplitWeek = isSplitWeek(vCalendarWeekNumbering, oLocale);
+    if (bSplitWeek && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
         return {
             year: iYear,
             month: 0,
@@ -200,8 +221,44 @@ UniversalDate.getFirstDateOfWeek = function (sCalendarType, iYear, iWeek) {
         day: oDate.getUTCDate()
     };
 };
-function getFirstDayOfFirstWeek(clDate, iYear) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), iMinDays = oLocaleData.getMinimalDaysInFirstWeek(), iFirstDayOfWeek = oLocaleData.getFirstDayOfWeek(), oFirstDay = new clDate(clDate.UTC(iYear, 0, 1)), iDayCount = 7;
+function isSplitWeek(vCalendarWeekNumbering, oLocale) {
+    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+    var oLocaleData = LocaleData.getInstance(oLocale);
+    return (!isCalendarWeekConfigurationDefined(vCalendarWeekNumbering) || vCalendarWeekNumbering === CalendarWeekNumbering.Default) && oLocaleData.firstDayStartsFirstWeek();
+}
+function checkWeekConfig(vCalendarWeekNumbering) {
+    if (typeof vCalendarWeekNumbering === 'object') {
+        if (!isCalendarWeekConfigurationDefined(vCalendarWeekNumbering)) {
+            throw new TypeError('Week config requires firstDayOfWeek and minimalDaysInFirstWeek to be set');
+        }
+    } else if (vCalendarWeekNumbering && !Object.values(CalendarWeekNumbering).includes(vCalendarWeekNumbering)) {
+        throw new TypeError('Illegal format option calendarWeekNumbering: \'' + vCalendarWeekNumbering + '\'');
+    }
+}
+function isCalendarWeekConfigurationDefined(vCalendarWeekNumbering) {
+    if (typeof vCalendarWeekNumbering === 'object') {
+        return typeof vCalendarWeekNumbering.firstDayOfWeek === 'number' && typeof vCalendarWeekNumbering.minimalDaysInFirstWeek === 'number';
+    } else if (vCalendarWeekNumbering) {
+        return true;
+    }
+    return false;
+}
+function resolveCalendarWeekConfiguration(vCalendarWeekNumbering, oLocale) {
+    if (typeof vCalendarWeekNumbering === 'object' && typeof vCalendarWeekNumbering.firstDayOfWeek === 'number' && typeof vCalendarWeekNumbering.minimalDaysInFirstWeek === 'number') {
+        return vCalendarWeekNumbering;
+    }
+    return CalendarUtils.getWeekConfigurationValues(vCalendarWeekNumbering, oLocale);
+}
+function getFirstDayOfFirstWeek(clDate, iYear, oLocale, vCalendarWeekNumbering) {
+    oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
+    var oWeekConfig = resolveCalendarWeekConfiguration(vCalendarWeekNumbering, oLocale);
+    var iMinDays = oWeekConfig.minimalDaysInFirstWeek;
+    var iFirstDayOfWeek = oWeekConfig.firstDayOfWeek;
+    var oFirstDay = new clDate(clDate.UTC(iYear, 0, 1));
+    var iDayCount = 7;
+    if (isNaN(oFirstDay.getTime())) {
+        throw new Error('Could not determine the first day of the week, because the date ' + 'object is invalid');
+    }
     while (oFirstDay.getUTCDay() !== iFirstDayOfWeek) {
         oFirstDay.setUTCDate(oFirstDay.getUTCDate() - 1);
         iDayCount--;
@@ -241,7 +298,7 @@ UniversalDate.getEraStartDate = function (sCalendarType, iEra) {
     }
 };
 function getEras(sCalendarType) {
-    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), aEras = mEras[sCalendarType];
+    var oLocale = Configuration.getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), aEras = mEras[sCalendarType];
     if (!aEras) {
         var aEras = oLocaleData.getEraDates(sCalendarType);
         if (!aEras[0]) {