@sapui5/sap.fe.macros 1.121.1 → 1.122.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.macros",
-	"version": "1.121.1",
+	"version": "1.122.0",
 	"description": "SAPUI5 Library sap.fe.macros",
 	"keywords": [
 		"sapui5",

package/src/sap/fe/macros/.library

@@ -6,7 +6,7 @@
 		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
 	</copyright>
-	<version>1.121.1</version>
+	<version>1.122.0</version>
 
 	<documentation>UI5 library: sap.fe.macros</documentation>
 

package/src/sap/fe/macros/CollectionBindingInfo.js

@@ -17,16 +17,55 @@ sap.ui.define(["sap/base/util/deepClone", "sap/ui/model/Filter"], function (deep
       this.collectionBindingInfo = bindingInfo;
     }
 
+    /**
+     * Recursive cloning of the Filter.
+     * Filters have a parameter aFilters which contains more filters, so we use this method to recursively clone it.
+     * cloneFilters should be called first, to have the Filter outside an array and avoid an empty filter.
+     * @param cloning The filter to clone
+     * @returns The cloned Filter
+     */
+    _exports = CollectionBindingInfoAPI;
+    var _proto = CollectionBindingInfoAPI.prototype;
+    _proto.cloneFiltersContent = function cloneFiltersContent(cloning) {
+      const filterInfo = {
+        path: cloning.getPath(),
+        operator: cloning.getOperator(),
+        value1: cloning.getValue1(),
+        value2: cloning.getValue2(),
+        variable: cloning.getVariable(),
+        condition: cloning.getCondition(),
+        and: cloning.isAnd(),
+        caseSensitive: cloning.isCaseSensitive()
+      };
+      const testFn = cloning.getTest();
+      if (testFn !== undefined) {
+        filterInfo.test = testFn;
+      }
+      const comparatorFn = cloning.getComparator();
+      if (comparatorFn !== undefined) {
+        filterInfo.comparator = comparatorFn;
+      }
+      const filters = cloning.getFilters();
+      const arrayFilter = filters === null || filters === void 0 ? void 0 : filters.map(singleFilter => {
+        return this.cloneFiltersContent(singleFilter);
+      });
+      if (arrayFilter) {
+        filterInfo.filters = arrayFilter;
+      }
+      return new Filter(filterInfo);
+    }
+
     /**
      * Returns the current filters applied to the Table.
      *
      * @public
      * @returns The {@link sap.ui.model.Filter "filters"} on the table
-     */
-    _exports = CollectionBindingInfoAPI;
-    var _proto = CollectionBindingInfoAPI.prototype;
+     */;
     _proto.getFilters = function getFilters() {
-      return deepClone(this.collectionBindingInfo.filters);
+      if (this.collectionBindingInfo.filters) {
+        return this.cloneFiltersContent(this.collectionBindingInfo.filters);
+      }
+      return undefined;
     }
 
     /**
@@ -48,7 +87,7 @@ sap.ui.define(["sap/base/util/deepClone", "sap/ui/model/Filter"], function (deep
      * @public
      */;
     _proto.getSorters = function getSorters() {
-      return deepClone(this.collectionBindingInfo.sorter);
+      return this.collectionBindingInfo.sorter;
     }
 
     /**
@@ -58,15 +97,13 @@ sap.ui.define(["sap/base/util/deepClone", "sap/ui/model/Filter"], function (deep
      * @public
      */;
     _proto.addSelect = function addSelect(parameters) {
-      var _this$collectionBindi, _this$collectionBindi2;
+      var _this$collectionBindi;
       const parameterString = parameters.toString();
-      if ((_this$collectionBindi = this.collectionBindingInfo) !== null && _this$collectionBindi !== void 0 && (_this$collectionBindi2 = _this$collectionBindi.parameters) !== null && _this$collectionBindi2 !== void 0 && _this$collectionBindi2.$select) {
-        var _this$collectionBindi3, _this$collectionBindi4;
-        this.collectionBindingInfo.parameters.$select = ((_this$collectionBindi3 = this.collectionBindingInfo) === null || _this$collectionBindi3 === void 0 ? void 0 : (_this$collectionBindi4 = _this$collectionBindi3.parameters) === null || _this$collectionBindi4 === void 0 ? void 0 : _this$collectionBindi4.$select) + "," + parameterString;
+      if ((_this$collectionBindi = this.collectionBindingInfo.parameters) !== null && _this$collectionBindi !== void 0 && _this$collectionBindi.$select) {
+        this.collectionBindingInfo.parameters.$select = this.collectionBindingInfo.parameters.$select + "," + parameterString;
       } else {
-        this.collectionBindingInfo.parameters = {
-          $select: parameterString
-        };
+        this.collectionBindingInfo.parameters ??= {};
+        this.collectionBindingInfo.parameters.$select = parameterString;
       }
     }
 
@@ -77,7 +114,21 @@ sap.ui.define(["sap/base/util/deepClone", "sap/ui/model/Filter"], function (deep
      * @public
      */;
     _proto.getBindingInfo = function getBindingInfo() {
-      return deepClone(this.collectionBindingInfo);
+      const clonedBindingInfo = {
+        ...this.collectionBindingInfo
+      };
+
+      // Making deepClones of objects (except Sorters because we can't)
+      if (this.collectionBindingInfo.events) {
+        clonedBindingInfo.events = deepClone(this.collectionBindingInfo.events);
+      }
+      if (this.collectionBindingInfo.filters) {
+        clonedBindingInfo.filters = this.cloneFiltersContent(this.collectionBindingInfo.filters);
+      }
+      if (this.collectionBindingInfo.parameters) {
+        deepClone(this.collectionBindingInfo.parameters);
+      }
+      return clonedBindingInfo;
     }
 
     /**
@@ -98,4 +149,4 @@ sap.ui.define(["sap/base/util/deepClone", "sap/ui/model/Filter"], function (deep
   _exports = CollectionBindingInfoAPI;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJDb2xsZWN0aW9uQmluZGluZ0luZm9BUEkiLCJiaW5kaW5nSW5mbyIsImNvbGxlY3Rpb25CaW5kaW5nSW5mbyIsImdldEZpbHRlcnMiLCJkZWVwQ2xvbmUiLCJmaWx0ZXJzIiwiYWRkRmlsdGVyIiwiY3VzdG9tRmlsdGVyIiwicHVzaCIsIkZpbHRlciIsImdldFNvcnRlcnMiLCJzb3J0ZXIiLCJhZGRTZWxlY3QiLCJwYXJhbWV0ZXJzIiwicGFyYW1ldGVyU3RyaW5nIiwidG9TdHJpbmciLCIkc2VsZWN0IiwiZ2V0QmluZGluZ0luZm8iLCJhZGRTb3J0ZXIiXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIkNvbGxlY3Rpb25CaW5kaW5nSW5mby50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgZGVlcENsb25lIGZyb20gXCJzYXAvYmFzZS91dGlsL2RlZXBDbG9uZVwiO1xuaW1wb3J0IEZpbHRlciBmcm9tIFwic2FwL3VpL21vZGVsL0ZpbHRlclwiO1xuaW1wb3J0IHR5cGUgU29ydGVyIGZyb20gXCJzYXAvdWkvbW9kZWwvU29ydGVyXCI7XG5cbmV4cG9ydCB0eXBlIENvbGxlY3Rpb25CaW5kaW5nSW5mbyA9IHtcblx0c3VzcGVuZGVkPzogYm9vbGVhbjtcblx0cGF0aD86IHN0cmluZztcblx0ZmlsdGVycz86IEZpbHRlcjtcblx0c2VhcmNoPzogc3RyaW5nO1xuXHRwYXJhbWV0ZXJzPzoge1xuXHRcdCRzZWFyY2g/OiBzdHJpbmc7XG5cdFx0JHNlbGVjdD86IHN0cmluZztcblx0fTtcblx0c29ydGVyPzogU29ydGVyW107XG59O1xuXG4vKipcbiAqIEFQSSB0byBhZGQgcGFyYW1ldGVycyB0byB0aGUgY29sbGVjdGlvbiBiaW5kaW5nIGluZm9zLlxuICogQGhpZGVjb25zdHJ1Y3RvclxuICogQGFsaWFzIHNhcC5mZS5tYWNyb3MuQ29sbGVjdGlvbkJpbmRpbmdJbmZvXG4gKiBAcHVibGljXG4gKi9cblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQ29sbGVjdGlvbkJpbmRpbmdJbmZvQVBJIHtcblx0cHJpdmF0ZSBjb2xsZWN0aW9uQmluZGluZ0luZm86IENvbGxlY3Rpb25CaW5kaW5nSW5mbztcblxuXHRjb25zdHJ1Y3RvcihiaW5kaW5nSW5mbzogQ29sbGVjdGlvbkJpbmRpbmdJbmZvKSB7XG5cdFx0dGhpcy5jb2xsZWN0aW9uQmluZGluZ0luZm8gPSBiaW5kaW5nSW5mbztcblx0fVxuXG5cdC8qKlxuXHQgKiBSZXR1cm5zIHRoZSBjdXJyZW50IGZpbHRlcnMgYXBwbGllZCB0byB0aGUgVGFibGUuXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICogQHJldHVybnMgVGhlIHtAbGluayBzYXAudWkubW9kZWwuRmlsdGVyIFwiZmlsdGVyc1wifSBvbiB0aGUgdGFibGVcblx0ICovXG5cdGdldEZpbHRlcnMoKTogRmlsdGVyIHwgdW5kZWZpbmVkIHtcblx0XHRyZXR1cm4gZGVlcENsb25lKHRoaXMuY29sbGVjdGlvbkJpbmRpbmdJbmZvLmZpbHRlcnMpO1xuXHR9XG5cblx0LyoqXG5cdCAqIEFkZHMgYSBmaWx0ZXIgdG8gdGhlIGZpbHRlcnMgYWxyZWFkeSBwcmVzZW50IGluIHRoZSBiaW5kaW5nIGluZm8uXG5cdCAqXG5cdCAqIEBwYXJhbSBjdXN0b21GaWx0ZXIgVGhlIHtAbGluayBzYXAudWkubW9kZWwuRmlsdGVyIFwiZmlsdGVyXCJ9IHRvIGFkZFxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRhZGRGaWx0ZXIoY3VzdG9tRmlsdGVyOiBGaWx0ZXIpOiB2b2lkIHtcblx0XHRjb25zdCBmaWx0ZXJzID0gdGhpcy5jb2xsZWN0aW9uQmluZGluZ0luZm8uZmlsdGVycyA/IFt0aGlzLmNvbGxlY3Rpb25CaW5kaW5nSW5mby5maWx0ZXJzXSA6IFtdO1xuXHRcdGZpbHRlcnMucHVzaChjdXN0b21GaWx0ZXIpO1xuXHRcdHRoaXMuY29sbGVjdGlvbkJpbmRpbmdJbmZvLmZpbHRlcnMgPSBuZXcgRmlsdGVyKGZpbHRlcnMsIHRydWUpO1xuXHR9XG5cblx0LyoqXG5cdCAqIFJldHVybnMgdGhlIGN1cnJlbnQgc29ydGVycyBvZiB0aGUgVGFibGUuXG5cdCAqXG5cdCAqIEByZXR1cm5zIFRoZSB7QGxpbmsgc2FwLnVpLm1vZGVsLlNvcnRlciBcInNvcnRlcnNcIn0gb24gdGhlIHRhYmxlXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdGdldFNvcnRlcnMoKTogU29ydGVyW10gfCB1bmRlZmluZWQge1xuXHRcdHJldHVybiBkZWVwQ2xvbmUodGhpcy5jb2xsZWN0aW9uQmluZGluZ0luZm8uc29ydGVyKTtcblx0fVxuXG5cdC8qKlxuXHQgKiBBZGRzIHBhcmFtZXRlcnMgdG8gdGhlIHNlbGVjdCBxdWVyeS5cblx0ICpcblx0ICogQHBhcmFtIHBhcmFtZXRlcnMgVGhlIGxpc3Qgb3IgcHJvcGVydGllcyB0byBhZGQgdG8gdGhlIHF1ZXJ5XG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdGFkZFNlbGVjdChwYXJhbWV0ZXJzOiBzdHJpbmdbXSk6IHZvaWQge1xuXHRcdGNvbnN0IHBhcmFtZXRlclN0cmluZzogc3RyaW5nID0gcGFyYW1ldGVycy50b1N0cmluZygpO1xuXHRcdGlmICh0aGlzLmNvbGxlY3Rpb25CaW5kaW5nSW5mbz8ucGFyYW1ldGVycz8uJHNlbGVjdCkge1xuXHRcdFx0dGhpcy5jb2xsZWN0aW9uQmluZGluZ0luZm8ucGFyYW1ldGVycy4kc2VsZWN0ID0gdGhpcy5jb2xsZWN0aW9uQmluZGluZ0luZm8/LnBhcmFtZXRlcnM/LiRzZWxlY3QgKyBcIixcIiArIHBhcmFtZXRlclN0cmluZztcblx0XHR9IGVsc2Uge1xuXHRcdFx0dGhpcy5jb2xsZWN0aW9uQmluZGluZ0luZm8ucGFyYW1ldGVycyA9IHtcblx0XHRcdFx0JHNlbGVjdDogcGFyYW1ldGVyU3RyaW5nXG5cdFx0XHR9O1xuXHRcdH1cblx0fVxuXG5cdC8qKlxuXHQgKiBSZXRyaWV2ZSB0aGUgJ3NlcmlhbGl6ZWQnIGJpbmRpbmcgaW5mbywgdXNlZnVsIGlmIHlvdSB3YW50IHRvIGNyZWF0ZSB5b3VyIG93biBiaW5kaW5nXG5cdCAqXG5cdCAqIEByZXR1cm5zIHtDb2xsZWN0aW9uQmluZGluZ0luZm99IFRoZSB7QGxpbmsgc2FwLmZlLm1hY3Jvcy5Db2xsZWN0aW9uQmluZGluZ0luZm8gXCJDb2xsZWN0aW9uQmluZGluZ0luZm9cIn1cblx0ICogQHB1YmxpY1xuXHQgKi9cblxuXHRnZXRCaW5kaW5nSW5mbygpOiBDb2xsZWN0aW9uQmluZGluZ0luZm8ge1xuXHRcdHJldHVybiBkZWVwQ2xvbmUodGhpcy5jb2xsZWN0aW9uQmluZGluZ0luZm8pO1xuXHR9XG5cblx0LyoqXG5cdCAqIEFkZHMgYSBzb3J0ZXIgdG8gdGhlIHNvcnRlcihzKSBhbHJlYWR5IHByZXNlbnQsIG9yIGNyZWF0ZSBvbmUgaWYgbm9uZSBleGlzdHMuXG5cdCAqXG5cdCAqIEBwYXJhbSBzb3J0ZXIgVGhlIHtAbGluayBzYXAudWkubW9kZWwuU29ydGVyIFwic29ydGVyXCJ9IHRvIGFkZCB0byB0aGUgcXVlcnlcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0YWRkU29ydGVyKHNvcnRlcjogU29ydGVyKTogdm9pZCB7XG5cdFx0aWYgKCF0aGlzLmNvbGxlY3Rpb25CaW5kaW5nSW5mby5zb3J0ZXIpIHtcblx0XHRcdHRoaXMuY29sbGVjdGlvbkJpbmRpbmdJbmZvLnNvcnRlciA9IFtzb3J0ZXJdO1xuXHRcdH0gZWxzZSB7XG5cdFx0XHR0aGlzLmNvbGxlY3Rpb25CaW5kaW5nSW5mby5zb3J0ZXIucHVzaChzb3J0ZXIpO1xuXHRcdH1cblx0fVxufVxuIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFBQTtBQUFBOzs7OztFQWdCQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7RUFMQSxJQU9xQkEsd0JBQXdCO0lBRzVDLGtDQUFZQyxXQUFrQyxFQUFFO01BQy9DLElBQUksQ0FBQ0MscUJBQXFCLEdBQUdELFdBQVc7SUFDekM7O0lBRUE7QUFDRDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0lBTEM7SUFBQTtJQUFBLE9BTUFFLFVBQVUsR0FBVixzQkFBaUM7TUFDaEMsT0FBT0MsU0FBUyxDQUFDLElBQUksQ0FBQ0YscUJBQXFCLENBQUNHLE9BQU8sQ0FBQztJQUNyRDs7SUFFQTtBQUNEO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsT0FMQztJQUFBLE9BTUFDLFNBQVMsR0FBVCxtQkFBVUMsWUFBb0IsRUFBUTtNQUNyQyxNQUFNRixPQUFPLEdBQUcsSUFBSSxDQUFDSCxxQkFBcUIsQ0FBQ0csT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDSCxxQkFBcUIsQ0FBQ0csT0FBTyxDQUFDLEdBQUcsRUFBRTtNQUM5RkEsT0FBTyxDQUFDRyxJQUFJLENBQUNELFlBQVksQ0FBQztNQUMxQixJQUFJLENBQUNMLHFCQUFxQixDQUFDRyxPQUFPLEdBQUcsSUFBSUksTUFBTSxDQUFDSixPQUFPLEVBQUUsSUFBSSxDQUFDO0lBQy9EOztJQUVBO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQSxPQUxDO0lBQUEsT0FNQUssVUFBVSxHQUFWLHNCQUFtQztNQUNsQyxPQUFPTixTQUFTLENBQUMsSUFBSSxDQUFDRixxQkFBcUIsQ0FBQ1MsTUFBTSxDQUFDO0lBQ3BEOztJQUVBO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQSxPQUxDO0lBQUEsT0FNQUMsU0FBUyxHQUFULG1CQUFVQyxVQUFvQixFQUFRO01BQUE7TUFDckMsTUFBTUMsZUFBdUIsR0FBR0QsVUFBVSxDQUFDRSxRQUFRLEVBQUU7TUFDckQsNkJBQUksSUFBSSxDQUFDYixxQkFBcUIsNEVBQTFCLHNCQUE0QlcsVUFBVSxtREFBdEMsdUJBQXdDRyxPQUFPLEVBQUU7UUFBQTtRQUNwRCxJQUFJLENBQUNkLHFCQUFxQixDQUFDVyxVQUFVLENBQUNHLE9BQU8sR0FBRywrQkFBSSxDQUFDZCxxQkFBcUIscUZBQTFCLHVCQUE0QlcsVUFBVSwyREFBdEMsdUJBQXdDRyxPQUFPLElBQUcsR0FBRyxHQUFHRixlQUFlO01BQ3hILENBQUMsTUFBTTtRQUNOLElBQUksQ0FBQ1oscUJBQXFCLENBQUNXLFVBQVUsR0FBRztVQUN2Q0csT0FBTyxFQUFFRjtRQUNWLENBQUM7TUFDRjtJQUNEOztJQUVBO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQSxPQUxDO0lBQUEsT0FPQUcsY0FBYyxHQUFkLDBCQUF3QztNQUN2QyxPQUFPYixTQUFTLENBQUMsSUFBSSxDQUFDRixxQkFBcUIsQ0FBQztJQUM3Qzs7SUFFQTtBQUNEO0FBQ0E7QUFDQTtBQUNBO0FBQ0EsT0FMQztJQUFBLE9BTUFnQixTQUFTLEdBQVQsbUJBQVVQLE1BQWMsRUFBUTtNQUMvQixJQUFJLENBQUMsSUFBSSxDQUFDVCxxQkFBcUIsQ0FBQ1MsTUFBTSxFQUFFO1FBQ3ZDLElBQUksQ0FBQ1QscUJBQXFCLENBQUNTLE1BQU0sR0FBRyxDQUFDQSxNQUFNLENBQUM7TUFDN0MsQ0FBQyxNQUFNO1FBQ04sSUFBSSxDQUFDVCxxQkFBcUIsQ0FBQ1MsTUFBTSxDQUFDSCxJQUFJLENBQUNHLE1BQU0sQ0FBQztNQUMvQztJQUNELENBQUM7SUFBQTtFQUFBO0VBQUE7RUFBQTtBQUFBIn0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["CollectionBindingInfoAPI","bindingInfo","collectionBindingInfo","cloneFiltersContent","cloning","filterInfo","path","getPath","operator","getOperator","value1","getValue1","value2","getValue2","variable","getVariable","condition","getCondition","and","isAnd","caseSensitive","isCaseSensitive","testFn","getTest","undefined","test","comparatorFn","getComparator","comparator","filters","getFilters","arrayFilter","map","singleFilter","Filter","addFilter","customFilter","push","getSorters","sorter","addSelect","parameters","parameterString","toString","$select","getBindingInfo","clonedBindingInfo","events","deepClone","addSorter"],"sourceRoot":".","sources":["CollectionBindingInfo.ts"],"sourcesContent":["import deepClone from \"sap/base/util/deepClone\";\nimport Filter from \"sap/ui/model/Filter\";\nimport type FilterOperator from \"sap/ui/model/FilterOperator\";\nimport type Sorter from \"sap/ui/model/Sorter\";\n\ntype FilterInfo = {\n\tpath?: string;\n\ttest?: (p1: unknown) => boolean;\n\tcomparator?: (p1: unknown, p2: unknown) => number;\n\toperator?:\n\t\t| FilterOperator\n\t\t| \"All\"\n\t\t| \"Any\"\n\t\t| \"BT\"\n\t\t| \"Contains\"\n\t\t| \"EndsWith\"\n\t\t| \"EQ\"\n\t\t| \"GE\"\n\t\t| \"GT\"\n\t\t| \"LE\"\n\t\t| \"LT\"\n\t\t| \"NB\"\n\t\t| \"NE\"\n\t\t| \"NotContains\"\n\t\t| \"NotEndsWith\"\n\t\t| \"NotStartsWith\"\n\t\t| \"StartsWith\"\n\t\t| undefined;\n\tvalue1?: unknown;\n\tvalue2?: unknown;\n\tvariable?: string;\n\tcondition?: Filter;\n\tfilters?: Filter[];\n\tand?: boolean;\n\tcaseSensitive?: boolean;\n};\n\nexport type CollectionBindingInfo = {\n\tevents?: Record<string, Function>;\n\tsuspended?: boolean;\n\tpath?: string;\n\tfilters?: Filter;\n\tsearch?: string;\n\tparameters?: {\n\t\t$search?: string;\n\t\t$select?: string;\n\t};\n\tsorter?: Sorter[];\n};\n\n/**\n * API to add parameters to the collection binding infos.\n * @hideconstructor\n * @alias sap.fe.macros.CollectionBindingInfo\n * @public\n */\n\nexport default class CollectionBindingInfoAPI {\n\tprivate collectionBindingInfo: CollectionBindingInfo;\n\n\tconstructor(bindingInfo: CollectionBindingInfo) {\n\t\tthis.collectionBindingInfo = bindingInfo;\n\t}\n\n\t/**\n\t * Recursive cloning of the Filter.\n\t * Filters have a parameter aFilters which contains more filters, so we use this method to recursively clone it.\n\t * cloneFilters should be called first, to have the Filter outside an array and avoid an empty filter.\n\t * @param cloning The filter to clone\n\t * @returns The cloned Filter\n\t */\n\tcloneFiltersContent(cloning: Filter): Filter {\n\t\tconst filterInfo: FilterInfo = {\n\t\t\tpath: cloning.getPath(),\n\t\t\toperator: cloning.getOperator(),\n\t\t\tvalue1: cloning.getValue1(),\n\t\t\tvalue2: cloning.getValue2(),\n\t\t\tvariable: cloning.getVariable(),\n\t\t\tcondition: cloning.getCondition(),\n\t\t\tand: cloning.isAnd(),\n\t\t\tcaseSensitive: cloning.isCaseSensitive()\n\t\t};\n\n\t\tconst testFn = cloning.getTest();\n\t\tif (testFn !== undefined) {\n\t\t\tfilterInfo.test = testFn;\n\t\t}\n\n\t\tconst comparatorFn = cloning.getComparator();\n\t\tif (comparatorFn !== undefined) {\n\t\t\tfilterInfo.comparator = comparatorFn;\n\t\t}\n\n\t\tconst filters = cloning.getFilters();\n\t\tconst arrayFilter = filters?.map((singleFilter: Filter) => {\n\t\t\treturn this.cloneFiltersContent(singleFilter);\n\t\t});\n\t\tif (arrayFilter) {\n\t\t\tfilterInfo.filters = arrayFilter;\n\t\t}\n\t\treturn new Filter(filterInfo);\n\t}\n\n\t/**\n\t * Returns the current filters applied to the Table.\n\t *\n\t * @public\n\t * @returns The {@link sap.ui.model.Filter \"filters\"} on the table\n\t */\n\tgetFilters(): Filter | undefined {\n\t\tif (this.collectionBindingInfo.filters) {\n\t\t\treturn this.cloneFiltersContent(this.collectionBindingInfo.filters);\n\t\t}\n\t\treturn undefined;\n\t}\n\n\t/**\n\t * Adds a filter to the filters already present in the binding info.\n\t *\n\t * @param customFilter The {@link sap.ui.model.Filter \"filter\"} to add\n\t * @public\n\t */\n\taddFilter(customFilter: Filter): void {\n\t\tconst filters = this.collectionBindingInfo.filters ? [this.collectionBindingInfo.filters] : [];\n\t\tfilters.push(customFilter);\n\t\tthis.collectionBindingInfo.filters = new Filter(filters, true);\n\t}\n\n\t/**\n\t * Returns the current sorters of the Table.\n\t *\n\t * @returns The {@link sap.ui.model.Sorter \"sorters\"} on the table\n\t * @public\n\t */\n\tgetSorters(): Sorter[] | undefined {\n\t\treturn this.collectionBindingInfo.sorter;\n\t}\n\n\t/**\n\t * Adds parameters to the select query.\n\t *\n\t * @param parameters The list or properties to add to the query\n\t * @public\n\t */\n\taddSelect(parameters: string[]): void {\n\t\tconst parameterString: string = parameters.toString();\n\t\tif (this.collectionBindingInfo.parameters?.$select) {\n\t\t\tthis.collectionBindingInfo.parameters.$select = this.collectionBindingInfo.parameters.$select + \",\" + parameterString;\n\t\t} else {\n\t\t\tthis.collectionBindingInfo.parameters ??= {};\n\t\t\tthis.collectionBindingInfo.parameters.$select = parameterString;\n\t\t}\n\t}\n\n\t/**\n\t * Retrieve the 'serialized' binding info, useful if you want to create your own binding\n\t *\n\t * @returns {CollectionBindingInfo} The {@link sap.fe.macros.CollectionBindingInfo \"CollectionBindingInfo\"}\n\t * @public\n\t */\n\n\tgetBindingInfo(): CollectionBindingInfo {\n\t\tconst clonedBindingInfo = { ...this.collectionBindingInfo };\n\n\t\t// Making deepClones of objects (except Sorters because we can't)\n\t\tif (this.collectionBindingInfo.events) {\n\t\t\tclonedBindingInfo.events = deepClone(this.collectionBindingInfo.events);\n\t\t}\n\t\tif (this.collectionBindingInfo.filters) {\n\t\t\tclonedBindingInfo.filters = this.cloneFiltersContent(this.collectionBindingInfo.filters);\n\t\t}\n\t\tif (this.collectionBindingInfo.parameters) {\n\t\t\tdeepClone(this.collectionBindingInfo.parameters);\n\t\t}\n\t\treturn clonedBindingInfo;\n\t}\n\n\t/**\n\t * Adds a sorter to the sorter(s) already present, or create one if none exists.\n\t *\n\t * @param sorter The {@link sap.ui.model.Sorter \"sorter\"} to add to the query\n\t * @public\n\t */\n\taddSorter(sorter: Sorter): void {\n\t\tif (!this.collectionBindingInfo.sorter) {\n\t\t\tthis.collectionBindingInfo.sorter = [sorter];\n\t\t} else {\n\t\t\tthis.collectionBindingInfo.sorter.push(sorter);\n\t\t}\n\t}\n}\n"],"mappings":"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"}

package/src/sap/fe/macros/CollectionBindingInfo.ts

@@ -1,8 +1,42 @@
 import deepClone from "sap/base/util/deepClone";
 import Filter from "sap/ui/model/Filter";
+import type FilterOperator from "sap/ui/model/FilterOperator";
 import type Sorter from "sap/ui/model/Sorter";
 
+type FilterInfo = {
+	path?: string;
+	test?: (p1: unknown) => boolean;
+	comparator?: (p1: unknown, p2: unknown) => number;
+	operator?:
+		| FilterOperator
+		| "All"
+		| "Any"
+		| "BT"
+		| "Contains"
+		| "EndsWith"
+		| "EQ"
+		| "GE"
+		| "GT"
+		| "LE"
+		| "LT"
+		| "NB"
+		| "NE"
+		| "NotContains"
+		| "NotEndsWith"
+		| "NotStartsWith"
+		| "StartsWith"
+		| undefined;
+	value1?: unknown;
+	value2?: unknown;
+	variable?: string;
+	condition?: Filter;
+	filters?: Filter[];
+	and?: boolean;
+	caseSensitive?: boolean;
+};
+
 export type CollectionBindingInfo = {
+	events?: Record<string, Function>;
 	suspended?: boolean;
 	path?: string;
 	filters?: Filter;
@@ -28,6 +62,45 @@ export default class CollectionBindingInfoAPI {
 		this.collectionBindingInfo = bindingInfo;
 	}
 
+	/**
+	 * Recursive cloning of the Filter.
+	 * Filters have a parameter aFilters which contains more filters, so we use this method to recursively clone it.
+	 * cloneFilters should be called first, to have the Filter outside an array and avoid an empty filter.
+	 * @param cloning The filter to clone
+	 * @returns The cloned Filter
+	 */
+	cloneFiltersContent(cloning: Filter): Filter {
+		const filterInfo: FilterInfo = {
+			path: cloning.getPath(),
+			operator: cloning.getOperator(),
+			value1: cloning.getValue1(),
+			value2: cloning.getValue2(),
+			variable: cloning.getVariable(),
+			condition: cloning.getCondition(),
+			and: cloning.isAnd(),
+			caseSensitive: cloning.isCaseSensitive()
+		};
+
+		const testFn = cloning.getTest();
+		if (testFn !== undefined) {
+			filterInfo.test = testFn;
+		}
+
+		const comparatorFn = cloning.getComparator();
+		if (comparatorFn !== undefined) {
+			filterInfo.comparator = comparatorFn;
+		}
+
+		const filters = cloning.getFilters();
+		const arrayFilter = filters?.map((singleFilter: Filter) => {
+			return this.cloneFiltersContent(singleFilter);
+		});
+		if (arrayFilter) {
+			filterInfo.filters = arrayFilter;
+		}
+		return new Filter(filterInfo);
+	}
+
 	/**
 	 * Returns the current filters applied to the Table.
 	 *
@@ -35,7 +108,10 @@ export default class CollectionBindingInfoAPI {
 	 * @returns The {@link sap.ui.model.Filter "filters"} on the table
 	 */
 	getFilters(): Filter | undefined {
-		return deepClone(this.collectionBindingInfo.filters);
+		if (this.collectionBindingInfo.filters) {
+			return this.cloneFiltersContent(this.collectionBindingInfo.filters);
+		}
+		return undefined;
 	}
 
 	/**
@@ -57,7 +133,7 @@ export default class CollectionBindingInfoAPI {
 	 * @public
 	 */
 	getSorters(): Sorter[] | undefined {
-		return deepClone(this.collectionBindingInfo.sorter);
+		return this.collectionBindingInfo.sorter;
 	}
 
 	/**
@@ -68,12 +144,11 @@ export default class CollectionBindingInfoAPI {
 	 */
 	addSelect(parameters: string[]): void {
 		const parameterString: string = parameters.toString();
-		if (this.collectionBindingInfo?.parameters?.$select) {
-			this.collectionBindingInfo.parameters.$select = this.collectionBindingInfo?.parameters?.$select + "," + parameterString;
+		if (this.collectionBindingInfo.parameters?.$select) {
+			this.collectionBindingInfo.parameters.$select = this.collectionBindingInfo.parameters.$select + "," + parameterString;
 		} else {
-			this.collectionBindingInfo.parameters = {
-				$select: parameterString
-			};
+			this.collectionBindingInfo.parameters ??= {};
+			this.collectionBindingInfo.parameters.$select = parameterString;
 		}
 	}
 
@@ -85,7 +160,19 @@ export default class CollectionBindingInfoAPI {
 	 */
 
 	getBindingInfo(): CollectionBindingInfo {
-		return deepClone(this.collectionBindingInfo);
+		const clonedBindingInfo = { ...this.collectionBindingInfo };
+
+		// Making deepClones of objects (except Sorters because we can't)
+		if (this.collectionBindingInfo.events) {
+			clonedBindingInfo.events = deepClone(this.collectionBindingInfo.events);
+		}
+		if (this.collectionBindingInfo.filters) {
+			clonedBindingInfo.filters = this.cloneFiltersContent(this.collectionBindingInfo.filters);
+		}
+		if (this.collectionBindingInfo.parameters) {
+			deepClone(this.collectionBindingInfo.parameters);
+		}
+		return clonedBindingInfo;
 	}
 
 	/**