@sapui5/sap.fe.core 1.100.0 → 1.102.0

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

@@ -1,11 +1,13 @@
+import 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 { defineUI5Class } from "sap/fe/core/helpers/ClassSupport";
+import Synchronization from "sap/fe/core/helpers/Synchronization";
 import { IShellServices } from "sap/fe/core/services/ShellServicesFactory";
+import BaseObject from "sap/ui/base/Object";
+import Core from "sap/ui/core/Core";
 import Router from "sap/ui/core/routing/Router";
-import { UI5Class } from "sap/fe/core/helpers/ClassSupport";
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
+import URI from "sap/ui/thirdparty/URI";
+import { CoreEx } from "types/extension_types";
 
 const enumState = {
 	EQUAL: 0,
@@ -27,7 +29,7 @@ const enumURLParams = {
 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;
 		}
 	};
@@ -77,7 +79,7 @@ function setAppStateInHash(sHash: any, sAppStateKey: any) {
 	return sNewHash;
 }
 
-@UI5Class("sap.fe.core.RouterProxy")
+@defineUI5Class("sap.fe.core.RouterProxy")
 class RouterProxy extends BaseObject {
 	bIsRebuildHistoryRunning = false;
 	bIsComputingTitleHierachy = false;
@@ -89,7 +91,6 @@ class RouterProxy extends BaseObject {
 	_fnHashGuard!: Function;
 	_bDisableOnHashChange!: boolean;
 	_bIgnoreRestore!: boolean;
-	_bCleanedRestore!: boolean;
 	_bForceFocus!: boolean;
 	_oRouter!: Router;
 	_oManagedHistory!: any[];
@@ -99,6 +100,7 @@ class RouterProxy extends BaseObject {
 	_bActivateRouteMatchSynchro: boolean = false;
 	_bApplyRestore: boolean = false;
 	_bDelayedRebuild: boolean = false;
+	_pathMappings: { oldPath: string; newPath: string }[] = [];
 
 	init(oAppComponent: any, isfclEnabled: boolean) {
 		// Save the name of the app (including startup parameters) for rebuilding full hashes later
@@ -127,14 +129,13 @@ 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);
 		window.addEventListener("popstate", this._fnHashGuard as any);
 		this._bDisableOnHashChange = false;
 		this._bIgnoreRestore = false;
-		this._bCleanedRestore = false;
 		this._bForceFocus = true; // Trigger the focus mechanism for the first view displayed by the app
 	}
 
@@ -207,7 +208,7 @@ class RouterProxy extends BaseObject {
 		bDisablePreservationCache?: boolean,
 		bForceFocus?: boolean,
 		bPreserveShellBackNavigationHandler?: boolean
-	) {
+	): Promise<boolean> {
 		if (bPreserveShellBackNavigationHandler !== false) {
 			this._oShellServices.setBackNavigation();
 		}
@@ -224,7 +225,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);
@@ -232,7 +233,7 @@ class RouterProxy extends BaseObject {
 
 		if (!this.checkHashWithGuard(sHash)) {
 			if (!this.oResourceBundle) {
-				this.oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle;
+				this.oResourceBundle = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
 			}
 
 			// We have to use a confirm here for UI consistency reasons, as with some scenarios
@@ -254,7 +255,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];
 					}));
 		}
@@ -363,9 +364,11 @@ class RouterProxy extends BaseObject {
 	 * Sets the last state as a guard.
 	 * Each future navigation will be checked against this guard, and a confirmation dialog will
 	 * be displayed before the navigation crosses the guard (i.e. goes to an ancestor of the guard).
+	 *
+	 * @param sHash The hash for the guard
 	 */
-	setNavigationGuard() {
-		this._oNavigationGuard = createGuardFromHash(this.getHash());
+	setNavigationGuard(sHash: string) {
+		this._oNavigationGuard = createGuardFromHash(sHash);
 		this.bIsGuardCrossAllowed = false;
 	}
 
@@ -438,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]);
@@ -630,10 +633,10 @@ class RouterProxy extends BaseObject {
 	 * @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;
@@ -647,7 +650,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);
@@ -661,7 +664,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);
@@ -713,25 +716,38 @@ class RouterProxy extends BaseObject {
 		return this._oManagedHistory[this._oManagedHistory.length - 1];
 	}
 
+	setPathMapping(mappings: { oldPath: string; newPath: string }[]) {
+		this._pathMappings = mappings.filter((mapping) => {
+			return mapping.oldPath !== mapping.newPath;
+		});
+	}
+
 	hashGuard() {
-		if (this._bCleanedRestore) {
-			this._bCleanedRestore = false;
-			return;
-		}
-		const sHash = window.location.hash;
+		let sHash = window.location.hash;
+
 		if (sHash.indexOf("restoreHistory=true") !== -1) {
 			this._bApplyRestore = true;
 		} else if (!this.bIsRebuildHistoryRunning) {
-			const aHashSplit = sHash.split("&/");
-			const sAppHash = aHashSplit[1] ? aHashSplit[1] : "";
-			if (this.checkHashWithGuard(sAppHash)) {
-				this._bDelayedRebuild = true;
-				const oNewState = this._extractStateFromHash(sAppHash);
-				this._pushNewState(oNewState, false, false, true);
-
-				setTimeout(() => {
-					this._bDelayedRebuild = false;
-				}, 0);
+			// 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) => {
+				return sHash.indexOf(m.oldPath) >= 0;
+			});
+			if (mapping) {
+				// Replace the current hash
+				sHash = sHash.replace(mapping.oldPath, mapping.newPath);
+				history.replaceState(Object.assign({}, history.state), "", sHash);
+			} else {
+				const aHashSplit = sHash.split("&/");
+				const sAppHash = aHashSplit[1] ? aHashSplit[1] : "";
+				if (this.checkHashWithGuard(sAppHash)) {
+					this._bDelayedRebuild = true;
+					const oNewState = this._extractStateFromHash(sAppHash);
+					this._pushNewState(oNewState, false, false, true);
+
+					setTimeout(() => {
+						this._bDelayedRebuild = false;
+					}, 0);
+				}
 			}
 		}
 	}

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

@@ -0,0 +1,28 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/ui/base/ManagedObject"], function (ManagedObject) {
+  "use strict";
+
+  /**
+   * @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"
+      }
+    },
+    updateProperty: function () {
+      // Avoid Promise processing in ManagedObject and set Promise as value directly
+      this.setAny(this.getBindingInfo("any").binding.getExternalValue());
+    }
+  });
+  return Any;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkFueS50cyJdLCJuYW1lcyI6WyJBbnkiLCJNYW5hZ2VkT2JqZWN0IiwiZXh0ZW5kIiwibWV0YWRhdGEiLCJwcm9wZXJ0aWVzIiwiYW55IiwidXBkYXRlUHJvcGVydHkiLCJzZXRBbnkiLCJnZXRCaW5kaW5nSW5mbyIsImJpbmRpbmciLCJnZXRFeHRlcm5hbFZhbHVlIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBUUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSxNQUFNQSxHQUFHLEdBQUdDLGFBQWEsQ0FBQ0MsTUFBZCxDQUFxQiwwQkFBckIsRUFBaUQ7QUFDNURDLElBQUFBLFFBQVEsRUFBRTtBQUNUQyxNQUFBQSxVQUFVLEVBQUU7QUFDWEMsUUFBQUEsR0FBRyxFQUFFO0FBRE07QUFESCxLQURrRDtBQU01REMsSUFBQUEsY0FBYyxFQUFFLFlBQXlCO0FBQ3hDO0FBQ0EsV0FBS0MsTUFBTCxDQUFhLEtBQUtDLGNBQUwsQ0FBb0IsS0FBcEIsQ0FBRCxDQUFvQ0MsT0FBcEMsQ0FBNENDLGdCQUE1QyxFQUFaO0FBQ0E7QUFUMkQsR0FBakQsQ0FBWjtTQVllVixHIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgTWFuYWdlZE9iamVjdCBmcm9tIFwic2FwL3VpL2Jhc2UvTWFuYWdlZE9iamVjdFwiO1xuXG5leHBvcnQgdHlwZSBBbnlUeXBlID0gTWFuYWdlZE9iamVjdCAmIHtcblx0bUJpbmRpbmdJbmZvczogb2JqZWN0O1xuXHRnZXRBbnkoKTogYW55O1xuXHRzZXRBbnkodmFsdWU6IGFueSk6IHZvaWQ7XG5cdGdldEJpbmRpbmdJbmZvKHByb3BlcnR5OiBzdHJpbmcpOiBvYmplY3Q7XG5cdGV4dGVuZChzTmFtZTogc3RyaW5nLCBzRXh0ZW5zaW9uOiBhbnkpOiBBbnlUeXBlO1xufTtcblxuLyoqXG4gKiBAY2xhc3NcbiAqIEEgY3VzdG9tIGVsZW1lbnQgdG8gZXZhbHVhdGUgdGhlIHZhbHVlIG9mIEJpbmRpbmcuXG4gKlxuICogQG5hbWUgc2FwLmZlLmNvcmUuY29udHJvbHMuQW55XG4gKiBAaGlkZWNvbnN0cnVjdG9yXG4gKi9cbmNvbnN0IEFueSA9IE1hbmFnZWRPYmplY3QuZXh0ZW5kKFwic2FwLmZlLmNvcmUuY29udHJvbHMuQW55XCIsIHtcblx0bWV0YWRhdGE6IHtcblx0XHRwcm9wZXJ0aWVzOiB7XG5cdFx0XHRhbnk6IFwiYW55XCJcblx0XHR9XG5cdH0sXG5cdHVwZGF0ZVByb3BlcnR5OiBmdW5jdGlvbiAodGhpczogQW55VHlwZSkge1xuXHRcdC8vIEF2b2lkIFByb21pc2UgcHJvY2Vzc2luZyBpbiBNYW5hZ2VkT2JqZWN0IGFuZCBzZXQgUHJvbWlzZSBhcyB2YWx1ZSBkaXJlY3RseVxuXHRcdHRoaXMuc2V0QW55KCh0aGlzLmdldEJpbmRpbmdJbmZvKFwiYW55XCIpIGFzIGFueSkuYmluZGluZy5nZXRFeHRlcm5hbFZhbHVlKCkpO1xuXHR9XG59KTtcblxuZXhwb3J0IGRlZmF1bHQgQW55IGFzIGFueTtcbiJdfQ==

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

@@ -0,0 +1,30 @@
+import ManagedObject from "sap/ui/base/ManagedObject";
+
+export type AnyType = ManagedObject & {
+	mBindingInfos: object;
+	getAny(): any;
+	setAny(value: any): void;
+	getBindingInfo(property: string): object;
+	extend(sName: string, sExtension: any): AnyType;
+};
+
+/**
+ * @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"
+		}
+	},
+	updateProperty: function (this: AnyType) {
+		// Avoid Promise processing in ManagedObject and set Promise as value directly
+		this.setAny((this.getBindingInfo("any") as any).binding.getExternalValue());
+	}
+});
+
+export default Any as any;

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

@@ -2,13 +2,32 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/ui/core/CommandExecution", "sap/base/Log", "sap/ui/core/Element", "sap/ui/core/Shortcut"], function (CommandExecution, Log, 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 CustomCommandExecution = CommandExecution.extend("sap.fe.core.controls.CommandExecution", {
-    setParent: function (oParent) {
-      var aExcludedSingleKey = ["escape"];
-      CommandExecution.prototype.setParent.apply(this, [oParent]);
+  var _dec, _class;
+
+  var defineUI5Class = ClassSupport.defineUI5Class;
+
+  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 CustomCommandExecution = (_dec = defineUI5Class("sap.fe.core.controls.CommandExecution"), _dec(_class = /*#__PURE__*/function (_CommandExecution) {
+    _inheritsLoose(CustomCommandExecution, _CommandExecution);
+
+    function CustomCommandExecution() {
+      return _CommandExecution.apply(this, arguments) || this;
+    }
+
+    var _proto = CustomCommandExecution.prototype;
+
+    _proto.setParent = function setParent(oParent) {
+      var aExcludedSingleKey = ["escape"]; // 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");
 
       if (Array.isArray(aCommands) && aCommands.length > 0) {
@@ -39,8 +58,9 @@ sap.ui.define(["sap/ui/core/CommandExecution", "sap/base/Log", "sap/ui/core/Elem
 
         return this;
       }
-    },
-    destroy: function (bSuppressInvalidate) {
+    };
+
+    _proto.destroy = function destroy(bSuppressInvalidate) {
       var oParent = this.getParent();
 
       if (oParent) {
@@ -54,19 +74,33 @@ sap.ui.define(["sap/ui/core/CommandExecution", "sap/base/Log", "sap/ui/core/Elem
       }
 
       Element.prototype.destroy.apply(this, [bSuppressInvalidate]);
-    },
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    setVisible: function (bValue) {
-      var oCommand = this._getCommandInfo();
+    };
+
+    _proto.setVisible = function setVisible(bValue) {
+      var oCommand,
+          oParentControl = this.getParent(),
+          oComponent = Component.getOwnerComponentFor(this.getParent());
+
+      while (!oComponent && oParentControl && oParentControl.getParent()) {
+        oComponent = Component.getOwnerComponentFor(oParentControl);
+        oParentControl = oParentControl.getParent();
+      }
+
+      if (oComponent) {
+        oCommand = oComponent.getCommand(this.getCommand());
+      }
 
       if (oCommand) {
-        return CommandExecution.prototype.setVisible.apply(this, [bValue]);
+        _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;
+    };
+
+    return CustomCommandExecution;
+  }(CommandExecution)) || _class);
   return CustomCommandExecution;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1hbmRFeGVjdXRpb24udHMiXSwibmFtZXMiOlsiQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiIsIkNvbW1hbmRFeGVjdXRpb24iLCJleHRlbmQiLCJzZXRQYXJlbnQiLCJvUGFyZW50IiwiYUV4Y2x1ZGVkU2luZ2xlS2V5IiwicHJvdG90eXBlIiwiYXBwbHkiLCJhQ29tbWFuZHMiLCJkYXRhIiwiQXJyYXkiLCJpc0FycmF5IiwibGVuZ3RoIiwib0NvbW1hbmQiLCJvU2hvcnRjdXQiLCJzaG9ydGN1dFNwZWMiLCJpbmRleE9mIiwia2V5IiwiYWRkRGVsZWdhdGUiLCJvRXZlbnQiLCJ0b0xvd2VyQ2FzZSIsInNFbGVtZW50IiwidGFyZ2V0IiwidGFnTmFtZSIsInVuZGVmaW5lZCIsInNldE1hcmtlZCIsImRlc3Ryb3kiLCJiU3VwcHJlc3NJbnZhbGlkYXRlIiwiZ2V0UGFyZW50IiwiX2dldENvbW1hbmRJbmZvIiwiU2hvcnRjdXQiLCJ1bnJlZ2lzdGVyIiwic2hvcnRjdXQiLCJfY2xlYW51cENvbnRleHQiLCJFbGVtZW50Iiwic2V0VmlzaWJsZSIsImJWYWx1ZSIsIkxvZyIsImluZm8iLCJnZXRDb21tYW5kIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBU0EsTUFBTUEsc0JBQXNCLEdBQUdDLGdCQUFnQixDQUFDQyxNQUFqQixDQUF3Qix1Q0FBeEIsRUFBaUU7QUFDL0ZDLElBQUFBLFNBQVMsRUFBRSxVQUFTQyxPQUFULEVBQXVCO0FBQ2pDLFVBQU1DLGtCQUFrQixHQUFHLENBQUMsUUFBRCxDQUEzQjtBQUNDSixNQUFBQSxnQkFBZ0IsQ0FBQ0ssU0FBbEIsQ0FBb0NILFNBQXBDLENBQThDSSxLQUE5QyxDQUFvRCxJQUFwRCxFQUEwRCxDQUFDSCxPQUFELENBQTFEO0FBQ0EsVUFBTUksU0FBUyxHQUFHSixPQUFPLENBQUNLLElBQVIsQ0FBYSxzQkFBYixDQUFsQjs7QUFDQSxVQUFJQyxLQUFLLENBQUNDLE9BQU4sQ0FBY0gsU0FBZCxLQUE0QkEsU0FBUyxDQUFDSSxNQUFWLEdBQW1CLENBQW5ELEVBQXNEO0FBQ3JELFlBQU1DLFFBQVEsR0FBR1QsT0FBTyxDQUFDSyxJQUFSLENBQWEsc0JBQWIsRUFBcUNELFNBQVMsQ0FBQ0ksTUFBVixHQUFtQixDQUF4RCxDQUFqQjtBQUFBLFlBQ0NFLFNBQVMsR0FBR0QsUUFBUSxDQUFDRSxZQUR0Qjs7QUFFQSxZQUFJRCxTQUFTLElBQUlULGtCQUFrQixDQUFDVyxPQUFuQixDQUEyQkYsU0FBUyxDQUFDRyxHQUFyQyxJQUE0QyxDQUFDLENBQTlELEVBQWlFO0FBQ2hFO0FBQ0EsZUFBSyxJQUFNQSxHQUFYLElBQWtCSCxTQUFsQixFQUE2QjtBQUM1QixnQkFBSUEsU0FBUyxDQUFDRyxHQUFELENBQVQsSUFBa0JBLEdBQUcsS0FBSyxLQUE5QixFQUFxQztBQUNwQyxxQkFBTyxJQUFQO0FBQ0E7QUFDRCxXQU4rRCxDQU9oRTs7O0FBQ0FiLFVBQUFBLE9BQU8sQ0FBQ2MsV0FBUixDQUNDO0FBQ0MseUJBQWEsVUFBU0MsTUFBVCxFQUFzQjtBQUNsQyxrQkFBSWQsa0JBQWtCLENBQUNXLE9BQW5CLENBQTJCRyxNQUFNLENBQUNGLEdBQVAsQ0FBV0csV0FBWCxFQUEzQixJQUF1RCxDQUFDLENBQTVELEVBQStEO0FBQzlELG9CQUFNQyxRQUFRLEdBQUdGLE1BQU0sQ0FBQ0csTUFBUCxHQUFnQkgsTUFBTSxDQUFDRyxNQUFQLENBQWNDLE9BQWQsQ0FBc0JILFdBQXRCLEVBQWhCLEdBQXNESSxTQUF2RTs7QUFDQSxvQkFBSUgsUUFBUSxLQUFLLE9BQWpCLEVBQTBCO0FBQ3pCRixrQkFBQUEsTUFBTSxDQUFDTSxTQUFQO0FBQ0E7QUFDRDtBQUNEO0FBUkYsV0FERCxFQVdDLElBWEQsRUFZQ0QsU0FaRCxFQWFDLElBYkQ7QUFlQTs7QUFDRCxlQUFPLElBQVA7QUFDQTtBQUNELEtBbEM4RjtBQW9DL0ZFLElBQUFBLE9BQU8sRUFBRSxVQUFtQ0MsbUJBQW5DLEVBQXdEO0FBQ2hFLFVBQU12QixPQUFPLEdBQUcsS0FBS3dCLFNBQUwsRUFBaEI7O0FBQ0EsVUFBSXhCLE9BQUosRUFBYTtBQUNaLFlBQU1TLFFBQVEsR0FBRyxLQUFLZ0IsZUFBTCxFQUFqQjs7QUFDQSxZQUFJaEIsUUFBSixFQUFjO0FBQ2JpQixVQUFBQSxRQUFRLENBQUNDLFVBQVQsQ0FBb0IsS0FBS0gsU0FBTCxFQUFwQixFQUFzQ2YsUUFBUSxDQUFDbUIsUUFBL0M7QUFDQTs7QUFDRCxhQUFLQyxlQUFMLENBQXFCN0IsT0FBckI7QUFDQTs7QUFDRDhCLE1BQUFBLE9BQU8sQ0FBQzVCLFNBQVIsQ0FBa0JvQixPQUFsQixDQUEwQm5CLEtBQTFCLENBQWdDLElBQWhDLEVBQXNDLENBQUNvQixtQkFBRCxDQUF0QztBQUNBLEtBOUM4RjtBQWdEL0Y7QUFDQTtBQUNBUSxJQUFBQSxVQUFVLEVBQUUsVUFBbUNDLE1BQW5DLEVBQWdEO0FBQzNELFVBQU12QixRQUFRLEdBQUcsS0FBS2dCLGVBQUwsRUFBakI7O0FBQ0EsVUFBSWhCLFFBQUosRUFBYztBQUNiLGVBQU9aLGdCQUFnQixDQUFDSyxTQUFqQixDQUEyQjZCLFVBQTNCLENBQXNDNUIsS0FBdEMsQ0FBNEMsSUFBNUMsRUFBa0QsQ0FBQzZCLE1BQUQsQ0FBbEQsQ0FBUDtBQUNBLE9BRkQsTUFFTztBQUNOQyxRQUFBQSxHQUFHLENBQUNDLElBQUosQ0FBUyxrRkFBa0YsS0FBS0MsVUFBTCxFQUEzRjtBQUNBO0FBQ0Q7QUF6RDhGLEdBQWpFLENBQS9CO1NBNERldkMsc0IiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBDb21tYW5kRXhlY3V0aW9uIGZyb20gXCJzYXAvdWkvY29yZS9Db21tYW5kRXhlY3V0aW9uXCI7XG5pbXBvcnQgTG9nIGZyb20gXCJzYXAvYmFzZS9Mb2dcIjtcbmltcG9ydCBFbGVtZW50IGZyb20gXCJzYXAvdWkvY29yZS9FbGVtZW50XCI7XG5pbXBvcnQgU2hvcnRjdXQgZnJvbSBcInNhcC91aS9jb3JlL1Nob3J0Y3V0XCI7XG5cbnR5cGUgQ29tbWFuZEV4ZWN1dGlvbkV4ID0gQ29tbWFuZEV4ZWN1dGlvbiAmIHtcblx0c2V0UGFyZW50KG9QYXJlbnQ6IGFueSk6IHZvaWQ7XG5cdF9nZXRDb21tYW5kSW5mbygpOiBhbnk7XG5cdF9jbGVhbnVwQ29udGV4dChvUGFyZW50OiBhbnkpOiB2b2lkO1xufTtcblxuY29uc3QgQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiA9IENvbW1hbmRFeGVjdXRpb24uZXh0ZW5kKFwic2FwLmZlLmNvcmUuY29udHJvbHMuQ29tbWFuZEV4ZWN1dGlvblwiLCB7XG5cdHNldFBhcmVudDogZnVuY3Rpb24ob1BhcmVudDogYW55KSB7XG5cdFx0Y29uc3QgYUV4Y2x1ZGVkU2luZ2xlS2V5ID0gW1wiZXNjYXBlXCJdO1xuXHRcdChDb21tYW5kRXhlY3V0aW9uLnByb3RvdHlwZSBhcyBhbnkpLnNldFBhcmVudC5hcHBseSh0aGlzLCBbb1BhcmVudF0pO1xuXHRcdGNvbnN0IGFDb21tYW5kcyA9IG9QYXJlbnQuZGF0YShcInNhcC51aS5jb3JlLlNob3J0Y3V0XCIpO1xuXHRcdGlmIChBcnJheS5pc0FycmF5KGFDb21tYW5kcykgJiYgYUNvbW1hbmRzLmxlbmd0aCA+IDApIHtcblx0XHRcdGNvbnN0IG9Db21tYW5kID0gb1BhcmVudC5kYXRhKFwic2FwLnVpLmNvcmUuU2hvcnRjdXRcIilbYUNvbW1hbmRzLmxlbmd0aCAtIDFdLFxuXHRcdFx0XHRvU2hvcnRjdXQgPSBvQ29tbWFuZC5zaG9ydGN1dFNwZWM7XG5cdFx0XHRpZiAob1Nob3J0Y3V0ICYmIGFFeGNsdWRlZFNpbmdsZUtleS5pbmRleE9mKG9TaG9ydGN1dC5rZXkpID4gLTEpIHtcblx0XHRcdFx0Ly8gQ2hlY2sgaWYgc2luZ2xlIGtleSBzaG9ydGN1dFxuXHRcdFx0XHRmb3IgKGNvbnN0IGtleSBpbiBvU2hvcnRjdXQpIHtcblx0XHRcdFx0XHRpZiAob1Nob3J0Y3V0W2tleV0gJiYga2V5ICE9PSBcImtleVwiKSB7XG5cdFx0XHRcdFx0XHRyZXR1cm4gdGhpcztcblx0XHRcdFx0XHR9XG5cdFx0XHRcdH1cblx0XHRcdFx0Ly8gTmVlZCB0byBkaXNhYmxlIFNob3J0Q3V0IHdoZW4gdXNlciBwcmVzcyBzaW5nbGUgc2hvcnRjdXQga2V5IGludG8gYW4gaW5wdXRcblx0XHRcdFx0b1BhcmVudC5hZGREZWxlZ2F0ZShcblx0XHRcdFx0XHR7XG5cdFx0XHRcdFx0XHRcIm9ua2V5ZG93blwiOiBmdW5jdGlvbihvRXZlbnQ6IGFueSkge1xuXHRcdFx0XHRcdFx0XHRpZiAoYUV4Y2x1ZGVkU2luZ2xlS2V5LmluZGV4T2Yob0V2ZW50LmtleS50b0xvd2VyQ2FzZSgpKSA+IC0xKSB7XG5cdFx0XHRcdFx0XHRcdFx0Y29uc3Qgc0VsZW1lbnQgPSBvRXZlbnQudGFyZ2V0ID8gb0V2ZW50LnRhcmdldC50YWdOYW1lLnRvTG93ZXJDYXNlKCkgOiB1bmRlZmluZWQ7XG5cdFx0XHRcdFx0XHRcdFx0aWYgKHNFbGVtZW50ID09PSBcImlucHV0XCIpIHtcblx0XHRcdFx0XHRcdFx0XHRcdG9FdmVudC5zZXRNYXJrZWQoKTtcblx0XHRcdFx0XHRcdFx0XHR9XG5cdFx0XHRcdFx0XHRcdH1cblx0XHRcdFx0XHRcdH1cblx0XHRcdFx0XHR9LFxuXHRcdFx0XHRcdHRydWUsXG5cdFx0XHRcdFx0dW5kZWZpbmVkLFxuXHRcdFx0XHRcdHRydWVcblx0XHRcdFx0KTtcblx0XHRcdH1cblx0XHRcdHJldHVybiB0aGlzO1xuXHRcdH1cblx0fSxcblxuXHRkZXN0cm95OiBmdW5jdGlvbih0aGlzOiBDb21tYW5kRXhlY3V0aW9uRXgsIGJTdXBwcmVzc0ludmFsaWRhdGUpIHtcblx0XHRjb25zdCBvUGFyZW50ID0gdGhpcy5nZXRQYXJlbnQoKTtcblx0XHRpZiAob1BhcmVudCkge1xuXHRcdFx0Y29uc3Qgb0NvbW1hbmQgPSB0aGlzLl9nZXRDb21tYW5kSW5mbygpO1xuXHRcdFx0aWYgKG9Db21tYW5kKSB7XG5cdFx0XHRcdFNob3J0Y3V0LnVucmVnaXN0ZXIodGhpcy5nZXRQYXJlbnQoKSwgb0NvbW1hbmQuc2hvcnRjdXQpO1xuXHRcdFx0fVxuXHRcdFx0dGhpcy5fY2xlYW51cENvbnRleHQob1BhcmVudCk7XG5cdFx0fVxuXHRcdEVsZW1lbnQucHJvdG90eXBlLmRlc3Ryb3kuYXBwbHkodGhpcywgW2JTdXBwcmVzc0ludmFsaWRhdGVdKTtcblx0fSxcblxuXHQvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L2Jhbi10cy1jb21tZW50XG5cdC8vIEB0cy1pZ25vcmVcblx0c2V0VmlzaWJsZTogZnVuY3Rpb24odGhpczogQ29tbWFuZEV4ZWN1dGlvbkV4LCBiVmFsdWU6IGFueSkge1xuXHRcdGNvbnN0IG9Db21tYW5kID0gdGhpcy5fZ2V0Q29tbWFuZEluZm8oKTtcblx0XHRpZiAob0NvbW1hbmQpIHtcblx0XHRcdHJldHVybiBDb21tYW5kRXhlY3V0aW9uLnByb3RvdHlwZS5zZXRWaXNpYmxlLmFwcGx5KHRoaXMsIFtiVmFsdWVdKTtcblx0XHR9IGVsc2Uge1xuXHRcdFx0TG9nLmluZm8oXCJUaGVyZSBpcyBubyBzaG9ydGN1dCBkZWZpbml0aW9uIHJlZ2lzdGVyZWQgaW4gdGhlIG1hbmlmZXN0IGZvciB0aGUgY29tbWFuZCA6IFwiICsgdGhpcy5nZXRDb21tYW5kKCkpO1xuXHRcdH1cblx0fVxufSk7XG5cbmV4cG9ydCBkZWZhdWx0IEN1c3RvbUNvbW1hbmRFeGVjdXRpb247XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbW1hbmRFeGVjdXRpb24udHMiXSwibmFtZXMiOlsiQ3VzdG9tQ29tbWFuZEV4ZWN1dGlvbiIsImRlZmluZVVJNUNsYXNzIiwic2V0UGFyZW50Iiwib1BhcmVudCIsImFFeGNsdWRlZFNpbmdsZUtleSIsImFDb21tYW5kcyIsImRhdGEiLCJBcnJheSIsImlzQXJyYXkiLCJsZW5ndGgiLCJvQ29tbWFuZCIsIm9TaG9ydGN1dCIsInNob3J0Y3V0U3BlYyIsImluZGV4T2YiLCJrZXkiLCJhZGREZWxlZ2F0ZSIsIm9FdmVudCIsInRvTG93ZXJDYXNlIiwic0VsZW1lbnQiLCJ0YXJnZXQiLCJ0YWdOYW1lIiwidW5kZWZpbmVkIiwic2V0TWFya2VkIiwiZGVzdHJveSIsImJTdXBwcmVzc0ludmFsaWRhdGUiLCJnZXRQYXJlbnQiLCJfZ2V0Q29tbWFuZEluZm8iLCJTaG9ydGN1dCIsInVucmVnaXN0ZXIiLCJzaG9ydGN1dCIsIl9jbGVhbnVwQ29udGV4dCIsIkVsZW1lbnQiLCJwcm90b3R5cGUiLCJhcHBseSIsInNldFZpc2libGUiLCJiVmFsdWUiLCJvUGFyZW50Q29udHJvbCIsIm9Db21wb25lbnQiLCJDb21wb25lbnQiLCJnZXRPd25lckNvbXBvbmVudEZvciIsImdldENvbW1hbmQiLCJMb2ciLCJpbmZvIiwiQ29tbWFuZEV4ZWN1dGlvbiJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7O01BTU1BLHNCLFdBRExDLGNBQWMsQ0FBQyx1Q0FBRCxDOzs7Ozs7Ozs7V0FFZEMsUyxHQUFBLG1CQUFVQyxPQUFWLEVBQXdCO0FBQ3ZCLFVBQU1DLGtCQUFrQixHQUFHLENBQUMsUUFBRCxDQUEzQixDQUR1QixDQUV2QjtBQUNBOztBQUNBLGtDQUFNRixTQUFOLFlBQWdCQyxPQUFoQjs7QUFDQSxVQUFNRSxTQUFTLEdBQUdGLE9BQU8sQ0FBQ0csSUFBUixDQUFhLHNCQUFiLENBQWxCOztBQUNBLFVBQUlDLEtBQUssQ0FBQ0MsT0FBTixDQUFjSCxT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LGdCO1NBd0V0QjNDLHNCIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgTG9nIGZyb20gXCJzYXAvYmFzZS9Mb2dcIjtcbmltcG9ydCB7IGRlZmluZVVJNUNsYXNzIH0gZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvQ2xhc3NTdXBwb3J0XCI7XG5pbXBvcnQgQ29tbWFuZEV4ZWN1dGlvbiBmcm9tIFwic2FwL3VpL2NvcmUvQ29tbWFuZEV4ZWN1dGlvblwiO1xuaW1wb3J0IENvbXBvbmVudCBmcm9tIFwic2FwL3VpL2NvcmUvQ29tcG9uZW50XCI7XG5pbXBvcnQgRWxlbWVudCBmcm9tIFwic2FwL3VpL2NvcmUvRWxlbWVudFwiO1xuaW1wb3J0IFNob3J0Y3V0IGZyb20gXCJzYXAvdWkvY29yZS9TaG9ydGN1dFwiO1xuXG5AZGVmaW5lVUk1Q2xhc3MoXCJzYXAuZmUuY29yZS5jb250cm9scy5Db21tYW5kRXhlY3V0aW9uXCIpXG5jbGFzcyBDdXN0b21Db21tYW5kRXhlY3V0aW9uIGV4dGVuZHMgQ29tbWFuZEV4ZWN1dGlvbiB7XG5cdHNldFBhcmVudChvUGFyZW50OiBhbnkpIHtcblx0XHRjb25zdCBhRXhjbHVkZWRTaW5nbGVLZXkgPSBbXCJlc2NhcGVcIl07XG5cdFx0Ly8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIEB0eXBlc2NyaXB0LWVzbGludC9iYW4tdHMtY29tbWVudFxuXHRcdC8vIEB0cy1pZ25vcmVcblx0XHRzdXBlci5zZXRQYXJlbnQob1BhcmVudCk7XG5cdFx0Y29uc3QgYUNvbW1hbmRzID0gb1BhcmVudC5kYXRhKFwic2FwLnVpLmNvcmUuU2hvcnRjdXRcIik7XG5cdFx0aWYgKEFycmF5LmlzQXJyYXkoYUNvbW1hbmRzKSAmJiBhQ29tbWFuZHMubGVuZ3RoID4gMCkge1xuXHRcdFx0Y29uc3Qgb0NvbW1hbmQgPSBvUGFyZW50LmRhdGEoXCJzYXAudWkuY29yZS5TaG9ydGN1dFwiKVthQ29tbWFuZHMubGVuZ3RoIC0gMV0sXG5cdFx0XHRcdG9TaG9ydGN1dCA9IG9Db21tYW5kLnNob3J0Y3V0U3BlYztcblx0XHRcdGlmIChvU2hvcnRjdXQgJiYgYUV4Y2x1ZGVkU2luZ2xlS2V5LmluZGV4T2Yob1Nob3J0Y3V0LmtleSkgPiAtMSkge1xuXHRcdFx0XHQvLyBDaGVjayBpZiBzaW5nbGUga2V5IHNob3J0Y3V0XG5cdFx0XHRcdGZvciAoY29uc3Qga2V5IGluIG9TaG9ydGN1dCkge1xuXHRcdFx0XHRcdGlmIChvU2hvcnRjdXRba2V5XSAmJiBrZXkgIT09IFwia2V5XCIpIHtcblx0XHRcdFx0XHRcdHJldHVybiB0aGlzO1xuXHRcdFx0XHRcdH1cblx0XHRcdFx0fVxuXHRcdFx0XHQvLyBOZWVkIHRvIGRpc2FibGUgU2hvcnRDdXQgd2hlbiB1c2VyIHByZXNzIHNpbmdsZSBzaG9ydGN1dCBrZXkgaW50byBhbiBpbnB1dFxuXHRcdFx0XHRvUGFyZW50LmFkZERlbGVnYXRlKFxuXHRcdFx0XHRcdHtcblx0XHRcdFx0XHRcdFwib25rZXlkb3duXCI6IGZ1bmN0aW9uIChvRXZlbnQ6IGFueSkge1xuXHRcdFx0XHRcdFx0XHRpZiAoYUV4Y2x1ZGVkU2luZ2xlS2V5LmluZGV4T2Yob0V2ZW50LmtleS50b0xvd2VyQ2FzZSgpKSA+IC0xKSB7XG5cdFx0XHRcdFx0XHRcdFx0Y29uc3Qgc0VsZW1lbnQgPSBvRXZlbnQudGFyZ2V0ID8gb0V2ZW50LnRhcmdldC50YWdOYW1lLnRvTG93ZXJDYXNlKCkgOiB1bmRlZmluZWQ7XG5cdFx0XHRcdFx0XHRcdFx0aWYgKHNFbGVtZW50ID09PSBcImlucHV0XCIpIHtcblx0XHRcdFx0XHRcdFx0XHRcdG9FdmVudC5zZXRNYXJrZWQoKTtcblx0XHRcdFx0XHRcdFx0XHR9XG5cdFx0XHRcdFx0XHRcdH1cblx0XHRcdFx0XHRcdH1cblx0XHRcdFx0XHR9LFxuXHRcdFx0XHRcdHRydWUsXG5cdFx0XHRcdFx0dW5kZWZpbmVkLFxuXHRcdFx0XHRcdHRydWVcblx0XHRcdFx0KTtcblx0XHRcdH1cblx0XHRcdHJldHVybiB0aGlzO1xuXHRcdH1cblx0fVxuXG5cdGRlc3Ryb3koYlN1cHByZXNzSW52YWxpZGF0ZTogYm9vbGVhbikge1xuXHRcdGNvbnN0IG9QYXJlbnQgPSB0aGlzLmdldFBhcmVudCgpO1xuXHRcdGlmIChvUGFyZW50KSB7XG5cdFx0XHRjb25zdCBvQ29tbWFuZCA9IHRoaXMuX2dldENvbW1hbmRJbmZvKCk7XG5cdFx0XHRpZiAob0NvbW1hbmQpIHtcblx0XHRcdFx0U2hvcnRjdXQudW5yZWdpc3Rlcih0aGlzLmdldFBhcmVudCgpLCBvQ29tbWFuZC5zaG9ydGN1dCk7XG5cdFx0XHR9XG5cdFx0XHR0aGlzLl9jbGVhbnVwQ29udGV4dChvUGFyZW50KTtcblx0XHR9XG5cdFx0RWxlbWVudC5wcm90b3R5cGUuZGVzdHJveS5hcHBseSh0aGlzLCBbYlN1cHByZXNzSW52YWxpZGF0ZV0pO1xuXHR9XG5cdHNldFZpc2libGUoYlZhbHVlOiBib29sZWFuKSB7XG5cdFx0bGV0IG9Db21tYW5kLFxuXHRcdFx0b1BhcmVudENvbnRyb2wgPSB0aGlzLmdldFBhcmVudCgpLFxuXHRcdFx0b0NvbXBvbmVudDogYW55ID0gQ29tcG9uZW50LmdldE93bmVyQ29tcG9uZW50Rm9yKHRoaXMuZ2V0UGFyZW50KCkpO1xuXHRcdHdoaWxlICghb0NvbXBvbmVudCAmJiBvUGFyZW50Q29udHJvbCAmJiBvUGFyZW50Q29udHJvbC5nZXRQYXJlbnQoKSkge1xuXHRcdFx0b0NvbXBvbmVudCA9IENvbXBvbmVudC5nZXRPd25lckNvbXBvbmVudEZvcihvUGFyZW50Q29udHJvbCk7XG5cdFx0XHRvUGFyZW50Q29udHJvbCA9IG9QYXJlbnRDb250cm9sLmdldFBhcmVudCgpO1xuXHRcdH1cblx0XHRpZiAob0NvbXBvbmVudCkge1xuXHRcdFx0b0NvbW1hbmQgPSBvQ29tcG9uZW50LmdldENvbW1hbmQodGhpcy5nZXRDb21tYW5kKCkpO1xuXHRcdH1cblx0XHRpZiAob0NvbW1hbmQpIHtcblx0XHRcdHN1cGVyLnNldFZpc2libGUoYlZhbHVlKTtcblx0XHR9IGVsc2Uge1xuXHRcdFx0TG9nLmluZm8oXCJUaGVyZSBpcyBubyBzaG9ydGN1dCBkZWZpbml0aW9uIHJlZ2lzdGVyZWQgaW4gdGhlIG1hbmlmZXN0IGZvciB0aGUgY29tbWFuZCA6IFwiICsgdGhpcy5nZXRDb21tYW5kKCkpO1xuXHRcdH1cblx0XHRyZXR1cm4gdGhpcztcblx0fVxufVxuaW50ZXJmYWNlIEN1c3RvbUNvbW1hbmRFeGVjdXRpb24ge1xuXHRfZ2V0Q29tbWFuZEluZm8oKTogYW55O1xuXHRfY2xlYW51cENvbnRleHQob1BhcmVudDogYW55KTogdm9pZDtcbn1cbmV4cG9ydCBkZWZhdWx0IEN1c3RvbUNvbW1hbmRFeGVjdXRpb247XG4iXX0=

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

@@ -1,18 +1,17 @@
-import CommandExecution from "sap/ui/core/CommandExecution";
 import Log from "sap/base/Log";
+import { defineUI5Class } from "sap/fe/core/helpers/ClassSupport";
+import CommandExecution from "sap/ui/core/CommandExecution";
+import Component from "sap/ui/core/Component";
 import Element from "sap/ui/core/Element";
 import Shortcut from "sap/ui/core/Shortcut";
 
-type CommandExecutionEx = CommandExecution & {
-	setParent(oParent: any): void;
-	_getCommandInfo(): any;
-	_cleanupContext(oParent: any): void;
-};
-
-const CustomCommandExecution = CommandExecution.extend("sap.fe.core.controls.CommandExecution", {
-	setParent: function(oParent: any) {
+@defineUI5Class("sap.fe.core.controls.CommandExecution")
+class CustomCommandExecution extends CommandExecution {
+	setParent(oParent: any) {
 		const aExcludedSingleKey = ["escape"];
-		(CommandExecution.prototype as any).setParent.apply(this, [oParent]);
+		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+		// @ts-ignore
+		super.setParent(oParent);
 		const aCommands = oParent.data("sap.ui.core.Shortcut");
 		if (Array.isArray(aCommands) && aCommands.length > 0) {
 			const oCommand = oParent.data("sap.ui.core.Shortcut")[aCommands.length - 1],
@@ -27,7 +26,7 @@ const CustomCommandExecution = CommandExecution.extend("sap.fe.core.controls.Com
 				// Need to disable ShortCut when user press single shortcut key into an input
 				oParent.addDelegate(
 					{
-						"onkeydown": function(oEvent: any) {
+						"onkeydown": function (oEvent: any) {
 							if (aExcludedSingleKey.indexOf(oEvent.key.toLowerCase()) > -1) {
 								const sElement = oEvent.target ? oEvent.target.tagName.toLowerCase() : undefined;
 								if (sElement === "input") {
@@ -43,9 +42,9 @@ const CustomCommandExecution = CommandExecution.extend("sap.fe.core.controls.Com
 			}
 			return this;
 		}
-	},
+	}
 
-	destroy: function(this: CommandExecutionEx, bSuppressInvalidate) {
+	destroy(bSuppressInvalidate: boolean) {
 		const oParent = this.getParent();
 		if (oParent) {
 			const oCommand = this._getCommandInfo();
@@ -55,18 +54,28 @@ const CustomCommandExecution = CommandExecution.extend("sap.fe.core.controls.Com
 			this._cleanupContext(oParent);
 		}
 		Element.prototype.destroy.apply(this, [bSuppressInvalidate]);
-	},
-
-	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-	// @ts-ignore
-	setVisible: function(this: CommandExecutionEx, bValue: any) {
-		const oCommand = this._getCommandInfo();
+	}
+	setVisible(bValue: boolean) {
+		let oCommand,
+			oParentControl = this.getParent(),
+			oComponent: any = Component.getOwnerComponentFor(this.getParent());
+		while (!oComponent && oParentControl && oParentControl.getParent()) {
+			oComponent = Component.getOwnerComponentFor(oParentControl);
+			oParentControl = oParentControl.getParent();
+		}
+		if (oComponent) {
+			oCommand = oComponent.getCommand(this.getCommand());
+		}
 		if (oCommand) {
-			return CommandExecution.prototype.setVisible.apply(this, [bValue]);
+			super.setVisible(bValue);
 		} else {
 			Log.info("There is no shortcut definition registered in the manifest for the command : " + this.getCommand());
 		}
+		return this;
 	}
-});
-
+}
+interface CustomCommandExecution {
+	_getCommandInfo(): any;
+	_cleanupContext(oParent: any): void;
+}
 export default CustomCommandExecution;