@sapui5/sap.fe.core 1.100.0 → 1.102.0

package/src/sap/fe/core/TemplateComponent.ts

@@ -1,126 +1,111 @@
-import UIComponent from "sap/ui/core/UIComponent";
+import AppComponent from "sap/fe/core/AppComponent";
 import CommonUtils from "sap/fe/core/CommonUtils";
-import StateUtil from "sap/ui/mdc/p13n/StateUtil";
+import { defineUI5Class, event, implementInterface, property } from "sap/fe/core/helpers/ClassSupport";
+import PageController from "sap/fe/core/PageController";
 import ComponentContainer from "sap/ui/core/ComponentContainer";
-import AppComponent from "sap/fe/core/AppComponent";
+import { IAsyncContentCreation } from "sap/ui/core/library";
 import View from "sap/ui/core/mvc/View";
-import PageController from "sap/fe/core/PageController";
+import UIComponent from "sap/ui/core/UIComponent";
+import StateUtil from "sap/ui/mdc/p13n/StateUtil";
+import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
 
-export type TemplateComponentType = UIComponent & {
-	oAppComponent: AppComponent;
-	getNavigation(): any;
-	getNavigationConfiguration(sNavigationName: string): any;
-	getBindingContextPattern(): any;
-	createDeferredContext(sPath: string, oListBinding: any, bActionCreate: boolean): any;
-	getEntitySet(): string;
-	getContextPath(): string;
-	getViewData(): any;
-	extend(sName: string, sExtension: any): any;
-};
-const TemplateComponent = UIComponent.extend("sap.fe.core.TemplateComponent", {
-	metadata: {
-		interfaces: ["sap.ui.core.IAsyncContentCreation"],
-		properties: {
-			/**
-			 * Name of the OData entity set
-			 */
-			entitySet: {
-				type: "string",
-				defaultValue: null
-			},
-			/**
-			 * Context Path for rendering the template
-			 */
-			contextPath: {
-				type: "string",
-				defaultValue: null
-			},
-			/**
-			 * The pattern for the binding context to be create based on the parameters from the navigation
-			 * If not provided we'll default to what was passed in the URL
-			 */
-			bindingContextPattern: {
-				type: "string"
-			},
-
-			/**
-			 * Map of used OData navigations and its routing targets
-			 */
-			navigation: {
-				type: "object"
-			},
-			/**
-			 * Enhance the i18n bundle used for this page with one or more app specific i18n resource bundles or resource models
-			 * or a combination of both. The last resource bundle/model is given highest priority
-			 */
-			enhanceI18n: {
-				type: "string[]"
-			},
-			/**
-			 * Define control related configuration settings
-			 */
-			controlConfiguration: {
-				type: "object"
-			},
-			/**
-			 * Adjusts the template content
-			 */
-			content: {
-				type: "object"
-			},
-			/**
-			 * Whether or not you can reach this page directly through semantic bookmarks
-			 */
-			allowDeepLinking: {
-				type: "boolean"
-			},
-			/**
-			 * Defines the context path on the component that is refreshed when the app is restored using keep alive mode
-			 */
-			refreshStrategyOnAppRestore: {
-				type: "object"
-			}
-		},
-		events: {
-			containerDefined: {
-				container: { type: "sap.ui.base.ManagedObject" }
-			},
-			heroesBatchReceived: {
-				element: { type: "sap.ui.base.ManagedObject" }
-			},
-			workersBatchReceived: {
-				element: { type: "sap.ui.base.ManagedObject" }
-			}
-		},
-		library: "sap.fe.core"
-	},
+@defineUI5Class("sap.fe.core.TemplateComponent")
+class TemplateComponent extends UIComponent implements IAsyncContentCreation {
+	@implementInterface("sap.ui.core.IAsyncContentCreation")
+	__implements__sap_ui_core_IAsyncContentCreation: boolean = true;
+
+	/**
+	 * Name of the OData entity set
+	 */
+	@property({ type: "string", defaultValue: null })
+	entitySet: string | null = null;
+
+	/**
+	 * Context Path for rendering the template
+	 */
+	@property({ type: "string", defaultValue: null })
+	contextPath: string | null = null;
+
+	/**
+	 * The pattern for the binding context to be create based on the parameters from the navigation
+	 * If not provided we'll default to what was passed in the URL
+	 */
+	@property({ type: "string" })
+	bindingContextPattern!: string;
+
+	/**
+	 * Map of used OData navigations and its routing targets
+	 */
+	@property({ type: "object" })
+	navigation: any;
+
+	/**
+	 * Enhance the i18n bundle used for this page with one or more app specific i18n resource bundles or resource models
+	 * or a combination of both. The last resource bundle/model is given highest priority
+	 */
+	@property({ type: "string[]" })
+	enhanceI18n!: string[];
+
+	/**
+	 * Define control related configuration settings
+	 */
+	@property({ type: "object" })
+	controlConfiguration: any;
 
-	setContainer: function(oContainer: ComponentContainer): UIComponent {
-		const setContainerOutput = UIComponent.prototype.setContainer.apply(this, [oContainer]);
-		(this as any).fireContainerDefined({ container: oContainer });
-		return setContainerOutput;
-	},
+	/**
+	 * Adjusts the template content
+	 */
+	@property({ type: "object" })
+	content: any;
 
-	init: function(this: TemplateComponentType) {
+	/**
+	 * Whether or not you can reach this page directly through semantic bookmarks
+	 */
+	@property({ type: "boolean" })
+	allowDeepLinking!: boolean;
+	/**
+	 * Defines the context path on the component that is refreshed when the app is restored using keep alive mode
+	 */
+	@property({ type: "object" })
+	refreshStrategyOnAppRestore: any;
+
+	@event()
+	containerDefined!: Function;
+
+	@event()
+	heroesBatchReceived!: Function;
+
+	@event()
+	workersBatchReceived!: Function;
+
+	protected oAppComponent!: AppComponent;
+
+	setContainer(oContainer: ComponentContainer): this {
+		super.setContainer(oContainer);
+		this.fireEvent("containerDefined", { container: oContainer });
+		return this;
+	}
+
+	init() {
 		this.oAppComponent = CommonUtils.getAppComponent(this);
-		UIComponent.prototype.init.apply(this);
-		const oStateChangedHandler = function(oEvent: any) {
+		super.init();
+		const oStateChangeHandler = function (oEvent: any) {
 			const oControl = oEvent.getParameter("control");
-			if (oControl.isA("sap.ui.mdc.Table") || oControl.isA("sap.ui.mdc.FilterBar")) {
+			if (oControl.isA("sap.ui.mdc.Table") || oControl.isA("sap.ui.mdc.FilterBar") || oControl.isA("sap.ui.mdc.Chart")) {
 				const oMacroAPI = oControl.getParent();
-				oMacroAPI.fireStateChanged();
+				oMacroAPI.fireStateChange();
 			}
 		};
-		StateUtil.detachStateChange(oStateChangedHandler);
-		StateUtil.attachStateChange(oStateChangedHandler);
-	},
+		StateUtil.detachStateChange(oStateChangeHandler);
+		StateUtil.attachStateChange(oStateChangeHandler);
+	}
 
 	// This method is called by UI5 core to access to the component containing the customizing configuration.
 	// as controller extensions are defined in the manifest for the app component and not for the
 	// template component we return the app component.
-	getExtensionComponent: function(this: TemplateComponentType): AppComponent {
+	getExtensionComponent(): AppComponent {
 		return this.oAppComponent;
-	},
+	}
 
 	getRootController(): any | undefined {
 		const rootControl: View = this.getRootControl() as View;
@@ -129,21 +114,21 @@ const TemplateComponent = UIComponent.extend("sap.fe.core.TemplateComponent", {
 			rootController = rootControl.getController() as PageController;
 		}
 		return rootController;
-	},
+	}
 
-	onPageReady: function(mParameters: any) {
+	onPageReady(mParameters: any) {
 		const rootController = this.getRootController();
 		if (rootController && rootController.onPageReady) {
 			rootController.onPageReady(mParameters);
 		}
-	},
+	}
 
-	getNavigationConfiguration: function(this: TemplateComponentType, sTargetPath: string): string {
-		const mNavigation = this.getNavigation();
+	getNavigationConfiguration(sTargetPath: string): any {
+		const mNavigation = this.navigation;
 		return mNavigation[sTargetPath];
-	},
+	}
 
-	getViewData: function(this: TemplateComponentType) {
+	getViewData() {
 		const mProperties = this.getMetadata().getAllProperties();
 		const oViewData = Object.keys(mProperties).reduce((mViewData: any, sPropertyName: any) => {
 			mViewData[sPropertyName] = (mProperties[sPropertyName] as any).get(this);
@@ -154,20 +139,23 @@ const TemplateComponent = UIComponent.extend("sap.fe.core.TemplateComponent", {
 		oViewData.fclEnabled = this.oAppComponent._isFclEnabled();
 
 		return oViewData;
-	},
+	}
 
-	_getPageTitleInformation: function() {
+	_getPageTitleInformation() {
 		const rootControl = this.getRootControl() as View;
 		if (rootControl && rootControl.getController() && (rootControl.getController() as any)._getPageTitleInformation) {
 			return (rootControl.getController() as any)._getPageTitleInformation();
 		} else {
 			return {};
 		}
-	},
+	}
 
-	getExtensionAPI: function() {
+	getExtensionAPI() {
 		return ((this.getRootControl() as View).getController() as any).getExtensionAPI();
 	}
-});
-
-export default (TemplateComponent as any) as TemplateComponentType;
+}
+interface TemplateComponent {
+	// TODO: this should be ideally be handled by the editflow/routing without the need to have this method in the object page - for now keep it here
+	createDeferredContext?(sPath: string, oListBinding: ODataListBinding, bActionCreate: boolean): void;
+}
+export default TemplateComponent;

package/src/sap/fe/core/TemplateModel.js

@@ -2,23 +2,21 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/base/Object", "sap/ui/model/json/JSONModel", "sap/fe/core/helpers/ClassSupport"], function (BaseObject, JSONModel, ClassSupport) {
+sap.ui.define(["sap/fe/core/helpers/ClassSupport", "sap/ui/base/Object", "sap/ui/model/json/JSONModel"], function (ClassSupport, BaseObject, JSONModel) {
   "use strict";
 
   var _dec, _class;
 
-  var UI5Class = ClassSupport.UI5Class;
-
-  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+  var defineUI5Class = ClassSupport.defineUI5Class;
 
   function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-  function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+  function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
 
   function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-  var TemplateModel = (_dec = UI5Class("sap.fe.core.TemplateModel"), _dec(_class = /*#__PURE__*/function (_BaseObject) {
-    _inherits(TemplateModel, _BaseObject);
+  var TemplateModel = (_dec = defineUI5Class("sap.fe.core.TemplateModel"), _dec(_class = /*#__PURE__*/function (_BaseObject) {
+    _inheritsLoose(TemplateModel, _BaseObject);
 
     function TemplateModel(pageConfig, oMetaModel) {
       var _this;
@@ -51,7 +49,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/ui/model/json/JSONModel", "sap/fe/core
       _this.fnCreateMetaBindingContext = _this.oMetaModel.createBindingContext.bind(_this.oMetaModel);
       _this.fnCreateConfigBindingContext = _this.oConfigModel.createBindingContext.bind(_this.oConfigModel);
       _this.oConfigModel.createBindingContext = _this.createBindingContext.bind(_assertThisInitialized(_this));
-      return _possibleConstructorReturn(_this, _this.oConfigModel);
+      return _this.oConfigModel || _assertThisInitialized(_this);
     }
 
     var _proto = TemplateModel.prototype;
@@ -78,4 +76,4 @@ sap.ui.define(["sap/ui/base/Object", "sap/ui/model/json/JSONModel", "sap/fe/core
   }(BaseObject)) || _class);
   return TemplateModel;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlRlbXBsYXRlTW9kZWwudHMiXSwibmFtZXMiOlsiVGVtcGxhdGVNb2RlbCIsIlVJNUNsYXNzIiwicGFnZUNvbmZpZyIsIm9NZXRhTW9kZWwiLCJvQ29uZmlnTW9kZWwiLCJKU09OTW9kZWwiLCJzZXRTaXplTGltaXQiLCJOdW1iZXIiLCJNQVhfVkFMVUUiLCJiQ29uZmlnTG9hZGVkIiwidGhhdCIsImZuR2V0T2JqZWN0IiwiX2dldE9iamVjdCIsImJpbmQiLCJzUGF0aCIsIm9Db250ZXh0Iiwic2V0RGF0YSIsImZuQ3JlYXRlTWV0YUJpbmRpbmdDb250ZXh0IiwiY3JlYXRlQmluZGluZ0NvbnRleHQiLCJmbkNyZWF0ZUNvbmZpZ0JpbmRpbmdDb250ZXh0IiwibVBhcmFtZXRlcnMiLCJmbkNhbGxCYWNrIiwib0JpbmRpbmdDb250ZXh0IiwiYk5vUmVzb2x2ZSIsIm5vUmVzb2x2ZSIsInNSZXNvbHZlZFBhdGgiLCJnZXRPYmplY3QiLCJkZXN0cm95IiwicHJvdG90eXBlIiwiYXBwbHkiLCJCYXNlT2JqZWN0Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7Ozs7Ozs7O01BSU1BLGEsV0FETEMsUUFBUSxDQUFDLDJCQUFELEM7OztBQVFSLDJCQUFZQyxVQUFaLEVBQTZCQyxVQUE3QixFQUF5RDtBQUFBOztBQUN4RDtBQUNBLFlBQUtBLFVBQUwsR0FBa0JBLFVBQWxCO0FBQ0EsWUFBS0MsWUFBTCxHQUFvQixJQUFJQyxTQUFKLEVBQXBCLENBSHdELENBSXhEOztBQUNBLFlBQUtELFlBQUwsQ0FBa0JFLFlBQWxCLENBQStCQyxNQUFNLENBQUNDLFNBQXRDOztBQUNBLFlBQUtDLGFBQUwsR0FBcUIsS0FBckIsQ0FOd0QsQ0FPeEQ7O0FBQ0EsVUFBTUMsSUFBSSxnQ0FBVjs7QUFFQSxVQUFJLE9BQU9SLFVBQVAsS0FBc0IsVUFBMUIsRUFBc0M7QUFDckMsWUFBTVMsV0FBVyxHQUFHLE1BQUtQLFlBQUwsQ0FBa0JRLFVBQWxCLENBQTZCQyxJQUE3QixDQUFrQyxNQUFLVCxZQUF2QyxDQUFwQjs7QUFDQSxjQUFLQSxZQUFMLENBQWtCUSxVQUFsQixHQUErQixVQUFTRSxLQUFULEVBQXFCQyxRQUFyQixFQUFvQztBQUNsRSxjQUFJLENBQUNMLElBQUksQ0FBQ0QsYUFBVixFQUF5QjtBQUN4QixpQkFBS08sT0FBTCxDQUFhZCxVQUFVLEVBQXZCO0FBQ0FRLFlBQUFBLElBQUksQ0FBQ0QsYUFBTCxHQUFxQixJQUFyQjtBQUNBOztBQUNELGlCQUFPRSxXQUFXLENBQUNHLEtBQUQsRUFBUUMsUUFBUixDQUFsQjtBQUNBLFNBTkQ7QUFPQSxPQVRELE1BU087QUFDTixjQUFLWCxZQUFMLENBQWtCWSxPQUFsQixDQUEwQmQsVUFBMUI7QUFDQTs7QUFFRCxZQUFLZSwwQkFBTCxHQUFrQyxNQUFLZCxVQUFMLENBQWdCZSxvQkFBaEIsQ0FBcUNMLElBQXJDLENBQTBDLE1BQUtWLFVBQS9DLENBQWxDO0FBQ0EsWUFBS2dCLDRCQUFMLEdBQW9DLE1BQUtmLFlBQUwsQ0FBa0JjLG9CQUFsQixDQUF1Q0wsSUFBdkMsQ0FBNEMsTUFBS1QsWUFBakQsQ0FBcEM7QUFFQSxZQUFLQSxZQUFMLENBQWtCYyxvQkFBbEIsR0FBeUMsTUFBS0Esb0JBQUwsQ0FBMEJMLElBQTFCLCtCQUF6QztBQUNBLCtDQUFPLE1BQUtULFlBQVo7QUFDQTs7OztXQUVEYyxvQixHQUFBLDhCQUFxQkosS0FBckIsRUFBaUNDLFFBQWpDLEVBQWlESyxXQUFqRCxFQUFvRUMsVUFBcEUsRUFBc0Y7QUFDckYsVUFBSUMsZUFBSjtBQUNBLFVBQU1DLFVBQVUsR0FBR0gsV0FBVyxJQUFJQSxXQUFXLENBQUNJLFNBQTlDO0FBRUFGLE1BQUFBLGVBQWUsR0FBRyxLQUFLSCw0QkFBTCxDQUFrQ0wsS0FBbEMsRUFBeUNDLFFBQXpDLEVBQW1ESyxXQUFuRCxFQUFnRUMsVUFBaEUsQ0FBbEI7QUFDQSxVQUFNSSxhQUFhLEdBQUcsQ0FBQ0YsVUFBRCxJQUFlRCxlQUFlLENBQUNJLFNBQWhCLEVBQXJDOztBQUNBLFVBQUlELGFBQWEsSUFBSSxPQUFPQSxhQUFQLEtBQXlCLFFBQTlDLEVBQXdEO0FBQ3ZESCxRQUFBQSxlQUFlLEdBQUcsS0FBS0wsMEJBQUwsQ0FBZ0NRLGFBQWhDLEVBQStDVixRQUEvQyxFQUF5REssV0FBekQsRUFBc0VDLFVBQXRFLENBQWxCO0FBQ0E7O0FBRUQsYUFBT0MsZUFBUDtBQUNBLEs7O1dBRURLLE8sR0FBQSxtQkFBVTtBQUNULFdBQUt2QixZQUFMLENBQWtCdUIsT0FBbEI7QUFDQXRCLE1BQUFBLFNBQVMsQ0FBQ3VCLFNBQVYsQ0FBb0JELE9BQXBCLENBQTRCRSxLQUE1QixDQUFrQyxJQUFsQztBQUNBLEs7OztJQXJEMEJDLFU7U0F3RGI5QixhIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQmFzZU9iamVjdCBmcm9tIFwic2FwL3VpL2Jhc2UvT2JqZWN0XCI7XG5pbXBvcnQgSlNPTk1vZGVsIGZyb20gXCJzYXAvdWkvbW9kZWwvanNvbi9KU09OTW9kZWxcIjtcbmltcG9ydCB7IFVJNUNsYXNzIH0gZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvQ2xhc3NTdXBwb3J0XCI7XG5pbXBvcnQgT0RhdGFNZXRhTW9kZWwgZnJvbSBcInNhcC91aS9tb2RlbC9vZGF0YS92NC9PRGF0YU1ldGFNb2RlbFwiO1xuXG5AVUk1Q2xhc3MoXCJzYXAuZmUuY29yZS5UZW1wbGF0ZU1vZGVsXCIpXG5jbGFzcyBUZW1wbGF0ZU1vZGVsIGV4dGVuZHMgQmFzZU9iamVjdCB7XG5cdHB1YmxpYyBvTWV0YU1vZGVsOiBPRGF0YU1ldGFNb2RlbDtcblx0cHVibGljIG9Db25maWdNb2RlbDogYW55O1xuXHRwdWJsaWMgYkNvbmZpZ0xvYWRlZDogYm9vbGVhbjtcblx0cHVibGljIGZuQ3JlYXRlTWV0YUJpbmRpbmdDb250ZXh0OiBGdW5jdGlvbjtcblx0cHVibGljIGZuQ3JlYXRlQ29uZmlnQmluZGluZ0NvbnRleHQ6IEZ1bmN0aW9uO1xuXG5cdGNvbnN0cnVjdG9yKHBhZ2VDb25maWc6IGFueSwgb01ldGFNb2RlbDogT0RhdGFNZXRhTW9kZWwpIHtcblx0XHRzdXBlcigpO1xuXHRcdHRoaXMub01ldGFNb2RlbCA9IG9NZXRhTW9kZWw7XG5cdFx0dGhpcy5vQ29uZmlnTW9kZWwgPSBuZXcgSlNPTk1vZGVsKCk7XG5cdFx0Ly8gZG9uJ3QgbGltaXQgYWdncmVnYXRpb24gYmluZGluZ3Ncblx0XHR0aGlzLm9Db25maWdNb2RlbC5zZXRTaXplTGltaXQoTnVtYmVyLk1BWF9WQUxVRSk7XG5cdFx0dGhpcy5iQ29uZmlnTG9hZGVkID0gZmFsc2U7XG5cdFx0Ly8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby10aGlzLWFsaWFzXG5cdFx0Y29uc3QgdGhhdCA9IHRoaXM7XG5cblx0XHRpZiAodHlwZW9mIHBhZ2VDb25maWcgPT09IFwiZnVuY3Rpb25cIikge1xuXHRcdFx0Y29uc3QgZm5HZXRPYmplY3QgPSB0aGlzLm9Db25maWdNb2RlbC5fZ2V0T2JqZWN0LmJpbmQodGhpcy5vQ29uZmlnTW9kZWwpO1xuXHRcdFx0dGhpcy5vQ29uZmlnTW9kZWwuX2dldE9iamVjdCA9IGZ1bmN0aW9uKHNQYXRoOiBhbnksIG9Db250ZXh0OiBhbnkpIHtcblx0XHRcdFx0aWYgKCF0aGF0LmJDb25maWdMb2FkZWQpIHtcblx0XHRcdFx0XHR0aGlzLnNldERhdGEocGFnZUNvbmZpZygpKTtcblx0XHRcdFx0XHR0aGF0LmJDb25maWdMb2FkZWQgPSB0cnVlO1xuXHRcdFx0XHR9XG5cdFx0XHRcdHJldHVybiBmbkdldE9iamVjdChzUGF0aCwgb0NvbnRleHQpO1xuXHRcdFx0fTtcblx0XHR9IGVsc2Uge1xuXHRcdFx0dGhpcy5vQ29uZmlnTW9kZWwuc2V0RGF0YShwYWdlQ29uZmlnKTtcblx0XHR9XG5cblx0XHR0aGlzLmZuQ3JlYXRlTWV0YUJpbmRpbmdDb250ZXh0ID0gdGhpcy5vTWV0YU1vZGVsLmNyZWF0ZUJpbmRpbmdDb250ZXh0LmJpbmQodGhpcy5vTWV0YU1vZGVsKTtcblx0XHR0aGlzLmZuQ3JlYXRlQ29uZmlnQmluZGluZ0NvbnRleHQgPSB0aGlzLm9Db25maWdNb2RlbC5jcmVhdGVCaW5kaW5nQ29udGV4dC5iaW5kKHRoaXMub0NvbmZpZ01vZGVsKTtcblxuXHRcdHRoaXMub0NvbmZpZ01vZGVsLmNyZWF0ZUJpbmRpbmdDb250ZXh0ID0gdGhpcy5jcmVhdGVCaW5kaW5nQ29udGV4dC5iaW5kKHRoaXMpO1xuXHRcdHJldHVybiB0aGlzLm9Db25maWdNb2RlbDtcblx0fVxuXG5cdGNyZWF0ZUJpbmRpbmdDb250ZXh0KHNQYXRoOiBhbnksIG9Db250ZXh0PzogYW55LCBtUGFyYW1ldGVycz86IGFueSwgZm5DYWxsQmFjaz86IGFueSkge1xuXHRcdGxldCBvQmluZGluZ0NvbnRleHQ7XG5cdFx0Y29uc3QgYk5vUmVzb2x2ZSA9IG1QYXJhbWV0ZXJzICYmIG1QYXJhbWV0ZXJzLm5vUmVzb2x2ZTtcblxuXHRcdG9CaW5kaW5nQ29udGV4dCA9IHRoaXMuZm5DcmVhdGVDb25maWdCaW5kaW5nQ29udGV4dChzUGF0aCwgb0NvbnRleHQsIG1QYXJhbWV0ZXJzLCBmbkNhbGxCYWNrKTtcblx0XHRjb25zdCBzUmVzb2x2ZWRQYXRoID0gIWJOb1Jlc29sdmUgJiYgb0JpbmRpbmdDb250ZXh0LmdldE9iamVjdCgpO1xuXHRcdGlmIChzUmVzb2x2ZWRQYXRoICYmIHR5cGVvZiBzUmVzb2x2ZWRQYXRoID09PSBcInN0cmluZ1wiKSB7XG5cdFx0XHRvQmluZGluZ0NvbnRleHQgPSB0aGlzLmZuQ3JlYXRlTWV0YUJpbmRpbmdDb250ZXh0KHNSZXNvbHZlZFBhdGgsIG9Db250ZXh0LCBtUGFyYW1ldGVycywgZm5DYWxsQmFjayk7XG5cdFx0fVxuXG5cdFx0cmV0dXJuIG9CaW5kaW5nQ29udGV4dDtcblx0fVxuXG5cdGRlc3Ryb3koKSB7XG5cdFx0dGhpcy5vQ29uZmlnTW9kZWwuZGVzdHJveSgpO1xuXHRcdEpTT05Nb2RlbC5wcm90b3R5cGUuZGVzdHJveS5hcHBseSh0aGlzKTtcblx0fVxufVxuXG5leHBvcnQgZGVmYXVsdCBUZW1wbGF0ZU1vZGVsO1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlRlbXBsYXRlTW9kZWwudHMiXSwibmFtZXMiOlsiVGVtcGxhdGVNb2RlbCIsImRlZmluZVVJNUNsYXNzIiwicGFnZUNvbmZpZyIsIm9NZXRhTW9kZWwiLCJvQ29uZmlnTW9kZWwiLCJKU09OTW9kZWwiLCJzZXRTaXplTGltaXQiLCJOdW1iZXIiLCJNQVhfVkFMVUUiLCJiQ29uZmlnTG9hZGVkIiwidGhhdCIsImZuR2V0T2JqZWN0IiwiX2dldE9iamVjdCIsImJpbmQiLCJzUGF0aCIsIm9Db250ZXh0Iiwic2V0RGF0YSIsImZuQ3JlYXRlTWV0YUJpbmRpbmdDb250ZXh0IiwiY3JlYXRlQmluZGluZ0NvbnRleHQiLCJmbkNyZWF0ZUNvbmZpZ0JpbmRpbmdDb250ZXh0IiwibVBhcmFtZXRlcnMiLCJmbkNhbGxCYWNrIiwib0JpbmRpbmdDb250ZXh0IiwiYk5vUmVzb2x2ZSIsIm5vUmVzb2x2ZSIsInNSZXNvbHZlZFBhdGgiLCJnZXRPYmplY3QiLCJkZXN0cm95IiwicHJvdG90eXBlIiwiYXBwbHkiLCJCYXNlT2JqZWN0Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7Ozs7OztNQUlNQSxhLFdBRExDLGNBQWMsQ0FBQywyQkFBRCxDOzs7QUFRZCwyQkFBWUMsVUFBWixFQUE2QkMsVUFBN0IsRUFBeUQ7QUFBQTs7QUFDeEQ7QUFDQSxZQUFLQSxVQUFMLEdBQWtCQSxVQUFsQjtBQUNBLFlBQUtDLFlBQUwsR0FBb0IsSUFBSUMsU0FBSixFQUFwQixDQUh3RCxDQUl4RDs7QUFDQSxZQUFLRCxZQUFMLENBQWtCRSxZQUFsQixDQUErQkMsTUFBTSxDQUFDQyxTQUF0Qzs7QUFDQSxZQUFLQyxhQUFMLEdBQXFCLEtBQXJCLENBTndELENBT3hEOztBQUNBLFVBQU1DLElBQUksZ0NBQVY7O0FBRUEsVUFBSSxPQUFPUixVQUFQLEtBQXNCLFVBQTFCLEVBQXNDO0FBQ3JDLFlBQU1TLFdBQVcsR0FBRyxNQUFLUCxZQUFMLENBQWtCUSxVQUFsQixDQUE2QkMsSUFBN0IsQ0FBa0MsTUFBS1QsWUFBdkMsQ0FBcEI7O0FBQ0EsY0FBS0EsWUFBTCxDQUFrQlEsVUFBbEIsR0FBK0IsVUFBVUUsS0FBVixFQUFzQkMsUUFBdEIsRUFBcUM7QUFDbkUsY0FBSSxDQUFDTCxJQUFJLENBQUNELGFBQVYsRUFBeUI7QUFDeEIsaUJBQUtPLE9BQUwsQ0FBYWQsVUFBVSxFQUF2QjtBQUNBUSxZQUFBQSxJQUFJLENBQUNELGFBQUwsR0FBcUIsSUFBckI7QUFDQTs7QUFDRCxpQkFBT0UsV0FBVyxDQUFDRyxLQUFELEVBQVFDLFFBQVIsQ0FBbEI7QUFDQSxTQU5EO0FBT0EsT0FURCxNQVNPO0FBQ04sY0FBS1gsWUFBTCxDQUFrQlksT0FBbEIsQ0FBMEJkLFVBQTFCO0FBQ0E7O0FBRUQsWUFBS2UsMEJBQUwsR0FBa0MsTUFBS2QsVUFBTCxDQUFnQmUsb0JBQWhCLENBQXFDTCxJQUFyQyxDQUEwQyxNQUFLVixVQUEvQyxDQUFsQztBQUNBLFlBQUtnQiw0QkFBTCxHQUFvQyxNQUFLZixZQUFMLENBQWtCYyxvQkFBbEIsQ0FBdUNMLElBQXZDLENBQTRDLE1BQUtULFlBQWpELENBQXBDO0FBRUEsWUFBS0EsWUFBTCxDQUFrQmMsb0JBQWxCLEdBQXlDLE1BQUtBLG9CQUFMLENBQTBCTCxJQUExQiwrQkFBekM7QUFDQSxhQUFPLE1BQUtULFlBQVo7QUFDQTs7OztXQUVEYyxvQixHQUFBLDhCQUFxQkosS0FBckIsRUFBaUNDLFFBQWpDLEVBQWlESyxXQUFqRCxFQUFvRUMsVUFBcEUsRUFBc0Y7QUFDckYsVUFBSUMsZUFBSjtBQUNBLFVBQU1DLFVBQVUsR0FBR0gsV0FBVyxJQUFJQSxXQUFXLENBQUNJLFNBQTlDO0FBRUFGLE1BQUFBLGVBQWUsR0FBRyxLQUFLSCw0QkFBTCxDQUFrQ0wsS0FBbEMsRUFBeUNDLFFBQXpDLEVBQW1ESyxXQUFuRCxFQUFnRUMsVUFBaEUsQ0FBbEI7QUFDQSxVQUFNSSxhQUFhLEdBQUcsQ0FBQ0YsVUFBRCxJQUFlRCxlQUFlLENBQUNJLFNBQWhCLEVBQXJDOztBQUNBLFVBQUlELGFBQWEsSUFBSSxPQUFPQSxhQUFQLEtBQXlCLFFBQTlDLEVBQXdEO0FBQ3ZESCxRQUFBQSxlQUFlLEdBQUcsS0FBS0wsMEJBQUwsQ0FBZ0NRLGFBQWhDLEVBQStDVixRQUEvQyxFQUF5REssV0FBekQsRUFBc0VDLFVBQXRFLENBQWxCO0FBQ0E7O0FBRUQsYUFBT0MsZUFBUDtBQUNBLEs7O1dBRURLLE8sR0FBQSxtQkFBVTtBQUNULFdBQUt2QixZQUFMLENBQWtCdUIsT0FBbEI7QUFDQXRCLE1BQUFBLFNBQVMsQ0FBQ3VCLFNBQVYsQ0FBb0JELE9BQXBCLENBQTRCRSxLQUE1QixDQUFrQyxJQUFsQztBQUNBLEs7OztJQXJEMEJDLFU7U0F3RGI5QixhIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBkZWZpbmVVSTVDbGFzcyB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0NsYXNzU3VwcG9ydFwiO1xuaW1wb3J0IEJhc2VPYmplY3QgZnJvbSBcInNhcC91aS9iYXNlL09iamVjdFwiO1xuaW1wb3J0IEpTT05Nb2RlbCBmcm9tIFwic2FwL3VpL21vZGVsL2pzb24vSlNPTk1vZGVsXCI7XG5pbXBvcnQgT0RhdGFNZXRhTW9kZWwgZnJvbSBcInNhcC91aS9tb2RlbC9vZGF0YS92NC9PRGF0YU1ldGFNb2RlbFwiO1xuXG5AZGVmaW5lVUk1Q2xhc3MoXCJzYXAuZmUuY29yZS5UZW1wbGF0ZU1vZGVsXCIpXG5jbGFzcyBUZW1wbGF0ZU1vZGVsIGV4dGVuZHMgQmFzZU9iamVjdCB7XG5cdHB1YmxpYyBvTWV0YU1vZGVsOiBPRGF0YU1ldGFNb2RlbDtcblx0cHVibGljIG9Db25maWdNb2RlbDogYW55O1xuXHRwdWJsaWMgYkNvbmZpZ0xvYWRlZDogYm9vbGVhbjtcblx0cHVibGljIGZuQ3JlYXRlTWV0YUJpbmRpbmdDb250ZXh0OiBGdW5jdGlvbjtcblx0cHVibGljIGZuQ3JlYXRlQ29uZmlnQmluZGluZ0NvbnRleHQ6IEZ1bmN0aW9uO1xuXG5cdGNvbnN0cnVjdG9yKHBhZ2VDb25maWc6IGFueSwgb01ldGFNb2RlbDogT0RhdGFNZXRhTW9kZWwpIHtcblx0XHRzdXBlcigpO1xuXHRcdHRoaXMub01ldGFNb2RlbCA9IG9NZXRhTW9kZWw7XG5cdFx0dGhpcy5vQ29uZmlnTW9kZWwgPSBuZXcgSlNPTk1vZGVsKCk7XG5cdFx0Ly8gZG9uJ3QgbGltaXQgYWdncmVnYXRpb24gYmluZGluZ3Ncblx0XHR0aGlzLm9Db25maWdNb2RlbC5zZXRTaXplTGltaXQoTnVtYmVyLk1BWF9WQUxVRSk7XG5cdFx0dGhpcy5iQ29uZmlnTG9hZGVkID0gZmFsc2U7XG5cdFx0Ly8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9uby10aGlzLWFsaWFzXG5cdFx0Y29uc3QgdGhhdCA9IHRoaXM7XG5cblx0XHRpZiAodHlwZW9mIHBhZ2VDb25maWcgPT09IFwiZnVuY3Rpb25cIikge1xuXHRcdFx0Y29uc3QgZm5HZXRPYmplY3QgPSB0aGlzLm9Db25maWdNb2RlbC5fZ2V0T2JqZWN0LmJpbmQodGhpcy5vQ29uZmlnTW9kZWwpO1xuXHRcdFx0dGhpcy5vQ29uZmlnTW9kZWwuX2dldE9iamVjdCA9IGZ1bmN0aW9uIChzUGF0aDogYW55LCBvQ29udGV4dDogYW55KSB7XG5cdFx0XHRcdGlmICghdGhhdC5iQ29uZmlnTG9hZGVkKSB7XG5cdFx0XHRcdFx0dGhpcy5zZXREYXRhKHBhZ2VDb25maWcoKSk7XG5cdFx0XHRcdFx0dGhhdC5iQ29uZmlnTG9hZGVkID0gdHJ1ZTtcblx0XHRcdFx0fVxuXHRcdFx0XHRyZXR1cm4gZm5HZXRPYmplY3Qoc1BhdGgsIG9Db250ZXh0KTtcblx0XHRcdH07XG5cdFx0fSBlbHNlIHtcblx0XHRcdHRoaXMub0NvbmZpZ01vZGVsLnNldERhdGEocGFnZUNvbmZpZyk7XG5cdFx0fVxuXG5cdFx0dGhpcy5mbkNyZWF0ZU1ldGFCaW5kaW5nQ29udGV4dCA9IHRoaXMub01ldGFNb2RlbC5jcmVhdGVCaW5kaW5nQ29udGV4dC5iaW5kKHRoaXMub01ldGFNb2RlbCk7XG5cdFx0dGhpcy5mbkNyZWF0ZUNvbmZpZ0JpbmRpbmdDb250ZXh0ID0gdGhpcy5vQ29uZmlnTW9kZWwuY3JlYXRlQmluZGluZ0NvbnRleHQuYmluZCh0aGlzLm9Db25maWdNb2RlbCk7XG5cblx0XHR0aGlzLm9Db25maWdNb2RlbC5jcmVhdGVCaW5kaW5nQ29udGV4dCA9IHRoaXMuY3JlYXRlQmluZGluZ0NvbnRleHQuYmluZCh0aGlzKTtcblx0XHRyZXR1cm4gdGhpcy5vQ29uZmlnTW9kZWw7XG5cdH1cblxuXHRjcmVhdGVCaW5kaW5nQ29udGV4dChzUGF0aDogYW55LCBvQ29udGV4dD86IGFueSwgbVBhcmFtZXRlcnM/OiBhbnksIGZuQ2FsbEJhY2s/OiBhbnkpIHtcblx0XHRsZXQgb0JpbmRpbmdDb250ZXh0O1xuXHRcdGNvbnN0IGJOb1Jlc29sdmUgPSBtUGFyYW1ldGVycyAmJiBtUGFyYW1ldGVycy5ub1Jlc29sdmU7XG5cblx0XHRvQmluZGluZ0NvbnRleHQgPSB0aGlzLmZuQ3JlYXRlQ29uZmlnQmluZGluZ0NvbnRleHQoc1BhdGgsIG9Db250ZXh0LCBtUGFyYW1ldGVycywgZm5DYWxsQmFjayk7XG5cdFx0Y29uc3Qgc1Jlc29sdmVkUGF0aCA9ICFiTm9SZXNvbHZlICYmIG9CaW5kaW5nQ29udGV4dC5nZXRPYmplY3QoKTtcblx0XHRpZiAoc1Jlc29sdmVkUGF0aCAmJiB0eXBlb2Ygc1Jlc29sdmVkUGF0aCA9PT0gXCJzdHJpbmdcIikge1xuXHRcdFx0b0JpbmRpbmdDb250ZXh0ID0gdGhpcy5mbkNyZWF0ZU1ldGFCaW5kaW5nQ29udGV4dChzUmVzb2x2ZWRQYXRoLCBvQ29udGV4dCwgbVBhcmFtZXRlcnMsIGZuQ2FsbEJhY2spO1xuXHRcdH1cblxuXHRcdHJldHVybiBvQmluZGluZ0NvbnRleHQ7XG5cdH1cblxuXHRkZXN0cm95KCkge1xuXHRcdHRoaXMub0NvbmZpZ01vZGVsLmRlc3Ryb3koKTtcblx0XHRKU09OTW9kZWwucHJvdG90eXBlLmRlc3Ryb3kuYXBwbHkodGhpcyk7XG5cdH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgVGVtcGxhdGVNb2RlbDtcbiJdfQ==

package/src/sap/fe/core/TemplateModel.ts

@@ -1,9 +1,9 @@
+import { defineUI5Class } from "sap/fe/core/helpers/ClassSupport";
 import BaseObject from "sap/ui/base/Object";
 import JSONModel from "sap/ui/model/json/JSONModel";
-import { UI5Class } from "sap/fe/core/helpers/ClassSupport";
 import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 
-@UI5Class("sap.fe.core.TemplateModel")
+@defineUI5Class("sap.fe.core.TemplateModel")
 class TemplateModel extends BaseObject {
 	public oMetaModel: ODataMetaModel;
 	public oConfigModel: any;
@@ -23,7 +23,7 @@ class TemplateModel extends BaseObject {
 
 		if (typeof pageConfig === "function") {
 			const fnGetObject = this.oConfigModel._getObject.bind(this.oConfigModel);
-			this.oConfigModel._getObject = function(sPath: any, oContext: any) {
+			this.oConfigModel._getObject = function (sPath: any, oContext: any) {
 				if (!that.bConfigLoaded) {
 					this.setData(pageConfig());
 					that.bConfigLoaded = true;

package/src/sap/fe/core/buildingBlocks/AttributeModel.js

@@ -0,0 +1,60 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/base/Log", "sap/base/util/ObjectPath", "sap/ui/model/json/JSONModel"], function (Log, ObjectPath, JSONModel) {
+  "use strict";
+
+  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+  function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+
+  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+  var AttributeModel = /*#__PURE__*/function (_JSONModel) {
+    _inheritsLoose(AttributeModel, _JSONModel);
+
+    function AttributeModel(oNode, oProps, buildingBlockDefinition) {
+      var _this;
+
+      _this = _JSONModel.call(this) || this;
+      _this.oNode = oNode;
+      _this.oProps = oProps;
+      _this.buildingBlockDefinition = buildingBlockDefinition;
+      _assertThisInitialized(_this).$$valueAsPromise = true;
+      return _this;
+    }
+
+    var _proto = AttributeModel.prototype;
+
+    _proto._getObject = function _getObject(sPath) {
+      if ((sPath === undefined || sPath === "") && this.oProps) {
+        return this.oProps;
+      } // just return the attribute - we can't validate them and we don't support aggregations for now
+
+
+      var oValue = ObjectPath.get(sPath.replace(/\//g, "."), this.oProps);
+
+      if (oValue !== undefined) {
+        return oValue;
+      } // Deal with undefined properties
+
+
+      if (this.oProps && this.oProps.hasOwnProperty(sPath)) {
+        return this.oProps[sPath];
+      }
+
+      if (sPath.indexOf(":") === -1 && sPath.indexOf("/") === -1) {
+        // Gloves are off, if you have this error you forgot to define your property on your metadata but are still using it in the underlying code
+        Log.error("Missing property ".concat(sPath, " on macro metadata ").concat(this.buildingBlockDefinition.name)); //throw new Error(`Missing property ${sPath} on macro metadata ${this.buildingBlockDefinition.name}`);
+      }
+
+      return this.oNode.getAttribute(sPath);
+    };
+
+    return AttributeModel;
+  }(JSONModel);
+
+  return AttributeModel;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkF0dHJpYnV0ZU1vZGVsLnRzIl0sIm5hbWVzIjpbIkF0dHJpYnV0ZU1vZGVsIiwib05vZGUiLCJvUHJvcHMiLCJidWlsZGluZ0Jsb2NrRGVmaW5pdGlvbiIsIiQkdmFsdWVBc1Byb21pc2UiLCJfZ2V0T2JqZWN0Iiwic1BhdGgiLCJ1bmRlZmluZWQiLCJvVmFsdWUiLCJPYmplY3RQYXRoIiwiZ2V0IiwicmVwbGFjZSIsImhhc093blByb3BlcnR5IiwiaW5kZXhPZiIsIkxvZyIsImVycm9yIiwibmFtZSIsImdldEF0dHJpYnV0ZSIsIkpTT05Nb2RlbCJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7OztNQUdNQSxjOzs7QUFDTCw0QkFDa0JDLEtBRGxCLEVBRWtCQyxNQUZsQixFQUdrQkMsdUJBSGxCLEVBSUU7QUFBQTs7QUFDRDtBQURDLFlBSGdCRixLQUdoQixHQUhnQkEsS0FHaEI7QUFBQSxZQUZnQkMsTUFFaEIsR0FGZ0JBLE1BRWhCO0FBQUEsWUFEZ0JDLHVCQUNoQixHQURnQkEsdUJBQ2hCO0FBRUQsb0NBQWNDLGdCQUFkLEdBQWlDLElBQWpDO0FBRkM7QUFHRDs7OztXQUNEQyxVLEdBQUEsb0JBQVdDLEtBQVgsRUFBeUM7QUFDeEMsVUFBSSxDQUFDQSxLQUFLLEtBQUtDLFNBQVYsSUFBdUJELEtBQUssS0FBSyxFQUFsQyxLQUF5QyxLQUFLSixNQUFsRCxFQUEwRDtBQUN6RCxlQUFPLEtBQUtBLE1BQVo7QUFDQSxPQUh1QyxDQUl4Qzs7O0FBQ0EsVUFBTU0sTUFBTSxHQUFHQyxVQUFVLENBQUNDLEdBQVgsQ0FBZUosS0FBSyxDQUFDSyxPQUFOLENBQWMsS0FBZCxFQUFxQixHQUFyQixDQUFmLEVBQTBDLEtBQUtULE1BQS9DLENBQWY7O0FBQ0EsVUFBSU0sTUFBTSxLQUFLRCxTQUFmLEVBQTBCO0FBQ3pCLGVBQU9DLE1BQVA7QUFDQSxPQVJ1QyxDQVN4Qzs7O0FBQ0EsVUFBSSxLQUFLTixNQUFMLElBQWUsS0FBS0EsTUFBTCxDQUFZVSxjQUFaLENBQTJCTixLQUEzQixDQUFuQixFQUFzRDtBQUNyRCxlQUFPLEtBQUtKLE1BQUwsQ0FBWUksS0FBWixDQUFQO0FBQ0E7O0FBQ0QsVUFBSUEsS0FBSyxDQUFDTyxPQUFOLENBQWMsR0FBZCxNQUF1QixDQUFDLENBQXhCLElBQTZCUCxLQUFLLENBQUNPLE9BQU4sQ0FBYyxHQUFkLE1BQXVCLENBQUMsQ0FBekQsRUFBNEQ7QUFDM0Q7QUFDQUMsUUFBQUEsR0FBRyxDQUFDQyxLQUFKLDRCQUE4QlQsS0FBOUIsZ0NBQXlELEtBQUtILHVCQUFMLENBQTZCYSxJQUF0RixHQUYyRCxDQUczRDtBQUNBOztBQUNELGFBQU8sS0FBS2YsS0FBTCxDQUFXZ0IsWUFBWCxDQUF3QlgsS0FBeEIsQ0FBUDtBQUNBLEs7OztJQTVCMkJZLFM7O1NBK0JkbEIsYyIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IExvZyBmcm9tIFwic2FwL2Jhc2UvTG9nXCI7XG5pbXBvcnQgT2JqZWN0UGF0aCBmcm9tIFwic2FwL2Jhc2UvdXRpbC9PYmplY3RQYXRoXCI7XG5pbXBvcnQgeyBCdWlsZGluZ0Jsb2NrRGVmaW5pdGlvbiB9IGZyb20gXCJzYXAvZmUvY29yZS9idWlsZGluZ0Jsb2Nrcy9CdWlsZGluZ0Jsb2NrXCI7XG5pbXBvcnQgSlNPTk1vZGVsIGZyb20gXCJzYXAvdWkvbW9kZWwvanNvbi9KU09OTW9kZWxcIjtcblxuY2xhc3MgQXR0cmlidXRlTW9kZWwgZXh0ZW5kcyBKU09OTW9kZWwge1xuXHRjb25zdHJ1Y3Rvcihcblx0XHRwcml2YXRlIHJlYWRvbmx5IG9Ob2RlOiBFbGVtZW50LFxuXHRcdHByaXZhdGUgcmVhZG9ubHkgb1Byb3BzOiBhbnksXG5cdFx0cHJpdmF0ZSByZWFkb25seSBidWlsZGluZ0Jsb2NrRGVmaW5pdGlvbjogQnVpbGRpbmdCbG9ja0RlZmluaXRpb25cblx0KSB7XG5cdFx0c3VwZXIoKTtcblx0XHQodGhpcyBhcyBhbnkpLiQkdmFsdWVBc1Byb21pc2UgPSB0cnVlO1xuXHR9XG5cdF9nZXRPYmplY3Qoc1BhdGg6IGFueSAvKm9Db250ZXh0OiBhbnkqLykge1xuXHRcdGlmICgoc1BhdGggPT09IHVuZGVmaW5lZCB8fCBzUGF0aCA9PT0gXCJcIikgJiYgdGhpcy5vUHJvcHMpIHtcblx0XHRcdHJldHVybiB0aGlzLm9Qcm9wcztcblx0XHR9XG5cdFx0Ly8ganVzdCByZXR1cm4gdGhlIGF0dHJpYnV0ZSAtIHdlIGNhbid0IHZhbGlkYXRlIHRoZW0gYW5kIHdlIGRvbid0IHN1cHBvcnQgYWdncmVnYXRpb25zIGZvciBub3dcblx0XHRjb25zdCBvVmFsdWUgPSBPYmplY3RQYXRoLmdldChzUGF0aC5yZXBsYWNlKC9cXC8vZywgXCIuXCIpLCB0aGlzLm9Qcm9wcyk7XG5cdFx0aWYgKG9WYWx1ZSAhPT0gdW5kZWZpbmVkKSB7XG5cdFx0XHRyZXR1cm4gb1ZhbHVlO1xuXHRcdH1cblx0XHQvLyBEZWFsIHdpdGggdW5kZWZpbmVkIHByb3BlcnRpZXNcblx0XHRpZiAodGhpcy5vUHJvcHMgJiYgdGhpcy5vUHJvcHMuaGFzT3duUHJvcGVydHkoc1BhdGgpKSB7XG5cdFx0XHRyZXR1cm4gdGhpcy5vUHJvcHNbc1BhdGhdO1xuXHRcdH1cblx0XHRpZiAoc1BhdGguaW5kZXhPZihcIjpcIikgPT09IC0xICYmIHNQYXRoLmluZGV4T2YoXCIvXCIpID09PSAtMSkge1xuXHRcdFx0Ly8gR2xvdmVzIGFyZSBvZmYsIGlmIHlvdSBoYXZlIHRoaXMgZXJyb3IgeW91IGZvcmdvdCB0byBkZWZpbmUgeW91ciBwcm9wZXJ0eSBvbiB5b3VyIG1ldGFkYXRhIGJ1dCBhcmUgc3RpbGwgdXNpbmcgaXQgaW4gdGhlIHVuZGVybHlpbmcgY29kZVxuXHRcdFx0TG9nLmVycm9yKGBNaXNzaW5nIHByb3BlcnR5ICR7c1BhdGh9IG9uIG1hY3JvIG1ldGFkYXRhICR7dGhpcy5idWlsZGluZ0Jsb2NrRGVmaW5pdGlvbi5uYW1lfWApO1xuXHRcdFx0Ly90aHJvdyBuZXcgRXJyb3IoYE1pc3NpbmcgcHJvcGVydHkgJHtzUGF0aH0gb24gbWFjcm8gbWV0YWRhdGEgJHt0aGlzLmJ1aWxkaW5nQmxvY2tEZWZpbml0aW9uLm5hbWV9YCk7XG5cdFx0fVxuXHRcdHJldHVybiB0aGlzLm9Ob2RlLmdldEF0dHJpYnV0ZShzUGF0aCk7XG5cdH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgQXR0cmlidXRlTW9kZWw7XG4iXX0=

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

@@ -0,0 +1,37 @@
+import Log from "sap/base/Log";
+import ObjectPath from "sap/base/util/ObjectPath";
+import { BuildingBlockDefinition } from "sap/fe/core/buildingBlocks/BuildingBlock";
+import JSONModel from "sap/ui/model/json/JSONModel";
+
+class AttributeModel extends JSONModel {
+	constructor(
+		private readonly oNode: Element,
+		private readonly oProps: any,
+		private readonly buildingBlockDefinition: BuildingBlockDefinition
+	) {
+		super();
+		(this as any).$$valueAsPromise = true;
+	}
+	_getObject(sPath: any /*oContext: any*/) {
+		if ((sPath === undefined || sPath === "") && this.oProps) {
+			return this.oProps;
+		}
+		// just return the attribute - we can't validate them and we don't support aggregations for now
+		const oValue = ObjectPath.get(sPath.replace(/\//g, "."), this.oProps);
+		if (oValue !== undefined) {
+			return oValue;
+		}
+		// Deal with undefined properties
+		if (this.oProps && this.oProps.hasOwnProperty(sPath)) {
+			return this.oProps[sPath];
+		}
+		if (sPath.indexOf(":") === -1 && sPath.indexOf("/") === -1) {
+			// Gloves are off, if you have this error you forgot to define your property on your metadata but are still using it in the underlying code
+			Log.error(`Missing property ${sPath} on macro metadata ${this.buildingBlockDefinition.name}`);
+			//throw new Error(`Missing property ${sPath} on macro metadata ${this.buildingBlockDefinition.name}`);
+		}
+		return this.oNode.getAttribute(sPath);
+	}
+}
+
+export default AttributeModel;