@recursyve/nestjs-data-filter 11.0.0 → 11.1.0

package/lib/filter/filter.service.js

@@ -15,7 +15,6 @@ const common_1 = require("@nestjs/common");
 const sequelize_1 = require("sequelize");
 const access_control_adapter_1 = require("../adapters/access-control.adapter");
 const translate_adapter_1 = require("../adapters/translate.adapter");
-const data_filter_repository_1 = require("../data-filter.repository");
 const data_filter_service_1 = require("../data-filter.service");
 const sequelize_model_scanner_1 = require("../scanners/sequelize-model.scanner");
 const sequelize_utils_1 = require("../sequelize.utils");
@@ -93,60 +92,61 @@ let FilterService = FilterService_1 = class FilterService {
         }
         return null;
     }
-    async count(...args) {
-        const [userOrOpt, opt] = args;
-        const options = opt ? opt : userOrOpt;
-        const user = opt ? userOrOpt : null;
+    async count(params) {
+        var _a, _b;
+        const { options } = params;
+        const user = (_a = params.user) !== null && _a !== void 0 ? _a : null;
         const countOptions = await this.getFindOptions(this.repository.model, options.query);
         if (options.search) {
-            this.addSearchCondition(options.search, countOptions);
+            this.addSearchCondition(options.search, countOptions, (_b = user === null || user === void 0 ? void 0 : user.language) !== null && _b !== void 0 ? _b : null);
         }
-        return user ? this.countTotalValues(user, countOptions) : this.countTotalValues(countOptions);
+        return this.countTotalValues({ options: countOptions, user });
     }
-    async filter(...args) {
-        const [userOrOpt, opt] = args;
-        const options = opt ? opt : userOrOpt;
-        const user = opt ? userOrOpt : null;
+    async filter(params) {
+        var _a, _b;
+        const { options, request } = params;
+        const user = (_a = params.user) !== null && _a !== void 0 ? _a : null;
         if (options.order) {
             options.order = this.normalizeOrder(options.order);
         }
         const countOptions = await this.getFindOptions(this.repository.model, options.query, options.data);
         if (options.search) {
-            this.addSearchCondition(options.search, countOptions);
+            this.addSearchCondition(options.search, countOptions, (_b = user === null || user === void 0 ? void 0 : user.language) !== null && _b !== void 0 ? _b : null);
         }
         if (options.order) {
             this.addOrderCondition(options.order, countOptions, options.data);
         }
         this.addGroupOption(options, countOptions);
-        const total = await (user ? this.countTotalValues(user, countOptions) : this.countTotalValues(countOptions));
-        const values = await (user ? this.findValues(user, options, countOptions) : this.findValues(options, countOptions));
+        const total = await this.countTotalValues({ options: countOptions, user });
+        const values = await this.findValues({ filter: options, options: countOptions, request, user });
         return {
             total,
             page: options.page,
             values
         };
     }
-    async downloadData(user, type, options, exportOptions) {
-        var _a, _b;
+    async downloadData(params) {
+        var _a, _b, _c;
+        const { exportOptions, options, request, type, user } = params;
         const findOptions = await this.getFindOptions(this.exportRepository.model, options.query);
         if (options.order) {
             options.order = this.normalizeOrder(options.order);
         }
         if (options.search) {
-            this.addSearchCondition(options.search, findOptions);
+            this.addSearchCondition(options.search, findOptions, (_a = user === null || user === void 0 ? void 0 : user.language) !== null && _a !== void 0 ? _a : null);
         }
         if (options.order) {
             this.addOrderCondition(options.order, findOptions, options.data);
         }
         delete options.page;
-        const values = await (user ? this.findValues(user, options, findOptions, this.exportRepository) : this.findValues(options, findOptions, this.exportRepository));
+        const values = await this.findValues({ filter: options, options: findOptions, repository: this.exportRepository, request, user });
         const headers = await this.model.getExportedFieldsKeys(type);
         if (headers.length) {
             const data = await Promise.all(values.map((value) => { var _a; return this.model.getExportedFields(value, (_a = user === null || user === void 0 ? void 0 : user.language) !== null && _a !== void 0 ? _a : "fr", type); }));
-            return await this.repository.downloadData(headers, data, type, (_a = user === null || user === void 0 ? void 0 : user.language) !== null && _a !== void 0 ? _a : "fr", exportOptions);
+            return await this.repository.downloadData(headers, data, type, (_b = user === null || user === void 0 ? void 0 : user.language) !== null && _b !== void 0 ? _b : "fr", exportOptions);
         }
         else {
-            return await this.repository.downloadData(values, type, (_b = user === null || user === void 0 ? void 0 : user.language) !== null && _b !== void 0 ? _b : "fr", exportOptions);
+            return await this.repository.downloadData(values, type, (_c = user === null || user === void 0 ? void 0 : user.language) !== null && _c !== void 0 ? _c : "fr", exportOptions);
         }
     }
     async getFindOptions(model, query, data) {
@@ -308,13 +308,13 @@ let FilterService = FilterService_1 = class FilterService {
             }
         }
     }
-    addSearchCondition(search, options) {
+    addSearchCondition(search, options, language) {
         var _a;
         const value = (_a = search === null || search === void 0 ? void 0 : search.value) === null || _a === void 0 ? void 0 : _a.toString();
         if (!(value === null || value === void 0 ? void 0 : value.length)) {
             return;
         }
-        this.repository.addSearchCondition(search.value, options);
+        this.repository.addSearchCondition(search.value, options, language);
     }
     addOrderCondition(orders, options, data) {
         if (orders.every(order => !order.direction)) {
@@ -365,14 +365,12 @@ let FilterService = FilterService_1 = class FilterService {
             }
         }
     }
-    async countTotalValues(...args) {
-        const [userOrOpt, opt] = args;
-        const options = opt ? opt : userOrOpt;
-        /**
-         * This means that countTotalValues was called with a user
-         */
-        if (opt) {
-            options.where = await this.getAccessControlWhereCondition(options.where, userOrOpt);
+    async countTotalValues(params) {
+        var _a;
+        const { options } = params;
+        const user = (_a = params.user) !== null && _a !== void 0 ? _a : null;
+        if (user) {
+            options.where = await this.getAccessControlWhereCondition(options.where, user);
         }
         if (options.having) {
             const data = await this.repository.model.findAll({
@@ -395,20 +393,15 @@ let FilterService = FilterService_1 = class FilterService {
             }
         }
     }
-    async findValues(...args) {
-        var _a, _b, _c, _d;
-        const [userOrOFilter, filterOrOpt, optOrRepo, repo] = args;
-        const optOrRepoIsRepo = optOrRepo instanceof data_filter_repository_1.DataFilterRepository;
-        const options = optOrRepo && !optOrRepoIsRepo ? optOrRepo : filterOrOpt;
-        const filter = optOrRepo && !optOrRepoIsRepo ? filterOrOpt : userOrOFilter;
-        const repository = repo !== null && repo !== void 0 ? repo : (optOrRepoIsRepo ? optOrRepo : this.repository);
-        /**
-         * This means that findValues was called with a user
-         */
-        if (repo) {
-            options.where = await this.getAccessControlWhereCondition(options.where, userOrOFilter);
-        }
-        const order = this.getOrderOptions((_a = filter.order) !== null && _a !== void 0 ? _a : []);
+    async findValues(params) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        const { filter, options, request } = params;
+        const user = (_a = params.user) !== null && _a !== void 0 ? _a : null;
+        const repository = (_b = params.repository) !== null && _b !== void 0 ? _b : this.repository;
+        if (user) {
+            options.where = await this.getAccessControlWhereCondition(options.where, user);
+        }
+        const order = this.getOrderOptions((_c = filter.order) !== null && _c !== void 0 ? _c : [], { request, user });
         const nonNestedOrderColumns = (Array.isArray(filter.order) ? filter.order : [filter.order])
             .filter((order) => !!order)
             .map(order => {
@@ -426,10 +419,10 @@ let FilterService = FilterService_1 = class FilterService {
         const values = await repository.model.findAll({
             ...options,
             attributes: ["id", ...nonNestedOrderColumns, ...customAttributes],
-            limit: filter.page ? filter.page.size : undefined,
-            offset: filter.page ? filter.page.number * filter.page.size + ((_b = filter.page.offset) !== null && _b !== void 0 ? _b : 0) : undefined,
+            limit: (_d = filter.page) === null || _d === void 0 ? void 0 : _d.size,
+            offset: filter.page ? filter.page.number * filter.page.size + ((_e = filter.page.offset) !== null && _e !== void 0 ? _e : 0) : undefined,
             subQuery: false,
-            group: (_c = filter.groupBy) !== null && _c !== void 0 ? _c : options.group,
+            group: (_f = filter.groupBy) !== null && _f !== void 0 ? _f : options.group,
             order
         });
         const group = this.generateRepositoryGroupBy(filter);
@@ -440,7 +433,7 @@ let FilterService = FilterService_1 = class FilterService {
             order,
             paranoid: options.paranoid,
             group
-        }, (_d = filter.data) !== null && _d !== void 0 ? _d : {});
+        }, (_g = filter.data) !== null && _g !== void 0 ? _g : {});
     }
     async getAccessControlWhereCondition(where, user) {
         var _a;
@@ -489,18 +482,17 @@ let FilterService = FilterService_1 = class FilterService {
             filter.condition ? this.getConditionInclude(model, filter.condition) : []
         ];
     }
-    getOrderOptions(orders) {
-        if (!Array.isArray(orders)) {
-            orders = [orders];
-        }
+    getOrderOptions(orders, context) {
+        let orderColumns = Array.isArray(orders) ? orders : [orders];
         if (this.model.defaultOrderRule) {
             const defaultOrders = Array.isArray(this.model.defaultOrderRule.order)
                 ? this.model.defaultOrderRule.order
                 : [this.model.defaultOrderRule.order];
-            orders = [...defaultOrders, ...orders];
+            const applicableDefaultOrderRule = defaultOrders.filter((order) => !orderColumns.some((o) => o.column === order.column));
+            orderColumns = [...applicableDefaultOrderRule, ...orderColumns];
         }
         const generatedOrder = [];
-        for (const order of orders) {
+        for (const order of orderColumns) {
             if (!(order === null || order === void 0 ? void 0 : order.column) || !order.direction) {
                 continue;
             }
@@ -515,7 +507,7 @@ let FilterService = FilterService_1 = class FilterService {
                 generatedOrder.push(this.sequelizeModelScanner.getOrder(this.repository.model, order));
             }
             else {
-                generatedOrder.push([rule.getOrderOption(this.repository.model), order.direction.toUpperCase()]);
+                generatedOrder.push([rule.getOrderOption(this.repository.model, context), order.direction.toUpperCase()]);
             }
         }
         return generatedOrder;

package/lib/filter/filters/filter.d.ts

@@ -8,6 +8,7 @@ import { Condition, QueryModel, QueryRuleModel } from "../models/query.model";
 import { IRule } from "../models/rule.model";
 import { CustomOperator, FilterOperators, FilterOperatorTypes } from "../operators";
 import { FilterType } from "../type";
+import { OrderRuleContext } from "../order-rules/order-rule";
 export interface FilterConditionRule {
     key: string;
     path?: string;
@@ -19,9 +20,10 @@ export interface FilterCondition {
     condition: Condition;
     rules: (FilterConditionRule | FilterCondition)[];
 }
+type JsonCallback<Request = unknown> = (context: OrderRuleContext) => string;
 export interface JsonConfig {
     type: "array" | "object";
-    path?: string;
+    path?: JsonCallback | string;
 }
 export type PathCondition = boolean | {
     [filter: string]: any;
@@ -90,3 +92,4 @@ export declare abstract class Filter implements FilterDefinition {
     private transformForJsonArray;
     private transformForJsonObject;
 }
+export {};

package/lib/filter/filters/options.filter.d.ts

@@ -12,12 +12,13 @@ export interface OptionsFilterOption {
     operator?: FilterOperatorTypes;
     condition?: FilterCondition;
 }
-export type OptionsFilterSelectionMode = "radio" | "select";
+export declare const optionsFilterSelectionModes: readonly ["radio", "select"];
+export type OptionsFilterSelectionMode = (typeof optionsFilterSelectionModes)[number];
 export interface OptionsFilterDefinition {
     selectionMode: OptionsFilterSelectionMode;
     options: OptionsFilterOption[];
 }
-export interface OptionsFilterOptionConfiguration {
+export declare class OptionsFilterOptionConfiguration {
     key: string;
     name?: string;
 }

package/lib/filter/filters/options.filter.js

@@ -1,11 +1,33 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RadioFilter = exports.OptionsFilter = void 0;
+exports.RadioFilter = exports.OptionsFilter = exports.OptionsFilterOptionConfiguration = exports.optionsFilterSelectionModes = void 0;
 const sequelize_1 = require("sequelize");
 const filter_utils_1 = require("../filter.utils");
 const operators_1 = require("../operators");
 const type_1 = require("../type");
 const filter_1 = require("./filter");
+const swagger_1 = require("@nestjs/swagger");
+exports.optionsFilterSelectionModes = ["radio", "select"];
+class OptionsFilterOptionConfiguration {
+}
+exports.OptionsFilterOptionConfiguration = OptionsFilterOptionConfiguration;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], OptionsFilterOptionConfiguration.prototype, "key", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => String }),
+    __metadata("design:type", String)
+], OptionsFilterOptionConfiguration.prototype, "name", void 0);
 class OptionsFilter extends filter_1.Filter {
     constructor(definition) {
         super(definition);

package/lib/filter/filters/select.filter.d.ts

@@ -2,7 +2,7 @@ import { DataFilterUserModel } from "../..";
 import { FilterType } from "../type";
 import { BaseFilterDefinition, Filter } from "./filter";
 import { FilterBaseConfigurationModel } from "../models/filter-configuration.model";
-export interface SelectFilterValue {
+export declare class SelectFilterValue {
     id: number | string;
     name: string;
 }

package/lib/filter/filters/select.filter.js

@@ -1,9 +1,30 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SelectFilter = void 0;
+exports.SelectFilter = exports.SelectFilterValue = void 0;
 const type_1 = require("../type");
 const operators_1 = require("../operators");
 const filter_1 = require("./filter");
+const swagger_1 = require("@nestjs/swagger");
+class SelectFilterValue {
+}
+exports.SelectFilterValue = SelectFilterValue;
+__decorate([
+    (0, swagger_1.ApiProperty)({ oneOf: [{ type: "string" }, { type: "number" }] }),
+    __metadata("design:type", Object)
+], SelectFilterValue.prototype, "id", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], SelectFilterValue.prototype, "name", void 0);
 class SelectFilter extends filter_1.Filter {
     constructor(definition) {
         super(definition);

package/lib/filter/index.d.ts

@@ -5,6 +5,7 @@ export * from "./filter.service";
 export * from "./base-filter";
 export * from "./controllers/dynamic-filter.controller";
 export * from "./controllers/filter.controller";
+export * from "./controllers/open-api-filter.controller";
 export * from "./decorators/inject-filter.decorator";
 export * from "./filter.utils";
 export * from "./operators";

package/lib/filter/index.js

@@ -21,6 +21,7 @@ __exportStar(require("./filter.service"), exports);
 __exportStar(require("./base-filter"), exports);
 __exportStar(require("./controllers/dynamic-filter.controller"), exports);
 __exportStar(require("./controllers/filter.controller"), exports);
+__exportStar(require("./controllers/open-api-filter.controller"), exports);
 __exportStar(require("./decorators/inject-filter.decorator"), exports);
 __exportStar(require("./filter.utils"), exports);
 __exportStar(require("./operators"), exports);

package/lib/filter/models/filter-configuration-search.model.d.ts

@@ -1,4 +1,4 @@
-export interface FilterConfigurationSearchModel {
+export declare class FilterConfigurationSearchModel {
     id: string;
     value: unknown;
     pageSize?: number;

package/lib/filter/models/filter-configuration-search.model.js

@@ -1,2 +1,32 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterConfigurationSearchModel = void 0;
+const swagger_1 = require("@nestjs/swagger");
+class FilterConfigurationSearchModel {
+}
+exports.FilterConfigurationSearchModel = FilterConfigurationSearchModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterConfigurationSearchModel.prototype, "id", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => Object }),
+    __metadata("design:type", Object)
+], FilterConfigurationSearchModel.prototype, "value", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => Number }),
+    __metadata("design:type", Number)
+], FilterConfigurationSearchModel.prototype, "pageSize", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => Number }),
+    __metadata("design:type", Number)
+], FilterConfigurationSearchModel.prototype, "page", void 0);

package/lib/filter/models/filter-configuration.model.d.ts

@@ -1,14 +1,14 @@
 import { FilterType } from "../type";
 import { OptionsFilterOptionConfiguration, OptionsFilterSelectionMode } from "../filters";
-export interface FilterOperatorsConfiguration {
+export declare class FilterOperatorsConfiguration {
     id: string;
     name: string;
 }
-export interface FilterGroupConfiguration {
+export declare class FilterGroupConfiguration {
     key: string;
     name: string;
 }
-export interface FilterBaseConfigurationModel {
+export declare class FilterBaseConfigurationModel {
     type: FilterType;
     operators: FilterOperatorsConfiguration[];
     values?: unknown[];
@@ -18,18 +18,18 @@ export interface FilterBaseConfigurationModel {
     group?: FilterGroupConfiguration;
     mask?: string;
 }
-export interface FilterConfigurationModel extends FilterBaseConfigurationModel {
+export declare class FilterConfigurationModel extends FilterBaseConfigurationModel {
     id: string;
     name: string;
 }
-export interface GroupFilterBaseConfigurationModel {
+export declare class GroupFilterBaseConfigurationModel {
     type: FilterType;
     rootFilter: FilterBaseConfigurationModel | null;
     valueFilter?: FilterBaseConfigurationModel | null;
     lazyLoading?: boolean;
     group?: FilterGroupConfiguration;
 }
-export interface GroupFilterConfigurationModel extends GroupFilterBaseConfigurationModel {
+export declare class GroupFilterConfigurationModel extends GroupFilterBaseConfigurationModel {
     id: string;
     name: string;
 }

package/lib/filter/models/filter-configuration.model.js

@@ -1,2 +1,117 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.GroupFilterConfigurationModel = exports.GroupFilterBaseConfigurationModel = exports.FilterConfigurationModel = exports.FilterBaseConfigurationModel = exports.FilterGroupConfiguration = exports.FilterOperatorsConfiguration = void 0;
+const type_1 = require("../type");
+const filters_1 = require("../filters");
+const swagger_1 = require("@nestjs/swagger");
+class FilterOperatorsConfiguration {
+}
+exports.FilterOperatorsConfiguration = FilterOperatorsConfiguration;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterOperatorsConfiguration.prototype, "id", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterOperatorsConfiguration.prototype, "name", void 0);
+class FilterGroupConfiguration {
+}
+exports.FilterGroupConfiguration = FilterGroupConfiguration;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterGroupConfiguration.prototype, "key", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterGroupConfiguration.prototype, "name", void 0);
+class FilterBaseConfigurationModel {
+}
+exports.FilterBaseConfigurationModel = FilterBaseConfigurationModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ enum: type_1.FilterType, enumName: "FilterType" }),
+    __metadata("design:type", String)
+], FilterBaseConfigurationModel.prototype, "type", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ isArray: true, type: () => FilterOperatorsConfiguration }),
+    __metadata("design:type", Array)
+], FilterBaseConfigurationModel.prototype, "operators", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ isArray: true, type: () => Object }),
+    __metadata("design:type", Array)
+], FilterBaseConfigurationModel.prototype, "values", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => Boolean }),
+    __metadata("design:type", Boolean)
+], FilterBaseConfigurationModel.prototype, "lazyLoading", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ enum: filters_1.optionsFilterSelectionModes, enumName: "OptionsFilterSelectionMode" }),
+    __metadata("design:type", String)
+], FilterBaseConfigurationModel.prototype, "selectionMode", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ isArray: true, type: () => filters_1.OptionsFilterOptionConfiguration }),
+    __metadata("design:type", Array)
+], FilterBaseConfigurationModel.prototype, "options", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => FilterGroupConfiguration }),
+    __metadata("design:type", FilterGroupConfiguration)
+], FilterBaseConfigurationModel.prototype, "group", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterBaseConfigurationModel.prototype, "mask", void 0);
+class FilterConfigurationModel extends FilterBaseConfigurationModel {
+}
+exports.FilterConfigurationModel = FilterConfigurationModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterConfigurationModel.prototype, "id", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterConfigurationModel.prototype, "name", void 0);
+class GroupFilterBaseConfigurationModel {
+}
+exports.GroupFilterBaseConfigurationModel = GroupFilterBaseConfigurationModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ enum: type_1.FilterType, enumName: "FilterType" }),
+    __metadata("design:type", String)
+], GroupFilterBaseConfigurationModel.prototype, "type", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => FilterBaseConfigurationModel }),
+    __metadata("design:type", Object)
+], GroupFilterBaseConfigurationModel.prototype, "rootFilter", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => FilterBaseConfigurationModel }),
+    __metadata("design:type", Object)
+], GroupFilterBaseConfigurationModel.prototype, "valueFilter", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => Boolean }),
+    __metadata("design:type", Boolean)
+], GroupFilterBaseConfigurationModel.prototype, "lazyLoading", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: () => FilterGroupConfiguration }),
+    __metadata("design:type", FilterGroupConfiguration)
+], GroupFilterBaseConfigurationModel.prototype, "group", void 0);
+class GroupFilterConfigurationModel extends GroupFilterBaseConfigurationModel {
+}
+exports.GroupFilterConfigurationModel = GroupFilterConfigurationModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], GroupFilterConfigurationModel.prototype, "id", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], GroupFilterConfigurationModel.prototype, "name", void 0);

package/lib/filter/models/filter-resource-value.model.d.ts

@@ -1,4 +1,4 @@
-export interface FilterResourceValueModel {
+export declare class FilterResourceValueModel {
     id: string;
     resourceId: number | string;
 }

package/lib/filter/models/filter-resource-value.model.js

@@ -1,2 +1,24 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FilterResourceValueModel = void 0;
+const swagger_1 = require("@nestjs/swagger");
+class FilterResourceValueModel {
+}
+exports.FilterResourceValueModel = FilterResourceValueModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterResourceValueModel.prototype, "id", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ oneOf: [{ type: "string" }, { type: "number" }] }),
+    __metadata("design:type", Object)
+], FilterResourceValueModel.prototype, "resourceId", void 0);

package/lib/filter/models/query.model.d.ts

@@ -1,9 +1,11 @@
 import { RuleModel } from "./rule.model";
-export type Condition = "and" | "or";
-export interface QueryRuleModel extends RuleModel {
+declare const conditions: readonly ["and", "or"];
+export type Condition = (typeof conditions)[number];
+export declare class QueryRuleModel extends RuleModel {
     id: string;
 }
-export interface QueryModel {
+export declare class QueryModel {
     condition: Condition;
     rules: (QueryRuleModel | QueryModel)[];
 }
+export {};

package/lib/filter/models/query.model.js

@@ -1,2 +1,41 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryModel = exports.QueryRuleModel = void 0;
+const swagger_1 = require("@nestjs/swagger");
+const rule_model_1 = require("./rule.model");
+const conditions = ["and", "or"];
+class QueryRuleModel extends rule_model_1.RuleModel {
+}
+exports.QueryRuleModel = QueryRuleModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], QueryRuleModel.prototype, "id", void 0);
+let QueryModel = class QueryModel {
+};
+exports.QueryModel = QueryModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ enum: conditions, enumName: "Condition" }),
+    __metadata("design:type", String)
+], QueryModel.prototype, "condition", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        oneOf: [
+            { type: "array", items: { $ref: (0, swagger_1.getSchemaPath)(QueryRuleModel) } },
+            { type: "array", items: { $ref: (0, swagger_1.getSchemaPath)(QueryModel) } },
+        ],
+    }),
+    __metadata("design:type", Array)
+], QueryModel.prototype, "rules", void 0);
+exports.QueryModel = QueryModel = __decorate([
+    (0, swagger_1.ApiExtraModels)(QueryRuleModel)
+], QueryModel);