@openui5/sap.ui.core 1.116.0 → 1.117.1

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

@@ -87,7 +87,8 @@ sap.ui.define([
 			sharedRequests : true,
 			supportReferences : true,
 			synchronizationMode : true,
-			updateGroupId : true
+			updateGroupId : true,
+			withCredentials : true
 		},
 		// system query options allowed in mParameters
 		aSystemQueryOptions = ["$apply", "$count", "$expand", "$filter", "$orderby", "$search",
@@ -174,12 +175,16 @@ sap.ui.define([
 		 *   (Controls synchronization between different bindings which refer to the same data for
 		 *   the case data changes in one binding. Must be set to 'None' which means bindings are
 		 *   not synchronized at all; all other values are not supported and lead to an error.)
-		 *   <b>deprecated:</b> As of version 1.110.0, this parameter is optional; see also
+		 *   <b>deprecated:</b> As of Version 1.110.0, this parameter is optional; see also
 		 *   {@link topic:648e360fa22d46248ca783dc6eb44531 Data Reuse}
 		 * @param {string} [mParameters.updateGroupId]
 		 *   The group ID that is used for update requests. If no update group ID is specified,
 		 *   <code>mParameters.groupId</code> is used. Valid update group IDs are
 		 *   <code>undefined</code>, '$auto', '$direct' or an application group ID.
+		 * @param {boolean} [mParameters.withCredentials]
+		 *   Whether the XMLHttpRequest is called with <code>withCredentials</code>, so that user
+		 *   credentials are included in cross-origin requests by the browser (@experimental as of
+		 *   Version 1.117.0)
 		 * @throws {Error} If an unsupported synchronization mode is given, if the given service
 		 *   root URL does not end with a forward slash, if an unsupported parameter is given, if
 		 *   OData system query options or parameter aliases are specified as parameters, if an
@@ -228,7 +233,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.116.0
+		 * @version 1.117.1
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -347,7 +352,8 @@ sap.ui.define([
 		mQueryParams = Object.assign({}, mUriParameters, mParameters.metadataUrlParams);
 		this.oMetaModel = new ODataMetaModel(
 			_MetadataRequestor.create(this.mMetadataHeaders, sODataVersion,
-				mParameters.ignoreAnnotationsFromMetadata, mQueryParams),
+				mParameters.ignoreAnnotationsFromMetadata, mQueryParams,
+				mParameters.withCredentials),
 			this.sServiceUrl + "$metadata", mParameters.annotationURI, this,
 			mParameters.supportReferences, mQueryParams["sap-language"]);
 		this.oInterface = {
@@ -377,7 +383,7 @@ sap.ui.define([
 			}
 		};
 		this.oRequestor = _Requestor.create(this.sServiceUrl, this.oInterface, this.mHeaders,
-			mUriParameters, sODataVersion);
+			mUriParameters, sODataVersion, mParameters.withCredentials);
 		this.changeHttpHeaders(mParameters.httpHeaders);
 		this.bEarlyRequests = mParameters.earlyRequests;
 		if (this.bEarlyRequests) {
@@ -457,12 +463,12 @@ sap.ui.define([
 	 * the entity is also available.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {object} [oEvent.getParameters().data]
+	 * @param {object} oEvent.getParameters
+	 * @param {object} [oEvent.getParameters.data]
 	 *   An empty data object if a back-end request succeeds
-	 * @param {Error} [oEvent.getParameters().error]
+	 * @param {Error} [oEvent.getParameters.error]
 	 *   The error object if a back-end request failed.
-	 * @param {string} [oEvent.getParameters().path]
+	 * @param {string} [oEvent.getParameters.path]
 	 *   The absolute path to the entity which caused the event. The path is only provided for
 	 *   additional property requests; for other requests it is <code>undefined</code>.
 	 *
@@ -499,8 +505,8 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {string} [oEvent.getParameters().path]
+	 * @param {object} oEvent.getParameters
+	 * @param {string} [oEvent.getParameters.path]
 	 *   The absolute path to the entity which caused the event. The path is only provided for
 	 *   additional property requests; for other requests it is <code>undefined</code>.
 	 *
@@ -528,20 +534,20 @@ sap.ui.define([
 	 * not user input.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {sap.ui.model.Context} [oEvent.getParameters().context]
+	 * @param {object} oEvent.getParameters
+	 * @param {sap.ui.model.Context} [oEvent.getParameters.context]
 	 *   The property binding's {@link sap.ui.model.Binding#getContext context}, if available
-	 * @param {string} oEvent.getParameters().path
+	 * @param {string} oEvent.getParameters.path
 	 *   The property binding's {@link sap.ui.model.Binding#getPath path}
-	 * @param {Promise} [oEvent.getParameters().promise]
+	 * @param {Promise<void>} [oEvent.getParameters.promise]
 	 *   A promise on the outcome of the PATCH request, much like
 	 *   {@link sap.ui.model.odata.v4.Context#setProperty} provides it for
 	 *   <code>bRetry === true</code>; missing in case there is no PATCH
-	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters().reason
+	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters.reason
 	 *   The reason for the property change: always <code>sap.ui.model.ChangeReason.Binding</code>
-	 * @param {string} oEvent.getParameters().resolvedPath
+	 * @param {string} oEvent.getParameters.resolvedPath
 	 *   The property binding's {@link sap.ui.model.Binding#getResolvedPath resolved path}
-	 * @param {any} oEvent.getParameters().value
+	 * @param {any} oEvent.getParameters.value
 	 *   The property binding's new
 	 *   {@link sap.ui.model.odata.v4.ODataPropertyBinding#getValue value}
 	 *
@@ -1500,10 +1506,10 @@ sap.ui.define([
 	 *   If <code>true</code>, deletion fails if the entity does not exist (HTTP status code 404 or
 	 *   412 due to the <code>If-Match: *</code> header); otherwise we assume that it has already
 	 *   been deleted by someone else and report success
-	 * @returns {Promise}
-	 *   A promise resolving when the delete succeeded, and rejecting with an instance of Error
-	 *   otherwise. In the latter case the HTTP status code of the response is given in the error's
-	 *   property <code>status</code>.
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result when the delete succeeded, or rejected
+	 *   with an instance of Error otherwise. In the latter case the HTTP status code of the
+	 *   response is given in the error's property <code>status</code>.
 	 * @throws {Error} If
 	 *   <ul>
 	 *     <li> the path does not start with a '/',
@@ -1545,6 +1551,7 @@ sap.ui.define([
 			).catch(function (oError) {
 				if (bRejectIfNotFound
 						|| !(oError.status === 404 || bInAllBindings && oError.status === 412)) {
+					that.reportError("Failed to delete " + aResults[0], sClassName, oError);
 					throw oError;
 				} // else: map 404/412 to 204
 			}).then(function () {
@@ -2521,7 +2528,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oEntityContext
 	 *   A context in this model which must point to a non-contained OData entity
-	 * @returns {Promise}
+	 * @returns {Promise<string>}
 	 *   A promise which is resolved with the canonical path (e.g. "/SalesOrderList('0500000000')")
 	 *   in case of success, or rejected with an instance of <code>Error</code> in case of failure,
 	 *   e.g. when the given context does not point to an entity
@@ -2566,8 +2573,8 @@ sap.ui.define([
 	 *   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}
-	 *   A promise resolving without a defined result, or rejecting with an error if loading of side
-	 *   effects fails, or <code>undefined</code> if there is nothing to do
+	 *   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
 	 *
 	 * @private
 	 */
@@ -2785,8 +2792,8 @@ sap.ui.define([
 	 *
 	 * @param {string} sGroupId
 	 *   A valid group ID as specified in {@link sap.ui.model.odata.v4.ODataModel}.
-	 * @returns {Promise<undefined>}
-	 *   A promise on the outcome of the HTTP request resolving with <code>undefined</code>; it is
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result on the outcome of the HTTP request, or
 	 *   rejected with an error if the batch request itself fails
 	 * @throws {Error}
 	 *   If the given group ID is not a valid group ID or has
@@ -2853,10 +2860,12 @@ sap.ui.define([
 	/**
 	 * Cleans up the optimistic batch cache to a given point in time.
 	 *
-	 * @param {Date} [dOlderThan] The point in time from which on older cache entries are deleted.
-	 *   If not supplied, all optimistic batch entries are deleted.
-	 * @returns {Promise} A promise resolving without a defined result, or rejecting with an error
-	 *   if deletion fails.
+	 * @param {Date} [dOlderThan]
+	 *   The point in time from which on older cache entries are deleted. If not supplied, all
+	 *   optimistic batch entries are deleted.
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result, or rejected with an error if
+	 *   deletion fails.
 	 *
 	 * @experimental As of version 1.102.0
 	 * @private

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

@@ -459,9 +459,10 @@ sap.ui.define([
 	 * parent context changed.
 	 *
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result when the check is finished, or rejecting in
-	 *   case of an error
-	 * @throws {Error} If called with parameters
+	 *   A promise which is resolved without a defined result when the check is finished, or
+	 *   rejected in case of an error
+	 * @throws {Error}
+	 *   If called with parameters
 	 *
 	 * @private
 	 */
@@ -1257,8 +1258,8 @@ sap.ui.define([
 	 *   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}
-	 *   A promise resolving without a defined result, or rejecting with an error if loading of side
-	 *   effects fails
+	 *   A promise which is resolved without a defined result, or rejected with an error if loading
+	 *   of side effects fails
 	 * @throws {Error}
 	 *   If this binding does not use own data service requests or if the binding's root binding is
 	 *   suspended and the given group ID is not the binding's group
@@ -1412,7 +1413,8 @@ sap.ui.define([
 	 * Note: Some API calls are not allowed as long as the binding is in suspended mode, hence the
 	 * returned promise can be used to get the point in time when these APIs can be called again.
 	 *
-	 * @returns {Promise} A promise which is resolved when the binding is resumed.
+	 * @returns {Promise<void>}
+	 *   A promise which is resolved without a defined result when the binding is resumed.
 	 * @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

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.116.0
+		 * @version 1.117.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
@@ -117,8 +117,8 @@ sap.ui.define([
 	 * change reason as parameter.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters().reason
+	 * @param {object} oEvent.getParameters
+	 * @param {sap.ui.model.ChangeReason} oEvent.getParameters.reason
 	 *   The reason for the 'change' event could be
 	 *   <ul>
 	 *     <li> {@link sap.ui.model.ChangeReason.Change Change} when the binding is initialized,
@@ -154,10 +154,10 @@ sap.ui.define([
 	 * 'error' event parameter.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
-	 * @param {object} oEvent.getParameters()
-	 * @param {object} [oEvent.getParameters().data]
+	 * @param {object} oEvent.getParameters
+	 * @param {object} [oEvent.getParameters.data]
 	 *   An empty data object if a back-end request succeeds
-	 * @param {Error} [oEvent.getParameters().error] The error object if a back-end request failed.
+	 * @param {Error} [oEvent.getParameters.error] The error object if a back-end request failed.
 	 *   If there are multiple failed back-end requests, the error of the first one is provided.
 	 *
 	 * @event sap.ui.model.odata.v4.ODataPropertyBinding#dataReceived
@@ -234,10 +234,10 @@ sap.ui.define([
 	 * @param {any} [vValue]
 	 *   The new value obtained from the cache, see {@link #onChange}
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result when the check is finished, or rejecting 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 value
-	 *   remains unchanged.
+	 *   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
+	 *   value remains unchanged.
 	 *
 	 * @private
 	 * @see sap.ui.model.PropertyBinding#checkDataState
@@ -539,8 +539,8 @@ sap.ui.define([
 	 * Requests the value of the property binding.
 	 *
 	 * @returns {Promise<any|undefined>}
-	 *   A promise resolving with the resulting value or <code>undefined</code> if it could not be
-	 *   determined, or rejecting in case of an error
+	 *   A promise resolved with the resulting value or <code>undefined</code> if it could not be
+	 *   determined, or rejected in case of an error
 	 *
 	 * @public
 	 * @since 1.69
@@ -560,7 +560,7 @@ sap.ui.define([
 	 *   The value of the parameter <code>autoExpandSelect</code> for value list models created by
 	 *   this method. If the value list model is this binding's model, this flag has no effect.
 	 *   Supported since 1.68.0
-	 * @returns {Promise}
+	 * @returns {Promise<Object<object>>}
 	 *   See {@link sap.ui.model.odata.v4.ODataMetaModel#requestValueListInfo}
 	 * @throws {Error}
 	 *   If the binding is unresolved (see {@link sap.ui.model.Binding#isResolved})
@@ -581,7 +581,7 @@ sap.ui.define([
 	/**
 	 * Determines which type of value list exists for this property.
 	 *
-	 * @returns {Promise}
+	 * @returns {Promise<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.
 	 * @throws {Error}

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

@@ -117,8 +117,11 @@ sap.ui.define([
 		}
 	}
 
-	// make _AggregationCache a _Cache
+	// make _AggregationCache a _Cache, but actively disinherit some critical methods
 	_AggregationCache.prototype = Object.create(_Cache.prototype);
+	_AggregationCache.prototype._delete = null;
+	_AggregationCache.prototype.addTransientCollection = null;
+	_AggregationCache.prototype.getAndRemoveValue = null;
 
 	/**
 	 * Copies the given elements from a cache read into <code>this.aElements</code>.
@@ -149,7 +152,8 @@ sap.ui.define([
 		function addElement(oElement, i) {
 			var oOldElement = aElements[iOffset + i],
 				oKeptElement,
-				sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
+				sPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate")
+					|| _Helper.getPrivateAnnotation(oElement, "predicate");
 
 			if (oOldElement) { // check before overwriting
 				if (oOldElement === oElement) {
@@ -295,6 +299,86 @@ sap.ui.define([
 		return iCount;
 	};
 
+	/**
+	 * Creates a transient node with the parent identified by "@$ui5.node.parent", inserts it into
+	 * the hierarchy at the appropriate position, and adds a POST request to the batch
+	 * group with the given ID. See {@link sap.ui.model.odata.v4.lib._Cache#create} for more.
+	 *
+	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
+	 *   A lock for the group ID
+	 * @param {sap.ui.base.SyncPromise} oPostPathPromise
+	 *   A SyncPromise resolving with the resource path for the POST request
+	 * @param {string} sPath
+	 *   The collection's path within the cache (as used by change listeners)
+	 * @param {string} sTransientPredicate
+	 *   A (temporary) key predicate for the transient entity: "($uid=...)"
+	 * @param {object} oEntityData
+	 *   The initial entity data, already cloned and cleaned of client-side annotations (except
+	 *   "@$ui5.node.parent" which contains the OData ID string needed for "...@odata.bind")
+	 * @param {boolean} bAtEndOfCreated
+	 *   Whether the newly created entity should be inserted after previously created entities or at
+	 *   the front of the list.
+	 * @param {function} fnErrorCallback
+	 *   A function which is called with an error object each time a POST request for the create
+	 *   fails
+	 * @param {function} fnSubmitCallback
+	 *   A function which is called just before a POST request for the create is sent
+	 * @returns {sap.ui.base.SyncPromise}
+	 *   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
+	 * @throws {Error}
+	 *   If <code>this.oAggregation.expandTo > 1</code>, <code>bAtEndOfCreated</code> is set, or the
+	 *   parent is collapsed
+	 *
+	 * @public
+	 */
+	// @override sap.ui.model.odata.v4.lib._Cache#create
+	_AggregationCache.prototype.create = function (oGroupLock, oPostPathPromise, sPath,
+			sTransientPredicate, oEntityData, bAtEndOfCreated, fnErrorCallback, fnSubmitCallback) {
+		if (this.oAggregation.expandTo > 1) {
+			throw new Error("Unsupported expandTo: " + this.oAggregation.expandTo);
+		}
+		if (bAtEndOfCreated) {
+			throw new Error("Unsupported bAtEndOfCreated");
+		}
+
+		const aElements = this.aElements;
+		const sParentPath = oEntityData["@$ui5.node.parent"];
+		const sParentPredicate = sParentPath.slice(sParentPath.indexOf("("));
+		const oParentNode = aElements.$byPredicate[sParentPredicate];
+		if (oParentNode["@$ui5.node.isExpanded"] === false) {
+			throw new Error("Unsupported collapsed parent: " + sParentPath);
+		}
+
+		let oCache = _Helper.getPrivateAnnotation(oParentNode, "cache");
+		if (!oCache) {
+			oCache = this.createGroupLevelCache(oParentNode);
+			_Helper.setPrivateAnnotation(oParentNode, "cache", oCache);
+			_Helper.updateAll(this.mChangeListeners, sParentPredicate, oParentNode,
+				{"@$ui5.node.isExpanded" : true}); // not a leaf anymore
+		}
+
+		delete oEntityData["@$ui5.node.parent"];
+		const oResult = oCache.create(oGroupLock, oPostPathPromise, sPath, sTransientPredicate,
+			oEntityData, bAtEndOfCreated, fnErrorCallback, fnSubmitCallback);
+		// add @odata.bind to POST body only
+		_Helper.getPrivateAnnotation(oEntityData, "postBody")
+			[this.oAggregation.$ParentNavigationProperty + "@odata.bind"] = sParentPath;
+		oEntityData["@$ui5.node.level"] = oParentNode["@$ui5.node.level"] + 1;
+
+		const iIndex = aElements.indexOf(oParentNode) + 1;
+		aElements.splice(iIndex, 0, null); // create a gap
+		this.addElements(oEntityData, iIndex, oCache, 0);
+		aElements.$count += 1;
+
+		return oResult.then(function () {
+			aElements.$byPredicate[_Helper.getPrivateAnnotation(oEntityData, "predicate")]
+				= oEntityData;
+
+			return oEntityData;
+		});
+	};
+
 	/**
 	 * Creates a cache for the children (next group level or leaves) of the given group node.
 	 * Creates the first level cache if there is no group node.
@@ -795,9 +879,9 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
 	 *   A lock for the group to associate the requests with;
 	 *   {@link sap.ui.model.odata.v4.lib._GroupLock#getUnlockedCopy} still needs to be called!
-	 * @returns {Promise|undefined}
-	 *   A promise resolving without a defined result when the read is finished, or rejecting in
-	 *   case of an error; <code>undefined</code> in case no count needs to be read
+	 * @returns {Promise<void>|undefined}
+	 *   A promise which is resolved without a defined result when the read is finished, or
+	 *   rejected in case of an error; <code>undefined</code> in case no count needs to be read
 	 * @throws {Error}
 	 *   If group ID is '$cached'. The error has a property <code>$cached = true</code>
 	 *
@@ -848,8 +932,8 @@ sap.ui.define([
 	 *   The function is called just before a back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result when the read is finished, or rejecting in
-	 *   case of an error
+	 *   A promise which is resolved without a defined result when the read is finished, or
+	 *   rejected in case of an error
 	 * @throws {Error} If given index or length is less than 0
 	 *
 	 * @private
@@ -920,8 +1004,8 @@ sap.ui.define([
 	 *   The function is called just before a back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving without a defined result when the read is finished, or rejecting in
-	 *   case of an error
+	 *   A promise which is resolved without a defined result when the read is finished, or
+	 *   rejected in case of an error
 	 * @throws {Error} If index of placeholder at start of gap is less than 0, or if end of gap is
 	 *   before start
 	 *

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

@@ -407,9 +407,9 @@ sap.ui.define([
 		 * Builds the value for a "$apply" system query option based on the given data aggregation
 		 * information for a recursive hierarchy. If no query options are given, only a symbolic
 		 * "$apply" is constructed to avoid timing issues with metadata. The property paths for
-		 * DistanceFromRootProperty, DrillStateProperty, LimitedDescendantCountProperty, and
-		 * NodeProperty are stored at <code>oAggregation</code> using a "$" prefix (if not already
-		 * stored).
+		 * DistanceFromRootProperty, DrillStateProperty, LimitedDescendantCountProperty,
+		 * NodeProperty, and ParentNavigationProperty are stored at <code>oAggregation</code> using
+		 * a "$" prefix (if not already stored).
 		 *
 		 * @param {object} oAggregation
 		 *   An object holding the information needed for a recursive hierarchy; see
@@ -438,25 +438,17 @@ sap.ui.define([
 		 * @public
 		 */
 		buildApply4Hierarchy : function (oAggregation, mQueryOptions, bAllLevels) {
-			var sApply = "",
-				sHierarchyQualifier = oAggregation.hierarchyQualifier,
-				sMetaPath = oAggregation.$metaPath,
-				sNodeProperty = oAggregation.$NodeProperty,
-				sPath = oAggregation.$path,
-				mRecursiveHierarchy,
-				sSeparator = "",
-				oSyncPromise;
+			let mRecursiveHierarchy; // cache it on 1st access
 
 			function select(sProperty) {
-				var sPropertyPath;
-
 				if (mQueryOptions.$select) {
-					sPropertyPath = oAggregation["$" + sProperty];
+					let sPropertyPath = oAggregation["$" + sProperty];
 					if (!sPropertyPath) {
 						if (!mRecursiveHierarchy) {
-							mRecursiveHierarchy = oAggregation.$fetchMetadata(sMetaPath
-								+ "/@com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy#"
-								+ sHierarchyQualifier).getResult();
+							mRecursiveHierarchy = oAggregation.$fetchMetadata(oAggregation.$metaPath
+									+ "/@com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy#"
+									+ oAggregation.hierarchyQualifier
+								).getResult();
 						}
 
 						sPropertyPath = oAggregation["$" + sProperty]
@@ -466,14 +458,18 @@ sap.ui.define([
 				}
 			}
 
+			let sNodeProperty = oAggregation.$NodeProperty;
 			if (!sNodeProperty) {
 				sNodeProperty = "???";
 				if (mQueryOptions) {
-					oSyncPromise = oAggregation.$fetchMetadata(sMetaPath
-						+ "/@Org.OData.Aggregation.V1.RecursiveHierarchy#" + sHierarchyQualifier
-						+ "/NodeProperty/$PropertyPath");
+					const oSyncPromise = oAggregation.$fetchMetadata(oAggregation.$metaPath
+						+ "/@Org.OData.Aggregation.V1.RecursiveHierarchy#"
+						+ oAggregation.hierarchyQualifier);
 					if (oSyncPromise.isFulfilled()) {
-						sNodeProperty = oAggregation.$NodeProperty = oSyncPromise.getResult();
+						sNodeProperty = oAggregation.$NodeProperty
+							= oSyncPromise.getResult().NodeProperty.$PropertyPath;
+						oAggregation.$ParentNavigationProperty = oSyncPromise.getResult()
+							.ParentNavigationProperty.$NavigationPropertyPath;
 					}
 				}
 			}
@@ -486,7 +482,9 @@ sap.ui.define([
 				}
 			}
 
+			let sApply = "";
 			if (mQueryOptions.$filter || oAggregation.search) {
+				let sSeparator = "";
 				if (mQueryOptions.$filter) {
 					sApply = "filter(" + mQueryOptions.$filter;
 					sSeparator = ")/";
@@ -495,15 +493,15 @@ sap.ui.define([
 				if (oAggregation.search) {
 					sApply += sSeparator + "search(" + oAggregation.search;
 				}
-				sApply = "ancestors($root" + sPath
-					+ "," + sHierarchyQualifier
+				sApply = "ancestors($root" + oAggregation.$path
+					+ "," + oAggregation.hierarchyQualifier
 					+ "," + sNodeProperty
 					+ "," + sApply
 					+ "),keep start)/";
 			}
 			if (mQueryOptions.$$filterBeforeAggregate) { // children of a given parent
-				sApply += "descendants($root" + sPath + "," + sHierarchyQualifier
-					+ "," + sNodeProperty
+				sApply += "descendants($root" + oAggregation.$path
+					+ "," + oAggregation.hierarchyQualifier + "," + sNodeProperty
 					+ ",filter(" + mQueryOptions.$$filterBeforeAggregate + "),1)";
 				delete mQueryOptions.$$filterBeforeAggregate;
 				if (mQueryOptions.$orderby) {
@@ -516,8 +514,8 @@ sap.ui.define([
 					delete mQueryOptions.$orderby;
 				}
 				sApply += "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root"
-					+ (sPath || "")
-					+ ",HierarchyQualifier='" + sHierarchyQualifier
+					+ (oAggregation.$path || "")
+					+ ",HierarchyQualifier='" + oAggregation.hierarchyQualifier
 					+ "',NodeProperty='" + sNodeProperty
 					+ "',Levels=" + (bAllLevels ? 999 : oAggregation.expandTo || 1)
 					+ ")";