@ui5/webcomponents-localization 1.7.4 → 1.7.5

package/dist/sap/ui/core/format/DateFormat.js

@@ -1,13 +1,15 @@
-import Core from '../Core.js';
 import CalendarType from '../CalendarType.js';
 import Locale from '../Locale.js';
 import LocaleData from '../LocaleData.js';
 import UniversalDate from '../date/UniversalDate.js';
+import CalendarUtils from '../date/CalendarUtils.js';
+import CalendarWeekNumbering from '../date/CalendarWeekNumbering.js';
 import TimezoneUtil from './TimezoneUtil.js';
 import deepEqual from '../../../base/util/deepEqual.js';
 import formatMessage from '../../../base/strings/formatMessage.js';
 import Log from '../../../base/Log.js';
 import extend from '../../../base/util/extend.js';
+import Configuration from '../Configuration.js';
 var DateFormat = function () {
     throw new Error();
 };
@@ -263,7 +265,7 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo) {
         oFormatOptions = undefined;
     }
     if (!oLocale) {
-        oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale();
+        oLocale = Configuration.getFormatSettings().getFormatLocale();
     }
     oFormat.oLocale = oLocale;
     oFormat.oLocaleData = LocaleData.getInstance(oLocale);
@@ -279,7 +281,13 @@ DateFormat.createInstance = function (oFormatOptions, oLocale, oInfo) {
     }
     oFormat.type = oInfo.type;
     if (!oFormat.oFormatOptions.calendarType) {
-        oFormat.oFormatOptions.calendarType = Core.getConfiguration().getCalendarType();
+        oFormat.oFormatOptions.calendarType = Configuration.getCalendarType();
+    }
+    if (oFormat.oFormatOptions.firstDayOfWeek === undefined && oFormat.oFormatOptions.minimalDaysInFirstWeek !== undefined || oFormat.oFormatOptions.firstDayOfWeek !== undefined && oFormat.oFormatOptions.minimalDaysInFirstWeek === undefined) {
+        throw new TypeError('Format options firstDayOfWeek and minimalDaysInFirstWeek need both to be set, but only one was provided.');
+    }
+    if (oFormat.oFormatOptions.calendarWeekNumbering && !Object.values(CalendarWeekNumbering).includes(oFormat.oFormatOptions.calendarWeekNumbering)) {
+        throw new TypeError('Illegal format option calendarWeekNumbering: \'' + oFormat.oFormatOptions.calendarWeekNumbering + '\'');
     }
     if (!oFormat.oFormatOptions.pattern) {
         if (oFormat.oFormatOptions.format) {
@@ -361,7 +369,15 @@ DateFormat.prototype.init = function () {
     this.aErasNarrow = this.oLocaleData.getEras('narrow', sCalendarType);
     this.aErasAbbrev = this.oLocaleData.getEras('abbreviated', sCalendarType);
     this.aErasWide = this.oLocaleData.getEras('wide', sCalendarType);
-    this.aDayPeriods = this.oLocaleData.getDayPeriods('abbreviated', sCalendarType);
+    this.aDayPeriodsAbbrev = this.oLocaleData.getDayPeriods('abbreviated', sCalendarType);
+    this.aDayPeriodsNarrow = this.oLocaleData.getDayPeriods('narrow', sCalendarType);
+    this.aDayPeriodsWide = this.oLocaleData.getDayPeriods('wide', sCalendarType);
+    this.oFlexibleDayPeriodsAbbrev = this.oLocaleData.getFlexibleDayPeriods('abbreviated', sCalendarType);
+    this.oFlexibleDayPeriodsNarrow = this.oLocaleData.getFlexibleDayPeriods('narrow', sCalendarType);
+    this.oFlexibleDayPeriodsWide = this.oLocaleData.getFlexibleDayPeriods('wide', sCalendarType);
+    this.oFlexibleDayPeriodsAbbrevSt = this.oLocaleData.getFlexibleDayPeriodsStandAlone('abbreviated', sCalendarType);
+    this.oFlexibleDayPeriodsNarrowSt = this.oLocaleData.getFlexibleDayPeriodsStandAlone('narrow', sCalendarType);
+    this.oFlexibleDayPeriodsWideSt = this.oLocaleData.getFlexibleDayPeriodsStandAlone('wide', sCalendarType);
     this.aFormatArray = this.parseCldrDatePattern(this.oFormatOptions.pattern);
     this.sAllowedCharacters = this.getAllowedCharacters(this.aFormatArray);
 };
@@ -601,7 +617,7 @@ DateFormat.prototype.oSymbols = {
     'Y': {
         name: 'weekYear',
         format: function (oField, oDate, bUTC, oFormat) {
-            var oWeek = oDate.getUTCWeek();
+            var oWeek = oDate.getUTCWeek(oFormat.oLocale, getCalendarWeekParameter(oFormat.oFormatOptions));
             var iWeekYear = oWeek.year;
             var sWeekYear = String(iWeekYear);
             var sCalendarType = oFormat.oFormatOptions.calendarType;
@@ -752,7 +768,7 @@ DateFormat.prototype.oSymbols = {
     'w': {
         name: 'weekInYear',
         format: function (oField, oDate, bUTC, oFormat) {
-            var oWeek = oDate.getUTCWeek();
+            var oWeek = oDate.getUTCWeek(oFormat.oLocale, getCalendarWeekParameter(oFormat.oFormatOptions));
             var iWeek = oWeek.week;
             var sWeek = String(iWeek + 1);
             if (oField.digits < 3) {
@@ -1034,35 +1050,89 @@ DateFormat.prototype.oSymbols = {
         name: 'amPmMarker',
         format: function (oField, oDate, bUTC, oFormat) {
             var iDayPeriod = oDate.getUTCDayPeriod();
-            return oFormat.aDayPeriods[iDayPeriod];
+            if (oField.digits <= 3) {
+                return oFormat.aDayPeriodsAbbrev[iDayPeriod];
+            } else if (oField.digits === 4) {
+                return oFormat.aDayPeriodsWide[iDayPeriod];
+            } else {
+                return oFormat.aDayPeriodsNarrow[iDayPeriod];
+            }
+        },
+        parse: function (sValue, oPart, oFormat, oConfig, sTimezone) {
+            var rAMPM, bAMPMAlternativeCase, oEntry, i, aMatch, normalize, aVariants, aDayPeriodsVariants = [
+                    oFormat.aDayPeriodsWide,
+                    oFormat.aDayPeriodsAbbrev,
+                    oFormat.aDayPeriodsNarrow
+                ];
+            rAMPM = /[aApP](?:\.)?[\x20\xA0]?[mM](?:\.)?/;
+            aMatch = sValue.match(rAMPM);
+            bAMPMAlternativeCase = aMatch && aMatch.index === 0;
+            function normalize(sValue) {
+                return sValue.replace(/[\x20\xA0]/g, '').replace(/\./g, '');
+            }
+            if (bAMPMAlternativeCase) {
+                sValue = normalize(sValue);
+            }
+            for (i = 0; i < aDayPeriodsVariants.length; i += 1) {
+                aVariants = aDayPeriodsVariants[i];
+                if (bAMPMAlternativeCase) {
+                    aVariants = aVariants.map(normalize);
+                }
+                oEntry = oParseHelper.findEntry(sValue, aVariants, oFormat.oLocaleData.sCLDRLocaleId);
+                if (oEntry.index !== -1) {
+                    return {
+                        pm: oEntry.index === 1,
+                        length: bAMPMAlternativeCase ? aMatch[0].length : oEntry.length
+                    };
+                }
+            }
+            return { valid: false };
+        }
+    },
+    'B': {
+        name: 'flexibleDayPeriod',
+        format: function (oField, oDate, bUTC, oFormat) {
+            var bContainsHour = oFormat.aFormatArray.some(function (oFormatElement) {
+                    return 'hHKk'.includes(oFormatElement.symbol);
+                }), sFlexibleDayPeriod = oFormat.oLocaleData.getFlexibleDayPeriodOfTime(oDate.getUTCHours(), oDate.getUTCMinutes());
+            if (bContainsHour) {
+                if (oField.digits <= 3) {
+                    return oFormat.oFlexibleDayPeriodsAbbrev[sFlexibleDayPeriod];
+                }
+                if (oField.digits === 4) {
+                    return oFormat.oFlexibleDayPeriodsWide[sFlexibleDayPeriod];
+                }
+                return oFormat.oFlexibleDayPeriodsNarrow[sFlexibleDayPeriod];
+            }
+            if (oField.digits <= 3) {
+                return oFormat.oFlexibleDayPeriodsAbbrevSt[sFlexibleDayPeriod];
+            }
+            if (oField.digits === 4) {
+                return oFormat.oFlexibleDayPeriodsWideSt[sFlexibleDayPeriod];
+            }
+            return oFormat.oFlexibleDayPeriodsNarrowSt[sFlexibleDayPeriod];
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
-            var bPM;
-            var iLength;
-            var sAM = oFormat.aDayPeriods[0], sPM = oFormat.aDayPeriods[1];
-            var rAMPM = /[aApP](?:\.)?[\x20\xA0]?[mM](?:\.)?/;
-            var aMatch = sValue.match(rAMPM);
-            var bVariant = aMatch && aMatch.index === 0;
-            if (bVariant) {
-                sValue = aMatch[0];
-                sAM = sAM.replace(/[\x20\xA0]/g, '');
-                sPM = sPM.replace(/[\x20\xA0]/g, '');
-                sValue = sValue.replace(/[\x20\xA0]/g, '');
-                sAM = sAM.replace(/\./g, '').toLowerCase();
-                sPM = sPM.replace(/\./g, '').toLowerCase();
-                sValue = sValue.replace(/\./g, '').toLowerCase();
-            }
-            if (sValue.indexOf(sAM) === 0) {
-                bPM = false;
-                iLength = bVariant ? aMatch[0].length : sAM.length;
-            } else if (sValue.indexOf(sPM) === 0) {
-                bPM = true;
-                iLength = bVariant ? aMatch[0].length : sPM.length;
+            var i, oFound, oVariant, bContainsHour = oFormat.aFormatArray.some(function (oFormatElement) {
+                    return 'hHKk'.includes(oFormatElement.symbol);
+                }), aFlexibleDayPeriodVariants = [
+                    oFormat.oFlexibleDayPeriodsWide,
+                    oFormat.oFlexibleDayPeriodsAbbrev,
+                    oFormat.oFlexibleDayPeriodsNarrow
+                ];
+            if (bContainsHour) {
+                for (i = 0; i < aFlexibleDayPeriodVariants.length; i++) {
+                    oVariant = aFlexibleDayPeriodVariants[i];
+                    oFound = oParseHelper.findEntry(sValue, Object.values(oVariant), oFormat.oLocaleData.sCLDRLocaleId);
+                    if (oFound.index !== -1) {
+                        return {
+                            flexDayPeriod: Object.keys(oVariant)[oFound.index],
+                            length: oFound.length
+                        };
+                    }
+                }
             }
-            return {
-                pm: bPM,
-                length: iLength
-            };
+            return { valid: false };
         }
     },
     'H': {
@@ -1338,7 +1408,7 @@ DateFormat.prototype.oSymbols = {
         name: 'timezoneID',
         format: function (oField, oDate, bUTC, oFormat, sTimezone) {
             if (!bUTC && oField.digits === 2) {
-                return sTimezone;
+                return oFormat.oLocaleData.getTimezoneTranslations()[sTimezone] || sTimezone;
             }
             return '';
         },
@@ -1348,18 +1418,27 @@ DateFormat.prototype.oSymbols = {
                 length: 0
             };
             if (oPart.digits === 2) {
-                if (sValue === sTimezone) {
-                    oTimezoneParsed.timezone = sTimezone;
-                    oTimezoneParsed.length = sTimezone.length;
-                    return oTimezoneParsed;
+                var mTimezoneTranslations = oFormat.oLocaleData.getTimezoneTranslations();
+                if (sValue === mTimezoneTranslations[sTimezone]) {
+                    return {
+                        timezone: sTimezone,
+                        length: sValue.length
+                    };
                 }
-                if (sValue) {
-                    var rIanaTimezone = new RegExp('([A-Za-z_])+([/][A-Za-z_]+)+');
-                    var aResult = rIanaTimezone.exec(sValue);
-                    if (aResult && aResult[0] && TimezoneUtil.isValidTimezone(aResult[0])) {
-                        oTimezoneParsed.timezone = aResult[0];
-                        oTimezoneParsed.length = aResult[0].length;
-                        return oTimezoneParsed;
+                var aTimezoneTranslations = Object.values(mTimezoneTranslations);
+                var oTimezoneResult = oParseHelper.findEntry(sValue, aTimezoneTranslations, oFormat.oLocaleData.sCLDRLocaleId);
+                if (oTimezoneResult.index !== -1) {
+                    return {
+                        timezone: Object.keys(mTimezoneTranslations)[oTimezoneResult.index],
+                        length: oTimezoneResult.length
+                    };
+                }
+                var sCurrentValue = '';
+                for (var i = 0; i < sValue.length; i++) {
+                    sCurrentValue += sValue[i];
+                    if (TimezoneUtil.isValidTimezone(sCurrentValue)) {
+                        oTimezoneParsed.timezone = sCurrentValue;
+                        oTimezoneParsed.length = sCurrentValue.length;
                     }
                 }
             }
@@ -1383,7 +1462,7 @@ DateFormat.prototype._format = function (oJSDate, bUTC, sTimezone) {
         aBuffer.push(this.oSymbols[sSymbol].format(oPart, oDate, bUTC, this, sTimezone));
     }
     sResult = aBuffer.join('');
-    if (Core.getConfiguration().getOriginInfo()) {
+    if (Configuration.getOriginInfo()) {
         sResult = new String(sResult);
         sResult.originInfo = {
             source: 'Common Locale Data Repository',
@@ -1409,7 +1488,7 @@ DateFormat.prototype.format = function (vJSDate, bUTC) {
     if (bUTC === undefined) {
         bUTC = this.oFormatOptions.UTC;
     }
-    sTimezone = sTimezone || Core.getConfiguration().getTimezone();
+    sTimezone = sTimezone || Configuration.getTimezone();
     if (Array.isArray(vJSDate)) {
         if (!this.oFormatOptions.interval) {
             Log.error('Non-interval DateFormat can\'t format more than one date instance.');
@@ -1441,7 +1520,7 @@ DateFormat.prototype.format = function (vJSDate, bUTC) {
     } else {
         if (!isValidDateObject(vJSDate)) {
             if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE && this.oFormatOptions.pattern.includes('VV')) {
-                return sTimezone;
+                return this.oLocaleData.getTimezoneTranslations()[sTimezone] || sTimezone;
             }
             Log.error('The given date instance isn\'t valid.');
             return '';
@@ -1519,7 +1598,7 @@ DateFormat.prototype._getGreatestDiffField = function (aDates) {
     return null;
 };
 DateFormat.prototype._parse = function (sValue, aFormatArray, bUTC, bStrict, sTimezone) {
-    var iIndex = 0, oPart, sSubValue, oResult;
+    var iIndex = 0, sFlexibleDayPeriod, oPart, bPM, sSubValue, oResult;
     var oDateValue = {
         valid: true,
         lastTimezonePatternSymbol: ''
@@ -1544,7 +1623,12 @@ DateFormat.prototype._parse = function (sValue, aFormatArray, bUTC, bStrict, sTi
         iIndex += oResult.length || 0;
     }
     oDateValue.index = iIndex;
-    if (oDateValue.pm) {
+    bPM = oDateValue.pm;
+    if (oDateValue.flexDayPeriod && oDateValue.hour * 60 + (oDateValue.minute || 0) < 720) {
+        sFlexibleDayPeriod = this.oLocaleData.getFlexibleDayPeriodOfTime(oDateValue.hour + 12, oDateValue.minute || 0);
+        bPM = oDateValue.flexDayPeriod === sFlexibleDayPeriod;
+    }
+    if (bPM) {
         oDateValue.hour += 12;
     }
     if (oDateValue.dayNumberOfWeek === undefined && oDateValue.dayOfWeek !== undefined) {
@@ -1601,13 +1685,24 @@ DateFormat.prototype._parseInterval = function (sValue, sCalendarType, bUTC, bSt
     }.bind(this));
     return aDateValues;
 };
+function getCalendarWeekParameter(oFormatOptions) {
+    if (oFormatOptions.calendarWeekNumbering) {
+        return oFormatOptions.calendarWeekNumbering;
+    } else if (oFormatOptions.firstDayOfWeek !== undefined && oFormatOptions.minimalDaysInFirstWeek !== undefined) {
+        return {
+            firstDayOfWeek: oFormatOptions.firstDayOfWeek,
+            minimalDaysInFirstWeek: oFormatOptions.minimalDaysInFirstWeek
+        };
+    }
+    return undefined;
+}
 var convertToTimezone = function (oJSDate, sTimezone, bUTC) {
     if (!bUTC && isValidDateObject(oJSDate)) {
         return TimezoneUtil.convertToTimezone(oJSDate, sTimezone);
     }
     return oJSDate;
 };
-var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict, sTimezone) {
+var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict, sTimezone, oFormatOptions, oLocale) {
     if (!oDateValue.valid) {
         return null;
     }
@@ -1628,7 +1723,7 @@ var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict, sTimezone
         oDate.setUTCWeek({
             year: oDateValue.weekYear || oDateValue.year,
             week: oDateValue.week
-        });
+        }, oLocale, getCalendarWeekParameter(oFormatOptions));
         if (oDateValue.dayNumberOfWeek !== undefined) {
             oDate.setUTCDate(oDate.getUTCDate() + oDateValue.dayNumberOfWeek - 1);
         }
@@ -1643,7 +1738,7 @@ var fnCreateDate = function (oDateValue, sCalendarType, bUTC, bStrict, sTimezone
         }
     }
     if (oDateValue.tzDiff) {
-        oDate.setUTCSeconds((oDateValue.second || 0) + oDateValue.tzDiff);
+        oDate.setUTCSeconds(oDate.getUTCSeconds() + oDateValue.tzDiff);
     }
     return oDate;
 };
@@ -1694,7 +1789,7 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
     sValue = sValue == null ? '' : String(sValue).trim();
     var oDateValue;
     var sCalendarType = this.oFormatOptions.calendarType;
-    sTimezone = sTimezone || Core.getConfiguration().getTimezone();
+    sTimezone = sTimezone || Configuration.getTimezone();
     if (bStrict === undefined) {
         bStrict = this.oFormatOptions.strictParsing;
     }
@@ -1710,7 +1805,7 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
         if (oDateValue.index === 0 || oDateValue.index < sValue.length) {
             oDateValue.valid = false;
         }
-        oJSDate = fnCreateDate(oDateValue, sCalendarType, bUTC, bStrict, sTimezone);
+        oJSDate = fnCreateDate(oDateValue, sCalendarType, bUTC, bStrict, sTimezone, this.oFormatOptions, this.oLocale);
         if (oJSDate) {
             if (this.type === mDateFormatTypes.DATETIME_WITH_TIMEZONE) {
                 var bShowTimezone = this.oFormatOptions.showTimezone === undefined || this.oFormatOptions.showTimezone;
@@ -1738,8 +1833,8 @@ DateFormat.prototype.parse = function (sValue, bUTC, bStrict) {
         if (aDateValues && aDateValues.length == 2) {
             var oDateValue1 = mergeWithoutOverwrite(aDateValues[0], aDateValues[1]);
             var oDateValue2 = mergeWithoutOverwrite(aDateValues[1], aDateValues[0]);
-            oJSDate1 = fnCreateDate(oDateValue1, sCalendarType, bUTC, bStrict, sTimezone);
-            oJSDate2 = fnCreateDate(oDateValue2, sCalendarType, bUTC, bStrict, sTimezone);
+            oJSDate1 = fnCreateDate(oDateValue1, sCalendarType, bUTC, bStrict, sTimezone, this.oFormatOptions, this.oLocale);
+            oJSDate2 = fnCreateDate(oDateValue2, sCalendarType, bUTC, bStrict, sTimezone, this.oFormatOptions, this.oLocale);
             if (oJSDate1 && oJSDate2) {
                 if (this.oFormatOptions.singleIntervalValue && oJSDate1.getTime() === oJSDate2.getTime()) {
                     return [
@@ -2067,7 +2162,12 @@ var mRelativeDiffs = {
     }
 };
 DateFormat.prototype._adaptDayOfWeek = function (iDayOfWeek) {
-    var iFirstDayOfWeek = LocaleData.getInstance(Core.getConfiguration().getFormatSettings().getFormatLocale()).getFirstDayOfWeek();
+    var vCalendarWeekParameter = getCalendarWeekParameter(this.oFormatOptions), iFirstDayOfWeek;
+    if (typeof vCalendarWeekParameter === 'object') {
+        iFirstDayOfWeek = vCalendarWeekParameter.firstDayOfWeek;
+    } else {
+        iFirstDayOfWeek = CalendarUtils.getWeekConfigurationValues(vCalendarWeekParameter, this.oLocale).firstDayOfWeek;
+    }
     var iDayNumberOfWeek = iDayOfWeek - (iFirstDayOfWeek - 1);
     if (iDayNumberOfWeek <= 0) {
         iDayNumberOfWeek += 7;

package/dist/sap/ui/core/format/TimezoneUtil.js

@@ -1,5 +1,6 @@
 var TimezoneUtil = {};
 var sLocalTimezone = "";
+var aSupportedTimezoneIDs;
 var oIntlDateTimeFormatCache = {
   _oCache: new Map(),
   _iCacheLimit: 10,
@@ -33,6 +34,16 @@ TimezoneUtil.isValidTimezone = function (sTimezone) {
   if (!sTimezone) {
     return false;
   }
+  if (Intl.supportedValuesOf) {
+    try {
+      aSupportedTimezoneIDs = aSupportedTimezoneIDs || Intl.supportedValuesOf("timeZone");
+      if (aSupportedTimezoneIDs.includes(sTimezone)) {
+        return true;
+      }
+    } catch (oError) {
+      aSupportedTimezoneIDs = [];
+    }
+  }
   try {
     oIntlDateTimeFormatCache.get(sTimezone);
     return true;
@@ -63,7 +74,7 @@ TimezoneUtil._getDateFromParts = function (oParts) {
     iUTCYear = iUTCYear * -1 + 1;
   }
   oDate.setUTCFullYear(iUTCYear, parseInt(oParts.month) - 1, parseInt(oParts.day));
-  oDate.setUTCHours(parseInt(oParts.hour), parseInt(oParts.minute), parseInt(oParts.second), parseInt(oParts.fractionalSecond));
+  oDate.setUTCHours(parseInt(oParts.hour), parseInt(oParts.minute), parseInt(oParts.second), parseInt(oParts.fractionalSecond || 0));
   return oDate;
 };
 TimezoneUtil.calculateOffset = function (oDate, sTimezoneSource) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-localization",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "Localization for UI5 Web Components",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -27,13 +27,13 @@
     "prepublishOnly": "npm run clean && npm run build"
   },
   "devDependencies": {
-    "@openui5/sap.ui.core": "1.101.0",
-    "@ui5/webcomponents-tools": "1.7.4",
-    "chromedriver": "104.0.0",
+    "@openui5/sap.ui.core": "1.109.0",
+    "@ui5/webcomponents-tools": "1.7.5",
+    "chromedriver": "107.0.3",
     "mkdirp": "^1.0.4",
     "resolve": "^1.20.0"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "1.7.4"
+    "@ui5/webcomponents-base": "1.7.5"
   }
 }

package/src/sap/ui/core/Configuration.js

@@ -0,0 +1,21 @@
+import { getLanguage } from "@ui5/webcomponents-base/dist/config/Language.js";
+import { getCalendarType } from "@ui5/webcomponents-base/dist/config/CalendarType.js";
+import getDesigntimePropertyAsArray from "@ui5/webcomponents-base/dist/util/getDesigntimePropertyAsArray.js";
+import TimezoneUtil from "./format/TimezoneUtil.js";
+import FormatSettings from "./FormatSettings.js";
+
+const emptyFn = () => { };
+
+/**
+ * OpenUI5 Configuration Shim
+ */
+const Configuration = {
+	getLanguage,
+	getCalendarType,
+	getSupportedLanguages: () => getDesigntimePropertyAsArray("$core-i18n-locales:,ar,bg,ca,cs,da,de,el,en,es,et,fi,fr,hi,hr,hu,it,iw,ja,ko,lt,lv,nl,no,pl,pt,ro,ru,sh,sk,sl,sv,th,tr,uk,vi,zh_CN,zh_TW$"),
+	getOriginInfo: emptyFn,
+	getFormatSettings: () => FormatSettings,
+	getTimezone: () => TimezoneUtil.getLocalTimezone(),
+};
+
+export default Configuration;

package/src/sap/ui/core/Core.js

@@ -1,33 +1,8 @@
-import { getLanguage } from "@ui5/webcomponents-base/dist/config/Language.js";
-import { getCalendarType } from "@ui5/webcomponents-base/dist/config/CalendarType.js";
-import getDesigntimePropertyAsArray from "@ui5/webcomponents-base/dist/util/getDesigntimePropertyAsArray.js";
-import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
-import TimezoneUtil from "./format/TimezoneUtil.js";
+import FormatSettings from "./FormatSettings.js";
+import Configuration from "./Configuration.js";
 
 const emptyFn = () => {};
 
-/**
- * OpenUI5 FormatSettings shim
- */
-const FormatSettings = {
-	getFormatLocale: getLocale,
-	getLegacyDateFormat: emptyFn,
-	getLegacyDateCalendarCustomizing: emptyFn,
-	getCustomLocaleData: emptyFn,
-};
-
-/**
- * OpenUI5 Configuration Shim
- */
-const Configuration = {
-	getLanguage,
-	getCalendarType,
-	getSupportedLanguages: () => getDesigntimePropertyAsArray("$core-i18n-locales:,ar,bg,ca,cs,da,de,el,en,es,et,fi,fr,hi,hr,hu,it,iw,ja,ko,lt,lv,nl,no,pl,pt,ro,ru,sh,sk,sl,sv,th,tr,uk,vi,zh_CN,zh_TW$"),
-	getOriginInfo: emptyFn,
-	getFormatSettings: () => FormatSettings,
-	getTimezone: () => TimezoneUtil.getLocalTimezone(),
-};
-
 /**
  * OpenUI5 Core shim
  */

package/src/sap/ui/core/FormatSettings.js

@@ -0,0 +1,15 @@
+import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
+
+const emptyFn = () => {};
+
+/**
+ * OpenUI5 FormatSettings shim
+ */
+const FormatSettings = {
+	getFormatLocale: getLocale,
+	getLegacyDateFormat: emptyFn,
+	getLegacyDateCalendarCustomizing: emptyFn,
+	getCustomLocaleData: emptyFn,
+};
+
+export default FormatSettings;

package/used-modules.txt

@@ -17,6 +17,8 @@ sap/ui/core/CalendarType.js
 sap/ui/core/Locale.js
 sap/ui/core/LocaleData.js
 sap/ui/core/date/Buddhist.js
+sap/ui/core/date/CalendarUtils.js
+sap/ui/core/date/CalendarWeekNumbering.js
 sap/ui/core/date/Gregorian.js
 sap/ui/core/date/Islamic.js
 sap/ui/core/date/Japanese.js

package/global.d.ts

@@ -1,105 +0,0 @@
-// eslint-disable-next-line
-import "@ui5/webcomponents-base/global";
-import LocaleData from "sap/ui/core/LocaleData";
-
-export {};
-
-declare global {
-
-	module "*./sap/ui/core/LocaleData.js" {
-		const content: LocaleData;
-		export default content;
-	}
-
-
-	// sap/ui/core/format/DateFormat.js
-	// type DateFormatOptions = {
-	// 	calendarType: string
-	// 	strictParsing?: boolean,
-	// 	pattern?: string,
-	// 	style?: string,
-	// }
-
-	// type DateFormatInstance = {
-	// 	format: (JSDate: Date, bUTC: boolean) => string,
-	// 	parse: (value: string, bUTC: boolean, bStrict: boolean) => Date | Array<Date | null | undefined> | null,
-	// }
-
-	// type DateFormat = {
-	// 	getDateInstance: (options: DateFormatOptions) => DateFormatInstance,
-	// 	getInstance: (options: DateFormatOptions) => DateFormatInstance,
-	// }
-
-	// module "*./sap/ui/core/format/DateFormat.js" {
-	// 	const content: DateFormat;
-	// 	export default content;
-	// }
-
-	// sap/ui/core/LocaleData.js
-	// type Locale = {
-	// 	getScript: () => string,
-	// 	getRegion: () => string,
-	// 	getLanguage: () => string,
-	// }
-
-	// type LocaleDataInstance = {
-	// 	getPreferredCalendarType: () => string,
-	// }
-
-	// type LocaleData = {
-	// 	getInstance: (locale: Locale) => LocaleDataInstance,
-	// }
-
-	
-
-	// sap/ui/core/date/UniversalDate.js
-	// type UniversalDate = {
-	// 	new (time: number): UniversalDate;
-	// 	oDate: Date,
-	// 	sCalendarType: string,
-	// 	getInstance: (oDate: Date, sCalendarType: string) => UniversalDate,
-	// 	getDate: () => number,
-	// 	getMonth: () => number,
-	// 	getFullYear: () => number,
-	// 	getYear: () => number,
-	// 	getDay: () => number,
-	// 	getHours: () => number,
-	// 	getMinutes: () => number,
-	// 	getSeconds: () => number,
-	// 	getMilliseconds: () => number,
-	// 	getUTCDate: () => number,
-	// 	getUTCMonth: () => number,
-	// 	getUTCFullYear: () => number,
-	// 	getUTCDay: () => number,
-	// 	getUTCHours: () => number,
-	// 	getUTCMinutes: () => number,
-	// 	getUTCSeconds: () => number,
-	// 	getUTCMilliseconds: () => number,
-	// 	getTime: () => number,
-	// 	valueOf: () => number,
-	// 	getTimezoneOffset: () => number,
-	// 	toString: () => string,
-	// 	toDateString: () => string,
-	// 	setDate: (dayValue: number) => number,
-	// 	setFullYear: (yearValue: number, monthValue?: number, dateValue?: number) => number,
-	// 	setYear: (yearValue: number) => number,
-	// 	setMonth: (monthValue: number, dayValue?: number) => number,
-	// 	setHours: (hoursValue: number, minutesValue?: number, secondsValue?: number, msValue?: number) => number,
-	// 	setMinutes: (minutesValue: number, secondsValue?: number, msValue?: number) => number,
-	// 	setSeconds: (secondsValue: number, msValue?: number) => number,
-	// 	setMilliseconds: (setMilliseconds: number) => number,
-	// 	setUTCDate:(dayValue: number) => number,
-	// 	setUTCFullYear: (yearValue: number, monthValue?: number, dayValue?: number) => number,
-	// 	setUTCMonth: (monthValue: number, dayValue?: number) => number,
-	// 	setUTCHours: (hoursValue: number, minutesValue?: number, secondsValue?: number, msValue?: number) => number,
-	// 	setUTCMinutes: (minutesValue: number, secondsValue?: number, msValue?: number) => number,
-	// 	setUTCSeconds: (secondsValue: number, msValue?: number) => number,
-	// 	setUTCMilliseconds: (setMilliseconds: number) => number,
-	// }
-
-	// module "*../sap/ui/core/date/UniversalDate.js" {
-	// 	const content: UniversalDate;
-	// 	export default content;
-	// }
-
-}

package/src/DateFormat.ts

@@ -1,3 +0,0 @@
-import DateFormat from "./sap/ui/core/format/DateFormat.js";
-
-export default DateFormat;

package/src/LocaleData.ts

@@ -1,8 +0,0 @@
-import LocaleDataOpenUI5 from "./sap/ui/core/LocaleData.js";
-import type Locale from "sap/ui/core/Locale";
-
-type LocaleData = typeof LocaleDataOpenUI5 & {
-	getInstance: (locale: Locale) => LocaleData,
-}
-
-export default LocaleData;