@qrvey/filters 0.0.29 → 0.0.31

package/CHANGELOG.md

@@ -4,8 +4,20 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.0.31](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.31..v0.0.30)
+
+- fix: :bug: fixed the ordering filters by scope, datasets and columns [`#8`](https://bitbucket.org/qrvey/qrvey_filters/pull-requests/8)
+
+#### [v0.0.30](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.30..v0.0.29)
+
+> 19 February 2025
+
+- fix: added new config to order the given filters manually [`#7`](https://bitbucket.org/qrvey/qrvey_filters/pull-requests/7)
+
 #### [v0.0.29](https://bitbucket.org/qrvey/qrvey_filters/compare/v0.0.29..v0.0.28)
 
+> 7 February 2025
+
 - fix: adjusted addFilter module to change the operator based on the new criteria [`#6`](https://bitbucket.org/qrvey/qrvey_filters/pull-requests/6)
 - chore :upgraded Qrvey Utils to latest version [`87be141`](https://bitbucket.org/qrvey/qrvey_filters/commits/87be141d628b77607b0daa50e5e5d371a0892650)
 

package/dist/cjs/classes/FilterBuilder.d.ts

@@ -25,20 +25,23 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * Adds various filter into the collection.
      * Inserts them next to the last similar filter
      * @param newFilters the filter to add
+     * @param inIndexes collection of indexes to add the new filters
      * @param settings the settings object to setup this function
      * @returns the new collection of filters
      */
-    addMutiple(newFilters: IFilter[], settings?: IFilterAddSettings): IFilterBuilderMultipleReturn;
+    addMultiple(newFilters: IFilter[], inIndexes?: number[], settings?: IFilterAddSettings): IFilterBuilderMultipleReturn;
     /**
      * Adds one filter into the collection.
      * - Inserts it next to the last similar filter
      * - If the new one is match with the last similar filter, the operator will change to OR
      * - If the id is not provided, a new one is created.
+     * - If the inIndex nunber is provided, this will be the index where the filter is inserted
      * @param filter the filter to add
+     * @param inIndex the index to add the new filter
      * @param settings settings object to setup this function
      * @returns the new collection of filters
      */
-    addSingle(filter: IFilter, settings?: IFilterAddSettings): IFilterBuilderSingleReturn;
+    addSingle(filter: IFilter, inIndex?: number, settings?: IFilterAddSettings): IFilterBuilderSingleReturn;
     /**
      * Adds one value from filter
      * @param id the ID to search the filter to add value
@@ -70,7 +73,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param ids a collection of ID to search filters to remove
      * @returns the new filter collection
      */
-    deleteMutiple(ids: string[]): IFilterBuilderMultipleReturn;
+    deleteMultiple(ids: string[]): IFilterBuilderMultipleReturn;
     /**
      * Removes one filter from the collection
      * @param id the ID to search the filter to remove
@@ -103,7 +106,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param settings settings object for the function
      * @returns the new filter collection
      */
-    editMutiple(ids: string[], filters: Partial<IFilter>[], settings?: IFilterBuilderEditSettings): IFilterBuilderMultipleReturn;
+    editMultiple(ids: string[], filters: Partial<IFilter>[], settings?: IFilterBuilderEditSettings): IFilterBuilderMultipleReturn;
     /**
      * Edits one filter from the collection
      * @param id the ID to search the filter to edit
@@ -146,7 +149,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param settings the settings object to setup this function
      * @returns the new filter collection
      */
-    mergeMutiple(filters: IFilter[], settings?: IFilterMergeSettings): IFilterBuilderMultipleReturn;
+    mergeMultiple(filters: IFilter[], settings?: IFilterMergeSettings): IFilterBuilderMultipleReturn;
     /**
      * Merge values from filter
      * @param id the ID to search the filter to merge values

package/dist/cjs/classes/FilterBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}

package/dist/cjs/classes/FilterBuilder.js

@@ -37,17 +37,18 @@ class FilterBuilder {
      * Adds various filter into the collection.
      * Inserts them next to the last similar filter
      * @param newFilters the filter to add
+     * @param inIndexes collection of indexes to add the new filters
      * @param settings the settings object to setup this function
      * @returns the new collection of filters
      */
-    addMutiple(newFilters, settings) {
+    addMultiple(newFilters, inIndexes, settings) {
         if ((0, utils_1.isEmpty)(newFilters))
             return { resulting: this.filters };
         const filters = (0, utils_1.objectCopy)(this.filters);
         const affected = [];
         try {
-            newFilters.forEach((newFilter) => {
-                const affectedFilter = this.addSingle(newFilter, settings);
+            newFilters.forEach((newFilter, index) => {
+                const affectedFilter = this.addSingle(newFilter, inIndexes?.[index], settings);
                 affected.push(affectedFilter.affected);
             });
         }
@@ -67,11 +68,13 @@ class FilterBuilder {
      * - Inserts it next to the last similar filter
      * - If the new one is match with the last similar filter, the operator will change to OR
      * - If the id is not provided, a new one is created.
+     * - If the inIndex nunber is provided, this will be the index where the filter is inserted
      * @param filter the filter to add
+     * @param inIndex the index to add the new filter
      * @param settings settings object to setup this function
      * @returns the new collection of filters
      */
-    addSingle(filter, settings) {
+    addSingle(filter, inIndex, settings) {
         if ((0, utils_1.isEmpty)(filter))
             return { resulting: this.filters };
         if (FilterValidation_1.FilterValidation.isDuplicated(this.filters, filter))
@@ -81,14 +84,27 @@ class FilterBuilder {
         const newSettings = (0, filter_settings_helpers_1.getFilterAddSettings)(settings);
         if ((0, utils_1.isEmpty)(filter.id) || newSettings.automaticId)
             newFilter.id = (0, getFilterId_1.getFilterId)(newFilter);
-        const lastIndex = (0, utils_1.getLastIndexFromArray)(this.filters, (aFilter) => aFilter.columnId === newFilter.columnId &&
-            aFilter.datasetId === newFilter.datasetId &&
-            aFilter.scope === newFilter.scope &&
-            aFilter.scopeId === newFilter.scopeId);
-        if (lastIndex > -1) {
-            this.filters.splice(lastIndex + 1, 0, newFilter);
-            if (newSettings.automaticOperator)
-                this.filters[lastIndex].operator = filter_operators_resources_1.FILTER_OPERATOR.OR;
+        let indexResult;
+        let nextIndex;
+        if ((0, utils_1.isNaNV2)(inIndex)) {
+            indexResult = this.searchEngine.findLastIndexByFilter(newFilter, inIndex);
+            nextIndex = indexResult.index + 1;
+        }
+        else {
+            indexResult = {
+                index: inIndex,
+                nextToColumnFilter: false,
+                nextToDatasetFilter: false,
+                nextToScopeFilter: false,
+            };
+            nextIndex = indexResult.index;
+        }
+        if (indexResult.index > -1) {
+            this.filters.splice(nextIndex, 0, newFilter);
+            if (newSettings.automaticOperator &&
+                indexResult.nextToColumnFilter &&
+                indexResult.index > -1)
+                this.filters[indexResult.index].operator = filter_operators_resources_1.FILTER_OPERATOR.OR;
         }
         else {
             this.filters.push(newFilter);
@@ -177,7 +193,7 @@ class FilterBuilder {
      * @param ids a collection of ID to search filters to remove
      * @returns the new filter collection
      */
-    deleteMutiple(ids) {
+    deleteMultiple(ids) {
         if (!Array.isArray(ids))
             return { resulting: this.filters };
         const filters = (0, utils_1.objectCopy)(this.filters);
@@ -286,7 +302,7 @@ class FilterBuilder {
      * @param settings settings object for the function
      * @returns the new filter collection
      */
-    editMutiple(ids, filters, settings) {
+    editMultiple(ids, filters, settings) {
         if (!Array.isArray(ids) ||
             !Array.isArray(filters) ||
             ids.length !== filters.length)
@@ -423,7 +439,7 @@ class FilterBuilder {
             affected = affectedMergeFilter;
         }
         else {
-            const { affected: affectedAddSingle } = this.addSingle(filter, settings);
+            const { affected: affectedAddSingle } = this.addSingle(filter, undefined, settings);
             affected = affectedAddSingle;
         }
         return {
@@ -438,7 +454,7 @@ class FilterBuilder {
      * @param settings the settings object to setup this function
      * @returns the new filter collection
      */
-    mergeMutiple(filters, settings) {
+    mergeMultiple(filters, settings) {
         if (!Array.isArray(filters) || (0, utils_1.isEmpty)(filters))
             return { resulting: this.filters };
         const originalFilters = (0, utils_1.objectCopy)(this.filters);
@@ -558,8 +574,14 @@ class FilterBuilder {
     replaceByParams(filters, params, settings) {
         const original = (0, utils_1.objectCopy)(this.filters);
         const newSettings = (0, filter_settings_helpers_1.getReplaceByParamsSettings)(settings);
+        let filterIndexes = undefined;
+        if (newSettings.addingInSameIndex) {
+            filterIndexes = this.searchEngine.filterIndexesByParams(params, settings);
+            if ((0, utils_1.isEmpty)(filterIndexes))
+                filterIndexes = undefined;
+        }
         this.filters = this.searchEngine.excludeByParams(params, newSettings);
-        const resulting = this.addMutiple(filters, newSettings);
+        const resulting = this.addMultiple(filters, filterIndexes, newSettings);
         this.sync();
         return {
             resulting: this.filters,

package/dist/cjs/classes/FilterSearcher.d.ts

@@ -1,5 +1,5 @@
 import { IFilterSearcherParams } from "../models/filter-searcher.models";
-import { IFilterParamSettings } from "../resources/filter-functions.resources";
+import { IFilterFindLastIndexReturn, IFilterParamSettings } from "../resources/filter-functions.resources";
 import { IFilter } from "../resources/filters.resources";
 /**
  * Class to search filters.
@@ -31,7 +31,7 @@ export declare class FilterSearcher implements IFilterSearcherParams {
      */
     filterByParams(params: Partial<IFilter>, settings?: IFilterParamSettings): IFilter[];
     /**
-     * Searchs filters by the given params and returns the inexes
+     * Searchs filters by the given params and returns the indexes
      * @param params params to search the filters
      * @param settings settings for this function
      * @returns the new collection of filters
@@ -53,6 +53,19 @@ export declare class FilterSearcher implements IFilterSearcherParams {
      * @returns the new collection of filters
      */
     findIndexByParams(params: Partial<IFilter>, settings?: IFilterParamSettings): number;
+    /**
+     * **************************************************************************************************
+     **************************************** By Filters *************************************************
+     ****************************************************************************************************
+     */
+    /**
+     * Gets an index where the new filter is going to be added
+     * If an index is given, the searching is skipped
+     * @param newFilter the new filter to add
+     * @param index a custom index
+     * @returns the index result object
+     */
+    findLastIndexByFilter(newFilter: IFilter, index?: number): IFilterFindLastIndexReturn;
     /**
      * **************************************************************************************************
      ****************************************** Getters *************************************************

package/dist/cjs/classes/FilterSearcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterSearcher.d.ts","sourceRoot":"","sources":["../../../src/classes/FilterSearcher.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;GAEG;AACH,qBAAa,cAAe,YAAW,qBAAqB;IAK9C,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE;IAJxC;;;OAGG;gBACmB,OAAO,GAAE,OAAO,EAAO;IAI7C;;;;OAIG;IAEH;;;;;OAKG;IACI,eAAe,CACpB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,OAAO,EAAE;IAYZ;;;;;OAKG;IACI,cAAc,CACnB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,OAAO,EAAE;IAWZ;;;;;OAKG;IACI,qBAAqB,CAC1B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,MAAM,EAAE;IAsBX;;;;;;OAMG;IACI,YAAY,CACjB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,OAAO,GAAG,SAAS;IAYtB;;;;;;OAMG;IACI,iBAAiB,CACtB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,MAAM;IAYT;;;;OAIG;IAEH;;;OAGG;IACI,UAAU,IAAI,OAAO,EAAE;IAI9B;;;;OAIG;IAEH;;;OAGG;IACI,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI;CAG5C"}
+{"version":3,"file":"FilterSearcher.d.ts","sourceRoot":"","sources":["../../../src/classes/FilterSearcher.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;GAEG;AACH,qBAAa,cAAe,YAAW,qBAAqB;IAK9C,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE;IAJxC;;;OAGG;gBACmB,OAAO,GAAE,OAAO,EAAO;IAI7C;;;;OAIG;IAEH;;;;;OAKG;IACI,eAAe,CACpB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,OAAO,EAAE;IAYZ;;;;;OAKG;IACI,cAAc,CACnB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,OAAO,EAAE;IAWZ;;;;;OAKG;IACI,qBAAqB,CAC1B,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,MAAM,EAAE;IAsBX;;;;;;OAMG;IACI,YAAY,CACjB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,OAAO,GAAG,SAAS;IAYtB;;;;;;OAMG;IACI,iBAAiB,CACtB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,MAAM;IAYT;;;;OAIG;IAEH;;;;;;OAMG;IACI,qBAAqB,CAC1B,SAAS,EAAE,OAAO,EAClB,KAAK,SAAK,GACT,0BAA0B;IAiD7B;;;;OAIG;IAEH;;;OAGG;IACI,UAAU,IAAI,OAAO,EAAE;IAI9B;;;;OAIG;IAEH;;;OAGG;IACI,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI;CAG5C"}

package/dist/cjs/classes/FilterSearcher.js

@@ -47,7 +47,7 @@ class FilterSearcher {
         return this.filters.filter((filter) => (0, resolveFilterConditions_1.resolveFilterConditions)(filter, params, completeSettings));
     }
     /**
-     * Searchs filters by the given params and returns the inexes
+     * Searchs filters by the given params and returns the indexes
      * @param params params to search the filters
      * @param settings settings for this function
      * @returns the new collection of filters
@@ -88,6 +88,52 @@ class FilterSearcher {
             return -1;
         return this.filters.findIndex((filter) => (0, resolveFilterConditions_1.resolveFilterConditions)(filter, params, (0, filter_settings_helpers_1.getParamFiltersSettings)(settings)));
     }
+    /**
+     * **************************************************************************************************
+     **************************************** By Filters *************************************************
+     ****************************************************************************************************
+     */
+    /**
+     * Gets an index where the new filter is going to be added
+     * If an index is given, the searching is skipped
+     * @param newFilter the new filter to add
+     * @param index a custom index
+     * @returns the index result object
+     */
+    findLastIndexByFilter(newFilter, index = -1) {
+        const result = {
+            index: -1,
+            nextToColumnFilter: false,
+            nextToDatasetFilter: false,
+            nextToScopeFilter: false,
+        };
+        if ((0, utils_1.isEmpty)(newFilter))
+            return result;
+        const newIndex = (0, utils_1.isNaNV2)(index) ? -1 : index;
+        if (this.filters.length <= newIndex)
+            return { ...result, index: this.filters.length - 1 };
+        if (newIndex > -1)
+            return { ...result, index: newIndex };
+        // Look index next to Scope - Dataset - column
+        let lastIndex = (0, utils_1.getLastIndexFromArray)(this.filters, (aFilter) => aFilter.columnId === newFilter.columnId &&
+            aFilter.datasetId === newFilter.datasetId &&
+            aFilter.scope === newFilter.scope &&
+            aFilter.scopeId === newFilter.scopeId);
+        if (lastIndex > -1)
+            return { ...result, index: lastIndex, nextToColumnFilter: true };
+        // Look index next to Scope - Dataset
+        lastIndex = (0, utils_1.getLastIndexFromArray)(this.filters, (aFilter) => aFilter.datasetId === newFilter.datasetId &&
+            aFilter.scope === newFilter.scope &&
+            aFilter.scopeId === newFilter.scopeId);
+        if (lastIndex > -1)
+            return { ...result, index: lastIndex, nextToDatasetFilter: true };
+        // Look index next to Scope
+        lastIndex = (0, utils_1.getLastIndexFromArray)(this.filters, (aFilter) => aFilter.scope === newFilter.scope &&
+            aFilter.scopeId === newFilter.scopeId);
+        if (lastIndex > -1)
+            return { ...result, index: lastIndex, nextToScopeFilter: true };
+        return result;
+    }
     /**
      * **************************************************************************************************
      ****************************************** Getters *************************************************

package/dist/cjs/helpers/filter-settings.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-settings.helpers.d.ts","sourceRoot":"","sources":["../../../src/helpers/filter-settings.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,uCAAuC,EACvC,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,yCAAyC,CAAC;AAEjD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,CAAC,EAAE,0BAA0B,GACpC,0BAA0B,CAQ5B;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,kBAAkB,GAC5B,kBAAkB,CAQpB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,qBAAqB,CAMvB;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,QAAQ,CAAC,EAAE,uCAAuC,GACjD,uCAAuC,CAkBzC;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,oBAAoB,CAYtB;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,CAAC,EAAE,2BAA2B,GACrC,2BAA2B,CAK7B"}
+{"version":3,"file":"filter-settings.helpers.d.ts","sourceRoot":"","sources":["../../../src/helpers/filter-settings.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,uCAAuC,EACvC,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,yCAAyC,CAAC;AAEjD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,CAAC,EAAE,0BAA0B,GACpC,0BAA0B,CAQ5B;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,kBAAkB,GAC5B,kBAAkB,CAQpB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,qBAAqB,CAMvB;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,QAAQ,CAAC,EAAE,uCAAuC,GACjD,uCAAuC,CAkBzC;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,oBAAoB,CAYtB;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,CAAC,EAAE,2BAA2B,GACrC,2BAA2B,CAM7B"}

package/dist/cjs/helpers/filter-settings.helpers.js

@@ -89,6 +89,7 @@ function getReplaceByParamsSettings(settings) {
     return {
         ...settings,
         automaticOperator: settings?.automaticOperator ?? false,
+        addingInSameIndex: settings?.addingInSameIndex ?? false,
     };
 }
 exports.getReplaceByParamsSettings = getReplaceByParamsSettings;

package/dist/cjs/models/filter-builder.models.d.ts

@@ -8,19 +8,21 @@ export interface IFilterBuilderAdd {
     /**
      * Adds one filter into the collection.
      * Inserts it next to the last similar filter
-     * @param newFilter the filter to add
+     * @param filter the filter to add
+     * @param inIndex the index to add the new filter
      * @param settings the settings object to setup this function
      * @returns the new collection of filters
      */
-    addSingle: (filter: IFilter, settings?: IFilterAddSettings) => IFilterBuilderSingleReturn;
+    addSingle: (filter: IFilter, inIndex?: number, settings?: IFilterAddSettings) => IFilterBuilderSingleReturn;
     /**
      * Adds various filter into the collection.
      * Inserts them next to the last similar filter
-     * @param newFilters the filter to add
+     * @param filter the filter to add
+     * @param inIndexes collection of indexes to add the new filters
      * @param settings the settings object to setup this function
      * @returns the new collection of filters
      */
-    addMutiple: (filter: IFilter[], settings?: IFilterAddSettings) => IFilterBuilderMultipleReturn;
+    addMultiple: (filter: IFilter[], inIndexes?: number[], settings?: IFilterAddSettings) => IFilterBuilderMultipleReturn;
 }
 /**
  * Structure module for the editing filter values
@@ -56,7 +58,7 @@ export interface IFilterBuilderDelete {
      * @param ids a collection of ID to search filters to remove
      * @returns the new filter collection
      */
-    deleteMutiple: (ids: string[]) => IFilterBuilderMultipleReturn;
+    deleteMultiple: (ids: string[]) => IFilterBuilderMultipleReturn;
 }
 /**
  * Structure module for the editing filter values
@@ -96,7 +98,7 @@ export interface IFilterBuilderEdit {
      * @param settings settings object for the function
      * @returns the new filter collection
      */
-    editMutiple: (ids: string[], filter: Partial<IFilter>[] | IFilter[], settings?: IFilterBuilderEditSettings) => IFilterBuilderMultipleReturn;
+    editMultiple: (ids: string[], filter: Partial<IFilter>[] | IFilter[], settings?: IFilterBuilderEditSettings) => IFilterBuilderMultipleReturn;
 }
 /**
  * Structure module for the editing filter values
@@ -136,7 +138,7 @@ export interface IFilterBuilderMerge {
      * @param settings the settings object to setup this function
      * @returns the new filter collection
      */
-    mergeMutiple: (filters: IFilter[], settings?: IFilterMergeSettings) => IFilterBuilderMultipleReturn;
+    mergeMultiple: (filters: IFilter[], settings?: IFilterMergeSettings) => IFilterBuilderMultipleReturn;
 }
 /**
  * Structure module for the editing filter values

package/dist/cjs/models/filter-builder.models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-builder.models.d.ts","sourceRoot":"","sources":["../../../src/models/filter-builder.models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filter-builder.models.d.ts","sourceRoot":"","sources":["../../../src/models/filter-builder.models.ts"],"names":[],"mappings":"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"}

package/dist/cjs/resources/filter-functions.resources.d.ts

@@ -59,5 +59,16 @@ export type IFilterMergeSettings = IFilterAddSettings;
 /**
  * Settings object for the Replace Param function
  */
-export type IFilterReplaceParamSettings = IFilterParamSettings & IFilterAddSettings;
+export type IFilterReplaceParamSettings = IFilterParamSettings & IFilterAddSettings & {
+    addingInSameIndex?: boolean;
+};
+/**
+ * The object to return for the findLastIndex function
+ */
+export interface IFilterFindLastIndexReturn {
+    index: number;
+    nextToColumnFilter: boolean;
+    nextToDatasetFilter: boolean;
+    nextToScopeFilter: boolean;
+}
 //# sourceMappingURL=filter-functions.resources.d.ts.map

package/dist/cjs/resources/filter-functions.resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-functions.resources.d.ts","sourceRoot":"","sources":["../../../src/resources/filter-functions.resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,2BAA2B,EAAE,kBAGzC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACjC;AAED,eAAO,MAAM,8BAA8B,EAAE,qBAG5C,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,8BAA8B,EAAE,oBAI5C,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,6BAA6B,EAAE,0BAG3C,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,uCAAuC;IACtD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,eAAO,MAAM,gDAAgD,EAAE,uCAO5D,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAC5D,kBAAkB,CAAC"}
+{"version":3,"file":"filter-functions.resources.d.ts","sourceRoot":"","sources":["../../../src/resources/filter-functions.resources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,2BAA2B,EAAE,kBAGzC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACjC;AAED,eAAO,MAAM,8BAA8B,EAAE,qBAG5C,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,8BAA8B,EAAE,oBAI5C,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,6BAA6B,EAAE,0BAG3C,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,uCAAuC;IACtD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,eAAO,MAAM,gDAAgD,EAAE,uCAO5D,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,2BAA2B,GAAG,oBAAoB,GAC5D,kBAAkB,GAAG;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEvD;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,iBAAiB,EAAE,OAAO,CAAC;CAC5B"}

package/dist/classes/FilterBuilder.d.ts

@@ -25,20 +25,23 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * Adds various filter into the collection.
      * Inserts them next to the last similar filter
      * @param newFilters the filter to add
+     * @param inIndexes collection of indexes to add the new filters
      * @param settings the settings object to setup this function
      * @returns the new collection of filters
      */
-    addMutiple(newFilters: IFilter[], settings?: IFilterAddSettings): IFilterBuilderMultipleReturn;
+    addMultiple(newFilters: IFilter[], inIndexes?: number[], settings?: IFilterAddSettings): IFilterBuilderMultipleReturn;
     /**
      * Adds one filter into the collection.
      * - Inserts it next to the last similar filter
      * - If the new one is match with the last similar filter, the operator will change to OR
      * - If the id is not provided, a new one is created.
+     * - If the inIndex nunber is provided, this will be the index where the filter is inserted
      * @param filter the filter to add
+     * @param inIndex the index to add the new filter
      * @param settings settings object to setup this function
      * @returns the new collection of filters
      */
-    addSingle(filter: IFilter, settings?: IFilterAddSettings): IFilterBuilderSingleReturn;
+    addSingle(filter: IFilter, inIndex?: number, settings?: IFilterAddSettings): IFilterBuilderSingleReturn;
     /**
      * Adds one value from filter
      * @param id the ID to search the filter to add value
@@ -70,7 +73,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param ids a collection of ID to search filters to remove
      * @returns the new filter collection
      */
-    deleteMutiple(ids: string[]): IFilterBuilderMultipleReturn;
+    deleteMultiple(ids: string[]): IFilterBuilderMultipleReturn;
     /**
      * Removes one filter from the collection
      * @param id the ID to search the filter to remove
@@ -103,7 +106,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param settings settings object for the function
      * @returns the new filter collection
      */
-    editMutiple(ids: string[], filters: Partial<IFilter>[], settings?: IFilterBuilderEditSettings): IFilterBuilderMultipleReturn;
+    editMultiple(ids: string[], filters: Partial<IFilter>[], settings?: IFilterBuilderEditSettings): IFilterBuilderMultipleReturn;
     /**
      * Edits one filter from the collection
      * @param id the ID to search the filter to edit
@@ -146,7 +149,7 @@ export declare class FilterBuilder implements IFilterBuilderAdd, IFilterBuilderA
      * @param settings the settings object to setup this function
      * @returns the new filter collection
      */
-    mergeMutiple(filters: IFilter[], settings?: IFilterMergeSettings): IFilterBuilderMultipleReturn;
+    mergeMultiple(filters: IFilter[], settings?: IFilterMergeSettings): IFilterBuilderMultipleReturn;
     /**
      * Merge values from filter
      * @param id the ID to search the filter to merge values

package/dist/classes/FilterBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FilterBuilder.d.ts","sourceRoot":"","sources":["../../src/classes/FilterBuilder.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACtB,oBAAoB,EACpB,yBAAyB,EACzB,kBAAkB,EAClB,uBAAuB,EACvB,mBAAmB,EACnB,wBAAwB,EACxB,4BAA4B,EAC5B,iBAAiB,EACjB,0BAA0B,EAC3B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EAErB,oBAAoB,EACpB,oBAAoB,EACpB,2BAA2B,EAC5B,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EACL,YAAY,EAIb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAGL,OAAO,EACR,MAAM,gCAAgC,CAAC;AAExC;;GAEG;AACH,qBAAa,aACX,YACE,iBAAiB,EACjB,sBAAsB,EACtB,oBAAoB,EACpB,yBAAyB,EACzB,kBAAkB,EAClB,uBAAuB,EACvB,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB;IAWP,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE;IATxC;;OAEG;IACH,OAAO,CAAC,YAAY,CAAiB;IAErC;;;OAGG;gBACmB,OAAO,GAAE,OAAO,EAAO;IAK7C;;;;OAIG;IAEH;;;;;;;OAOG;IACI,WAAW,CAChB,UAAU,EAAE,OAAO,EAAE,EACrB,SAAS,CAAC,EAAE,MAAM,EAAE,EACpB,QAAQ,CAAC,EAAE,kBAAkB,GAC5B,4BAA4B;IA2B/B;;;;;;;;;;OAUG;IACI,SAAS,CACd,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,kBAAkB,GAC5B,0BAA0B;IA+C7B;;;;;OAKG;IACI,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,0BAA0B;IAiB5E;;;;;OAKG;IACI,SAAS,CACd,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,YAAY,EAAE,GACrB,0BAA0B;IAyB7B;;;;OAIG;IAEH;;;;;OAKG;IACI,cAAc,CACnB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,4BAA4B;IAgB/B;;;;OAIG;IACI,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,4BAA4B;IAuBlE;;;;OAIG;IACI,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,0BAA0B;IAiB3D;;;;;OAKG;IACI,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,0BAA0B;IAsBzE;;;;;OAKG;IACI,YAAY,CACjB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,EAAE,GAChB,0BAA0B;IA6B7B;;;;OAIG;IAEH;;;;;;OAMG;IACI,YAAY,CACjB,GAAG,EAAE,MAAM,EAAE,EACb,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EAC3B,QAAQ,CAAC,EAAE,0BAA0B,GACpC,4BAA4B;IAgC/B;;;;;;OAMG;IACI,UAAU,CACf,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,0BAA0B,GACpC,0BAA0B;IAyB7B;;;;;;OAMG;IACH,SAAS,CACP,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,MAAM,GACZ,0BAA0B;IAsB7B;;;;;;OAMG;IACI,UAAU,CACf,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,YAAY,EAAE,EACtB,OAAO,EAAE,MAAM,EAAE,GAChB,0BAA0B;IA6B7B;;;;OAIG;IAEH;;;;;OAKG;IACI,WAAW,CAChB,MAAM,EAAE,OAAO,EACf,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,0BAA0B;IAqC7B;;;;;OAKG;IACI,aAAa,CAClB,OAAO,EAAE,OAAO,EAAE,EAClB,QAAQ,CAAC,EAAE,oBAAoB,GAC9B,4BAA4B;IA2B/B;;;;;OAKG;IACI,WAAW,CAChB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,GACjC,0BAA0B;IAiD7B;;;;OAIG;IAEH;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CACjB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,qBAAqB,GAC/B,OAAO;IA0CV;;;;;;;OAOG;IACI,eAAe,CACpB,OAAO,EAAE,OAAO,EAAE,EAClB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,EACxB,QAAQ,CAAC,EAAE,2BAA2B,GACrC,4BAA4B;IAqB/B;;OAEG;IACH,OAAO,CAAC,IAAI;IAIZ;;;;OAIG;IAEH;;;OAGG;IACI,UAAU,IAAI,OAAO,EAAE;IAI9B;;;;OAIG;IAEH;;;OAGG;IACI,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI;CAI5C"}

package/dist/classes/FilterBuilder.js

@@ -1,4 +1,4 @@
-import { getLastIndexFromArray, isEmpty, objectCopy } from "@qrvey/utils";
+import { isEmpty, isNaNV2, objectCopy } from "@qrvey/utils";
 import { FilterSearcher } from "./FilterSearcher";
 import { FilterValidation } from "./FilterValidation";
 import { FilterValues } from "./FilterValues";
@@ -34,17 +34,18 @@ export class FilterBuilder {
      * Adds various filter into the collection.
      * Inserts them next to the last similar filter
      * @param newFilters the filter to add
+     * @param inIndexes collection of indexes to add the new filters
      * @param settings the settings object to setup this function
      * @returns the new collection of filters
      */
-    addMutiple(newFilters, settings) {
+    addMultiple(newFilters, inIndexes, settings) {
         if (isEmpty(newFilters))
             return { resulting: this.filters };
         const filters = objectCopy(this.filters);
         const affected = [];
         try {
-            newFilters.forEach((newFilter) => {
-                const affectedFilter = this.addSingle(newFilter, settings);
+            newFilters.forEach((newFilter, index) => {
+                const affectedFilter = this.addSingle(newFilter, inIndexes?.[index], settings);
                 affected.push(affectedFilter.affected);
             });
         }
@@ -64,11 +65,13 @@ export class FilterBuilder {
      * - Inserts it next to the last similar filter
      * - If the new one is match with the last similar filter, the operator will change to OR
      * - If the id is not provided, a new one is created.
+     * - If the inIndex nunber is provided, this will be the index where the filter is inserted
      * @param filter the filter to add
+     * @param inIndex the index to add the new filter
      * @param settings settings object to setup this function
      * @returns the new collection of filters
      */
-    addSingle(filter, settings) {
+    addSingle(filter, inIndex, settings) {
         if (isEmpty(filter))
             return { resulting: this.filters };
         if (FilterValidation.isDuplicated(this.filters, filter))
@@ -78,14 +81,27 @@ export class FilterBuilder {
         const newSettings = getFilterAddSettings(settings);
         if (isEmpty(filter.id) || newSettings.automaticId)
             newFilter.id = getFilterId(newFilter);
-        const lastIndex = getLastIndexFromArray(this.filters, (aFilter) => aFilter.columnId === newFilter.columnId &&
-            aFilter.datasetId === newFilter.datasetId &&
-            aFilter.scope === newFilter.scope &&
-            aFilter.scopeId === newFilter.scopeId);
-        if (lastIndex > -1) {
-            this.filters.splice(lastIndex + 1, 0, newFilter);
-            if (newSettings.automaticOperator)
-                this.filters[lastIndex].operator = FILTER_OPERATOR.OR;
+        let indexResult;
+        let nextIndex;
+        if (isNaNV2(inIndex)) {
+            indexResult = this.searchEngine.findLastIndexByFilter(newFilter, inIndex);
+            nextIndex = indexResult.index + 1;
+        }
+        else {
+            indexResult = {
+                index: inIndex,
+                nextToColumnFilter: false,
+                nextToDatasetFilter: false,
+                nextToScopeFilter: false,
+            };
+            nextIndex = indexResult.index;
+        }
+        if (indexResult.index > -1) {
+            this.filters.splice(nextIndex, 0, newFilter);
+            if (newSettings.automaticOperator &&
+                indexResult.nextToColumnFilter &&
+                indexResult.index > -1)
+                this.filters[indexResult.index].operator = FILTER_OPERATOR.OR;
         }
         else {
             this.filters.push(newFilter);
@@ -174,7 +190,7 @@ export class FilterBuilder {
      * @param ids a collection of ID to search filters to remove
      * @returns the new filter collection
      */
-    deleteMutiple(ids) {
+    deleteMultiple(ids) {
         if (!Array.isArray(ids))
             return { resulting: this.filters };
         const filters = objectCopy(this.filters);
@@ -283,7 +299,7 @@ export class FilterBuilder {
      * @param settings settings object for the function
      * @returns the new filter collection
      */
-    editMutiple(ids, filters, settings) {
+    editMultiple(ids, filters, settings) {
         if (!Array.isArray(ids) ||
             !Array.isArray(filters) ||
             ids.length !== filters.length)
@@ -420,7 +436,7 @@ export class FilterBuilder {
             affected = affectedMergeFilter;
         }
         else {
-            const { affected: affectedAddSingle } = this.addSingle(filter, settings);
+            const { affected: affectedAddSingle } = this.addSingle(filter, undefined, settings);
             affected = affectedAddSingle;
         }
         return {
@@ -435,7 +451,7 @@ export class FilterBuilder {
      * @param settings the settings object to setup this function
      * @returns the new filter collection
      */
-    mergeMutiple(filters, settings) {
+    mergeMultiple(filters, settings) {
         if (!Array.isArray(filters) || isEmpty(filters))
             return { resulting: this.filters };
         const originalFilters = objectCopy(this.filters);
@@ -555,8 +571,14 @@ export class FilterBuilder {
     replaceByParams(filters, params, settings) {
         const original = objectCopy(this.filters);
         const newSettings = getReplaceByParamsSettings(settings);
+        let filterIndexes = undefined;
+        if (newSettings.addingInSameIndex) {
+            filterIndexes = this.searchEngine.filterIndexesByParams(params, settings);
+            if (isEmpty(filterIndexes))
+                filterIndexes = undefined;
+        }
         this.filters = this.searchEngine.excludeByParams(params, newSettings);
-        const resulting = this.addMutiple(filters, newSettings);
+        const resulting = this.addMultiple(filters, filterIndexes, newSettings);
         this.sync();
         return {
             resulting: this.filters,