@ui5/webcomponents-localization 0.0.0-dff5837d7 → 0.0.0-e818f286e

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

@@ -0,0 +1,83 @@
+var TimezoneUtil = {};
+var sLocalTimezone = "";
+var oIntlDateTimeFormatCache = {
+  _oCache: new Map(),
+  _iCacheLimit: 10,
+  get: function (sTimezone) {
+    var cacheEntry = this._oCache.get(sTimezone);
+    if (cacheEntry) {
+      return cacheEntry;
+    }
+    var oOptions = {
+      hourCycle: "h23",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: "2-digit",
+      fractionalSecondDigits: 3,
+      day: "2-digit",
+      month: "2-digit",
+      year: "numeric",
+      timeZone: sTimezone,
+      timeZoneName: "short",
+      era: "narrow"
+    };
+    var oInstance = new Intl.DateTimeFormat("en-US", oOptions);
+    if (this._oCache.size === this._iCacheLimit) {
+      this._oCache = new Map();
+    }
+    this._oCache.set(sTimezone, oInstance);
+    return oInstance;
+  }
+};
+TimezoneUtil.isValidTimezone = function (sTimezone) {
+  if (!sTimezone) {
+    return false;
+  }
+  try {
+    oIntlDateTimeFormatCache.get(sTimezone);
+    return true;
+  } catch (oError) {
+    return false;
+  }
+};
+TimezoneUtil.convertToTimezone = function (oDate, sTargetTimezone) {
+  var oFormatParts = this._getParts(oDate, sTargetTimezone);
+  return TimezoneUtil._getDateFromParts(oFormatParts);
+};
+TimezoneUtil._getParts = function (oDate, sTargetTimezone) {
+  var oIntlDate = oIntlDateTimeFormatCache.get(sTargetTimezone);
+  var oParts = oIntlDate.formatToParts(new Date(oDate.getTime()));
+  var oDateParts = Object.create(null);
+  for (var sKey in oParts) {
+    var oPart = oParts[sKey];
+    if (oPart.type !== "literal") {
+      oDateParts[oPart.type] = oPart.value;
+    }
+  }
+  return oDateParts;
+};
+TimezoneUtil._getDateFromParts = function (oParts) {
+  var oDate = new Date(0);
+  var iUTCYear = parseInt(oParts.year);
+  if (oParts.era === "B") {
+    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));
+  return oDate;
+};
+TimezoneUtil.calculateOffset = function (oDate, sTimezoneSource) {
+  var oFirstGuess = this.convertToTimezone(oDate, sTimezoneSource);
+  var iInitialOffset = oDate.getTime() - oFirstGuess.getTime();
+  var oDateSource = new Date(oDate.getTime() + iInitialOffset);
+  var oDateTarget = this.convertToTimezone(oDateSource, sTimezoneSource);
+  return (oDateSource.getTime() - oDateTarget.getTime()) / 1000;
+};
+TimezoneUtil.getLocalTimezone = function () {
+  if (sLocalTimezone) {
+    return sLocalTimezone;
+  }
+  sLocalTimezone = new Intl.DateTimeFormat().resolvedOptions().timeZone;
+  return sLocalTimezone;
+};
+export default TimezoneUtil;

package/package-scripts.js

@@ -1,19 +1,23 @@
+const resolve = require("resolve");
+const copyUsedModules = resolve.sync("@ui5/webcomponents-tools/lib/copy-list/index.js");
+const replaceGlobalCore = resolve.sync("@ui5/webcomponents-tools/lib/replace-global-core/index.js");
+const esmAbsToRel = resolve.sync("@ui5/webcomponents-tools/lib/esm-abs-to-rel/index.js");
+
 const scripts = {
 	clean: "rimraf dist",
 	lint: "eslint . --config config/.eslintrc.js",
 	build: {
-		"default": "path-exists dist/ || nps build.all",
-		all: "nps lint clean copy.used-modules copy.cldr copy.overlay build.replace-amd build.replace-export-true build.replace-export-false build.amd-to-es6 build.replace-global-core-usage build.esm-abs-to-rel build.jsonImports copy.src",
+		"default": "nps lint clean copy.used-modules copy.cldr copy.overlay build.replace-amd build.replace-export-true build.replace-export-false build.amd-to-es6 build.replace-global-core-usage build.esm-abs-to-rel build.jsonImports copy.src",
 		"replace-amd": "replace-in-file sap.ui.define define dist/**/*.js",
 		"replace-export-true": `replace-in-file ", /* bExport= */ true" "" dist/**/*.js`,
 		"replace-export-false": `replace-in-file ", /* bExport= */ false" "" dist/**/*.js`,
 		"amd-to-es6": "amdtoes6 --src=dist --replace --glob=**/*.js",
-		"replace-global-core-usage": "node ./lib/replace-global-core/index.js dist/",
-		"esm-abs-to-rel": "node ./lib/esm-abs-to-rel/index.js dist/",
-		jsonImports: "node ./lib/generate-json-imports/cldr.js",
+		"replace-global-core-usage": `node "${replaceGlobalCore}" dist/`,
+		"esm-abs-to-rel": `node "${esmAbsToRel}" dist/`,
+		jsonImports: "node ./lib/generate-json-imports/cldr.js"
 	},
 	copy: {
-		"used-modules": "node ./lib/copy-list/index.js ./used-modules.txt dist/",
+		"used-modules": `node "${copyUsedModules}" ./used-modules.txt dist/`,
 		cldr: `copy-and-watch "../../node_modules/@openui5/sap.ui.core/src/sap/ui/core/cldr/*.json" dist/generated/assets/cldr/`,
 		overlay: `copy-and-watch "overlay/**/*.js" dist/`,
 		src: `copy-and-watch "src/**/*.js" dist/`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-localization",
-  "version": "0.0.0-dff5837d7",
+  "version": "0.0.0-e818f286e",
   "description": "Localization for UI5 Web Components",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,11 @@
     "url": "https://github.com/SAP/ui5-webcomponents.git",
     "directory": "packages/localization"
   },
+  "exports": {
+    "./dist/*": "./dist/*",
+    "./package.json": "./package.json",
+    "./*": "./dist/*"
+  },
   "scripts": {
     "clean": "nps clean",
     "lint": "nps lint",
@@ -22,20 +27,13 @@
     "prepublishOnly": "npm run clean && npm run build"
   },
   "devDependencies": {
-    "@buxlabs/amd-to-es6": "^0.15.0",
-    "@openui5/sap.ui.core": "1.76.0",
-    "@ui5/webcomponents-tools": "0.0.0-dff5837d7",
-    "chromedriver": "latest",
-    "copy-and-watch": "^0.1.4",
-    "escodegen": "^1.11.0",
-    "esprima": "^4.0.1",
-    "glob": "^7.1.3",
-    "mkdirp": "^0.5.1",
-    "path-exists-cli": "^1.0.0",
-    "replace-in-file": "^3.4.2",
-    "rimraf": "^2.6.2"
+    "@openui5/sap.ui.core": "1.101.0",
+    "@ui5/webcomponents-tools": "0.0.0-e818f286e",
+    "chromedriver": "102.0.0",
+    "mkdirp": "^1.0.4",
+    "resolve": "^1.20.0"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "0.0.0-dff5837d7"
+    "@ui5/webcomponents-base": "0.0.0-e818f286e"
   }
 }

package/src/Assets-static.js

@@ -0,0 +1,2 @@
+// Currently the base package provides CLDR assets only
+import "./generated/json-imports/LocaleData-static.js";

package/src/dates/CalendarDate.js

@@ -64,9 +64,29 @@ class CalendarDate {
 		return this._oUDate.getUTCMonth();
 	}
 
-	setMonth(month) {
+	/**
+	 * Sets the given month as ordinal month of the year.
+	 * @param {int} month An integer between 0 and 11, representing the months January through December( or their
+	 * equivalent month names for the given calendar).
+	 * If the specified value is is outside of the expected range, this method attempts to update the date information
+	 * accordingly. For example, if 12 is given as a month, the year will be incremented by 1, and 1 will be used for month.
+	 * @param {int} [date] An integer between 1 and 31, representing the day of the month, but other values are allowed.
+	 * 0 will result in the previous month's last day.
+	 * -1 will result in the day before the previous month's last day.
+	 * 32 will result in:
+	 * - first day of the next month if the current month has 31 days.
+	 * - second day of the next month if the current month has 30 days.
+	 * Other value will result in adding or subtracting days according to the given value.
+	 * @returns {sap.ui.unified.calendar.CalendarDate} <code>this</code> for method chaining.
+	 */
+	setMonth(month, date) {
 		checkNumericLike(month, `Invalid month: ${month}`);
-		this._oUDate.setUTCMonth(month);
+		if (date || date === 0) {
+			checkNumericLike(date, `Invalid date: ${date}`);
+			this._oUDate.setUTCMonth(month, date);
+		} else {
+			this._oUDate.setUTCMonth(month);
+		}
 		return this;
 	}
 
@@ -157,7 +177,13 @@ class CalendarDate {
 
 	static fromTimestamp(iTimestamp, sCalendarType) {
 		const oCalDate = new CalendarDate(0, 0, 1);
-		oCalDate._oUDate = UniversalDate.getInstance(new Date(iTimestamp), sCalendarType);
+		let oUDate;
+		try {
+			oUDate = UniversalDate.getInstance(new Date(iTimestamp), sCalendarType);
+		} catch (e) {
+			oUDate = new Date(NaN); // UniversalDate.getInstance may now throw an Exception - keep the old behavior
+		}
+		oCalDate._oUDate = oUDate;
 		return oCalDate;
 	}
 }

package/src/dates/ExtremeDates.js

@@ -0,0 +1,39 @@
+import CalendarDate from "./CalendarDate.js";
+
+const cache = new Map();
+
+const getMinCalendarDate = primaryCalendarType => {
+	const key = `min ${primaryCalendarType}`;
+
+	if (!cache.has(key)) {
+		const minDate = new CalendarDate(1, 0, 1, primaryCalendarType);
+		minDate.setYear(1);
+		minDate.setMonth(0);
+		minDate.setDate(1);
+		cache.set(key, minDate);
+	}
+
+	return cache.get(key);
+};
+
+const getMaxCalendarDate = primaryCalendarType => {
+	const key = `max ${primaryCalendarType}`;
+
+	if (!cache.has(key)) {
+		const maxDate = new CalendarDate(1, 0, 1, primaryCalendarType);
+		maxDate.setYear(9999);
+		maxDate.setMonth(11);
+		const tempDate = new CalendarDate(maxDate, primaryCalendarType);
+		tempDate.setDate(1);
+		tempDate.setMonth(tempDate.getMonth() + 1, 0);
+		maxDate.setDate(tempDate.getDate());// 31st for Gregorian Calendar
+		cache.set(key, maxDate);
+	}
+
+	return cache.get(key);
+};
+
+export {
+	getMinCalendarDate,
+	getMaxCalendarDate,
+};

package/src/dates/convertMonthNumbersToMonthNames.js

@@ -0,0 +1,33 @@
+import getLocale from "@ui5/webcomponents-base/dist/locale/getLocale.js";
+import getCachedLocaleDataInstance from "../getCachedLocaleDataInstance.js";
+
+/**
+ * Convert month number to month name (text).
+ * If the numbers of the two months are the same you will get the name of the month,
+ * otherwise you will get the two names separated by a dash
+ *
+ * @param firstMonth CalendarDate Month
+ * @param lastMonth CalendarDate Month
+ * @param calendarType calendar type
+ * @returns {String}
+ */
+const convertMonthNumbersToMonthNames = (firstMonth, lastMonth, calendarType) => {
+	const localeData = getCachedLocaleDataInstance(getLocale());
+	const pattern = localeData.getIntervalPattern();
+	const secondaryMonthsNames = localeData.getMonthsStandAlone("abbreviated", calendarType);
+	const secondaryMonthsNamesWide = localeData.getMonthsStandAlone("wide", calendarType);
+
+	if (firstMonth === lastMonth) {
+		return {
+			text: localeData.getMonths("abbreviated", calendarType)[firstMonth],
+			textInfo: localeData.getMonths("wide", calendarType)[firstMonth],
+		};
+	}
+
+	return {
+		text: pattern.replace(/\{0\}/, secondaryMonthsNames[firstMonth]).replace(/\{1\}/, secondaryMonthsNames[lastMonth]),
+		textInfo: pattern.replace(/\{0\}/, secondaryMonthsNamesWide[firstMonth]).replace(/\{1\}/, secondaryMonthsNamesWide[lastMonth]),
+	};
+};
+
+export default convertMonthNumbersToMonthNames;

package/src/dates/getDaysInMonth.js

@@ -0,0 +1,11 @@
+import CalendarDate from "./CalendarDate.js";
+
+const getDaysInMonth = date => {
+	const tempCalendarDate = new CalendarDate(date);
+	tempCalendarDate.setDate(1);
+	tempCalendarDate.setMonth(tempCalendarDate.getMonth() + 1);
+	tempCalendarDate.setDate(0);
+	return tempCalendarDate.getDate();
+};
+
+export default getDaysInMonth;

package/src/dates/getRoundedTimestamp.js

@@ -0,0 +1,14 @@
+/**
+ * Returns a timestamp with only the year, month and day (with zero hours, minutes and seconds) and without 000 for milliseconds
+ * @param millisecondsUTC
+ * @returns {number}
+ */
+const getRoundedTimestamp = millisecondsUTC => {
+	if (!millisecondsUTC) {
+		millisecondsUTC = new Date().getTime();
+	}
+	const rounded = millisecondsUTC - (millisecondsUTC % (24 * 60 * 60 * 1000));
+	return rounded / 1000;
+};
+
+export default getRoundedTimestamp;

package/src/dates/getTodayUTCTimestamp.js

@@ -0,0 +1,9 @@
+import CalendarDate from "./CalendarDate.js";
+
+/**
+ * Returns a UTC timestamp representing today
+ * @public
+ */
+const getTodayUTCTimestamp = primaryCalendarType => CalendarDate.fromLocalJSDate(new Date(), primaryCalendarType).valueOf() / 1000;
+
+export default getTodayUTCTimestamp;

package/src/dates/modifyDateBy.js

@@ -0,0 +1,42 @@
+import CalendarDate from "./CalendarDate.js";
+
+/**
+ * Adds or subtracts a given amount of days/months/years from a date.
+ * If minDate or maxDate are given, the result will be enforced within these limits
+ *
+ * @param date CalendarDate instance
+ * @param amount how many days/months/years to add (can be a negative number)
+ * @param unit what to modify: "day", "month" or "year"
+ * @param minDate minimum date to enforce
+ * @param maxDate maximum date to enforce
+ */
+const modifyDateBy = (date, amount, unit, minDate = null, maxDate = null) => {
+	const newDate = new CalendarDate(date);
+	if (unit === "day") {
+		newDate.setDate(date.getDate() + amount);
+	} else if (unit === "month") {
+		newDate.setMonth(date.getMonth() + amount);
+		const stillSameMonth = amount === -1 && newDate.getMonth() === date.getMonth(); // f.e. PageUp remained in the same month
+		const monthSkipped = amount === 1 && newDate.getMonth() - date.getMonth() > 1; // f.e. PageDown skipped a whole month
+		if (stillSameMonth || monthSkipped) { // Select the last day of the month in any of these 2 scenarios
+			newDate.setDate(0);
+		}
+	} else {
+		newDate.setYear(date.getYear() + amount);
+		if (newDate.getMonth() !== date.getMonth()) { // f.e. 29th Feb to next/prev year
+			newDate.setDate(0); // Select the last day of the month
+		}
+	}
+
+	if (minDate && newDate.valueOf() < minDate.valueOf()) {
+		return new CalendarDate(minDate);
+	}
+
+	if (maxDate && newDate.valueOf() > maxDate.valueOf()) {
+		return new CalendarDate(maxDate);
+	}
+
+	return newDate;
+};
+
+export default modifyDateBy;

package/src/dates/transformDateToSecondaryType.js

@@ -0,0 +1,20 @@
+import CalendarDate from "./CalendarDate.js";
+import getDaysInMonth from "./getDaysInMonth.js";
+
+const transformDateToSecondaryType = (primaryCalendarType, secondaryCalendarType, timeStamp, hasYearPicker) => {
+	let firstDate = CalendarDate.fromLocalJSDate(new Date(timeStamp * 1000), primaryCalendarType);
+	let lastDate = CalendarDate.fromLocalJSDate(new Date(timeStamp * 1000), primaryCalendarType);
+	firstDate.setDate(1);
+
+	if (hasYearPicker) {
+		firstDate.setMonth(0);
+		lastDate.setMonth(11);
+	}
+
+	lastDate.setDate(getDaysInMonth(lastDate));
+	firstDate = new CalendarDate(firstDate, secondaryCalendarType);
+	lastDate = new CalendarDate(lastDate, secondaryCalendarType);
+	return { firstDate, lastDate };
+};
+
+export default transformDateToSecondaryType;

package/src/getCachedLocaleDataInstance.js

@@ -0,0 +1,13 @@
+import LocaleData from "./LocaleData.js";
+
+const cache = new Map();
+
+const getCachedLocaleDataInstance = locale => {
+	if (!cache.has(locale)) {
+		cache.set(locale, LocaleData.getInstance(locale));
+	}
+
+	return cache.get(locale);
+};
+
+export default getCachedLocaleDataInstance;

package/src/sap/base/util/LoaderExtensions.js

@@ -1,7 +1,17 @@
-import { getModuleContent } from "@ui5/webcomponents-base/dist/asset-registries/LocaleData.js";
+import { getLocaleData } from "@ui5/webcomponents-base/dist/asset-registries/LocaleData.js";
+
+const loadResource = moduleName => {
+	const moduleFormat = moduleName.match(/sap\/ui\/core\/cldr\/(\w+)\.json/);
+	if (!moduleFormat) {
+		throw new Error(`Unknown module "${moduleName}"`);
+	}
+
+	const localeId = moduleFormat[1];
+	return getLocaleData(localeId);
+};
 
 const LoaderExtensions = {
-	loadResource: getModuleContent,
+	loadResource,
 };
 
 export default LoaderExtensions;

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

@@ -2,6 +2,7 @@ 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";
 
 const emptyFn = () => {};
 
@@ -24,6 +25,7 @@ const Configuration = {
 	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(),
 };
 
 /**

package/used-modules.txt

@@ -22,4 +22,5 @@ sap/ui/core/date/Islamic.js
 sap/ui/core/date/Japanese.js
 sap/ui/core/date/Persian.js
 sap/ui/core/date/UniversalDate.js
+sap/ui/core/format/TimezoneUtil.js
 sap/ui/core/format/DateFormat.js