@openui5/sap.ui.core 1.120.7 → 1.121.0

package/src/sap/ui/test/starter/_utils.js

@@ -274,6 +274,19 @@ sap.ui.define([
 
 	}
 
+	function registerResourceRoots(oScriptTag) {
+		const sResourceRoots = getAttribute("data-sap-ui-resource-roots");
+		if (!sResourceRoots) {
+			return;
+		}
+		const oResourceRoots = JSON.parse(sResourceRoots);
+		const paths = {};
+		for (const n in oResourceRoots) {
+			paths[n.replace(/\./g, "/")] = oResourceRoots[n] || ".";
+		}
+		sap.ui.loader.config({ paths });
+	}
+
 	sap.ui.loader.config({
 		paths: {
 			'test-resources': sap.ui.require.toUrl("") + "/../test-resources/"
@@ -287,7 +300,8 @@ sap.ui.define([
 		getAttribute: getAttribute,
 		getDefaultSuiteName: getDefaultSuiteName,
 		getSuiteConfig: getSuiteConfig,
-		whenDOMReady: whenDOMReady
+		whenDOMReady: whenDOMReady,
+		registerResourceRoots: registerResourceRoots
 	};
 
 });

package/src/sap/ui/test/starter/createSuite.js

@@ -179,6 +179,8 @@
 
 	}
 
+	utils.registerResourceRoots();
+
 	var sSuiteName = utils.getAttribute("data-sap-ui-testsuite") || utils.getDefaultSuiteName();
 	var whenLoaded = utils.getSuiteConfig(sSuiteName);
 

package/src/sap/ui/thirdparty/RequestRecorder.js

@@ -73,7 +73,7 @@
 		 * @returns {number} Timestamp with milliseconds
 		 */
 		preciseDateNow: function() {
-			return window.performance.timing.navigationStart + window.performance.now();
+			return window.performance.timeOrigin + window.performance.now();
 		},
 
 		/**

package/src/sap/ui/thirdparty/crossroads.js

@@ -700,6 +700,9 @@ var factory = function (signals) {
                 }
 
                 if (vParamValue != null) {
+                    if (match.indexOf('{') !== -1 && vParamValue === "") {
+                        throw new Error('The required segment "'+ match +'" cannot accept empty string as value.');
+                    }
                     if (typeof vParamValue === 'object') {
                         var queryParts = [];
                         for (var key in vParamValue) {

package/src/sap/ui/thirdparty/qunit-2.js

@@ -22,8 +22,7 @@
   // the goal is to prevent QUnit timeouts while test is already paused.
   if (window && window.sap && window.sap.ui && window.sap.ui.require) {
     try {
-      var QUnitPause = window.sap.ui.require("sap/ui/test/qunitPause") || window.sap.ui.requireSync("sap/ui/test/qunitPause"); // legacy-relevant
-      QUnitPause.setupBeforeQUnit();
+      window.sap.ui.require("sap/ui/test/qunitPause") || window.sap.ui.requireSync("sap/ui/test/qunitPause"); // legacy-relevant
     } catch (e) {
       console.warn("Could not find module sap/ui/test/qunitPause. Details: " + e);
     }

package/src/sap/ui/thirdparty/qunit-reporter-junit.js

@@ -16,6 +16,13 @@
 (function() {
 	'use strict';
 
+	// ##### BEGIN: MODIFIED BY SAP
+	// Prevent script from being executed twice (from sap/ui/thirdparty/qunit-reporter-junit.js + copy within sap/ui/qunit/qunit-junit.js)
+	if (QUnit.jUnitDone) {
+		return;
+	}
+	// ##### END: MODIFIED BY SAP
+
 	var currentRun, currentModule, currentTest, assertCount,
 			jUnitReportData, _executeRegisteredCallbacks,
 			// ##### BEGIN: MODIFIED BY SAP
@@ -68,6 +75,18 @@
 			start: new Date(),
 			time: 0
 		};
+		// ##### BEGIN: MODIFIED BY SAP
+		// Register testDone callback late so that `currentTest` is more likely to be defined
+		// even when another `testDone` callback uses e.g. `QUnit.log` / `QUnit.push(Failure)`
+		QUnit.testDone(function(data) {
+			currentTest.time = (new Date()).getTime() - currentTest.start.getTime();  // ms
+			currentTest.total = data.total;
+			currentTest.passed = data.passed;
+			currentTest.failed = data.failed;
+
+			currentTest = null;
+		});
+		// ##### END: MODIFIED BY SAP
 	});
 
 	QUnit.moduleStart(function(data) {
@@ -138,14 +157,17 @@
 		}
 	});
 
-	QUnit.testDone(function(data) {
-		currentTest.time = (new Date()).getTime() - currentTest.start.getTime();  // ms
-		currentTest.total = data.total;
-		currentTest.passed = data.passed;
-		currentTest.failed = data.failed;
-
-		currentTest = null;
-	});
+	// ##### BEGIN: MODIFIED BY SAP
+	// Moved into `QUnit.begin` callback
+	//QUnit.testDone(function(data) {
+	//	currentTest.time = (new Date()).getTime() - currentTest.start.getTime();  // ms
+	//	currentTest.total = data.total;
+	//	currentTest.passed = data.passed;
+	//	currentTest.failed = data.failed;
+	//
+	//	currentTest = null;
+	//});
+	// ##### END: MODIFIED BY SAP
 
 	QUnit.moduleDone(function(data) {
 		currentModule.time = (new Date()).getTime() - currentModule.start.getTime();  // ms

package/src/sap/ui/thirdparty/qunit.js

@@ -16,8 +16,7 @@
 	// the goal is to prevent QUnit timeouts while test is already paused.
 	if (window && window.sap && window.sap.ui && window.sap.ui.require) {
 		try {
-			var QUnitPause = window.sap.ui.require("sap/ui/test/qunitPause") || window.sap.ui.requireSync("sap/ui/test/qunitPause"); // legacy-relevant
-			QUnitPause.setupBeforeQUnit();
+			window.sap.ui.require("sap/ui/test/qunitPause") || window.sap.ui.requireSync("sap/ui/test/qunitPause"); // legacy-relevant
 		} catch (e) {
 			window.console.warn("Could not find module sap/ui/test/qunitPause. Details: " + e);
 		}

package/src/sap/ui/util/Storage.js

@@ -277,7 +277,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 */
 	Storage.Type = {
 		/**

package/src/ui5loader-autoconfig.js

@@ -965,12 +965,22 @@
 
 	})();
 
-	if (BaseConfig.get({
+	const bFuture = BaseConfig.get({
+		name: "sapUiXxFuture",
+		type: BaseConfig.Type.Boolean,
+		external: true,
+		freeze: true
+	});
+
+	// xx-future implicitly sets the loader to async
+	const bAsync = BaseConfig.get({
 		name: "sapUiAsync",
 		type: BaseConfig.Type.Boolean,
 		external: true,
 		freeze: true
-	})) {
+	}) || bFuture;
+
+	if (bAsync) {
 		ui5loader.config({
 			async: true
 		});
@@ -1002,12 +1012,16 @@
 
 	//calculate syncCallBehavior
 	let syncCallBehavior = 0; // ignore
-	const sNoSync = BaseConfig.get({
+	let sNoSync = BaseConfig.get({ // call must be made to ensure freezing
 		name: "sapUiXxNoSync",
 		type: BaseConfig.Type.String,
 		external: true,
 		freeze: true
 	});
+
+	// sap-ui-xx-future enforces strict sync call behavior
+	sNoSync = bFuture ? "x" : sNoSync;
+
 	if (sNoSync === 'warn') {
 		syncCallBehavior = 1;
 	} else if (/^(true|x)$/i.test(sNoSync)) {
@@ -1015,7 +1029,7 @@
 	}
 
 	/**
-	 * @deprectaed As of Version 1.120
+	 * @deprecated As of Version 1.120
 	 */
 	(() => {
 		const GlobalConfigurationProvider = sap.ui.require("sap/base/config/GlobalConfigurationProvider");

package/src/ui5loader.js

@@ -1010,7 +1010,8 @@
 		 */
 		dependsOn(oDependantModule) {
 			const dependant = oDependantModule.name,
-				visited = Object.create(null);
+				visited = Object.create(null),
+				stack = log.isLoggable() ? [this.name, dependant] : undefined;
 
 			// log.debug("checking for a cycle between", this.name, "and", dependant);
 			function visit(mod) {
@@ -1018,13 +1019,22 @@
 					// log.debug("  ", mod);
 					visited[mod] = true;
 					const pending = mModules[mod]?.pending;
-					return Array.isArray(pending) &&
-						(pending.indexOf(dependant) >= 0 || pending.some(visit));
+					if (Array.isArray(pending) &&
+						(pending.includes(dependant) || pending.some(visit)) ) {
+						stack?.push(mod);
+						return true;
+					}
 				}
 				return false;
 			}
 
-			return this.name === dependant || visit(this.name);
+			const result = this.name === dependant || visit(this.name);
+			if ( result && stack ) {
+				log.error("Dependency cycle detected: ",
+					stack.reverse().map((entry, idx) => `${"".padEnd(idx)} -> ${entry}`).join("\n").slice(4)
+				);
+			}
+			return result;
 		}
 
 		/**
@@ -2009,6 +2019,7 @@
 			queue.push(sResourceName, aDependencies, vFactory, bExport);
 			if ( sResourceName != null ) {
 				const oModule = Module.get(sResourceName);
+				// change state of PRELOADED or INITIAL modules to prevent further requests/executions
 				if ( oModule.state <= INITIAL ) {
 					oModule.state = EXECUTING;
 					oModule.async = true;

package/test/sap/ui/core/DateFormat.controller.js

@@ -1,15 +1,15 @@
 sap.ui.define([
 	"./FormatHelper",
+	"sap/base/i18n/Formatting",
 	"sap/base/util/deepEqual",
 	"sap/base/util/JSTokenizer",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/Locale",
 	"sap/ui/core/date/CalendarWeekNumbering",
 	"sap/ui/core/date/UI5Date",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/model/json/JSONModel"
-], function (FormatHelper, deepEqual, JSTokenizer, Configuration, Locale, CalendarWeekNumbering,
+], function (FormatHelper, Formatting, deepEqual, JSTokenizer, Locale, CalendarWeekNumbering,
 		UI5Date, DateFormat, Controller, JSONModel
 ) {
 	"use strict";
@@ -121,7 +121,7 @@ sap.ui.define([
 					}
 				};
 
-			var oCurrentLocale = Configuration.getFormatSettings().getFormatLocale();
+			var oCurrentLocale = new Locale(Formatting.getLanguageTag());
 			var sLocale = oCurrentLocale.getLanguage();
 			if (oCurrentLocale.getRegion()) {
 				sLocale += "-" + oCurrentLocale.getRegion();

package/test/sap/ui/core/ILabelableInterface.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>ILabelable Interface - sap.ui.core</title>
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<script src="shared-config.js"></script>
+		<script id="sap-ui-bootstrap"
+				src='../../../../resources/sap-ui-core.js'
+				data-sap-ui-async="true"
+				data-sap-ui-compatVersion="edge"
+				data-sap-ui-libs="sap.m"
+				data-sap-ui-onInit="module:local/ILabelableInterface"
+				data-sap-ui-resourceRoots='{
+					"local": "./"
+				}'>
+		</script>
+	</head>
+	<body id="body" class="sapUiBody">
+	</body>
+</html>

package/test/sap/ui/core/ILabelableInterface.js

@@ -0,0 +1,81 @@
+sap.ui.define([
+	"sap/ui/core/Control",
+	"sap/m/App",
+	"sap/m/Label",
+	"sap/m/Page",
+	"sap/m/HBox"
+], function(
+	Control,
+	App,
+	Label,
+	Page,
+	HBox
+) {
+	"use strict";
+
+	var CustomControlClass = Control.extend("CustomControlClass", {
+		metadata: {
+			interfaces : [
+				"sap.ui.core.ILabelable"
+			],
+			properties: {
+				isInput: {
+					type: "boolean",
+					defaultValue: false
+				}
+			}
+		},
+		renderer: {
+			apiVersion: 2,
+			render: function (oRm, oControl) {
+				if (oControl.getIsInput()) {
+					oRm.voidStart("input", oControl)
+						.voidEnd();
+				} else {
+					oRm.openStart("span", oControl)
+						.openEnd()
+						.text("Some text")
+						.close("span");
+				}
+			}
+		},
+		hasLabelableHTMLElement: function () {
+			return this.getIsInput();
+		}
+	});
+
+	var oPage = new Page("myPage", {
+		title: "sap.ui.core.ILabelable Interface Test Page",
+		content: [
+			new HBox({
+				items: [
+					new Label({
+						text: "Label 1",
+						labelFor: "id1"
+					}),
+					new CustomControlClass("id1", {
+						isInput: true
+					})
+				]
+			}),
+			new HBox({
+				items: [
+					new Label({
+						text: "Label 2",
+						labelFor: "id2"
+					}),
+					new CustomControlClass("id2", {
+						isInput: false
+					})
+				]
+			})
+		]
+	});
+
+	var oApp = new App("myApp", {
+		initialPage:"myPage"
+	});
+	oApp.addPage(oPage);
+
+	oApp.placeAt("body");
+});

package/test/sap/ui/core/NumberFormat.controller.js

@@ -1,14 +1,14 @@
 sap.ui.define([
 	"./FormatHelper",
+	"sap/base/i18n/Formatting",
 	"sap/base/util/deepEqual",
 	"sap/base/util/JSTokenizer",
 	"sap/ui/core/format/NumberFormat",
 	"sap/ui/core/Locale",
 	"sap/ui/core/LocaleData",
 	"sap/ui/core/mvc/Controller",
-	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/Configuration"
-], function(FormatHelper, deepEqual, JSTokenizer, NumberFormat, Locale, LocaleData, Controller, JSONModel, Configuration) {
+	"sap/ui/model/json/JSONModel"
+], function(FormatHelper, Formatting, deepEqual, JSTokenizer, NumberFormat, Locale, LocaleData, Controller, JSONModel) {
 	"use strict";
 
 	return Controller.extend("DateFormat", {
@@ -183,7 +183,7 @@ sap.ui.define([
 				};
 
 
-			var oCurrentLocale = Configuration.getFormatSettings().getFormatLocale();
+			var oCurrentLocale = new Locale(Formatting.getLanguageTag());
 			var sLocale = oCurrentLocale.getLanguage();
 			if (oCurrentLocale.getRegion()) {
 				sLocale += "-" + oCurrentLocale.getRegion();

package/test/sap/ui/core/Strings.controller.js

@@ -1,9 +1,9 @@
 sap.ui.define([
+	"sap/base/i18n/Localization",
 	"sap/ui/core/format/NumberFormat",
 	"sap/ui/core/mvc/Controller",
-	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/Configuration"
-], function(NumberFormat, Controller, JSONModel, Configuration) {
+	"sap/ui/model/json/JSONModel"
+], function(Localization, NumberFormat, Controller, JSONModel) {
 	"use strict";
 
 	return Controller.extend("DateFormat", {
@@ -65,7 +65,7 @@ sap.ui.define([
 
 		onRTLChange: function(oEvent) {
 			var bState = oEvent.getParameter("state");
-			Configuration.setRTL(bState);
+			Localization.setRTL(bState);
 			this.getView().getModel().setProperty("/rtl", bState ? "RTL" : "LTR");
 		},
 

package/test/sap/ui/core/demokit/docuindex.json

@@ -5,7 +5,7 @@
 			{
 				"icon": "map-2",
 				"text": "Employee Directory",
-				"desc": "This app is an employee directory and shows the final result of the 'Navigation Tutorial'",
+				"desc": "This app is an employee directory and shows the final result of the 'Navigation Tutorial'.",
 				"ref": "test-resources/sap/ui/core/demokit/tutorial/navigation/17/webapp/index.html",
 				"links": {
 					"View Tutorial": "topic/1b6dcd39a6a74f528b27ddb22f15af0d"
@@ -96,7 +96,8 @@
 				"since" : "1.30",
 				"samples" : [
 					"sap.ui.core.sample.View.async",
-					"sap.ui.core.sample.View.preprocessor"
+					"sap.ui.core.sample.View.preprocessor",
+					"sap.ui.core.sample.View.navigationTypedView"
 				]
 			},
 			{
@@ -611,6 +612,11 @@
 				"name": "Preprocessor example with XMLView",
 				"description": "A small example for View Preprocessor usage with XMLViews."
 			},
+			{
+				"id": "sap.ui.core.sample.View.navigationTypedView",
+				"name": "Typed View",
+				"description": "Based on defining views via Typed Views primarily, this small sample demonstrates basic routing configuration, event handler registration, asynchronous content creation incl. JS fragments and stable IDs. See the provided sample code."
+			},
 			{
 				"id": "sap.ui.core.sample.odata.v4.ConsumeV2Service",
 				"name": "OData V2 Service Consumption",

package/test/sap/ui/core/demokit/sample/MessageManager/ODataBackendMessagesComp/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.7" #MainVersion#
+  version: "1.121.0" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.core

package/test/sap/ui/core/demokit/sample/RoutingNestedComponent/Component.js

@@ -1,13 +1,12 @@
 sap.ui.define([
-	"sap/ui/core/library",
 	"sap/ui/core/sample/RoutingNestedComponent/base/BaseComponent"
-], function(library, BaseComponent) {
+], function(BaseComponent) {
 		"use strict";
 
 		return BaseComponent.extend("sap.ui.core.sample.RoutingNestedComponent.Component", {
 			metadata: {
 				manifest: "json",
-				interfaces: [library.IAsyncContentCreation]
+				interfaces: ["sap.ui.core.IAsyncContentCreation"]
 			},
 			// define the events which are fired from the reuse components
 			//

package/test/sap/ui/core/demokit/sample/RoutingNestedComponent/css/style.css

@@ -1,12 +1,12 @@
-li.sapTntNavLIItemSelected[id$="suppliersItem"] > div.sapTntNavLIItem {
+li.sapTntNLISelected[id$="suppliersItem"] > div.sapTntNLI {
 	background-color: antiquewhite;
 }
 
-li.sapTntNavLIItemSelected[id$="categoriesItem"] > div.sapTntNavLIItem {
+li.sapTntNLISelected[id$="categoriesItem"] > div.sapTntNLI {
 	background-color: aquamarine;
 }
 
-li.sapTntNavLIItemSelected[id$="productsItem"] > div.sapTntNavLIItem {
+li.sapTntNLISelected[id$="productsItem"] > div.sapTntNLI {
 	background-color: lightblue;
 }
 

package/test/sap/ui/core/demokit/sample/RoutingNestedComponent/reuse/categories/Component.js

@@ -1,13 +1,12 @@
 sap.ui.define([
-	"sap/ui/core/library",
 	"sap/ui/core/sample/RoutingNestedComponent/base/BaseComponent"
-], function(library, BaseComponent) {
+], function(BaseComponent) {
 	"use strict";
 
 	return BaseComponent.extend("sap.ui.core.sample.RoutingNestedComponent.reuse.categories.Component", {
 		metadata: {
 			manifest: "json",
-			interfaces: [library.IAsyncContentCreation]
+			interfaces: ["sap.ui.core.IAsyncContentCreation"]
 		},
 		eventMappings: {
 			productsComponent: [{

package/test/sap/ui/core/demokit/sample/RoutingNestedComponent/reuse/products/Component.js

@@ -1,13 +1,12 @@
 sap.ui.define([
-	"sap/ui/core/library",
 	"sap/ui/core/sample/RoutingNestedComponent/base/BaseComponent",
 	"sap/ui/core/Component"
-], function(library, BaseComponent, Component) {
+], function(BaseComponent, Component) {
 	"use strict";
 	return BaseComponent.extend("sap.ui.core.sample.RoutingNestedComponent.reuse.products.Component", {
 		metadata: {
 			manifest: "json",
-			interfaces: [library.IAsyncContentCreation]
+			interfaces: ["sap.ui.core.IAsyncContentCreation"]
 		},
 		init: function() {
 			BaseComponent.prototype.init.apply(this, arguments);

package/test/sap/ui/core/demokit/sample/RoutingNestedComponent/reuse/suppliers/Component.js

@@ -1,13 +1,12 @@
 sap.ui.define([
-	"sap/ui/core/library",
 	"sap/ui/core/sample/RoutingNestedComponent/base/BaseComponent"
-], function(library, BaseComponent) {
+], function(BaseComponent) {
 	"use strict";
 
 	return BaseComponent.extend("sap.ui.core.sample.RoutingNestedComponent.reuse.suppliers.Component", {
 		metadata: {
 			manifest: "json",
-			interfaces: [library.IAsyncContentCreation]
+			interfaces: ["sap.ui.core.IAsyncContentCreation"]
 		},
 		eventMappings: {
 			productsComponent: [{

package/test/sap/ui/core/demokit/sample/View/navigationTypedView/Component.js

@@ -0,0 +1,20 @@
+sap.ui.define([
+	"sap/ui/core/UIComponent"
+], (UIComponent) => {
+	"use strict";
+
+	return UIComponent.extend("sap.ui.core.sample.View.navigationTypedView.Component", {
+		metadata: {
+			interfaces: [
+				"sap.ui.core.IAsyncContentCreation"
+			],
+			manifest: "json"
+		},
+
+		init() {
+			UIComponent.prototype.init.apply(this, arguments);
+			this.getRouter().initialize();
+		}
+
+	});
+});

package/test/sap/ui/core/demokit/sample/View/navigationTypedView/controller/Home.controller.js

@@ -0,0 +1,14 @@
+sap.ui.define([
+	"sap/ui/core/mvc/Controller",
+	"sap/ui/core/UIComponent"
+], (Controller, UIComponent) => {
+	"use strict";
+
+	return Controller.extend("sap.ui.core.sample.View.navigationTypedView.controller.Home", {
+		navToNext() {
+			const oRouter = UIComponent.getRouterFor(this);
+			oRouter.navTo("next");
+		}
+
+	});
+});

package/test/sap/ui/core/demokit/sample/View/navigationTypedView/controller/Next.controller.js

@@ -0,0 +1,21 @@
+sap.ui.define([
+	"sap/ui/core/mvc/Controller",
+	"sap/ui/core/routing/History"
+], (Controller, History) => {
+	"use strict";
+
+	return Controller.extend("sap.ui.core.sample.View.navigationTypedView.controller.Next", {
+		onNavButtonPress(oController, sHomeRouteName) {
+			if (History.getInstance().getPreviousHash() !== undefined) {
+				window.history.go(-1);
+			} else {
+				// User visited this Next view directly via a deep link.
+				sap.ui.require(["sap/ui/core/UIComponent"], (UIComponent) => {
+					const oRouter = UIComponent.getRouterFor(oController);
+					oRouter.navTo(sHomeRouteName); // Allow the user to navigate up to home.
+				});
+			}
+		}
+
+	});
+});