@openui5/sap.ui.core 1.124.1 → 1.125.0

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

@@ -51,149 +51,68 @@ sap.ui.define([
 	var sClassName = "sap.ui.model.odata.v4.ODataParentBinding";
 
 	/**
-	 * Attach event handler <code>fnFunction</code> to the 'patchCompleted' event of this binding.
-	 *
-	 * @param {function} fnFunction The function to call when the event occurs
-	 * @param {object} [oListener] Object on which to call the given function
-	 * @returns {this} <code>this</code> to allow method chaining
-	 *
-	 * @public
-	 * @since 1.59.0
-	 */
-	ODataParentBinding.prototype.attachPatchCompleted = function (fnFunction, oListener) {
-		return this.attachEvent("patchCompleted", fnFunction, oListener);
-	};
-
-	/**
-	 * Detach event handler <code>fnFunction</code> from the 'patchCompleted' event of this binding.
-	 *
-	 * @param {function} fnFunction The function to call when the event occurs
-	 * @param {object} [oListener] Object on which to call the given function
-	 * @returns {this} <code>this</code> to allow method chaining
-	 *
-	 * @public
-	 * @since 1.59.0
-	 */
-	ODataParentBinding.prototype.detachPatchCompleted = function (fnFunction, oListener) {
-		return this.detachEvent("patchCompleted", fnFunction, oListener);
-	};
-
-	/**
-	 * Handles exceptional cases of setting the property with the given path to the given value.
-	 *
-	 * @param {string} sPath
-	 *   A path (absolute or relative to this binding)
-	 * @param {any} vValue
-	 *   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}
-	 *   <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
-	 *
-	 * @abstract
-	 * @function
-	 * @name sap.ui.model.odata.v4.ODataParentBinding#doSetProperty
-	 * @private
-	 */
-
-	/**
-	 * Binding specific code for suspend.
-	 *
-	 * @private
-	 */
-	ODataParentBinding.prototype.doSuspend = function () {
-		// nothing to do here
-	};
-
-	/**
-	 * Finds the context that matches the given canonical path.
+	 * Find the context in the uppermost binding in the hierarchy that can be reached with an empty
+	 * path.
 	 *
-	 * @param {string} sCanonicalPath
-	 *   The canonical path of an entity (as a context path with the leading "/")
+	 * @param {sap.ui.model.odata.v4.Context} oContext
+	 *   The context of the caller
 	 * @returns {sap.ui.model.odata.v4.Context}
-	 *   A matching context or <code>undefined</code> if there is none
-	 *
-	 * @function
-	 * @name sap.ui.model.odata.v4.ODataParentBinding#findContextForCanonicalPath
-	 * @private
-	 */
-
-	/**
-	 * Fire event 'patchCompleted' to attached listeners, if the last PATCH request is completed.
+	 *   The context that can be reached through empty paths
 	 *
-	 * @param {boolean} bSuccess Whether the current PATCH request has been processed successfully
 	 * @private
 	 */
-	ODataParentBinding.prototype.firePatchCompleted = function (bSuccess) {
-		if (this.iPatchCounter === 0) {
-			throw new Error("Completed more PATCH requests than sent");
-		}
-		this.iPatchCounter -= 1;
-		this.bPatchSuccess &&= bSuccess;
-		if (this.iPatchCounter === 0) {
-			this.fireEvent("patchCompleted", {success : this.bPatchSuccess});
-			this.bPatchSuccess = true;
+	ODataParentBinding.prototype._findEmptyPathParentContext = function (oContext) {
+		if (this.sPath === "" && this.oContext.getBinding) {
+			return this.oContext.getBinding()._findEmptyPathParentContext(this.oContext);
 		}
+		return oContext;
 	};
 
 	/**
-	 * Attach event handler <code>fnFunction</code> to the 'patchSent' event of this binding.
+	 * Resumes this binding. The binding can again fire change events and initiate data service
+	 * requests.
 	 *
-	 * @param {function} fnFunction The function to call when the event occurs
-	 * @param {object} [oListener] Object on which to call the given function
-	 * @returns {this} <code>this</code> to allow method chaining
+	 * @param {boolean} bAsPrerenderingTask
+	 *   Whether resume is done as a prerendering task
+	 * @throws {Error}
+	 *   If this binding is relative to an {@link sap.ui.model.odata.v4.Context} or if it is an
+	 *   operation binding or if it is not suspended
 	 *
-	 * @public
-	 * @since 1.59.0
+	 * @private
+	 * @see #suspend
 	 */
-	ODataParentBinding.prototype.attachPatchSent = function (fnFunction, oListener) {
-		return this.attachEvent("patchSent", fnFunction, oListener);
-	};
+	ODataParentBinding.prototype._resume = function (bAsPrerenderingTask) {
+		var that = this;
 
-	/**
-	 * Detach event handler <code>fnFunction</code> from the 'patchSent' event of this binding.
-	 *
-	 * @param {function} fnFunction The function to call when the event occurs
-	 * @param {object} [oListener] Object on which to call the given function
-	 * @returns {this} <code>this</code> to allow method chaining
-	 *
-	 * @public
-	 * @since 1.59.0
-	 */
-	ODataParentBinding.prototype.detachPatchSent = function (fnFunction, oListener) {
-		return this.detachEvent("patchSent", fnFunction, oListener);
-	};
+		function doResume() {
+			that.bSuspended = false;
+			if (that.oResumePromise) {
+				that.resumeInternal(true);
+				that.oResumePromise.$resolve();
+				that.oResumePromise = undefined;
+			}
+		}
 
-	/**
-	 * Fire event 'patchSent' to attached listeners, if the first PATCH request is sent.
-	 *
-	 * @private
-	 */
-	ODataParentBinding.prototype.firePatchSent = function () {
-		this.iPatchCounter += 1;
-		if (this.iPatchCounter === 1) {
-			this.fireEvent("patchSent");
+		if (this.oOperation) {
+			throw new Error("Cannot resume an operation binding: " + this);
+		}
+		if (!this.isRoot()) {
+			throw new Error("Cannot resume a relative binding: " + this);
+		}
+		if (!this.bSuspended) {
+			throw new Error("Cannot resume a not suspended binding: " + this);
 		}
-	};
 
-	/**
-	 * Find the context in the uppermost binding in the hierarchy that can be reached with an empty
-	 * path.
-	 *
-	 * @param {sap.ui.model.odata.v4.Context} oContext
-	 *   The context of the caller
-	 * @returns {sap.ui.model.odata.v4.Context}
-	 *   The context that can be reached through empty paths
-	 *
-	 * @private
-	 */
-	ODataParentBinding.prototype._findEmptyPathParentContext = function (oContext) {
-		if (this.sPath === "" && this.oContext.getBinding) {
-			return this.oContext.getBinding()._findEmptyPathParentContext(this.oContext);
+		if (bAsPrerenderingTask) {
+			// wait one additional prerendering because resume itself starts in a prerendering task
+			this.createReadGroupLock(this.getGroupId(), true, 1);
+			// dependent bindings are only removed in a *new task* in ManagedObject#updateBindings
+			// => must only resume in prerendering task
+			this.oModel.addPrerenderingTask(doResume);
+		} else {
+			this.createReadGroupLock(this.getGroupId(), true);
+			doResume();
 		}
-		return oContext;
 	};
 
 	/**
@@ -325,6 +244,34 @@ sap.ui.define([
 		return false;
 	};
 
+	/**
+	 * Attach event handler <code>fnFunction</code> to the 'patchCompleted' event of this binding.
+	 *
+	 * @param {function} fnFunction The function to call when the event occurs
+	 * @param {object} [oListener] Object on which to call the given function
+	 * @returns {this} <code>this</code> to allow method chaining
+	 *
+	 * @public
+	 * @since 1.59.0
+	 */
+	ODataParentBinding.prototype.attachPatchCompleted = function (fnFunction, oListener) {
+		return this.attachEvent("patchCompleted", fnFunction, oListener);
+	};
+
+	/**
+	 * Attach event handler <code>fnFunction</code> to the 'patchSent' event of this binding.
+	 *
+	 * @param {function} fnFunction The function to call when the event occurs
+	 * @param {object} [oListener] Object on which to call the given function
+	 * @returns {this} <code>this</code> to allow method chaining
+	 *
+	 * @public
+	 * @since 1.59.0
+	 */
+	ODataParentBinding.prototype.attachPatchSent = function (fnFunction, oListener) {
+		return this.attachEvent("patchSent", fnFunction, oListener);
+	};
+
 	/**
 	 * Changes this binding's parameters and refreshes the binding. Since 1.111.0, a list binding's
 	 * header context is deselected, but (since 1.120.13) only if the binding parameter
@@ -705,6 +652,63 @@ sap.ui.define([
 		asODataBinding.prototype.destroy.call(this);
 	};
 
+	/**
+	 * Detach event handler <code>fnFunction</code> from the 'patchCompleted' event of this binding.
+	 *
+	 * @param {function} fnFunction The function to call when the event occurs
+	 * @param {object} [oListener] Object on which to call the given function
+	 * @returns {this} <code>this</code> to allow method chaining
+	 *
+	 * @public
+	 * @since 1.59.0
+	 */
+	ODataParentBinding.prototype.detachPatchCompleted = function (fnFunction, oListener) {
+		return this.detachEvent("patchCompleted", fnFunction, oListener);
+	};
+
+	/**
+	 * Detach event handler <code>fnFunction</code> from the 'patchSent' event of this binding.
+	 *
+	 * @param {function} fnFunction The function to call when the event occurs
+	 * @param {object} [oListener] Object on which to call the given function
+	 * @returns {this} <code>this</code> to allow method chaining
+	 *
+	 * @public
+	 * @since 1.59.0
+	 */
+	ODataParentBinding.prototype.detachPatchSent = function (fnFunction, oListener) {
+		return this.detachEvent("patchSent", fnFunction, oListener);
+	};
+
+	/**
+	 * Handles exceptional cases of setting the property with the given path to the given value.
+	 *
+	 * @param {string} sPath
+	 *   A path (absolute or relative to this binding)
+	 * @param {any} vValue
+	 *   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}
+	 *   <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
+	 *
+	 * @abstract
+	 * @function
+	 * @name sap.ui.model.odata.v4.ODataParentBinding#doSetProperty
+	 * @private
+	 */
+
+	/**
+	 * Binding specific code for suspend.
+	 *
+	 * @private
+	 */
+	ODataParentBinding.prototype.doSuspend = function () {
+		// nothing to do here
+	};
+
 	/**
 	 * Determines whether a child binding with the given context and path can use
 	 * the cache of this binding or one of its ancestor bindings. If this is the case, enhances
@@ -996,6 +1000,49 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Finds the context that matches the given canonical path.
+	 *
+	 * @param {string} sCanonicalPath
+	 *   The canonical path of an entity (as a context path with the leading "/")
+	 * @returns {sap.ui.model.odata.v4.Context}
+	 *   A matching context or <code>undefined</code> if there is none
+	 *
+	 * @function
+	 * @name sap.ui.model.odata.v4.ODataParentBinding#findContextForCanonicalPath
+	 * @private
+	 */
+
+	/**
+	 * Fire event 'patchCompleted' to attached listeners, if the last PATCH request is completed.
+	 *
+	 * @param {boolean} bSuccess Whether the current PATCH request has been processed successfully
+	 * @private
+	 */
+	ODataParentBinding.prototype.firePatchCompleted = function (bSuccess) {
+		if (this.iPatchCounter === 0) {
+			throw new Error("Completed more PATCH requests than sent");
+		}
+		this.iPatchCounter -= 1;
+		this.bPatchSuccess &&= bSuccess;
+		if (this.iPatchCounter === 0) {
+			this.fireEvent("patchCompleted", {success : this.bPatchSuccess});
+			this.bPatchSuccess = true;
+		}
+	};
+
+	/**
+	 * Fire event 'patchSent' to attached listeners, if the first PATCH request is sent.
+	 *
+	 * @private
+	 */
+	ODataParentBinding.prototype.firePatchSent = function () {
+		this.iPatchCounter += 1;
+		if (this.iPatchCounter === 1) {
+			this.fireEvent("patchSent");
+		}
+	};
+
 	/**
 	 * Returns the absolute base path used for path reduction of child (property) bindings. This is
 	 * the shortest possible path of a binding that may carry the data for the reduced path. A
@@ -1020,6 +1067,19 @@ sap.ui.define([
 		return this.getResolvedPath();
 	};
 
+	/**
+	 * Returns the unique number of this bindings's generation, or <code>0</code> if it does not
+	 * belong to any specific generation. This number can be inherited from a parent context.
+	 *
+	 * @returns {number}
+	 *   The unique number of this binding's generation, or <code>0</code>
+	 *
+	 * @private
+	 */
+	ODataParentBinding.prototype.getGeneration = function () {
+		return this.bRelative && this.oContext.getGeneration && this.oContext.getGeneration() || 0;
+	};
+
 	/**
 	 * Returns the query options that can be inherited from this binding, including late query
 	 * options.
@@ -1038,19 +1098,6 @@ sap.ui.define([
 				this.oContext.getBinding().getInheritableQueryOptions(), this.sPath);
 	};
 
-	/**
-	 * Returns the unique number of this bindings's generation, or <code>0</code> if it does not
-	 * belong to any specific generation. This number can be inherited from a parent context.
-	 *
-	 * @returns {number}
-	 *   The unique number of this binding's generation, or <code>0</code>
-	 *
-	 * @private
-	 */
-	ODataParentBinding.prototype.getGeneration = function () {
-		return this.bRelative && this.oContext.getGeneration && this.oContext.getGeneration() || 0;
-	};
-
 	/**
 	 * Returns the query options for the given path relative to this binding. Uses the options
 	 * resulting from the binding parameters or the options inherited from the parent binding by
@@ -1308,22 +1355,6 @@ sap.ui.define([
 		});
 	};
 
-	/**
-	 * Resumes this binding and all dependent bindings, fires a change or refresh event afterwards.
-	 *
-	 * @param {boolean} bCheckUpdate
-	 *   Parameter is ignored; dependent property bindings of a list binding never call checkUpdate
-	 * @param {boolean} [bParentHasChanges]
-	 *   Whether there are changes on the parent binding that become active after resuming. If
-	 *   <code>true</code>, this binding is allowed to reuse the parent cache, otherwise this
-	 *   binding has to create its own cache
-	 *
-	 * @abstract
-	 * @function
-	 * @name sap.ui.model.odata.v4.ODataParentBinding#resumeInternal
-	 * @private
-	 */
-
 	/**
 	 * If there is a refresh promise created by {@link #createRefreshPromise}, it is resolved with
 	 * the given promise and cleared. Does not reject the refresh promise with a canceled error.
@@ -1345,53 +1376,6 @@ sap.ui.define([
 		return oPromise;
 	};
 
-	/**
-	 * Resumes this binding. The binding can again fire change events and initiate data service
-	 * requests.
-	 *
-	 * @param {boolean} bAsPrerenderingTask
-	 *   Whether resume is done as a prerendering task
-	 * @throws {Error}
-	 *   If this binding is relative to an {@link sap.ui.model.odata.v4.Context} or if it is an
-	 *   operation binding or if it is not suspended
-	 *
-	 * @private
-	 * @see #suspend
-	 */
-	ODataParentBinding.prototype._resume = function (bAsPrerenderingTask) {
-		var that = this;
-
-		function doResume() {
-			that.bSuspended = false;
-			if (that.oResumePromise) {
-				that.resumeInternal(true);
-				that.oResumePromise.$resolve();
-				that.oResumePromise = undefined;
-			}
-		}
-
-		if (this.oOperation) {
-			throw new Error("Cannot resume an operation binding: " + this);
-		}
-		if (!this.isRoot()) {
-			throw new Error("Cannot resume a relative binding: " + this);
-		}
-		if (!this.bSuspended) {
-			throw new Error("Cannot resume a not suspended binding: " + this);
-		}
-
-		if (bAsPrerenderingTask) {
-			// wait one additional prerendering because resume itself starts in a prerendering task
-			this.createReadGroupLock(this.getGroupId(), true, 1);
-			// dependent bindings are only removed in a *new task* in ManagedObject#updateBindings
-			// => must only resume in prerendering task
-			this.oModel.addPrerenderingTask(doResume);
-		} else {
-			this.createReadGroupLock(this.getGroupId(), true);
-			doResume();
-		}
-	};
-
 	/**
 	 * Resumes this binding. The binding can then again fire change events and initiate data service
 	 * requests.
@@ -1439,6 +1423,22 @@ sap.ui.define([
 		return Promise.resolve(this.oResumePromise);
 	};
 
+	/**
+	 * Resumes this binding and all dependent bindings, fires a change or refresh event afterwards.
+	 *
+	 * @param {boolean} bCheckUpdate
+	 *   Parameter is ignored; dependent property bindings of a list binding never call checkUpdate
+	 * @param {boolean} [bParentHasChanges]
+	 *   Whether there are changes on the parent binding that become active after resuming. If
+	 *   <code>true</code>, this binding is allowed to reuse the parent cache, otherwise this
+	 *   binding has to create its own cache
+	 *
+	 * @abstract
+	 * @function
+	 * @name sap.ui.model.odata.v4.ODataParentBinding#resumeInternal
+	 * @private
+	 */
+
 	/**
 	 * Adds the key properties of the entity reached by the given navigation property path to
 	 * $select of the query options. Expects that the type has already been loaded so that it can

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.124.1
+		 * @version 1.125.0
 		 * @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

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

@@ -121,7 +121,8 @@ sap.ui.define([
 			(oNode) => _Helper.getKeyFilter(oNode, this.sMetaPath, this.getTypes()));
 		// Whether this cache is a unified cache, using oFirstLevel with ExpandLevels instead of
 		// separate group level caches
-		this.bUnifiedCache = this.oAggregation.expandTo >= Number.MAX_SAFE_INTEGER;
+		this.bUnifiedCache = this.oAggregation.expandTo >= Number.MAX_SAFE_INTEGER
+			|| !!this.oAggregation.createInPlace;
 	}
 
 	// make _AggregationCache a _Cache, but actively disinherit some critical methods
@@ -540,15 +541,46 @@ sap.ui.define([
 				[this.oAggregation.$ParentNavigationProperty + "@odata.bind"]
 					= _Helper.makeRelativeUrl("/" + sParentPath, "/" + this.sResourcePath);
 		}
-		oEntityData["@$ui5.node.level"] = iLevel; // do not send via POST!
 
-		aElements.splice(iIndex, 0, null); // create a gap
-		this.addElements(oEntityData, iIndex, oCache); // rank is undefined!
-		aElements.$count += 1;
-		if (oCache === this.oFirstLevel) {
-			this.adjustDescendantCount(oEntityData, iIndex, +1);
+		const addElement = (iIndex0, iRank) => {
+			oEntityData["@$ui5.node.level"] = iLevel; // do not send via POST!
+			aElements.splice(iIndex0, 0, null); // create a gap
+			this.addElements(oEntityData, iIndex0, oCache, iRank);
+			aElements.$count += 1;
+			if (oCache === this.oFirstLevel) {
+				this.adjustDescendantCount(oEntityData, iIndex0, +1);
+			}
+		};
+		const completeCreation = (iIndex0, iRank) => {
+			oCache.removeElement(0, sTransientPredicate);
+			_Helper.deletePrivateAnnotation(oEntityData, "transientPredicate");
+			oCache.restoreElement(iRank, oEntityData);
+
+			delete aElements.$byPredicate[sTransientPredicate];
+			_Helper.setPrivateAnnotation(oEntityData, "rank", iRank);
+			this.shiftRank(iIndex0, +1);
+		};
+
+		if (this.oAggregation.createInPlace) {
+			return oPromise.then(async () => {
+				_Helper.removeByPath(this.mPostRequests, sTransientPredicate, oEntityData);
+				const [iRank] = await Promise.all([
+					this.requestRank(oEntityData, oGroupLock),
+					this.requestNodeProperty(oEntityData, oGroupLock)
+				]);
+				if (iRank === undefined) {
+					oCache.removeElement(0, sTransientPredicate);
+				} else {
+					addElement(iRank, iRank);
+					completeCreation(iRank, iRank);
+				}
+
+				return oEntityData;
+			});
 		}
 
+		addElement(iIndex, /*iRank*/undefined);
+
 		return oPromise.then(async () => {
 			_Helper.removeByPath(this.mPostRequests, sTransientPredicate, oEntityData);
 			aElements.$byPredicate[_Helper.getPrivateAnnotation(oEntityData, "predicate")]
@@ -564,13 +596,7 @@ sap.ui.define([
 					this.requestNodeProperty(oEntityData, oGroupLock, /*bDropFilter*/true)
 				]);
 
-				oCache.removeElement(0, sTransientPredicate);
-				_Helper.deletePrivateAnnotation(oEntityData, "transientPredicate");
-				oCache.restoreElement(iRank, oEntityData);
-
-				delete this.aElements.$byPredicate[sTransientPredicate];
-				_Helper.setPrivateAnnotation(oEntityData, "rank", iRank);
-				this.shiftRank(iIndex, +1);
+				completeCreation(iIndex, iRank);
 			} else {
 				await this.requestNodeProperty(oEntityData, oGroupLock, /*bDropFilter*/true);
 			}
@@ -935,20 +961,23 @@ sap.ui.define([
 
 	/**
 	 * Returns the index in <code>this.aElements</code> for a given (limited preorder) rank where
-	 * either a node or placeholder with that rank is present and belongs to the first level cache.
+	 * either a node or placeholder with that rank is present and belongs to the given first level
+	 * or group level cache.
 	 *
 	 * @param {number} iRank
 	 *   The (limited preorder) rank of a node
+	 * @param {sap.ui.model.odata.v4.lib._CollectionCache} [oCache]
+	 *   A (group level) cache
 	 * @returns {number}
 	 *   The array index
 	 *
 	 * @private
 	 * @see #getInsertIndex
 	 */
-	_AggregationCache.prototype.findIndex = function (iRank) {
+	_AggregationCache.prototype.findIndex = function (iRank, oCache = this.oFirstLevel) {
 		return this.aElements.findIndex(
 			(oNode) => _Helper.getPrivateAnnotation(oNode, "rank") === iRank
-					&& _Helper.getPrivateAnnotation(oNode, "parent") === this.oFirstLevel);
+					&& _Helper.getPrivateAnnotation(oNode, "parent") === oCache);
 	};
 
 	/**
@@ -1083,6 +1112,45 @@ sap.ui.define([
 		// return undefined;
 	};
 
+	/**
+	 * Returns the index of the given node's sibling, either the next one (via offset +1) or the
+	 * previous one (via offset -1).
+	 *
+	 * @param {number} iIndex - The index of a node
+	 * @param {number} iOffset - An offset, either -1 or +1
+	 * @returns {number}
+	 *   The sibling node's index, or -1 if no such sibling exists
+	 *
+	 * @public
+	 */
+	_AggregationCache.prototype.getSiblingIndex = function (iIndex, iOffset) {
+		function findSibling(aElements, iRank, iLevel) {
+			for (;;) {
+				iRank += iOffset;
+				if (iRank < 0 || iRank >= aElements.$count) {
+					return -1; // no such sibling
+				}
+				if (!aElements[iRank]) {
+					return iRank;
+				}
+				if (aElements[iRank]["@$ui5.node.level"] < iLevel) {
+					return -1; // no such sibling
+				}
+				if (aElements[iRank]["@$ui5.node.level"] === iLevel) {
+					return iRank;
+				}
+				// else: ignore descendants
+			}
+		}
+
+		const oNode = this.aElements[iIndex];
+		const oCache = _Helper.getPrivateAnnotation(oNode, "parent");
+		const iSiblingRank = findSibling(oCache.aElements,
+			_Helper.getPrivateAnnotation(oNode, "rank"), oNode["@$ui5.node.level"]);
+
+		return iSiblingRank < 0 ? -1 : this.findIndex(iSiblingRank, oCache);
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.lib._Cache#getValue
@@ -1116,7 +1184,7 @@ sap.ui.define([
 		const getPredicate
 			= (oNode) => _Helper.getKeyPredicate(oNode, this.sMetaPath, this.getTypes());
 		const getRank
-			= (oNode) => Number.parseInt(_Helper.drillDown(oNode, this.oAggregation.$LimitedRank));
+			= (oNode) => parseInt(_Helper.drillDown(oNode, this.oAggregation.$LimitedRank));
 		const mPredicate2RankResult = {};
 		oRankResult.value.forEach((oNode) => {
 			mPredicate2RankResult[getPredicate(oNode)] = oNode;
@@ -1145,8 +1213,10 @@ sap.ui.define([
 				_Helper.merge(oNode, mPredicate2RankResult[sPredicate]);
 				// Note: overridden by _AggregationCache.calculateKeyPredicateRH
 				this.oFirstLevel.calculateKeyPredicate(oNode, this.getTypes(), this.sMetaPath);
+				const iRank = getRank(oNode);
+				_Helper.deleteProperty(oNode, this.oAggregation.$LimitedRank);
 				// insert at rank position to ensure correct placeholder is replaced
-				this.insertNode(oNode, getRank(oNode));
+				this.insertNode(oNode, iRank);
 			});
 		});
 
@@ -1943,7 +2013,7 @@ sap.ui.define([
 			mQueryOptions = getApply(
 				_AggregationHelper.buildApply4Hierarchy(oAggregation, this.mQueryOptions));
 		} else {
-			const oCache = _Helper.getPrivateAnnotation(oElement, "parent");
+			const oCache = _Helper.getPrivateAnnotation(oElement, "parent", this.oFirstLevel);
 			mQueryOptions = bDropFilter
 				? _AggregationHelper
 					.dropFilter(this.oAggregation, this.mQueryOptions, oCache.$parentFilter)

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

@@ -44,6 +44,7 @@ sap.ui.define([
 			+ "(?:/" + _Parser.sODataIdentifier + ")*"
 			+ ")(?:" + _Parser.sWhitespace + "+(?:asc|desc))?$"),
 		mRecursiveHierarchyType = {
+			createInPlace : true,
 			expandTo : /^[1-9]\d*$/, // a positive integer
 			hierarchyQualifier : "string",
 			search : "string"
@@ -636,6 +637,10 @@ sap.ui.define([
 					_AggregationHelper.checkTypeof(vValue[sKey], vType[bIsMap ? "*" : sKey],
 						sPath + "/" + sKey);
 				});
+			} else if (vType === true) {
+				if (vValue !== true) {
+					throw new Error("Not a true value for '" + sPath + "'");
+				}
 			} else if (typeof vValue !== vType) { // eslint-disable-line valid-typeof
 				throw new Error("Not a " + vType + " value for '" + sPath + "'");
 			}