@sapui5/sap.fe.core 1.101.0 → 1.103.0

package/src/sap/fe/core/{RouterProxy.ts → controllerextensions/routing/RouterProxy.ts}

@@ -1,13 +1,13 @@
+import type ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
-import BaseObject from "sap/ui/base/Object";
-import Synchronization from "sap/fe/core/Synchronization";
-import URI from "sap/ui/thirdparty/URI";
-import { IShellServices } from "sap/fe/core/services/ShellServicesFactory";
-import Router from "sap/ui/core/routing/Router";
 import { defineUI5Class } from "sap/fe/core/helpers/ClassSupport";
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
-import { CoreEx } from "types/extension_types";
+import Synchronization from "sap/fe/core/helpers/Synchronization";
+import type { IShellServices } from "sap/fe/core/services/ShellServicesFactory";
+import BaseObject from "sap/ui/base/Object";
 import Core from "sap/ui/core/Core";
+import type Router from "sap/ui/core/routing/Router";
+import URI from "sap/ui/thirdparty/URI";
+import type { CoreEx } from "types/extension_types";
 
 const enumState = {
 	EQUAL: 0,
@@ -23,13 +23,13 @@ const enumURLParams = {
 /**
  * Creates a HashGuard object.
  *
- * @param {string} sGuardHash The hash used for the guard
- * @returns {object} The created hash guard
+ * @param sGuardHash The hash used for the guard
+ * @returns The created hash guard
  */
 function createGuardFromHash(sGuardHash: string) {
 	return {
 		_guardHash: sGuardHash.replace(/\?[^\?]*$/, ""), // Remove query part
-		check: function(sHash: any) {
+		check: function (sHash: any) {
 			return sHash.indexOf(this._guardHash) === 0;
 		}
 	};
@@ -37,43 +37,43 @@ function createGuardFromHash(sGuardHash: string) {
 /**
  * Returns the iAppState part from a hash (or null if not found).
  *
- * @param {string} sHash The hash
- * @returns {string} The iAppState part of the hash
+ * @param sHash The hash
+ * @returns The iAppState part of the hash
  */
 function findAppStateInHash(sHash: string): string | null {
-	const aAppState = sHash.match(new RegExp("\\?.*" + enumURLParams.IAPPSTATEPARAM + "=([^&]*)"));
+	const aAppState = sHash.match(new RegExp(`\\?.*${enumURLParams.IAPPSTATEPARAM}=([^&]*)`));
 	return aAppState && aAppState.length > 1 ? aAppState[1] : null;
 }
 /**
  * Returns a hash without its iAppState part.
  *
- * @param {string} sHash The hash
- * @returns {string} The hash without the iAppState
+ * @param sHash The hash
+ * @returns The hash without the iAppState
  */
 function removeAppStateInHash(sHash: string) {
-	return sHash.replace(new RegExp("[&?]*" + enumURLParams.IAPPSTATEPARAM + "=[^&]*"), "");
+	return sHash.replace(new RegExp(`[&?]*${enumURLParams.IAPPSTATEPARAM}=[^&]*`), "");
 }
 /**
  * Adds an iAppState inside a hash (or replaces an existing one).
  *
- * @param {*} sHash The hash
- * @param {*} sAppStateKey The iAppState to add
- * @returns {string} The hash with the app state
+ * @param sHash The hash
+ * @param sAppStateKey The iAppState to add
+ * @returns The hash with the app state
  */
 function setAppStateInHash(sHash: any, sAppStateKey: any) {
 	let sNewHash;
 
 	if (sHash.indexOf(enumURLParams.IAPPSTATEPARAM) >= 0) {
 		// If there's already an iAppState parameter in the hash, replace it
-		sNewHash = sHash.replace(new RegExp(enumURLParams.IAPPSTATEPARAM + "=[^&]*"), enumURLParams.IAPPSTATEPARAM + "=" + sAppStateKey);
+		sNewHash = sHash.replace(new RegExp(`${enumURLParams.IAPPSTATEPARAM}=[^&]*`), `${enumURLParams.IAPPSTATEPARAM}=${sAppStateKey}`);
 	} else {
 		// Add the iAppState parameter in the hash
 		if (sHash.indexOf("?") < 0) {
-			sNewHash = sHash + "?";
+			sNewHash = `${sHash}?`;
 		} else {
-			sNewHash = sHash + "&";
+			sNewHash = `${sHash}&`;
 		}
-		sNewHash += enumURLParams.IAPPSTATEPARAM + "=" + sAppStateKey;
+		sNewHash += `${enumURLParams.IAPPSTATEPARAM}=${sAppStateKey}`;
 	}
 
 	return sNewHash;
@@ -129,7 +129,7 @@ class RouterProxy extends BaseObject {
 				this._fnBlockingNavFilter = this._blockingNavigationFilter.bind(this);
 				this._oShellServices.registerNavigationFilter(this._fnBlockingNavFilter);
 			})
-			.catch(function(oError: any) {
+			.catch(function (oError: any) {
 				Log.error("Cannot retrieve the shell services", oError);
 			});
 		this._fnHashGuard = this.hashGuard.bind(this);
@@ -149,7 +149,7 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Raw initialization (for unit tests).
 	 *
-	 * @param {sap.ui.core.routing.Router} oRouter The router used by this proxy
+	 * @param oRouter The router used by this proxy
 	 */
 	initRaw(oRouter: Router) {
 		this._oRouter = oRouter;
@@ -180,7 +180,6 @@ class RouterProxy extends BaseObject {
 	 *
 	 * @function
 	 * @name sap.fe.core.RouterProxy#removeIAppStateKey
-	 *
 	 * @ui5-restricted
 	 */
 	removeIAppStateKey() {
@@ -194,12 +193,12 @@ class RouterProxy extends BaseObject {
 	 * @name sap.fe.core.RouterProxy#navToHash
 	 * @memberof sap.fe.core.RouterProxy
 	 * @static
-	 * @param {string} sHash Hash to be navigated to
-	 * @param {boolean} bPreserveHistory If set to true, non-ancestor entries in history will be retained
-	 * @param {boolean} bDisablePreservationCache If set to true, cache preservation mechanism is disabled for the current navigation
-	 * @param {boolean} bForceFocus If set to true, the logic to set the focus once the navigation is finalized will be triggered (onPageReady)
-	 * @param {boolean} bPreserveShellBackNavigationHandler If not set to false, the back navigation is set to undefined
-	 * @returns {Promise} Promise (resolved when the navigation is finalized) that returns 'true' if a navigation took place, 'false' if the navigation didn't happen
+	 * @param sHash Hash to be navigated to
+	 * @param bPreserveHistory If set to true, non-ancestor entries in history will be retained
+	 * @param bDisablePreservationCache If set to true, cache preservation mechanism is disabled for the current navigation
+	 * @param bForceFocus If set to true, the logic to set the focus once the navigation is finalized will be triggered (onPageReady)
+	 * @param bPreserveShellBackNavigationHandler If not set to false, the back navigation is set to undefined
+	 * @returns Promise (resolved when the navigation is finalized) that returns 'true' if a navigation took place, 'false' if the navigation didn't happen
 	 * @ui5-restricted
 	 */
 	navToHash(
@@ -208,7 +207,7 @@ class RouterProxy extends BaseObject {
 		bDisablePreservationCache?: boolean,
 		bForceFocus?: boolean,
 		bPreserveShellBackNavigationHandler?: boolean
-	) {
+	): Promise<boolean> {
 		if (bPreserveShellBackNavigationHandler !== false) {
 			this._oShellServices.setBackNavigation();
 		}
@@ -225,7 +224,7 @@ class RouterProxy extends BaseObject {
 		}
 	}
 
-	_internalNavToHash(sHash: any, bPreserveHistory: any, bDisablePreservationCache: any, bForceFocus?: boolean) {
+	_internalNavToHash(sHash: any, bPreserveHistory: any, bDisablePreservationCache: any, bForceFocus?: boolean): Promise<boolean> {
 		// Add the app state in the hash if needed
 		if (this.fclEnabled && this.sIAppStateKey && !findAppStateInHash(sHash)) {
 			sHash = setAppStateInHash(sHash, this.sIAppStateKey);
@@ -255,7 +254,7 @@ class RouterProxy extends BaseObject {
 			this._bForceFocus =
 				bForceFocus ||
 				(aCurrentHashKeys.length < oNewState.keys.length &&
-					aCurrentHashKeys.every(function(key: any, index: any) {
+					aCurrentHashKeys.every(function (key: any, index: any) {
 						return key === oNewState.keys[index];
 					}));
 		}
@@ -269,7 +268,7 @@ class RouterProxy extends BaseObject {
 	 * Clears browser history if entries have been added without using the RouterProxy.
 	 * Updates the internal history accordingly.
 	 *
-	 * @returns {Promise} Promise that is resolved once the history is rebuilt
+	 * @returns Promise that is resolved once the history is rebuilt
 	 */
 	restoreHistory() {
 		if (this._bApplyRestore) {
@@ -289,7 +288,7 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Navigates back in the history.
 	 *
-	 * @returns {Promise} Promise that is resolved when the navigation is finalized
+	 * @returns Promise that is resolved when the navigation is finalized
 	 */
 	navBack() {
 		const sCurrentHash = this.getHash();
@@ -316,9 +315,10 @@ class RouterProxy extends BaseObject {
 
 	/**
 	 * Navigates to a route with parameters.
-	 * @param {string} sRouteName The route name to be navigated to
-	 * @param {object} oParameters Parameters for the navigation
-	 * @returns {Promise} Promise that is resolved when the navigation is finalized
+	 *
+	 * @param sRouteName The route name to be navigated to
+	 * @param oParameters Parameters for the navigation
+	 * @returns Promise that is resolved when the navigation is finalized
 	 * @ui5-restricted
 	 */
 	navTo(sRouteName: string, oParameters: any) {
@@ -330,7 +330,7 @@ class RouterProxy extends BaseObject {
 	 * Exits the current app by navigating back
 	 * to the previous app (if any) or the FLP.
 	 *
-	 * @returns {Promise} Promise that is resolved when we exit the app
+	 * @returns Promise that is resolved when we exit the app
 	 */
 	exitFromApp() {
 		return this._oShellServices.backToPreviousApp();
@@ -340,8 +340,8 @@ class RouterProxy extends BaseObject {
 	 * Checks whether a given hash can have an impact on the current state
 	 * i.e. if the hash is equal, compatible or an ancestor of the current state.
 	 *
-	 * @param {*} sHash `true` if there is an impact
-	 * @returns {boolean} If there is an impact
+	 * @param sHash `true` if there is an impact
+	 * @returns If there is an impact
 	 */
 	isCurrentStateImpactedBy(sHash: any) {
 		if (sHash[0] === "/") {
@@ -354,7 +354,7 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Checks if a navigation is currently being processed.
 	 *
-	 * @returns {boolean} `false` if a navigation has been triggered in the RouterProxy and is not yet finalized
+	 * @returns `false` if a navigation has been triggered in the RouterProxy and is not yet finalized
 	 */
 	isNavigationFinalized() {
 		return !this.bIsRebuildHistoryRunning && !this._bDelayedRebuild;
@@ -382,7 +382,7 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Checks for the availability of the navigation guard.
 	 *
-	 * @returns {boolean} `true` if navigating guard is available
+	 * @returns `true` if navigating guard is available
 	 */
 	hasNavigationGuard() {
 		return this._oNavigationGuard !== null;
@@ -391,8 +391,8 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Tests a hash against the navigation guard.
 	 *
-	 * @param {string} sHash The hash to be tested
-	 * @returns {boolean} `true` if navigating to the hash doesn't cross the guard
+	 * @param sHash The hash to be tested
+	 * @returns `true` if navigating to the hash doesn't cross the guard
 	 */
 	checkHashWithGuard(sHash: string) {
 		return this._oNavigationGuard === null || this._oNavigationGuard.check(sHash);
@@ -401,7 +401,7 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Checks if the user allowed the navigation guard to be crossed.
 	 *
-	 * @returns {boolean} `true` if crossing the guard has been allowed by the user
+	 * @returns `true` if crossing the guard has been allowed by the user
 	 */
 	isGuardCrossAllowedByUser() {
 		return this.bIsGuardCrossAllowed;
@@ -441,7 +441,7 @@ class RouterProxy extends BaseObject {
 		const aTokens = sHashNoParams.split("/");
 		const aKeys: any[] = [];
 
-		aTokens.forEach(function(sToken: any) {
+		aTokens.forEach(function (sToken: any) {
 			const regexKey = /[^\(\)]+\([^\(\)]+\)/; // abc(def)
 			if (regexKey.test(sToken)) {
 				aKeys.push(sToken.split("(")[0]);
@@ -454,9 +454,8 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Builds a state from a hash.
 	 *
-	 * @param {string} sHash The hash to be used as entry
-	 * @returns {object} The state
-	 *
+	 * @param sHash The hash to be used as entry
+	 * @returns The state
 	 * @ui5-restricted
 	 */
 	_extractStateFromHash(sHash: string) {
@@ -469,7 +468,7 @@ class RouterProxy extends BaseObject {
 		};
 
 		// Retrieve layout (if any)
-		const aLayout = sHash.match(new RegExp("\\?.*" + enumURLParams.LAYOUTPARAM + "=([^&]*)"));
+		const aLayout = sHash.match(new RegExp(`\\?.*${enumURLParams.LAYOUTPARAM}=([^&]*)`));
 		oState.sLayout = aLayout && aLayout.length > 1 ? aLayout[1] : null;
 		if (oState.sLayout === "MidColumnFullScreen") {
 			oState.screenMode = 1;
@@ -489,11 +488,11 @@ class RouterProxy extends BaseObject {
 	 * Also sets the iAppState key in the whole history.
 	 *
 	 * @memberof sap.fe.core.RouterProxy
-	 * @param {object} oNewState The new state to be added
-	 * @param {boolean} bRebuildOnly `true` if we're rebuilding the history after a shell menu navigation
-	 * @param {boolean} bPreserveHistory If set to true, non-ancestor entries in history will be retained
-	 * @param {boolean} bDisableHistoryPreservation Disable the mechanism to retained marked entries in cache
-	 * @returns {object} The new state
+	 * @param oNewState The new state to be added
+	 * @param bRebuildOnly `true` if we're rebuilding the history after a shell menu navigation
+	 * @param bPreserveHistory If set to true, non-ancestor entries in history will be retained
+	 * @param bDisableHistoryPreservation Disable the mechanism to retained marked entries in cache
+	 * @returns The new state
 	 * @ui5-restricted
 	 * @final
 	 */
@@ -598,7 +597,6 @@ class RouterProxy extends BaseObject {
 	 *
 	 * @function
 	 * @memberof sap.fe.core.RouterProxy
-	 *
 	 * @ui5-restricted
 	 * @final
 	 */
@@ -613,8 +611,7 @@ class RouterProxy extends BaseObject {
 	 * @function
 	 * @name sap.fe.core.RouterProxy#_enableEventOnHashChange
 	 * @memberof sap.fe.core.RouterProxy
-	 * @param {boolean} [bIgnoreCurrentHash] Ignore the last hash event triggered before the router has initialized
-	 *
+	 * @param [bIgnoreCurrentHash] Ignore the last hash event triggered before the router has initialized
 	 * @ui5-restricted
 	 * @final
 	 */
@@ -627,16 +624,16 @@ class RouterProxy extends BaseObject {
 	 * Synchronizes the browser history with the internal history of the routerProxy, and triggers a navigation if needed.
 	 *
 	 * @memberof sap.fe.core.RouterProxy
-	 * @param {object} oHistoryAction Specifies the navigation action to be performed
-	 * @param {boolean} bRebuildOnly `true` if internal history is currently being rebuilt
-	 * @returns {Promise} Promise (resolved when the navigation is finalized) that returns 'true' if a navigation took place, 'false' if the navigation didn't happen
+	 * @param oHistoryAction Specifies the navigation action to be performed
+	 * @param bRebuildOnly `true` if internal history is currently being rebuilt
+	 * @returns Promise (resolved when the navigation is finalized) that returns 'true' if a navigation took place, 'false' if the navigation didn't happen
 	 * @ui5-restricted
 	 * @final
 	 */
-	_rebuildBrowserHistory(oHistoryAction: any, bRebuildOnly: boolean) {
+	_rebuildBrowserHistory(oHistoryAction: any, bRebuildOnly: boolean): Promise<boolean> {
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		const that = this;
-		return new Promise(resolve => {
+		return new Promise((resolve) => {
 			this.bIsRebuildHistoryRunning = true;
 			const oTargetState = this._oManagedHistory[this._oManagedHistory.length - 1],
 				newLevel = this._oManagedHistory.length - 1;
@@ -650,7 +647,7 @@ class RouterProxy extends BaseObject {
 				history.replaceState(Object.assign({ feLevel: newLevel }, history.state), "");
 
 				if (bRebuildOnly) {
-					setTimeout(function() {
+					setTimeout(function () {
 						// Timeout to let 'hashchange' event be processed before by the HashChanger, so that
 						// onRouteMatched notification isn't raised
 						that._enableEventOnHashChange(true);
@@ -664,7 +661,7 @@ class RouterProxy extends BaseObject {
 			// Async callbacks when navigating back, in order to let all notifications and events get processed
 			function backReplaceAsync() {
 				window.removeEventListener("popstate", backReplaceAsync);
-				setTimeout(function() {
+				setTimeout(function () {
 					// Timeout to let 'hashchange' event be processed before by the HashChanger
 					replaceAsync();
 				}, 0);
@@ -717,7 +714,9 @@ class RouterProxy extends BaseObject {
 	}
 
 	setPathMapping(mappings: { oldPath: string; newPath: string }[]) {
-		this._pathMappings = mappings;
+		this._pathMappings = mappings.filter((mapping) => {
+			return mapping.oldPath !== mapping.newPath;
+		});
 	}
 
 	hashGuard() {
@@ -727,7 +726,7 @@ class RouterProxy extends BaseObject {
 			this._bApplyRestore = true;
 		} else if (!this.bIsRebuildHistoryRunning) {
 			// Check if the hash needs to be changed (this happens in FCL when switching b/w edit and read-only with 3 columns open)
-			const mapping = this._pathMappings.find(m => {
+			const mapping = this._pathMappings.find((m) => {
 				return sHash.indexOf(m.oldPath) >= 0;
 			});
 			if (mapping) {
@@ -795,8 +794,8 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Checks if back exits the present guard set.
 	 *
-	 * @param {string} sPresentHash The current hash. Only used for unit tests.
-	 * @returns {boolean} `true` if back exits there is a guard exit on back
+	 * @param sPresentHash The current hash. Only used for unit tests.
+	 * @returns `true` if back exits there is a guard exit on back
 	 */
 	checkIfBackIsOutOfGuard(sPresentHash?: string) {
 		let sPrevHash;
@@ -837,7 +836,7 @@ class RouterProxy extends BaseObject {
 	/**
 	 * Checks if the last 2 entries in the history share the same context.
 	 *
-	 * @returns {boolean} `true` if they share the same context.
+	 * @returns `true` if they share the same context.
 	 */
 	checkIfBackHasSameContext() {
 		if (this._oManagedHistory.length < 2) {

package/src/sap/fe/core/controls/ActionParameterDialog.fragment.xml

@@ -18,27 +18,27 @@
 		Property: 'sap/fe/core/templating/PropertyFormatters'
 	}"
 >
-		<form:SimpleForm binding="{$Parameter}">
-			<template:repeat list="{action>$Parameter}" var="parameter">
-				<template:with path="parameter>" helper="COMMON.gotoActionParameter" var="actionParameter">
-					<!-- In case of bound actions the first parameter shall be ignored -->
-					<template:if test="{= !${action>$IsBound} || ${parameter>$Name} !== ${action>$Parameter/0/$Name} }">
-						<Label
+	<form:SimpleForm binding="{$Parameter}">
+		<template:repeat list="{action>$Parameter}" var="parameter">
+			<template:with path="parameter>" helper="COMMON.gotoActionParameter" var="actionParameter">
+				<!-- In case of bound actions the first parameter shall be ignored -->
+				<template:if test="{= !${action>$IsBound} || ${parameter>$Name} !== ${action>$Parameter/0/$Name} }">
+					<Label
 						unittest:id="ActionParameterDialogLabelExpressionTest"
 						text="{= ${actionParameter>@com.sap.vocabularies.Common.v1.Label} ? ${actionParameter>@com.sap.vocabularies.Common.v1.Label} : ${parameter>$Name}}"
 					/>
-						<!-- TODOs:
+					<!-- TODOs:
 							edit mode, can there be also field control?
                             value help
                             additional value? (= text annotation)
                             text arrangement?
                             multipleLines?
                 -->
-						<!-- TODO: use new value helper -->
+					<!-- TODO: use new value helper -->
 
-						<template:if test="{=  !${parameter>$isCollection} }">
+					<template:if test="{=  !${parameter>$isCollection} }">
 						<template:then>
-						<!--The payload of FieldBaseDelegate is used to control the fallback feature 'retrieveTextFromValueList' -->
+							<!--The payload of FieldBaseDelegate is used to control the fallback feature 'retrieveTextFromValueList' -->
 							<mdc:Field
 								delegate="{name:'sap/fe/macros/FieldBaseDelegate', payload:{retrieveTextFromValueList:true}}"
 								unittest:id="ActionParameterDialogFieldExpressionTest"
@@ -51,9 +51,9 @@
 								required="{= FIELD.isRequired(${actionParameter>@@FIELD.fieldControl}, 'Editable')}"
 								change="{= '.handleChange($event, \'' + ${parameter>$Name} + '\')' }"
 								fieldHelp="{= FIELD.getActionParameterDialogFieldHelp(${actionParameter>@}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
-								visible="{actionParameter>@com.sap.vocabularies.UI.v1.Hidden@@FIELD.getActionParameterVisibility}"
+								visible="{= (${actionParameter>$Name} === 'ResultIsActiveEntity') ? false : ${actionParameter>@com.sap.vocabularies.UI.v1.Hidden@@FIELD.getActionParameterVisibility} }"
 							>
-							<core:Fragment fragmentName="sap.fe.core.controls.ActionParameterDialogValueHelp" type="XML" />
+								<core:Fragment fragmentName="sap.fe.core.controls.ActionParameterDialogValueHelp" type="XML" />
 							</mdc:Field>
 						</template:then>
 						<template:else>
@@ -70,13 +70,16 @@
 								fieldHelp="{= FIELD.getActionParameterDialogFieldHelp(${actionParameter>@}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
 								visible="{actionParameter>@com.sap.vocabularies.UI.v1.Hidden@@FIELD.getActionParameterVisibility}"
 							>
-							<mdcField:MultiValueFieldItem key="{path: 'mvfview>Key', type:'sap.ui.model.type.String'}" description="{mvfview>Desc}" />
-							<core:Fragment fragmentName="sap.fe.core.controls.ActionParameterDialogValueHelp" type="XML" />
+								<mdcField:MultiValueFieldItem
+									key="{path: 'mvfview>Key', type:'sap.ui.model.type.String'}"
+									description="{mvfview>Desc}"
+								/>
+								<core:Fragment fragmentName="sap.fe.core.controls.ActionParameterDialogValueHelp" type="XML" />
 							</mdc:MultiValueField>
 						</template:else>
-						</template:if>
 					</template:if>
-				</template:with>
-			</template:repeat>
-		</form:SimpleForm>
+				</template:if>
+			</template:with>
+		</template:repeat>
+	</form:SimpleForm>
 </core:FragmentDefinition>

package/src/sap/fe/core/controls/Any.js

@@ -8,21 +8,25 @@ sap.ui.define(["sap/ui/base/ManagedObject"], function (ManagedObject) {
   /**
    * @class
    * A custom element to evaluate the value of Binding.
-   *
    * @name sap.fe.core.controls.Any
    * @hideconstructor
    */
   var Any = ManagedObject.extend("sap.fe.core.controls.Any", {
     metadata: {
       properties: {
-        any: "any"
+        any: "any",
+        anyText: "string"
       }
     },
-    updateProperty: function () {
+    updateProperty: function (sName) {
       // Avoid Promise processing in ManagedObject and set Promise as value directly
-      this.setAny(this.getBindingInfo("any").binding.getExternalValue());
+      if (sName === "any") {
+        this.setAny(this.getBindingInfo(sName).binding.getExternalValue());
+      } else {
+        this.setAnyText(this.getBindingInfo(sName).binding.getExternalValue());
+      }
     }
   });
   return Any;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkFueS50cyJdLCJuYW1lcyI6WyJBbnkiLCJNYW5hZ2VkT2JqZWN0IiwiZXh0ZW5kIiwibWV0YWRhdGEiLCJwcm9wZXJ0aWVzIiwiYW55IiwidXBkYXRlUHJvcGVydHkiLCJzZXRBbnkiLCJnZXRCaW5kaW5nSW5mbyIsImJpbmRpbmciLCJnZXRFeHRlcm5hbFZhbHVlIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBUUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSxNQUFNQSxHQUFHLEdBQUdDLGFBQWEsQ0FBQ0MsTUFBZCxDQUFxQiwwQkFBckIsRUFBaUQ7QUFDNURDLElBQUFBLFFBQVEsRUFBRTtBQUNUQyxNQUFBQSxVQUFVLEVBQUU7QUFDWEMsUUFBQUEsR0FBRyxFQUFFO0FBRE07QUFESCxLQURrRDtBQU01REMsSUFBQUEsY0FBYyxFQUFFLFlBQXlCO0FBQ3hDO0FBQ0EsV0FBS0MsTUFBTCxDQUFhLEtBQUtDLGNBQUwsQ0FBb0IsS0FBcEIsQ0FBRCxDQUFvQ0MsT0FBcEMsQ0FBNENDLGdCQUE1QyxFQUFaO0FBQ0E7QUFUMkQsR0FBakQsQ0FBWjtTQVllVixHIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgTWFuYWdlZE9iamVjdCBmcm9tIFwic2FwL3VpL2Jhc2UvTWFuYWdlZE9iamVjdFwiO1xuXG5leHBvcnQgdHlwZSBBbnlUeXBlID0gTWFuYWdlZE9iamVjdCAmIHtcblx0bUJpbmRpbmdJbmZvczogb2JqZWN0O1xuXHRnZXRBbnkoKTogYW55O1xuXHRzZXRBbnkodmFsdWU6IGFueSk6IHZvaWQ7XG5cdGdldEJpbmRpbmdJbmZvKHByb3BlcnR5OiBzdHJpbmcpOiBvYmplY3Q7XG5cdGV4dGVuZChzTmFtZTogc3RyaW5nLCBzRXh0ZW5zaW9uOiBhbnkpOiBBbnlUeXBlO1xufTtcblxuLyoqXG4gKiBAY2xhc3NcbiAqIEEgY3VzdG9tIGVsZW1lbnQgdG8gZXZhbHVhdGUgdGhlIHZhbHVlIG9mIEJpbmRpbmcuXG4gKlxuICogQG5hbWUgc2FwLmZlLmNvcmUuY29udHJvbHMuQW55XG4gKiBAaGlkZWNvbnN0cnVjdG9yXG4gKi9cbmNvbnN0IEFueSA9IE1hbmFnZWRPYmplY3QuZXh0ZW5kKFwic2FwLmZlLmNvcmUuY29udHJvbHMuQW55XCIsIHtcblx0bWV0YWRhdGE6IHtcblx0XHRwcm9wZXJ0aWVzOiB7XG5cdFx0XHRhbnk6IFwiYW55XCJcblx0XHR9XG5cdH0sXG5cdHVwZGF0ZVByb3BlcnR5OiBmdW5jdGlvbiAodGhpczogQW55VHlwZSkge1xuXHRcdC8vIEF2b2lkIFByb21pc2UgcHJvY2Vzc2luZyBpbiBNYW5hZ2VkT2JqZWN0IGFuZCBzZXQgUHJvbWlzZSBhcyB2YWx1ZSBkaXJlY3RseVxuXHRcdHRoaXMuc2V0QW55KCh0aGlzLmdldEJpbmRpbmdJbmZvKFwiYW55XCIpIGFzIGFueSkuYmluZGluZy5nZXRFeHRlcm5hbFZhbHVlKCkpO1xuXHR9XG59KTtcblxuZXhwb3J0IGRlZmF1bHQgQW55IGFzIGFueTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkFueS50cyJdLCJuYW1lcyI6WyJBbnkiLCJNYW5hZ2VkT2JqZWN0IiwiZXh0ZW5kIiwibWV0YWRhdGEiLCJwcm9wZXJ0aWVzIiwiYW55IiwiYW55VGV4dCIsInVwZGF0ZVByb3BlcnR5Iiwic05hbWUiLCJzZXRBbnkiLCJnZXRCaW5kaW5nSW5mbyIsImJpbmRpbmciLCJnZXRFeHRlcm5hbFZhbHVlIiwic2V0QW55VGV4dCJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7OztBQVVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBLE1BQU1BLEdBQUcsR0FBR0MsYUFBYSxDQUFDQyxNQUFkLENBQXFCLDBCQUFyQixFQUFpRDtBQUM1REMsSUFBQUEsUUFBUSxFQUFFO0FBQ1RDLE1BQUFBLFVBQVUsRUFBRTtBQUNYQyxRQUFBQSxHQUFHLEVBQUUsS0FETTtBQUVYQyxRQUFBQSxPQUFPLEVBQUU7QUFGRTtBQURILEtBRGtEO0FBTzVEQyxJQUFBQSxjQUFjLEVBQUUsVUFBeUJDLEtBQXpCLEVBQXdDO0FBQ3ZEO0FBQ0EsVUFBSUEsS0FBSyxLQUFLLEtBQWQsRUFBcUI7QUFDcEIsYUFBS0MsTUFBTCxDQUFhLEtBQUtDLGNBQUwsQ0FBb0JGLEtBQXBCLENBQUQsQ0FBb0NHLE9BQXBDLENBQTRDQyxnQkFBNUMsRUFBWjtBQUNBLE9BRkQsTUFFTztBQUNOLGFBQUtDLFVBQUwsQ0FBaUIsS0FBS0gsY0FBTCxDQUFvQkYsS0FBcEIsQ0FBRCxDQUFvQ0csT0FBcEMsQ0FBNENDLGdCQUE1QyxFQUFoQjtBQUNBO0FBQ0Q7QUFkMkQsR0FBakQsQ0FBWjtTQWlCZVosRyIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IE1hbmFnZWRPYmplY3QgZnJvbSBcInNhcC91aS9iYXNlL01hbmFnZWRPYmplY3RcIjtcblxuZXhwb3J0IHR5cGUgQW55VHlwZSA9IE1hbmFnZWRPYmplY3QgJiB7XG5cdG1CaW5kaW5nSW5mb3M6IG9iamVjdDtcblx0Z2V0QW55KCk6IGFueTtcblx0Z2V0QW55VGV4dCgpOiBhbnk7XG5cdHNldEFueSh2YWx1ZTogYW55KTogdm9pZDtcblx0c2V0QW55VGV4dCh2YWx1ZTogYW55KTogdm9pZDtcblx0Z2V0QmluZGluZ0luZm8ocHJvcGVydHk6IHN0cmluZyk6IG9iamVjdDtcblx0ZXh0ZW5kKHNOYW1lOiBzdHJpbmcsIHNFeHRlbnNpb246IGFueSk6IEFueVR5cGU7XG59O1xuXG4vKipcbiAqIEBjbGFzc1xuICogQSBjdXN0b20gZWxlbWVudCB0byBldmFsdWF0ZSB0aGUgdmFsdWUgb2YgQmluZGluZy5cbiAqIEBuYW1lIHNhcC5mZS5jb3JlLmNvbnRyb2xzLkFueVxuICogQGhpZGVjb25zdHJ1Y3RvclxuICovXG5jb25zdCBBbnkgPSBNYW5hZ2VkT2JqZWN0LmV4dGVuZChcInNhcC5mZS5jb3JlLmNvbnRyb2xzLkFueVwiLCB7XG5cdG1ldGFkYXRhOiB7XG5cdFx0cHJvcGVydGllczoge1xuXHRcdFx0YW55OiBcImFueVwiLFxuXHRcdFx0YW55VGV4dDogXCJzdHJpbmdcIlxuXHRcdH1cblx0fSxcblx0dXBkYXRlUHJvcGVydHk6IGZ1bmN0aW9uICh0aGlzOiBBbnlUeXBlLCBzTmFtZTogc3RyaW5nKSB7XG5cdFx0Ly8gQXZvaWQgUHJvbWlzZSBwcm9jZXNzaW5nIGluIE1hbmFnZWRPYmplY3QgYW5kIHNldCBQcm9taXNlIGFzIHZhbHVlIGRpcmVjdGx5XG5cdFx0aWYgKHNOYW1lID09PSBcImFueVwiKSB7XG5cdFx0XHR0aGlzLnNldEFueSgodGhpcy5nZXRCaW5kaW5nSW5mbyhzTmFtZSkgYXMgYW55KS5iaW5kaW5nLmdldEV4dGVybmFsVmFsdWUoKSk7XG5cdFx0fSBlbHNlIHtcblx0XHRcdHRoaXMuc2V0QW55VGV4dCgodGhpcy5nZXRCaW5kaW5nSW5mbyhzTmFtZSkgYXMgYW55KS5iaW5kaW5nLmdldEV4dGVybmFsVmFsdWUoKSk7XG5cdFx0fVxuXHR9XG59KTtcblxuZXhwb3J0IGRlZmF1bHQgQW55IGFzIGFueTtcbiJdfQ==

package/src/sap/fe/core/controls/Any.ts

@@ -3,7 +3,9 @@ import ManagedObject from "sap/ui/base/ManagedObject";
 export type AnyType = ManagedObject & {
 	mBindingInfos: object;
 	getAny(): any;
+	getAnyText(): any;
 	setAny(value: any): void;
+	setAnyText(value: any): void;
 	getBindingInfo(property: string): object;
 	extend(sName: string, sExtension: any): AnyType;
 };
@@ -11,19 +13,23 @@ export type AnyType = ManagedObject & {
 /**
  * @class
  * A custom element to evaluate the value of Binding.
- *
  * @name sap.fe.core.controls.Any
  * @hideconstructor
  */
 const Any = ManagedObject.extend("sap.fe.core.controls.Any", {
 	metadata: {
 		properties: {
-			any: "any"
+			any: "any",
+			anyText: "string"
 		}
 	},
-	updateProperty: function (this: AnyType) {
+	updateProperty: function (this: AnyType, sName: string) {
 		// Avoid Promise processing in ManagedObject and set Promise as value directly
-		this.setAny((this.getBindingInfo("any") as any).binding.getExternalValue());
+		if (sName === "any") {
+			this.setAny((this.getBindingInfo(sName) as any).binding.getExternalValue());
+		} else {
+			this.setAnyText((this.getBindingInfo(sName) as any).binding.getExternalValue());
+		}
 	}
 });
 

package/src/sap/fe/core/controls/CommandExecution.js

@@ -2,7 +2,7 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/base/Log", "sap/fe/core/helpers/ClassSupport", "sap/ui/core/CommandExecution", "sap/ui/core/Element", "sap/ui/core/Shortcut"], function (Log, ClassSupport, CommandExecution, Element, Shortcut) {
+sap.ui.define(["sap/base/Log", "sap/fe/core/helpers/ClassSupport", "sap/ui/core/CommandExecution", "sap/ui/core/Component", "sap/ui/core/Element", "sap/ui/core/Shortcut"], function (Log, ClassSupport, CommandExecution, Component, Element, Shortcut) {
   "use strict";
 
   var _dec, _class;
@@ -23,9 +23,8 @@ sap.ui.define(["sap/base/Log", "sap/fe/core/helpers/ClassSupport", "sap/ui/core/
     var _proto = CustomCommandExecution.prototype;
 
     _proto.setParent = function setParent(oParent) {
-      var aExcludedSingleKey = ["escape"]; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-
       _CommandExecution.prototype.setParent.call(this, oParent);
 
       var aCommands = oParent.data("sap.ui.core.Shortcut");
@@ -34,26 +33,13 @@ sap.ui.define(["sap/base/Log", "sap/fe/core/helpers/ClassSupport", "sap/ui/core/
         var oCommand = oParent.data("sap.ui.core.Shortcut")[aCommands.length - 1],
             oShortcut = oCommand.shortcutSpec;
 
-        if (oShortcut && aExcludedSingleKey.indexOf(oShortcut.key) > -1) {
+        if (oShortcut) {
           // Check if single key shortcut
           for (var key in oShortcut) {
             if (oShortcut[key] && key !== "key") {
               return this;
             }
-          } // Need to disable ShortCut when user press single shortcut key into an input
-
-
-          oParent.addDelegate({
-            "onkeydown": function (oEvent) {
-              if (aExcludedSingleKey.indexOf(oEvent.key.toLowerCase()) > -1) {
-                var sElement = oEvent.target ? oEvent.target.tagName.toLowerCase() : undefined;
-
-                if (sElement === "input") {
-                  oEvent.setMarked();
-                }
-              }
-            }
-          }, true, undefined, true);
+          }
         }
 
         return this;
@@ -77,12 +63,23 @@ sap.ui.define(["sap/base/Log", "sap/fe/core/helpers/ClassSupport", "sap/ui/core/
     };
 
     _proto.setVisible = function setVisible(bValue) {
-      var oCommand = this._getCommandInfo();
+      var oCommand,
+          oParentControl = this.getParent(),
+          oComponent;
 
-      if (oCommand) {
-        _CommandExecution.prototype.setVisible.call(this, bValue);
-      } else {
-        Log.info("There is no shortcut definition registered in the manifest for the command : " + this.getCommand());
+      while (!oComponent && oParentControl) {
+        oComponent = Component.getOwnerComponentFor(oParentControl);
+        oParentControl = oParentControl.getParent();
+      }
+
+      if (oComponent) {
+        oCommand = oComponent.getCommand(this.getCommand());
+
+        if (oCommand) {
+          _CommandExecution.prototype.setVisible.call(this, bValue);
+        } else {
+          Log.info("There is no shortcut definition registered in the manifest for the command : " + this.getCommand());
+        }
       }
 
       return this;
@@ -92,4 +89,4 @@ sap.ui.define(["sap/base/Log", "sap/fe/core/helpers/ClassSupport", "sap/ui/core/
   }(CommandExecution)) || _class);
   return CustomCommandExecution;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1hbmRFeGVjdXRpb24udHMiXSwibmFtZXMiOlsiQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiIsImRlZmluZVVJNUNsYXNzIiwic2V0UGFyZW50Iiwib1BhcmVudCIsImFFeGNsdWRlZFNpbmdsZUtleSIsImFDb21tYW5kcyIsImRhdGEiLCJBcnJheSIsImlzQXJyYXkiLCJsZW5ndGgiLCJvQ29tbWFuZCIsIm9TaG9ydGN1dCIsInNob3J0Y3V0U3BlYyIsImluZGV4T2YiLCJrZXkiLCJhZGREZWxlZ2F0ZSIsIm9FdmVudCIsInRvTG93ZXJDYXNlIiwic0VsZW1lbnQiLCJ0YXJnZXQiLCJ0YWdOYW1lIiwidW5kZWZpbmVkIiwic2V0TWFya2VkIiwiZGVzdHJveSIsImJTdXBwcmVzc0ludmFsaWRhdGUiLCJnZXRQYXJlbnQiLCJfZ2V0Q29tbWFuZEluZm8iLCJTaG9ydGN1dCIsInVucmVnaXN0ZXIiLCJzaG9ydGN1dCIsIl9jbGVhbnVwQ29udGV4dCIsIkVsZW1lbnQiLCJwcm90b3R5cGUiLCJhcHBseSIsInNldFZpc2libGUiLCJiVmFsdWUiLCJMb2ciLCJpbmZvIiwiZ2V0Q29tbWFuZCIsIkNvbW1hbmRFeGVjdXRpb24iXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7OztNQUtNQSxzQixXQURMQyxjQUFjLENBQUMsdUNBQUQsQzs7Ozs7Ozs7O1dBRWRDLFMsR0FBQSxtQkFBVUMsT0FBVixFQUF3QjtBQUN2QixVQUFNQyxrQkFBa0IsR0FBRyxDQUFDLFFBQUQsQ0FBM0IsQ0FEdUIsQ0FFdkI7QUFDQTs7QUFDQSxrQ0FBTUYsU0FBTixZQUFnQkMsT0FBaEI7O0FBQ0EsVUFBTUUsU0FBUyxHQUFHRixPQUFPLENBQUNHLElBQVIsQ0FBYSxzQkFBYixDQUFsQjs7QUFDQSxVQUFJQyxLQUFLLENBQUNDLE9BQU4sQ0FBY0gsU0FBZCxLQUE0QkEsU0FBUyxDQUFDSSxNQUFWLEdBQW1CLENBQW5ELEVBQXNEO0FBQ3JELFlBQU1DLFFBQVEsR0FBR1AsT0FBTyxDQUFDRyxJQUFSLENBQWEsc0JBQWIsRUFBcUNELFNBQVMsQ0FBQ0ksTUFBVixHQUFtQixDQUF4RCxDQUFqQjtBQUFBLFlBQ0NFLFNBQVMsR0FBR0QsUUFBUSxDQUFDRSxZQUR0Qjs7QUFFQSxZQUFJRCxTQUFTLElBQUlQLGtCQUFrQixDQUFDUyxPQUFuQixDQUEyQkYsU0FBUyxDQUFDRyxHQUFyQyxJQUE0QyxDQUFDLENBQTlELEVBQWlFO0FBQ2hFO0FBQ0EsZUFBSyxJQUFNQSxHQUFYLElBQWtCSCxTQUFsQixFQUE2QjtBQUM1QixnQkFBSUEsU0FBUyxDQUFDRyxHQUFELENBQVQsSUFBa0JBLEdBQUcsS0FBSyxLQUE5QixFQUFxQztBQUNwQyxxQkFBTyxJQUFQO0FBQ0E7QUFDRCxXQU4rRCxDQU9oRTs7O0FBQ0FYLFVBQUFBLE9BQU8sQ0FBQ1ksV0FBUixDQUNDO0FBQ0MseUJBQWEsVUFBVUMsTUFBVixFQUF1QjtBQUNuQyxrQkFBSVosa0JBQWtCLENBQUNTLE9BQW5CLENBQTJCRyxNQUFNLENBQUNGLEdBQVAsQ0FBV0csV0FBWCxFQUEzQixJQUF1RCxDQUFDLENBQTVELEVBQStEO0FBQzlELG9CQUFNQyxRQUFRLEdBQUdGLE1BQU0sQ0FBQ0csTUFBUCxHQUFnQkgsTUFBTSxDQUFDRyxNQUFQLENBQWNDLE9BQWQsQ0FBc0JILFdBQXRCLEVBQWhCLEdBQXNESSxTQUF2RTs7QUFDQSxvQkFBSUgsUUFBUSxLQUFLLE9BQWpCLEVBQTBCO0FBQ3pCRixrQkFBQUEsTUFBTSxDQUFDTSxTQUFQO0FBQ0E7QUFDRDtBQUNEO0FBUkYsV0FERCxFQVdDLElBWEQsRUFZQ0QsU0FaRCxFQWFDLElBYkQ7QUFlQTs7QUFDRCxlQUFPLElBQVA7QUFDQTtBQUNELEs7O1dBRURFLE8sR0FBQSxpQkFBUUMsbUJBQVIsRUFBc0M7QUFDckMsVUFBTXJCLE9BQU8sR0FBRyxLQUFLc0IsU0FBTCxFQUFoQjs7QUFDQSxVQUFJdEIsT0FBSixFQUFhO0FBQ1osWUFBTU8sUUFBUSxHQUFHLEtBQUtnQixlQUFMLEVBQWpCOztBQUNBLFlBQUloQixRQUFKLEVBQWM7QUFDYmlCLFVBQUFBLFFBQVEsQ0FBQ0MsVUFBVCxDQUFvQixLQUFLSCxTQUFMLEVBQXBCLEVBQXNDZixRQUFRLENBQUNtQixRQUEvQztBQUNBOztBQUNELGFBQUtDLGVBQUwsQ0FBcUIzQixPQUFyQjtBQUNBOztBQUNENEIsTUFBQUEsT0FBTyxDQUFDQyxTQUFSLENBQWtCVCxPQUFsQixDQUEwQlUsS0FBMUIsQ0FBZ0MsSUFBaEMsRUFBc0MsQ0FBQ1QsbUJBQUQsQ0FBdEM7QUFDQSxLOztXQUVEVSxVLEdBQUEsb0JBQVdDLE1BQVgsRUFBNEI7QUFDM0IsVUFBTXpCLFFBQVEsR0FBRyxLQUFLZ0IsZUFBTCxFQUFqQjs7QUFDQSxVQUFJaEIsUUFBSixFQUFjO0FBQ2Isb0NBQU13QixVQUFOLFlBQWlCQyxNQUFqQjtBQUNBLE9BRkQsTUFFTztBQUNOQyxRQUFBQSxHQUFHLENBQUNDLElBQUosQ0FBUyxrRkFBa0YsS0FBS0MsVUFBTCxFQUEzRjtBQUNBOztBQUNELGFBQU8sSUFBUDtBQUNBLEs7OztJQTFEbUNDLGdCO1NBZ0V0QnZDLHNCIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgTG9nIGZyb20gXCJzYXAvYmFzZS9Mb2dcIjtcbmltcG9ydCB7IGRlZmluZVVJNUNsYXNzIH0gZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvQ2xhc3NTdXBwb3J0XCI7XG5pbXBvcnQgQ29tbWFuZEV4ZWN1dGlvbiBmcm9tIFwic2FwL3VpL2NvcmUvQ29tbWFuZEV4ZWN1dGlvblwiO1xuaW1wb3J0IEVsZW1lbnQgZnJvbSBcInNhcC91aS9jb3JlL0VsZW1lbnRcIjtcbmltcG9ydCBTaG9ydGN1dCBmcm9tIFwic2FwL3VpL2NvcmUvU2hvcnRjdXRcIjtcblxuQGRlZmluZVVJNUNsYXNzKFwic2FwLmZlLmNvcmUuY29udHJvbHMuQ29tbWFuZEV4ZWN1dGlvblwiKVxuY2xhc3MgQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiBleHRlbmRzIENvbW1hbmRFeGVjdXRpb24ge1xuXHRzZXRQYXJlbnQob1BhcmVudDogYW55KSB7XG5cdFx0Y29uc3QgYUV4Y2x1ZGVkU2luZ2xlS2V5ID0gW1wiZXNjYXBlXCJdO1xuXHRcdC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvYmFuLXRzLWNvbW1lbnRcblx0XHQvLyBAdHMtaWdub3JlXG5cdFx0c3VwZXIuc2V0UGFyZW50KG9QYXJlbnQpO1xuXHRcdGNvbnN0IGFDb21tYW5kcyA9IG9QYXJlbnQuZGF0YShcInNhcC51aS5jb3JlLlNob3J0Y3V0XCIpO1xuXHRcdGlmIChBcnJheS5pc0FycmF5KGFDb21tYW5kcykgJiYgYUNvbW1hbmRzLmxlbmd0aCA+IDApIHtcblx0XHRcdGNvbnN0IG9Db21tYW5kID0gb1BhcmVudC5kYXRhKFwic2FwLnVpLmNvcmUuU2hvcnRjdXRcIilbYUNvbW1hbmRzLmxlbmd0aCAtIDFdLFxuXHRcdFx0XHRvU2hvcnRjdXQgPSBvQ29tbWFuZC5zaG9ydGN1dFNwZWM7XG5cdFx0XHRpZiAob1Nob3J0Y3V0ICYmIGFFeGNsdWRlZFNpbmdsZUtleS5pbmRleE9mKG9TaG9ydGN1dC5rZXkpID4gLTEpIHtcblx0XHRcdFx0Ly8gQ2hlY2sgaWYgc2luZ2xlIGtleSBzaG9ydGN1dFxuXHRcdFx0XHRmb3IgKGNvbnN0IGtleSBpbiBvU2hvcnRjdXQpIHtcblx0XHRcdFx0XHRpZiAob1Nob3J0Y3V0W2tleV0gJiYga2V5ICE9PSBcImtleVwiKSB7XG5cdFx0XHRcdFx0XHRyZXR1cm4gdGhpcztcblx0XHRcdFx0XHR9XG5cdFx0XHRcdH1cblx0XHRcdFx0Ly8gTmVlZCB0byBkaXNhYmxlIFNob3J0Q3V0IHdoZW4gdXNlciBwcmVzcyBzaW5nbGUgc2hvcnRjdXQga2V5IGludG8gYW4gaW5wdXRcblx0XHRcdFx0b1BhcmVudC5hZGREZWxlZ2F0ZShcblx0XHRcdFx0XHR7XG5cdFx0XHRcdFx0XHRcIm9ua2V5ZG93blwiOiBmdW5jdGlvbiAob0V2ZW50OiBhbnkpIHtcblx0XHRcdFx0XHRcdFx0aWYgKGFFeGNsdWRlZFNpbmdsZUtleS5pbmRleE9mKG9FdmVudC5rZXkudG9Mb3dlckNhc2UoKSkgPiAtMSkge1xuXHRcdFx0XHRcdFx0XHRcdGNvbnN0IHNFbGVtZW50ID0gb0V2ZW50LnRhcmdldCA/IG9FdmVudC50YXJnZXQudGFnTmFtZS50b0xvd2VyQ2FzZSgpIDogdW5kZWZpbmVkO1xuXHRcdFx0XHRcdFx0XHRcdGlmIChzRWxlbWVudCA9PT0gXCJpbnB1dFwiKSB7XG5cdFx0XHRcdFx0XHRcdFx0XHRvRXZlbnQuc2V0TWFya2VkKCk7XG5cdFx0XHRcdFx0XHRcdFx0fVxuXHRcdFx0XHRcdFx0XHR9XG5cdFx0XHRcdFx0XHR9XG5cdFx0XHRcdFx0fSxcblx0XHRcdFx0XHR0cnVlLFxuXHRcdFx0XHRcdHVuZGVmaW5lZCxcblx0XHRcdFx0XHR0cnVlXG5cdFx0XHRcdCk7XG5cdFx0XHR9XG5cdFx0XHRyZXR1cm4gdGhpcztcblx0XHR9XG5cdH1cblxuXHRkZXN0cm95KGJTdXBwcmVzc0ludmFsaWRhdGU6IGJvb2xlYW4pIHtcblx0XHRjb25zdCBvUGFyZW50ID0gdGhpcy5nZXRQYXJlbnQoKTtcblx0XHRpZiAob1BhcmVudCkge1xuXHRcdFx0Y29uc3Qgb0NvbW1hbmQgPSB0aGlzLl9nZXRDb21tYW5kSW5mbygpO1xuXHRcdFx0aWYgKG9Db21tYW5kKSB7XG5cdFx0XHRcdFNob3J0Y3V0LnVucmVnaXN0ZXIodGhpcy5nZXRQYXJlbnQoKSwgb0NvbW1hbmQuc2hvcnRjdXQpO1xuXHRcdFx0fVxuXHRcdFx0dGhpcy5fY2xlYW51cENvbnRleHQob1BhcmVudCk7XG5cdFx0fVxuXHRcdEVsZW1lbnQucHJvdG90eXBlLmRlc3Ryb3kuYXBwbHkodGhpcywgW2JTdXBwcmVzc0ludmFsaWRhdGVdKTtcblx0fVxuXG5cdHNldFZpc2libGUoYlZhbHVlOiBib29sZWFuKSB7XG5cdFx0Y29uc3Qgb0NvbW1hbmQgPSB0aGlzLl9nZXRDb21tYW5kSW5mbygpO1xuXHRcdGlmIChvQ29tbWFuZCkge1xuXHRcdFx0c3VwZXIuc2V0VmlzaWJsZShiVmFsdWUpO1xuXHRcdH0gZWxzZSB7XG5cdFx0XHRMb2cuaW5mbyhcIlRoZXJlIGlzIG5vIHNob3J0Y3V0IGRlZmluaXRpb24gcmVnaXN0ZXJlZCBpbiB0aGUgbWFuaWZlc3QgZm9yIHRoZSBjb21tYW5kIDogXCIgKyB0aGlzLmdldENvbW1hbmQoKSk7XG5cdFx0fVxuXHRcdHJldHVybiB0aGlzO1xuXHR9XG59XG5pbnRlcmZhY2UgQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiB7XG5cdF9nZXRDb21tYW5kSW5mbygpOiBhbnk7XG5cdF9jbGVhbnVwQ29udGV4dChvUGFyZW50OiBhbnkpOiB2b2lkO1xufVxuZXhwb3J0IGRlZmF1bHQgQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbjtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1hbmRFeGVjdXRpb24udHMiXSwibmFtZXMiOlsiQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiIsImRlZmluZVVJNUNsYXNzIiwic2V0UGFyZW50Iiwib1BhcmVudCIsImFDb21tYW5kcyIsImRhdGEiLCJBcnJheSIsImlzQXJyYXkiLCJsZW5ndGgiLCJvQ29tbWFuZCIsIm9TaG9ydGN1dCIsInNob3J0Y3V0U3BlYyIsImtleSIsImRlc3Ryb3kiLCJiU3VwcHJlc3NJbnZhbGlkYXRlIiwiZ2V0UGFyZW50IiwiX2dldENvbW1hbmRJbmZvIiwiU2hvcnRjdXQiLCJ1bnJlZ2lzdGVyIiwic2hvcnRjdXQiLCJfY2xlYW51cENvbnRleHQiLCJFbGVtZW50IiwicHJvdG90eXBlIiwiYXBwbHkiLCJzZXRWaXNpYmxlIiwiYlZhbHVlIiwib1BhcmVudENvbnRyb2wiLCJvQ29tcG9uZW50IiwiQ29tcG9uZW50IiwiZ2V0T3duZXJDb21wb25lbnRGb3IiLCJnZXRDb21tYW5kIiwiTG9nIiwiaW5mbyIsIkNvbW1hbmRFeGVjdXRpb24iXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7OztNQU1NQSxzQixXQURMQyxjQUFjLENBQUMsdUNBQUQsQzs7Ozs7Ozs7O1dBRWRDLFMsR0FBQSxtQkFBVUMsT0FBVixFQUF3QjtBQUN2QjtBQUNBO0FBQ0Esa0NBQU1ELFNBQU4sWUFBZ0JDLE9BQWhCOztBQUNBLFVBQU1DLFNBQVMsR0FBR0QsT0FBTyxDQUFDRSxJQUFSLENBQWEsc0JBQWIsQ0FBbEI7O0FBQ0EsVUFBSUMsS0FBSyxDQUFDQyxPQUFOLENBQWNILFNBQWQsS0FBNEJBLFNBQVMsQ0FBQ0ksTUFBVixHQUFtQixDQUFuRCxFQUFzRDtBQUNyRCxZQUFNQyxRQUFRLEdBQUdOLE9BQU8sQ0FBQ0UsSUFBUixDQUFhLHNCQUFiLEVBQXFDRCxTQUFTLENBQUNJLE1BQVYsR0FBbUIsQ0FBeEQsQ0FBakI7QUFBQSxZQUNDRSxTQUFTLEdBQUdELFFBQVEsQ0FBQ0UsWUFEdEI7O0FBRUEsWUFBSUQsU0FBSixFQUFlO0FBQ2Q7QUFDQSxlQUFLLElBQU1FLEdBQVgsSUFBa0JGLFNBQWxCLEVBQTZCO0FBQzVCLGdCQUFJQSxTQUFTLENBQUNFLEdBQUQsQ0FBVCxJQUFrQkEsR0FBRyxLQUFLLEtBQTlCLEVBQXFDO0FBQ3BDLHFCQUFPLElBQVA7QUFDQTtBQUNEO0FBQ0Q7O0FBQ0QsZUFBTyxJQUFQO0FBQ0E7QUFDRCxLOztXQUVEQyxPLEdBQUEsaUJBQVFDLG1CQUFSLEVBQXNDO0FBQ3JDLFVBQU1YLE9BQU8sR0FBRyxLQUFLWSxTQUFMLEVBQWhCOztBQUNBLFVBQUlaLE9BQUosRUFBYTtBQUNaLFlBQU1NLFFBQVEsR0FBRyxLQUFLTyxlQUFMLEVBQWpCOztBQUNBLFlBQUlQLFFBQUosRUFBYztBQUNiUSxVQUFBQSxRQUFRLENBQUNDLFVBQVQsQ0FBb0IsS0FBS0gsU0FBTCxFQUFwQixFQUFzQ04sUUFBUSxDQUFDVSxRQUEvQztBQUNBOztBQUNELGFBQUtDLGVBQUwsQ0FBcUJqQixPQUFyQjtBQUNBOztBQUNEa0IsTUFBQUEsT0FBTyxDQUFDQyxTQUFSLENBQWtCVCxPQUFsQixDQUEwQlUsS0FBMUIsQ0FBZ0MsSUFBaEMsRUFBc0MsQ0FBQ1QsbUJBQUQsQ0FBdEM7QUFDQSxLOztXQUNEVSxVLEdBQUEsb0JBQVdDLE1BQVgsRUFBNEI7QUFDM0IsVUFBSWhCLFFBQUo7QUFBQSxVQUNDaUIsY0FBYyxHQUFHLEtBQUtYLFNBQUwsRUFEbEI7QUFBQSxVQUVDWSxVQUZEOztBQUlBLGFBQU8sQ0FBQ0EsVUFBRCxJQUFlRCxjQUF0QixFQUFzQztBQUNyQ0MsUUFBQUEsVUFBVSxHQUFHQyxTQUFTLENBQUNDLG9CQUFWLENBQStCSCxjQUEvQixDQUFiO0FBQ0FBLFFBQUFBLGNBQWMsR0FBR0EsY0FBYyxDQUFDWCxTQUFmLEVBQWpCO0FBQ0E7O0FBRUQsVUFBSVksVUFBSixFQUFnQjtBQUNmbEIsUUFBQUEsUUFBUSxHQUFHa0IsVUFBVSxDQUFDRyxVQUFYLENBQXNCLEtBQUtBLFVBQUwsRUFBdEIsQ0FBWDs7QUFFQSxZQUFJckIsUUFBSixFQUFjO0FBQ2Isc0NBQU1lLFVBQU4sWUFBaUJDLE1BQWpCO0FBQ0EsU0FGRCxNQUVPO0FBQ05NLFVBQUFBLEdBQUcsQ0FBQ0MsSUFBSixDQUFTLGtGQUFrRixLQUFLRixVQUFMLEVBQTNGO0FBQ0E7QUFDRDs7QUFDRCxhQUFPLElBQVA7QUFDQSxLOzs7SUFwRG1DRyxnQjtTQTBEdEJqQyxzQiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IExvZyBmcm9tIFwic2FwL2Jhc2UvTG9nXCI7XG5pbXBvcnQgeyBkZWZpbmVVSTVDbGFzcyB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0NsYXNzU3VwcG9ydFwiO1xuaW1wb3J0IENvbW1hbmRFeGVjdXRpb24gZnJvbSBcInNhcC91aS9jb3JlL0NvbW1hbmRFeGVjdXRpb25cIjtcbmltcG9ydCBDb21wb25lbnQgZnJvbSBcInNhcC91aS9jb3JlL0NvbXBvbmVudFwiO1xuaW1wb3J0IEVsZW1lbnQgZnJvbSBcInNhcC91aS9jb3JlL0VsZW1lbnRcIjtcbmltcG9ydCBTaG9ydGN1dCBmcm9tIFwic2FwL3VpL2NvcmUvU2hvcnRjdXRcIjtcblxuQGRlZmluZVVJNUNsYXNzKFwic2FwLmZlLmNvcmUuY29udHJvbHMuQ29tbWFuZEV4ZWN1dGlvblwiKVxuY2xhc3MgQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiBleHRlbmRzIENvbW1hbmRFeGVjdXRpb24ge1xuXHRzZXRQYXJlbnQob1BhcmVudDogYW55KSB7XG5cdFx0Ly8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9iYW4tdHMtY29tbWVudFxuXHRcdC8vIEB0cy1pZ25vcmVcblx0XHRzdXBlci5zZXRQYXJlbnQob1BhcmVudCk7XG5cdFx0Y29uc3QgYUNvbW1hbmRzID0gb1BhcmVudC5kYXRhKFwic2FwLnVpLmNvcmUuU2hvcnRjdXRcIik7XG5cdFx0aWYgKEFycmF5LmlzQXJyYXkoYUNvbW1hbmRzKSAmJiBhQ29tbWFuZHMubGVuZ3RoID4gMCkge1xuXHRcdFx0Y29uc3Qgb0NvbW1hbmQgPSBvUGFyZW50LmRhdGEoXCJzYXAudWkuY29yZS5TaG9ydGN1dFwiKVthQ29tbWFuZHMubGVuZ3RoIC0gMV0sXG5cdFx0XHRcdG9TaG9ydGN1dCA9IG9Db21tYW5kLnNob3J0Y3V0U3BlYztcblx0XHRcdGlmIChvU2hvcnRjdXQpIHtcblx0XHRcdFx0Ly8gQ2hlY2sgaWYgc2luZ2xlIGtleSBzaG9ydGN1dFxuXHRcdFx0XHRmb3IgKGNvbnN0IGtleSBpbiBvU2hvcnRjdXQpIHtcblx0XHRcdFx0XHRpZiAob1Nob3J0Y3V0W2tleV0gJiYga2V5ICE9PSBcImtleVwiKSB7XG5cdFx0XHRcdFx0XHRyZXR1cm4gdGhpcztcblx0XHRcdFx0XHR9XG5cdFx0XHRcdH1cblx0XHRcdH1cblx0XHRcdHJldHVybiB0aGlzO1xuXHRcdH1cblx0fVxuXG5cdGRlc3Ryb3koYlN1cHByZXNzSW52YWxpZGF0ZTogYm9vbGVhbikge1xuXHRcdGNvbnN0IG9QYXJlbnQgPSB0aGlzLmdldFBhcmVudCgpO1xuXHRcdGlmIChvUGFyZW50KSB7XG5cdFx0XHRjb25zdCBvQ29tbWFuZCA9IHRoaXMuX2dldENvbW1hbmRJbmZvKCk7XG5cdFx0XHRpZiAob0NvbW1hbmQpIHtcblx0XHRcdFx0U2hvcnRjdXQudW5yZWdpc3Rlcih0aGlzLmdldFBhcmVudCgpLCBvQ29tbWFuZC5zaG9ydGN1dCk7XG5cdFx0XHR9XG5cdFx0XHR0aGlzLl9jbGVhbnVwQ29udGV4dChvUGFyZW50KTtcblx0XHR9XG5cdFx0RWxlbWVudC5wcm90b3R5cGUuZGVzdHJveS5hcHBseSh0aGlzLCBbYlN1cHByZXNzSW52YWxpZGF0ZV0pO1xuXHR9XG5cdHNldFZpc2libGUoYlZhbHVlOiBib29sZWFuKSB7XG5cdFx0bGV0IG9Db21tYW5kLFxuXHRcdFx0b1BhcmVudENvbnRyb2wgPSB0aGlzLmdldFBhcmVudCgpLFxuXHRcdFx0b0NvbXBvbmVudDogYW55O1xuXG5cdFx0d2hpbGUgKCFvQ29tcG9uZW50ICYmIG9QYXJlbnRDb250cm9sKSB7XG5cdFx0XHRvQ29tcG9uZW50ID0gQ29tcG9uZW50LmdldE93bmVyQ29tcG9uZW50Rm9yKG9QYXJlbnRDb250cm9sKTtcblx0XHRcdG9QYXJlbnRDb250cm9sID0gb1BhcmVudENvbnRyb2wuZ2V0UGFyZW50KCk7XG5cdFx0fVxuXG5cdFx0aWYgKG9Db21wb25lbnQpIHtcblx0XHRcdG9Db21tYW5kID0gb0NvbXBvbmVudC5nZXRDb21tYW5kKHRoaXMuZ2V0Q29tbWFuZCgpKTtcblxuXHRcdFx0aWYgKG9Db21tYW5kKSB7XG5cdFx0XHRcdHN1cGVyLnNldFZpc2libGUoYlZhbHVlKTtcblx0XHRcdH0gZWxzZSB7XG5cdFx0XHRcdExvZy5pbmZvKFwiVGhlcmUgaXMgbm8gc2hvcnRjdXQgZGVmaW5pdGlvbiByZWdpc3RlcmVkIGluIHRoZSBtYW5pZmVzdCBmb3IgdGhlIGNvbW1hbmQgOiBcIiArIHRoaXMuZ2V0Q29tbWFuZCgpKTtcblx0XHRcdH1cblx0XHR9XG5cdFx0cmV0dXJuIHRoaXM7XG5cdH1cbn1cbmludGVyZmFjZSBDdXN0b21Db21tYW5kRXhlY3V0aW9uIHtcblx0X2dldENvbW1hbmRJbmZvKCk6IGFueTtcblx0X2NsZWFudXBDb250ZXh0KG9QYXJlbnQ6IGFueSk6IHZvaWQ7XG59XG5leHBvcnQgZGVmYXVsdCBDdXN0b21Db21tYW5kRXhlY3V0aW9uO1xuIl19