@sapui5/sap.ushell 1.136.3 → 1.138.0

package/src/main/js/sap/ushell/URLTemplateProcessor/DefinitionParameterSetBuilder.js

@@ -4,7 +4,7 @@
  * @fileOverview Methods to build the set of parameters used by the URL template.
  *
  *
- * @version 1.136.3
+ * @version 1.138.0
  *
  * @private
  *
@@ -14,12 +14,12 @@ sap.ui.define([
     "sap/ushell/URLTemplateProcessor/Resolvers",
     "sap/ushell/URLTemplateProcessor/utils",
     "sap/ushell/utils/type"
-], function (oTemplateParameterParser, oResolvers, oUtils, oType) {
+], (oTemplateParameterParser, oResolvers, oUtils, oType) => {
     "use strict";
 
     /* eslint-disable no-use-before-define */
 
-    var S_PARAMETER_NAMES_PATH = "/payload/parameters/names";
+    const S_PARAMETER_NAMES_PATH = "/payload/parameters/names";
 
     function buildDefinitionParameterSet (oParamDefs, oSite, sDefaultNamespace) {
         if (!oParamDefs || !oParamDefs.names) {
@@ -30,22 +30,21 @@ sap.ui.define([
             // no merge with specified
             return oParamDefs.names;
         }
-        var vMergeWithOption = oParamDefs && oParamDefs.mergeWith;
+        const vMergeWithOption = oParamDefs && oParamDefs.mergeWith;
         if (Array.isArray(vMergeWithOption) === false
             && typeof vMergeWithOption !== "string") {
-
             throw new Error("The value of 'mergeWith' can only be a string or an array");
         }
 
-        var oParamNames = oParamDefs && oParamDefs.names;
+        const oParamNames = oParamDefs && oParamDefs.names;
 
-        var aDependingParameterPaths = findDependingParameterPaths(oParamDefs.mergeWith, oSite, sDefaultNamespace, {} /* oVisitedPaths */);
+        const aDependingParameterPaths = findDependingParameterPaths(oParamDefs.mergeWith, oSite, sDefaultNamespace, {} /* oVisitedPaths */);
 
-        var oMergedParamNames = aDependingParameterPaths
-            .map(function (sMergeWithNamesPath) {
-                var oParsedPath = oTemplateParameterParser.parsePath(sDefaultNamespace, sMergeWithNamesPath);
+        const oMergedParamNames = aDependingParameterPaths
+            .map((sMergeWithNamesPath) => {
+                const oParsedPath = oTemplateParameterParser.parsePath(sDefaultNamespace, sMergeWithNamesPath);
                 validateMergeWithPath(oParsedPath);
-                var oTargetParamNames = oResolvers.resolvePath(
+                const oTargetParamNames = oResolvers.resolvePath(
                     oParsedPath, // oParamDef
                     {}, // oResolvedParameters
                     oSite, // oSite
@@ -54,12 +53,12 @@ sap.ui.define([
                 );
 
                 if (!oType.isPlainObject(oTargetParamNames)) {
-                    throw new Error("Cannot merge parameters from '" + sMergeWithNamesPath + "'. The path must point to an object");
+                    throw new Error(`Cannot merge parameters from '${sMergeWithNamesPath}'. The path must point to an object`);
                 }
 
                 return oTargetParamNames;
             })
-            .reduce(function (oMerged, oDependencyParamNames) {
+            .reduce((oMerged, oDependencyParamNames) => {
                 oMerged = oUtils.mergeObject(oMerged, oDependencyParamNames);
                 return oMerged;
             }, {});
@@ -72,14 +71,13 @@ sap.ui.define([
             throw new Error("Please only specify absolute paths via mergeWith");
         }
 
-        oParsedPath.value.forEach(function (oPathPart) {
+        oParsedPath.value.forEach((oPathPart) => {
             if (oPathPart.type !== "literal") {
                 throw new Error("Please do not specify references in mergeWith paths");
             }
         });
     }
 
-
     function findDependingParameterPaths (vMergeWith, oSite, sDefaultNamespace, oVisitedPaths) {
         if (Array.isArray(vMergeWith)) {
             /* Array notation: just merge a set of names (don't follow mergeWiths) */
@@ -92,9 +90,9 @@ sap.ui.define([
             oVisitedPaths[vMergeWith] = true; // mark as visited
 
             /* String notation: add names of the template + follow merges */
-            var oParsedPath = oTemplateParameterParser.parsePath(sDefaultNamespace, vMergeWith);
+            const oParsedPath = oTemplateParameterParser.parsePath(sDefaultNamespace, vMergeWith);
             validateMergeWithPath(oParsedPath);
-            var oTemplateDef = oResolvers.resolvePath(
+            const oTemplateDef = oResolvers.resolvePath(
                 oParsedPath, // oParamDef
                 {}, // oResolvedParameters
                 oSite, // oSite
@@ -103,10 +101,10 @@ sap.ui.define([
             );
 
             if (!oTemplateDef) {
-                throw new Error("The specified mergeWith path does cannot be resolved: '" + vMergeWith + "'");
+                throw new Error(`The specified mergeWith path does cannot be resolved: '${vMergeWith}'`);
             }
 
-            var bHasAllNecessaryTemplateProperties = S_PARAMETER_NAMES_PATH.split("/").slice(1).reduce(function (o, sSegment) {
+            const bHasAllNecessaryTemplateProperties = S_PARAMETER_NAMES_PATH.split("/").slice(1).reduce((o, sSegment) => {
                 if (o.result && o.obj && o.obj.hasOwnProperty(sSegment)) {
                     o.obj = o.obj[sSegment];
                 } else {
@@ -116,7 +114,7 @@ sap.ui.define([
             }, { obj: oTemplateDef, result: true }).result;
 
             if (!bHasAllNecessaryTemplateProperties) {
-                throw new Error(vMergeWith + " does not contain " + S_PARAMETER_NAMES_PATH + ". Please make sure " + vMergeWith + " points to the root of a URL template.");
+                throw new Error(`${vMergeWith} does not contain ${S_PARAMETER_NAMES_PATH}. Please make sure ${vMergeWith} points to the root of a URL template.`);
             }
 
             return findDependingParameterPaths(
@@ -125,9 +123,9 @@ sap.ui.define([
                 sDefaultNamespace,
                 oVisitedPaths
             )
-            .concat(
-                [vMergeWith + S_PARAMETER_NAMES_PATH]
-            );
+                .concat(
+                    [vMergeWith + S_PARAMETER_NAMES_PATH]
+                );
         }
 
         return [];
@@ -136,5 +134,4 @@ sap.ui.define([
     return {
         buildDefinitionParameterSet: buildDefinitionParameterSet
     };
-
 }, false /* bExport */);

package/src/main/js/sap/ushell/URLTemplateProcessor/DependencyGraph.js

@@ -8,14 +8,14 @@
  * The proper order of evaluation can be determined by creating and visiting a graph that represents parameters and depending parameters
  * as nodes. This graph can be also used to detect cyclic references in the parameter set definition.
  *
- * @version 1.136.3
+ * @version 1.138.0
  * @private
  */
 sap.ui.define([
     "sap/base/util/deepExtend"
-], function (
+], (
     deepExtend
-) {
+) => {
     "use strict";
 
     function isTerminalNode (oNode) {
@@ -39,20 +39,8 @@ sap.ui.define([
         }
     }
 
-    function buildDependencyGraph (oParameterSetParsed) {
-        var oDependencyGraph = {};
-        var fnAddNodeToGraph = addDependencyNodeToGraph.bind(null, oDependencyGraph);
-
-        Object.keys(oParameterSetParsed).forEach(function (sParameter) {
-            var oNode = oParameterSetParsed[sParameter];
-            visitNode(oNode, sParameter, fnAddNodeToGraph);
-        });
-
-        return oDependencyGraph;
-    }
-
     function extractNodeDependencies (oNode) {
-        var sNodeType = oNode.type;
+        const sNodeType = oNode.type;
 
         if (sNodeType === "expression") {
             return [oNode.value];
@@ -63,7 +51,7 @@ sap.ui.define([
         if (sNodeType === "pipe" || sNodeType === "path") {
             return oNode.value; // already an array
         }
-        throw new Error("Unknown type encountered while building dependency graph: '" + sNodeType + "'");
+        throw new Error(`Unknown type encountered while building dependency graph: '${sNodeType}'`);
     }
 
     function visitNode (oNode, sParent, fnAddNodeToGraph) {
@@ -73,27 +61,39 @@ sap.ui.define([
             return;
         }
 
-        var aNodeContent = extractNodeDependencies(oNode);
-        aNodeContent.forEach(function (oNode) {
+        const aNodeContent = extractNodeDependencies(oNode);
+        aNodeContent.forEach((oNode) => {
             visitNode(oNode, sParent, fnAddNodeToGraph);
         });
     }
 
+    function buildDependencyGraph (oParameterSetParsed) {
+        const oDependencyGraph = {};
+        const fnAddNodeToGraph = addDependencyNodeToGraph.bind(null, oDependencyGraph);
+
+        Object.keys(oParameterSetParsed).forEach((sParameter) => {
+            const oNode = oParameterSetParsed[sParameter];
+            visitNode(oNode, sParameter, fnAddNodeToGraph);
+        });
+
+        return oDependencyGraph;
+    }
+
     function getDependencyResolutionOrder (oDependencyGraphReadOnly) {
-        var oDependencyGraph = deepExtend({}, oDependencyGraphReadOnly);
-        var iNumNodesBefore,
-            iNumNodesAfter,
-            aResolutionOrder = [],
-            oResolutionOrderIndex = {};
+        const oDependencyGraph = deepExtend({}, oDependencyGraphReadOnly);
+        let iNumNodesBefore;
+        let iNumNodesAfter;
+        const aResolutionOrder = [];
+        const oResolutionOrderIndex = {};
 
         do {
-            var aDependencyGraphNodes = Object.keys(oDependencyGraph);
+            const aDependencyGraphNodes = Object.keys(oDependencyGraph);
             iNumNodesBefore = aDependencyGraphNodes.length;
-            aDependencyGraphNodes.forEach(function (sNode) {
+            aDependencyGraphNodes.forEach((sNode) => {
                 if (oDependencyGraph[sNode].length > 0) {
-                    oDependencyGraph[sNode] = oDependencyGraph[sNode].filter(function (sDependant) {
-                        var bWasNotDetermined = !oResolutionOrderIndex[sDependant];
-                        var bMustBeDetermined = oDependencyGraph.hasOwnProperty(sDependant);
+                    oDependencyGraph[sNode] = oDependencyGraph[sNode].filter((sDependant) => {
+                        const bWasNotDetermined = !oResolutionOrderIndex[sDependant];
+                        const bMustBeDetermined = oDependencyGraph.hasOwnProperty(sDependant);
                         return bWasNotDetermined && bMustBeDetermined;
                     });
                 }

package/src/main/js/sap/ushell/URLTemplateProcessor/Functions.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Methods to parse and execute functions defined for the URL Template parameter language.
- * @version 1.136.3
+ * @version 1.138.0
  * @private
  */
 sap.ui.define([
@@ -10,12 +10,12 @@ sap.ui.define([
     "sap/ui/thirdparty/URI",
     "sap/ushell/URLTemplateProcessor/utils",
     "sap/ushell/utils/type"
-], function (
+], (
     deepExtend,
     URI,
     _utils,
     ushellType
-) {
+) => {
     "use strict";
 
     /*
@@ -64,14 +64,48 @@ sap.ui.define([
      * - The number of items in vValues can be controlled by minValues and maxValues, which will cause the engine to throw during parsing.
      */
 
-    var O_FUNCTION = {
+    function isEmpty (v) {
+        if (typeof v === "undefined") {
+            return true;
+        }
+        if (typeof v === "string") {
+            return v === "";
+        }
+        if (typeof v === "object") {
+            return Object.keys(v).length === 0;
+        }
+        if (typeof v === "number") {
+            return v === 0;
+        }
+        if (typeof v === "boolean") {
+            return v === false;
+        }
+
+        throw new Error("Unexpected type for value");
+    }
+
+    function getValuesAsArray (vValues) {
+        let aValues;
+        if (ushellType.isArray(vValues)) {
+            aValues = vValues;
+        } else if (ushellType.isPlainObject(vValues)) {
+            aValues = [vValues];
+        } else if (vValues === undefined) {
+            return [];
+        } else {
+            throw new Error("Unexpected type");
+        }
+        return aValues;
+    }
+
+    const O_FUNCTION = {
         url: {
             args: ["urlPart?"],
             minValues: 0,
             maxValues: 0,
             fn: function (oArgs) {
-                var oURL = new URI();
-                var aAllowedPartArg = [
+                const oURL = new URI();
+                const aAllowedPartArg = [
                     "protocol",
                     "scheme",
                     "username",
@@ -97,10 +131,10 @@ sap.ui.define([
                     "resource"
                 ];
 
-                var sMethod = "toString";
+                let sMethod = "toString";
                 if (oArgs.urlPart) {
                     if (aAllowedPartArg.indexOf(oArgs.urlPart) === -1) {
-                        throw new Error("The URL part '" + oArgs.urlPart + "' is not valid. Please use one of " + aAllowedPartArg.join(", "));
+                        throw new Error(`The URL part '${oArgs.urlPart}' is not valid. Please use one of ${aAllowedPartArg.join(", ")}`);
                     }
                     sMethod = oArgs.urlPart;
                 }
@@ -113,7 +147,7 @@ sap.ui.define([
             minValues: 1,
             maxValues: 2,
             fn: function (oArgs, vValues) {
-                var aValues = getValuesAsArray(vValues);
+                const aValues = getValuesAsArray(vValues);
 
                 if (isEmpty(oArgs.trueCondition)) {
                     return aValues.length === 1
@@ -128,7 +162,7 @@ sap.ui.define([
             args: ["emptyCondition?"],
             minValues: 1,
             fn: function (oArgs, vValues) {
-                var aValues = getValuesAsArray(vValues);
+                const aValues = getValuesAsArray(vValues);
 
                 if (typeof oArgs.emptyCondition === "undefined" && oArgs.length > 0) {
                     return undefined;
@@ -138,8 +172,8 @@ sap.ui.define([
                     return undefined;
                 }
 
-                var sLastValue = aValues.pop();
-                var bAllValuesDefined = aValues.every(_utils.hasValue);
+                const sLastValue = aValues.pop();
+                const bAllValuesDefined = aValues.every(_utils.hasValue);
                 return bAllValuesDefined
                     ? sLastValue
                     : undefined;
@@ -149,7 +183,7 @@ sap.ui.define([
             args: ["emptyCondition?"],
             minValues: 1,
             fn: function (oArgs, vValues) {
-                var aValues = getValuesAsArray(vValues);
+                const aValues = getValuesAsArray(vValues);
 
                 if (typeof oArgs.emptyCondition === "undefined" && oArgs.length > 0) {
                     return undefined;
@@ -158,7 +192,7 @@ sap.ui.define([
                     return undefined;
                 }
 
-                return aValues.reduce(function (sPreviousVal, sNextVal) {
+                return aValues.reduce((sPreviousVal, sNextVal) => {
                     if (_utils.hasValue(sPreviousVal)) {
                         return sPreviousVal;
                     }
@@ -173,8 +207,8 @@ sap.ui.define([
             minValues: 1,
             maxValues: 1,
             fn: function (oArgs, vValues) {
-                var rRegex = new RegExp(oArgs.strRegExp, oArgs.flags);
-                var sReplace = oArgs.strReplace || "";
+                const rRegex = new RegExp(oArgs.strRegExp, oArgs.flags);
+                const sReplace = oArgs.strReplace || "";
 
                 /* eslint-disable valid-typeof */
                 if (typeof vValues === undefined || vValues === null) {
@@ -193,7 +227,7 @@ sap.ui.define([
 
                 if (ushellType.isPlainObject(vValues)) {
                     return Object.keys(vValues).reduce(function (o, sKey) {
-                        var vValue = vValues[sKey];
+                        const vValue = vValues[sKey];
                         o[sKey] = O_FUNCTION.replace.fn.call(this, oArgs, vValue);
                         return o;
                     }, {});
@@ -204,30 +238,30 @@ sap.ui.define([
                 }
 
                 // boolean or number types are converted to a string
-                return O_FUNCTION.replace.fn.call(this, oArgs, vValues + "");
+                return O_FUNCTION.replace.fn.call(this, oArgs, `${vValues}`);
             }
         },
         join: {
             args: ["macroSeparator?", "microSeparator?"],
             minValues: 1,
             fnPipe: function (oArgs, oValues) {
-                var aValues = [oValues];
+                const aValues = [oValues];
                 return O_FUNCTION.join.fn.call(this, oArgs, aValues);
             },
             fn: function (oArgs, aValues) {
-                var sMacroSeparator = oArgs.macroSeparator || "";
-                var sMicroSeparator = oArgs.microSeparator || "";
+                const sMacroSeparator = oArgs.macroSeparator || "";
+                const sMicroSeparator = oArgs.microSeparator || "";
 
-                aValues = aValues.map(function (vSimpleOrComplex) {
+                aValues = aValues.map((vSimpleOrComplex) => {
                     if (!ushellType.isPlainObject(vSimpleOrComplex) && !ushellType.isArray(vSimpleOrComplex)) {
                         return vSimpleOrComplex;
                     }
 
-                    var sType = Object.prototype.toString.apply(vSimpleOrComplex);
+                    const sType = Object.prototype.toString.apply(vSimpleOrComplex);
 
                     if (sType === "[object Object]") {
-                        var aSanitizedParameters = _utils.removeArrayParameterNotation(vSimpleOrComplex);
-                        return Object.keys(aSanitizedParameters).sort().map(function (sKey) {
+                        const aSanitizedParameters = _utils.removeArrayParameterNotation(vSimpleOrComplex);
+                        return Object.keys(aSanitizedParameters).sort().map((sKey) => {
                             return sKey + sMicroSeparator + vSimpleOrComplex[sKey];
                         }).join(sMacroSeparator);
                     }
@@ -244,9 +278,9 @@ sap.ui.define([
             args: ["strRegex"],
             minValues: 1,
             fnPipe: function (oArgs, oValues) {
-                var sStrRegex = oArgs.strRegex;
-                var rRegex = new RegExp(sStrRegex);
-                return Object.keys(oValues).reduce(function (o, sNextKey) {
+                const sStrRegex = oArgs.strRegex;
+                const rRegex = new RegExp(sStrRegex);
+                return Object.keys(oValues).reduce((o, sNextKey) => {
                     if (rRegex.exec(sNextKey)) {
                         o[sNextKey] = oValues[sNextKey];
                     }
@@ -259,18 +293,18 @@ sap.ui.define([
                     return undefined;
                 }
 
-                var sStrRegex = oArgs.strRegex;
-                var rRegex = new RegExp(sStrRegex);
+                const sStrRegex = oArgs.strRegex;
+                const rRegex = new RegExp(sStrRegex);
 
-                var aMatchedValues = aValues.filter(function (vValue) {
-                    var aInnerValues;
+                const aMatchedValues = aValues.filter((vValue) => {
+                    let aInnerValues;
                     if (ushellType.isPlainObject(vValue)) {
                         // there is at least one key matching
                         aInnerValues = Object.keys(vValue);
                     } else if (ushellType.isArray(vValue)) {
                         aInnerValues = vValue;
                     } else {
-                        aInnerValues = ["" + vValue];
+                        aInnerValues = [`${vValue}`];
                     }
 
                     return aInnerValues.some(rRegex.exec.bind(rRegex));
@@ -301,8 +335,7 @@ sap.ui.define([
                     : "";
             },
             fn: function (oArgs, aValues) {
-
-                var vEndResult = O_FUNCTION.and.fn(oArgs, aValues);
+                const vEndResult = O_FUNCTION.and.fn(oArgs, aValues);
 
                 return vEndResult === undefined
                     ? ""
@@ -334,13 +367,13 @@ sap.ui.define([
             minValues: 1,
             maxValues: 1,
             fnPipe: function (oArgs, oValues) {
-                return Object.keys(oValues).reduce(function (o, sKey) {
+                return Object.keys(oValues).reduce((o, sKey) => {
                     o[sKey] = encodeURIComponent(oValues[sKey]);
                     return o;
                 }, {});
             },
             fn: function (oArgs, aValues) {
-                var vValue = aValues[0];
+                const vValue = aValues[0];
                 if (typeof vValue !== "string") {
                     return vValue;
                 }
@@ -350,66 +383,36 @@ sap.ui.define([
         }
     };
 
-    function isEmpty (v) {
-        if (typeof v === "undefined") {
-            return true;
-        }
-        if (typeof v === "string") {
-            return v === "";
-        }
-        if (typeof v === "object") {
-            return Object.keys(v).length === 0;
-        }
-        if (typeof v === "number") {
-            return v === 0;
-        }
-        if (typeof v === "boolean") {
-            return v === false;
-        }
-
-        throw new Error("Unexpected type for value");
-    }
-
-    function getValuesAsArray (vValues) {
-        var aValues;
-        if (ushellType.isArray(vValues)) {
-            aValues = vValues;
-        } else if (ushellType.isPlainObject(vValues)) {
-            aValues = [vValues];
-        } else if (vValues === undefined) {
-            return [];
-        } else {
-            throw new Error("Unexpected type");
-        }
-        return aValues;
-    }
-
     function validateFunctionValuesInPipeContext (sFunctionName, oFnDef, oValues) {
         if (oValues !== undefined && !ushellType.isPlainObject(oValues)) {
-            throw new Error("Invalid value type passed to '" + sFunctionName + "' in pipe context. An object is expected.");
+            throw new Error(`Invalid value type passed to '${sFunctionName}' in pipe context. An object is expected.`);
         }
     }
 
     function validateFunctionValuesInValueContext (sFunctionName, oFnDef, aValues) {
         if (aValues !== undefined && !ushellType.isArray(aValues)) {
-            throw new Error("Invalid value type passed to '" + sFunctionName + "' in value context. An array is expected.");
+            throw new Error(`Invalid value type passed to '${sFunctionName}' in value context. An array is expected.`);
         }
 
-        var iNumValues = ushellType.isArray(aValues)
+        const iNumValues = ushellType.isArray(aValues)
             ? aValues.length
             : 0;
 
         if (_utils.hasValue(oFnDef.maxValues) && iNumValues > oFnDef.maxValues) {
-            throw new Error("Too many values were passed to '" + sFunctionName + "'. Please pass maximum " + oFnDef.maxValues + " values.");
+            throw new Error(`Too many values were passed to '${sFunctionName}'. Please pass maximum ${oFnDef.maxValues} values.`);
         }
         if (_utils.hasValue(oFnDef.minValues) && iNumValues < oFnDef.minValues) {
-            throw new Error("Too few values were passed to '" + sFunctionName + "'. Please pass minimum " + oFnDef.minValues + " values.");
+            throw new Error(`Too few values were passed to '${sFunctionName}'. Please pass minimum ${oFnDef.minValues} values.`);
         }
     }
 
+    function isArgRequired (sArgWithSuffix) {
+        return sArgWithSuffix.charAt(sArgWithSuffix.length - 1) !== "?";
+    }
+
     function isInvalidArgSignature (aArgsDef) {
-        var bError = false;
-        aArgsDef.map(isArgRequired).reduce(function (bRequired, bNextRequired) {
+        let bError = false;
+        aArgsDef.map(isArgRequired).reduce((bRequired, bNextRequired) => {
             if (!bRequired && bNextRequired) {
                 bError = true;
             }
@@ -418,34 +421,30 @@ sap.ui.define([
         return bError;
     }
 
-    function isArgRequired (sArgWithSuffix) {
-        return sArgWithSuffix.charAt(sArgWithSuffix.length - 1) !== "?";
-    }
-
     function removeArgSuffix (sArgWithSuffix) {
         return sArgWithSuffix.substr(0, sArgWithSuffix.length - 1);
     }
 
     function parseFunctionArgs (sFunctionName, aArgs) {
-        var aArgsDeclaration = deepExtend([], O_FUNCTION[sFunctionName].args);
+        const aArgsDeclaration = deepExtend([], O_FUNCTION[sFunctionName].args);
         if (isInvalidArgSignature(aArgsDeclaration)) {
             throw new Error("Invalid argument signature. Make sure all optional arguments appear in the end.");
         }
 
-        var oArgs = {
+        const oArgs = {
             length: aArgs.length
         };
 
-        var iRequiredArgs = aArgsDeclaration.filter(isArgRequired);
+        const iRequiredArgs = aArgsDeclaration.filter(isArgRequired);
 
-        var bMoreParametersRequired = iRequiredArgs > aArgs.length;
+        const bMoreParametersRequired = iRequiredArgs > aArgs.length;
         if (bMoreParametersRequired) {
-            throw new Error(sFunctionName + " requires " + iRequiredArgs + " arguments but " + aArgs.length + " was specified");
+            throw new Error(`${sFunctionName} requires ${iRequiredArgs} arguments but ${aArgs.length} was specified`);
         }
 
-        aArgs.forEach(function (vValue) {
-            var sNextExpectedArg = aArgsDeclaration.shift();
-            var bIsArgOptional = !isArgRequired(sNextExpectedArg);
+        aArgs.forEach((vValue) => {
+            let sNextExpectedArg = aArgsDeclaration.shift();
+            const bIsArgOptional = !isArgRequired(sNextExpectedArg);
             if (bIsArgOptional) {
                 sNextExpectedArg = removeArgSuffix(sNextExpectedArg);
             }
@@ -460,10 +459,11 @@ sap.ui.define([
 
     function applyFunction (bPipeContext, sFunctionName, aFunctionArgs, aInitialValues) {
         if (!O_FUNCTION.hasOwnProperty(sFunctionName)) {
-            throw "Invalid function: " + sFunctionName;
+            // eslint-disable-next-line no-throw-literal
+            throw `Invalid function: ${sFunctionName}`;
         }
 
-        var oParsedArgs = parseFunctionArgs(sFunctionName, aFunctionArgs);
+        const oParsedArgs = parseFunctionArgs(sFunctionName, aFunctionArgs);
         if (bPipeContext) {
             validateFunctionValuesInPipeContext(sFunctionName, O_FUNCTION[sFunctionName], aInitialValues);
         } else {
@@ -472,7 +472,7 @@ sap.ui.define([
 
         if (bPipeContext) {
             if (!O_FUNCTION[sFunctionName].fnPipe) {
-                throw new Error("The function '" + sFunctionName + "' cannot be executed in pipe context");
+                throw new Error(`The function '${sFunctionName}' cannot be executed in pipe context`);
             }
             return O_FUNCTION[sFunctionName].fnPipe(oParsedArgs, aInitialValues);
         }
@@ -481,16 +481,16 @@ sap.ui.define([
     }
 
     function toCharacterClass (s) {
-        return s.split("").map(function (ch) {
+        return s.split("").map((ch) => {
             if (ch === "[") {
                 return "[\\[]";
             }
-            return "[" + ch + "]";
+            return `[${ch}]`;
         }).join("");
     }
 
     function getPossibleFunctionsRegExpString () {
-        var aAllFunctionSymbols = Object.keys(O_FUNCTION);
+        const aAllFunctionSymbols = Object.keys(O_FUNCTION);
         return aAllFunctionSymbols.map(toCharacterClass).join("|");
     }