@openui5/sap.ui.core 1.140.0 → 1.141.1

package/src/sap/ui/model/odata/v4/ODataMetaModel.js

@@ -204,7 +204,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.140.0
+		 * @version 1.141.1
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -373,7 +373,8 @@ sap.ui.define([
 
 		/**
 		 * Returns the contexts that result from iterating over the binding's path/context.
-		 * @returns {sap.ui.base.SyncPromise} A promise that is resolved with an array of contexts
+		 * @returns {sap.ui.base.SyncPromise<sap.ui.model.odata.v4.Context[]>}
+		 *   A promise that is resolved with an array of contexts
 		 *
 		 * @private
 		 */
@@ -786,7 +787,7 @@ sap.ui.define([
 	 *   A namespace, for example "foo.bar.", of a schema
 	 * @param {function} fnLog
 	 *   The log function
-	 * @returns {object|sap.ui.base.SyncPromise|undefined}
+	 * @returns {object|sap.ui.base.SyncPromise<void>|undefined}
 	 *   The schema, or a promise which is resolved without details or rejected with an error, or
 	 *   <code>undefined</code>.
 	 * @throws {Error}
@@ -1085,7 +1086,7 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.Context} oContext
 	 *   OData V4 context object for which the canonical path is requested; it must point to an
 	 *   entity
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<string>}
 	 *   A promise which is resolved with the canonical path (for example "/EMPLOYEES('1')") in
 	 *   case of success; it is rejected if the requested metadata cannot be loaded, if the context
 	 *   path does not point to an entity, if the entity is transient, or if required key properties
@@ -1109,7 +1110,7 @@ sap.ui.define([
 	/**
 	 * Requests the metadata.
 	 *
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<object>}
 	 *   A promise which is resolved with the requested metadata as soon as it is available
 	 *
 	 * @private
@@ -1130,7 +1131,7 @@ sap.ui.define([
 	 *   Whether to just read the $metadata document and annotations, but not yet convert them from
 	 *   XML to JSON; this is useful at most once in an early call that precedes all other normal
 	 *   calls and ignored after the first call without this.
-	 * @returns {sap.ui.base.SyncPromise|null}
+	 * @returns {sap.ui.base.SyncPromise<object>|null}
 	 *   A promise which is resolved with the $metadata "JSON" object as soon as the entity
 	 *   container is fully available, or rejected with an error. In case of
 	 *   <code>bPrefetch</code> in an early call, <code>null</code> is returned.
@@ -1183,7 +1184,7 @@ sap.ui.define([
 	 *   (since 1.57.0)
 	 * @param {object} [mParameters.scope]
 	 *   Optional scope for lookup of aliases for computed annotations (since 1.43.0)
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<object>}
 	 *   A promise which is resolved with the requested metadata object as soon as it is available;
 	 *   it is rejected if the requested metadata cannot be loaded
 	 *
@@ -1750,16 +1751,15 @@ sap.ui.define([
 			 * scope (unless inside "annotations [...] targeting an entity set or a singleton") and
 			 * changing <code>vResult</code>.
 			 *
-			 * @param {string} sRelativePath
-			 *   Some relative path (semantically, it is absolute as we start at the global scope,
-			 *   but it does not begin with a slash!)
+			 * @param {string} sSomePath
+			 *   Some absolute or relative path
 			 * @param {string[]} [vNewLocation]
 			 *   List of segments up to the point where the relative path has been found (in case
 			 *   of indirection)
 			 * @returns {boolean}
 			 *   Whether to continue after all steps
 			 */
-			function steps(sRelativePath, vNewLocation) {
+			function steps(sSomePath, vNewLocation) {
 				var bContinue;
 
 				if (vLocation) {
@@ -1770,10 +1770,13 @@ sap.ui.define([
 				bInsideAnnotation = false;
 				bODataMode = true;
 				vResult = mScope;
-				if (oEntitySetOrSingleton) {
+				if (sSomePath[0] === "/") {
+					oEntitySetOrSingleton = undefined;
+					sSomePath = sSomePath.slice(1);
+				} else if (oEntitySetOrSingleton) {
 					// "14.5.12 Expression edm:Path" within an annotation targeting an entity set or
 					// a singleton
-					if (!sRelativePath) { // "an empty path resolves to the entity set or singleton"
+					if (!sSomePath) { // "an empty path resolves to the entity set or singleton"
 						vResult = oEntitySetOrSingleton;
 						oEntitySetOrSingleton = vLocation = undefined;
 						return true;
@@ -1782,13 +1785,13 @@ sap.ui.define([
 					sSchemaChildName = oEntitySetOrSingleton.$Type;
 					oEntitySetOrSingleton = oSchemaChild = undefined;
 				}
-				bContinue = sRelativePath.split("/").every(step);
+				bContinue = sSomePath.split("/").every(step);
 
 				vLocation = undefined;
 				return bContinue;
 			}
 
-			if (!steps(sResolvedPath.slice(1)) && SyncPromise.isThenable(vResult)) {
+			if (!steps(sResolvedPath) && SyncPromise.isThenable(vResult)) {
 				// try again after #_getOrFetchSchema's promise has resolved,
 				// but avoid endless loop for computed annotations returning a promise!
 				vResult = vResult.then(function () {
@@ -1810,7 +1813,7 @@ sap.ui.define([
 	 *   Type-specific format options, since 1.81.0. The boolean format option
 	 *   "parseKeepsEmptyString" applies to {@link sap.ui.model.odata.type.String} only and is
 	 *   ignored for all other types. All other format options are passed "as is".
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<sap.ui.model.odata.type.ODataType>}
 	 *   A promise that gets resolved with the corresponding UI5 type from
 	 *   {@link sap.ui.model.odata.type}; if no specific type can be determined, a warning is logged
 	 *   and {@link sap.ui.model.odata.type.Raw} is used
@@ -1900,7 +1903,7 @@ sap.ui.define([
 	 *   Whether no edit URL is required; must be <code>undefined</code> from APIs for canonical
 	 *   paths (based on {@link #fetchCanonicalPath}). Since 1.133.0, when a boolean value is given,
 	 *   the edit URL is allowed to be adjusted for upsert use cases.
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<object>}
 	 *   A promise that gets resolved with an object having the following properties:
 	 *   <ul>
 	 *     <li> <code>editUrl</code>: The edit URL or undefined if the entity is transient
@@ -2099,7 +2102,7 @@ sap.ui.define([
 	 * @param {object[]} [aOverloads]
 	 *   The list of operation overloads in case of an operation parameter, must contain exactly one
 	 *   entry (which means that the parameter's binding path exactly matches one overload)
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<object>}
 	 *   A promise that gets resolved with a map containing all "ValueListMapping" annotations in
 	 *   the metadata of the given model by qualifier.
 	 *
@@ -2219,7 +2222,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sPropertyPath
 	 *   An absolute path to an OData property within the OData data model
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<sap.ui.model.odata.v4.ValueListType>}
 	 *   A promise that is resolved with the type of the value list. It is rejected if the property
 	 *   cannot be found in the metadata.
 	 *
@@ -3125,10 +3128,10 @@ sap.ui.define([
 	 * </ul>
 	 * The path must not continue after "@sapui.name".
 	 *
-	 * If the current object is a string value, that string value is treated as a relative path and
-	 * followed step-by-step before the next segment is processed. Except for this, a path must
-	 * not continue if it comes across a non-object value. Such a string value can be a qualified
-	 * name (example path "/$EntityContainer/..."), a simple identifier (example path
+	 * If the current object is a string value, that string value is treated as an absolute or
+	 * relative path and followed step-by-step before the next segment is processed. Except for
+	 * this, a path must not continue if it comes across a non-object value. Such a string value can
+	 * be a qualified name (example path "/$EntityContainer/..."), a simple identifier (example path
 	 * "/TEAMS/$NavigationPropertyBinding/TEAM_2_EMPLOYEES/...") including the special name
 	 * "$ReturnType" (since 1.71.0), or even a path according to "14.5.12 Expression edm:Path" etc.
 	 * (example path "/TEAMS/@com.sap.vocabularies.UI.v1.LineItem/0/Value/$Path/...".
@@ -3306,7 +3309,7 @@ sap.ui.define([
 	 *   Scope for lookup of aliases for computed annotations (since 1.43.0) as a map from alias to
 	 *   a module (like <code>{AH : AnnotationHelper}</code>) or function (like
 	 *   <code>{format : AnnotationHelper.format}</code>); the alias must not contain a dot.
-	 *   Since 1.120.3 looking up a computed annotation via its global name is <b>deprecated</b>;
+	 *   Since 1.120.3, looking up a computed annotation via its global name is <b>deprecated</b>;
 	 *   always use this scope instead.
 	 * @returns {Promise<any>}
 	 *   A promise which is resolved with the requested metadata value as soon as it is available;
@@ -3387,12 +3390,17 @@ sap.ui.define([
 	/**
 	 * Requests the resulting value of the given annotation that contains dynamic expressions. If
 	 * <code>sMetaPath</code> contains one navigation property more than
-	 * <code>oContext.getPath()</code>, then that navigation property's "Partner" (if any) is used
-	 * as a prefix to be ignored in a path expression. This is useful in case of multi input where
-	 * <code>oContext</code> refers to an entity with a collection-valued navigation property
-	 * (being edited) and the annotation (ValueListRelevantQualifiers) refers to a structural
-	 * property of the target type and thus needs to refer <b>back</b> in order to evaluate the
-	 * entity's current state.
+	 * <code>oContext.getPath()</code>, then two cases are handled specially:
+	 * <ul>
+	 *   <li> If that navigation property is single-valued, then it is assumed to be part of the
+	 *     property binding and is thus *added* as a prefix for path expressions;
+	 *   <li> otherwise that navigation property's "Partner" (if any) is used as a prefix to be
+	 *     *ignored* in a path expression. This is useful in case of multi input where
+	 *     <code>oContext</code> refers to an entity with a collection-valued navigation property
+	 *     (being edited) and the annotation (ValueListRelevantQualifiers) refers to a structural
+	 *     property of the target type and thus needs to refer <b>back</b> in order to evaluate the
+	 *     entity's current state.
+	 * </ul>
 	 *
 	 * @param {object} vRawValue
 	 *   The raw value of an annotation
@@ -3407,14 +3415,18 @@ sap.ui.define([
 	 */
 	ODataMetaModel.prototype.requestValue4Annotation = function (vRawValue, sMetaPath, oContext) {
 		let oOverload;
+		let sPrefix;
 		const sContextMetaPath = _Helper.getMetaPath(oContext.getPath());
 		const iIndexOfNextSlash = sMetaPath.indexOf("/", sContextMetaPath.length + 1);
 		if (iIndexOfNextSlash > 0) { // there's at least one segment more
-			const sPartner = this.getObject(sMetaPath.slice(0, iIndexOfNextSlash) + "/$Partner");
-			if (sPartner) { // looks like a NavigationProperty with a "Partner"
+			const oNavigationProperty = this.getObject(sMetaPath.slice(0, iIndexOfNextSlash));
+			if (!oNavigationProperty.$isCollection) {
+				// Note: include trailing, but not leading slash
+				sPrefix = sMetaPath.slice(sContextMetaPath.length + 1, iIndexOfNextSlash + 1);
+			} else if (oNavigationProperty.$Partner) {
 				oOverload = { // fake overload to determine ignoreAsPrefix
 					$IsBound : true,
-					$Parameter : [{$Name : sPartner}]
+					$Parameter : [{$Name : oNavigationProperty.$Partner}]
 				};
 			}
 		}
@@ -3422,7 +3434,8 @@ sap.ui.define([
 		const oAny = new Any({
 			any : AnnotationHelper.value(vRawValue, {
 				context : this.createBindingContext(sMetaPath),
-				overload : oOverload
+				overload : oOverload,
+				prefix : sPrefix
 			}),
 			bindingContexts : oContext,
 			models : oContext.getModel()

package/src/sap/ui/model/odata/v4/ODataModel.js

@@ -59,7 +59,9 @@ sap.ui.define([
 	 */
 	const bFinal = false;
 
-	var sClassName = "sap.ui.model.odata.v4.ODataModel",
+	var a401DenyList = ["apply", "compute", "count", "expand", "filter", "format", "id", "index",
+			"levels", "orderby", "schemaversion", "search", "select", "skip", "top"],
+		sClassName = "sap.ui.model.odata.v4.ODataModel",
 		// system query options allowed within a $expand query option
 		aExpandQueryOptions = ["$count", "$expand", "$filter", "$levels", "$orderby", "$search",
 			"$select"],
@@ -240,7 +242,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.140.0
+		 * @version 1.141.1
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -455,7 +457,7 @@ sap.ui.define([
 	 *   The group ID
 	 * @param {boolean} [bCatch]
 	 *   Whether the returned promise always resolves and never rejects
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise on the outcome of the HTTP request resolving with <code>undefined</code>; it is
 	 *   rejected with an error if the batch request itself fails. Use <code>bCatch</code> to catch
 	 *   that error and make the promise resolve with <code>undefined</code> instead.
@@ -1240,6 +1242,12 @@ sap.ui.define([
 
 		if (mParameters) {
 			for (sParameterName in mParameters) {
+				if (a401DenyList.includes(sParameterName.toLowerCase())) {
+					Log.warning("[FUTURE FATAL] Custom query option " + sParameterName
+						+ " will not be supported with OData 4.01, see"
+						+ " https://sdk.openui5.org/topic/cda632b01c1e4a988ccecab759d19380",
+						undefined, sClassName);
+				}
 				if (sParameterName.startsWith("$$")) { // binding-specific parameter
 					delete mTransformedOptions[sParameterName];
 				} else if (sParameterName[0] === "@") { // OData parameter alias
@@ -1921,7 +1929,7 @@ sap.ui.define([
 	 * Returns a context with the given path belonging to a matching list binding that has been
 	 * marked with <code>$$getKeepAliveContext</code> (see {@link #bindList}). If such a matching
 	 * binding can be found, a context is returned and kept alive (see
-	 * {@link sap.ui.model.odata.v4.ODataListBinding#getKeepAliveContext}). Since 1.100.0 a
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#getKeepAliveContext}). Since 1.100.0, a
 	 * temporary binding is used if no such binding could be found. If such a binding is created or
 	 * resolved later, the context and its data are transferred to it, and the temporary binding is
 	 * destroyed again.
@@ -2248,8 +2256,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataModel.prototype.initializeSecurityToken = function () {
-		// a failure is not logged, only the failed request for the service document appears
-		this.oRequestor.refreshSecurityToken().catch(function () {});
+		this.oRequestor.refreshSecurityToken(); // never rejects
 	};
 
 	/**
@@ -2740,7 +2747,7 @@ sap.ui.define([
 	 * @param {string[]} aAbsolutePaths
 	 *   The absolute paths to request side effects for; each path must not start with the fully
 	 *   qualified container name.
-	 * @returns {sap.ui.base.SyncPromise|undefined}
+	 * @returns {sap.ui.base.SyncPromise<void>|undefined}
 	 *   A promise which is resolved without a defined result, or rejected with an error if loading
 	 *   of side effects fails, or <code>undefined</code> if there is nothing to do
 	 *
@@ -2867,25 +2874,34 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets the "odata.continue-on-error" preference once for the <b>current</b> batch request
-	 * associated with the given group ID. This method can be called early on, when that batch queue
-	 * is still empty, or even synchronously after {@link #submitBatch} - just as long as the $batch
-	 * request is not already being sent to the server. It needs to be called again for future
-	 * batch requests with the same group ID.
+	 * Sets the "odata.continue-on-error" preference for the <b>current</b> batch request associated
+	 * with the given group ID. This method can be called early on, when the batch queue is still
+	 * empty, or even synchronously after {@link #submitBatch} - just as long as the $batch request
+	 * is not already being sent to the server. It needs to be called again for future batch
+	 * requests with the same group ID. It is safe to call it multiple times for the same batch
+	 * request.
+	 *
+	 * <b>Caution:</b> Make sure that no user input is lost due to a side-effects GET being applied
+	 * even after a failed PATCH. It's safe to use this method if, for example, only actions are
+	 * invoked or when {@link sap.ui.model.odata.v4.Context#setProperty} is used without
+	 * <code>bRetry</code> for mass updates.
 	 *
 	 * @param {string} sGroupId
-	 *   A valid group ID as specified in {@link sap.ui.model.odata.v4.ODataModel}. Note that
-	 *   '$auto' should be avoided to control exactly which requests are affected by this
-	 *   preference. Using a {@link module:sap/base/util/uid UID} may be one way to achieve this,
-	 *   but take care to replace dashes with underscores.
-	 * @throws {Error}
-	 *   If the given group ID is not a valid group ID or has
-	 *   {@link sap.ui.model.odata.v4.SubmitMode.Direct} or if multiple requests that apply the
-	 *   preference "handling=strict" already exist in the same change set of the batch request
+	 *   A valid group ID as specified in {@link sap.ui.model.odata.v4.ODataModel}. Avoid '$auto' to
+	 *   control which requests are affected by this preference. Using a
+	 *   {@link module:sap/base/util/uid UID} may be one way to achieve this, but take care to
+	 *   replace hyphens with underscores:
+	 *   <code>"$auto." + uid().replaceAll("-", "_")</code>
+	 * @throws {Error} If
+	 *   <ul>
+	 *     <li> the given group ID is not a valid group ID,
+	 *     <li> the given group ID has {@link sap.ui.model.odata.v4.SubmitMode.Direct},
+	 *     <li> multiple requests that apply the preference "handling=strict" already exist in the
+	 *       same change set of the batch request.
+	 *   </ul>
 	 *
-	 * @private
-	 * @since 1.134.0
-	 * @ui5-restricted sap.fe
+	 * @public
+	 * @since 1.141.0
 	 */
 	ODataModel.prototype.setContinueOnError = function (sGroupId) {
 		this.checkBatchGroupId(sGroupId);
@@ -3079,7 +3095,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.odata.v4.ODataBinding} oBinding
 	 *   The binding that possibly needs the cache of a temporary keep-alive binding
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise which is resolved without a defined result when that cache is available
 	 *
 	 * @private

package/src/sap/ui/model/odata/v4/ODataParentBinding.js

@@ -430,7 +430,7 @@ sap.ui.define([
 	 * Checks dependent bindings for updates or refreshes the binding if the resource path of its
 	 * parent context changed.
 	 *
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise which is resolved without a defined result when the check is finished, or
 	 *   rejected in case of an error
 	 * @throws {Error}
@@ -472,7 +472,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oUpdateGroupLock
 	 *   The group ID to be used for the POST request
-	 * @param {string|sap.ui.base.SyncPromise} vCreatePath
+	 * @param {string|sap.ui.base.SyncPromise<string>} vCreatePath
 	 *   The path for the POST request or a SyncPromise that resolves with that path
 	 * @param {string} sCollectionPath
 	 *   The absolute path to the collection in the cache where to create the entity
@@ -488,7 +488,7 @@ sap.ui.define([
 	 *   fails
 	 * @param {function} fnSubmitCallback
 	 *   A function which is called just before a POST request for the create is sent
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<object>}
 	 *   A promise which is resolved with the created entity when the POST request has been
 	 *   successfully sent and the entity has been marked as non-transient
 	 *
@@ -614,7 +614,7 @@ sap.ui.define([
 	 * @param {function} fnUndelete
 	 *   A function to undelete the context (and poss. the context the deletion was delegated to)
 	 *   when the deletion failed or has been canceled
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise which is resolved without a result in case of success, or rejected with an
 	 *   instance of <code>Error</code> in case of failure.
 	 * @throws {Error}
@@ -645,7 +645,7 @@ sap.ui.define([
 	 *  A function which is called immediately when an entity has been deleted from the cache, or
 	 *   when it was re-inserted; the index of the entity and an offset (-1 for deletion, 1 for
 	 *   re-insertion) are passed as parameter
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise which is resolved without a result in case of success, or rejected with an
 	 *   instance of <code>Error</code> in case of failure; returns <code>undefined</code> if the
 	 *   cache promise for this binding is not yet fulfilled
@@ -717,7 +717,7 @@ sap.ui.define([
 	 *   The new value which must be primitive
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} [oGroupLock]
 	 *   A lock for the group ID to be used for the PATCH request; without a lock, no PATCH is sent
-	 * @returns {sap.ui.base.SyncPromise|undefined}
+	 * @returns {sap.ui.base.SyncPromise<void>|undefined}
 	 *   <code>undefined</code> for the general case which is handled generically by the caller
 	 *   {@link sap.ui.model.odata.v4.Context#doSetProperty} or a <code>SyncPromise</code> for the
 	 *   exceptional case
@@ -756,11 +756,11 @@ sap.ui.define([
 	 *   <code>sChildPath</code> accordingly.
 	 * @param {string} sChildPath
 	 *   The child binding's binding path relative to <code>oContext</code>
-	 * @param {object|sap.ui.base.SyncPromise} [vChildQueryOptions={}]
+	 * @param {object|sap.ui.base.SyncPromise<object>} [vChildQueryOptions={}]
 	 *   The child binding's (aggregated) query options (if any) or a promise resolving with them
 	 * @param {boolean} [bIsProperty]
 	 *   Whether the child is a property binding
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<string|undefined>}
 	 *   A promise resolved with the reduced path for the child binding if the child binding can use
 	 *   this binding's or an ancestor binding's cache; resolved with <code>undefined</code>
 	 *   otherwise.
@@ -789,9 +789,10 @@ sap.ui.define([
 		/*
 		 * Fetches the property that is reached by the calculated meta path and (if necessary) its
 		 * type.
-		 * @returns {sap.ui.base.SyncPromise} A promise that is either resolved with the property
-		 *   or, in case of an action advertisement with the entity. If no property can be reached
-		 *   by the calculated meta path the promise is resolved with undefined.
+		 * @returns {sap.ui.base.SyncPromise<object|undefined>}
+		 *   A promise that is either resolved with the property or, in case of an action
+		 *   advertisement with the entity. If no property can be reached by the calculated meta
+		 *   path the promise is resolved with undefined.
 		 */
 		function fetchPropertyAndType() {
 			if (bIsAdvertisement) {
@@ -891,7 +892,10 @@ sap.ui.define([
 			}
 
 			if (oProperty?.["@$ui5.$count"]
-					&& oContext !== oContext.getBinding().getHeaderContext?.()) {
+					&& oContext !== oContext.getBinding().getHeaderContext?.()
+					// avoid new $count handling in case of "manual" $expand
+					// Note: sChildPath.slice(0, -7) is the navigation property name
+					&& !mLocalQueryOptions.$expand?.[sChildPath.slice(0, -7)]) {
 				mCountQueryOptions = {
 					$expand : {
 						[sChildPath.slice(0, -7)] : {$count : true, $top : 0}
@@ -1318,7 +1322,7 @@ sap.ui.define([
 	/**
 	 * Recursively refreshes all dependent list bindings that have no own cache.
 	 *
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise resolving when all dependent list bindings without own cache are refreshed; it is
 	 *   rejected when the refresh fails; the promise is resolved immediately on a suspended binding
 	 * @throws {Error}
@@ -1363,7 +1367,7 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.Context} [oContext]
 	 *   The context for which to request side effects; if this parameter is missing or if it is the
 	 *   header context of a list binding, the whole binding is affected
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise which is resolved without a defined result, or rejected with an error if loading
 	 *   of side effects fails
 	 * @throws {Error}
@@ -1509,7 +1513,7 @@ sap.ui.define([
 	 * was not supported and threw an error. Since 1.97.0, pending changes are ignored if they
 	 * relate to a {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive} context of this
 	 * binding. Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts
-	 * of a {@link #getRootBinding root binding} do not count as pending changes. Since 1.108.0
+	 * of a {@link #getRootBinding root binding} do not count as pending changes. Since 1.108.0,
 	 * {@link sap.ui.model.odata.v4.Context#delete deleted} contexts do not count as pending
 	 * changes.
 	 *

package/src/sap/ui/model/odata/v4/ODataPropertyBinding.js

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.140.0
+		 * @version 1.141.1
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -245,7 +245,7 @@ sap.ui.define([
 	 *   bubbled up to the model
 	 * @param {any} [vValue]
 	 *   The new value obtained from the cache, see {@link #onChange}
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise which is resolved without a defined result when the check is finished, or
 	 *   rejected in case of an error. If the cache is no longer the active cache when the response
 	 *   arrives, that response is ignored almost silently (that is, with a canceled error) and the
@@ -745,7 +745,7 @@ sap.ui.define([
 	 * be updated on the server, an error is logged to the console and added to the message manager
 	 * as a technical message. Unless preconditions fail synchronously, a
 	 * {@link sap.ui.model.odata.v4.ODataModel#event:propertyChange 'propertyChange'} event is
-	 * fired and provides a promise on the outcome of the asynchronous operation. Since 1.122.0
+	 * fired and provides a promise on the outcome of the asynchronous operation. Since 1.122.0,
 	 * this method allows updates to the client-side annotation "@$ui5.context.isSelected". Note:
 	 * Changing the value of a client-side annotation never initiates a PATCH request, no matter
 	 * which <code>sGroupId</code> is given. Thus, it cannot be reverted via {@link #resetChanges}.

package/src/sap/ui/model/odata/v4/_AnnotationHelperExpression.js

@@ -122,7 +122,7 @@ sap.ui.define([
 	 *
 	 * @param {object} oPathValue
 	 * @param {string} sMessage
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 */
 	function asyncError(oPathValue, sMessage) {
 		return SyncPromise.resolve().then(function () {
@@ -171,7 +171,7 @@ sap.ui.define([
 		 *   path and value information pointing to the apply (see Expression object)
 		 * @param {object} oParameters
 		 *   path and value information pointing to the parameter array (see Expression object)
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		apply : function (oPathValue, oParameters) {
@@ -194,7 +194,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the array (see Expression object)
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		collection : function (oPathValue) {
@@ -225,7 +225,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter array (see Expression object)
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		concat : function (oPathValue) {
@@ -280,7 +280,7 @@ sap.ui.define([
 		 * @param {boolean} [bInCollection]
 		 *   Whether "14.5.6 Expression edm:If" appears as a direct child of
 		 *   "14.5.5 Expression edm:Collection" and thus needs no third child element ("else")
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		conditional : function (oPathValue, bInCollection) {
@@ -379,7 +379,7 @@ sap.ui.define([
 		 * @param {boolean} [bInCollection]
 		 *   Whether the current expression appears as a direct child of
 		 *  "14.5.5 Expression edm:Collection"
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		expression : function (oPathValue, bInCollection) {
@@ -491,7 +491,7 @@ sap.ui.define([
 		 *   the type of the property referenced by <code>oPathValue.path</code>
 		 * @param {object} mConstraints
 		 *   the type constraints for the property referenced by <code>oPathValue.path</code>
-		 * @returns {sap.ui.base.SyncPromise|undefined}
+		 * @returns {sap.ui.base.SyncPromise<object>|undefined}
 		 *   a sync promise which resolves with a result object for the currency or unit, or is
 		 *   rejected with an error; <code>undefined</code> if there are no unit and currency
 		 *   annotations for the property referenced by <code>oPathValue.path</code>
@@ -555,7 +555,7 @@ sap.ui.define([
 		 *   use this value instead of <code>oPathValue.value</code>!
 		 * @param {object} mConstraints
 		 *   the type constraints for the property referenced by <code>oPathValue.path</code>
-		 * @returns {sap.ui.base.SyncPromise|undefined}
+		 * @returns {sap.ui.base.SyncPromise<object>|undefined}
 		 *   a sync promise which resolves with a result object for the date/time with timezone, or
 		 *   is rejected with an error; <code>undefined</code> if there is no timezone annotation
 		 *   for the property referenced by <code>oPathValue.path</code>
@@ -593,7 +593,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter array (see Expression object)
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		fillUriTemplate : function (oPathValue) {
@@ -703,7 +703,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter (see Expression object)
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		not : function (oPathValue) {
@@ -728,7 +728,7 @@ sap.ui.define([
 		 *   path and value information pointing to the parameter array (see Expression object)
 		 * @param {string} sType
 		 *   the operator as text (like "And" or "Or")
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		operator : function (oPathValue, sType) {
@@ -796,7 +796,7 @@ sap.ui.define([
 		 *   the parameter index
 		 * @param {string} [sEdmType]
 		 *   the expected EDM type or <code>undefined</code> if any type is allowed
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		parameter : function (oPathValue, iIndex, sEdmType) {
@@ -828,7 +828,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oPathValue
 		 *   model, path and value information pointing to the path (see Expression object)
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		path : function (oPathValue) {
@@ -896,7 +896,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oPathValue
 		 *   path and value information pointing to the parameter array (see Expression object)
-		 * @returns {sap.ui.base.SyncPromise}
+		 * @returns {sap.ui.base.SyncPromise<object>}
 		 *   a sync promise which resolves with the result object or is rejected with an error
 		 */
 		uriEncode : function (oPathValue) {