@sapui5/sap.fe.core 1.99.0 → 1.101.1

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

@@ -1,243 +1,436 @@
-import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
+import merge from "sap/base/util/merge";
 import ObjectPath from "sap/base/util/ObjectPath";
-import deepClone from "sap/base/util/deepClone";
-import ElementMetadata from "sap/ui/core/ElementMetadata";
-import RenderManager from "sap/ui/core/RenderManager";
-
-const ensureMetadata = function(target: any) {
-	if (!target.hasOwnProperty("metadata")) {
-		target.metadata = deepClone(
-			target.metadata || {
-				properties: {},
-				macroContexts: {},
-				aggregations: {},
-				associations: {},
-				methods: {},
-				events: {}
-			}
-		);
-	}
+import uid from "sap/base/util/uid";
+import UI5Event from "sap/ui/base/Event";
+import Metadata from "sap/ui/base/Metadata";
+import ControllerExtension from "sap/ui/core/mvc/ControllerExtension";
+import ControllerMetadata from "sap/ui/core/mvc/ControllerMetadata";
+import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
+
+type OverrideDefinition = Record<string, Function>;
+type UI5ControllerMethodDefinition = {
+	overrideExecution?: OverrideExecution;
+	public?: boolean;
+	final?: boolean;
+};
+type UI5PropertyMetadata = {
+	type: string;
+	required?: boolean;
+	group?: string;
+	defaultValue?: any;
+};
+type UI5AggregationMetadata = {
+	type: string;
+	multiple?: boolean;
+	isDefault?: boolean;
+	singularName?: string;
+	visibility?: string;
+};
+type UI5AssociationMetadata = {
+	type: string;
+	multiple?: boolean;
+	singularName?: string;
+};
+type UI5ControlMetadataDefinition = {
+	defaultAggregation?: string;
+	controllerExtensions: Record<string, typeof ControllerExtension | Function>;
+	properties: Record<string, UI5PropertyMetadata>;
+	macroContexts: Record<string, UI5PropertyMetadata>;
+	aggregations: Record<string, UI5AggregationMetadata>;
+	associations: Record<string, UI5AssociationMetadata>;
+	methods: Record<string, UI5ControllerMethodDefinition>;
+	events: Record<string, {}>;
+	interfaces: string[];
+};
+type UI5Controller = {
+	override?: { extension?: Record<string, OverrideDefinition> } & {
+		[k: string]: Function;
+	};
+	metadata?: UI5ControlMetadataDefinition;
+};
+
+type UI5Control = {
+	metadata?: UI5ControlMetadataDefinition;
+};
+
+type UI5APIControl = UI5Control & {
+	getAPI(event: UI5Event): UI5APIControl;
+	[k: string]: Function;
+};
+
+type ControlPropertyNames<T> = {
+	[K in keyof T]: T[K] extends Function ? never : K;
+}[keyof T];
+export type PropertiesOf<T> = Partial<Pick<T, ControlPropertyNames<T>>>;
+export type EnhanceWithUI5<T> = T & {
+	// Add all the getXXX method, might add too much as i'm not filtering on actual properties actually...
+	[P in keyof T as `get${Capitalize<string & P>}`]: () => T[P];
+};
+const ensureMetadata = function (target: UI5Controller) {
+	target.metadata = merge(
+		{
+			controllerExtensions: {},
+			properties: {},
+			macroContexts: {},
+			aggregations: {},
+			associations: {},
+			methods: {},
+			events: {},
+			interfaces: []
+		},
+		target.metadata || {}
+	) as UI5ControlMetadataDefinition;
 	return target.metadata;
 };
-export function Override(sTarget?: string) {
-	return function(target: any, propertyKey: string) {
+
+/* #region CONTROLLER EXTENSIONS */
+
+/**
+ * Defines that the following method is an override for the method name with the same name in the specific controller extension or base implementation.
+ *
+ * @param extensionName The name of the extension that will be overriden
+ * @returns The decorated method
+ */
+export function methodOverride(extensionName?: string): MethodDecorator {
+	return function (target: UI5Controller, propertyKey) {
 		if (!target.override) {
 			target.override = {};
 		}
 		let currentTarget = target.override;
-		if (sTarget) {
+		if (extensionName) {
 			if (!currentTarget.extension) {
 				currentTarget.extension = {};
 			}
-			if (!currentTarget.extension[sTarget]) {
-				currentTarget.extension[sTarget] = {};
+			if (!currentTarget.extension[extensionName]) {
+				currentTarget.extension[extensionName] = {};
 			}
-			currentTarget = currentTarget.extension[sTarget];
+			currentTarget = currentTarget.extension[extensionName];
 		}
-		currentTarget[propertyKey] = target[propertyKey];
+		currentTarget[propertyKey.toString()] = (target as any)[propertyKey.toString()];
 	};
 }
-export function Extensible(oOverrideExecution?: OverrideExecution) {
-	return function(target: any, propertyKey: string) {
+
+/**
+ * Defines that the method can be extended by other controller extension based on the defined overrideExecutionType.
+ *
+ * @param overrideExecutionType The OverrideExecution defining when the override should run (Before / After / Instead)
+ * @returns The decorated method
+ */
+export function extensible(overrideExecutionType?: OverrideExecution): MethodDecorator {
+	return function (target: UI5Controller, propertyKey) {
 		const metadata = ensureMetadata(target);
-		if (!metadata.methods[propertyKey]) {
-			metadata.methods[propertyKey] = {};
+		if (!metadata.methods[propertyKey.toString()]) {
+			metadata.methods[propertyKey.toString()] = {};
 		}
-		metadata.methods[propertyKey].overrideExecution = oOverrideExecution;
+		metadata.methods[propertyKey.toString()].overrideExecution = overrideExecutionType;
 	};
 }
-export function Public(target: any, propertyKey: string) {
-	const metadata = ensureMetadata(target);
-	if (!metadata.methods[propertyKey]) {
-		metadata.methods[propertyKey] = {};
-	}
-	metadata.methods[propertyKey].public = true;
+
+/**
+ * Defines that the method will be publicly available for controller extension usage.
+ *
+ * @returns The decorated method
+ */
+export function publicExtension(): MethodDecorator {
+	return function (target: UI5Controller, propertyKey, descriptor): void {
+		const metadata = ensureMetadata(target);
+		descriptor.enumerable = true;
+		if (!metadata.methods[propertyKey.toString()]) {
+			metadata.methods[propertyKey.toString()] = {};
+		}
+		metadata.methods[propertyKey.toString()].public = true;
+	};
 }
-export function Private(target: any, propertyKey: string) {
-	const metadata = ensureMetadata(target);
-	if (!metadata.methods[propertyKey]) {
-		metadata.methods[propertyKey] = {};
-	}
-	metadata.methods[propertyKey].public = false;
+/**
+ * Defines that the method will be only available for internal usage of the controller extension.
+ *
+ * @returns The decorated method
+ */
+export function privateExtension(): MethodDecorator {
+	return function (target: UI5Controller, propertyKey, descriptor) {
+		const metadata = ensureMetadata(target);
+		descriptor.enumerable = true;
+		if (!metadata.methods[propertyKey.toString()]) {
+			metadata.methods[propertyKey.toString()] = {};
+		}
+		metadata.methods[propertyKey.toString()].public = false;
+	};
 }
-export function Final(target: any, propertyKey: string) {
-	const metadata = ensureMetadata(target);
-	if (!metadata.methods[propertyKey]) {
-		metadata.methods[propertyKey] = {};
-	}
-	metadata.methods[propertyKey].final = true;
+/**
+ * Defines that the method cannot be further extended by other controller extension.
+ *
+ * @returns The decorated method
+ */
+export function finalExtension(): MethodDecorator {
+	return function (target: UI5Controller, propertyKey, descriptor) {
+		const metadata = ensureMetadata(target);
+		descriptor.enumerable = true;
+		if (!metadata.methods[propertyKey.toString()]) {
+			metadata.methods[propertyKey.toString()] = {};
+		}
+		metadata.methods[propertyKey.toString()].final = true;
+	};
 }
 
-export function Event(target: any, eventKey: string) {
-	const metadata = ensureMetadata(target);
-	if (!metadata.events[eventKey]) {
-		metadata.events[eventKey] = {};
-	}
+/**
+ * Defines that we are going to use instantiate a controller extension under the following variable name.
+ *
+ * @param extensionClass The controller extension that will be instantiated
+ * @returns The decorated property
+ */
+export function usingExtension(extensionClass: typeof ControllerExtension | Function): PropertyDecorator {
+	return function (target: UI5Controller, propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<any>) {
+		const metadata = ensureMetadata(target);
+		delete (propertyDescriptor as any).initializer;
+		metadata.controllerExtensions[propertyKey.toString()] = extensionClass;
+		return propertyDescriptor;
+	} as any; // This is technically an accessor decorator, but somehow the compiler doesn't like it if i declare it as such.
 }
 
-export function EventHandler(target: any, propertykey: any) {
-	target.constructor[propertykey] = function(...args: any[]) {
-		const currentTarget = target.constructor.getAPI(args[0] as UI5Event);
-		currentTarget[propertykey](...args);
-	};
-}
+/* #endregion */
 
-export function MacroContext(bMetaModelObject: boolean = false): any {
-	return Property({ type: "sap.ui.model.Context", macroContext: true, metaModelObject: bMetaModelObject });
+/* #region CONTROL */
+/**
+ * Indicates that the property shall be declared as an event on the control metadata.
+ *
+ * @returns The decorated property
+ */
+export function event(): PropertyDecorator {
+	return function (target: UI5Control, eventKey) {
+		const metadata = ensureMetadata(target);
+		if (!metadata.events[eventKey.toString()]) {
+			metadata.events[eventKey.toString()] = {};
+		}
+	};
 }
 
-export function Property(oPropertyParams: any): any {
-	return function(target: any, propertyKey: string, propertyDescriptor: PropertyDescriptor): any {
+/**
+ * Defines the following property in the control metatada.
+ *
+ * @param ui5PropertyMetadata The property definition
+ * @returns The decorated property.
+ */
+export function property(ui5PropertyMetadata: UI5PropertyMetadata): PropertyDecorator {
+	return function (target: UI5Control, propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<any>) {
 		const metadata = ensureMetadata(target);
-		if (oPropertyParams?.macroContext) {
-			if (!metadata.macroContexts[propertyKey]) {
-				metadata.macroContexts[propertyKey] = oPropertyParams;
-			}
-		}
 		if (!metadata.properties[propertyKey]) {
-			metadata.properties[propertyKey] = oPropertyParams;
+			metadata.properties[propertyKey] = ui5PropertyMetadata;
 		}
 		delete propertyDescriptor.writable;
 		delete (propertyDescriptor as any).initializer;
-		(propertyDescriptor as any).set = function(v: any) {
-			return this.setProperty(propertyKey, v);
-		};
-		(propertyDescriptor as any).get = function() {
-			return this.getProperty(propertyKey);
-		};
 
 		return propertyDescriptor;
-	};
+	} as any; // This is technically an accessor decorator, but somehow the compiler doesn't like it if i declare it as such.;
 }
-
-export function Aggregation(oAggregationDescriptor?: any): any {
-	return function(target: any, propertyKey: string, propertyDescriptor: PropertyDescriptor): any {
+/**
+ * Defines and configure the following aggregation in the control metatada.
+ *
+ * @param ui5AggregationMetadata The aggregation definition
+ * @returns The decorated property.
+ */
+export function aggregation(ui5AggregationMetadata: UI5AggregationMetadata): PropertyDecorator {
+	return function (target: UI5Control, propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<any>) {
 		const metadata = ensureMetadata(target);
+		if (ui5AggregationMetadata.multiple === undefined) {
+			// UI5 defaults this to true but this is just weird...
+			ui5AggregationMetadata.multiple = false;
+		}
 		if (!metadata.aggregations[propertyKey]) {
-			metadata.aggregations[propertyKey] = oAggregationDescriptor;
+			metadata.aggregations[propertyKey] = ui5AggregationMetadata;
 		}
-		if (oAggregationDescriptor.isDefault) {
+		if (ui5AggregationMetadata.isDefault) {
 			metadata.defaultAggregation = propertyKey;
 		}
 		delete propertyDescriptor.writable;
 		delete (propertyDescriptor as any).initializer;
-		(propertyDescriptor as any).set = function(v: any) {
-			return this.setAggregation(propertyKey, v);
-		};
-		(propertyDescriptor as any).get = function() {
-			return this.getAggregation(propertyKey);
-		};
 
 		return propertyDescriptor;
-	};
+	} as any; // This is technically an accessor decorator, but somehow the compiler doesn't like it if i declare it as such.;
 }
 
-export function Association(oAssociationDescription?: any): any {
-	return function(target: any, propertyKey: string, propertyDescriptor: PropertyDescriptor): any {
+/**
+ * Defines and configure the following association in the control metatada.
+ *
+ * @param ui5AssociationMetadata The definition of the association.
+ * @returns The decorated property
+ */
+export function association(ui5AssociationMetadata: UI5AssociationMetadata): PropertyDecorator {
+	return function (target: UI5Control, propertyKey: string, propertyDescriptor: TypedPropertyDescriptor<any>) {
 		const metadata = ensureMetadata(target);
 		if (!metadata.associations[propertyKey]) {
-			metadata.associations[propertyKey] = oAssociationDescription;
+			metadata.associations[propertyKey] = ui5AssociationMetadata;
 		}
 		delete propertyDescriptor.writable;
 		delete (propertyDescriptor as any).initializer;
-		(propertyDescriptor as any).set = function(v: any) {
-			return this.setAggregation(propertyKey, v);
-		};
-		(propertyDescriptor as any).get = function() {
-			return this.getAggregation(propertyKey);
-		};
 
 		return propertyDescriptor;
-	};
+	} as any; // This is technically an accessor decorator, but somehow the compiler doesn't like it if i declare it as such.;
 }
-type ControlPropertyNames<T> = {
-	[K in keyof T]: T[K] extends Function ? never : K;
-}[keyof T];
-export type PropertiesOf<T> = Partial<Pick<T, ControlPropertyNames<T>>>;
 
 /**
- * Decorator to provide a new API class to be used in the macros.
+ * Defines in the metadata that this control implements a specific interface.
  *
- * @param sTarget The fully qualified name of the macro API
- * @param isDependentBound Whether this API will be used as a dependent or not
- * @class
+ * @param interfaceName The name of the implemented interface
+ * @returns The decorated method
  */
-export function APIClass(sTarget: string, isDependentBound = false) {
-	return function(constructor: Function) {
-		if (!constructor.prototype.metadata) {
-			constructor.prototype.metadata = {};
-		}
+export function implementInterface(interfaceName: string): PropertyDecorator {
+	return function (target: UI5Control) {
+		const metadata = ensureMetadata(target);
 
-		if (!constructor.prototype.metadata.interfaces) {
-			constructor.prototype.metadata.interfaces = [];
-		}
-		constructor.prototype.metadata.interfaces.push("sap.ui.core.IFormContent");
-		(constructor as any).isDependentBound = isDependentBound;
-		if (!constructor.prototype.renderer) {
-			constructor.prototype.renderer = {
-				apiVersion: 2,
-				render: function(oRm: RenderManager, oControl: any) {
-					oRm.renderControl(oControl.getContent());
-				}
-			};
-		}
+		metadata.interfaces.push(interfaceName);
+	};
+}
 
-		describe(constructor, sTarget, constructor.prototype, ElementMetadata);
+/**
+ * Indicates that the following method should also be exposed statically so we can call it from the XML.
+ *
+ * @returns The decorated method
+ */
+export function xmlEventHandler(): MethodDecorator {
+	return function (target: UI5Control, propertykey) {
+		const currentConstructor: UI5APIControl = target.constructor as unknown as UI5APIControl;
+		currentConstructor[propertykey.toString()] = function (...args: any[]) {
+			const currentTarget = currentConstructor.getAPI(args[0] as UI5Event);
+			currentTarget[propertykey.toString()](...args);
+		};
 	};
 }
-export function UI5Class(sTarget: string, metadataClass?: any, metadataDefinition?: any) {
-	return function(constructor: Function) {
+
+/**
+ * Indicates that the following class should define a ui5 control of the specified name.
+ *
+ * @param sTarget The fully qualified name of the macro API
+ * @param metadataDefinition Inline metadata definition
+ * @class
+ */
+export function defineUI5Class(sTarget: string, metadataDefinition?: any): ClassDecorator {
+	return function (constructor: Function) {
 		if (!constructor.prototype.metadata) {
 			constructor.prototype.metadata = {};
 		}
-		if (metadataDefinition?.properties) {
-			constructor.prototype.metadata.properties = metadataDefinition.properties;
-		}
-		if (metadataDefinition?.events) {
-			constructor.prototype.metadata.events = metadataDefinition.events;
+		if (metadataDefinition) {
+			for (const key in metadataDefinition) {
+				constructor.prototype.metadata[key] = metadataDefinition[key as keyof UI5ControlMetadataDefinition];
+			}
 		}
-		describe(constructor, sTarget, constructor.prototype, metadataClass);
+		return registerUI5Metadata(constructor, sTarget, constructor.prototype);
 	};
 }
 
-function describe(clazz: any, name: string, inObj: any, metadataClass?: any) {
+/**
+ * Internal heavy lifting that will take care of creating the class property for ui5 to use.
+ *
+ * @param clazz The class prototype
+ * @param name The name of the class to create
+ * @param inObj The metadata object
+ * @returns The metadata class
+ */
+function registerUI5Metadata(clazz: any, name: string, inObj: any): any {
+	if (clazz.getMetadata && clazz.getMetadata().isA("sap.ui.core.mvc.ControllerExtension")) {
+		Object.getOwnPropertyNames(inObj).forEach((objName) => {
+			const descriptor = Object.getOwnPropertyDescriptor(inObj, objName);
+			if (descriptor && !descriptor.enumerable) {
+				descriptor.enumerable = true;
+				//		Log.error(`Property ${objName} from ${name} should be decorated as public`);
+			}
+		});
+	}
 	const obj: any = {};
 	obj.metadata = inObj.metadata || {};
 	obj.override = inObj.override;
 	obj.constructor = clazz;
-	obj.metadata.baseType = Object.getPrototypeOf(clazz.prototype)
-		.getMetadata()
-		.getName();
-	obj.renderer = inObj.renderer || clazz.renderer;
+	obj.metadata.baseType = Object.getPrototypeOf(clazz.prototype).getMetadata().getName();
+
+	if (clazz?.getMetadata()?.getStereotype() === "control") {
+		const rendererDefinition = inObj.renderer || clazz.renderer || clazz.render;
+		obj.renderer = { apiVersion: 2 };
+		if (typeof rendererDefinition === "function") {
+			obj.renderer.render = rendererDefinition;
+		} else if (rendererDefinition != undefined) {
+			obj.renderer = rendererDefinition;
+		}
+	}
 	obj.metadata.interfaces = inObj.metadata?.interfaces || clazz.metadata?.interfaces;
-	let metadata: any;
-	if (metadataClass) {
-		metadata = new metadataClass(name, obj);
-	} else {
-		metadata = new ElementMetadata(name, obj);
+	Object.keys(clazz.prototype).forEach((key) => {
+		if (key !== "metadata") {
+			try {
+				obj[key] = clazz.prototype[key];
+			} catch (e) {
+				//console.log(e);
+			}
+		}
+	});
+	if (obj.metadata?.controllerExtensions && Object.keys(obj.metadata.controllerExtensions).length > 0) {
+		for (const cExtName in obj.metadata.controllerExtensions) {
+			obj[cExtName] = obj.metadata.controllerExtensions[cExtName];
+		}
 	}
-	clazz.getMetadata = clazz.prototype.getMetadata = function() {
-		return metadata;
-	};
-	const fnInit = clazz.prototype.init;
-	clazz.prototype.init = function(...args: any[]) {
+	const output = clazz.extend(name, obj);
+	const fnInit = output.prototype.init;
+	output.prototype.init = function (...args: any[]) {
 		fnInit && fnInit.apply(this, args);
+		this.metadata = obj.metadata;
+
 		if (obj.metadata.properties) {
 			const aPropertyKeys = Object.keys(obj.metadata.properties);
-			// eslint-disable-next-line @typescript-eslint/no-this-alias
-			const that = this;
-			aPropertyKeys.forEach(propertyKey => {
-				Object.defineProperty(that, propertyKey, {
+			aPropertyKeys.forEach((propertyKey) => {
+				Object.defineProperty(this, propertyKey, {
+					configurable: true,
+					set: (v: any) => {
+						return this.setProperty(propertyKey, v);
+					},
+					get: () => {
+						return this.getProperty(propertyKey);
+					}
+				});
+			});
+			const aAggregationKeys = Object.keys(obj.metadata.aggregations);
+			aAggregationKeys.forEach((aggregationKey) => {
+				Object.defineProperty(this, aggregationKey, {
+					configurable: true,
+					set: (v: any) => {
+						return this.setAggregation(aggregationKey, v);
+					},
+					get: () => {
+						const aggregationContent = this.getAggregation(aggregationKey);
+						if (obj.metadata.aggregations[aggregationKey].multiple) {
+							return aggregationContent || [];
+						} else {
+							return aggregationContent;
+						}
+					}
+				});
+			});
+			const aAssociationKeys = Object.keys(obj.metadata.associations);
+			aAssociationKeys.forEach((associationKey) => {
+				Object.defineProperty(this, associationKey, {
 					configurable: true,
 					set: (v: any) => {
-						return that.setProperty(propertyKey, v);
+						return this.setAssociation(associationKey, v);
 					},
 					get: () => {
-						return that.getProperty(propertyKey);
+						const aggregationContent = this.getAssociation(associationKey);
+						if (obj.metadata.associations[associationKey].multiple) {
+							return aggregationContent || [];
+						} else {
+							return aggregationContent;
+						}
 					}
 				});
 			});
 		}
 	};
-	ObjectPath.set(name, clazz);
+	clazz.override = function (oExtension: any) {
+		const pol = {};
+		(pol as any).constructor = function (...args: any[]) {
+			return clazz.apply(this, args as any);
+		};
+		const oClass = (Metadata as any).createClass(clazz, "anonymousExtension~" + uid(), pol, ControllerMetadata);
+		oClass.getMetadata()._staticOverride = oExtension;
+		oClass.getMetadata()._override = (clazz.getMetadata() as any)._override;
+		return oClass;
+	};
+
+	ObjectPath.set(name, output);
+	return output;
 }

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

@@ -5,6 +5,8 @@
 sap.ui.define(["sap/ui/base/BindingParser"], function (BindingParser) {
   "use strict";
 
+  var _exports = {};
+
   function getObject(oObject, sPath) {
     if (!oObject) {
       return null;
@@ -58,8 +60,7 @@ sap.ui.define(["sap/ui/base/BindingParser"], function (BindingParser) {
     return sAnnotationPath;
   }
 
-  return {
-    resolveDynamicExpression: resolveDynamicExpression
-  };
+  _exports.resolveDynamicExpression = resolveDynamicExpression;
+  return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkR5bmFtaWNBbm5vdGF0aW9uUGF0aEhlbHBlci50cyJdLCJuYW1lcyI6WyJnZXRPYmplY3QiLCJvT2JqZWN0Iiwic1BhdGgiLCJzUGF0aFNwbGl0Iiwic3BsaXQiLCJsZW5ndGgiLCJzcGxpY2UiLCJqb2luIiwicmVzb2x2ZUR5bmFtaWNFeHByZXNzaW9uIiwic0Fubm90YXRpb25QYXRoIiwib01ldGFNb2RlbCIsImluZGV4T2YiLCJmaXJzdEJyYWNrZXQiLCJzU3RhYmxlQnJhY2tldCIsInN1YnN0ciIsInNSZXN0IiwibGFzdEJyYWNrZXQiLCJhVmFsdWUiLCJvRXhwcmVzc2lvbiIsIkJpbmRpbmdQYXJzZXIiLCJwYXJzZUV4cHJlc3Npb24iLCJBcnJheSIsImlzQXJyYXkiLCJyZXN1bHQiLCJwYXJ0cyIsInBhdGgiLCJpIiwiYkZvdW5kIiwib09iamVjdFZhbHVlIiwiYlJlc3VsdCIsImZvcm1hdHRlciJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7OztBQUFBLFdBQVNBLFNBQVQsQ0FBbUJDLE9BQW5CLEVBQWlDQyxLQUFqQyxFQUFrRDtBQUNqRCxRQUFJLENBQUNELE9BQUwsRUFBYztBQUNiLGFBQU8sSUFBUDtBQUNBOztBQUNELFFBQU1FLFVBQVUsR0FBR0QsS0FBSyxDQUFDRSxLQUFOLENBQVksR0FBWixDQUFuQjs7QUFDQSxRQUFJRCxVQUFVLENBQUNFLE1BQVgsS0FBc0IsQ0FBMUIsRUFBNkI7QUFDNUIsYUFBT0osT0FBTyxDQUFDQyxLQUFELENBQWQ7QUFDQSxLQUZELE1BRU87QUFDTixhQUFPRixTQUFTLENBQUNDLE9BQU8sQ0FBQ0UsVUFBVSxDQUFDLENBQUQsQ0FBWCxDQUFSLEVBQXlCQSxVQUFVLENBQUNHLE1BQVgsQ0FBa0IsQ0FBbEIsRUFBcUJDLElBQXJCLENBQTBCLEdBQTFCLENBQXpCLENBQWhCO0FBQ0E7QUFDRDtBQUNEO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOzs7QUFDQSxXQUFTQyx3QkFBVCxDQUFrQ0MsZUFBbEMsRUFBd0RDLFVBQXhELEVBQXlFO0FBQ3hFLFFBQUlELGVBQWUsQ0FBQ0UsT0FBaEIsQ0FBd0IsR0FBeEIsTUFBaUMsQ0FBQyxDQUF0QyxFQUF5QztBQUN4QyxVQUFNQyxZQUFZLEdBQUdILGVBQWUsQ0FBQ0UsT0FBaEIsQ0FBd0IsR0FBeEIsQ0FBckI7QUFDQSxVQUFNRSxjQUFjLEdBQUdKLGVBQWUsQ0FBQ0ssTUFBaEIsQ0FBdUIsQ0FBdkIsRUFBMEJGLFlBQTFCLENBQXZCO0FBQ0EsVUFBTUcsS0FBSyxHQUFHTixlQUFlLENBQUNLLE1BQWhCLENBQXVCRixZQUFZLEdBQUcsQ0FBdEMsQ0FBZDtBQUNBLFVBQU1JLFdBQVcsR0FBR0QsS0FBSyxDQUFDSixPQUFOLENBQWMsR0FBZCxDQUFwQjtBQUNBLFVBQU1NLE1BQU0sR0FBR1AsVUFBVSxDQUFDVixTQUFYLENBQXFCYSxjQUFyQixDQUFmO0FBQ0EsVUFBTUssV0FBVyxHQUFHQyxhQUFhLENBQUNDLGVBQWQsQ0FBOEJMLEtBQUssQ0FBQ0QsTUFBTixDQUFhLENBQWIsRUFBZ0JFLFdBQWhCLENBQTlCLENBQXBCOztBQUNBLFVBQ0NLLEtBQUssQ0FBQ0MsT0FBTixDQUFjTCxNQUFkLEtBQ0FDLFdBREEsSUFFQUEsV0FBVyxDQUFDSyxNQUZaLElBR0FMLFdBQVcsQ0FBQ0ssTUFBWixDQUFtQkMsS0FIbkIsSUFJQU4sV0FBVyxDQUFDSyxNQUFaLENBQW1CQyxLQUFuQixDQUF5QixDQUF6QixDQUpBLElBS0FOLFdBQVcsQ0FBQ0ssTUFBWixDQUFtQkMsS0FBbkIsQ0FBeUIsQ0FBekIsRUFBNEJDLElBTjdCLEVBT0U7QUFDRCxZQUFJQyxDQUFKO0FBQ0EsWUFBSUMsTUFBTSxHQUFHLEtBQWI7O0FBQ0EsYUFBS0QsQ0FBQyxHQUFHLENBQVQsRUFBWUEsQ0FBQyxHQUFHVCxNQUFNLENBQUNaLE1BQVgsSUFBcUIsQ0FBQ3NCLE1BQWxDLEVBQTBDRCxDQUFDLEVBQTNDLEVBQStDO0FBQzlDLGNBQU1FLFlBQVksR0FBRzVCLFNBQVMsQ0FBQ2lCLE1BQU0sQ0FBQ1MsQ0FBRCxDQUFQLEVBQVlSLFdBQVcsQ0FBQ0ssTUFBWixDQUFtQkMsS0FBbkIsQ0FBeUIsQ0FBekIsRUFBNEJDLElBQXhDLENBQTlCO0FBQ0EsY0FBTUksT0FBTyxHQUFHWCxXQUFXLENBQUNLLE1BQVosQ0FBbUJPLFNBQW5CLENBQTZCRixZQUE3QixDQUFoQjs7QUFDQSxjQUFJQyxPQUFKLEVBQWE7QUFDWkYsWUFBQUEsTUFBTSxHQUFHLElBQVQ7QUFDQTtBQUNEOztBQUNELFlBQUlBLE1BQUosRUFBWTtBQUNYbEIsVUFBQUEsZUFBZSxHQUFHRCx3QkFBd0IsQ0FBQ0ssY0FBYyxJQUFJYSxDQUFDLEdBQUcsQ0FBUixDQUFkLEdBQTJCWCxLQUFLLENBQUNELE1BQU4sQ0FBYUUsV0FBVyxHQUFHLENBQTNCLENBQTVCLEVBQTJETixVQUEzRCxDQUExQztBQUNBO0FBQ0Q7QUFDRDs7QUFDRCxXQUFPRCxlQUFQO0FBQ0E7O1NBRWM7QUFDZEQsSUFBQUEsd0JBQXdCLEVBQUVBO0FBRFosRyIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEJpbmRpbmdQYXJzZXIgZnJvbSBcInNhcC91aS9iYXNlL0JpbmRpbmdQYXJzZXJcIjtcblxuZnVuY3Rpb24gZ2V0T2JqZWN0KG9PYmplY3Q6IGFueSwgc1BhdGg6IGFueSk6IGFueSB7XG5cdGlmICghb09iamVjdCkge1xuXHRcdHJldHVybiBudWxsO1xuXHR9XG5cdGNvbnN0IHNQYXRoU3BsaXQgPSBzUGF0aC5zcGxpdChcIi9cIik7XG5cdGlmIChzUGF0aFNwbGl0Lmxlbmd0aCA9PT0gMSkge1xuXHRcdHJldHVybiBvT2JqZWN0W3NQYXRoXTtcblx0fSBlbHNlIHtcblx0XHRyZXR1cm4gZ2V0T2JqZWN0KG9PYmplY3Rbc1BhdGhTcGxpdFswXV0sIHNQYXRoU3BsaXQuc3BsaWNlKDEpLmpvaW4oXCIvXCIpKTtcblx0fVxufVxuLyoqXG4gKiBSZXNvbHZlIGEgZHluYW1pYyBhbm5vdGF0aW9uIHBhdGggZG93biB0byBhIHN0YW5kYXJkIGFubm90YXRpb24gcGF0aC5cbiAqXG4gKiBAcGFyYW0gc0Fubm90YXRpb25QYXRoXG4gKiBAcGFyYW0gb01ldGFNb2RlbFxuICogQHJldHVybnMge3N0cmluZ30gVGhlIG5vbiBkeW5hbWljIHZlcnNpb24gb2YgdGhlIGFubm90YXRpb24gcGF0aFxuICovXG5mdW5jdGlvbiByZXNvbHZlRHluYW1pY0V4cHJlc3Npb24oc0Fubm90YXRpb25QYXRoOiBhbnksIG9NZXRhTW9kZWw6IGFueSkge1xuXHRpZiAoc0Fubm90YXRpb25QYXRoLmluZGV4T2YoXCJbXCIpICE9PSAtMSkge1xuXHRcdGNvbnN0IGZpcnN0QnJhY2tldCA9IHNBbm5vdGF0aW9uUGF0aC5pbmRleE9mKFwiW1wiKTtcblx0XHRjb25zdCBzU3RhYmxlQnJhY2tldCA9IHNBbm5vdGF0aW9uUGF0aC5zdWJzdHIoMCwgZmlyc3RCcmFja2V0KTtcblx0XHRjb25zdCBzUmVzdCA9IHNBbm5vdGF0aW9uUGF0aC5zdWJzdHIoZmlyc3RCcmFja2V0ICsgMSk7XG5cdFx0Y29uc3QgbGFzdEJyYWNrZXQgPSBzUmVzdC5pbmRleE9mKFwiXVwiKTtcblx0XHRjb25zdCBhVmFsdWUgPSBvTWV0YU1vZGVsLmdldE9iamVjdChzU3RhYmxlQnJhY2tldCk7XG5cdFx0Y29uc3Qgb0V4cHJlc3Npb24gPSBCaW5kaW5nUGFyc2VyLnBhcnNlRXhwcmVzc2lvbihzUmVzdC5zdWJzdHIoMCwgbGFzdEJyYWNrZXQpKTtcblx0XHRpZiAoXG5cdFx0XHRBcnJheS5pc0FycmF5KGFWYWx1ZSkgJiZcblx0XHRcdG9FeHByZXNzaW9uICYmXG5cdFx0XHRvRXhwcmVzc2lvbi5yZXN1bHQgJiZcblx0XHRcdG9FeHByZXNzaW9uLnJlc3VsdC5wYXJ0cyAmJlxuXHRcdFx0b0V4cHJlc3Npb24ucmVzdWx0LnBhcnRzWzBdICYmXG5cdFx0XHRvRXhwcmVzc2lvbi5yZXN1bHQucGFydHNbMF0ucGF0aFxuXHRcdCkge1xuXHRcdFx0bGV0IGk7XG5cdFx0XHRsZXQgYkZvdW5kID0gZmFsc2U7XG5cdFx0XHRmb3IgKGkgPSAwOyBpIDwgYVZhbHVlLmxlbmd0aCAmJiAhYkZvdW5kOyBpKyspIHtcblx0XHRcdFx0Y29uc3Qgb09iamVjdFZhbHVlID0gZ2V0T2JqZWN0KGFWYWx1ZVtpXSwgb0V4cHJlc3Npb24ucmVzdWx0LnBhcnRzWzBdLnBhdGgpO1xuXHRcdFx0XHRjb25zdCBiUmVzdWx0ID0gb0V4cHJlc3Npb24ucmVzdWx0LmZvcm1hdHRlcihvT2JqZWN0VmFsdWUpO1xuXHRcdFx0XHRpZiAoYlJlc3VsdCkge1xuXHRcdFx0XHRcdGJGb3VuZCA9IHRydWU7XG5cdFx0XHRcdH1cblx0XHRcdH1cblx0XHRcdGlmIChiRm91bmQpIHtcblx0XHRcdFx0c0Fubm90YXRpb25QYXRoID0gcmVzb2x2ZUR5bmFtaWNFeHByZXNzaW9uKHNTdGFibGVCcmFja2V0ICsgKGkgLSAxKSArIHNSZXN0LnN1YnN0cihsYXN0QnJhY2tldCArIDEpLCBvTWV0YU1vZGVsKTtcblx0XHRcdH1cblx0XHR9XG5cdH1cblx0cmV0dXJuIHNBbm5vdGF0aW9uUGF0aDtcbn1cblxuZXhwb3J0IGRlZmF1bHQge1xuXHRyZXNvbHZlRHluYW1pY0V4cHJlc3Npb246IHJlc29sdmVEeW5hbWljRXhwcmVzc2lvblxufTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkR5bmFtaWNBbm5vdGF0aW9uUGF0aEhlbHBlci50cyJdLCJuYW1lcyI6WyJnZXRPYmplY3QiLCJvT2JqZWN0Iiwic1BhdGgiLCJzUGF0aFNwbGl0Iiwic3BsaXQiLCJsZW5ndGgiLCJzcGxpY2UiLCJqb2luIiwicmVzb2x2ZUR5bmFtaWNFeHByZXNzaW9uIiwic0Fubm90YXRpb25QYXRoIiwib01ldGFNb2RlbCIsImluZGV4T2YiLCJmaXJzdEJyYWNrZXQiLCJzU3RhYmxlQnJhY2tldCIsInN1YnN0ciIsInNSZXN0IiwibGFzdEJyYWNrZXQiLCJhVmFsdWUiLCJvRXhwcmVzc2lvbiIsIkJpbmRpbmdQYXJzZXIiLCJwYXJzZUV4cHJlc3Npb24iLCJBcnJheSIsImlzQXJyYXkiLCJyZXN1bHQiLCJwYXJ0cyIsInBhdGgiLCJpIiwiYkZvdW5kIiwib09iamVjdFZhbHVlIiwiYlJlc3VsdCIsImZvcm1hdHRlciJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7O0FBQUEsV0FBU0EsU0FBVCxDQUFtQkMsT0FBbkIsRUFBaUNDLEtBQWpDLEVBQWtEO0FBQ2pELFFBQUksQ0FBQ0QsT0FBTCxFQUFjO0FBQ2IsYUFBTyxJQUFQO0FBQ0E7O0FBQ0QsUUFBTUUsVUFBVSxHQUFHRCxLQUFLLENBQUNFLEtBQU4sQ0FBWSxHQUFaLENBQW5COztBQUNBLFFBQUlELFVBQVUsQ0FBQ0UsTUFBWCxLQUFzQixDQUExQixFQUE2QjtBQUM1QixhQUFPSixPQUFPLENBQUNDLEtBQUQsQ0FBZDtBQUNBLEtBRkQsTUFFTztBQUNOLGFBQU9GLFNBQVMsQ0FBQ0MsT0FBTyxDQUFDRSxVQUFVLENBQUMsQ0FBRCxDQUFYLENBQVIsRUFBeUJBLFVBQVUsQ0FBQ0csTUFBWCxDQUFrQixDQUFsQixFQUFxQkMsSUFBckIsQ0FBMEIsR0FBMUIsQ0FBekIsQ0FBaEI7QUFDQTtBQUNEO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7OztBQUNPLFdBQVNDLHdCQUFULENBQWtDQyxlQUFsQyxFQUF3REMsVUFBeEQsRUFBeUU7QUFDL0UsUUFBSUQsZUFBZSxDQUFDRSxPQUFoQixDQUF3QixHQUF4QixNQUFpQyxDQUFDLENBQXRDLEVBQXlDO0FBQ3hDLFVBQU1DLFlBQVksR0FBR0gsZUFBZSxDQUFDRSxPQUFoQixDQUF3QixHQUF4QixDQUFyQjtBQUNBLFVBQU1FLGNBQWMsR0FBR0osZUFBZSxDQUFDSyxNQUFoQixDQUF1QixDQUF2QixFQUEwQkYsWUFBMUIsQ0FBdkI7QUFDQSxVQUFNRyxLQUFLLEdBQUdOLGVBQWUsQ0FBQ0ssTUFBaEIsQ0FBdUJGLFlBQVksR0FBRyxDQUF0QyxDQUFkO0FBQ0EsVUFBTUksV0FBVyxHQUFHRCxLQUFLLENBQUNKLE9BQU4sQ0FBYyxHQUFkLENBQXBCO0FBQ0EsVUFBTU0sTUFBTSxHQUFHUCxVQUFVLENBQUNWLFNBQVgsQ0FBcUJhLGNBQXJCLENBQWY7QUFDQSxVQUFNSyxXQUFXLEdBQUdDLGFBQWEsQ0FBQ0MsZUFBZCxDQUE4QkwsS0FBSyxDQUFDRCxNQUFOLENBQWEsQ0FBYixFQUFnQkUsV0FBaEIsQ0FBOUIsQ0FBcEI7O0FBQ0EsVUFDQ0ssS0FBSyxDQUFDQyxPQUFOLENBQWNMLE1BQWQsS0FDQUMsV0FEQSxJQUVBQSxXQUFXLENBQUNLLE1BRlosSUFHQUwsV0FBVyxDQUFDSyxNQUFaLENBQW1CQyxLQUhuQixJQUlBTixXQUFXLENBQUNLLE1BQVosQ0FBbUJDLEtBQW5CLENBQXlCLENBQXpCLENBSkEsSUFLQU4sV0FBVyxDQUFDSyxNQUFaLENBQW1CQyxLQUFuQixDQUF5QixDQUF6QixFQUE0QkMsSUFON0IsRUFPRTtBQUNELFlBQUlDLENBQUo7QUFDQSxZQUFJQyxNQUFNLEdBQUcsS0FBYjs7QUFDQSxhQUFLRCxDQUFDLEdBQUcsQ0FBVCxFQUFZQSxDQUFDLEdBQUdULE1BQU0sQ0FBQ1osTUFBWCxJQUFxQixDQUFDc0IsTUFBbEMsRUFBMENELENBQUMsRUFBM0MsRUFBK0M7QUFDOUMsY0FBTUUsWUFBWSxHQUFHNUIsU0FBUyxDQUFDaUIsTUFBTSxDQUFDUyxDQUFELENBQVAsRUFBWVIsV0FBVyxDQUFDSyxNQUFaLENBQW1CQyxLQUFuQixDQUF5QixDQUF6QixFQUE0QkMsSUFBeEMsQ0FBOUI7QUFDQSxjQUFNSSxPQUFPLEdBQUdYLFdBQVcsQ0FBQ0ssTUFBWixDQUFtQk8sU0FBbkIsQ0FBNkJGLFlBQTdCLENBQWhCOztBQUNBLGNBQUlDLE9BQUosRUFBYTtBQUNaRixZQUFBQSxNQUFNLEdBQUcsSUFBVDtBQUNBO0FBQ0Q7O0FBQ0QsWUFBSUEsTUFBSixFQUFZO0FBQ1hsQixVQUFBQSxlQUFlLEdBQUdELHdCQUF3QixDQUFDSyxjQUFjLElBQUlhLENBQUMsR0FBRyxDQUFSLENBQWQsR0FBMkJYLEtBQUssQ0FBQ0QsTUFBTixDQUFhRSxXQUFXLEdBQUcsQ0FBM0IsQ0FBNUIsRUFBMkROLFVBQTNELENBQTFDO0FBQ0E7QUFDRDtBQUNEOztBQUNELFdBQU9ELGVBQVA7QUFDQSIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEJpbmRpbmdQYXJzZXIgZnJvbSBcInNhcC91aS9iYXNlL0JpbmRpbmdQYXJzZXJcIjtcblxuZnVuY3Rpb24gZ2V0T2JqZWN0KG9PYmplY3Q6IGFueSwgc1BhdGg6IGFueSk6IGFueSB7XG5cdGlmICghb09iamVjdCkge1xuXHRcdHJldHVybiBudWxsO1xuXHR9XG5cdGNvbnN0IHNQYXRoU3BsaXQgPSBzUGF0aC5zcGxpdChcIi9cIik7XG5cdGlmIChzUGF0aFNwbGl0Lmxlbmd0aCA9PT0gMSkge1xuXHRcdHJldHVybiBvT2JqZWN0W3NQYXRoXTtcblx0fSBlbHNlIHtcblx0XHRyZXR1cm4gZ2V0T2JqZWN0KG9PYmplY3Rbc1BhdGhTcGxpdFswXV0sIHNQYXRoU3BsaXQuc3BsaWNlKDEpLmpvaW4oXCIvXCIpKTtcblx0fVxufVxuLyoqXG4gKiBSZXNvbHZlIGEgZHluYW1pYyBhbm5vdGF0aW9uIHBhdGggZG93biB0byBhIHN0YW5kYXJkIGFubm90YXRpb24gcGF0aC5cbiAqXG4gKiBAcGFyYW0gc0Fubm90YXRpb25QYXRoXG4gKiBAcGFyYW0gb01ldGFNb2RlbFxuICogQHJldHVybnMge3N0cmluZ30gVGhlIG5vbiBkeW5hbWljIHZlcnNpb24gb2YgdGhlIGFubm90YXRpb24gcGF0aFxuICovXG5leHBvcnQgZnVuY3Rpb24gcmVzb2x2ZUR5bmFtaWNFeHByZXNzaW9uKHNBbm5vdGF0aW9uUGF0aDogYW55LCBvTWV0YU1vZGVsOiBhbnkpIHtcblx0aWYgKHNBbm5vdGF0aW9uUGF0aC5pbmRleE9mKFwiW1wiKSAhPT0gLTEpIHtcblx0XHRjb25zdCBmaXJzdEJyYWNrZXQgPSBzQW5ub3RhdGlvblBhdGguaW5kZXhPZihcIltcIik7XG5cdFx0Y29uc3Qgc1N0YWJsZUJyYWNrZXQgPSBzQW5ub3RhdGlvblBhdGguc3Vic3RyKDAsIGZpcnN0QnJhY2tldCk7XG5cdFx0Y29uc3Qgc1Jlc3QgPSBzQW5ub3RhdGlvblBhdGguc3Vic3RyKGZpcnN0QnJhY2tldCArIDEpO1xuXHRcdGNvbnN0IGxhc3RCcmFja2V0ID0gc1Jlc3QuaW5kZXhPZihcIl1cIik7XG5cdFx0Y29uc3QgYVZhbHVlID0gb01ldGFNb2RlbC5nZXRPYmplY3Qoc1N0YWJsZUJyYWNrZXQpO1xuXHRcdGNvbnN0IG9FeHByZXNzaW9uID0gQmluZGluZ1BhcnNlci5wYXJzZUV4cHJlc3Npb24oc1Jlc3Quc3Vic3RyKDAsIGxhc3RCcmFja2V0KSk7XG5cdFx0aWYgKFxuXHRcdFx0QXJyYXkuaXNBcnJheShhVmFsdWUpICYmXG5cdFx0XHRvRXhwcmVzc2lvbiAmJlxuXHRcdFx0b0V4cHJlc3Npb24ucmVzdWx0ICYmXG5cdFx0XHRvRXhwcmVzc2lvbi5yZXN1bHQucGFydHMgJiZcblx0XHRcdG9FeHByZXNzaW9uLnJlc3VsdC5wYXJ0c1swXSAmJlxuXHRcdFx0b0V4cHJlc3Npb24ucmVzdWx0LnBhcnRzWzBdLnBhdGhcblx0XHQpIHtcblx0XHRcdGxldCBpO1xuXHRcdFx0bGV0IGJGb3VuZCA9IGZhbHNlO1xuXHRcdFx0Zm9yIChpID0gMDsgaSA8IGFWYWx1ZS5sZW5ndGggJiYgIWJGb3VuZDsgaSsrKSB7XG5cdFx0XHRcdGNvbnN0IG9PYmplY3RWYWx1ZSA9IGdldE9iamVjdChhVmFsdWVbaV0sIG9FeHByZXNzaW9uLnJlc3VsdC5wYXJ0c1swXS5wYXRoKTtcblx0XHRcdFx0Y29uc3QgYlJlc3VsdCA9IG9FeHByZXNzaW9uLnJlc3VsdC5mb3JtYXR0ZXIob09iamVjdFZhbHVlKTtcblx0XHRcdFx0aWYgKGJSZXN1bHQpIHtcblx0XHRcdFx0XHRiRm91bmQgPSB0cnVlO1xuXHRcdFx0XHR9XG5cdFx0XHR9XG5cdFx0XHRpZiAoYkZvdW5kKSB7XG5cdFx0XHRcdHNBbm5vdGF0aW9uUGF0aCA9IHJlc29sdmVEeW5hbWljRXhwcmVzc2lvbihzU3RhYmxlQnJhY2tldCArIChpIC0gMSkgKyBzUmVzdC5zdWJzdHIobGFzdEJyYWNrZXQgKyAxKSwgb01ldGFNb2RlbCk7XG5cdFx0XHR9XG5cdFx0fVxuXHR9XG5cdHJldHVybiBzQW5ub3RhdGlvblBhdGg7XG59XG4iXX0=

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

@@ -18,7 +18,7 @@ function getObject(oObject: any, sPath: any): any {
  * @param oMetaModel
  * @returns {string} The non dynamic version of the annotation path
  */
-function resolveDynamicExpression(sAnnotationPath: any, oMetaModel: any) {
+export function resolveDynamicExpression(sAnnotationPath: any, oMetaModel: any) {
 	if (sAnnotationPath.indexOf("[") !== -1) {
 		const firstBracket = sAnnotationPath.indexOf("[");
 		const sStableBracket = sAnnotationPath.substr(0, firstBracket);
@@ -50,7 +50,3 @@ function resolveDynamicExpression(sAnnotationPath: any, oMetaModel: any) {
 	}
 	return sAnnotationPath;
 }
-
-export default {
-	resolveDynamicExpression: resolveDynamicExpression
-};