@openui5/sap.ui.core 1.138.0 → 1.140.0

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

@@ -219,7 +219,7 @@ sap.ui.define([
 		*   If present, a recursive hierarchy w/o data aggregation is defined and
 		*   {@link _AggregationHelper.buildApply4Hierarchy} is invoked instead.
 		 * @param {object} [mQueryOptions={}]
-		 *   A map of key-value pairs representing the query string; it is not modified
+		 *   A read-only map of key-value pairs representing the query string
 		 * @param {boolean} [mQueryOptions.$count]
 		 *   The value for a "$count" system query option; it is removed from the returned map for a
 		 *   follow-up request or in case it is turned into an aggregate "$count as UI5__count"
@@ -434,7 +434,7 @@ sap.ui.define([
 		 * DistanceFromRoot, DrillState, LimitedDescendantCount, LimitedRank, NodeProperty, and
 		 * ParentNavigationProperty are stored at <code>oAggregation</code> using a "$" prefix (if
 		 * not already stored). The "com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchyActions"
-		 * annotation is stored as "$Actions".
+		 * annotation is stored as "$Actions". "expandTo" is normalized.
 		 *
 		 * @param {object} oAggregation
 		 *   An object holding the information needed for a recursive hierarchy; see
@@ -455,7 +455,7 @@ sap.ui.define([
 		 *   Like the value for a "$search" system query option (remember ODATA-1452); it is turned
 		 *   into the search expression parameter of an "ancestors()" transformation
 		 * @param {object} [mQueryOptions={}]
-		 *   A map of key-value pairs representing the query string; it is not modified
+		 *   A read-only map of key-value pairs representing the query string
 		 * @param {string} [mQueryOptions.$$filterBeforeAggregate]
 		 *   The value for a filter which identifies a parent node; it is removed from the returned
 		 *   map and turned into a "filter()" transformation
@@ -558,6 +558,9 @@ sap.ui.define([
 					delete mQueryOptions.$orderby;
 				}
 				oAggregation.expandTo ??= 1;
+				if (oAggregation.expandTo > Number.MAX_SAFE_INTEGER) { // normalization
+					oAggregation.expandTo = Number.MAX_SAFE_INTEGER;
+				}
 				const sExpandLevels = !bAllLevels && oAggregation.$ExpandLevels;
 				sApply += sSapHierarchy + "TopLevels(HierarchyNodes=$root"
 					+ (oAggregation.$path || "")
@@ -706,7 +709,7 @@ sap.ui.define([
 		 *   {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation}.
 		 * @param {string} [oAggregation.search] - Ignored
 		 * @param {object} mQueryOptions
-		 *   A map of key-value pairs representing the query string; it is not modified
+		 *   A read-only map of key-value pairs representing the query string
 		 * @param {string} [mQueryOptions.$$filterBeforeAggregate] - Removed from the returned map
 		 * @param {string} [mQueryOptions.$apply] - Replaced in the returned map
 		 * @param {string} [mQueryOptions.$count] - Removed from the returned map
@@ -793,7 +796,7 @@ sap.ui.define([
 		 * Returns a copy of the given query options with a filtered "$orderby".
 		 *
 		 * @param {object} mQueryOptions
-		 *   A map of key-value pairs representing the query string
+		 *   A read-only map of key-value pairs representing the query string
 		 * @param {object} oAggregation
 		 *   An object holding the information needed for data aggregation;
 		 *   (see {@link .buildApply})
@@ -1042,7 +1045,7 @@ sap.ui.define([
 		 * @param {object} oAggregation
 		 *   An object holding the information needed for data aggregation; see {@link .buildApply}
 		 * @param {object} mQueryOptions
-		 *   A map of key-value pairs representing the query string; it is not modified
+		 *   A read-only map of key-value pairs representing the query string
 		 * @returns {object}
 		 *   The created query options
 		 *
@@ -1085,7 +1088,7 @@ sap.ui.define([
 		 * @param {object} oAggregation
 		 *   An object holding the information needed for data aggregation; see {@link .buildApply}
 		 * @param {object} mQueryOptions
-		 *   A map of key-value pairs representing the query string; it is not modified
+		 *   A read-only map of key-value pairs representing the query string
 		 * @returns {object}
 		 *   The created query options
 		 *

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

@@ -1313,7 +1313,7 @@ sap.ui.define([
 	/**
 	 * Returns this cache's query options.
 	 *
-	 * @returns {object|undefined} The query options, if any
+	 * @returns {object|undefined} The query options, if any (requires "copy on write"!)
 	 *
 	 * @public
 	 * @see #setQueryOptions
@@ -1522,19 +1522,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];
@@ -1853,6 +1851,9 @@ sap.ui.define([
 			aElements[iIndex] = aElements.$byPredicate[sPredicate] = oElement;
 			sTransientPredicate = _Helper.getPrivateAnnotation(oOldElement, "transientPredicate");
 			if (sTransientPredicate) {
+				if ("@$ui5.context.isInactive" in oOldElement) {
+					oElement["@$ui5.context.isInactive"] = false;
+				}
 				oElement["@$ui5.context.isTransient"] = false;
 				aElements.$byPredicate[sTransientPredicate] = oElement;
 				_Helper.setPrivateAnnotation(oElement, "transientPredicate", sTransientPredicate);
@@ -2096,7 +2097,7 @@ sap.ui.define([
 	 * Updates this cache's query options if it has not yet sent a request.
 	 *
 	 * @param {object} [mQueryOptions={}]
-	 *   The new query options
+	 *   The new query options (requires "copy on write"!)
 	 * @param {boolean} [bForce]
 	 *   Forces an update even if a request has been already sent
 	 * @throws {Error}
@@ -2112,7 +2113,7 @@ sap.ui.define([
 			throw new Error("Cannot set query options: Cache has already sent a request");
 		}
 
-		this.mQueryOptions = mQueryOptions;
+		this.mQueryOptions = mQueryOptions; // Note: requires "copy on write"!
 		this.sQueryString = this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false,
 			this.bSortExpandSelect);
 	};
@@ -2687,7 +2688,7 @@ sap.ui.define([
 	 * @param {string} sResourcePath
 	 *   A resource path relative to the service URL
 	 * @param {object} [mQueryOptions]
-	 *   A map of key-value pairs representing the query string
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!)
 	 * @param {boolean} [bSortExpandSelect]
 	 *   Whether the paths in $expand and $select shall be sorted in the cache's query string
 	 * @param {string} [sDeepResourcePath=sResourcePath]
@@ -3224,6 +3225,8 @@ sap.ui.define([
 						if (sNewPredicate) {
 							sPredicate = sNewPredicate;
 							oKeptElement = oElement; // leads to no-op for _Helper.updateNonExisting
+						} else if (iIndex < iStart || iIndex >= iStart + iResultLength) {
+							oKeptElement = oElement; // leads to no-op for _Helper.updateNonExisting
 						} else {
 							throw new Error("Duplicate key predicate: " + sPredicate);
 						}
@@ -4015,7 +4018,7 @@ sap.ui.define([
 	 *   rows and transient elements with a different batch group shall be kept in place and a
 	 *   backup shall be remembered for a later {@link #restore}
 	 * @param {object} [mQueryOptions]
-	 *   The new query options
+	 *   The new query options (requires "copy on write"!)
 	 * @param {object} [_oAggregation]
 	 *   An object holding the information needed for data aggregation; see also "OData Extension
 	 *   for Data Aggregation Version 4.0"; must already be normalized by
@@ -4217,7 +4220,7 @@ sap.ui.define([
 	 * @param {string} sResourcePath
 	 *   A resource path relative to the service URL
 	 * @param {object} [mQueryOptions]
-	 *   A map of key-value pairs representing the query string
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!)
 	 *
 	 * @alias sap.ui.model.odata.v4.lib._PropertyCache
 	 * @constructor
@@ -4327,7 +4330,7 @@ sap.ui.define([
 	 * @param {string} sResourcePath
 	 *   A resource path relative to the service URL
 	 * @param {object} [mQueryOptions]
-	 *   A map of key-value pairs representing the query string
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!)
 	 * @param {boolean} [bSortExpandSelect]
 	 *   Whether the paths in $expand and $select shall be sorted in the cache's query string
 	 * @param {boolean} [bSharedRequest]
@@ -4595,7 +4598,9 @@ sap.ui.define([
 			}
 		}
 
-		if (oEntity && !("@odata.etag" in oEntity)) {
+		// Note: ODLB#getKeepAliveContext creates an empty initial object w/ private annotations
+		if (bIgnoreETag && oEntity && !("@odata.etag" in oEntity)
+				&& !_Helper.isEmptyObject(_Helper.publicClone(oEntity))) {
 			bIgnoreETag = false;
 		}
 		if (bIgnoreETag || oEntity) {
@@ -4749,7 +4754,7 @@ sap.ui.define([
 	 * @param {string} sResourcePath
 	 *   A resource path relative to the service URL
 	 * @param {object} [mQueryOptions]
-	 *   A map of key-value pairs representing the query string
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!)
 	 * @private
 	 */
 	function _SingletonPropertyCache(oRequestor, sResourcePath, mQueryOptions) {
@@ -4845,9 +4850,9 @@ sap.ui.define([
 	 *   <br>
 	 *   Example: Products
 	 * @param {object} [mQueryOptions]
-	 *   A map of key-value pairs representing the query string, the value in this pair has to
-	 *   be a string or an array of strings; if it is an array, the resulting query string
-	 *   repeats the key for each array value.
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!), the
+	 *   value in this pair has to be a string or an array of strings; if it is an array, the
+	 *   resulting query string repeats the key for each array value.
 	 *   Examples:
 	 *   {foo : "bar", "bar" : "baz"} results in the query string "foo=bar&bar=baz"
 	 *   {foo : ["bar", "baz"]} results in the query string "foo=bar&foo=baz"
@@ -4915,9 +4920,9 @@ sap.ui.define([
 	 *   <br>
 	 *   Example: Products
 	 * @param {object} [mQueryOptions]
-	 *   A map of key-value pairs representing the query string, the value in this pair has to
-	 *   be a string or an array of strings; if it is an array, the resulting query string
-	 *   repeats the key for each array value.
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!), the
+	 *   value in this pair has to be a string or an array of strings; if it is an array, the
+	 *   resulting query string repeats the key for each array value.
 	 *   Examples:
 	 *   {foo : "bar", "bar" : "baz"} results in the query string "foo=bar&bar=baz"
 	 *   {foo : ["bar", "baz"]} results in the query string "foo=bar&foo=baz"
@@ -4943,9 +4948,9 @@ sap.ui.define([
 	 *   <br>
 	 *   Example: Products
 	 * @param {object} [mQueryOptions]
-	 *   A map of key-value pairs representing the query string, the value in this pair has to
-	 *   be a string or an array of strings; if it is an array, the resulting query string
-	 *   repeats the key for each array value.
+	 *   A map of key-value pairs representing the query string (requires "copy on write"!), the
+	 *   value in this pair has to be a string or an array of strings; if it is an array, the
+	 *   resulting query string repeats the key for each array value.
 	 *   Examples:
 	 *   {foo : "bar", "bar" : "baz"} results in the query string "foo=bar&bar=baz"
 	 *   {foo : ["bar", "baz"]} results in the query string "foo=bar&foo=baz"

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

@@ -144,8 +144,8 @@ sap.ui.define([
 		/**
 		 * Adds the given paths to $select of the given query options.
 		 *
-		 * @param {object} mQueryOptions The query options
-		 * @param {string[]} aSelectPaths The paths to add to $select
+		 * @param {object} mQueryOptions - The query options to be MODIFIED
+		 * @param {string[]} aSelectPaths - The paths to add to $select
 		 *
 		 * @public
 		 */
@@ -237,9 +237,10 @@ sap.ui.define([
 		 * Recursively merges $select and $expand from mQueryOptions into mAggregatedQueryOptions.
 		 * All other query options in mAggregatedQueryOptions remain untouched.
 		 *
-		 * @param {object} mAggregatedQueryOptions The aggregated query options
-		 * @param {object} mQueryOptions The query options to merge into the aggregated query
-		 *   options
+		 * @param {object} mAggregatedQueryOptions
+		 *   The aggregated query options to be MODIFIED
+		 * @param {object} mQueryOptions
+		 *   The read-only query options to merge into the aggregated query options
 		 *
 		 * @public
 		 */
@@ -302,7 +303,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 +332,7 @@ sap.ui.define([
 				return "";
 			}
 
-			aKeys = Object.keys(mParameters);
+			aKeys = Object.keys(mParameters).filter((sKey) => !sKey.startsWith("$$"));
 			if (aKeys.length === 0) {
 				return "";
 			}
@@ -493,7 +495,7 @@ sap.ui.define([
 		 *
 		 * $expand must not contain collection-valued navigation properties.
 		 *
-		 * @param {object} mQueryOptions - The query options
+		 * @param {object} mQueryOptions - The read-only query options
 		 * @returns {string[]} The paths
 		 *
 		 * @public
@@ -604,7 +606,7 @@ sap.ui.define([
 		 *       status code 412 and response header "Preference-Applied:handling=strict"
 		 *   </ul>
 		 * @see <a href=
-		 * "http://docs.oasis-open.org/odata/odata-json-format/v4.0/os/odata-json-format-v4.0-os.html#_Representing_Errors_in"
+		 * "https://docs.oasis-open.org/odata/odata-json-format/v4.0/odata-json-format-v4.0.html#_Representing_Errors_in"
 		 * >"19 Error Response"</a>
 		 *
 		 * @public
@@ -710,6 +712,10 @@ sap.ui.define([
 		 *   <code>null</code> value
 		 *
 		 * @public
+		 * @see .deleteProperty
+		 * @see .drillDown
+		 * @see .inheritPathValue
+		 * @see .makeUpdateData
 		 */
 		createMissing : function (oObject, aSegments) {
 			aSegments.reduce(function (oCurrent, sSegment, i) {
@@ -895,6 +901,10 @@ sap.ui.define([
 		 * @param {string} sPath - Some relative path
 		 *
 		 * @public
+		 * @see .createMissing
+		 * @see .drillDown
+		 * @see .inheritPathValue
+		 * @see .makeUpdateData
 		 */
 		deleteProperty : function (oObject, sPath) {
 			var aSegments;
@@ -950,6 +960,10 @@ sap.ui.define([
 		 *   into void
 		 *
 		 * @public
+		 * @see .createMissing
+		 * @see .deleteProperty
+		 * @see .inheritPathValue
+		 * @see .makeUpdateData
 		 */
 		drillDown : function (oObject, vSegments) {
 			if (typeof vSegments === "string") {
@@ -1004,24 +1018,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;
 		},
@@ -1668,7 +1679,8 @@ sap.ui.define([
 		 * care of the details).
 		 *
 		 * @param {object|object[]} vEntityOrCollection - The entity (collection)
-		 * @param {object} mQueryOptions - The query options (only $select and $expand required)
+		 * @param {object} mQueryOptions
+		 *   The read-only query options (only $select and $expand required)
 		 * @returns {string[]}
 		 *   A list of paths relative to vEntityOrCollection for which the property value is missing
 		 * @throws {Error} If there is a path containing "*"
@@ -1755,7 +1767,7 @@ sap.ui.define([
 		 * Returns the query options corresponding to the given path.
 		 *
 		 * @param {object} [mQueryOptions]
-		 *   A map of query options as returned by
+		 *   A map of read-only query options as returned by
 		 *   {@link sap.ui.model.odata.v4.ODataModel#buildQueryOptions}
 		 * @param {string} sPath
 		 *   The path of the cache value in the cache
@@ -1946,6 +1958,10 @@ sap.ui.define([
 		 *   untolerated <code>null</code> value
 		 *
 		 * @public
+		 * @see .createMissing
+		 * @see .deleteProperty
+		 * @see .drillDown
+		 * @see .makeUpdateData
 		 */
 		inheritPathValue : function (aSegments, oSource, oTarget, bTolerateNull) {
 			aSegments.forEach(function (sSegment, i) {
@@ -1997,7 +2013,7 @@ sap.ui.define([
 		 * key predicate.
 		 *
 		 * @param {object} [mCacheQueryOptions]
-		 *   A map of query options as returned by
+		 *   A read-only map of query options as returned by
 		 *   {@link sap.ui.model.odata.v4.ODataModel#buildQueryOptions}
 		 * @param {string[]} aPaths
 		 *   The "14.5.11 Expression edm:NavigationPropertyPath" or
@@ -2206,7 +2222,7 @@ sap.ui.define([
 			// The safe integers consist of all integers from -(2^53 - 1) inclusive to 2^53 - 1
 			// inclusive.
 			// 2^53 - 1 = 9007199254740991
-			return iNumber <= 9007199254740991 && Math.floor(iNumber) === iNumber;
+			return iNumber <= Number.MAX_SAFE_INTEGER && Math.floor(iNumber) === iNumber;
 		},
 
 		/**
@@ -2227,7 +2243,7 @@ sap.ui.define([
 		 * ok, because within all known scenarios such combinations do not happen.
 		 *
 		 * @param {string} sPropertyPath The path to the structural property as meta path
-		 * @param {object} [mQueryOptions] The query options to be analyzed
+		 * @param {object} [mQueryOptions] The read-only query options to be analyzed
 		 * @returns {boolean} Whether the property for the given path was already selected
 		 *
 		 * @public
@@ -2307,6 +2323,10 @@ sap.ui.define([
 		 *   The resulting object
 		 *
 		 * @public
+		 * @see .createMissing
+		 * @see .deleteProperty
+		 * @see .drillDown
+		 * @see .inheritPathValue
 		 */
 		makeUpdateData : function (aPropertyPath, vValue, bUpdating) {
 			return aPropertyPath.reduceRight(function (vValue0, sSegment) {
@@ -2330,7 +2350,7 @@ sap.ui.define([
 		 * Ensures that the original map is left unchanged, but creates a copy only if necessary.
 		 *
 		 * @param {object} [mQueryOptions]
-		 *   The map of query options
+		 *   The read-only map of query options
 		 * @param {string} [sOrderby]
 		 *   The new value for the query option "$orderby"
 		 * @param {string[]} [aFilters]
@@ -2640,10 +2660,8 @@ sap.ui.define([
 		/**
 		 * Adds the key properties of the given entity type to $select of the given query options.
 		 *
-		 * @param {object} mQueryOptions
-		 *   The query options
-		 * @param {object} oType
-		 *   The entity type's metadata "JSON"
+		 * @param {object} mQueryOptions - The query options to be MODIFIED
+		 * @param {object} oType - The entity type's metadata "JSON"
 		 *
 		 * @public
 		 */
@@ -2941,7 +2959,7 @@ sap.ui.define([
 		 * regarding order and count.
 		 *
 		 * @param {object} mChangeListeners - A map of change listeners by path
-		 * @param {object} mQueryOptions - The query options
+		 * @param {object} mQueryOptions - The read-only query options
 		 * @param {string} sPath
 		 *   The path of the target entity relative to mChangeListeners and mQueryOptions
 		 * @param {object} oTargetEntity - The target entity

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

@@ -25,7 +25,7 @@ sap.ui.define([
 		 *   Extension for Data Aggregation Version 4.0"; must already be normalized by
 		 *   {@link _AggregationHelper.buildApply}
 		 * @param {object} mQueryOptions
-		 *   A map of key-value pairs representing the query string
+		 *   A map of key-value pairs representing the query string (requires "copy on write"!)
 		 * @returns {sap.ui.model.odata.v4.lib._Cache}
 		 *   The cache
 		 */

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;
 		}
@@ -297,7 +300,7 @@ sap.ui.define([
 	 * @param {string} sMetaPath
 	 *   The meta path corresponding to the resource path
 	 * @param {object} [mQueryOptions]
-	 *   A map of key-value pairs representing the query string
+	 *   A read-only map of key-value pairs representing the query string
 	 * @param {boolean} [bDropSystemQueryOptions]
 	 *   Whether all system query options are dropped (useful for non-GET requests)
 	 * @param {boolean} [bSortExpandSelect]
@@ -708,7 +711,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sMetaPath
 	 *   The meta path corresponding to the resource path
-	 * @param {object} [mQueryOptions] The query options
+	 * @param {object} [mQueryOptions] The read-only query options
 	 * @param {boolean} [bDropSystemQueryOptions]
 	 *   Whether all system query options are dropped (useful for non-GET requests)
 	 * @param {boolean} [bSortExpandSelect]
@@ -812,7 +815,7 @@ sap.ui.define([
 	 *
 	 * @param {string} _sMetaPath
 	 *   The meta path corresponding to the resource path
-	 * @param {object} mQueryOptions The query options
+	 * @param {object} mQueryOptions The read-only query options
 	 * @param {function (string,any)} fnResultHandler
 	 *   The function to process the converted options getting the name and the value
 	 * @param {boolean} [bDropSystemQueryOptions]
@@ -1285,6 +1288,9 @@ sap.ui.define([
 					if (oCandidate.$mergeRequests && oRequest.$mergeRequests) {
 						oCandidate.$mergeRequests(oRequest.$mergeRequests());
 					}
+					oCandidate.$sortSystemQueryOptions
+						||= oCandidate.$queryOptions.$$sortIfMerged
+							|| oRequest.$queryOptions.$$sortIfMerged;
 
 					return true;
 				}
@@ -1302,10 +1308,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;
@@ -1853,10 +1861,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/odata/v4/lib/_V2Requestor.js

@@ -764,7 +764,7 @@ sap.ui.define([
 
 	/**
 	 * Formats a given internal value into a literal suitable for usage in OData V2 URLs. See
-	 * http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem.
+	 * https://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem.
 	 *
 	 * @param {any} vValue
 	 *   The value

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

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.138.0
+	 * @version 1.140.0
 	 */
 	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.138.0
+	 * @version 1.140.0
 	 *
 	 * @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.138.0
+	 * @version 1.140.0
 	 *
 	 * @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.138.0
+	 * @version 1.140.0
 	 *
 	 * @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.138.0
+	 * @version 1.140.0
 	 *
 	 * @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.138.0
+	 * @version 1.140.0
 	 *
 	 * @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.138.0
+	 * @version 1.140.0
 	 *
 	 * @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.138.0
+	 * @version 1.140.0
 	 *
 	 * @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.138.0
+	 * @version 1.140.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]