@ui5/webcomponents-localization 0.0.0-b4cbc43ba → 0.0.0-b93c2a321

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

@@ -20,7 +20,7 @@ UniversalDate.prototype.createDate = function (clDate, aArgs) {
     case 0:
         return new clDate();
     case 1:
-        return new clDate(aArgs[0]);
+        return new clDate(aArgs[0] instanceof Date ? aArgs[0].getTime() : aArgs[0]);
     case 2:
         return new clDate(aArgs[0], aArgs[1]);
     case 3:
@@ -39,6 +39,8 @@ UniversalDate.getInstance = function (oDate, sCalendarType) {
     var clDate, oInstance;
     if (oDate instanceof UniversalDate) {
         oDate = oDate.getJSDate();
+    } else if (!oDate) {
+        oDate = new Date();
     }
     if (!sCalendarType) {
         sCalendarType = Core.getConfiguration().getCalendarType();
@@ -160,8 +162,8 @@ 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') {
+    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(clDate.UTC(iYear, iMonth, iDay)), iWeek, iLastYear, iNextYear, oLastFirstDay, oNextFirstDay;
+    if (oLocaleData.firstDayStartsFirstWeek()) {
         iWeek = calculateWeeks(oFirstDay, oDate);
     } else {
         iLastYear = iYear - 1;
@@ -184,8 +186,8 @@ UniversalDate.getWeekByDate = function (sCalendarType, iYear, iMonth, iDay) {
     };
 };
 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) {
+    var oLocale = Core.getConfiguration().getFormatSettings().getFormatLocale(), oLocaleData = LocaleData.getInstance(oLocale), clDate = this.getClass(sCalendarType), oFirstDay = getFirstDayOfFirstWeek(clDate, iYear), oDate = new clDate(oFirstDay.valueOf() + iWeek * iMillisecondsInWeek), bIsRegionUS = oLocaleData.firstDayStartsFirstWeek();
+    if (bIsRegionUS && iWeek === 0 && oFirstDay.getUTCFullYear() < iYear) {
         return {
             year: iYear,
             month: 0,

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

@@ -350,7 +350,7 @@ var oParseHelper = {
             value: iFoundIndex === -1 ? null : aList[iFoundIndex]
         };
     },
-    parseTZ: function (sValue, bISO) {
+    parseTZ: function (sValue, bColonSeparated) {
         var iLength = 0;
         var iTZFactor = sValue.charAt(0) == '+' ? -1 : 1;
         var sPart;
@@ -358,12 +358,15 @@ var oParseHelper = {
         sPart = this.findNumbers(sValue.substr(iLength), 2);
         var iTZDiffHour = parseInt(sPart);
         iLength += 2;
-        if (bISO) {
+        if (bColonSeparated) {
             iLength++;
         }
         sPart = this.findNumbers(sValue.substr(iLength), 2);
-        iLength += 2;
-        var iTZDiff = parseInt(sPart);
+        var iTZDiff = 0;
+        if (sPart) {
+            iLength += 2;
+            iTZDiff = parseInt(sPart);
+        }
         return {
             length: iLength,
             tzDiff: (iTZDiff + 60 * iTZDiffHour) * iTZFactor
@@ -937,13 +940,17 @@ DateFormat.prototype.oSymbols = {
             var bPM;
             var iLength;
             var sAM = oFormat.aDayPeriods[0], sPM = oFormat.aDayPeriods[1];
-            var rAMPM = /[aApP](?:\.)?[mM](?:\.)?/;
+            var rAMPM = /[aApP](?:\.)?[\x20\xA0]?[mM](?:\.)?/;
             var aMatch = sValue.match(rAMPM);
             var bVariant = aMatch && aMatch.index === 0;
             if (bVariant) {
-                sValue = aMatch[0].replace(/\./g, '').toLowerCase() + sValue.substring(aMatch[0].length);
+                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;
@@ -1127,9 +1134,9 @@ DateFormat.prototype.oSymbols = {
     'z': {
         name: 'timezoneGeneral',
         format: function (oField, oDate, bUTC, oFormat) {
-            if (oField.digits > 3 && oDate.getTimezoneLong()) {
+            if (oField.digits > 3 && oDate.getTimezoneLong && oDate.getTimezoneLong()) {
                 return oDate.getTimezoneLong();
-            } else if (oDate.getTimezoneShort()) {
+            } else if (oDate.getTimezoneShort && oDate.getTimezoneShort()) {
                 return oDate.getTimezoneShort();
             }
             var sTimeZone = 'GMT';
@@ -1155,13 +1162,13 @@ DateFormat.prototype.oSymbols = {
                 iLength = 3;
             } else if (sValue.substring(0, 2) === 'UT') {
                 iLength = 2;
-            } else if (sValue.charAt(0) == 'Z') {
+            } else if (sValue.charAt(0) === 'Z') {
                 iLength = 1;
                 iTZDiff = 0;
             } else {
-                return { error: 'cannot be parsed correcly by sap.ui.core.format.DateFormat: The given timezone is not supported!' };
+                return { error: 'cannot be parsed correctly by sap.ui.core.format.DateFormat: The given timezone is not supported!' };
             }
-            if (sValue.charAt(0) != 'Z') {
+            if (sValue.charAt(0) !== 'Z') {
                 var oParsedTZ = oParseHelper.parseTZ(sValue.substr(iLength), true);
                 iLength += oParsedTZ.length;
                 iTZDiff = oParsedTZ.tzDiff;
@@ -1180,7 +1187,7 @@ DateFormat.prototype.oSymbols = {
             var iHourOffset = Math.floor(iTZOffset / 60);
             var iMinuteOffset = iTZOffset % 60;
             var sTimeZone = '';
-            if (!bUTC && iTZOffset != 0) {
+            if (!bUTC) {
                 sTimeZone += bPositiveOffset ? '-' : '+';
                 sTimeZone += String(iHourOffset).padStart(2, '0');
                 sTimeZone += String(iMinuteOffset).padStart(2, '0');
@@ -1202,21 +1209,25 @@ DateFormat.prototype.oSymbols = {
             if (!bUTC && iTZOffset != 0) {
                 sTimeZone += bPositiveOffset ? '-' : '+';
                 sTimeZone += String(iHourOffset).padStart(2, '0');
-                sTimeZone += ':';
-                sTimeZone += String(iMinuteOffset).padStart(2, '0');
+                if (oField.digits > 1 || iMinuteOffset > 0) {
+                    if (oField.digits === 3 || oField.digits === 5) {
+                        sTimeZone += ':';
+                    }
+                    sTimeZone += String(iMinuteOffset).padStart(2, '0');
+                }
             } else {
                 sTimeZone += 'Z';
             }
             return sTimeZone;
         },
         parse: function (sValue, oPart, oFormat, oConfig) {
-            if (sValue.charAt(0) == 'Z') {
+            if (sValue.charAt(0) === 'Z') {
                 return {
                     length: 1,
                     tzDiff: 0
                 };
             } else {
-                return oParseHelper.parseTZ(sValue, true);
+                return oParseHelper.parseTZ(sValue, oPart.digits === 3 || oPart.digits === 5);
             }
         }
     }
@@ -1818,10 +1829,12 @@ function cutDateFields(oDate, iStartIndex) {
             'Seconds',
             'Milliseconds'
         ], sMethodName;
+    var oDateCopy = new Date(oDate.getTime());
     for (var i = iStartIndex; i < aFields.length; i++) {
         sMethodName = 'set' + aFields[iStartIndex];
-        oDate[sMethodName].apply(oDate, [0]);
+        oDateCopy[sMethodName].apply(oDateCopy, [0]);
     }
+    return oDateCopy;
 }
 var mRelativeDiffs = {
     year: function (oFromDate, oToDate) {
@@ -1833,28 +1846,28 @@ var mRelativeDiffs = {
     week: function (oFromDate, oToDate, oFormat) {
         var iFromDay = oFormat._adaptDayOfWeek(oFromDate.getDay());
         var iToDay = oFormat._adaptDayOfWeek(oToDate.getDay());
-        cutDateFields(oFromDate, 3);
-        cutDateFields(oToDate, 3);
+        oFromDate = cutDateFields(oFromDate, 3);
+        oToDate = cutDateFields(oToDate, 3);
         return (oToDate.getTime() - oFromDate.getTime() - (iToDay - iFromDay) * oFormat._mScales.day * 1000) / (oFormat._mScales.week * 1000);
     },
     day: function (oFromDate, oToDate, oFormat) {
-        cutDateFields(oFromDate, 3);
-        cutDateFields(oToDate, 3);
+        oFromDate = cutDateFields(oFromDate, 3);
+        oToDate = cutDateFields(oToDate, 3);
         return (oToDate.getTime() - oFromDate.getTime()) / (oFormat._mScales.day * 1000);
     },
     hour: function (oFromDate, oToDate, oFormat) {
-        cutDateFields(oFromDate, 4);
-        cutDateFields(oToDate, 4);
+        oFromDate = cutDateFields(oFromDate, 4);
+        oToDate = cutDateFields(oToDate, 4);
         return (oToDate.getTime() - oFromDate.getTime()) / (oFormat._mScales.hour * 1000);
     },
     minute: function (oFromDate, oToDate, oFormat) {
-        cutDateFields(oFromDate, 5);
-        cutDateFields(oToDate, 5);
+        oFromDate = cutDateFields(oFromDate, 5);
+        oToDate = cutDateFields(oToDate, 5);
         return (oToDate.getTime() - oFromDate.getTime()) / (oFormat._mScales.minute * 1000);
     },
     second: function (oFromDate, oToDate, oFormat) {
-        cutDateFields(oFromDate, 6);
-        cutDateFields(oToDate, 6);
+        oFromDate = cutDateFields(oFromDate, 6);
+        oToDate = cutDateFields(oToDate, 6);
         return (oToDate.getTime() - oFromDate.getTime()) / (oFormat._mScales.second * 1000);
     }
 };

package/hash.txt

@@ -0,0 +1 @@
+WxDe3QUtrOjzNXLHZ65GIiIMnKU=

package/package-scripts.js

@@ -1,19 +1,27 @@
+const resolve = require("resolve");
+const generateHash = resolve.sync("@ui5/webcomponents-tools/lib/hash/generate.js");
+const hashIsUpToDate = resolve.sync("@ui5/webcomponents-tools/lib/hash/upToDate.js");
+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 UP_TO_DATE = `node "${hashIsUpToDate}" dist/ hash.txt && echo "Up to date."`;
+
 const scripts = {
 	clean: "rimraf dist",
 	lint: "eslint . --config config/.eslintrc.js",
 	build: {
-		"default": "path-exists dist/ || nps build.all",
+		"default": `${UP_TO_DATE} || nps build.all hash`,
 		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",
 		"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/`,
@@ -23,6 +31,7 @@ const scripts = {
 		src: `nps "copy.src --watch --skip-initial-copy"`,
 	},
 	start: "nps watch",
+	hash: `node ${generateHash} dist/ hash.txt`
 };
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ui5/webcomponents-localization",
-  "version": "0.0.0-b4cbc43ba",
+  "version": "0.0.0-b93c2a321",
   "description": "Localization for UI5 Web Components",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,28 +14,26 @@
     "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",
     "start": "nps start",
     "build": "nps build",
+    "hash": "nps hash",
     "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-b4cbc43ba",
-    "chromedriver": "88.0.0",
-    "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"
+    "@ui5/webcomponents-tools": "0.0.0-b93c2a321",
+    "chromedriver": "100.0.0",
+    "mkdirp": "^1.0.4",
+    "resolve": "^1.20.0"
   },
   "dependencies": {
-    "@ui5/webcomponents-base": "0.0.0-b4cbc43ba"
+    "@ui5/webcomponents-base": "0.0.0-b93c2a321"
   }
 }

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/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;