@sapui5/sap.fe.core 1.102.2 → 1.104.1

package/src/sap/fe/core/buildingBlocks/BuildingBlockRuntime.ts

@@ -1,7 +1,7 @@
 import Log from "sap/base/Log";
 import uid from "sap/base/util/uid";
 import AttributeModel from "sap/fe/core/buildingBlocks/AttributeModel";
-import {
+import type {
 	BuildingBlockAggregationDefinition,
 	BuildingBlockBase,
 	BuildingBlockDefinition,
@@ -10,12 +10,12 @@ import {
 	BuildingBlockMetadataContextDefinition,
 	BuildingBlockPropertyDefinition
 } from "sap/fe/core/buildingBlocks/BuildingBlock";
-import { compileBinding } from "sap/fe/core/helpers/BindingExpression";
+import { compileExpression } from "sap/fe/core/helpers/BindingToolkit";
 import ResourceModel from "sap/fe/macros/ResourceModel";
 import BindingParser from "sap/ui/base/BindingParser";
 import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
-import Context from "sap/ui/model/Context";
-import JSONModel from "sap/ui/model/json/JSONModel";
+import type Context from "sap/ui/model/Context";
+import type JSONModel from "sap/ui/model/json/JSONModel";
 import TraceInfo from "./TraceInfo";
 
 const LOGGER_SCOPE = "sap.fe.core.buildingBlocks.BuildingBlockRuntime";
@@ -27,6 +27,7 @@ type ResolvedBuildingBlockMetadata = {
 	aggregations: Record<string, BuildingBlockAggregationDefinition>;
 	metadataContexts: Record<string, BuildingBlockMetadataContextDefinition>;
 	isOpen: boolean;
+	defaultAggregation?: string;
 };
 
 type ICallback = {
@@ -43,7 +44,7 @@ type ICallback = {
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A thenable which resolves with <code>undefined</code> as soon as visiting
 	 *   is done, or is rejected with a corresponding error if visiting fails
-	 **/
+	 */
 	visitNode(oNode: Node): Promise<void>;
 
 	/**
@@ -70,6 +71,7 @@ type ICallback = {
 	/**
 	 * Interprets the given XML DOM attribute value as a binding and returns the
 	 * resulting value.
+	 *
 	 * @param {string} sValue
 	 *   An XML DOM attribute value
 	 * @param {Element} [oElement]
@@ -171,7 +173,7 @@ export function validateMacroSignature(sName: any, oMetadata: any, mContexts: an
 		const oPropertySettings = oMetadata.properties[sKey];
 		if (!oNode.hasAttribute(sKey)) {
 			if (oPropertySettings.required && !oPropertySettings.hasOwnProperty("defaultValue")) {
-				throw new Error(sName + ": " + "Required property '" + sKey + "' is missing");
+				throw new Error(`${sName}: ` + `Required property '${sKey}' is missing`);
 			}
 		} else {
 			delete oAttributeNames[sKey];
@@ -187,6 +189,10 @@ export function validateMacroSignature(sName: any, oMetadata: any, mContexts: an
 	});
 }
 
+const SAP_UI_CORE_ELEMENT = "sap.ui.core.Element";
+
+const SAP_UI_MODEL_CONTEXT = "sap.ui.model.Context";
+
 /**
  * Ensures that the metadata for the building block are properly defined.
  *
@@ -199,16 +205,16 @@ function prepareMetadata(buildingBlockMetadata?: BuildingBlockMetadata, isOpen =
 		const oProperties: any = {};
 		const oAggregations: any = {
 			"dependents": {
-				type: "sap.ui.core.Element"
+				type: SAP_UI_CORE_ELEMENT
 			},
 			"customData": {
-				type: "sap.ui.core.Element"
+				type: SAP_UI_CORE_ELEMENT
 			}
 		};
 		const oMetadataContexts: Record<string, BuildingBlockPropertyDefinition> = {};
-
+		let foundDefaultAggregation;
 		Object.keys(buildingBlockMetadata.properties).forEach(function (sPropertyName: string) {
-			if (buildingBlockMetadata.properties[sPropertyName].type !== "sap.ui.model.Context") {
+			if (buildingBlockMetadata.properties[sPropertyName].type !== SAP_UI_MODEL_CONTEXT) {
 				oProperties[sPropertyName] = buildingBlockMetadata.properties[sPropertyName];
 			} else {
 				oMetadataContexts[sPropertyName] = buildingBlockMetadata.properties[sPropertyName];
@@ -223,11 +229,15 @@ function prepareMetadata(buildingBlockMetadata?: BuildingBlockMetadata, isOpen =
 		if (buildingBlockMetadata.aggregations) {
 			Object.keys(buildingBlockMetadata.aggregations).forEach(function (sPropertyName: string) {
 				oAggregations[sPropertyName] = buildingBlockMetadata.aggregations[sPropertyName];
+				if (oAggregations[sPropertyName].isDefault) {
+					foundDefaultAggregation = sPropertyName;
+				}
 			});
 		}
 		return {
 			properties: oProperties,
 			aggregations: oAggregations,
+			defaultAggregation: foundDefaultAggregation,
 			metadataContexts: oMetadataContexts,
 			isOpen: isOpen
 		};
@@ -236,10 +246,10 @@ function prepareMetadata(buildingBlockMetadata?: BuildingBlockMetadata, isOpen =
 			metadataContexts: {},
 			aggregations: {
 				"dependents": {
-					type: "sap.ui.core.Element"
+					type: SAP_UI_CORE_ELEMENT
 				},
 				"customData": {
-					type: "sap.ui.core.Element"
+					type: SAP_UI_CORE_ELEMENT
 				}
 			},
 			properties: {},
@@ -260,16 +270,14 @@ function _getMetadataContext(
 	if (!bDoNotResolve && oNode.hasAttribute(sAttributeName)) {
 		const sAttributeValue = oNode.getAttribute(sAttributeName) as string;
 		let sMetaPath;
-		// oVisitor.getResult(sAttributeValue, oNode);
 		oMetadataContext = BindingParser.complexParser(sAttributeValue);
 		if (!oMetadataContext) {
-			if (sAttributeValue.startsWith("uid--")) {
+			if (sAttributeValue.startsWith("/uid--")) {
 				const oData = myStore[sAttributeValue];
-				const sContextPath = "/" + sAttributeValue;
-				oSettings.models.converterContext.setProperty(sContextPath, oData);
+				oSettings.models.converterContext.setProperty(sAttributeValue, oData);
 				oMetadataContext = {
 					model: "converterContext",
-					path: sContextPath
+					path: sAttributeValue
 				};
 			} else if ((sAttributeName === "metaPath" && oSettings.currentContextPath) || sAttributeName === "contextPath") {
 				if (sAttributeValue && sAttributeValue.startsWith("/")) {
@@ -322,7 +330,8 @@ async function processProperties(
 	isPublic: boolean,
 	oVisitor: ICallback,
 	mContexts: any,
-	oMetadataContexts: any
+	oMetadataContexts: any,
+	apiVersion?: number
 ) {
 	const mMissingContext: any = {};
 	const oDefinitionProperties = oMetadata.properties;
@@ -333,10 +342,9 @@ async function processProperties(
 	const aDefinitionPropertiesKeys = Object.keys(oDefinitionProperties);
 	let aDefinitionContextsKeys = Object.keys(oDefinitionContexts);
 	const propertyValues: Record<string, any> = {};
-	for (let j = 0; j < aDefinitionPropertiesKeys.length; j++) {
-		const sKeyValue = aDefinitionPropertiesKeys[j];
+	for (const sKeyValue of aDefinitionPropertiesKeys) {
 		if (oDefinitionProperties[sKeyValue].type === "object") {
-			propertyValues[sKeyValue] = {}; // To avoid vales being reused accross macros
+			propertyValues[sKeyValue] = {}; // To avoid values being reused accross macros
 		} else {
 			propertyValues[sKeyValue] = oDefinitionProperties[sKeyValue].defaultValue;
 		}
@@ -344,8 +352,11 @@ async function processProperties(
 			Log.error(`Property ${sKeyValue} was ignored as it is not intended for public usage`);
 		} else if (oNode.hasAttribute(sKeyValue)) {
 			await oVisitor.visitAttribute(oNode, oNode.attributes.getNamedItem(sKeyValue) as Attr);
-			const vValue = oNode.getAttribute(sKeyValue);
+			let vValue: any = oNode.getAttribute(sKeyValue);
 			if (vValue !== undefined) {
+				if (apiVersion === 2 && typeof vValue === "string" && oDefinitionProperties[sKeyValue].type === "boolean") {
+					vValue = vValue === "true";
+				}
 				propertyValues[sKeyValue] = vValue;
 			}
 		}
@@ -376,48 +387,161 @@ async function processProperties(
 	}
 	return { mMissingContext, propertyValues: propertyValues };
 }
+function parseAggregation(oAggregation: Element) {
+	const oOutObjects: any = {};
+	if (oAggregation && oAggregation.children.length > 0) {
+		const children = oAggregation.children;
+		for (let childIdx = 0; childIdx < children.length; childIdx++) {
+			const childDefinition = children[childIdx];
+			let childKey = childDefinition.getAttribute("key") || childDefinition.getAttribute("id");
+			if (childKey) {
+				childKey = `InlineXML_${childKey}`;
+				childDefinition.setAttribute("key", childKey);
+				oOutObjects[childKey] = {
+					key: childKey,
+					position: {
+						placement: childDefinition.getAttribute("placement"),
+						anchor: childDefinition.getAttribute("anchor")
+					},
+					type: "Slot"
+				};
+			}
+		}
+	}
+	return oOutObjects;
+}
 
 async function processChildren(
 	oNode: Element,
 	oVisitor: ICallback,
 	oMetadata: ResolvedBuildingBlockMetadata,
 	isPublic: boolean,
-	propertyValues: Record<string, any>
+	propertyValues: Record<string, any>,
+	apiVersion?: number
 ) {
 	const oAggregations: any = {};
 	if (oNode.firstElementChild !== null) {
-		// If there are aggregation we need to visit the childNodes first and foremost
-		await oVisitor.visitChildNodes(oNode);
 		let oFirstElementChild: Element | null = oNode.firstElementChild;
+		if (apiVersion === 2) {
+			while (oFirstElementChild !== null) {
+				const sChildName = oFirstElementChild.localName;
+				let sAggregationName = sChildName;
+				if (sAggregationName[0].toUpperCase() === sAggregationName[0]) {
+					// not a sub aggregation, go back to default Aggregation
+					sAggregationName = oMetadata.defaultAggregation || "";
+				}
+				const aggregationDefinition = oMetadata.aggregations[sAggregationName];
+				if (aggregationDefinition && !aggregationDefinition.slot) {
+					const parsedAggregation = parseAggregation(oFirstElementChild);
+					oAggregations[sAggregationName] = parsedAggregation;
+					for (const parsedAggregationKey in parsedAggregation) {
+						oMetadata.aggregations[parsedAggregationKey] = parsedAggregation[parsedAggregationKey];
+					}
+				}
+				oFirstElementChild = oFirstElementChild.nextElementSibling;
+			}
+		}
+
+		if (apiVersion !== 2) {
+			// If there are aggregation we need to visit the childNodes to resolve templating instructions
+			await oVisitor.visitChildNodes(oNode);
+		}
+		oFirstElementChild = oNode.firstElementChild;
 		while (oFirstElementChild !== null) {
+			const oNextChild: Element | null = oFirstElementChild.nextElementSibling;
 			const sChildName = oFirstElementChild.localName;
+			let sAggregationName = sChildName;
+			if (sAggregationName[0].toUpperCase() === sAggregationName[0]) {
+				// not a sub aggregation, go back to default Aggregation
+				sAggregationName = oMetadata.defaultAggregation || "";
+			}
 			if (
-				Object.keys(oMetadata.aggregations).indexOf(sChildName) !== -1 &&
-				(!isPublic || oMetadata.aggregations[sChildName].isPublic)
+				Object.keys(oMetadata.aggregations).indexOf(sAggregationName) !== -1 &&
+				(!isPublic || oMetadata.aggregations[sAggregationName].isPublic)
 			) {
-				oAggregations[oFirstElementChild.localName] = oFirstElementChild;
-			} else if (Object.keys(oMetadata.properties).indexOf(sChildName) !== -1) {
+				if (apiVersion === 2) {
+					const aggregationDefinition = oMetadata.aggregations[sAggregationName];
+					if (!aggregationDefinition.slot && oFirstElementChild && oFirstElementChild.children.length > 0) {
+						await oVisitor.visitNode(oFirstElementChild);
+						let childDefinition = oFirstElementChild.firstElementChild;
+						while (childDefinition) {
+							const oNewChild = document.createElementNS(oNode.namespaceURI, childDefinition.getAttribute("key")!);
+							const nextChild = childDefinition.nextElementSibling;
+							oNewChild.appendChild(childDefinition);
+							oAggregations[childDefinition.getAttribute("key")!] = oNewChild;
+							childDefinition.removeAttribute("key");
+							childDefinition = nextChild;
+						}
+					} else if (aggregationDefinition.slot) {
+						if (sAggregationName !== sChildName) {
+							if (!oAggregations[sAggregationName]) {
+								const oNewChild = document.createElementNS(oNode.namespaceURI, sAggregationName);
+								oAggregations[sAggregationName] = oNewChild;
+							}
+							oAggregations[sAggregationName].appendChild(oFirstElementChild);
+						} else {
+							oAggregations[sAggregationName] = oFirstElementChild;
+						}
+					}
+				} else {
+					await oVisitor.visitNode(oFirstElementChild);
+					oAggregations[oFirstElementChild.localName] = oFirstElementChild;
+				}
+			} else if (Object.keys(oMetadata.properties).indexOf(sAggregationName) !== -1) {
+				await oVisitor.visitNode(oFirstElementChild);
 				// Object Type properties
-				propertyValues[sChildName] = {};
+				propertyValues[sAggregationName] = {};
 				for (const attributeIndex of Object.keys(oFirstElementChild.attributes)) {
-					propertyValues[sChildName][oFirstElementChild.attributes[attributeIndex as any].localName] =
+					propertyValues[sAggregationName][oFirstElementChild.attributes[attributeIndex as any].localName] =
 						oFirstElementChild.attributes[attributeIndex as any].value;
 				}
 			}
 
-			oFirstElementChild = oFirstElementChild.nextElementSibling;
+			oFirstElementChild = oNextChild;
 		}
 	}
 	return oAggregations;
 }
 
+function processSlots(
+	oAggregations: Record<string, any>,
+	oMetadataAggregations: Record<string, BuildingBlockAggregationDefinition>,
+	oNode: Element,
+	processCustomData: boolean = false
+) {
+	if (Object.keys(oAggregations).length > 0) {
+		Object.keys(oAggregations).forEach(function (sAggregationName: string) {
+			const oAggregationElement = oAggregations[sAggregationName];
+			if (oNode !== null && oNode !== undefined && oAggregationElement) {
+				const oNewChild = document.createElementNS(oNode.namespaceURI, sAggregationName);
+				let oElementChild = oAggregationElement.firstElementChild;
+				while (oElementChild) {
+					const oNextChild = oElementChild.nextElementSibling;
+					oNewChild.appendChild(oElementChild);
+					oElementChild = oNextChild;
+				}
+				if (sAggregationName !== "customData" && sAggregationName !== "dependents") {
+					const sSlotName =
+						(oMetadataAggregations[sAggregationName] && oMetadataAggregations[sAggregationName].slot) || sAggregationName;
+					const oTargetElement = oNode.querySelector(`slot[name='${sSlotName}']`) as Element;
+					if (oTargetElement) {
+						oTargetElement.replaceWith(...(oNewChild.children as any));
+					}
+				} else if (processCustomData && oNewChild.children.length > 0) {
+					oNode.appendChild(oNewChild);
+				}
+			}
+		});
+	}
+}
+
 async function processBuildingBlock(
-	buildingBLockDefinition: BuildingBlockDefinition,
+	buildingBlockDefinition: BuildingBlockDefinition,
 	oNode: Element,
 	oVisitor: ICallback,
 	isPublic = false
 ) {
-	const sFragmentName = buildingBLockDefinition.fragment || `${buildingBLockDefinition.namespace}.${buildingBLockDefinition.name}`;
+	const sFragmentName = buildingBlockDefinition.fragment || `${buildingBlockDefinition.namespace}.${buildingBlockDefinition.name}`;
 
 	const sName = "this";
 
@@ -435,7 +559,7 @@ async function processBuildingBlock(
 				Log.error(error);
 			});
 	}
-	const oMetadata = prepareMetadata(buildingBLockDefinition.metadata, buildingBLockDefinition.isOpen);
+	const oMetadata = prepareMetadata(buildingBlockDefinition.metadata, buildingBlockDefinition.isOpen);
 
 	//Inject storage for macros
 	if (!oSettings[sFragmentName]) {
@@ -450,12 +574,20 @@ async function processBuildingBlock(
 		isPublic,
 		oVisitor,
 		mContexts,
-		oMetadataContexts
+		oMetadataContexts,
+		buildingBlockDefinition.apiVersion
 	);
 	const initialKeys = Object.keys(propertyValues);
 	try {
 		// Aggregation and complex type support
-		const oAggregations = await processChildren(oNode, oVisitor, oMetadata, isPublic, propertyValues);
+		const oAggregations = await processChildren(
+			oNode,
+			oVisitor,
+			oMetadata,
+			isPublic,
+			propertyValues,
+			buildingBlockDefinition.apiVersion
+		);
 		let oInstance: any;
 		let oControlConfig = {};
 
@@ -464,9 +596,9 @@ async function processBuildingBlock(
 			oControlConfig = oSettings.models.viewData.getProperty("/controlConfiguration");
 		}
 		let processedPropertyValues = propertyValues;
-		if (isV1MacroDef(buildingBLockDefinition) && buildingBLockDefinition.create) {
-			processedPropertyValues = buildingBLockDefinition.create.call(
-				buildingBLockDefinition,
+		if (isV1MacroDef(buildingBlockDefinition) && buildingBlockDefinition.create) {
+			processedPropertyValues = buildingBlockDefinition.create.call(
+				buildingBlockDefinition,
 				propertyValues,
 				oControlConfig,
 				oSettings,
@@ -483,22 +615,45 @@ async function processBuildingBlock(
 					mContexts[sContextName] = processedPropertyValues[sContextName];
 				}
 			});
-		} else if (buildingBLockDefinition.apiVersion === 2) {
+		} else if (buildingBlockDefinition.apiVersion === 2) {
 			Object.keys(propertyValues).forEach((propName) => {
 				const oData = propertyValues[propName];
 				if (
 					oData &&
 					oData.isA &&
-					oData.isA("sap.ui.model.Context") &&
+					oData.isA(SAP_UI_MODEL_CONTEXT) &&
 					!oData.getModel().isA("sap.ui.model.odata.v4.ODataMetaModel")
 				) {
 					propertyValues[propName] = oData.getObject();
 				}
 			});
-			const BuildingBlockClass = buildingBLockDefinition as typeof BuildingBlockBase;
-			oInstance = new BuildingBlockClass(propertyValues /*, oControlConfig, oSettings, oAggregations, isPublic*/);
+			const BuildingBlockClass = buildingBlockDefinition as typeof BuildingBlockBase;
+			propertyValues.isPublic = isPublic;
+
+			oInstance = new BuildingBlockClass(
+				{ ...propertyValues, ...oAggregations },
+				oControlConfig,
+				oSettings
+				/*, oControlConfig, oSettings, oAggregations, isPublic*/
+			);
+			processedPropertyValues = oInstance.getProperties();
+			Object.keys(oMetadata.metadataContexts).forEach(function (sContextName: string) {
+				if (processedPropertyValues.hasOwnProperty(sContextName)) {
+					let targetObject = processedPropertyValues[sContextName];
+					if (typeof targetObject === "object" && !targetObject.getObject) {
+						const sAttributeValue = storeValue(targetObject);
+						const sContextPath = `${sAttributeValue}`;
+						oSettings.models.converterContext.setProperty(sContextPath, targetObject);
+						targetObject = oSettings.models.converterContext.createBindingContext(sContextPath);
+						delete myStore[sAttributeValue];
+						mContexts[sContextName] = targetObject;
+					} else if (!mContexts.hasOwnProperty(sContextName) && targetObject !== undefined) {
+						mContexts[sContextName] = targetObject;
+					}
+				}
+			});
 		}
-		const oAttributesModel: JSONModel = new AttributeModel(oNode, processedPropertyValues, buildingBLockDefinition);
+		const oAttributesModel: JSONModel = new AttributeModel(oNode, processedPropertyValues, buildingBlockDefinition);
 		mContexts[sName] = oAttributesModel.createBindingContext("/");
 
 		let oPreviousMacroInfo: any;
@@ -515,26 +670,34 @@ async function processBuildingBlock(
 
 		const oContextVisitor = oVisitor.with(
 			mContexts,
-			buildingBLockDefinition.isOpen !== undefined ? !buildingBLockDefinition.isOpen : true
+			buildingBlockDefinition.isOpen !== undefined ? !buildingBlockDefinition.isOpen : true
 		);
 		const oParent = oNode.parentNode;
 
 		let iChildIndex: number;
 		let oPromise;
+		let processCustomData = true;
 		if (oParent) {
 			iChildIndex = Array.from(oParent.children).indexOf(oNode);
-
 			if (
-				(isV1MacroDef(buildingBLockDefinition) && buildingBLockDefinition.getTemplate) ||
-				buildingBLockDefinition.apiVersion === 2
+				(isV1MacroDef(buildingBlockDefinition) && buildingBlockDefinition.getTemplate) ||
+				(buildingBlockDefinition.apiVersion === 2 && !buildingBlockDefinition.fragment)
 			) {
 				let oTemplate;
 				let addDefaultNamespace = false;
-				if (buildingBLockDefinition.apiVersion === 2) {
+				if (buildingBlockDefinition.apiVersion === 2) {
 					oTemplate = oInstance.getTemplate();
+					if (buildingBlockDefinition.isRuntime) {
+						for (const myStoreKey in myStore) {
+							const oData = myStore[myStoreKey];
+							const sContextPath = `${myStoreKey}`;
+							oSettings.models.converterContext.setProperty(sContextPath, oData);
+							delete myStore[myStoreKey];
+						}
+					}
 					addDefaultNamespace = true;
-				} else if (buildingBLockDefinition.getTemplate) {
-					oTemplate = buildingBLockDefinition.getTemplate(processedPropertyValues);
+				} else if (buildingBlockDefinition.getTemplate) {
+					oTemplate = buildingBlockDefinition.getTemplate(processedPropertyValues);
 				}
 
 				let hasError = "";
@@ -554,23 +717,24 @@ async function processBuildingBlock(
 
 					if (oTemplate.localName === "parsererror") {
 						// If there is a parseerror while processing the XML it means the XML itself is malformed, as such we rerun the template process
-						// Setting isTraceMode true will make it so that each xml` expression is checked for validity from XML perspective and if an error is found it's returned instead of the normal fragment
-						Log.error(`Error while processing building block ${buildingBLockDefinition.name}`);
+						// Setting isTraceMode true will make it so that each xml` expression is checked for validity from XML perspective
+						// If an error is found it's returned instead of the normal fragment
+						Log.error(`Error while processing building block ${buildingBlockDefinition.name}`);
 						try {
 							isTraceMode = true;
 							oTemplate = oInstance?.getTemplate
 								? oInstance.getTemplate()
-								: (buildingBLockDefinition as any).getTemplate(processedPropertyValues);
+								: (buildingBlockDefinition as any).getTemplate(processedPropertyValues);
 							oTemplate = parseXMLString(oTemplate, true);
 						} finally {
 							isTraceMode = false;
 						}
 					} else if (hasError.length > 0) {
 						// If there is trailing text we create a standard error and display it.
-						Log.error(`Error while processing building block ${buildingBLockDefinition.name}`);
+						Log.error(`Error while processing building block ${buildingBlockDefinition.name}`);
 						const oErrorText = createErrorXML(
 							[
-								`Error while processing building block ${buildingBLockDefinition.name}`,
+								`Error while processing building block ${buildingBlockDefinition.name}`,
 								`Trailing text was found in the XML: ${hasError}`
 							],
 							oTemplate.outerHTML
@@ -579,6 +743,8 @@ async function processBuildingBlock(
 					}
 					oNode.replaceWith(oTemplate);
 					oNode = oParent.children[iChildIndex];
+					processSlots(oAggregations, oMetadata.aggregations, oNode, processCustomData);
+					processCustomData = false;
 					oPromise = oContextVisitor.visitNode(oNode);
 				} else {
 					oNode.remove();
@@ -590,32 +756,7 @@ async function processBuildingBlock(
 
 			await oPromise;
 			const oMacroElement = oParent.children[iChildIndex];
-
-			if (Object.keys(oAggregations).length > 0) {
-				Object.keys(oAggregations).forEach(function (sAggregationName: string) {
-					const oAggregationElement = oAggregations[sAggregationName];
-					if (oMacroElement !== null && oMacroElement !== undefined) {
-						const oNewChild = document.createElementNS(oMacroElement.namespaceURI, sAggregationName);
-						let oElementChild = oAggregationElement.firstElementChild;
-						while (oElementChild) {
-							const oNextChild = oElementChild.nextElementSibling;
-							oNewChild.appendChild(oElementChild);
-							oElementChild = oNextChild;
-						}
-						if (sAggregationName !== "customData" && sAggregationName !== "dependents") {
-							const sSlotName =
-								(oMetadata.aggregations[sAggregationName] && oMetadata.aggregations[sAggregationName].slot) ||
-								sAggregationName;
-							const oTargetElement = oMacroElement.querySelector("slot[name='" + sSlotName + "']") as Element;
-							if (oTargetElement) {
-								oTargetElement.replaceWith(...(oNewChild.children as any));
-							}
-						} else {
-							oMacroElement.appendChild(oNewChild);
-						}
-					}
-				});
-			}
+			processSlots(oAggregations, oMetadata.aggregations, oMacroElement, processCustomData);
 			if (oMacroElement) {
 				const oRemainingSlots = oMacroElement.querySelectorAll("slot");
 				oRemainingSlots.forEach(function (oSlotElement: any) {
@@ -638,7 +779,7 @@ async function processBuildingBlock(
 		};
 		for (const propertyName of initialKeys) {
 			const propertyValue = propertyValues[propertyName];
-			if (propertyValue && propertyValue.isA && propertyValue.isA("sap.ui.model.Context")) {
+			if (propertyValue && propertyValue.isA && propertyValue.isA(SAP_UI_MODEL_CONTEXT)) {
 				traceDetails.initialProperties[propertyName] = {
 					path: propertyValue.getPath(),
 					value: propertyValue.getObject()
@@ -650,7 +791,7 @@ async function processBuildingBlock(
 		for (const propertyName in propertyValues) {
 			const propertyValue = propertyValues[propertyName];
 			if (!initialKeys.includes(propertyName)) {
-				if (propertyValue && propertyValue.isA && propertyValue.isA("sap.ui.model.Context")) {
+				if (propertyValue && propertyValue.isA && propertyValue.isA(SAP_UI_MODEL_CONTEXT)) {
 					traceDetails.resolvedProperties[propertyName] = {
 						path: propertyValue.getPath(),
 						value: propertyValue.getObject()
@@ -663,7 +804,7 @@ async function processBuildingBlock(
 		const errorAny = e as any;
 		Log.error(errorAny, errorAny);
 		const oError = createErrorXML(
-			[`Error while processing building block ${buildingBLockDefinition.name}`, errorAny.stack],
+			[`Error while processing building block ${buildingBlockDefinition.name}`, errorAny.stack],
 			oNode.outerHTML,
 			traceDetails
 		);
@@ -680,10 +821,12 @@ function addSingleContext(mContexts: any, oVisitor: any, oCtx: any, oMetadataCon
 	try {
 		let sContextPath = oCtx.path;
 		if (oCtx.model != null) {
-			sContextPath = oCtx.model + ">" + sContextPath;
+			sContextPath = `${oCtx.model}>${sContextPath}`;
 		}
 		const mSetting = oVisitor.getSettings();
-		if (!mSetting.bindingContexts[oCtx.model] && mSetting.models[oCtx.model]) {
+		if (oCtx.model === "converterContext" && oCtx.path.length > 0) {
+			mContexts[sKey] = mSetting.models[oCtx.model].getContext(oCtx.path, mSetting.bindingContexts[oCtx.model]); // add the context to the visitor
+		} else if (!mSetting.bindingContexts[oCtx.model] && mSetting.models[oCtx.model]) {
 			mContexts[sKey] = mSetting.models[oCtx.model].getContext(oCtx.path); // add the context to the visitor
 		} else {
 			mContexts[sKey] = oVisitor.getContext(sContextPath); // add the context to the visitor
@@ -720,7 +863,7 @@ export function registerBuildingBlock(buildingBlockDefinition: BuildingBlockDefi
 }
 
 function createErrorXML(errorMessages: string[], xmlFragment: string, additionalData?: object): string {
-	const errorLabels = errorMessages.map((errorMessage) => xml`<m:Label text="${escapeXML(errorMessage)}"/>`);
+	const errorLabels = errorMessages.map((errorMessage) => xml`<m:Label text="${escapeXMLAttributeValue(errorMessage)}"/>`);
 	let additionalText = "";
 	if (additionalData) {
 		additionalText = xml`<m:VBox>
@@ -742,7 +885,7 @@ function createErrorXML(errorMessages: string[], xmlFragment: string, additional
 
 const myStore: Record<string, any> = {};
 function storeValue(values: any) {
-	const propertyUID = `uid--${uid()}`;
+	const propertyUID = `/uid--${uid()}`;
 	myStore[propertyUID] = values;
 	return propertyUID;
 }
@@ -760,6 +903,7 @@ function parseXMLString(xmlString: string, addDefaultNamespaces = false): Elemen
 						xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 						xmlns:m="sap.m"
 						xmlns:core="sap.ui.core"
+						xmlns:mdc="sap.ui.mdc"
 						xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1">${xmlString}</template>`;
 	}
 	const xmlDocument = DOMParserInstance.parseFromString(xmlString, "text/xml");
@@ -794,7 +938,7 @@ function escapeXML(str: string): string {
  * @returns The escaped string.
  */
 function escapeXMLAttributeValue(val: string): string {
-	return val.replace(/&/g, "&amp;").replace(/</g, "&lt;");
+	return val && val.replace(/&/g, "&amp;").replace(/</g, "&lt;");
 }
 
 /**
@@ -810,16 +954,22 @@ export const xml = (strings: TemplateStringsArray, ...values: any[]) => {
 	for (i = 0; i < values.length; i++) {
 		outStr += strings[i];
 		// Handle the different case of object, if it's an array we join them, if it's a binding expression (determined by _type) then we compile it.
-		if (Array.isArray(values[i])) {
-			outStr += values[i].flat(5).join("").trim();
+		if (Array.isArray(values[i]) && values[i].length > 0 && typeof values[i][0] === "string") {
+			outStr += values[i].flat(5).join("\n").trim();
 		} else if (values[i]?._type) {
-			const compiledExpression = compileBinding(values[i]);
+			const compiledExpression = compileExpression(values[i]);
 			outStr += compiledExpression !== undefined ? escapeXMLAttributeValue(compiledExpression) : undefined;
 		} else if (values[i]?.getTemplate) {
 			outStr += values[i].getTemplate();
 		} else if (typeof values[i] === "object") {
-			const propertyUId = storeValue(values[i]);
-			outStr += `${propertyUId}`;
+			if (values[i].isA?.("sap.ui.model.Context")) {
+				outStr += values[i].getPath();
+			} else {
+				const propertyUId = storeValue(values[i]);
+				outStr += `${propertyUId}`;
+			}
+		} else if (values[i] && typeof values[i] === "string" && !values[i].startsWith("<") && !values[i].startsWith("&lt;")) {
+			outStr += escapeXMLAttributeValue(values[i]);
 		} else {
 			outStr += values[i];
 		}