@sapui5/sap.fe.core 1.111.1 → 1.113.0

package/src/sap/fe/core/services/TemplatedViewServiceFactory.ts

@@ -1,13 +1,12 @@
-import type ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
-import UriParameters from "sap/base/util/UriParameters";
 import type AppComponent from "sap/fe/core/AppComponent";
-import type { ManifestContent } from "sap/fe/core/AppComponent";
+import type { ComponentData, ManifestContent } from "sap/fe/core/AppComponent";
 import type { ContentDensitiesType, ControlConfiguration } from "sap/fe/core/converters/ManifestSettings";
 import { requireDependencies } from "sap/fe/core/helpers/LoaderUtils";
+import { applyPageConfigurationChanges } from "sap/fe/core/manifestMerger/ChangePageConfiguration";
+import ResourceModel from "sap/fe/core/ResourceModel";
 import type { CacheHandlerService } from "sap/fe/core/services/CacheHandlerServiceFactory";
 import TemplateModel from "sap/fe/core/TemplateModel";
-import type ResourceModel from "sap/fe/macros/ResourceModel";
 import Component from "sap/ui/core/Component";
 import View from "sap/ui/core/mvc/View";
 import Service from "sap/ui/core/service/Service";
@@ -18,17 +17,18 @@ import ManagedObjectModel from "sap/ui/model/base/ManagedObjectModel";
 import JSONModel from "sap/ui/model/json/JSONModel";
 import type Model from "sap/ui/model/Model";
 import VersionInfo from "sap/ui/VersionInfo";
-import type { ServiceContext } from "types/extension_types";
+import type { ServiceContext } from "types/metamodel_types";
 import { resolveDynamicExpression } from "../helpers/DynamicAnnotationPathHelper";
 import type { ResourceModelService } from "./ResourceModelServiceFactory";
 
 type TemplatedViewServiceSettings = {};
 export type ViewData = {
+	appComponent: AppComponent;
 	navigation: object;
 	viewLevel: number;
 	stableId: string;
 	contentDensities?: ContentDensitiesType;
-	resourceBundle: ResourceBundle;
+	resourceModel: ResourceModel;
 	fullContextPath: string;
 	isDesktop: boolean;
 	isPhone: boolean;
@@ -37,17 +37,29 @@ export type ViewData = {
 	useNewLazyLoading?: boolean;
 	retrieveTextFromValueList?: boolean;
 	controlConfiguration?: ControlConfiguration;
+	entitySet?: string;
+	isShareButtonVisibleForMyInbox?: boolean;
 };
 
 class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 	initPromise!: Promise<any>;
+
 	oView!: View;
+
 	oResourceModelService!: ResourceModelService;
+
 	oCacheHandlerService!: CacheHandlerService;
+
 	oFactory!: TemplatedViewServiceFactory;
-	resourceModel!: typeof ResourceModel;
+
+	resourceModel!: ResourceModel;
+
 	stableId!: string;
+
+	pageId!: string;
+
 	TemplateConverter: any;
+
 	MetaModelConverter: any;
 
 	init() {
@@ -56,7 +68,8 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		const oComponent = oContext.scopeObject;
 		const oAppComponent = Component.getOwnerComponentFor(oComponent) as AppComponent;
 		const oMetaModel = oAppComponent.getMetaModel();
-		const sStableId = `${oAppComponent.getMetadata().getComponentName()}::${oAppComponent.getLocalId(oComponent.getId())}`;
+		this.pageId = oAppComponent.getLocalId(oComponent.getId()) as string;
+		const sStableId = `${oAppComponent.getMetadata().getComponentName()}::${this.pageId}`;
 		const aEnhanceI18n = oComponent.getEnhanceI18n() || [];
 		let sAppNamespace;
 		this.oFactory = oContext.factory;
@@ -132,7 +145,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 
 		this.initPromise = Promise.all(aServiceDependencies)
 			.then(async (aDependenciesResult: any[]) => {
-				const oResourceModel = aDependenciesResult[0];
+				const oResourceModel = aDependenciesResult[0] as ResourceModel;
 				const sCacheKey = aDependenciesResult[1];
 				const oSideEffectsServices = oAppComponent.getSideEffectsService();
 				oSideEffectsServices.initializeSideEffects(oAppComponent.getEnvironmentCapabilities().getCapabilities());
@@ -172,14 +185,15 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 				Log.error(oError);
 			});
 	}
+
 	async createView(
-		oResourceModel: any,
+		oResourceModel: ResourceModel,
 		sStableId: any,
 		sCacheKey: any,
 		TemplateConverter: any,
 		MetaModelConverter: any
 	): Promise<any | void> {
-		this.resourceModel = oResourceModel;
+		this.resourceModel = oResourceModel; // TODO: get rid, kept it for the time being
 		this.stableId = sStableId;
 		this.TemplateConverter = TemplateConverter;
 		this.MetaModelConverter = MetaModelConverter;
@@ -195,6 +209,7 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		const oManifestModel = new JSONModel(oManifestContent);
 		const bError = false;
 		let oPageModel: TemplateModel, oViewDataModel: Model, oViewSettings: any, mViewData: ViewData;
+
 		// Load the index for the additional building blocks which is responsible for initializing them
 		function getViewSettings() {
 			const aSplitPath = sFullContextPath.split("/");
@@ -310,12 +325,14 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 					};
 				}
 			});
+
 			mViewData = {
+				appComponent: oAppComponent,
 				navigation: mNavigation,
 				viewLevel: oTargetInfo.viewLevel,
 				stableId: sStableId,
 				contentDensities: oManifestContent["sap.ui5"]?.contentDensities,
-				resourceBundle: oResourceModel.__bundle,
+				resourceModel: oResourceModel,
 				fullContextPath: sFullContextPath,
 				isDesktop: (Device as any).system.desktop,
 				isPhone: (Device as any).system.phone
@@ -323,12 +340,15 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 
 			if (oComponent.getViewData) {
 				Object.assign(mViewData, oComponent.getViewData());
+
+				const actualSettings = oManifestContent?.["sap.ui5"]?.routing?.targets?.[this.pageId]?.options?.settings || {};
+				mViewData = applyPageConfigurationChanges(actualSettings, mViewData, oAppComponent, this.pageId);
 			}
 
+			mViewData.isShareButtonVisibleForMyInbox = TemplatedViewServiceFactory.getShareButtonVisibilityForMyInbox(oAppComponent);
 			const oShellServices = oAppComponent.getShellServices();
 			mViewData.converterType = sConverterType;
 			mViewData.shellContentDensity = oShellServices.getContentDensity();
-			mViewData.useNewLazyLoading = UriParameters.fromQuery(window.location.search).get("sap-fe-xx-lazyloadingtest") === "true";
 			mViewData.retrieveTextFromValueList =
 				oManifestContent["sap.fe"] && oManifestContent["sap.fe"].form
 					? oManifestContent["sap.fe"].form.retrieveTextFromValueList
@@ -393,12 +413,15 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 			throw new Error(`Error while creating view : ${error}`);
 		}
 	}
+
 	getView() {
 		return this.oView;
 	}
+
 	getInterface(): any {
 		return this;
 	}
+
 	exit() {
 		// Deregister global instance
 		if (this.oResourceModelService) {
@@ -410,9 +433,12 @@ class TemplatedViewService extends Service<TemplatedViewServiceSettings> {
 		this.oFactory.removeGlobalInstance();
 	}
 }
+
 class TemplatedViewServiceFactory extends ServiceFactory<TemplatedViewServiceSettings> {
 	_oInstanceRegistry: Record<string, TemplatedViewService> = {};
+
 	static iCreatingViews: 0;
+
 	createInstance(oServiceContext: ServiceContext<TemplatedViewServiceSettings>) {
 		TemplatedViewServiceFactory.iCreatingViews++;
 
@@ -422,9 +448,24 @@ class TemplatedViewServiceFactory extends ServiceFactory<TemplatedViewServiceSet
 			return oTemplatedViewService;
 		});
 	}
+
 	removeGlobalInstance() {
 		this._oInstanceRegistry = {};
 	}
+
+	/**
+	 * @description This function checks if the component data specifies the visibility of the 'Share' button and returns true or false based on the visibility
+	 * @param appComponent Specifies the app component
+	 * @returns Boolean value as true or false based whether the 'Share' button should be visible or not
+	 */
+	static getShareButtonVisibilityForMyInbox(appComponent: AppComponent) {
+		const componentData: ComponentData = appComponent.getComponentData();
+		if (componentData !== undefined && componentData.feEnvironment) {
+			return componentData.feEnvironment.getShareControlVisibility();
+		}
+		return undefined;
+	}
+
 	static getNumberOfViewsInCreationState() {
 		return TemplatedViewServiceFactory.iCreatingViews;
 	}

package/src/sap/fe/core/support/Diagnostics-dbg.js

@@ -41,4 +41,4 @@ sap.ui.define([], function () {
   }();
   return Diagnostics;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJEaWFnbm9zdGljcyIsIl9pc3N1ZXMiLCJhZGRJc3N1ZSIsImlzc3VlQ2F0ZWdvcnkiLCJpc3N1ZVNldmVyaXR5IiwiZGV0YWlscyIsImlzc3VlQ2F0ZWdvcnlUeXBlIiwic3ViQ2F0ZWdvcnkiLCJjaGVja0lmSXNzdWVFeGlzdHMiLCJwdXNoIiwiY2F0ZWdvcnkiLCJzZXZlcml0eSIsImdldElzc3VlcyIsImdldElzc3Vlc0J5Q2F0ZWdvcnkiLCJpbkNhdGVnb3J5IiwiZmlsdGVyIiwiaXNzdWUiLCJpc3N1ZVN1YkNhdGVnb3J5Iiwic29tZSIsInJlcGxhY2UiXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIkRpYWdub3N0aWNzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgSXNzdWVDYXRlZ29yeSwgSXNzdWVTZXZlcml0eSB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL2hlbHBlcnMvSXNzdWVNYW5hZ2VyXCI7XG5cbmV4cG9ydCB0eXBlIElzc3VlRGVmaW5pdGlvbiA9IHtcblx0Y2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnk7XG5cdHNldmVyaXR5OiBJc3N1ZVNldmVyaXR5O1xuXHRkZXRhaWxzOiBzdHJpbmc7XG5cdHN1YkNhdGVnb3J5Pzogc3RyaW5nIHwgdW5kZWZpbmVkO1xufTtcbmNsYXNzIERpYWdub3N0aWNzIHtcblx0X2lzc3VlczogSXNzdWVEZWZpbml0aW9uW107XG5cdGNvbnN0cnVjdG9yKCkge1xuXHRcdHRoaXMuX2lzc3VlcyA9IFtdO1xuXHR9XG5cdGFkZElzc3VlKFxuXHRcdGlzc3VlQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksXG5cdFx0aXNzdWVTZXZlcml0eTogSXNzdWVTZXZlcml0eSxcblx0XHRkZXRhaWxzOiBzdHJpbmcsXG5cdFx0aXNzdWVDYXRlZ29yeVR5cGU/OiBhbnkgfCB1bmRlZmluZWQsXG5cdFx0c3ViQ2F0ZWdvcnk/OiBzdHJpbmcgfCB1bmRlZmluZWRcblx0KTogdm9pZCB7XG5cdFx0Y29uc3QgY2hlY2tJZklzc3VlRXhpc3RzID0gdGhpcy5jaGVja0lmSXNzdWVFeGlzdHMoaXNzdWVDYXRlZ29yeSwgaXNzdWVTZXZlcml0eSwgZGV0YWlscywgaXNzdWVDYXRlZ29yeVR5cGUsIHN1YkNhdGVnb3J5KTtcblx0XHRpZiAoIWNoZWNrSWZJc3N1ZUV4aXN0cykge1xuXHRcdFx0dGhpcy5faXNzdWVzLnB1c2goe1xuXHRcdFx0XHRjYXRlZ29yeTogaXNzdWVDYXRlZ29yeSxcblx0XHRcdFx0c2V2ZXJpdHk6IGlzc3VlU2V2ZXJpdHksXG5cdFx0XHRcdGRldGFpbHM6IGRldGFpbHMsXG5cdFx0XHRcdHN1YkNhdGVnb3J5OiBzdWJDYXRlZ29yeVxuXHRcdFx0fSk7XG5cdFx0fVxuXHR9XG5cdGdldElzc3VlcygpOiBJc3N1ZURlZmluaXRpb25bXSB7XG5cdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcztcblx0fVxuXHRnZXRJc3N1ZXNCeUNhdGVnb3J5KGluQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksIHN1YkNhdGVnb3J5Pzogc3RyaW5nKTogSXNzdWVEZWZpbml0aW9uW10ge1xuXHRcdGlmIChzdWJDYXRlZ29yeSkge1xuXHRcdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcy5maWx0ZXIoKGlzc3VlKSA9PiBpc3N1ZS5jYXRlZ29yeSA9PT0gaW5DYXRlZ29yeSAmJiBpc3N1ZS5zdWJDYXRlZ29yeSA9PT0gc3ViQ2F0ZWdvcnkpO1xuXHRcdH0gZWxzZSB7XG5cdFx0XHRyZXR1cm4gdGhpcy5faXNzdWVzLmZpbHRlcigoaXNzdWUpID0+IGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5KTtcblx0XHR9XG5cdH1cblx0Y2hlY2tJZklzc3VlRXhpc3RzKFxuXHRcdGluQ2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnksXG5cdFx0c2V2ZXJpdHk6IElzc3VlU2V2ZXJpdHksXG5cdFx0ZGV0YWlsczogc3RyaW5nLFxuXHRcdGlzc3VlQ2F0ZWdvcnlUeXBlPzogYW55LFxuXHRcdGlzc3VlU3ViQ2F0ZWdvcnk/OiBzdHJpbmdcblx0KTogYm9vbGVhbiB7XG5cdFx0aWYgKGlzc3VlQ2F0ZWdvcnlUeXBlICYmIGlzc3VlQ2F0ZWdvcnlUeXBlW2luQ2F0ZWdvcnldICYmIGlzc3VlU3ViQ2F0ZWdvcnkpIHtcblx0XHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuc29tZShcblx0XHRcdFx0KGlzc3VlKSA9PlxuXHRcdFx0XHRcdGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmXG5cdFx0XHRcdFx0aXNzdWUuc2V2ZXJpdHkgPT09IHNldmVyaXR5ICYmXG5cdFx0XHRcdFx0aXNzdWUuZGV0YWlscy5yZXBsYWNlKC9cXG4vZywgXCJcIikgPT09IGRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpICYmXG5cdFx0XHRcdFx0aXNzdWUuc3ViQ2F0ZWdvcnkgPT09IGlzc3VlU3ViQ2F0ZWdvcnlcblx0XHRcdCk7XG5cdFx0fVxuXHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuc29tZShcblx0XHRcdChpc3N1ZSkgPT5cblx0XHRcdFx0aXNzdWUuY2F0ZWdvcnkgPT09IGluQ2F0ZWdvcnkgJiZcblx0XHRcdFx0aXNzdWUuc2V2ZXJpdHkgPT09IHNldmVyaXR5ICYmXG5cdFx0XHRcdGlzc3VlLmRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpID09PSBkZXRhaWxzLnJlcGxhY2UoL1xcbi9nLCBcIlwiKVxuXHRcdCk7XG5cdH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgRGlhZ25vc3RpY3M7XG4iXSwibWFwcGluZ3MiOiI7QUFBQTtBQUFBO0FBQUE7Ozs7TUFRTUEsV0FBVztJQUVoQix1QkFBYztNQUNiLElBQUksQ0FBQ0MsT0FBTyxHQUFHLEVBQUU7SUFDbEI7SUFBQztJQUFBLE9BQ0RDLFFBQVEsR0FBUixrQkFDQ0MsYUFBNEIsRUFDNUJDLGFBQTRCLEVBQzVCQyxPQUFlLEVBQ2ZDLGlCQUFtQyxFQUNuQ0MsV0FBZ0MsRUFDekI7TUFDUCxNQUFNQyxrQkFBa0IsR0FBRyxJQUFJLENBQUNBLGtCQUFrQixDQUFDTCxhQUFhLEVBQUVDLGFBQWEsRUFBRUMsT0FBTyxFQUFFQyxpQkFBaUIsRUFBRUMsV0FBVyxDQUFDO01BQ3pILElBQUksQ0FBQ0Msa0JBQWtCLEVBQUU7UUFDeEIsSUFBSSxDQUFDUCxPQUFPLENBQUNRLElBQUksQ0FBQztVQUNqQkMsUUFBUSxFQUFFUCxhQUFhO1VBQ3ZCUSxRQUFRLEVBQUVQLGFBQWE7VUFDdkJDLE9BQU8sRUFBRUEsT0FBTztVQUNoQkUsV0FBVyxFQUFFQTtRQUNkLENBQUMsQ0FBQztNQUNIO0lBQ0QsQ0FBQztJQUFBLE9BQ0RLLFNBQVMsR0FBVCxxQkFBK0I7TUFDOUIsT0FBTyxJQUFJLENBQUNYLE9BQU87SUFDcEIsQ0FBQztJQUFBLE9BQ0RZLG1CQUFtQixHQUFuQiw2QkFBb0JDLFVBQXlCLEVBQUVQLFdBQW9CLEVBQXFCO01BQ3ZGLElBQUlBLFdBQVcsRUFBRTtRQUNoQixPQUFPLElBQUksQ0FBQ04sT0FBTyxDQUFDYyxNQUFNLENBQUVDLEtBQUssSUFBS0EsS0FBSyxDQUFDTixRQUFRLEtBQUtJLFVBQVUsSUFBSUUsS0FBSyxDQUFDVCxXQUFXLEtBQUtBLFdBQVcsQ0FBQztNQUMxRyxDQUFDLE1BQU07UUFDTixPQUFPLElBQUksQ0FBQ04sT0FBTyxDQUFDYyxNQUFNLENBQUVDLEtBQUssSUFBS0EsS0FBSyxDQUFDTixRQUFRLEtBQUtJLFVBQVUsQ0FBQztNQUNyRTtJQUNELENBQUM7SUFBQSxPQUNETixrQkFBa0IsR0FBbEIsNEJBQ0NNLFVBQXlCLEVBQ3pCSCxRQUF1QixFQUN2Qk4sT0FBZSxFQUNmQyxpQkFBdUIsRUFDdkJXLGdCQUF5QixFQUNmO01BQ1YsSUFBSVgsaUJBQWlCLElBQUlBLGlCQUFpQixDQUFDUSxVQUFVLENBQUMsSUFBSUcsZ0JBQWdCLEVBQUU7UUFDM0UsT0FBTyxJQUFJLENBQUNoQixPQUFPLENBQUNpQixJQUFJLENBQ3RCRixLQUFLLElBQ0xBLEtBQUssQ0FBQ04sUUFBUSxLQUFLSSxVQUFVLElBQzdCRSxLQUFLLENBQUNMLFFBQVEsS0FBS0EsUUFBUSxJQUMzQkssS0FBSyxDQUFDWCxPQUFPLENBQUNjLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEtBQUtkLE9BQU8sQ0FBQ2MsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsSUFDL0RILEtBQUssQ0FBQ1QsV0FBVyxLQUFLVSxnQkFBZ0IsQ0FDdkM7TUFDRjtNQUNBLE9BQU8sSUFBSSxDQUFDaEIsT0FBTyxDQUFDaUIsSUFBSSxDQUN0QkYsS0FBSyxJQUNMQSxLQUFLLENBQUNOLFFBQVEsS0FBS0ksVUFBVSxJQUM3QkUsS0FBSyxDQUFDTCxRQUFRLEtBQUtBLFFBQVEsSUFDM0JLLEtBQUssQ0FBQ1gsT0FBTyxDQUFDYyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLZCxPQUFPLENBQUNjLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQ2hFO0lBQ0YsQ0FBQztJQUFBO0VBQUE7RUFBQSxPQUdhbkIsV0FBVztBQUFBIn0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJEaWFnbm9zdGljcyIsIl9pc3N1ZXMiLCJhZGRJc3N1ZSIsImlzc3VlQ2F0ZWdvcnkiLCJpc3N1ZVNldmVyaXR5IiwiZGV0YWlscyIsImlzc3VlQ2F0ZWdvcnlUeXBlIiwic3ViQ2F0ZWdvcnkiLCJjaGVja0lmSXNzdWVFeGlzdHMiLCJwdXNoIiwiY2F0ZWdvcnkiLCJzZXZlcml0eSIsImdldElzc3VlcyIsImdldElzc3Vlc0J5Q2F0ZWdvcnkiLCJpbkNhdGVnb3J5IiwiZmlsdGVyIiwiaXNzdWUiLCJpc3N1ZVN1YkNhdGVnb3J5Iiwic29tZSIsInJlcGxhY2UiXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIkRpYWdub3N0aWNzLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgSXNzdWVDYXRlZ29yeSwgSXNzdWVTZXZlcml0eSB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL2hlbHBlcnMvSXNzdWVNYW5hZ2VyXCI7XG5cbmV4cG9ydCB0eXBlIElzc3VlRGVmaW5pdGlvbiA9IHtcblx0Y2F0ZWdvcnk6IElzc3VlQ2F0ZWdvcnk7XG5cdHNldmVyaXR5OiBJc3N1ZVNldmVyaXR5O1xuXHRkZXRhaWxzOiBzdHJpbmc7XG5cdHN1YkNhdGVnb3J5Pzogc3RyaW5nIHwgdW5kZWZpbmVkO1xufTtcbmNsYXNzIERpYWdub3N0aWNzIHtcblx0X2lzc3VlczogSXNzdWVEZWZpbml0aW9uW107XG5cblx0Y29uc3RydWN0b3IoKSB7XG5cdFx0dGhpcy5faXNzdWVzID0gW107XG5cdH1cblxuXHRhZGRJc3N1ZShcblx0XHRpc3N1ZUNhdGVnb3J5OiBJc3N1ZUNhdGVnb3J5LFxuXHRcdGlzc3VlU2V2ZXJpdHk6IElzc3VlU2V2ZXJpdHksXG5cdFx0ZGV0YWlsczogc3RyaW5nLFxuXHRcdGlzc3VlQ2F0ZWdvcnlUeXBlPzogYW55IHwgdW5kZWZpbmVkLFxuXHRcdHN1YkNhdGVnb3J5Pzogc3RyaW5nIHwgdW5kZWZpbmVkXG5cdCk6IHZvaWQge1xuXHRcdGNvbnN0IGNoZWNrSWZJc3N1ZUV4aXN0cyA9IHRoaXMuY2hlY2tJZklzc3VlRXhpc3RzKGlzc3VlQ2F0ZWdvcnksIGlzc3VlU2V2ZXJpdHksIGRldGFpbHMsIGlzc3VlQ2F0ZWdvcnlUeXBlLCBzdWJDYXRlZ29yeSk7XG5cdFx0aWYgKCFjaGVja0lmSXNzdWVFeGlzdHMpIHtcblx0XHRcdHRoaXMuX2lzc3Vlcy5wdXNoKHtcblx0XHRcdFx0Y2F0ZWdvcnk6IGlzc3VlQ2F0ZWdvcnksXG5cdFx0XHRcdHNldmVyaXR5OiBpc3N1ZVNldmVyaXR5LFxuXHRcdFx0XHRkZXRhaWxzOiBkZXRhaWxzLFxuXHRcdFx0XHRzdWJDYXRlZ29yeTogc3ViQ2F0ZWdvcnlcblx0XHRcdH0pO1xuXHRcdH1cblx0fVxuXG5cdGdldElzc3VlcygpOiBJc3N1ZURlZmluaXRpb25bXSB7XG5cdFx0cmV0dXJuIHRoaXMuX2lzc3Vlcztcblx0fVxuXG5cdGdldElzc3Vlc0J5Q2F0ZWdvcnkoaW5DYXRlZ29yeTogSXNzdWVDYXRlZ29yeSwgc3ViQ2F0ZWdvcnk/OiBzdHJpbmcpOiBJc3N1ZURlZmluaXRpb25bXSB7XG5cdFx0aWYgKHN1YkNhdGVnb3J5KSB7XG5cdFx0XHRyZXR1cm4gdGhpcy5faXNzdWVzLmZpbHRlcigoaXNzdWUpID0+IGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmIGlzc3VlLnN1YkNhdGVnb3J5ID09PSBzdWJDYXRlZ29yeSk7XG5cdFx0fSBlbHNlIHtcblx0XHRcdHJldHVybiB0aGlzLl9pc3N1ZXMuZmlsdGVyKChpc3N1ZSkgPT4gaXNzdWUuY2F0ZWdvcnkgPT09IGluQ2F0ZWdvcnkpO1xuXHRcdH1cblx0fVxuXG5cdGNoZWNrSWZJc3N1ZUV4aXN0cyhcblx0XHRpbkNhdGVnb3J5OiBJc3N1ZUNhdGVnb3J5LFxuXHRcdHNldmVyaXR5OiBJc3N1ZVNldmVyaXR5LFxuXHRcdGRldGFpbHM6IHN0cmluZyxcblx0XHRpc3N1ZUNhdGVnb3J5VHlwZT86IGFueSxcblx0XHRpc3N1ZVN1YkNhdGVnb3J5Pzogc3RyaW5nXG5cdCk6IGJvb2xlYW4ge1xuXHRcdGlmIChpc3N1ZUNhdGVnb3J5VHlwZSAmJiBpc3N1ZUNhdGVnb3J5VHlwZVtpbkNhdGVnb3J5XSAmJiBpc3N1ZVN1YkNhdGVnb3J5KSB7XG5cdFx0XHRyZXR1cm4gdGhpcy5faXNzdWVzLnNvbWUoXG5cdFx0XHRcdChpc3N1ZSkgPT5cblx0XHRcdFx0XHRpc3N1ZS5jYXRlZ29yeSA9PT0gaW5DYXRlZ29yeSAmJlxuXHRcdFx0XHRcdGlzc3VlLnNldmVyaXR5ID09PSBzZXZlcml0eSAmJlxuXHRcdFx0XHRcdGlzc3VlLmRldGFpbHMucmVwbGFjZSgvXFxuL2csIFwiXCIpID09PSBkZXRhaWxzLnJlcGxhY2UoL1xcbi9nLCBcIlwiKSAmJlxuXHRcdFx0XHRcdGlzc3VlLnN1YkNhdGVnb3J5ID09PSBpc3N1ZVN1YkNhdGVnb3J5XG5cdFx0XHQpO1xuXHRcdH1cblx0XHRyZXR1cm4gdGhpcy5faXNzdWVzLnNvbWUoXG5cdFx0XHQoaXNzdWUpID0+XG5cdFx0XHRcdGlzc3VlLmNhdGVnb3J5ID09PSBpbkNhdGVnb3J5ICYmXG5cdFx0XHRcdGlzc3VlLnNldmVyaXR5ID09PSBzZXZlcml0eSAmJlxuXHRcdFx0XHRpc3N1ZS5kZXRhaWxzLnJlcGxhY2UoL1xcbi9nLCBcIlwiKSA9PT0gZGV0YWlscy5yZXBsYWNlKC9cXG4vZywgXCJcIilcblx0XHQpO1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IERpYWdub3N0aWNzO1xuIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFBQTtBQUFBOzs7O01BUU1BLFdBQVc7SUFHaEIsdUJBQWM7TUFDYixJQUFJLENBQUNDLE9BQU8sR0FBRyxFQUFFO0lBQ2xCO0lBQUM7SUFBQSxPQUVEQyxRQUFRLEdBQVIsa0JBQ0NDLGFBQTRCLEVBQzVCQyxhQUE0QixFQUM1QkMsT0FBZSxFQUNmQyxpQkFBbUMsRUFDbkNDLFdBQWdDLEVBQ3pCO01BQ1AsTUFBTUMsa0JBQWtCLEdBQUcsSUFBSSxDQUFDQSxrQkFBa0IsQ0FBQ0wsYUFBYSxFQUFFQyxhQUFhLEVBQUVDLE9BQU8sRUFBRUMsaUJBQWlCLEVBQUVDLFdBQVcsQ0FBQztNQUN6SCxJQUFJLENBQUNDLGtCQUFrQixFQUFFO1FBQ3hCLElBQUksQ0FBQ1AsT0FBTyxDQUFDUSxJQUFJLENBQUM7VUFDakJDLFFBQVEsRUFBRVAsYUFBYTtVQUN2QlEsUUFBUSxFQUFFUCxhQUFhO1VBQ3ZCQyxPQUFPLEVBQUVBLE9BQU87VUFDaEJFLFdBQVcsRUFBRUE7UUFDZCxDQUFDLENBQUM7TUFDSDtJQUNELENBQUM7SUFBQSxPQUVESyxTQUFTLEdBQVQscUJBQStCO01BQzlCLE9BQU8sSUFBSSxDQUFDWCxPQUFPO0lBQ3BCLENBQUM7SUFBQSxPQUVEWSxtQkFBbUIsR0FBbkIsNkJBQW9CQyxVQUF5QixFQUFFUCxXQUFvQixFQUFxQjtNQUN2RixJQUFJQSxXQUFXLEVBQUU7UUFDaEIsT0FBTyxJQUFJLENBQUNOLE9BQU8sQ0FBQ2MsTUFBTSxDQUFFQyxLQUFLLElBQUtBLEtBQUssQ0FBQ04sUUFBUSxLQUFLSSxVQUFVLElBQUlFLEtBQUssQ0FBQ1QsV0FBVyxLQUFLQSxXQUFXLENBQUM7TUFDMUcsQ0FBQyxNQUFNO1FBQ04sT0FBTyxJQUFJLENBQUNOLE9BQU8sQ0FBQ2MsTUFBTSxDQUFFQyxLQUFLLElBQUtBLEtBQUssQ0FBQ04sUUFBUSxLQUFLSSxVQUFVLENBQUM7TUFDckU7SUFDRCxDQUFDO0lBQUEsT0FFRE4sa0JBQWtCLEdBQWxCLDRCQUNDTSxVQUF5QixFQUN6QkgsUUFBdUIsRUFDdkJOLE9BQWUsRUFDZkMsaUJBQXVCLEVBQ3ZCVyxnQkFBeUIsRUFDZjtNQUNWLElBQUlYLGlCQUFpQixJQUFJQSxpQkFBaUIsQ0FBQ1EsVUFBVSxDQUFDLElBQUlHLGdCQUFnQixFQUFFO1FBQzNFLE9BQU8sSUFBSSxDQUFDaEIsT0FBTyxDQUFDaUIsSUFBSSxDQUN0QkYsS0FBSyxJQUNMQSxLQUFLLENBQUNOLFFBQVEsS0FBS0ksVUFBVSxJQUM3QkUsS0FBSyxDQUFDTCxRQUFRLEtBQUtBLFFBQVEsSUFDM0JLLEtBQUssQ0FBQ1gsT0FBTyxDQUFDYyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLZCxPQUFPLENBQUNjLE9BQU8sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLElBQy9ESCxLQUFLLENBQUNULFdBQVcsS0FBS1UsZ0JBQWdCLENBQ3ZDO01BQ0Y7TUFDQSxPQUFPLElBQUksQ0FBQ2hCLE9BQU8sQ0FBQ2lCLElBQUksQ0FDdEJGLEtBQUssSUFDTEEsS0FBSyxDQUFDTixRQUFRLEtBQUtJLFVBQVUsSUFDN0JFLEtBQUssQ0FBQ0wsUUFBUSxLQUFLQSxRQUFRLElBQzNCSyxLQUFLLENBQUNYLE9BQU8sQ0FBQ2MsT0FBTyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsS0FBS2QsT0FBTyxDQUFDYyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUNoRTtJQUNGLENBQUM7SUFBQTtFQUFBO0VBQUEsT0FHYW5CLFdBQVc7QUFBQSJ9

package/src/sap/fe/core/support/Diagnostics.ts

@@ -8,9 +8,11 @@ export type IssueDefinition = {
 };
 class Diagnostics {
 	_issues: IssueDefinition[];
+
 	constructor() {
 		this._issues = [];
 	}
+
 	addIssue(
 		issueCategory: IssueCategory,
 		issueSeverity: IssueSeverity,
@@ -28,9 +30,11 @@ class Diagnostics {
 			});
 		}
 	}
+
 	getIssues(): IssueDefinition[] {
 		return this._issues;
 	}
+
 	getIssuesByCategory(inCategory: IssueCategory, subCategory?: string): IssueDefinition[] {
 		if (subCategory) {
 			return this._issues.filter((issue) => issue.category === inCategory && issue.subCategory === subCategory);
@@ -38,6 +42,7 @@ class Diagnostics {
 			return this._issues.filter((issue) => issue.category === inCategory);
 		}
 	}
+
 	checkIfIssueExists(
 		inCategory: IssueCategory,
 		severity: IssueSeverity,

package/src/sap/fe/core/templating/CommonFormatters-dbg.js

@@ -2,7 +2,7 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2023 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/helpers/BindingToolkit", "sap/fe/core/templating/DataModelPathHelper", "sap/fe/core/templating/PropertyHelper", "sap/fe/core/templating/UIFormatters", "../converters/helpers/DataFieldHelper"], function (valueFormatters, BindingToolkit, DataModelPathHelper, PropertyHelper, UIFormatters, DataFieldHelper) {
+sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/helpers/BindingToolkit", "sap/fe/core/helpers/TypeGuards", "sap/fe/core/templating/DataModelPathHelper", "sap/fe/core/templating/UIFormatters", "../converters/helpers/DataFieldHelper"], function (valueFormatters, BindingToolkit, TypeGuards, DataModelPathHelper, UIFormatters, DataFieldHelper) {
   "use strict";
 
   var _exports = {};
@@ -10,6 +10,7 @@ sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/helpers/Bin
   var getRelativePaths = DataModelPathHelper.getRelativePaths;
   var getContextRelativeTargetObjectPath = DataModelPathHelper.getContextRelativeTargetObjectPath;
   var enhanceDataModelPath = DataModelPathHelper.enhanceDataModelPath;
+  var isPathAnnotationExpression = TypeGuards.isPathAnnotationExpression;
   var pathInModel = BindingToolkit.pathInModel;
   var getExpressionFromAnnotation = BindingToolkit.getExpressionFromAnnotation;
   var formatWithTypeInformation = BindingToolkit.formatWithTypeInformation;
@@ -54,7 +55,7 @@ sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/helpers/Bin
   _exports.getBindingWithTextArrangement = getBindingWithTextArrangement;
   const getBindingWithText = function (targetDataModelPath) {
     let propertyDataModelPath = targetDataModelPath;
-    if (PropertyHelper.isPathExpression(targetDataModelPath === null || targetDataModelPath === void 0 ? void 0 : targetDataModelPath.targetObject)) {
+    if (isPathAnnotationExpression(targetDataModelPath === null || targetDataModelPath === void 0 ? void 0 : targetDataModelPath.targetObject)) {
       var _targetDataModelPath$;
       propertyDataModelPath = enhanceDataModelPath(targetDataModelPath, (_targetDataModelPath$ = targetDataModelPath.targetObject) === null || _targetDataModelPath$ === void 0 ? void 0 : _targetDataModelPath$.path);
     }
@@ -67,4 +68,4 @@ sap.ui.define(["sap/fe/core/formatters/ValueFormatter", "sap/fe/core/helpers/Bin
   _exports.getBindingWithText = getBindingWithText;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["getExpressionBinding","expression","compileExpression","getBindingWithTextArrangement","oPropertyDataModelPath","propertyBindingExpression","fieldFormatOptions","targetDisplayModeOverride","displayMode","outExpression","oPropertyDefinition","targetObject","type","$target","targetDisplayMode","UIFormatters","getDisplayMode","commonText","annotations","Common","Text","relativeLocation","getRelativePaths","formatWithTypeInformation","getExpressionFromAnnotation","formatResult","valueFormatters","formatWithBrackets","getBindingWithText","targetDataModelPath","propertyDataModelPath","PropertyHelper","isPathExpression","enhanceDataModelPath","path","propertyDefinition","pathInModel","getContextRelativeTargetObjectPath","textArrangementBinding","UI","isReferencePropertyStaticallyHidden","DataFieldDefault","undefined"],"sourceRoot":".","sources":["CommonFormatters.ts"],"sourcesContent":["import type { Property } from \"@sap-ux/vocabularies-types\";\nimport valueFormatters from \"sap/fe/core/formatters/ValueFormatter\";\nimport type { BindingToolkitExpression, CompiledBindingToolkitExpression } from \"sap/fe/core/helpers/BindingToolkit\";\nimport {\n\tcompileExpression,\n\tformatResult,\n\tformatWithTypeInformation,\n\tgetExpressionFromAnnotation,\n\tpathInModel\n} from \"sap/fe/core/helpers/BindingToolkit\";\nimport type { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { enhanceDataModelPath, getContextRelativeTargetObjectPath, getRelativePaths } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport type * as DisplayModeFormatter from \"sap/fe/core/templating/DisplayModeFormatter\";\nimport * as PropertyHelper from \"sap/fe/core/templating/PropertyHelper\";\nimport * as UIFormatters from \"sap/fe/core/templating/UIFormatters\";\nimport { isReferencePropertyStaticallyHidden } from \"../converters/helpers/DataFieldHelper\";\nexport type DisplayMode = DisplayModeFormatter.DisplayMode;\n\n// Import-export methods related to the common annotations used by the converter to use them in the templating through the Common Formatters.\n\n/**\n * Retrieves the expressionBinding created out of a binding expression.\n *\n * @param expression The expression which needs to be compiled\n * @returns The expression-binding string\n */\nexport const getExpressionBinding = function (expression: BindingToolkitExpression<any>): CompiledBindingToolkitExpression {\n\treturn compileExpression(expression);\n};\nexport const getBindingWithTextArrangement = function (\n\toPropertyDataModelPath: DataModelObjectPath,\n\tpropertyBindingExpression: BindingToolkitExpression<string>,\n\tfieldFormatOptions?: { displayMode?: DisplayMode }\n): BindingToolkitExpression<string> {\n\tconst targetDisplayModeOverride = fieldFormatOptions?.displayMode;\n\tlet outExpression = propertyBindingExpression;\n\tconst oPropertyDefinition =\n\t\toPropertyDataModelPath.targetObject.type === \"PropertyPath\"\n\t\t\t? (oPropertyDataModelPath.targetObject.$target as Property)\n\t\t\t: (oPropertyDataModelPath.targetObject as Property);\n\tconst targetDisplayMode = targetDisplayModeOverride || UIFormatters.getDisplayMode(oPropertyDataModelPath);\n\tconst commonText = oPropertyDefinition.annotations?.Common?.Text;\n\tconst relativeLocation = getRelativePaths(oPropertyDataModelPath);\n\tpropertyBindingExpression = formatWithTypeInformation(oPropertyDefinition, propertyBindingExpression);\n\tif (targetDisplayMode !== \"Value\" && commonText) {\n\t\tswitch (targetDisplayMode) {\n\t\t\tcase \"Description\":\n\t\t\t\toutExpression = getExpressionFromAnnotation(commonText, relativeLocation) as BindingToolkitExpression<string>;\n\t\t\t\tbreak;\n\t\t\tcase \"DescriptionValue\":\n\t\t\t\toutExpression = formatResult(\n\t\t\t\t\t[\n\t\t\t\t\t\tgetExpressionFromAnnotation(commonText, relativeLocation) as BindingToolkitExpression<string>,\n\t\t\t\t\t\tpropertyBindingExpression\n\t\t\t\t\t],\n\t\t\t\t\tvalueFormatters.formatWithBrackets\n\t\t\t\t);\n\t\t\t\tbreak;\n\t\t\tcase \"ValueDescription\":\n\t\t\t\toutExpression = formatResult(\n\t\t\t\t\t[\n\t\t\t\t\t\tpropertyBindingExpression,\n\t\t\t\t\t\tgetExpressionFromAnnotation(commonText, relativeLocation) as BindingToolkitExpression<string>\n\t\t\t\t\t],\n\t\t\t\t\tvalueFormatters.formatWithBrackets\n\t\t\t\t);\n\t\t\t\tbreak;\n\t\t}\n\t}\n\treturn outExpression;\n};\nexport const getBindingWithText = function (targetDataModelPath: DataModelObjectPath): CompiledBindingToolkitExpression {\n\tlet propertyDataModelPath = targetDataModelPath;\n\tif (PropertyHelper.isPathExpression(targetDataModelPath?.targetObject)) {\n\t\tpropertyDataModelPath = enhanceDataModelPath(targetDataModelPath, targetDataModelPath.targetObject?.path);\n\t}\n\tconst propertyDefinition = propertyDataModelPath.targetObject as Property;\n\n\tlet propertyBindingExpression = pathInModel(\n\t\tgetContextRelativeTargetObjectPath(propertyDataModelPath)\n\t) as BindingToolkitExpression<string>;\n\n\tpropertyBindingExpression = formatWithTypeInformation(propertyDefinition, propertyBindingExpression, true);\n\tconst textArrangementBinding = getBindingWithTextArrangement(propertyDataModelPath, propertyBindingExpression);\n\treturn ((propertyDefinition.annotations.UI &&\n\t\t!isReferencePropertyStaticallyHidden(propertyDefinition.annotations.UI.DataFieldDefault) &&\n\t\tcompileExpression(textArrangementBinding)) ||\n\t\tundefined) as CompiledBindingToolkitExpression;\n};\n"],"mappings":";AAAA;AAAA;AAAA;;;;;;;;;;;;;;EAkBA;;EAEA;AACA;AACA;AACA;AACA;AACA;EACO,MAAMA,oBAAoB,GAAG,UAAUC,UAAyC,EAAoC;IAC1H,OAAOC,iBAAiB,CAACD,UAAU,CAAC;EACrC,CAAC;EAAC;EACK,MAAME,6BAA6B,GAAG,UAC5CC,sBAA2C,EAC3CC,yBAA2D,EAC3DC,kBAAkD,EACf;IAAA;IACnC,MAAMC,yBAAyB,GAAGD,kBAAkB,aAAlBA,kBAAkB,uBAAlBA,kBAAkB,CAAEE,WAAW;IACjE,IAAIC,aAAa,GAAGJ,yBAAyB;IAC7C,MAAMK,mBAAmB,GACxBN,sBAAsB,CAACO,YAAY,CAACC,IAAI,KAAK,cAAc,GACvDR,sBAAsB,CAACO,YAAY,CAACE,OAAO,GAC3CT,sBAAsB,CAACO,YAAyB;IACrD,MAAMG,iBAAiB,GAAGP,yBAAyB,IAAIQ,YAAY,CAACC,cAAc,CAACZ,sBAAsB,CAAC;IAC1G,MAAMa,UAAU,4BAAGP,mBAAmB,CAACQ,WAAW,oFAA/B,sBAAiCC,MAAM,2DAAvC,uBAAyCC,IAAI;IAChE,MAAMC,gBAAgB,GAAGC,gBAAgB,CAAClB,sBAAsB,CAAC;IACjEC,yBAAyB,GAAGkB,yBAAyB,CAACb,mBAAmB,EAAEL,yBAAyB,CAAC;IACrG,IAAIS,iBAAiB,KAAK,OAAO,IAAIG,UAAU,EAAE;MAChD,QAAQH,iBAAiB;QACxB,KAAK,aAAa;UACjBL,aAAa,GAAGe,2BAA2B,CAACP,UAAU,EAAEI,gBAAgB,CAAqC;UAC7G;QACD,KAAK,kBAAkB;UACtBZ,aAAa,GAAGgB,YAAY,CAC3B,CACCD,2BAA2B,CAACP,UAAU,EAAEI,gBAAgB,CAAC,EACzDhB,yBAAyB,CACzB,EACDqB,eAAe,CAACC,kBAAkB,CAClC;UACD;QACD,KAAK,kBAAkB;UACtBlB,aAAa,GAAGgB,YAAY,CAC3B,CACCpB,yBAAyB,EACzBmB,2BAA2B,CAACP,UAAU,EAAEI,gBAAgB,CAAC,CACzD,EACDK,eAAe,CAACC,kBAAkB,CAClC;UACD;MAAM;IAET;IACA,OAAOlB,aAAa;EACrB,CAAC;EAAC;EACK,MAAMmB,kBAAkB,GAAG,UAAUC,mBAAwC,EAAoC;IACvH,IAAIC,qBAAqB,GAAGD,mBAAmB;IAC/C,IAAIE,cAAc,CAACC,gBAAgB,CAACH,mBAAmB,aAAnBA,mBAAmB,uBAAnBA,mBAAmB,CAAElB,YAAY,CAAC,EAAE;MAAA;MACvEmB,qBAAqB,GAAGG,oBAAoB,CAACJ,mBAAmB,2BAAEA,mBAAmB,CAAClB,YAAY,0DAAhC,sBAAkCuB,IAAI,CAAC;IAC1G;IACA,MAAMC,kBAAkB,GAAGL,qBAAqB,CAACnB,YAAwB;IAEzE,IAAIN,yBAAyB,GAAG+B,WAAW,CAC1CC,kCAAkC,CAACP,qBAAqB,CAAC,CACrB;IAErCzB,yBAAyB,GAAGkB,yBAAyB,CAACY,kBAAkB,EAAE9B,yBAAyB,EAAE,IAAI,CAAC;IAC1G,MAAMiC,sBAAsB,GAAGnC,6BAA6B,CAAC2B,qBAAqB,EAAEzB,yBAAyB,CAAC;IAC9G,OAAS8B,kBAAkB,CAACjB,WAAW,CAACqB,EAAE,IACzC,CAACC,mCAAmC,CAACL,kBAAkB,CAACjB,WAAW,CAACqB,EAAE,CAACE,gBAAgB,CAAC,IACxFvC,iBAAiB,CAACoC,sBAAsB,CAAC,IACzCI,SAAS;EACX,CAAC;EAAC;EAAA;AAAA"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["getExpressionBinding","expression","compileExpression","getBindingWithTextArrangement","oPropertyDataModelPath","propertyBindingExpression","fieldFormatOptions","targetDisplayModeOverride","displayMode","outExpression","oPropertyDefinition","targetObject","type","$target","targetDisplayMode","UIFormatters","getDisplayMode","commonText","annotations","Common","Text","relativeLocation","getRelativePaths","formatWithTypeInformation","getExpressionFromAnnotation","formatResult","valueFormatters","formatWithBrackets","getBindingWithText","targetDataModelPath","propertyDataModelPath","isPathAnnotationExpression","enhanceDataModelPath","path","propertyDefinition","pathInModel","getContextRelativeTargetObjectPath","textArrangementBinding","UI","isReferencePropertyStaticallyHidden","DataFieldDefault","undefined"],"sourceRoot":".","sources":["CommonFormatters.ts"],"sourcesContent":["import type { Property } from \"@sap-ux/vocabularies-types\";\nimport valueFormatters from \"sap/fe/core/formatters/ValueFormatter\";\nimport type { BindingToolkitExpression, CompiledBindingToolkitExpression } from \"sap/fe/core/helpers/BindingToolkit\";\nimport {\n\tcompileExpression,\n\tformatResult,\n\tformatWithTypeInformation,\n\tgetExpressionFromAnnotation,\n\tpathInModel\n} from \"sap/fe/core/helpers/BindingToolkit\";\nimport { isPathAnnotationExpression } from \"sap/fe/core/helpers/TypeGuards\";\nimport type { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { enhanceDataModelPath, getContextRelativeTargetObjectPath, getRelativePaths } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport type * as DisplayModeFormatter from \"sap/fe/core/templating/DisplayModeFormatter\";\nimport * as UIFormatters from \"sap/fe/core/templating/UIFormatters\";\nimport { isReferencePropertyStaticallyHidden } from \"../converters/helpers/DataFieldHelper\";\nexport type DisplayMode = DisplayModeFormatter.DisplayMode;\n\n// Import-export methods related to the common annotations used by the converter to use them in the templating through the Common Formatters.\n\n/**\n * Retrieves the expressionBinding created out of a binding expression.\n *\n * @param expression The expression which needs to be compiled\n * @returns The expression-binding string\n */\nexport const getExpressionBinding = function (expression: BindingToolkitExpression<any>): CompiledBindingToolkitExpression {\n\treturn compileExpression(expression);\n};\nexport const getBindingWithTextArrangement = function (\n\toPropertyDataModelPath: DataModelObjectPath,\n\tpropertyBindingExpression: BindingToolkitExpression<string>,\n\tfieldFormatOptions?: { displayMode?: DisplayMode }\n): BindingToolkitExpression<string> {\n\tconst targetDisplayModeOverride = fieldFormatOptions?.displayMode;\n\tlet outExpression = propertyBindingExpression;\n\tconst oPropertyDefinition =\n\t\toPropertyDataModelPath.targetObject.type === \"PropertyPath\"\n\t\t\t? (oPropertyDataModelPath.targetObject.$target as Property)\n\t\t\t: (oPropertyDataModelPath.targetObject as Property);\n\tconst targetDisplayMode = targetDisplayModeOverride || UIFormatters.getDisplayMode(oPropertyDataModelPath);\n\tconst commonText = oPropertyDefinition.annotations?.Common?.Text;\n\tconst relativeLocation = getRelativePaths(oPropertyDataModelPath);\n\tpropertyBindingExpression = formatWithTypeInformation(oPropertyDefinition, propertyBindingExpression);\n\tif (targetDisplayMode !== \"Value\" && commonText) {\n\t\tswitch (targetDisplayMode) {\n\t\t\tcase \"Description\":\n\t\t\t\toutExpression = getExpressionFromAnnotation(commonText, relativeLocation) as BindingToolkitExpression<string>;\n\t\t\t\tbreak;\n\t\t\tcase \"DescriptionValue\":\n\t\t\t\toutExpression = formatResult(\n\t\t\t\t\t[\n\t\t\t\t\t\tgetExpressionFromAnnotation(commonText, relativeLocation) as BindingToolkitExpression<string>,\n\t\t\t\t\t\tpropertyBindingExpression\n\t\t\t\t\t],\n\t\t\t\t\tvalueFormatters.formatWithBrackets\n\t\t\t\t);\n\t\t\t\tbreak;\n\t\t\tcase \"ValueDescription\":\n\t\t\t\toutExpression = formatResult(\n\t\t\t\t\t[\n\t\t\t\t\t\tpropertyBindingExpression,\n\t\t\t\t\t\tgetExpressionFromAnnotation(commonText, relativeLocation) as BindingToolkitExpression<string>\n\t\t\t\t\t],\n\t\t\t\t\tvalueFormatters.formatWithBrackets\n\t\t\t\t);\n\t\t\t\tbreak;\n\t\t}\n\t}\n\treturn outExpression;\n};\nexport const getBindingWithText = function (targetDataModelPath: DataModelObjectPath): CompiledBindingToolkitExpression {\n\tlet propertyDataModelPath = targetDataModelPath;\n\tif (isPathAnnotationExpression(targetDataModelPath?.targetObject)) {\n\t\tpropertyDataModelPath = enhanceDataModelPath(targetDataModelPath, targetDataModelPath.targetObject?.path);\n\t}\n\tconst propertyDefinition = propertyDataModelPath.targetObject as Property;\n\n\tlet propertyBindingExpression = pathInModel(\n\t\tgetContextRelativeTargetObjectPath(propertyDataModelPath)\n\t) as BindingToolkitExpression<string>;\n\n\tpropertyBindingExpression = formatWithTypeInformation(propertyDefinition, propertyBindingExpression, true);\n\tconst textArrangementBinding = getBindingWithTextArrangement(propertyDataModelPath, propertyBindingExpression);\n\treturn ((propertyDefinition.annotations.UI &&\n\t\t!isReferencePropertyStaticallyHidden(propertyDefinition.annotations.UI.DataFieldDefault) &&\n\t\tcompileExpression(textArrangementBinding)) ||\n\t\tundefined) as CompiledBindingToolkitExpression;\n};\n"],"mappings":";AAAA;AAAA;AAAA;;;;;;;;;;;;;;;EAkBA;;EAEA;AACA;AACA;AACA;AACA;AACA;EACO,MAAMA,oBAAoB,GAAG,UAAUC,UAAyC,EAAoC;IAC1H,OAAOC,iBAAiB,CAACD,UAAU,CAAC;EACrC,CAAC;EAAC;EACK,MAAME,6BAA6B,GAAG,UAC5CC,sBAA2C,EAC3CC,yBAA2D,EAC3DC,kBAAkD,EACf;IAAA;IACnC,MAAMC,yBAAyB,GAAGD,kBAAkB,aAAlBA,kBAAkB,uBAAlBA,kBAAkB,CAAEE,WAAW;IACjE,IAAIC,aAAa,GAAGJ,yBAAyB;IAC7C,MAAMK,mBAAmB,GACxBN,sBAAsB,CAACO,YAAY,CAACC,IAAI,KAAK,cAAc,GACvDR,sBAAsB,CAACO,YAAY,CAACE,OAAO,GAC3CT,sBAAsB,CAACO,YAAyB;IACrD,MAAMG,iBAAiB,GAAGP,yBAAyB,IAAIQ,YAAY,CAACC,cAAc,CAACZ,sBAAsB,CAAC;IAC1G,MAAMa,UAAU,4BAAGP,mBAAmB,CAACQ,WAAW,oFAA/B,sBAAiCC,MAAM,2DAAvC,uBAAyCC,IAAI;IAChE,MAAMC,gBAAgB,GAAGC,gBAAgB,CAAClB,sBAAsB,CAAC;IACjEC,yBAAyB,GAAGkB,yBAAyB,CAACb,mBAAmB,EAAEL,yBAAyB,CAAC;IACrG,IAAIS,iBAAiB,KAAK,OAAO,IAAIG,UAAU,EAAE;MAChD,QAAQH,iBAAiB;QACxB,KAAK,aAAa;UACjBL,aAAa,GAAGe,2BAA2B,CAACP,UAAU,EAAEI,gBAAgB,CAAqC;UAC7G;QACD,KAAK,kBAAkB;UACtBZ,aAAa,GAAGgB,YAAY,CAC3B,CACCD,2BAA2B,CAACP,UAAU,EAAEI,gBAAgB,CAAC,EACzDhB,yBAAyB,CACzB,EACDqB,eAAe,CAACC,kBAAkB,CAClC;UACD;QACD,KAAK,kBAAkB;UACtBlB,aAAa,GAAGgB,YAAY,CAC3B,CACCpB,yBAAyB,EACzBmB,2BAA2B,CAACP,UAAU,EAAEI,gBAAgB,CAAC,CACzD,EACDK,eAAe,CAACC,kBAAkB,CAClC;UACD;MAAM;IAET;IACA,OAAOlB,aAAa;EACrB,CAAC;EAAC;EACK,MAAMmB,kBAAkB,GAAG,UAAUC,mBAAwC,EAAoC;IACvH,IAAIC,qBAAqB,GAAGD,mBAAmB;IAC/C,IAAIE,0BAA0B,CAACF,mBAAmB,aAAnBA,mBAAmB,uBAAnBA,mBAAmB,CAAElB,YAAY,CAAC,EAAE;MAAA;MAClEmB,qBAAqB,GAAGE,oBAAoB,CAACH,mBAAmB,2BAAEA,mBAAmB,CAAClB,YAAY,0DAAhC,sBAAkCsB,IAAI,CAAC;IAC1G;IACA,MAAMC,kBAAkB,GAAGJ,qBAAqB,CAACnB,YAAwB;IAEzE,IAAIN,yBAAyB,GAAG8B,WAAW,CAC1CC,kCAAkC,CAACN,qBAAqB,CAAC,CACrB;IAErCzB,yBAAyB,GAAGkB,yBAAyB,CAACW,kBAAkB,EAAE7B,yBAAyB,EAAE,IAAI,CAAC;IAC1G,MAAMgC,sBAAsB,GAAGlC,6BAA6B,CAAC2B,qBAAqB,EAAEzB,yBAAyB,CAAC;IAC9G,OAAS6B,kBAAkB,CAAChB,WAAW,CAACoB,EAAE,IACzC,CAACC,mCAAmC,CAACL,kBAAkB,CAAChB,WAAW,CAACoB,EAAE,CAACE,gBAAgB,CAAC,IACxFtC,iBAAiB,CAACmC,sBAAsB,CAAC,IACzCI,SAAS;EACX,CAAC;EAAC;EAAA;AAAA"}

package/src/sap/fe/core/templating/CommonFormatters.js

@@ -2,5 +2,5 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2023 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/formatters/ValueFormatter","sap/fe/core/helpers/BindingToolkit","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/templating/PropertyHelper","sap/fe/core/templating/UIFormatters","../converters/helpers/DataFieldHelper"],function(t,e,a,r,n,o){"use strict";var i={};var s=o.isReferencePropertyStaticallyHidden;var c=a.getRelativePaths;var l=a.getContextRelativeTargetObjectPath;var p=a.enhanceDataModelPath;var d=e.pathInModel;var v=e.getExpressionFromAnnotation;var g=e.formatWithTypeInformation;var u=e.formatResult;var f=e.compileExpression;const h=function(t){return f(t)};i.getExpressionBinding=h;const m=function(e,a,r){var o,i;const s=r===null||r===void 0?void 0:r.displayMode;let l=a;const p=e.targetObject.type==="PropertyPath"?e.targetObject.$target:e.targetObject;const d=s||n.getDisplayMode(e);const f=(o=p.annotations)===null||o===void 0?void 0:(i=o.Common)===null||i===void 0?void 0:i.Text;const h=c(e);a=g(p,a);if(d!=="Value"&&f){switch(d){case"Description":l=v(f,h);break;case"DescriptionValue":l=u([v(f,h),a],t.formatWithBrackets);break;case"ValueDescription":l=u([a,v(f,h)],t.formatWithBrackets);break}}return l};i.getBindingWithTextArrangement=m;const b=function(t){let e=t;if(r.isPathExpression(t===null||t===void 0?void 0:t.targetObject)){var a;e=p(t,(a=t.targetObject)===null||a===void 0?void 0:a.path)}const n=e.targetObject;let o=d(l(e));o=g(n,o,true);const i=m(e,o);return n.annotations.UI&&!s(n.annotations.UI.DataFieldDefault)&&f(i)||undefined};i.getBindingWithText=b;return i},false);
+sap.ui.define(["sap/fe/core/formatters/ValueFormatter","sap/fe/core/helpers/BindingToolkit","sap/fe/core/helpers/TypeGuards","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/templating/UIFormatters","../converters/helpers/DataFieldHelper"],function(t,e,a,r,n,o){"use strict";var i={};var s=o.isReferencePropertyStaticallyHidden;var c=r.getRelativePaths;var l=r.getContextRelativeTargetObjectPath;var p=r.enhanceDataModelPath;var d=a.isPathAnnotationExpression;var v=e.pathInModel;var u=e.getExpressionFromAnnotation;var f=e.formatWithTypeInformation;var g=e.formatResult;var h=e.compileExpression;const m=function(t){return h(t)};i.getExpressionBinding=m;const b=function(e,a,r){var o,i;const s=r===null||r===void 0?void 0:r.displayMode;let l=a;const p=e.targetObject.type==="PropertyPath"?e.targetObject.$target:e.targetObject;const d=s||n.getDisplayMode(e);const v=(o=p.annotations)===null||o===void 0?void 0:(i=o.Common)===null||i===void 0?void 0:i.Text;const h=c(e);a=f(p,a);if(d!=="Value"&&v){switch(d){case"Description":l=u(v,h);break;case"DescriptionValue":l=g([u(v,h),a],t.formatWithBrackets);break;case"ValueDescription":l=g([a,u(v,h)],t.formatWithBrackets);break}}return l};i.getBindingWithTextArrangement=b;const D=function(t){let e=t;if(d(t===null||t===void 0?void 0:t.targetObject)){var a;e=p(t,(a=t.targetObject)===null||a===void 0?void 0:a.path)}const r=e.targetObject;let n=v(l(e));n=f(r,n,true);const o=b(e,n);return r.annotations.UI&&!s(r.annotations.UI.DataFieldDefault)&&h(o)||undefined};i.getBindingWithText=D;return i},false);
 //# sourceMappingURL=CommonFormatters.js.map

package/src/sap/fe/core/templating/CommonFormatters.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommonFormatters.js","names":["sap","ui","define","valueFormatters","BindingToolkit","DataModelPathHelper","PropertyHelper","UIFormatters","DataFieldHelper","_exports","isReferencePropertyStaticallyHidden","getRelativePaths","getContextRelativeTargetObjectPath","enhanceDataModelPath","pathInModel","getExpressionFromAnnotation","formatWithTypeInformation","formatResult","compileExpression","getExpressionBinding","expression","getBindingWithTextArrangement","oPropertyDataModelPath","propertyBindingExpression","fieldFormatOptions","_oPropertyDefinition$","_oPropertyDefinition$2","targetDisplayModeOverride","displayMode","outExpression","oPropertyDefinition","targetObject","type","$target","targetDisplayMode","getDisplayMode","commonText","annotations","Common","Text","relativeLocation","formatWithBrackets","getBindingWithText","targetDataModelPath","propertyDataModelPath","isPathExpression","_targetDataModelPath$","path","propertyDefinition","textArrangementBinding","UI","DataFieldDefault","undefined"],"sources":["CommonFormatters-dbg.js"],"mappings":";;;;AAIAA,IAAIC,GAAGC,OAAO,CAAC,wCAAyC,qCAAsC,6CAA8C,wCAAyC,sCAAuC,yCAA0C,SAAUC,EAAiBC,EAAgBC,EAAqBC,EAAgBC,EAAcC,GAClW,aAEA,IAAIC,EAAW,CAAC,EAChB,IAAIC,EAAsCF,EAAgBE,oCAC1D,IAAIC,EAAmBN,EAAoBM,iBAC3C,IAAIC,EAAqCP,EAAoBO,mCAC7D,IAAIC,EAAuBR,EAAoBQ,qBAC/C,IAAIC,EAAcV,EAAeU,YACjC,IAAIC,EAA8BX,EAAeW,4BACjD,IAAIC,EAA4BZ,EAAeY,0BAC/C,IAAIC,EAAeb,EAAea,aAClC,IAAIC,EAAoBd,EAAec,kBASvC,MAAMC,EAAuB,SAAUC,GACrC,OAAOF,EAAkBE,EAC3B,EACAX,EAASU,qBAAuBA,EAChC,MAAME,EAAgC,SAAUC,EAAwBC,EAA2BC,GACjG,IAAIC,EAAuBC,EAC3B,MAAMC,EAA4BH,IAAuB,MAAQA,SAA4B,OAAS,EAAIA,EAAmBI,YAC7H,IAAIC,EAAgBN,EACpB,MAAMO,EAAsBR,EAAuBS,aAAaC,OAAS,eAAiBV,EAAuBS,aAAaE,QAAUX,EAAuBS,aAC/J,MAAMG,EAAoBP,GAA6BpB,EAAa4B,eAAeb,GACnF,MAAMc,GAAcX,EAAwBK,EAAoBO,eAAiB,MAAQZ,SAA+B,OAAS,GAAKC,EAAyBD,EAAsBa,UAAY,MAAQZ,SAAgC,OAAS,EAAIA,EAAuBa,KAC7Q,MAAMC,EAAmB7B,EAAiBW,GAC1CC,EAA4BP,EAA0Bc,EAAqBP,GAC3E,GAAIW,IAAsB,SAAWE,EAAY,CAC/C,OAAQF,GACN,IAAK,cACHL,EAAgBd,EAA4BqB,EAAYI,GACxD,MACF,IAAK,mBACHX,EAAgBZ,EAAa,CAACF,EAA4BqB,EAAYI,GAAmBjB,GAA4BpB,EAAgBsC,oBACrI,MACF,IAAK,mBACHZ,EAAgBZ,EAAa,CAACM,EAA2BR,EAA4BqB,EAAYI,IAAoBrC,EAAgBsC,oBACrI,MAEN,CACA,OAAOZ,CACT,EACApB,EAASY,8BAAgCA,EACzC,MAAMqB,EAAqB,SAAUC,GACnC,IAAIC,EAAwBD,EAC5B,GAAIrC,EAAeuC,iBAAiBF,IAAwB,MAAQA,SAA6B,OAAS,EAAIA,EAAoBZ,cAAe,CAC/I,IAAIe,EACJF,EAAwB/B,EAAqB8B,GAAsBG,EAAwBH,EAAoBZ,gBAAkB,MAAQe,SAA+B,OAAS,EAAIA,EAAsBC,KAC7M,CACA,MAAMC,EAAqBJ,EAAsBb,aACjD,IAAIR,EAA4BT,EAAYF,EAAmCgC,IAC/ErB,EAA4BP,EAA0BgC,EAAoBzB,EAA2B,MACrG,MAAM0B,EAAyB5B,EAA8BuB,EAAuBrB,GACpF,OAAOyB,EAAmBX,YAAYa,KAAOxC,EAAoCsC,EAAmBX,YAAYa,GAAGC,mBAAqBjC,EAAkB+B,IAA2BG,SACvL,EACA3C,EAASiC,mBAAqBA,EAC9B,OAAOjC,CACT,EAAG"}
+{"version":3,"file":"CommonFormatters.js","names":["sap","ui","define","valueFormatters","BindingToolkit","TypeGuards","DataModelPathHelper","UIFormatters","DataFieldHelper","_exports","isReferencePropertyStaticallyHidden","getRelativePaths","getContextRelativeTargetObjectPath","enhanceDataModelPath","isPathAnnotationExpression","pathInModel","getExpressionFromAnnotation","formatWithTypeInformation","formatResult","compileExpression","getExpressionBinding","expression","getBindingWithTextArrangement","oPropertyDataModelPath","propertyBindingExpression","fieldFormatOptions","_oPropertyDefinition$","_oPropertyDefinition$2","targetDisplayModeOverride","displayMode","outExpression","oPropertyDefinition","targetObject","type","$target","targetDisplayMode","getDisplayMode","commonText","annotations","Common","Text","relativeLocation","formatWithBrackets","getBindingWithText","targetDataModelPath","propertyDataModelPath","_targetDataModelPath$","path","propertyDefinition","textArrangementBinding","UI","DataFieldDefault","undefined"],"sources":["CommonFormatters-dbg.js"],"mappings":";;;;AAIAA,IAAIC,GAAGC,OAAO,CAAC,wCAAyC,qCAAsC,iCAAkC,6CAA8C,sCAAuC,yCAA0C,SAAUC,EAAiBC,EAAgBC,EAAYC,EAAqBC,EAAcC,GACvV,aAEA,IAAIC,EAAW,CAAC,EAChB,IAAIC,EAAsCF,EAAgBE,oCAC1D,IAAIC,EAAmBL,EAAoBK,iBAC3C,IAAIC,EAAqCN,EAAoBM,mCAC7D,IAAIC,EAAuBP,EAAoBO,qBAC/C,IAAIC,EAA6BT,EAAWS,2BAC5C,IAAIC,EAAcX,EAAeW,YACjC,IAAIC,EAA8BZ,EAAeY,4BACjD,IAAIC,EAA4Bb,EAAea,0BAC/C,IAAIC,EAAed,EAAec,aAClC,IAAIC,EAAoBf,EAAee,kBASvC,MAAMC,EAAuB,SAAUC,GACrC,OAAOF,EAAkBE,EAC3B,EACAZ,EAASW,qBAAuBA,EAChC,MAAME,EAAgC,SAAUC,EAAwBC,EAA2BC,GACjG,IAAIC,EAAuBC,EAC3B,MAAMC,EAA4BH,IAAuB,MAAQA,SAA4B,OAAS,EAAIA,EAAmBI,YAC7H,IAAIC,EAAgBN,EACpB,MAAMO,EAAsBR,EAAuBS,aAAaC,OAAS,eAAiBV,EAAuBS,aAAaE,QAAUX,EAAuBS,aAC/J,MAAMG,EAAoBP,GAA6BrB,EAAa6B,eAAeb,GACnF,MAAMc,GAAcX,EAAwBK,EAAoBO,eAAiB,MAAQZ,SAA+B,OAAS,GAAKC,EAAyBD,EAAsBa,UAAY,MAAQZ,SAAgC,OAAS,EAAIA,EAAuBa,KAC7Q,MAAMC,EAAmB9B,EAAiBY,GAC1CC,EAA4BP,EAA0Bc,EAAqBP,GAC3E,GAAIW,IAAsB,SAAWE,EAAY,CAC/C,OAAQF,GACN,IAAK,cACHL,EAAgBd,EAA4BqB,EAAYI,GACxD,MACF,IAAK,mBACHX,EAAgBZ,EAAa,CAACF,EAA4BqB,EAAYI,GAAmBjB,GAA4BrB,EAAgBuC,oBACrI,MACF,IAAK,mBACHZ,EAAgBZ,EAAa,CAACM,EAA2BR,EAA4BqB,EAAYI,IAAoBtC,EAAgBuC,oBACrI,MAEN,CACA,OAAOZ,CACT,EACArB,EAASa,8BAAgCA,EACzC,MAAMqB,EAAqB,SAAUC,GACnC,IAAIC,EAAwBD,EAC5B,GAAI9B,EAA2B8B,IAAwB,MAAQA,SAA6B,OAAS,EAAIA,EAAoBZ,cAAe,CAC1I,IAAIc,EACJD,EAAwBhC,EAAqB+B,GAAsBE,EAAwBF,EAAoBZ,gBAAkB,MAAQc,SAA+B,OAAS,EAAIA,EAAsBC,KAC7M,CACA,MAAMC,EAAqBH,EAAsBb,aACjD,IAAIR,EAA4BT,EAAYH,EAAmCiC,IAC/ErB,EAA4BP,EAA0B+B,EAAoBxB,EAA2B,MACrG,MAAMyB,EAAyB3B,EAA8BuB,EAAuBrB,GACpF,OAAOwB,EAAmBV,YAAYY,KAAOxC,EAAoCsC,EAAmBV,YAAYY,GAAGC,mBAAqBhC,EAAkB8B,IAA2BG,SACvL,EACA3C,EAASkC,mBAAqBA,EAC9B,OAAOlC,CACT,EAAG"}

package/src/sap/fe/core/templating/CommonFormatters.ts

@@ -8,10 +8,10 @@ import {
 	getExpressionFromAnnotation,
 	pathInModel
 } from "sap/fe/core/helpers/BindingToolkit";
+import { isPathAnnotationExpression } from "sap/fe/core/helpers/TypeGuards";
 import type { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
 import { enhanceDataModelPath, getContextRelativeTargetObjectPath, getRelativePaths } from "sap/fe/core/templating/DataModelPathHelper";
 import type * as DisplayModeFormatter from "sap/fe/core/templating/DisplayModeFormatter";
-import * as PropertyHelper from "sap/fe/core/templating/PropertyHelper";
 import * as UIFormatters from "sap/fe/core/templating/UIFormatters";
 import { isReferencePropertyStaticallyHidden } from "../converters/helpers/DataFieldHelper";
 export type DisplayMode = DisplayModeFormatter.DisplayMode;
@@ -71,7 +71,7 @@ export const getBindingWithTextArrangement = function (
 };
 export const getBindingWithText = function (targetDataModelPath: DataModelObjectPath): CompiledBindingToolkitExpression {
 	let propertyDataModelPath = targetDataModelPath;
-	if (PropertyHelper.isPathExpression(targetDataModelPath?.targetObject)) {
+	if (isPathAnnotationExpression(targetDataModelPath?.targetObject)) {
 		propertyDataModelPath = enhanceDataModelPath(targetDataModelPath, targetDataModelPath.targetObject?.path);
 	}
 	const propertyDefinition = propertyDataModelPath.targetObject as Property;