@sapui5/sap.fe.core 1.97.0 → 1.100.0

package/src/sap/fe/core/helpers/ClassSupport.ts

@@ -1,20 +1,27 @@
-import { OverrideExecution } from "sap/ui/core/mvc";
-import { ObjectPath, deepClone } from "sap/base/util";
-import { $ControlSettings, ElementMetadata, RenderManager } from "sap/ui/core";
+import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
+import ObjectPath from "sap/base/util/ObjectPath";
+import ElementMetadata from "sap/ui/core/ElementMetadata";
+import RenderManager from "sap/ui/core/RenderManager";
+import Metadata from "sap/ui/base/Metadata";
+import ControllerExtensionMetadata from "sap/fe/core/controllerextensions/ControllerExtensionMetadata";
+import ControllerMetadata from "sap/ui/core/mvc/ControllerMetadata";
+import uid from "sap/base/util/uid";
+import merge from "sap/base/util/merge";
+import UI5Event from "sap/ui/base/Event";
 
 const ensureMetadata = function(target: any) {
-	if (!target.hasOwnProperty("metadata")) {
-		target.metadata = deepClone(
-			target.metadata || {
-				properties: {},
-				macroContexts: {},
-				aggregations: {},
-				associations: {},
-				methods: {},
-				events: {}
-			}
-		);
-	}
+	target.metadata = merge(
+		{
+			controllerExtensions: {},
+			properties: {},
+			macroContexts: {},
+			aggregations: {},
+			associations: {},
+			methods: {},
+			events: {}
+		},
+		target.metadata || {}
+	);
 	return target.metadata;
 };
 export function Override(sTarget?: string) {
@@ -44,22 +51,25 @@ export function Extensible(oOverrideExecution?: OverrideExecution) {
 		metadata.methods[propertyKey].overrideExecution = oOverrideExecution;
 	};
 }
-export function Public(target: any, propertyKey: string) {
+export function Public(target: any, propertyKey: string, descriptor: any): any {
 	const metadata = ensureMetadata(target);
+	descriptor.enumerable = true;
 	if (!metadata.methods[propertyKey]) {
 		metadata.methods[propertyKey] = {};
 	}
 	metadata.methods[propertyKey].public = true;
 }
-export function Private(target: any, propertyKey: string) {
+export function Private(target: any, propertyKey: string, descriptor: any) {
 	const metadata = ensureMetadata(target);
+	descriptor.enumerable = true;
 	if (!metadata.methods[propertyKey]) {
 		metadata.methods[propertyKey] = {};
 	}
 	metadata.methods[propertyKey].public = false;
 }
-export function Final(target: any, propertyKey: string) {
+export function Final(target: any, propertyKey: string, descriptor: any) {
 	const metadata = ensureMetadata(target);
+	descriptor.enumerable = true;
 	if (!metadata.methods[propertyKey]) {
 		metadata.methods[propertyKey] = {};
 	}
@@ -84,6 +94,14 @@ export function MacroContext(bMetaModelObject: boolean = false): any {
 	return Property({ type: "sap.ui.model.Context", macroContext: true, metaModelObject: bMetaModelObject });
 }
 
+export function UsingExtension(extensionClass: any): any {
+	return function(target: any, propertyKey: string, propertyDescriptor: PropertyDescriptor): any {
+		const metadata = ensureMetadata(target);
+		delete (propertyDescriptor as any).initializer;
+		metadata.controllerExtensions[propertyKey] = extensionClass;
+		return propertyDescriptor;
+	};
+}
 export function Property(oPropertyParams: any): any {
 	return function(target: any, propertyKey: string, propertyDescriptor: PropertyDescriptor): any {
 		const metadata = ensureMetadata(target);
@@ -97,12 +115,12 @@ export function Property(oPropertyParams: any): any {
 		}
 		delete propertyDescriptor.writable;
 		delete (propertyDescriptor as any).initializer;
-		(propertyDescriptor as any).set = function(v: any) {
-			return this.setProperty(propertyKey, v);
-		};
-		(propertyDescriptor as any).get = function() {
-			return this.getProperty(propertyKey);
-		};
+		// (propertyDescriptor as any).set = function(v: any) {
+		// 	return this.setProperty(propertyKey, v);
+		// };
+		// (propertyDescriptor as any).get = function() {
+		// 	return this.getProperty(propertyKey);
+		// };
 
 		return propertyDescriptor;
 	};
@@ -119,12 +137,12 @@ export function Aggregation(oAggregationDescriptor?: any): any {
 		}
 		delete propertyDescriptor.writable;
 		delete (propertyDescriptor as any).initializer;
-		(propertyDescriptor as any).set = function(v: any) {
-			return this.setAggregation(propertyKey, v);
-		};
-		(propertyDescriptor as any).get = function() {
-			return this.getAggregation(propertyKey);
-		};
+		// (propertyDescriptor as any).set = function(v: any) {
+		// 	return this.setAggregation(propertyKey, v);
+		// };
+		// (propertyDescriptor as any).get = function() {
+		// 	return this.getAggregation(propertyKey);
+		// };
 
 		return propertyDescriptor;
 	};
@@ -138,12 +156,12 @@ export function Association(oAssociationDescription?: any): any {
 		}
 		delete propertyDescriptor.writable;
 		delete (propertyDescriptor as any).initializer;
-		(propertyDescriptor as any).set = function(v: any) {
-			return this.setAggregation(propertyKey, v);
-		};
-		(propertyDescriptor as any).get = function() {
-			return this.getAggregation(propertyKey);
-		};
+		// (propertyDescriptor as any).set = function(v: any) {
+		// 	return this.setAggregation(propertyKey, v);
+		// };
+		// (propertyDescriptor as any).get = function() {
+		// 	return this.getAggregation(propertyKey);
+		// };
 
 		return propertyDescriptor;
 	};
@@ -151,9 +169,16 @@ export function Association(oAssociationDescription?: any): any {
 type ControlPropertyNames<T> = {
 	[K in keyof T]: T[K] extends Function ? never : K;
 }[keyof T];
-export type PropertiesOf<T> = Partial<Pick<T, ControlPropertyNames<T>>> & $ControlSettings;
+export type PropertiesOf<T> = Partial<Pick<T, ControlPropertyNames<T>>>;
 
-export function APIClass(sTarget: string) {
+/**
+ * Decorator to provide a new API class to be used in the macros.
+ *
+ * @param sTarget The fully qualified name of the macro API
+ * @param isDependentBound Whether this API will be used as a dependent or not
+ * @class
+ */
+export function APIClass(sTarget: string, isDependentBound = false) {
 	return function(constructor: Function) {
 		if (!constructor.prototype.metadata) {
 			constructor.prototype.metadata = {};
@@ -163,7 +188,7 @@ export function APIClass(sTarget: string) {
 			constructor.prototype.metadata.interfaces = [];
 		}
 		constructor.prototype.metadata.interfaces.push("sap.ui.core.IFormContent");
-
+		(constructor as any).isDependentBound = isDependentBound;
 		if (!constructor.prototype.renderer) {
 			constructor.prototype.renderer = {
 				apiVersion: 2,
@@ -176,22 +201,29 @@ export function APIClass(sTarget: string) {
 		describe(constructor, sTarget, constructor.prototype, ElementMetadata);
 	};
 }
-export function UI5Class(sTarget: string, metadataClass?: any, metadataDefinition?: any) {
+export function UI5Class(sTarget: string, metadataClass?: any, metadataDefinition?: any, useExtend: boolean = true) {
 	return function(constructor: Function) {
 		if (!constructor.prototype.metadata) {
 			constructor.prototype.metadata = {};
 		}
-		if (metadataDefinition?.properties) {
-			constructor.prototype.metadata.properties = metadataDefinition.properties;
-		}
-		if (metadataDefinition?.events) {
-			constructor.prototype.metadata.events = metadataDefinition.events;
+		if (metadataDefinition) {
+			Object.keys(metadataDefinition).forEach(key => {
+				constructor.prototype.metadata[key] = metadataDefinition[key];
+			});
 		}
-		describe(constructor, sTarget, constructor.prototype, metadataClass);
+		return describe(constructor, sTarget, constructor.prototype, metadataClass, useExtend);
 	};
 }
-
-function describe(clazz: any, name: string, inObj: any, metadataClass?: any) {
+function describe(clazz: any, name: string, inObj: any, metadataClass?: any, useExtend: boolean = true) {
+	if (metadataClass === ControllerExtensionMetadata) {
+		Object.getOwnPropertyNames(inObj).forEach(objName => {
+			const descriptor = Object.getOwnPropertyDescriptor(inObj, objName);
+			if (descriptor && !descriptor.enumerable) {
+				descriptor.enumerable = true;
+				//		Log.error(`Property ${objName} from ${name} should be decorated as public`);
+			}
+		});
+	}
 	const obj: any = {};
 	obj.metadata = inObj.metadata || {};
 	obj.override = inObj.override;
@@ -199,34 +231,129 @@ function describe(clazz: any, name: string, inObj: any, metadataClass?: any) {
 	obj.metadata.baseType = Object.getPrototypeOf(clazz.prototype)
 		.getMetadata()
 		.getName();
-	obj.renderer = inObj.renderer || clazz.renderer;
+
+	const rendererDefinition = inObj.renderer || clazz.renderer;
+	obj.renderer = { apiVersion: 2 };
+	if (typeof rendererDefinition === "function") {
+		obj.renderer.render = rendererDefinition;
+	} else if (rendererDefinition != undefined) {
+		obj.renderer = rendererDefinition;
+	}
 	obj.metadata.interfaces = inObj.metadata?.interfaces || clazz.metadata?.interfaces;
-	let metadata: any;
-	if (metadataClass) {
-		metadata = new metadataClass(name, obj);
+	if (useExtend) {
+		Object.keys(clazz.prototype).forEach(key => {
+			if (key !== "metadata") {
+				try {
+					obj[key] = clazz.prototype[key];
+				} catch (e) {
+					//console.log(e);
+				}
+			}
+		});
+	}
+	if (obj.metadata?.controllerExtensions && Object.keys(obj.metadata.controllerExtensions).length > 0) {
+		for (const cExtName in obj.metadata.controllerExtensions) {
+			obj[cExtName] = obj.metadata.controllerExtensions[cExtName];
+		}
+	}
+	let output = clazz;
+	if (useExtend) {
+		output = clazz.extend(name, obj, metadataClass);
+		const fnInit = output.prototype.init;
+		output.prototype.init = function(...args: any[]) {
+			fnInit && fnInit.apply(this, args);
+			this.metadata = obj.metadata;
+
+			if (obj.metadata.properties) {
+				const aPropertyKeys = Object.keys(obj.metadata.properties);
+				// eslint-disable-next-line @typescript-eslint/no-this-alias
+				const that = this;
+				aPropertyKeys.forEach(propertyKey => {
+					Object.defineProperty(that, propertyKey, {
+						configurable: true,
+						set: (v: any) => {
+							return that.setProperty(propertyKey, v);
+						},
+						get: () => {
+							return that.getProperty(propertyKey);
+						}
+					});
+				});
+				const aAggregationKeys = Object.keys(obj.metadata.aggregations);
+				aAggregationKeys.forEach(aggregationKey => {
+					Object.defineProperty(that, aggregationKey, {
+						configurable: true,
+						set: (v: any) => {
+							return that.setAggregation(aggregationKey, v);
+						},
+						get: () => {
+							return that.getAggregation(aggregationKey);
+						}
+					});
+				});
+			}
+		};
 	} else {
-		metadata = new ElementMetadata(name, obj);
+		let metadata: any;
+		if (metadataClass) {
+			metadata = new metadataClass(name, obj);
+		} else {
+			metadata = new ElementMetadata(name, obj);
+		}
+		clazz.getMetadata = clazz.prototype.getMetadata = function() {
+			return metadata;
+		};
+		if (!clazz.getMetadata().isFinal()) {
+			clazz.extend = function(sSCName: string, oSCClassInfo: any, fnSCMetaImpl: Function) {
+				// the default constructor created by ui5 does not return the value which is problematic with TS
+				oSCClassInfo.constructor = function(...args: any[]) {
+					return clazz.apply(this, args);
+				};
+
+				const fnClass = (Metadata as any).createClass(
+					clazz,
+					sSCName,
+					oSCClassInfo,
+					fnSCMetaImpl || metadataClass || ElementMetadata
+				);
+				// fnClass.prototype.constructor = function(...args: any[]) {
+				// 	return clazz.apply(this, ...args);
+				// };
+				return fnClass;
+			};
+		}
 	}
-	clazz.getMetadata = clazz.prototype.getMetadata = function() {
-		return metadata;
+	clazz.override = function(oExtension: any) {
+		const pol = {};
+		(pol as any).constructor = function(...args: any[]) {
+			return clazz.apply(this, args as any);
+		};
+		const oClass = (Metadata as any).createClass(clazz, "anonymousExtension~" + uid(), pol, ControllerMetadata);
+		oClass.getMetadata()._staticOverride = oExtension;
+		oClass.getMetadata()._override = (clazz.getMetadata() as any)._override;
+		return oClass;
 	};
+
 	const fnInit = clazz.prototype.init;
-	clazz.prototype.init = function(...args: any[]) {
-		fnInit.apply(this, args);
-		const aPropertyKeys = Object.keys(obj.metadata.properties);
-		// eslint-disable-next-line @typescript-eslint/no-this-alias
-		const that = this;
-		aPropertyKeys.forEach(propertyKey => {
-			Object.defineProperty(that, propertyKey, {
-				configurable: true,
-				set: (v: any) => {
-					return that.setProperty(propertyKey, v);
-				},
-				get: () => {
-					return that.getProperty(propertyKey);
-				}
+	output.prototype.init = function(...args: any[]) {
+		fnInit && fnInit.apply(this, args);
+		if (obj.metadata.properties) {
+			const aPropertyKeys = Object.keys(obj.metadata.properties);
+			// eslint-disable-next-line @typescript-eslint/no-this-alias
+			const that = this;
+			aPropertyKeys.forEach(propertyKey => {
+				Object.defineProperty(that, propertyKey, {
+					configurable: true,
+					set: (v: any) => {
+						return that.setProperty(propertyKey, v);
+					},
+					get: () => {
+						return that.getProperty(propertyKey);
+					}
+				});
 			});
-		});
+		}
 	};
-	ObjectPath.set(name, clazz);
+	ObjectPath.set(name, output);
+	return output;
 }

package/src/sap/fe/core/helpers/DynamicAnnotationPathHelper.js

@@ -1,61 +1,66 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/base/BindingParser"], function(BindingParser) {
-	"use strict";
-
-	var getObject = function(oObject, sPath) {
-		if (!oObject) {
-			return null;
-		}
-		var sPathSplit = sPath.split("/");
-		if (sPathSplit.length === 1) {
-			return oObject[sPath];
-		} else {
-			return getObject(oObject[sPathSplit[0]], sPathSplit.splice(1).join("/"));
-		}
-	};
-	/**
-	 * Resolve a dynamic annotation path down to a standard annotation path.
-	 *
-	 * @param sAnnotationPath
-	 * @param oMetaModel
-	 * @returns {string} The non dynamic version of the annotation path
-	 */
-	var resolveDynamicExpression = function(sAnnotationPath, oMetaModel) {
-		if (sAnnotationPath.indexOf("[") !== -1) {
-			var firstBracket = sAnnotationPath.indexOf("[");
-			var sStableBracket = sAnnotationPath.substr(0, firstBracket);
-			var sRest = sAnnotationPath.substr(firstBracket + 1);
-			var lastBracket = sRest.indexOf("]");
-			var aValue = oMetaModel.getObject(sStableBracket);
-			var oExpression = BindingParser.parseExpression(sRest.substr(0, lastBracket));
-			if (
-				Array.isArray(aValue) &&
-				oExpression &&
-				oExpression.result &&
-				oExpression.result.parts &&
-				oExpression.result.parts[0] &&
-				oExpression.result.parts[0].path
-			) {
-				var bFound = false;
-				for (var i = 0; i < aValue.length && !bFound; i++) {
-					var oObjectValue = getObject(aValue[i], oExpression.result.parts[0].path);
-					var bResult = oExpression.result.formatter(oObjectValue);
-					if (bResult) {
-						bFound = true;
-					}
-				}
-				if (bFound) {
-					sAnnotationPath = resolveDynamicExpression(sStableBracket + (i - 1) + sRest.substr(lastBracket + 1), oMetaModel);
-				}
-			}
-		}
-		return sAnnotationPath;
-	};
-
-	return {
-		resolveDynamicExpression: resolveDynamicExpression
-	};
-});
+sap.ui.define(["sap/ui/base/BindingParser"], function (BindingParser) {
+  "use strict";
+
+  var _exports = {};
+
+  function getObject(oObject, sPath) {
+    if (!oObject) {
+      return null;
+    }
+
+    var sPathSplit = sPath.split("/");
+
+    if (sPathSplit.length === 1) {
+      return oObject[sPath];
+    } else {
+      return getObject(oObject[sPathSplit[0]], sPathSplit.splice(1).join("/"));
+    }
+  }
+  /**
+   * Resolve a dynamic annotation path down to a standard annotation path.
+   *
+   * @param sAnnotationPath
+   * @param oMetaModel
+   * @returns {string} The non dynamic version of the annotation path
+   */
+
+
+  function resolveDynamicExpression(sAnnotationPath, oMetaModel) {
+    if (sAnnotationPath.indexOf("[") !== -1) {
+      var firstBracket = sAnnotationPath.indexOf("[");
+      var sStableBracket = sAnnotationPath.substr(0, firstBracket);
+      var sRest = sAnnotationPath.substr(firstBracket + 1);
+      var lastBracket = sRest.indexOf("]");
+      var aValue = oMetaModel.getObject(sStableBracket);
+      var oExpression = BindingParser.parseExpression(sRest.substr(0, lastBracket));
+
+      if (Array.isArray(aValue) && oExpression && oExpression.result && oExpression.result.parts && oExpression.result.parts[0] && oExpression.result.parts[0].path) {
+        var i;
+        var bFound = false;
+
+        for (i = 0; i < aValue.length && !bFound; i++) {
+          var oObjectValue = getObject(aValue[i], oExpression.result.parts[0].path);
+          var bResult = oExpression.result.formatter(oObjectValue);
+
+          if (bResult) {
+            bFound = true;
+          }
+        }
+
+        if (bFound) {
+          sAnnotationPath = resolveDynamicExpression(sStableBracket + (i - 1) + sRest.substr(lastBracket + 1), oMetaModel);
+        }
+      }
+    }
+
+    return sAnnotationPath;
+  }
+
+  _exports.resolveDynamicExpression = resolveDynamicExpression;
+  return _exports;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkR5bmFtaWNBbm5vdGF0aW9uUGF0aEhlbHBlci50cyJdLCJuYW1lcyI6WyJnZXRPYmplY3QiLCJvT2JqZWN0Iiwic1BhdGgiLCJzUGF0aFNwbGl0Iiwic3BsaXQiLCJsZW5ndGgiLCJzcGxpY2UiLCJqb2luIiwicmVzb2x2ZUR5bmFtaWNFeHByZXNzaW9uIiwic0Fubm90YXRpb25QYXRoIiwib01ldGFNb2RlbCIsImluZGV4T2YiLCJmaXJzdEJyYWNrZXQiLCJzU3RhYmxlQnJhY2tldCIsInN1YnN0ciIsInNSZXN0IiwibGFzdEJyYWNrZXQiLCJhVmFsdWUiLCJvRXhwcmVzc2lvbiIsIkJpbmRpbmdQYXJzZXIiLCJwYXJzZUV4cHJlc3Npb24iLCJBcnJheSIsImlzQXJyYXkiLCJyZXN1bHQiLCJwYXJ0cyIsInBhdGgiLCJpIiwiYkZvdW5kIiwib09iamVjdFZhbHVlIiwiYlJlc3VsdCIsImZvcm1hdHRlciJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7O0FBQUEsV0FBU0EsU0FBVCxDQUFtQkMsT0FBbkIsRUFBaUNDLEtBQWpDLEVBQWtEO0FBQ2pELFFBQUksQ0FBQ0QsT0FBTCxFQUFjO0FBQ2IsYUFBTyxJQUFQO0FBQ0E7O0FBQ0QsUUFBTUUsVUFBVSxHQUFHRCxLQUFLLENBQUNFLEtBQU4sQ0FBWSxHQUFaLENBQW5COztBQUNBLFFBQUlELFVBQVUsQ0FBQ0UsTUFBWCxLQUFzQixDQUExQixFQUE2QjtBQUM1QixhQUFPSixPQUFPLENBQUNDLEtBQUQsQ0FBZDtBQUNBLEtBRkQsTUFFTztBQUNOLGFBQU9GLFNBQVMsQ0FBQ0MsT0FBTyxDQUFDRSxVQUFVLENBQUMsQ0FBRCxDQUFYLENBQVIsRUFBeUJBLFVBQVUsQ0FBQ0csTUFBWCxDQUFrQixDQUFsQixFQUFxQkMsSUFBckIsQ0FBMEIsR0FBMUIsQ0FBekIsQ0FBaEI7QUFDQTtBQUNEO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7OztBQUNPLFdBQVNDLHdCQUFULENBQWtDQyxlQUFsQyxFQUF3REMsVUFBeEQsRUFBeUU7QUFDL0UsUUFBSUQsZUFBZSxDQUFDRSxPQUFoQixDQUF3QixHQUF4QixNQUFpQyxDQUFDLENBQXRDLEVBQXlDO0FBQ3hDLFVBQU1DLFlBQVksR0FBR0gsZUFBZSxDQUFDRSxPQUFoQixDQUF3QixHQUF4QixDQUFyQjtBQUNBLFVBQU1FLGNBQWMsR0FBR0osZUFBZSxDQUFDSyxNQUFoQixDQUF1QixDQUF2QixFQUEwQkYsWUFBMUIsQ0FBdkI7QUFDQSxVQUFNRyxLQUFLLEdBQUdOLGVBQWUsQ0FBQ0ssTUFBaEIsQ0FBdUJGLFlBQVksR0FBRyxDQUF0QyxDQUFkO0FBQ0EsVUFBTUksV0FBVyxHQUFHRCxLQUFLLENBQUNKLE9BQU4sQ0FBYyxHQUFkLENBQXBCO0FBQ0EsVUFBTU0sTUFBTSxHQUFHUCxVQUFVLENBQUNWLFNBQVgsQ0FBcUJhLGNBQXJCLENBQWY7QUFDQSxVQUFNSyxXQUFXLEdBQUdDLGFBQWEsQ0FBQ0MsZUFBZCxDQUE4QkwsS0FBSyxDQUFDRCxNQUFOLENBQWEsQ0FBYixFQUFnQkUsV0FBaEIsQ0FBOUIsQ0FBcEI7O0FBQ0EsVUFDQ0ssS0FBSyxDQUFDQyxPQUFOLENBQWNMLE1BQWQsS0FDQUMsV0FEQSxJQUVBQSxXQUFXLENBQUNLLE1BRlosSUFHQUwsV0FBVyxDQUFDSyxNQUFaLENBQW1CQyxLQUhuQixJQUlBTixXQUFXLENBQUNLLE1BQVosQ0FBbUJDLEtBQW5CLENBQXlCLENBQXpCLENBSkEsSUFLQU4sV0FBVyxDQUFDSyxNQUFaLENBQW1CQyxLQUFuQixDQUF5QixDQUF6QixFQUE0QkMsSUFON0IsRUFPRTtBQUNELFlBQUlDLENBQUo7QUFDQSxZQUFJQyxNQUFNLEdBQUcsS0FBYjs7QUFDQSxhQUFLRCxDQUFDLEdBQUcsQ0FBVCxFQUFZQSxDQUFDLEdBQUdULE1BQU0sQ0FBQ1osTUFBWCxJQUFxQixDQUFDc0IsTUFBbEMsRUFBMENELENBQUMsRUFBM0MsRUFBK0M7QUFDOUMsY0FBTUUsWUFBWSxHQUFHNUIsU0FBUyxDQUFDaUIsTUFBTSxDQUFDUyxDQUFELENBQVAsRUFBWVIsV0FBVyxDQUFDSyxNQUFaLENBQW1CQyxLQUFuQixDQUF5QixDQUF6QixFQUE0QkMsSUFBeEMsQ0FBOUI7QUFDQSxjQUFNSSxPQUFPLEdBQUdYLFdBQVcsQ0FBQ0ssTUFBWixDQUFtQk8sU0FBbkIsQ0FBNkJGLFlBQTdCLENBQWhCOztBQUNBLGNBQUlDLE9BQUosRUFBYTtBQUNaRixZQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNBO0FBQ0Q7O0FBQ0QsWUFBSUEsTUFBSixFQUFZO0FBQ1hsQixVQUFBQSxlQUFlLEdBQUdELHdCQUF3QixDQUFDSyxjQUFjLElBQUlhLENBQUMsR0FBRyxDQUFSLENBQWQsR0FBMkJYLEtBQUssQ0FBQ0QsTUFBTixDQUFhRSxXQUFXLEdBQUcsQ0FBM0IsQ0FBNUIsRUFBMkROLFVBQTNELENBQTFDO0FBQ0E7QUFDRDtBQUNEOztBQUNELFdBQU9ELGVBQVA7QUFDQSIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEJpbmRpbmdQYXJzZXIgZnJvbSBcInNhcC91aS9iYXNlL0JpbmRpbmdQYXJzZXJcIjtcblxuZnVuY3Rpb24gZ2V0T2JqZWN0KG9PYmplY3Q6IGFueSwgc1BhdGg6IGFueSk6IGFueSB7XG5cdGlmICghb09iamVjdCkge1xuXHRcdHJldHVybiBudWxsO1xuXHR9XG5cdGNvbnN0IHNQYXRoU3BsaXQgPSBzUGF0aC5zcGxpdChcIi9cIik7XG5cdGlmIChzUGF0aFNwbGl0Lmxlbmd0aCA9PT0gMSkge1xuXHRcdHJldHVybiBvT2JqZWN0W3NQYXRoXTtcblx0fSBlbHNlIHtcblx0XHRyZXR1cm4gZ2V0T2JqZWN0KG9PYmplY3Rbc1BhdGhTcGxpdFswXV0sIHNQYXRoU3BsaXQuc3BsaWNlKDEpLmpvaW4oXCIvXCIpKTtcblx0fVxufVxuLyoqXG4gKiBSZXNvbHZlIGEgZHluYW1pYyBhbm5vdGF0aW9uIHBhdGggZG93biB0byBhIHN0YW5kYXJkIGFubm90YXRpb24gcGF0aC5cbiAqXG4gKiBAcGFyYW0gc0Fubm90YXRpb25QYXRoXG4gKiBAcGFyYW0gb01ldGFNb2RlbFxuICogQHJldHVybnMge3N0cmluZ30gVGhlIG5vbiBkeW5hbWljIHZlcnNpb24gb2YgdGhlIGFubm90YXRpb24gcGF0aFxuICovXG5leHBvcnQgZnVuY3Rpb24gcmVzb2x2ZUR5bmFtaWNFeHByZXNzaW9uKHNBbm5vdGF0aW9uUGF0aDogYW55LCBvTWV0YU1vZGVsOiBhbnkpIHtcblx0aWYgKHNBbm5vdGF0aW9uUGF0aC5pbmRleE9mKFwiW1wiKSAhPT0gLTEpIHtcblx0XHRjb25zdCBmaXJzdEJyYWNrZXQgPSBzQW5ub3RhdGlvblBhdGguaW5kZXhPZihcIltcIik7XG5cdFx0Y29uc3Qgc1N0YWJsZUJyYWNrZXQgPSBzQW5ub3RhdGlvblBhdGguc3Vic3RyKDAsIGZpcnN0QnJhY2tldCk7XG5cdFx0Y29uc3Qgc1Jlc3QgPSBzQW5ub3RhdGlvblBhdGguc3Vic3RyKGZpcnN0QnJhY2tldCArIDEpO1xuXHRcdGNvbnN0IGxhc3RCcmFja2V0ID0gc1Jlc3QuaW5kZXhPZihcIl1cIik7XG5cdFx0Y29uc3QgYVZhbHVlID0gb01ldGFNb2RlbC5nZXRPYmplY3Qoc1N0YWJsZUJyYWNrZXQpO1xuXHRcdGNvbnN0IG9FeHByZXNzaW9uID0gQmluZGluZ1BhcnNlci5wYXJzZUV4cHJlc3Npb24oc1Jlc3Quc3Vic3RyKDAsIGxhc3RCcmFja2V0KSk7XG5cdFx0aWYgKFxuXHRcdFx0QXJyYXkuaXNBcnJheShhVmFsdWUpICYmXG5cdFx0XHRvRXhwcmVzc2lvbiAmJlxuXHRcdFx0b0V4cHJlc3Npb24ucmVzdWx0ICYmXG5cdFx0XHRvRXhwcmVzc2lvbi5yZXN1bHQucGFydHMgJiZcblx0XHRcdG9FeHByZXNzaW9uLnJlc3VsdC5wYXJ0c1swXSAmJlxuXHRcdFx0b0V4cHJlc3Npb24ucmVzdWx0LnBhcnRzWzBdLnBhdGhcblx0XHQpIHtcblx0XHRcdGxldCBpO1xuXHRcdFx0bGV0IGJGb3VuZCA9IGZhbHNlO1xuXHRcdFx0Zm9yIChpID0gMDsgaSA8IGFWYWx1ZS5sZW5ndGggJiYgIWJGb3VuZDsgaSsrKSB7XG5cdFx0XHRcdGNvbnN0IG9PYmplY3RWYWx1ZSA9IGdldE9iamVjdChhVmFsdWVbaV0sIG9FeHByZXNzaW9uLnJlc3VsdC5wYXJ0c1swXS5wYXRoKTtcblx0XHRcdFx0Y29uc3QgYlJlc3VsdCA9IG9FeHByZXNzaW9uLnJlc3VsdC5mb3JtYXR0ZXIob09iamVjdFZhbHVlKTtcblx0XHRcdFx0aWYgKGJSZXN1bHQpIHtcblx0XHRcdFx0XHRiRm91bmQgPSB0cnVlO1xuXHRcdFx0XHR9XG5cdFx0XHR9XG5cdFx0XHRpZiAoYkZvdW5kKSB7XG5cdFx0XHRcdHNBbm5vdGF0aW9uUGF0aCA9IHJlc29sdmVEeW5hbWljRXhwcmVzc2lvbihzU3RhYmxlQnJhY2tldCArIChpIC0gMSkgKyBzUmVzdC5zdWJzdHIobGFzdEJyYWNrZXQgKyAxKSwgb01ldGFNb2RlbCk7XG5cdFx0XHR9XG5cdFx0fVxuXHR9XG5cdHJldHVybiBzQW5ub3RhdGlvblBhdGg7XG59XG4iXX0=

package/src/sap/fe/core/helpers/DynamicAnnotationPathHelper.ts

@@ -0,0 +1,52 @@
+import BindingParser from "sap/ui/base/BindingParser";
+
+function getObject(oObject: any, sPath: any): any {
+	if (!oObject) {
+		return null;
+	}
+	const sPathSplit = sPath.split("/");
+	if (sPathSplit.length === 1) {
+		return oObject[sPath];
+	} else {
+		return getObject(oObject[sPathSplit[0]], sPathSplit.splice(1).join("/"));
+	}
+}
+/**
+ * Resolve a dynamic annotation path down to a standard annotation path.
+ *
+ * @param sAnnotationPath
+ * @param oMetaModel
+ * @returns {string} The non dynamic version of the annotation path
+ */
+export function resolveDynamicExpression(sAnnotationPath: any, oMetaModel: any) {
+	if (sAnnotationPath.indexOf("[") !== -1) {
+		const firstBracket = sAnnotationPath.indexOf("[");
+		const sStableBracket = sAnnotationPath.substr(0, firstBracket);
+		const sRest = sAnnotationPath.substr(firstBracket + 1);
+		const lastBracket = sRest.indexOf("]");
+		const aValue = oMetaModel.getObject(sStableBracket);
+		const oExpression = BindingParser.parseExpression(sRest.substr(0, lastBracket));
+		if (
+			Array.isArray(aValue) &&
+			oExpression &&
+			oExpression.result &&
+			oExpression.result.parts &&
+			oExpression.result.parts[0] &&
+			oExpression.result.parts[0].path
+		) {
+			let i;
+			let bFound = false;
+			for (i = 0; i < aValue.length && !bFound; i++) {
+				const oObjectValue = getObject(aValue[i], oExpression.result.parts[0].path);
+				const bResult = oExpression.result.formatter(oObjectValue);
+				if (bResult) {
+					bFound = true;
+				}
+			}
+			if (bFound) {
+				sAnnotationPath = resolveDynamicExpression(sStableBracket + (i - 1) + sRest.substr(lastBracket + 1), oMetaModel);
+			}
+		}
+	}
+	return sAnnotationPath;
+}