@sapui5/sap.fe.core 1.102.0 → 1.103.0

package/src/sap/fe/core/converters/controls/ListReport/VisualFilters.ts

@@ -1,14 +1,13 @@
-import { EntityType } from "@sap-ux/annotation-converter";
-import ConverterContext from "sap/fe/core/converters/ConverterContext";
-import { FilterFieldManifestConfiguration } from "sap/fe/core/converters/ManifestSettings";
-import { isPropertyFilterable, getIsRequired } from "sap/fe/core/templating/FilterTemplating";
-import { compileBinding } from "sap/fe/core/helpers/BindingExpression";
-import { checkFilterExpressionRestrictions } from "sap/fe/core/templating/DataModelPathHelper";
+import type { AnnotationTerm, EntityType } from "@sap-ux/vocabularies-types";
+import type { CustomAggregate } from "@sap-ux/vocabularies-types/vocabularies/Aggregation";
+import type { NavigationPropertyRestrictionTypes } from "@sap-ux/vocabularies-types/vocabularies/Capabilities";
+import type ConverterContext from "sap/fe/core/converters/ConverterContext";
 import { AggregationHelper } from "sap/fe/core/converters/helpers/Aggregation";
-import { IssueType, IssueSeverity, IssueCategory } from "sap/fe/core/converters/helpers/IssueManager";
-import { NavigationPropertyRestrictionTypes } from "@sap-ux/vocabularies-types/dist/generated/Capabilities";
-import { AnnotationTerm } from "@sap-ux/vocabularies-types";
-import { CustomAggregate } from "@sap-ux/vocabularies-types/dist/generated/Aggregation";
+import { IssueCategory, IssueSeverity, IssueType } from "sap/fe/core/converters/helpers/IssueManager";
+import type { FilterFieldManifestConfiguration } from "sap/fe/core/converters/ManifestSettings";
+import { compileExpression } from "sap/fe/core/helpers/BindingToolkit";
+import { checkFilterExpressionRestrictions } from "sap/fe/core/templating/DataModelPathHelper";
+import { getIsRequired, isPropertyFilterable } from "sap/fe/core/templating/FilterTemplating";
 
 export type VisualFilters = {
 	dimensionPath?: string;
@@ -30,12 +29,13 @@ export type VisualFilters = {
 
 /**
  * Checks that measures and dimensions of the visual filter chart can be aggregated and grouped.
+ *
  * @param converterContext The converter context
  * @param chartAnnotation The chart annotation
  * @param aggregationHelper The aggregation helper
- * @returns {boolean | undefined }
+ * @returns `true` if the measure can be grouped and aggregated
  */
-const _checkVFAggregation = function(
+const _checkVFAggregation = function (
 	converterContext: ConverterContext,
 	chartAnnotation: any,
 	aggregationHelper: any
@@ -47,14 +47,14 @@ const _checkVFAggregation = function(
 	const aTransAggregations = aggregationHelper.getTransAggregations();
 
 	if (
-		customAggregates.some(function(custAgg: AnnotationTerm<CustomAggregate>) {
+		customAggregates.some(function (custAgg: AnnotationTerm<CustomAggregate>) {
 			return custAgg.qualifier === sMeasure;
 		})
 	) {
 		sMeasurePath = sMeasure;
 	} else if (aTransAggregations && aTransAggregations[0]) {
 		const aAggregations = aTransAggregations[0];
-		aAggregations.some(function(oAggregate: any) {
+		aAggregations.some(function (oAggregate: any) {
 			if (oAggregate.Name === sMeasure) {
 				sMeasurePath = oAggregate?.AggregatableProperty.value;
 			}
@@ -81,11 +81,12 @@ const _checkVFAggregation = function(
 
 /**
  * Method to get the visual filters object for a property.
+ *
  * @param entityType The converter context
  * @param converterContext The chart annotation
  * @param sPropertyPath The aggregation helper
  * @param FilterFields The aggregation helper
- * @returns {VisualFilters | undefined }
+ * @returns The visual filters
  */
 export function getVisualFilters(
 	entityType: EntityType,
@@ -98,13 +99,13 @@ export function getVisualFilters(
 	if (oVisualFilter?.visualFilter?.valueList) {
 		const oVFPath = oVisualFilter?.visualFilter?.valueList;
 		const annotationQualifierSplit = oVFPath.split("#");
-		const qualifierVL = annotationQualifierSplit.length > 1 ? "ValueList#" + annotationQualifierSplit[1] : annotationQualifierSplit[0];
+		const qualifierVL = annotationQualifierSplit.length > 1 ? `ValueList#${annotationQualifierSplit[1]}` : annotationQualifierSplit[0];
 		const property = entityType.resolvePath(sPropertyPath);
 		const valueList: any = property?.annotations?.Common[qualifierVL];
 		if (valueList) {
 			const collectionPath = valueList?.CollectionPath;
 			let collectionPathConverterContext = converterContext.getConverterContextFor(
-				"/" + (collectionPath || converterContext.getEntitySet()?.name)
+				`/${collectionPath || converterContext.getEntitySet()?.name}`
 			);
 			const valueListParams = valueList?.Parameters;
 			let outParameter: any;
@@ -116,12 +117,12 @@ export function getVisualFilters(
 			}
 			const parameterEntityType = collectionPathConverterContext.getParameterEntityType();
 			aParameters = parameterEntityType
-				? parameterEntityType.keys.map(function(key) {
+				? parameterEntityType.keys.map(function (key) {
 						return key.name;
 				  })
 				: [];
 			if (converterContext.getContextPath() === collectionPathConverterContext.getContextPath()) {
-				aParameters.forEach(function(parameter: any) {
+				aParameters.forEach(function (parameter: any) {
 					inParameters.push({
 						localDataProperty: parameter,
 						valueListProperty: parameter
@@ -130,8 +131,8 @@ export function getVisualFilters(
 			}
 			if (valueListParams) {
 				for (const valueListParam of valueListParams) {
-					const localDataProperty = (valueListParam as any).LocalDataProperty?.value;
-					const valueListProperty = (valueListParam as any).ValueListProperty;
+					const localDataProperty = valueListParam.LocalDataProperty?.value;
+					const valueListProperty = valueListParam.ValueListProperty;
 					if (
 						(valueListParam?.$Type === "com.sap.vocabularies.Common.v1.ValueListParameterInOut" ||
 							valueListParam?.$Type === "com.sap.vocabularies.Common.v1.ValueListParameterOut") &&
@@ -155,8 +156,8 @@ export function getVisualFilters(
 				}
 			}
 			if (inParameters && inParameters.length) {
-				inParameters.forEach(function(oInParameter: any) {
-					const mainEntitySetInMappingAllowedExpression = compileBinding(
+				inParameters.forEach(function (oInParameter: any) {
+					const mainEntitySetInMappingAllowedExpression = compileExpression(
 						checkFilterExpressionRestrictions(
 							converterContext
 								.getConverterContextFor(converterContext.getAbsoluteAnnotationPath(oInParameter?.localDataProperty))
@@ -164,7 +165,7 @@ export function getVisualFilters(
 							["SingleValue"]
 						)
 					);
-					const valueListEntitySetInMappingAllowedExpression = compileBinding(
+					const valueListEntitySetInMappingAllowedExpression = compileExpression(
 						checkFilterExpressionRestrictions(
 							collectionPathConverterContext
 								.getConverterContextFor(
@@ -175,23 +176,22 @@ export function getVisualFilters(
 						)
 					);
 					if (valueListEntitySetInMappingAllowedExpression === "true" && mainEntitySetInMappingAllowedExpression === "false") {
-						throw new Error(
-							"FilterRestrictions of " + sPropertyPath + " in MainEntitySet and ValueListEntitySet are different"
-						);
+						throw new Error(`FilterRestrictions of ${sPropertyPath} in MainEntitySet and ValueListEntitySet are different`);
 					}
 				});
 			}
 			const pvQualifier = valueList?.PresentationVariantQualifier;
 			const svQualifier = valueList?.SelectionVariantQualifier;
-			const pvAnnotation: any = collectionPathConverterContext?.getEntityTypeAnnotation("@UI.PresentationVariant#" + pvQualifier)
-				?.annotation;
+			const pvAnnotation: any = collectionPathConverterContext?.getEntityTypeAnnotation(
+				`@UI.PresentationVariant#${pvQualifier}`
+			)?.annotation;
 			const aggregationHelper = new AggregationHelper(collectionPathConverterContext.getEntityType(), collectionPathConverterContext);
 			if (!aggregationHelper.isAnalyticsSupported()) {
 				return;
 			}
 			if (pvAnnotation) {
 				const aVisualizations = pvAnnotation?.Visualizations;
-				const contextPath = "/" + valueList?.CollectionPath || "/" + collectionPathConverterContext?.getEntitySet()?.name;
+				const contextPath = `/${valueList?.CollectionPath}` || `/${collectionPathConverterContext?.getEntitySet()?.name}`;
 				visualFilter.contextPath = contextPath;
 				let chartAnnotation;
 				for (const visualization of aVisualizations) {
@@ -210,17 +210,18 @@ export function getVisualFilters(
 						return;
 					}
 					const bDimensionHidden: boolean = chartAnnotation?.$target?.Dimensions[0]?.$target?.annotations?.UI?.Hidden?.valueOf();
-					const bDimensionHiddenFilter: boolean = chartAnnotation?.$target?.Dimensions[0]?.$target?.annotations?.UI?.HiddenFilter?.valueOf();
+					const bDimensionHiddenFilter: boolean =
+						chartAnnotation?.$target?.Dimensions[0]?.$target?.annotations?.UI?.HiddenFilter?.valueOf();
 					if (bDimensionHidden === true || bDimensionHiddenFilter === true) {
 						return;
 					} else if (aVisualizations && aVisualizations.length) {
 						visualFilter.chartAnnotation = chartAnnotation
 							? collectionPathConverterContext?.getAbsoluteAnnotationPath(
-									chartAnnotation.fullyQualifiedName + "/$AnnotationPath/"
+									`${chartAnnotation.fullyQualifiedName}/$AnnotationPath/`
 							  )
 							: undefined;
 						visualFilter.presentationAnnotation = pvAnnotation
-							? collectionPathConverterContext?.getAbsoluteAnnotationPath(pvAnnotation.fullyQualifiedName + "/")
+							? collectionPathConverterContext?.getAbsoluteAnnotationPath(`${pvAnnotation.fullyQualifiedName}/`)
 							: undefined;
 						visualFilter.outParameter = outParameter?.LocalDataProperty?.value;
 						visualFilter.inParameters = inParameters;
@@ -231,7 +232,7 @@ export function getVisualFilters(
 							["SingleRange", "MultiRange"]
 						);
 
-						if (compileBinding(bIsRange) === "true") {
+						if (compileExpression(bIsRange) === "true") {
 							throw new Error("Range AllowedExpression is not supported for visual filters");
 						}
 
@@ -241,23 +242,25 @@ export function getVisualFilters(
 								.getDataModelObjectPath(),
 							["SingleValue"]
 						);
-						visualFilter.multipleSelectionAllowed = compileBinding(!bIsMainEntitySetSingleSelection.value) as any;
+						visualFilter.multipleSelectionAllowed = compileExpression(!bIsMainEntitySetSingleSelection.value) as any;
 						visualFilter.required = getIsRequired(converterContext, sPropertyPath);
 						let svAnnotation: any;
 						if (svQualifier) {
-							svAnnotation = collectionPathConverterContext?.getEntityTypeAnnotation("@UI.SelectionVariant#" + svQualifier)
-								?.annotation;
+							svAnnotation = collectionPathConverterContext?.getEntityTypeAnnotation(
+								`@UI.SelectionVariant#${svQualifier}`
+							)?.annotation;
 							visualFilter.selectionVariantAnnotation = svAnnotation
-								? collectionPathConverterContext?.getAbsoluteAnnotationPath(svAnnotation.fullyQualifiedName + "/")
+								? collectionPathConverterContext?.getAbsoluteAnnotationPath(`${svAnnotation.fullyQualifiedName}/`)
 								: undefined;
 						}
 						let requiredProperties = [];
 						if (parameterEntityType) {
 							const sEntitySet = collectionPath.split("/")[0];
 							const sNavigationProperty = collectionPath.split("/")[1];
-							const oEntitySetConverterContext = converterContext.getConverterContextFor("/" + sEntitySet);
-							const aRestrictedProperties = oEntitySetConverterContext?.getDataModelObjectPath().startingEntitySet
-								?.annotations?.Capabilities?.NavigationRestrictions?.RestrictedProperties;
+							const oEntitySetConverterContext = converterContext.getConverterContextFor(`/${sEntitySet}`);
+							const aRestrictedProperties =
+								oEntitySetConverterContext?.getDataModelObjectPath().startingEntitySet?.annotations?.Capabilities
+									?.NavigationRestrictions?.RestrictedProperties;
 							const oRestrictedProperty = aRestrictedProperties?.find(
 								(restrictedNavProp: NavigationPropertyRestrictionTypes) => {
 									if (restrictedNavProp.NavigationProperty?.type === "NavigationPropertyPath") {
@@ -272,7 +275,7 @@ export function getVisualFilters(
 						}
 						let requiredPropertyPaths: Array<object> = [];
 						if (requiredProperties?.length) {
-							requiredProperties.forEach(function(oRequireProperty: any) {
+							requiredProperties.forEach(function (oRequireProperty: any) {
 								requiredPropertyPaths.push(oRequireProperty.value);
 							});
 						}
@@ -290,7 +293,7 @@ export function getVisualFilters(
 									selectOptions = selectOptions.concat(parameterOptions);
 									requiredPropertyPaths = requiredPropertyPaths.sort();
 									selectOptions = selectOptions.sort();
-									visualFilter.showOverlayInitially = requiredPropertyPaths.some(function(sPath) {
+									visualFilter.showOverlayInitially = requiredPropertyPaths.some(function (sPath) {
 										return selectOptions.indexOf(sPath) === -1;
 									});
 								}

package/src/sap/fe/core/converters/controls/ObjectPage/Avatar.js

@@ -2,12 +2,12 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/helpers/BindingExpression"], function (BindingExpression) {
+sap.ui.define(["sap/fe/core/helpers/BindingToolkit"], function (BindingToolkit) {
   "use strict";
 
   var _exports = {};
-  var compileBinding = BindingExpression.compileBinding;
-  var annotationExpression = BindingExpression.annotationExpression;
+  var getExpressionFromAnnotation = BindingToolkit.getExpressionFromAnnotation;
+  var compileExpression = BindingToolkit.compileExpression;
 
   var AvatarShape;
 
@@ -32,10 +32,10 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression"], function (BindingExpres
     }
 
     if (headerInfo.ImageUrl && headerInfo.TypeImageUrl) {
-      return compileBinding(annotationExpression(headerInfo.TypeImageUrl));
+      return compileExpression(getExpressionFromAnnotation(headerInfo.TypeImageUrl));
     }
 
-    return compileBinding(isNaturalPerson(converterContext) ? "sap-icon://person-placeholder" : "sap-icon://product");
+    return compileExpression(isNaturalPerson(converterContext) ? "sap-icon://person-placeholder" : "sap-icon://product");
   };
 
   var getSource = function (converterContext) {
@@ -47,7 +47,7 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression"], function (BindingExpres
       return undefined;
     }
 
-    return compileBinding(annotationExpression(headerInfo.ImageUrl || headerInfo.TypeImageUrl));
+    return compileExpression(getExpressionFromAnnotation(headerInfo.ImageUrl || headerInfo.TypeImageUrl));
   };
 
   var getAvatar = function (converterContext) {
@@ -62,13 +62,13 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression"], function (BindingExpres
 
     return {
       src: getSource(converterContext),
-      initials: compileBinding(annotationExpression((headerInfo === null || headerInfo === void 0 ? void 0 : headerInfo.Initials) || "")),
+      initials: compileExpression(getExpressionFromAnnotation((headerInfo === null || headerInfo === void 0 ? void 0 : headerInfo.Initials) || "")),
       fallbackIcon: getFallBackIcon(converterContext),
-      displayShape: compileBinding(isNaturalPerson(converterContext) ? AvatarShape.Circle : AvatarShape.Square)
+      displayShape: compileExpression(isNaturalPerson(converterContext) ? AvatarShape.Circle : AvatarShape.Square)
     };
   };
 
   _exports.getAvatar = getAvatar;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkF2YXRhci50cyJdLCJuYW1lcyI6WyJBdmF0YXJTaGFwZSIsImlzTmF0dXJhbFBlcnNvbiIsImNvbnZlcnRlckNvbnRleHQiLCJnZXRFbnRpdHlUeXBlIiwiYW5ub3RhdGlvbnMiLCJDb21tb24iLCJJc05hdHVyYWxQZXJzb24iLCJ2YWx1ZU9mIiwiZ2V0RmFsbEJhY2tJY29uIiwiaGVhZGVySW5mbyIsIlVJIiwiSGVhZGVySW5mbyIsIkltYWdlVXJsIiwiVHlwZUltYWdlVXJsIiwidW5kZWZpbmVkIiwiY29tcGlsZUJpbmRpbmciLCJhbm5vdGF0aW9uRXhwcmVzc2lvbiIsImdldFNvdXJjZSIsImdldEF2YXRhciIsIm9Tb3VyY2UiLCJJbml0aWFscyIsInNyYyIsImluaXRpYWxzIiwiZmFsbGJhY2tJY29uIiwiZGlzcGxheVNoYXBlIiwiQ2lyY2xlIiwiU3F1YXJlIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7OztNQUFLQSxXOzthQUFBQSxXO0FBQUFBLElBQUFBLFc7QUFBQUEsSUFBQUEsVztLQUFBQSxXLEtBQUFBLFc7O0FBWUwsTUFBTUMsZUFBZSxHQUFHLFVBQUNDLGdCQUFELEVBQWlEO0FBQUE7O0FBQ3hFLFdBQU8sMEJBQUFBLGdCQUFnQixDQUFDQyxhQUFqQixHQUFpQ0MsV0FBakMsQ0FBNkNDLE1BQTdDLDBHQUFxREMsZUFBckQsa0ZBQXNFQyxPQUF0RSxRQUFvRixJQUEzRjtBQUNBLEdBRkQ7O0FBSUEsTUFBTUMsZUFBZSxHQUFHLFVBQUNOLGdCQUFELEVBQStFO0FBQUE7O0FBQ3RHLFFBQU1PLFVBQVUsNkJBQUdQLGdCQUFnQixDQUFDQyxhQUFqQixHQUFpQ0MsV0FBcEMscUZBQUcsdUJBQThDTSxFQUFqRCwyREFBRyx1QkFBa0RDLFVBQXJFOztBQUNBLFFBQUksQ0FBQ0YsVUFBRCxJQUFnQkEsVUFBVSxJQUFJLENBQUNBLFVBQVUsQ0FBQ0csUUFBMUIsSUFBc0MsQ0FBQ0gsVUFBVSxDQUFDSSxZQUF0RSxFQUFxRjtBQUNwRixhQUFPQyxTQUFQO0FBQ0E7O0FBQ0QsUUFBSUwsVUFBVSxDQUFDRyxRQUFYLElBQXVCSCxVQUFVLENBQUNJLFlBQXRDLEVBQW9EO0FBQ25ELGFBQU9FLGNBQWMsQ0FBQ0Msb0JBQW9CLENBQUNQLFVBQVUsQ0FBQ0ksWUFBWixDQUFyQixDQUFyQjtBQUNBOztBQUNELFdBQU9FLGNBQWMsQ0FBQ2QsZUFBZSxDQUFDQyxnQkFBRCxDQUFmLEdBQW9DLCtCQUFwQyxHQUFzRSxvQkFBdkUsQ0FBckI7QUFDQSxHQVREOztBQVdBLE1BQU1lLFNBQVMsR0FBRyxVQUFDZixnQkFBRCxFQUErRTtBQUFBOztBQUNoRyxRQUFNTyxVQUFVLDZCQUFHUCxnQkFBZ0IsQ0FBQ0MsYUFBakIsR0FBaUNDLFdBQXBDLHFGQUFHLHVCQUE4Q00sRUFBakQsMkRBQUcsdUJBQWtEQyxVQUFyRTs7QUFDQSxRQUFJLENBQUNGLFVBQUQsSUFBZSxFQUFFQSxVQUFVLENBQUNHLFFBQVgsSUFBdUJILFVBQVUsQ0FBQ0ksWUFBcEMsQ0FBbkIsRUFBc0U7QUFDckUsYUFBT0MsU0FBUDtBQUNBOztBQUNELFdBQU9DLGNBQWMsQ0FBQ0Msb0JBQW9CLENBQUNQLFVBQVUsQ0FBQ0csUUFBWCxJQUF1QkgsVUFBVSxDQUFDSSxZQUFuQyxDQUFyQixDQUFyQjtBQUNBLEdBTkQ7O0FBUU8sTUFBTUssU0FBUyxHQUFHLFVBQUNoQixnQkFBRCxFQUE0RDtBQUFBOztBQUNwRixRQUFNTyxVQUFVLDZCQUFHUCxnQkFBZ0IsQ0FBQ0MsYUFBakIsR0FBaUNDLFdBQXBDLHFGQUFHLHVCQUE4Q00sRUFBakQsMkRBQUcsdUJBQWtEQyxVQUFyRTtBQUNBLFFBQU1RLE9BQVksR0FBR1YsVUFBVSxLQUFLQSxVQUFVLENBQUNHLFFBQVgsSUFBdUJILFVBQVUsQ0FBQ0ksWUFBbEMsSUFBa0RKLFVBQVUsQ0FBQ1csUUFBbEUsQ0FBL0I7O0FBQ0EsUUFBSSxDQUFDRCxPQUFMLEVBQWM7QUFDYixhQUFPTCxTQUFQO0FBQ0E7O0FBQ0QsV0FBTztBQUNOTyxNQUFBQSxHQUFHLEVBQUVKLFNBQVMsQ0FBQ2YsZ0JBQUQsQ0FEUjtBQUVOb0IsTUFBQUEsUUFBUSxFQUFFUCxjQUFjLENBQUNDLG9CQUFvQixDQUFDLENBQUFQLFVBQVUsU0FBVixJQUFBQSxVQUFVLFdBQVYsWUFBQUEsVUFBVSxDQUFFVyxRQUFaLEtBQXdCLEVBQXpCLENBQXJCLENBRmxCO0FBR05HLE1BQUFBLFlBQVksRUFBRWYsZUFBZSxDQUFDTixnQkFBRCxDQUh2QjtBQUlOc0IsTUFBQUEsWUFBWSxFQUFFVCxjQUFjLENBQUNkLGVBQWUsQ0FBQ0MsZ0JBQUQsQ0FBZixHQUFvQ0YsV0FBVyxDQUFDeUIsTUFBaEQsR0FBeUR6QixXQUFXLENBQUMwQixNQUF0RTtBQUp0QixLQUFQO0FBTUEsR0FaTSIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IENvbnZlcnRlckNvbnRleHQgZnJvbSBcIi4uLy4uL0NvbnZlcnRlckNvbnRleHRcIjtcbmltcG9ydCB7IGFubm90YXRpb25FeHByZXNzaW9uLCBCaW5kaW5nRXhwcmVzc2lvbiwgY29tcGlsZUJpbmRpbmcgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9CaW5kaW5nRXhwcmVzc2lvblwiO1xuZW51bSBBdmF0YXJTaGFwZSB7XG5cdENpcmNsZSA9IFwiQ2lyY2xlXCIsXG5cdFNxdWFyZSA9IFwiU3F1YXJlXCJcbn1cblxuZXhwb3J0IHR5cGUgQXZhdGFyID0ge1xuXHRzcmM/OiBCaW5kaW5nRXhwcmVzc2lvbjxzdHJpbmc+O1xuXHRpbml0aWFsczogQmluZGluZ0V4cHJlc3Npb248c3RyaW5nPjtcblx0ZmFsbGJhY2tJY29uPzogQmluZGluZ0V4cHJlc3Npb248c3RyaW5nPjtcblx0ZGlzcGxheVNoYXBlOiBCaW5kaW5nRXhwcmVzc2lvbjxzdHJpbmc+O1xufTtcblxuY29uc3QgaXNOYXR1cmFsUGVyc29uID0gKGNvbnZlcnRlckNvbnRleHQ6IENvbnZlcnRlckNvbnRleHQpOiBCb29sZWFuID0+IHtcblx0cmV0dXJuIGNvbnZlcnRlckNvbnRleHQuZ2V0RW50aXR5VHlwZSgpLmFubm90YXRpb25zLkNvbW1vbj8uSXNOYXR1cmFsUGVyc29uPy52YWx1ZU9mKCkgPT09IHRydWU7XG59O1xuXG5jb25zdCBnZXRGYWxsQmFja0ljb24gPSAoY29udmVydGVyQ29udGV4dDogQ29udmVydGVyQ29udGV4dCk6IEJpbmRpbmdFeHByZXNzaW9uPHN0cmluZz4gfCB1bmRlZmluZWQgPT4ge1xuXHRjb25zdCBoZWFkZXJJbmZvID0gY29udmVydGVyQ29udGV4dC5nZXRFbnRpdHlUeXBlKCkuYW5ub3RhdGlvbnM/LlVJPy5IZWFkZXJJbmZvO1xuXHRpZiAoIWhlYWRlckluZm8gfHwgKGhlYWRlckluZm8gJiYgIWhlYWRlckluZm8uSW1hZ2VVcmwgJiYgIWhlYWRlckluZm8uVHlwZUltYWdlVXJsKSkge1xuXHRcdHJldHVybiB1bmRlZmluZWQ7XG5cdH1cblx0aWYgKGhlYWRlckluZm8uSW1hZ2VVcmwgJiYgaGVhZGVySW5mby5UeXBlSW1hZ2VVcmwpIHtcblx0XHRyZXR1cm4gY29tcGlsZUJpbmRpbmcoYW5ub3RhdGlvbkV4cHJlc3Npb24oaGVhZGVySW5mby5UeXBlSW1hZ2VVcmwpKTtcblx0fVxuXHRyZXR1cm4gY29tcGlsZUJpbmRpbmcoaXNOYXR1cmFsUGVyc29uKGNvbnZlcnRlckNvbnRleHQpID8gXCJzYXAtaWNvbjovL3BlcnNvbi1wbGFjZWhvbGRlclwiIDogXCJzYXAtaWNvbjovL3Byb2R1Y3RcIik7XG59O1xuXG5jb25zdCBnZXRTb3VyY2UgPSAoY29udmVydGVyQ29udGV4dDogQ29udmVydGVyQ29udGV4dCk6IEJpbmRpbmdFeHByZXNzaW9uPHN0cmluZz4gfCB1bmRlZmluZWQgPT4ge1xuXHRjb25zdCBoZWFkZXJJbmZvID0gY29udmVydGVyQ29udGV4dC5nZXRFbnRpdHlUeXBlKCkuYW5ub3RhdGlvbnM/LlVJPy5IZWFkZXJJbmZvO1xuXHRpZiAoIWhlYWRlckluZm8gfHwgIShoZWFkZXJJbmZvLkltYWdlVXJsIHx8IGhlYWRlckluZm8uVHlwZUltYWdlVXJsKSkge1xuXHRcdHJldHVybiB1bmRlZmluZWQ7XG5cdH1cblx0cmV0dXJuIGNvbXBpbGVCaW5kaW5nKGFubm90YXRpb25FeHByZXNzaW9uKGhlYWRlckluZm8uSW1hZ2VVcmwgfHwgaGVhZGVySW5mby5UeXBlSW1hZ2VVcmwpKTtcbn07XG5cbmV4cG9ydCBjb25zdCBnZXRBdmF0YXIgPSAoY29udmVydGVyQ29udGV4dDogQ29udmVydGVyQ29udGV4dCk6IEF2YXRhciB8IHVuZGVmaW5lZCA9PiB7XG5cdGNvbnN0IGhlYWRlckluZm8gPSBjb252ZXJ0ZXJDb250ZXh0LmdldEVudGl0eVR5cGUoKS5hbm5vdGF0aW9ucz8uVUk/LkhlYWRlckluZm87XG5cdGNvbnN0IG9Tb3VyY2U6IGFueSA9IGhlYWRlckluZm8gJiYgKGhlYWRlckluZm8uSW1hZ2VVcmwgfHwgaGVhZGVySW5mby5UeXBlSW1hZ2VVcmwgfHwgaGVhZGVySW5mby5Jbml0aWFscyk7XG5cdGlmICghb1NvdXJjZSkge1xuXHRcdHJldHVybiB1bmRlZmluZWQ7XG5cdH1cblx0cmV0dXJuIHtcblx0XHRzcmM6IGdldFNvdXJjZShjb252ZXJ0ZXJDb250ZXh0KSxcblx0XHRpbml0aWFsczogY29tcGlsZUJpbmRpbmcoYW5ub3RhdGlvbkV4cHJlc3Npb24oaGVhZGVySW5mbz8uSW5pdGlhbHMgfHwgXCJcIikpLFxuXHRcdGZhbGxiYWNrSWNvbjogZ2V0RmFsbEJhY2tJY29uKGNvbnZlcnRlckNvbnRleHQpLFxuXHRcdGRpc3BsYXlTaGFwZTogY29tcGlsZUJpbmRpbmcoaXNOYXR1cmFsUGVyc29uKGNvbnZlcnRlckNvbnRleHQpID8gQXZhdGFyU2hhcGUuQ2lyY2xlIDogQXZhdGFyU2hhcGUuU3F1YXJlKVxuXHR9O1xufTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkF2YXRhci50cyJdLCJuYW1lcyI6WyJBdmF0YXJTaGFwZSIsImlzTmF0dXJhbFBlcnNvbiIsImNvbnZlcnRlckNvbnRleHQiLCJnZXRFbnRpdHlUeXBlIiwiYW5ub3RhdGlvbnMiLCJDb21tb24iLCJJc05hdHVyYWxQZXJzb24iLCJ2YWx1ZU9mIiwiZ2V0RmFsbEJhY2tJY29uIiwiaGVhZGVySW5mbyIsIlVJIiwiSGVhZGVySW5mbyIsIkltYWdlVXJsIiwiVHlwZUltYWdlVXJsIiwidW5kZWZpbmVkIiwiY29tcGlsZUV4cHJlc3Npb24iLCJnZXRFeHByZXNzaW9uRnJvbUFubm90YXRpb24iLCJnZXRTb3VyY2UiLCJnZXRBdmF0YXIiLCJvU291cmNlIiwiSW5pdGlhbHMiLCJzcmMiLCJpbml0aWFscyIsImZhbGxiYWNrSWNvbiIsImRpc3BsYXlTaGFwZSIsIkNpcmNsZSIsIlNxdWFyZSJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7TUFDS0EsVzs7YUFBQUEsVztBQUFBQSxJQUFBQSxXO0FBQUFBLElBQUFBLFc7S0FBQUEsVyxLQUFBQSxXOztBQVlMLE1BQU1DLGVBQWUsR0FBRyxVQUFDQyxnQkFBRCxFQUFpRDtBQUFBOztBQUN4RSxXQUFPLDBCQUFBQSxnQkFBZ0IsQ0FBQ0MsYUFBakIsR0FBaUNDLFdBQWpDLENBQTZDQyxNQUE3QywwR0FBcURDLGVBQXJELGtGQUFzRUMsT0FBdEUsUUFBb0YsSUFBM0Y7QUFDQSxHQUZEOztBQUlBLE1BQU1DLGVBQWUsR0FBRyxVQUFDTixnQkFBRCxFQUFzRjtBQUFBOztBQUM3RyxRQUFNTyxVQUFVLDZCQUFHUCxnQkFBZ0IsQ0FBQ0MsYUFBakIsR0FBaUNDLFdBQXBDLHFGQUFHLHVCQUE4Q00sRUFBakQsMkRBQUcsdUJBQWtEQyxVQUFyRTs7QUFDQSxRQUFJLENBQUNGLFVBQUQsSUFBZ0JBLFVBQVUsSUFBSSxDQUFDQSxVQUFVLENBQUNHLFFBQTFCLElBQXNDLENBQUNILFVBQVUsQ0FBQ0ksWUFBdEUsRUFBcUY7QUFDcEYsYUFBT0MsU0FBUDtBQUNBOztBQUNELFFBQUlMLFVBQVUsQ0FBQ0csUUFBWCxJQUF1QkgsVUFBVSxDQUFDSSxZQUF0QyxFQUFvRDtBQUNuRCxhQUFPRSxpQkFBaUIsQ0FBQ0MsMkJBQTJCLENBQUNQLFVBQVUsQ0FBQ0ksWUFBWixDQUE1QixDQUF4QjtBQUNBOztBQUNELFdBQU9FLGlCQUFpQixDQUFDZCxlQUFlLENBQUNDLGdCQUFELENBQWYsR0FBb0MsK0JBQXBDLEdBQXNFLG9CQUF2RSxDQUF4QjtBQUNBLEdBVEQ7O0FBV0EsTUFBTWUsU0FBUyxHQUFHLFVBQUNmLGdCQUFELEVBQXNGO0FBQUE7O0FBQ3ZHLFFBQU1PLFVBQVUsNkJBQUdQLGdCQUFnQixDQUFDQyxhQUFqQixHQUFpQ0MsV0FBcEMscUZBQUcsdUJBQThDTSxFQUFqRCwyREFBRyx1QkFBa0RDLFVBQXJFOztBQUNBLFFBQUksQ0FBQ0YsVUFBRCxJQUFlLEVBQUVBLFVBQVUsQ0FBQ0csUUFBWCxJQUF1QkgsVUFBVSxDQUFDSSxZQUFwQyxDQUFuQixFQUFzRTtBQUNyRSxhQUFPQyxTQUFQO0FBQ0E7O0FBQ0QsV0FBT0MsaUJBQWlCLENBQUNDLDJCQUEyQixDQUFDUCxVQUFVLENBQUNHLFFBQVgsSUFBdUJILFVBQVUsQ0FBQ0ksWUFBbkMsQ0FBNUIsQ0FBeEI7QUFDQSxHQU5EOztBQVFPLE1BQU1LLFNBQVMsR0FBRyxVQUFDaEIsZ0JBQUQsRUFBNEQ7QUFBQTs7QUFDcEYsUUFBTU8sVUFBVSw2QkFBR1AsZ0JBQWdCLENBQUNDLGFBQWpCLEdBQWlDQyxXQUFwQyxxRkFBRyx1QkFBOENNLEVBQWpELDJEQUFHLHVCQUFrREMsVUFBckU7QUFDQSxRQUFNUSxPQUFZLEdBQUdWLFVBQVUsS0FBS0EsVUFBVSxDQUFDRyxRQUFYLElBQXVCSCxVQUFVLENBQUNJLFlBQWxDLElBQWtESixVQUFVLENBQUNXLFFBQWxFLENBQS9COztBQUNBLFFBQUksQ0FBQ0QsT0FBTCxFQUFjO0FBQ2IsYUFBT0wsU0FBUDtBQUNBOztBQUNELFdBQU87QUFDTk8sTUFBQUEsR0FBRyxFQUFFSixTQUFTLENBQUNmLGdCQUFELENBRFI7QUFFTm9CLE1BQUFBLFFBQVEsRUFBRVAsaUJBQWlCLENBQUNDLDJCQUEyQixDQUFDLENBQUFQLFVBQVUsU0FBVixJQUFBQSxVQUFVLFdBQVYsWUFBQUEsVUFBVSxDQUFFVyxRQUFaLEtBQXdCLEVBQXpCLENBQTVCLENBRnJCO0FBR05HLE1BQUFBLFlBQVksRUFBRWYsZUFBZSxDQUFDTixnQkFBRCxDQUh2QjtBQUlOc0IsTUFBQUEsWUFBWSxFQUFFVCxpQkFBaUIsQ0FBQ2QsZUFBZSxDQUFDQyxnQkFBRCxDQUFmLEdBQW9DRixXQUFXLENBQUN5QixNQUFoRCxHQUF5RHpCLFdBQVcsQ0FBQzBCLE1BQXRFO0FBSnpCLEtBQVA7QUFNQSxHQVpNIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IENvbXBpbGVkQmluZGluZ1Rvb2xraXRFeHByZXNzaW9uIH0gZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvQmluZGluZ1Rvb2xraXRcIjtcbmltcG9ydCB7IGNvbXBpbGVFeHByZXNzaW9uLCBnZXRFeHByZXNzaW9uRnJvbUFubm90YXRpb24gfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9CaW5kaW5nVG9vbGtpdFwiO1xuaW1wb3J0IHR5cGUgQ29udmVydGVyQ29udGV4dCBmcm9tIFwiLi4vLi4vQ29udmVydGVyQ29udGV4dFwiO1xuZW51bSBBdmF0YXJTaGFwZSB7XG5cdENpcmNsZSA9IFwiQ2lyY2xlXCIsXG5cdFNxdWFyZSA9IFwiU3F1YXJlXCJcbn1cblxuZXhwb3J0IHR5cGUgQXZhdGFyID0ge1xuXHRzcmM/OiBDb21waWxlZEJpbmRpbmdUb29sa2l0RXhwcmVzc2lvbjtcblx0aW5pdGlhbHM6IENvbXBpbGVkQmluZGluZ1Rvb2xraXRFeHByZXNzaW9uO1xuXHRmYWxsYmFja0ljb24/OiBDb21waWxlZEJpbmRpbmdUb29sa2l0RXhwcmVzc2lvbjtcblx0ZGlzcGxheVNoYXBlOiBDb21waWxlZEJpbmRpbmdUb29sa2l0RXhwcmVzc2lvbjtcbn07XG5cbmNvbnN0IGlzTmF0dXJhbFBlcnNvbiA9IChjb252ZXJ0ZXJDb250ZXh0OiBDb252ZXJ0ZXJDb250ZXh0KTogQm9vbGVhbiA9PiB7XG5cdHJldHVybiBjb252ZXJ0ZXJDb250ZXh0LmdldEVudGl0eVR5cGUoKS5hbm5vdGF0aW9ucy5Db21tb24/LklzTmF0dXJhbFBlcnNvbj8udmFsdWVPZigpID09PSB0cnVlO1xufTtcblxuY29uc3QgZ2V0RmFsbEJhY2tJY29uID0gKGNvbnZlcnRlckNvbnRleHQ6IENvbnZlcnRlckNvbnRleHQpOiBDb21waWxlZEJpbmRpbmdUb29sa2l0RXhwcmVzc2lvbiB8IHVuZGVmaW5lZCA9PiB7XG5cdGNvbnN0IGhlYWRlckluZm8gPSBjb252ZXJ0ZXJDb250ZXh0LmdldEVudGl0eVR5cGUoKS5hbm5vdGF0aW9ucz8uVUk/LkhlYWRlckluZm87XG5cdGlmICghaGVhZGVySW5mbyB8fCAoaGVhZGVySW5mbyAmJiAhaGVhZGVySW5mby5JbWFnZVVybCAmJiAhaGVhZGVySW5mby5UeXBlSW1hZ2VVcmwpKSB7XG5cdFx0cmV0dXJuIHVuZGVmaW5lZDtcblx0fVxuXHRpZiAoaGVhZGVySW5mby5JbWFnZVVybCAmJiBoZWFkZXJJbmZvLlR5cGVJbWFnZVVybCkge1xuXHRcdHJldHVybiBjb21waWxlRXhwcmVzc2lvbihnZXRFeHByZXNzaW9uRnJvbUFubm90YXRpb24oaGVhZGVySW5mby5UeXBlSW1hZ2VVcmwpKTtcblx0fVxuXHRyZXR1cm4gY29tcGlsZUV4cHJlc3Npb24oaXNOYXR1cmFsUGVyc29uKGNvbnZlcnRlckNvbnRleHQpID8gXCJzYXAtaWNvbjovL3BlcnNvbi1wbGFjZWhvbGRlclwiIDogXCJzYXAtaWNvbjovL3Byb2R1Y3RcIik7XG59O1xuXG5jb25zdCBnZXRTb3VyY2UgPSAoY29udmVydGVyQ29udGV4dDogQ29udmVydGVyQ29udGV4dCk6IENvbXBpbGVkQmluZGluZ1Rvb2xraXRFeHByZXNzaW9uIHwgdW5kZWZpbmVkID0+IHtcblx0Y29uc3QgaGVhZGVySW5mbyA9IGNvbnZlcnRlckNvbnRleHQuZ2V0RW50aXR5VHlwZSgpLmFubm90YXRpb25zPy5VST8uSGVhZGVySW5mbztcblx0aWYgKCFoZWFkZXJJbmZvIHx8ICEoaGVhZGVySW5mby5JbWFnZVVybCB8fCBoZWFkZXJJbmZvLlR5cGVJbWFnZVVybCkpIHtcblx0XHRyZXR1cm4gdW5kZWZpbmVkO1xuXHR9XG5cdHJldHVybiBjb21waWxlRXhwcmVzc2lvbihnZXRFeHByZXNzaW9uRnJvbUFubm90YXRpb24oaGVhZGVySW5mby5JbWFnZVVybCB8fCBoZWFkZXJJbmZvLlR5cGVJbWFnZVVybCkpO1xufTtcblxuZXhwb3J0IGNvbnN0IGdldEF2YXRhciA9IChjb252ZXJ0ZXJDb250ZXh0OiBDb252ZXJ0ZXJDb250ZXh0KTogQXZhdGFyIHwgdW5kZWZpbmVkID0+IHtcblx0Y29uc3QgaGVhZGVySW5mbyA9IGNvbnZlcnRlckNvbnRleHQuZ2V0RW50aXR5VHlwZSgpLmFubm90YXRpb25zPy5VST8uSGVhZGVySW5mbztcblx0Y29uc3Qgb1NvdXJjZTogYW55ID0gaGVhZGVySW5mbyAmJiAoaGVhZGVySW5mby5JbWFnZVVybCB8fCBoZWFkZXJJbmZvLlR5cGVJbWFnZVVybCB8fCBoZWFkZXJJbmZvLkluaXRpYWxzKTtcblx0aWYgKCFvU291cmNlKSB7XG5cdFx0cmV0dXJuIHVuZGVmaW5lZDtcblx0fVxuXHRyZXR1cm4ge1xuXHRcdHNyYzogZ2V0U291cmNlKGNvbnZlcnRlckNvbnRleHQpLFxuXHRcdGluaXRpYWxzOiBjb21waWxlRXhwcmVzc2lvbihnZXRFeHByZXNzaW9uRnJvbUFubm90YXRpb24oaGVhZGVySW5mbz8uSW5pdGlhbHMgfHwgXCJcIikpLFxuXHRcdGZhbGxiYWNrSWNvbjogZ2V0RmFsbEJhY2tJY29uKGNvbnZlcnRlckNvbnRleHQpLFxuXHRcdGRpc3BsYXlTaGFwZTogY29tcGlsZUV4cHJlc3Npb24oaXNOYXR1cmFsUGVyc29uKGNvbnZlcnRlckNvbnRleHQpID8gQXZhdGFyU2hhcGUuQ2lyY2xlIDogQXZhdGFyU2hhcGUuU3F1YXJlKVxuXHR9O1xufTtcbiJdfQ==

package/src/sap/fe/core/converters/controls/ObjectPage/Avatar.ts

@@ -1,38 +1,39 @@
-import ConverterContext from "../../ConverterContext";
-import { annotationExpression, BindingExpression, compileBinding } from "sap/fe/core/helpers/BindingExpression";
+import type { CompiledBindingToolkitExpression } from "sap/fe/core/helpers/BindingToolkit";
+import { compileExpression, getExpressionFromAnnotation } from "sap/fe/core/helpers/BindingToolkit";
+import type ConverterContext from "../../ConverterContext";
 enum AvatarShape {
 	Circle = "Circle",
 	Square = "Square"
 }
 
 export type Avatar = {
-	src?: BindingExpression<string>;
-	initials: BindingExpression<string>;
-	fallbackIcon?: BindingExpression<string>;
-	displayShape: BindingExpression<string>;
+	src?: CompiledBindingToolkitExpression;
+	initials: CompiledBindingToolkitExpression;
+	fallbackIcon?: CompiledBindingToolkitExpression;
+	displayShape: CompiledBindingToolkitExpression;
 };
 
 const isNaturalPerson = (converterContext: ConverterContext): Boolean => {
 	return converterContext.getEntityType().annotations.Common?.IsNaturalPerson?.valueOf() === true;
 };
 
-const getFallBackIcon = (converterContext: ConverterContext): BindingExpression<string> | undefined => {
+const getFallBackIcon = (converterContext: ConverterContext): CompiledBindingToolkitExpression | undefined => {
 	const headerInfo = converterContext.getEntityType().annotations?.UI?.HeaderInfo;
 	if (!headerInfo || (headerInfo && !headerInfo.ImageUrl && !headerInfo.TypeImageUrl)) {
 		return undefined;
 	}
 	if (headerInfo.ImageUrl && headerInfo.TypeImageUrl) {
-		return compileBinding(annotationExpression(headerInfo.TypeImageUrl));
+		return compileExpression(getExpressionFromAnnotation(headerInfo.TypeImageUrl));
 	}
-	return compileBinding(isNaturalPerson(converterContext) ? "sap-icon://person-placeholder" : "sap-icon://product");
+	return compileExpression(isNaturalPerson(converterContext) ? "sap-icon://person-placeholder" : "sap-icon://product");
 };
 
-const getSource = (converterContext: ConverterContext): BindingExpression<string> | undefined => {
+const getSource = (converterContext: ConverterContext): CompiledBindingToolkitExpression | undefined => {
 	const headerInfo = converterContext.getEntityType().annotations?.UI?.HeaderInfo;
 	if (!headerInfo || !(headerInfo.ImageUrl || headerInfo.TypeImageUrl)) {
 		return undefined;
 	}
-	return compileBinding(annotationExpression(headerInfo.ImageUrl || headerInfo.TypeImageUrl));
+	return compileExpression(getExpressionFromAnnotation(headerInfo.ImageUrl || headerInfo.TypeImageUrl));
 };
 
 export const getAvatar = (converterContext: ConverterContext): Avatar | undefined => {
@@ -43,8 +44,8 @@ export const getAvatar = (converterContext: ConverterContext): Avatar | undefine
 	}
 	return {
 		src: getSource(converterContext),
-		initials: compileBinding(annotationExpression(headerInfo?.Initials || "")),
+		initials: compileExpression(getExpressionFromAnnotation(headerInfo?.Initials || "")),
 		fallbackIcon: getFallBackIcon(converterContext),
-		displayShape: compileBinding(isNaturalPerson(converterContext) ? AvatarShape.Circle : AvatarShape.Square)
+		displayShape: compileExpression(isNaturalPerson(converterContext) ? AvatarShape.Circle : AvatarShape.Square)
 	};
 };