@dcupl/common 0.0.81-beta.5 → 0.0.81-beta.6

package/dist/lib-cjs/changeDetection.d.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs';
+import { CallbackFunction } from './types';
 export type DcuplUpdateScope = 'all' | 'global' | 'list' | 'list$';
 export type DcuplUpdateTrigger = 'user' | 'loader';
 export type DcuplUpdateType = 'loader_fetch_finished' | 'file_loaded' | 'file_processed' | 'dcupl_initialized' | 'dcupl_updated_manually' | 'data_reprocessed_manually' | 'result_updated' | 'filter_applied' | 'global_triggered_update';
@@ -12,20 +12,20 @@ export type DcuplUpdateMessage = {
     title?: string;
     origin?: DcuplUpdateTrigger;
     duration?: number;
-    listId?: string;
+    originCdRefKey?: string;
     modelKey?: string;
     cloneResult?: boolean;
 };
 export declare class ChangeDetector {
-    protected listId: string;
+    key: string;
     protected parentCd: ChangeDetector | undefined;
-    private update$;
-    private sub;
+    private off;
+    private updateListener;
     constructor();
-    _init(listId: string, parentCd?: ChangeDetector): void;
+    _init(cdRefKey: string, parentCd?: ChangeDetector): void;
     destroy(): void;
     trigger(msg: DcuplUpdateMessage): void;
-    on$(): Observable<DcuplUpdateMessage>;
+    on(cb: CallbackFunction): () => void;
 }
 export declare const clone: (obj: any, shouldClone: boolean) => any;
 export declare const trigger: (msg: DcuplUpdateMessage) => any;

package/dist/lib-cjs/changeDetection.js

@@ -5,47 +5,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trigger = exports.clone = exports.ChangeDetector = void 0;
 var cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
-var rxjs_1 = require("rxjs");
-var operators_1 = require("rxjs/operators");
 var performance_1 = require("./performance");
 var ChangeDetector = /** @class */ (function () {
     function ChangeDetector() {
-        this.update$ = new rxjs_1.Subject();
+        this.updateListener = new Set();
     }
-    ChangeDetector.prototype._init = function (listId, parentCd) {
+    ChangeDetector.prototype._init = function (cdRefKey, parentCd) {
         var _this = this;
-        this.listId = listId;
+        this.key = cdRefKey;
         this.parentCd = parentCd;
         if (this.parentCd) {
-            this.sub = this.parentCd.on$().subscribe(function (msg) {
+            this.off = this.parentCd.on(function (msg) {
                 var _a;
-                if (msg.action === 'update' && msg.listId == ((_a = _this.parentCd) === null || _a === void 0 ? void 0 : _a.listId)) {
-                    _this.trigger({
-                        scope: 'list',
-                        action: 'update',
-                        title: 'global_triggered_update',
-                        type: 'global_triggered_update',
-                    });
+                if (msg.action === 'update' && msg.originCdRefKey === ((_a = _this.parentCd) === null || _a === void 0 ? void 0 : _a.key)) {
+                    _this.trigger(msg);
                 }
             });
         }
     };
     ChangeDetector.prototype.destroy = function () {
-        if (this.sub) {
-            this.sub.unsubscribe();
+        if (this.off) {
+            this.off();
         }
     };
     ChangeDetector.prototype.trigger = function (msg) {
-        if (!msg.listId) {
-            msg.listId = this.listId;
-        }
-        this.update$.next(msg);
-        if (this.parentCd) {
-            this.parentCd.trigger(msg);
+        if (!msg.originCdRefKey) {
+            msg.originCdRefKey = this.key;
         }
+        this.updateListener.forEach(function (cb) {
+            cb(msg);
+        });
     };
-    ChangeDetector.prototype.on$ = function () {
-        return this.update$.asObservable();
+    ChangeDetector.prototype.on = function (cb) {
+        var _this = this;
+        this.updateListener.add(cb);
+        return function () {
+            _this.updateListener.delete(cb);
+        };
     };
     return ChangeDetector;
 }());
@@ -73,10 +69,9 @@ var trigger = function (msg) {
             }
             var cdRef = this.cdRef;
             var start = performance_1.perf.now();
-            var listId = this.listId;
             var modelKey = (_a = this.model) === null || _a === void 0 ? void 0 : _a.key;
-            if (listId) {
-                msg.listId = listId;
+            if (!msg.originCdRefKey && cdRef.key) {
+                msg.originCdRefKey = cdRef.key;
             }
             if (modelKey) {
                 msg.modelKey = modelKey;
@@ -86,23 +81,25 @@ var trigger = function (msg) {
                 msg.method = _propertyKey;
                 msg.args = args;
                 if (result && 'pipe' in result) {
-                    result = result.pipe((0, operators_1.map)(function (value) {
-                        cdRef.trigger(msg);
-                        return (0, exports.clone)(value, !!msg.cloneResult);
-                    }));
+                    // result = (result as Observable<any>).pipe(
+                    //   map((value) => {
+                    //     cdRef?.trigger(msg);
+                    //     return clone(value, !!msg.cloneResult);
+                    //   }),
+                    // );
                     return result;
                 }
                 else if (result && 'then' in result) {
                     return result.then(function (value) {
                         var end = performance_1.perf.now();
                         msg.duration = end - start;
-                        cdRef.trigger(msg);
+                        cdRef === null || cdRef === void 0 ? void 0 : cdRef.trigger(msg);
                         return (0, exports.clone)(value, !!msg.cloneResult);
                     });
                 }
                 var end = performance_1.perf.now();
                 msg.duration = end - start;
-                cdRef.trigger(msg);
+                cdRef === null || cdRef === void 0 ? void 0 : cdRef.trigger(msg);
                 try {
                     return (0, exports.clone)(result, !!msg.cloneResult);
                 }

package/dist/lib-cjs/changeDetection.js.map

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

package/dist/lib-cjs/getFacets.js

@@ -40,11 +40,11 @@ exports.getFacets = void 0;
 var queryData_1 = require("./queryData");
 var query_builder_1 = require("./query-builder");
 var lodash_1 = require("lodash");
-var queryBuilder = new query_builder_1.QueryBuilder();
+var queryBuilder = new query_builder_1.DcuplQueryBuilder();
 function getFacets(modelData, remoteModelData, options, query, attributeKey, modelIndexMap) {
     var e_1, _a, e_2, _b, e_3, _c;
     var filterItemEntries = [];
-    var queryWithoutCurrentFilter = queryBuilder.removeQuery({ queryKey: attributeKey }, (0, lodash_1.cloneDeep)(query));
+    var queryWithoutCurrentFilter = queryBuilder.removeQuery({ groupKey: attributeKey }, (0, lodash_1.cloneDeep)(query));
     var currentFilteredData = (0, queryData_1.queryData)(modelData, queryWithoutCurrentFilter, false, modelIndexMap);
     var remoteModelDataKeys = remoteModelData ? __spreadArray([], __read(remoteModelData === null || remoteModelData === void 0 ? void 0 : remoteModelData.keys()), false) : [];
     var validFacetKeys = new Set(remoteModelDataKeys);
@@ -123,10 +123,10 @@ function getFacets(modelData, remoteModelData, options, query, attributeKey, mod
 }
 exports.getFacets = getFacets;
 var isFilterItemEntrySelected = function (groupKey, facetKey, query) {
-    var idx = query.query.findIndex(function (query) { return queryBuilder.isQueryGroup(query) && query.queryKey === groupKey; });
+    var idx = query.queries.findIndex(function (query) { return queryBuilder.isQueryGroup(query) && query.groupKey === groupKey; });
     if (idx > -1) {
-        var queryGroup = query.query[idx];
-        return !!queryGroup.query.find(function (query) {
+        var queryGroup = query.queries[idx];
+        return !!queryGroup.queries.find(function (query) {
             var _a;
             if (queryBuilder.isQuery(query)) {
                 var key = ((_a = query.value) === null || _a === void 0 ? void 0 : _a.key) || query.value;

package/dist/lib-cjs/getFacets.js.map

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

package/dist/lib-cjs/query-builder.d.ts

@@ -1,22 +1,23 @@
 import { DcuplGlobalQueryOptionsNew, DcuplItemsOptions, DcuplQuery, DcuplQueryGroup } from './types';
-export declare class QueryBuilder {
+export declare class DcuplQueryBuilder {
     private _defaultQueryOptions;
     private _initOptions;
-    private queryOptions;
+    private currentQuery;
     constructor();
     init(options: {
-        listKey: string;
+        modelKey: string;
     }): void;
-    reset(): void;
+    reset(): DcuplGlobalQueryOptionsNew<any>;
     isQuery(query: Partial<DcuplQuery> | Partial<DcuplQueryGroup>): query is DcuplQuery;
     isQueryGroup(query: Partial<DcuplQuery> | Partial<DcuplQueryGroup>): query is DcuplQueryGroup;
-    isRootQueryGroup(query: Partial<DcuplQuery> | Partial<DcuplQueryGroup>): query is DcuplGlobalQueryOptionsNew<any>;
-    getQueryGroup(queryKey?: string): DcuplQueryGroup | undefined;
+    isRootQueryGroup(groupOrQuery: Partial<DcuplGlobalQueryOptionsNew<any>> | Partial<DcuplQuery> | Partial<DcuplQueryGroup>): groupOrQuery is DcuplGlobalQueryOptionsNew<any>;
+    getQueryGroup(groupKey?: string): DcuplQueryGroup | undefined;
     getQuery(): DcuplGlobalQueryOptionsNew<any>;
-    hasQueryGroup(queryKey: string): boolean;
-    applyItemOptions(options: DcuplItemsOptions<any>): DcuplGlobalQueryOptionsNew<any>;
-    applyQuery(queryToApply: DcuplQueryGroup | DcuplQuery | DcuplQuery[] | DcuplQueryGroup[], options?: {
+    hasQueryGroup(groupKey: string): boolean;
+    applyOptions(options: DcuplItemsOptions<any>, mode?: 'set' | 'update'): DcuplGlobalQueryOptionsNew<any>;
+    applyQuery(queryToApply: DcuplGlobalQueryOptionsNew<any> | DcuplQueryGroup | DcuplQuery | DcuplQuery[] | DcuplQueryGroup[], options?: {
         mode?: 'set' | 'add';
     }, relevantQuery?: DcuplGlobalQueryOptionsNew<any>): DcuplGlobalQueryOptionsNew<any>;
+    removeAllQueries(): DcuplGlobalQueryOptionsNew<any>;
     removeQuery(queryToRemove: Partial<DcuplQueryGroup> | DcuplQuery, relevantQuery?: DcuplGlobalQueryOptionsNew<any>): DcuplGlobalQueryOptionsNew<any>;
 }

package/dist/lib-cjs/query-builder.js

@@ -36,67 +36,76 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryBuilder = void 0;
+exports.DcuplQueryBuilder = void 0;
 var lodash_1 = require("lodash");
-var QueryBuilder = /** @class */ (function () {
-    function QueryBuilder() {
+var DcuplQueryBuilder = /** @class */ (function () {
+    function DcuplQueryBuilder() {
         this._defaultQueryOptions = {
-            listKey: '',
-            queryKey: 'root',
-            queryType: 'and',
-            query: [],
+            modelKey: '',
+            groupKey: 'root',
+            groupType: 'and',
+            queries: [],
         };
-        this.queryOptions = (0, lodash_1.cloneDeep)(this._defaultQueryOptions);
+        this.currentQuery = (0, lodash_1.cloneDeep)(this._defaultQueryOptions);
     }
-    QueryBuilder.prototype.init = function (options) {
+    DcuplQueryBuilder.prototype.init = function (options) {
         this._initOptions = (0, lodash_1.cloneDeep)(options);
-        this.queryOptions = (0, lodash_1.cloneDeep)(this._defaultQueryOptions);
-        this.queryOptions.listKey = options.listKey;
+        this.currentQuery = (0, lodash_1.cloneDeep)(this._defaultQueryOptions);
+        this.currentQuery.modelKey = options.modelKey;
     };
-    QueryBuilder.prototype.reset = function () {
+    DcuplQueryBuilder.prototype.reset = function () {
         this.init(this._initOptions);
+        return this.getQuery();
     };
-    QueryBuilder.prototype.isQuery = function (query) {
+    DcuplQueryBuilder.prototype.isQuery = function (query) {
         return 'attribute' in query;
     };
-    QueryBuilder.prototype.isQueryGroup = function (query) {
-        return 'queryKey' in query;
+    DcuplQueryBuilder.prototype.isQueryGroup = function (query) {
+        return 'groupKey' in query;
     };
-    QueryBuilder.prototype.isRootQueryGroup = function (query) {
-        return 'queryKey' in query && query.queryKey === 'root';
+    DcuplQueryBuilder.prototype.isRootQueryGroup = function (groupOrQuery) {
+        return this.isQueryGroup(groupOrQuery) && groupOrQuery.groupKey === 'root';
     };
-    QueryBuilder.prototype.getQueryGroup = function (queryKey) {
+    DcuplQueryBuilder.prototype.getQueryGroup = function (groupKey) {
         var _this = this;
-        return this.queryOptions.query.find(function (q) { return _this.isQueryGroup(q) && q.queryKey === queryKey; });
+        return this.currentQuery.queries.find(function (q) { return _this.isQueryGroup(q) && q.groupKey === groupKey; });
     };
-    QueryBuilder.prototype.getQuery = function () {
-        return (0, lodash_1.cloneDeep)(this.queryOptions);
+    DcuplQueryBuilder.prototype.getQuery = function () {
+        return (0, lodash_1.cloneDeep)(this.currentQuery);
     };
-    QueryBuilder.prototype.hasQueryGroup = function (queryKey) {
+    DcuplQueryBuilder.prototype.hasQueryGroup = function (groupKey) {
         var _this = this;
-        return this.queryOptions.query.some(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryKey; });
+        return this.currentQuery.queries.some(function (query) { return _this.isQueryGroup(query) && query.groupKey === groupKey; });
     };
-    QueryBuilder.prototype.applyItemOptions = function (options) {
-        if (options === null || options === void 0 ? void 0 : options.sort) {
-            this.queryOptions.sort = options.sort;
-        }
-        if (typeof (options === null || options === void 0 ? void 0 : options.count) !== 'undefined') {
-            this.queryOptions.count = options.count;
-        }
-        if (typeof (options === null || options === void 0 ? void 0 : options.start) !== 'undefined') {
-            this.queryOptions.start = options === null || options === void 0 ? void 0 : options.start;
+    DcuplQueryBuilder.prototype.applyOptions = function (options, mode) {
+        if (mode === void 0) { mode = 'update'; }
+        if (mode === 'set') {
+            this.currentQuery.count = options.count;
+            this.currentQuery.start = options.start;
+            this.currentQuery.sort = options.sort;
+            this.currentQuery.projection = options.projection;
         }
-        if (typeof (options === null || options === void 0 ? void 0 : options.projection) !== 'undefined') {
-            this.queryOptions.projection = options === null || options === void 0 ? void 0 : options.projection;
+        else {
+            if (typeof (options === null || options === void 0 ? void 0 : options.sort) !== 'undefined') {
+                this.currentQuery.sort = options.sort;
+            }
+            if (typeof (options === null || options === void 0 ? void 0 : options.count) !== 'undefined') {
+                this.currentQuery.count = options.count;
+            }
+            if (typeof (options === null || options === void 0 ? void 0 : options.start) !== 'undefined') {
+                this.currentQuery.start = options === null || options === void 0 ? void 0 : options.start;
+            }
+            if (typeof (options === null || options === void 0 ? void 0 : options.projection) !== 'undefined') {
+                this.currentQuery.projection = options === null || options === void 0 ? void 0 : options.projection;
+            }
         }
         return this.getQuery();
     };
-    QueryBuilder.prototype.applyQuery = function (queryToApply, options, relevantQuery) {
-        // handle default query
+    DcuplQueryBuilder.prototype.applyQuery = function (queryToApply, options, relevantQuery) {
         var e_1, _a;
         var _this = this;
         if (!relevantQuery)
-            relevantQuery = this.queryOptions;
+            relevantQuery = this.currentQuery;
         if (Array.isArray(queryToApply)) {
             try {
                 for (var queryToApply_1 = __values(queryToApply), queryToApply_1_1 = queryToApply_1.next(); !queryToApply_1_1.done; queryToApply_1_1 = queryToApply_1.next()) {
@@ -112,99 +121,101 @@ var QueryBuilder = /** @class */ (function () {
                 finally { if (e_1) throw e_1.error; }
             }
         }
+        else if (this.isRootQueryGroup(queryToApply)) {
+            if (queryToApply.groupType)
+                relevantQuery.groupType = queryToApply.groupType;
+            if (queryToApply.options)
+                relevantQuery.options = queryToApply.options;
+            if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
+                relevantQuery.queries = queryToApply.queries;
+            }
+            else {
+                relevantQuery.queries = __spreadArray(__spreadArray([], __read(relevantQuery.queries), false), __read(queryToApply.queries), false);
+            }
+        }
         else if (this.isQuery(queryToApply)) {
-            var idx = relevantQuery.query.findIndex(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryToApply.attribute; });
+            var idx = relevantQuery.queries.findIndex(function (query) { return _this.isQueryGroup(query) && query.groupKey === queryToApply.attribute; });
             if (idx > -1) {
-                var queryGroup = relevantQuery.query[idx];
+                var queryGroup = relevantQuery.queries[idx];
                 if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
-                    queryGroup.query = [queryToApply];
+                    queryGroup.queries = [queryToApply];
                 }
                 else {
-                    queryGroup.query.push(queryToApply);
+                    queryGroup.queries.push(queryToApply);
                 }
             }
             else {
-                relevantQuery.query.push({
-                    queryKey: queryToApply.attribute,
-                    queryType: 'or',
-                    query: [queryToApply],
+                relevantQuery.queries.push({
+                    groupKey: queryToApply.attribute,
+                    groupType: 'or',
+                    queries: [queryToApply],
                 });
             }
             // handle query group
         }
         else if (this.isQueryGroup(queryToApply)) {
-            if (this.isRootQueryGroup(queryToApply)) {
-                if (queryToApply.queryType)
-                    relevantQuery.queryType = queryToApply.queryType;
+            var idx = relevantQuery.queries.findIndex(function (query) { return _this.isQueryGroup(query) && query.groupKey === queryToApply.groupKey; });
+            if (idx > -1) {
+                var queryGroup = relevantQuery.queries[idx];
+                if (queryToApply.groupType)
+                    queryGroup.groupType = queryToApply.groupType;
                 if (queryToApply.options)
-                    relevantQuery.options = queryToApply.options;
+                    queryGroup.options = queryToApply.options;
                 if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
-                    relevantQuery.query = queryToApply.query;
+                    relevantQuery.queries[idx] = queryToApply;
                 }
                 else {
-                    relevantQuery.query = __spreadArray(__spreadArray([], __read(relevantQuery.query), false), __read(queryToApply.query), false);
+                    queryGroup.queries = __spreadArray(__spreadArray([], __read(queryGroup.queries), false), __read(queryToApply.queries), false);
                 }
             }
             else {
-                var idx = relevantQuery.query.findIndex(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryToApply.queryKey; });
-                if (idx > -1) {
-                    var queryGroup = relevantQuery.query[idx];
-                    if (queryToApply.queryType)
-                        queryGroup.queryType = queryToApply.queryType;
-                    if (queryToApply.options)
-                        queryGroup.options = queryToApply.options;
-                    if ((options === null || options === void 0 ? void 0 : options.mode) === 'set') {
-                        relevantQuery.query[idx] = queryToApply;
-                    }
-                    else {
-                        queryGroup.query = __spreadArray(__spreadArray([], __read(queryGroup.query), false), __read(queryToApply.query), false);
-                    }
-                }
-                else {
-                    relevantQuery.query.push({
-                        queryKey: queryToApply.queryKey,
-                        queryType: queryToApply.queryType || 'or',
-                        query: queryToApply.query,
-                        options: queryToApply.options,
-                    });
-                }
+                relevantQuery.queries.push({
+                    groupKey: queryToApply.groupKey,
+                    groupType: queryToApply.groupType || 'or',
+                    queries: queryToApply.queries,
+                    options: queryToApply.options,
+                });
             }
         }
         return relevantQuery;
     };
-    QueryBuilder.prototype.removeQuery = function (queryToRemove, relevantQuery) {
+    DcuplQueryBuilder.prototype.removeAllQueries = function () {
+        this.currentQuery.queries = [];
+        return this.getQuery();
+    };
+    DcuplQueryBuilder.prototype.removeQuery = function (queryToRemove, relevantQuery) {
         // handle default query
         var e_2, _a;
         var _this = this;
         if (!relevantQuery)
-            relevantQuery = this.queryOptions;
+            relevantQuery = this.currentQuery;
         if (this.isQuery(queryToRemove)) {
-            var idx = relevantQuery.query.findIndex(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryToRemove.attribute; });
+            var idx = relevantQuery.queries.findIndex(function (query) { return _this.isQueryGroup(query) && query.groupKey === queryToRemove.attribute; });
             if (idx > -1) {
-                var queryGroup = relevantQuery.query[idx];
-                var idxOfQueryToRemove = (0, lodash_1.findIndex)(queryGroup.query, queryToRemove);
+                var queryGroup = relevantQuery.queries[idx];
+                var idxOfQueryToRemove = (0, lodash_1.findIndex)(queryGroup.queries, queryToRemove);
                 if (idxOfQueryToRemove > -1) {
-                    queryGroup.query.splice(idxOfQueryToRemove, 1);
+                    queryGroup.queries.splice(idxOfQueryToRemove, 1);
                 }
-                if (queryGroup.query.length === 0) {
-                    relevantQuery.query.splice(idx, 1);
+                if (queryGroup.queries.length === 0) {
+                    relevantQuery.queries.splice(idx, 1);
                 }
             }
         }
         else if (this.isQueryGroup(queryToRemove)) {
-            var idx = relevantQuery.query.findIndex(function (query) { return _this.isQueryGroup(query) && query.queryKey === queryToRemove.queryKey; });
+            var idx = relevantQuery.queries.findIndex(function (query) { return _this.isQueryGroup(query) && query.groupKey === queryToRemove.groupKey; });
             if (idx > -1) {
-                if (!queryToRemove.query) {
-                    relevantQuery.query.splice(idx, 1);
+                if (!queryToRemove.queries) {
+                    relevantQuery.queries.splice(idx, 1);
                 }
                 else {
-                    var queryGroup = relevantQuery.query[idx];
+                    var queryGroup = relevantQuery.queries[idx];
                     try {
-                        for (var _b = __values(queryToRemove.query), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        for (var _b = __values(queryToRemove.queries), _c = _b.next(); !_c.done; _c = _b.next()) {
                             var q = _c.value;
-                            var idxOfQueryToRemove = (0, lodash_1.findIndex)(queryGroup.query, q);
+                            var idxOfQueryToRemove = (0, lodash_1.findIndex)(queryGroup.queries, q);
                             if (idxOfQueryToRemove > -1) {
-                                queryGroup.query.splice(idxOfQueryToRemove, 1);
+                                queryGroup.queries.splice(idxOfQueryToRemove, 1);
                             }
                         }
                     }
@@ -215,15 +226,15 @@ var QueryBuilder = /** @class */ (function () {
                         }
                         finally { if (e_2) throw e_2.error; }
                     }
-                    if (queryGroup.query.length === 0) {
-                        relevantQuery.query.splice(idx, 1);
+                    if (queryGroup.queries.length === 0) {
+                        relevantQuery.queries.splice(idx, 1);
                     }
                 }
             }
         }
         return relevantQuery;
     };
-    return QueryBuilder;
+    return DcuplQueryBuilder;
 }());
-exports.QueryBuilder = QueryBuilder;
+exports.DcuplQueryBuilder = DcuplQueryBuilder;
 //# sourceMappingURL=query-builder.js.map

package/dist/lib-cjs/query-builder.js.map

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