@openui5/sap.ui.core 1.136.4 → 1.136.6

package/src/sap/ui/model/odata/v4/lib/_Cache.js

@@ -586,7 +586,7 @@ sap.ui.define([
 					_Helper.getPrivateAnnotation(oEntityData, "select"));
 				if (!bDeepCreate) { // after a deep create the complete response is accepted
 					aSelect = _Helper.getQueryOptionsForPath(
-						that.mLateQueryOptions || that.mQueryOptions, sPath
+						that.mLateExpandSelect || that.mQueryOptions, sPath
 					).$select;
 				}
 				// update selected properties (or in case of a deep create all of them incl.
@@ -998,7 +998,7 @@ sap.ui.define([
 			}
 		}
 
-		if (!(this.mLateQueryOptions || this.mQueryOptions && this.mQueryOptions.$select)) {
+		if (!(this.mLateExpandSelect || this.mQueryOptions && this.mQueryOptions.$select)) {
 			return false; // no autoExpandSelect
 		}
 
@@ -1011,7 +1011,7 @@ sap.ui.define([
 		aUpdateProperties = [sRequestedPropertyPath];
 
 		sFullResourceMetaPath = _Helper.buildPath(this.sMetaPath, sResourceMetaPath);
-		mQueryOptions = this.mLateQueryOptions
+		mQueryOptions = this.mLateExpandSelect
 			|| { // ensure that $select precedes $expand in the resulting query
 				$select : this.mQueryOptions.$select,
 				$expand : this.mQueryOptions.$expand
@@ -1284,18 +1284,6 @@ sap.ui.define([
 		return aFilteredElements;
 	};
 
-	/**
-	 * Returns the query options for late properties.
-	 *
-	 * @returns {object} The late query options
-	 *
-	 * @public
-	 * @see #setLateQueryOptions
-	 */
-	_Cache.prototype.getLateQueryOptions = function () {
-		return this.mLateQueryOptions;
-	};
-
 	/**
 	 * Returns a promise that is pending while DELETEs or POSTs are being sent, or
 	 * <code>null</code> in case no such requests are currently being sent.
@@ -1511,10 +1499,10 @@ sap.ui.define([
 				throw new Error("No key predicate known");
 			}
 			sReadUrl = _Helper.buildPath(that.sResourcePath, sPath, sPredicate);
-			if (bKeepAlive && that.mLateQueryOptions) {
+			if (bKeepAlive && that.mLateExpandSelect) {
 				// bKeepAlive === true -> own cache of the list binding -> sPath === ''
 				// -> no need to apply _Helper.getQueryOptionsForPath
-				_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
+				_Helper.aggregateExpandSelect(mQueryOptions, that.mLateExpandSelect);
 			}
 			if (sMessagesPath && mQueryOptions.$select
 				&& !mQueryOptions.$select.includes(sMessagesPath)) {
@@ -1522,19 +1510,17 @@ sap.ui.define([
 				mQueryOptions.$select.push(sMessagesPath);
 				bKeepReportedMessagesPath = true;
 			}
-			// drop collection related system query options
-			delete mQueryOptions.$apply;
-			delete mQueryOptions.$count;
-			delete mQueryOptions.$filter;
-			delete mQueryOptions.$orderby;
-			delete mQueryOptions.$search;
-			sReadUrl += that.oRequestor.buildQueryString(that.sMetaPath, mQueryOptions, false,
-				that.bSortExpandSelect);
+			const mMergeableQueryOptions = _Helper.extractMergeableQueryOptions(mQueryOptions);
+			mMergeableQueryOptions.$$sortIfMerged = true;
+			sReadUrl += that.oRequestor.buildQueryString(that.sMetaPath, mQueryOptions,
+				// drop system query options to allow merging with late property requests
+				/*bDropSystemQueryOptions*/true, that.bSortExpandSelect);
 
 			that.bSentRequest = true;
 			return SyncPromise.all([
 				that.oRequestor
-					.request("GET", sReadUrl, oGroupLock, undefined, undefined, fnDataRequested),
+					.request("GET", sReadUrl, oGroupLock, undefined, undefined, fnDataRequested,
+						undefined, undefined, undefined, undefined, mMergeableQueryOptions),
 				that.fetchTypes()
 			]).then(function (aResult) {
 				var oElement = aResult[0];
@@ -1641,10 +1627,10 @@ sap.ui.define([
 
 			that.bSentRequest = true;
 			if (bKeepAlive) {
-				if (that.mLateQueryOptions) {
+				if (that.mLateExpandSelect) {
 					// bKeepAlive === true -> own cache of the list binding -> sPath === ''
 					// -> no need to apply _Helper.getQueryOptionsForPath
-					_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
+					_Helper.aggregateExpandSelect(mQueryOptions, that.mLateExpandSelect);
 				}
 				// clone query options for possible second request to check if entity is in
 				// the collection
@@ -2042,26 +2028,25 @@ sap.ui.define([
 
 	/**
 	 * Sets query options after the cache has sent a request to allow adding late properties.
-	 * Accepts only $expand and $select.
+	 * Remembers only $expand and $select, and ignores others.
 	 *
 	 * @param {object} mQueryOptions
 	 *   The new late query options or <code>null</code> to reset
 	 *
 	 * @public
-	 * @see #getLateQueryOptions
 	 * @see #hasSentRequest
 	 */
 	_Cache.prototype.setLateQueryOptions = function (mQueryOptions) {
 		// this.checkSharedRequest(); // don't do that here! it might work well enough
 		if (mQueryOptions) {
-			this.mLateQueryOptions = {
+			this.mLateExpandSelect = {
 				// must contain both properties for requestSideEffects
 				// ensure that $select precedes $expand in the resulting query
 				$select : mQueryOptions.$select,
 				$expand : mQueryOptions.$expand
 			};
 		} else {
-			this.mLateQueryOptions = null;
+			this.mLateExpandSelect = null;
 		}
 	};
 
@@ -2141,7 +2126,7 @@ sap.ui.define([
 		this.oTypePromise = undefined;
 
 		// the query options extended by $select for late properties
-		this.mLateQueryOptions = null;
+		this.mLateExpandSelect = null;
 		// map from resource path to request Promise for pending late property requests
 		this.mPropertyRequestByPath = {};
 	};
@@ -3542,8 +3527,8 @@ sap.ui.define([
 			var aKeyFilters,
 				mQueryOptions = _Helper.clone(that.mQueryOptions);
 
-			if (that.mLateQueryOptions) {
-				_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
+			if (that.mLateExpandSelect) {
+				_Helper.aggregateExpandSelect(mQueryOptions, that.mLateExpandSelect);
 			}
 			if (bDropApply) {
 				delete mQueryOptions.$apply;
@@ -3940,7 +3925,7 @@ sap.ui.define([
 		this.checkSharedRequest();
 
 		mQueryOptions = _Helper.intersectQueryOptions(
-			Object.assign({}, this.mQueryOptions, this.mLateQueryOptions), aPaths,
+			Object.assign({}, this.mQueryOptions, this.mLateExpandSelect), aPaths,
 			this.oRequestor.getModelInterface().fetchMetadata, this.sMetaPath, "", bWithMessages);
 		if (!mQueryOptions) {
 			return SyncPromise.resolve(); // micro optimization: use *sync.* promise which is cached
@@ -4651,7 +4636,7 @@ sap.ui.define([
 		this.checkSharedRequest();
 
 		mQueryOptions = this.oPromise && _Helper.intersectQueryOptions(
-			Object.assign({}, this.mQueryOptions, this.mLateQueryOptions), aPaths,
+			Object.assign({}, this.mQueryOptions, this.mLateExpandSelect), aPaths,
 			this.oRequestor.getModelInterface().fetchMetadata, this.sMetaPath);
 		if (!mQueryOptions) {
 			return SyncPromise.resolve();
@@ -4776,7 +4761,7 @@ sap.ui.define([
 
 	/**
 	 * Delegates to #fetchValue of its shared OData Singleton _SingleCache. Within the 1st call its
-	 * own relative property path is added to the mLateQueryOptions of its _SingleCache.
+	 * own relative property path is added to the mLateExpandSelect of its _SingleCache.
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
 	 *   A lock for the group to associate the request with
@@ -4801,18 +4786,18 @@ sap.ui.define([
 	_SingletonPropertyCache.prototype.fetchValue = function (oGroupLock, _sPath, fnDataRequested,
 			oListener, bCreateOnDemand) {
 		var sPropertyPath = this.oSingleton.sResourcePath + "/" + this.sRelativePath,
-			mLateQueryOptions,
+			mLateExpandSelect,
 			oMetadataPromise = this.oMetadataPromise || this.oRequestor.getModelInterface()
 				.fetchMetadata("/" + _Helper.getMetaPath(sPropertyPath)),
 			that = this;
 
 		return oMetadataPromise.then(function () {
 			if (!that.oMetadataPromise) {
-				mLateQueryOptions = that.oSingleton.getLateQueryOptions() || {};
-				_Helper.aggregateExpandSelect(mLateQueryOptions,
+				mLateExpandSelect = that.oSingleton.mLateExpandSelect || {};
+				_Helper.aggregateExpandSelect(mLateExpandSelect,
 					_Helper.wrapChildQueryOptions("/" + that.oSingleton.sResourcePath,
 						that.sRelativePath, {}, that.oRequestor.getModelInterface().fetchMetadata));
-				that.oSingleton.setLateQueryOptions(mLateQueryOptions);
+				that.oSingleton.setLateQueryOptions(mLateExpandSelect);
 			}
 			that.oMetadataPromise = oMetadataPromise;
 			return that.oSingleton.fetchValue(oGroupLock, that.sRelativePath, fnDataRequested,

package/src/sap/ui/model/odata/v4/lib/_Helper.js

@@ -302,7 +302,8 @@ sap.ui.define([
 		/**
 		 * Builds a query string from the given parameter map. Takes care of encoding, but ensures
 		 * that the characters "$", "(", ")", ";" and "=" are not encoded, so that OData queries
-		 * remain readable.
+		 * remain readable. A parameter starting with "$$" is meant to be internal and does not
+		 * become part of the query string.
 		 *
 		 * ';' is not encoded although RFC 1866 encourages its usage as separator between query
 		 * parameters. However OData Version 4.0 Part 2 specifies that only '&' is a valid
@@ -330,7 +331,7 @@ sap.ui.define([
 				return "";
 			}
 
-			aKeys = Object.keys(mParameters);
+			aKeys = Object.keys(mParameters).filter((sKey) => !sKey.startsWith("$$"));
 			if (aKeys.length === 0) {
 				return "";
 			}
@@ -1002,24 +1003,21 @@ sap.ui.define([
 		 * Extracts the mergeable query options "$expand" and "$select" from the given ones, returns
 		 * them as a new map while replacing their value with "~" in the old map.
 		 *
-		 * @param {object} mQueryOptions
-		 *   The original query options, will be modified
-		 * @returns {object}
-		 *   The extracted query options
+		 * @param {object} mQueryOptions - The original query options to be MODIFIED
+		 * @returns {object} The extracted query options in the same order
 		 *
 		 * @public
 		 */
 		extractMergeableQueryOptions : function (mQueryOptions) {
 			var mExtractedQueryOptions = {};
 
-			if ("$expand" in mQueryOptions) {
-				mExtractedQueryOptions.$expand = mQueryOptions.$expand;
-				mQueryOptions.$expand = "~";
-			}
-			if ("$select" in mQueryOptions) {
-				mExtractedQueryOptions.$select = mQueryOptions.$select;
-				mQueryOptions.$select = "~";
-			}
+			// ensure to keep the order of the query options
+			Object.keys(mQueryOptions).forEach(function (sKey) {
+				if (sKey === "$expand" || sKey === "$select") {
+					mExtractedQueryOptions[sKey] = mQueryOptions[sKey];
+					mQueryOptions[sKey] = "~";
+				}
+			});
 
 			return mExtractedQueryOptions;
 		},

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -192,11 +192,14 @@ sap.ui.define([
 	 * @param {string} sResourcePath The resource path with possible query options and placeholders
 	 * @param {string} sMetaPath The absolute meta path matching the resource path
 	 * @param {object} mQueryOptions Query options to add to the resource path
+	 * @param {boolean} [bSortSystemQueryOptions]
+	 *   Whether system query options are sorted alphabetically and moved to the query string's end
 	 * @returns {string} The resource path with the query options
 	 *
 	 * @private
 	 */
-	_Requestor.prototype.addQueryString = function (sResourcePath, sMetaPath, mQueryOptions) {
+	_Requestor.prototype.addQueryString = function (sResourcePath, sMetaPath, mQueryOptions,
+			bSortSystemQueryOptions) {
 		var sQueryString;
 
 		mQueryOptions = this.convertQueryOptions(sMetaPath, mQueryOptions, false, true);
@@ -209,7 +212,7 @@ sap.ui.define([
 				return _Helper.encodePair(sOption, sValue);
 			});
 
-		sQueryString = _Helper.buildQuery(mQueryOptions);
+		sQueryString = _Helper.buildQuery(mQueryOptions, bSortSystemQueryOptions);
 		if (!sQueryString) {
 			return sResourcePath;
 		}
@@ -1266,6 +1269,9 @@ sap.ui.define([
 					if (oCandidate.$mergeRequests && oRequest.$mergeRequests) {
 						oCandidate.$mergeRequests(oRequest.$mergeRequests());
 					}
+					oCandidate.$sortSystemQueryOptions
+						||= oCandidate.$queryOptions.$$sortIfMerged
+							|| oRequest.$queryOptions.$$sortIfMerged;
 
 					return true;
 				}
@@ -1283,10 +1289,12 @@ sap.ui.define([
 			var mQueryOptions = oRequest.$queryOptions;
 
 			if (mQueryOptions) {
-				if (mQueryOptions.$expand && !mQueryOptions.$select.length) {
+				// if there was no $select, don't introduce one
+				if (mQueryOptions.$expand && mQueryOptions.$select?.length === 0) {
 					mQueryOptions.$select = Object.keys(mQueryOptions.$expand).sort().slice(0, 1);
 				}
-				oRequest.url = that.addQueryString(oRequest.url, oRequest.$metaPath, mQueryOptions);
+				oRequest.url = that.addQueryString(oRequest.url, oRequest.$metaPath, mQueryOptions,
+					oRequest.$sortSystemQueryOptions);
 			}
 		});
 		aResultingRequests.iChangeSet = aRequests.iChangeSet;
@@ -1833,10 +1841,12 @@ sap.ui.define([
 	 *   contain $expand
 	 * @param {any} [vOwner]
 	 *   An additional precondition for the merging of GET requests: the owner must be identical.
+	 *   This is probably relevant when using parameter <code>fnMergeRequests</code> to ensure both
+	 *   functions work well together.
 	 * @param {function(string[]):string[]} [fnMergeRequests]
 	 *   Function which is called during merging of GET or PATCH requests. If a merged request has a
-	 *   function given, this function will be called and its return value is
-	 *   given to the one remaining request's function as a parameter.
+	 *   function given, this function will be called and its return value is given to the one
+	 *   remaining request's function as a parameter. See also <code>vOwner</code>.
 	 * @returns {Promise}
 	 *   A promise on the outcome of the HTTP request; it will be rejected with an error having the
 	 *   property <code>canceled = true</code> instead of sending a request if

package/src/sap/ui/model/resource/ResourceModel.js

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Lib", 'sap/ui/model/SimpleType', 'sap/ui/model/Forma
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Float.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/String.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -30,7 +30,7 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/generic/TestBase.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

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

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

package/src/ui5loader.js

@@ -18,6 +18,26 @@
 (function(__global) {
 	"use strict";
 
+	// Polyfill `Promise.withResolvers` for older browsers.
+	if (typeof Promise.withResolvers === "undefined") {
+		Object.defineProperty(Promise, "withResolvers", {
+			writable: true,
+			configurable: true,
+			// enumerable: false
+			value: function() {
+				let resolve, reject;
+				return {
+					promise: new this((_resolve, _reject) => {
+						resolve = _resolve;
+						reject = _reject;
+					}),
+					resolve,
+					reject
+				};
+			}
+		});
+	}
+
 	/*
 	 * Helper function that removes any query and/or hash parts from the given URL.
 	 *
@@ -2696,7 +2716,7 @@
 	/**
 	 * Root namespace for JavaScript functionality provided by SAP SE.
 	 *
-	 * @version 1.136.4
+	 * @version 1.136.6
 	 * @namespace
 	 * @public
 	 * @name sap