@recursyve/nestjs-data-filter 11.0.0 → 11.1.1

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

@@ -1,2 +1,45 @@
 "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 class_validator_1 = require("class-validator");
+const rule_model_1 = require("./rule.model");
+const conditions = ["and", "or"];
+class QueryRuleModel extends rule_model_1.RuleModel {
+}
+exports.QueryRuleModel = QueryRuleModel;
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], QueryRuleModel.prototype, "id", void 0);
+let QueryModel = class QueryModel {
+};
+exports.QueryModel = QueryModel;
+__decorate([
+    (0, class_validator_1.IsIn)(conditions),
+    (0, swagger_1.ApiProperty)({ enum: conditions, enumName: "Condition" }),
+    __metadata("design:type", String)
+], QueryModel.prototype, "condition", void 0);
+__decorate([
+    (0, class_validator_1.IsArray)(),
+    (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);

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

@@ -1,6 +1,6 @@
-import { FilterOperators } from "../operators";
-export interface RuleModel {
-    operation: FilterOperators;
+import { FilterOperatorTypes } from "../operators";
+export declare class RuleModel {
+    operation: FilterOperatorTypes;
     value: unknown | unknown[];
 }
 export interface IRule {

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

@@ -1,2 +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.RuleModel = void 0;
+const swagger_1 = require("@nestjs/swagger");
+const class_validator_1 = require("class-validator");
+const operators_1 = require("../operators");
+class RuleModel {
+}
+exports.RuleModel = RuleModel;
+__decorate([
+    (0, class_validator_1.IsIn)(Object.values(operators_1.FilterOperatorTypes)),
+    (0, swagger_1.ApiProperty)({ enum: operators_1.FilterOperatorTypes, enumName: "FilterOperatorTypes" }),
+    __metadata("design:type", String)
+], RuleModel.prototype, "operation", void 0);
+__decorate([
+    (0, class_validator_1.IsDefined)(),
+    (0, swagger_1.ApiProperty)({
+        oneOf: [{ type: "object" }, { type: "array", items: { type: "object" } }],
+    }),
+    __metadata("design:type", Object)
+], RuleModel.prototype, "value", void 0);

package/lib/filter/order-rules/enum.order-rule.js

@@ -9,7 +9,7 @@ class EnumOrderRule extends order_rule_1.OrderRule {
         super(definition);
     }
     getOrderOption(model) {
-        let order = `CASE ${this.path ? sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.attribute, this.path) : this.attribute} `;
+        let order = `CASE ${this.path ? sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.attribute, this.path) : `\`${model.name}\`.\`${this.attribute}\``} `;
         for (let i = 0; i < this.priorities.length; ++i) {
             order += `WHEN '${this.priorities[i]}' THEN ${this.priorities.length - i} `;
         }

package/lib/filter/order-rules/index.d.ts

@@ -1,4 +1,5 @@
+export * from "./default.order-rule";
 export * from "./enum.order-rule";
 export * from "./if.order-rule";
 export * from "./is-null.order-rule";
-export * from "./default.order-rule";
+export * from "./json.order-rule";

package/lib/filter/order-rules/index.js

@@ -14,7 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./default.order-rule"), exports);
 __exportStar(require("./enum.order-rule"), exports);
 __exportStar(require("./if.order-rule"), exports);
 __exportStar(require("./is-null.order-rule"), exports);
-__exportStar(require("./default.order-rule"), exports);
+__exportStar(require("./json.order-rule"), exports);

package/lib/filter/order-rules/json.order-rule.d.ts

@@ -0,0 +1,11 @@
+import { M } from "../../sequelize.utils";
+import { BaseOrderRuleDefinition, OrderItemColumn, OrderRule, OrderRuleContext } from "./order-rule";
+import { JsonConfig } from "../..";
+export interface JsonRuleDefinition {
+    json: JsonConfig;
+}
+export declare class JsonOrderRule extends OrderRule implements JsonRuleDefinition {
+    json: JsonConfig;
+    constructor(definition: BaseOrderRuleDefinition & JsonRuleDefinition);
+    getOrderOption(model: typeof M, context: OrderRuleContext): OrderItemColumn;
+}

package/lib/filter/order-rules/json.order-rule.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonOrderRule = void 0;
+const sequelize_1 = require("sequelize");
+const order_rule_1 = require("./order-rule");
+class JsonOrderRule extends order_rule_1.OrderRule {
+    constructor(definition) {
+        super(definition);
+    }
+    getOrderOption(model, context) {
+        const path = typeof this.json.path === "function" ? this.json.path(context) : this.json.path;
+        return (0, sequelize_1.literal)(`UPPER(JSON_UNQUOTE(JSON_EXTRACT(${`\`${model.name}\`.\`${this.attribute}\``}, '$.${path}')))`);
+    }
+}
+exports.JsonOrderRule = JsonOrderRule;

package/lib/filter/order-rules/order-rule.d.ts

@@ -1,13 +1,18 @@
 import { Col, Fn, Literal } from "sequelize/types/utils";
 import { M } from "../../sequelize.utils";
 import { IRule } from "../models";
+import { DataFilterUserModel } from "../../models/user.model";
 export type OrderItemColumn = string | Col | Fn | Literal;
 export interface BaseOrderRuleDefinition {
     attribute: string;
     path?: string;
 }
+export type OrderRuleContext<Request = unknown> = {
+    request: Request;
+    user: DataFilterUserModel | null;
+};
 export interface OrderRuleDefinition extends BaseOrderRuleDefinition, IRule {
-    getOrderOption(model: typeof M): OrderItemColumn;
+    getOrderOption(model: typeof M, context: OrderRuleContext): OrderItemColumn;
 }
 export declare abstract class OrderRule implements OrderRuleDefinition {
     readonly _type = "order_rule";
@@ -15,5 +20,5 @@ export declare abstract class OrderRule implements OrderRuleDefinition {
     path?: string;
     protected constructor(definition?: BaseOrderRuleDefinition);
     static validate(definition: IRule): boolean;
-    abstract getOrderOption(model: typeof M): OrderItemColumn;
+    abstract getOrderOption(model: typeof M, context: OrderRuleContext): OrderItemColumn;
 }

package/lib/models/attributes.model.d.ts

@@ -10,16 +10,19 @@ export interface AttributesConfigModel {
     customAttributes: CustomAttributesConfig[];
 }
 export declare class AttributesConfig implements AttributesConfigModel {
+    private _searchableAttributes?;
     readonly key: string;
     attributes?: FindAttributeOptions;
-    searchableAttributes?: string[];
+    searchableTranslationAttributes?: string[];
     path: PathConfig;
     includes: IncludeConfig[];
     customAttributes: CustomAttributesConfig[];
     ignoreInSearch: boolean;
     constructor(key: string | symbol);
+    get searchableAttributes(): string[] | undefined;
     setAttributes(attributes?: FindAttributeOptions): void;
     setSearchableAttributes(attributes: string[]): void;
+    setSearchableTranslationAttributes(attributes: string[]): void;
     setPath(path: PathConfig): void;
     containsPath(path: string): boolean;
     setIgnoreInPath(ignore: boolean): void;

package/lib/models/attributes.model.js

@@ -14,11 +14,18 @@ class AttributesConfig {
             paranoid: true
         });
     }
+    get searchableAttributes() {
+        var _a;
+        return (_a = this._searchableAttributes) === null || _a === void 0 ? void 0 : _a.filter(attribute => { var _a; return !((_a = this.searchableTranslationAttributes) === null || _a === void 0 ? void 0 : _a.includes(attribute)); });
+    }
     setAttributes(attributes) {
         this.attributes = attributes;
     }
     setSearchableAttributes(attributes) {
-        this.searchableAttributes = attributes;
+        this._searchableAttributes = attributes;
+    }
+    setSearchableTranslationAttributes(attributes) {
+        this.searchableTranslationAttributes = attributes;
     }
     setPath(path) {
         this.path = path;

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

@@ -9,20 +9,24 @@ export interface DataFilterConfigModel {
     customAttributes: CustomAttributesConfig[];
 }
 export declare class DataFilterConfig implements DataFilterConfigModel {
+    private _searchableAttributes?;
     model: typeof Model;
     attributes?: FindAttributeOptions;
-    searchableAttributes?: string[];
+    searchableTranslationAttributes?: string[];
     exportColumns?: string[];
     customAttributes: CustomAttributesConfig[];
     ignoreInSearch: boolean;
     setModel(model: typeof Model): void;
     setIgnoreInPath(ignore: boolean): void;
     setAttributes(attributes?: FindAttributeOptions): void;
+    get searchableAttributes(): string[] | undefined;
     setSearchableAttributes(attributes: string[]): void;
+    setSearchableTranslationAttributes(attributes: string[]): void;
     setExportColumns(exportColumns: string[]): void;
     addCustomAttribute(attribute: CustomAttributesConfig): void;
     transformAttributesConfig(options?: object): FindAttributeOptions | null;
     getCustomAttributes(options?: object): CustomAttributesModel[];
     getCustomAttributesIncludes(): IncludeConfig[];
     getSearchableAttributes(): string[];
+    getSearchableTranslationAttributes(): string[];
 }

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

@@ -16,8 +16,15 @@ class DataFilterConfig {
     setAttributes(attributes) {
         this.attributes = attributes;
     }
+    get searchableAttributes() {
+        var _a;
+        return (_a = this._searchableAttributes) === null || _a === void 0 ? void 0 : _a.filter((attribute) => { var _a; return !((_a = this.searchableTranslationAttributes) === null || _a === void 0 ? void 0 : _a.includes(attribute)); });
+    }
     setSearchableAttributes(attributes) {
-        this.searchableAttributes = attributes;
+        this._searchableAttributes = attributes;
+    }
+    setSearchableTranslationAttributes(attributes) {
+        this.searchableTranslationAttributes = attributes;
     }
     setExportColumns(exportColumns) {
         this.exportColumns = exportColumns;
@@ -72,18 +79,30 @@ class DataFilterConfig {
         });
     }
     getSearchableAttributes() {
-        var _a;
+        var _a, _b, _c;
         if (this.ignoreInSearch) {
             return [];
         }
+        if (!((_a = this.searchableAttributes) === null || _a === void 0 ? void 0 : _a.length) && ((_b = this.searchableTranslationAttributes) === null || _b === void 0 ? void 0 : _b.length)) {
+            return [];
+        }
         if (this.searchableAttributes) {
             return sequelize_utils_1.SequelizeUtils.getModelSearchableFieldAttributes(this.model, this.searchableAttributes);
         }
         const searchableAttributes = sequelize_utils_1.SequelizeUtils.getModelSearchableAttributes(this.model);
-        const attributes = sequelize_utils_1.SequelizeUtils.getModelSearchableFieldAttributes(this.model, (_a = this.attributes) !== null && _a !== void 0 ? _a : []);
-        return attributes.length ?
-            attributes === null || attributes === void 0 ? void 0 : attributes.filter(x => searchableAttributes.some(attr => attr === x)) :
-            searchableAttributes;
+        const attributes = sequelize_utils_1.SequelizeUtils.getModelSearchableFieldAttributes(this.model, (_c = this.attributes) !== null && _c !== void 0 ? _c : []);
+        return (attributes.length ?
+            attributes.filter(x => searchableAttributes.includes(x)) :
+            searchableAttributes).filter(attribute => { var _a; return !((_a = this.searchableTranslationAttributes) === null || _a === void 0 ? void 0 : _a.includes(attribute)); });
+    }
+    getSearchableTranslationAttributes() {
+        if (this.ignoreInSearch) {
+            return [];
+        }
+        if (!this.searchableTranslationAttributes) {
+            return [];
+        }
+        return sequelize_utils_1.SequelizeUtils.getModelSearchableFieldAttributes(this.model, this.searchableTranslationAttributes);
     }
 }
 exports.DataFilterConfig = DataFilterConfig;

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

@@ -1,19 +1,22 @@
+import { Type as _Type } from "@nestjs/common";
 import { QueryModel } from "../filter/models/query.model";
-export interface FilterPageMode {
+export declare class FilterPageModel {
     number: number;
     size: number;
     offset?: number;
 }
-export interface FilterSearchModel {
+export declare class FilterSearchModel {
     value: string;
 }
-export interface OrderModel {
+declare const directions: readonly ["asc", "desc", ""];
+export type Direction = (typeof directions)[number];
+export declare class OrderModel {
     column: string;
-    direction: "asc" | "desc" | "";
+    direction: Direction;
     nullLast?: boolean;
 }
-export interface FilterQueryModel {
-    page?: FilterPageMode;
+export declare class FilterQueryModel {
+    page?: FilterPageModel;
     search?: FilterSearchModel;
     query?: QueryModel;
     order?: OrderModel | OrderModel[];
@@ -28,3 +31,9 @@ export interface FilterResultModel<T> {
         size: number;
     };
 }
+export declare class PageModel {
+    number: number;
+    size: number;
+}
+export declare function FilterResultModelMixin<T extends _Type>(Base: T): _Type<FilterResultModel<T>>;
+export {};

package/lib/models/filter.model.js

@@ -1,2 +1,150 @@
 "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.PageModel = exports.FilterQueryModel = exports.OrderModel = exports.FilterSearchModel = exports.FilterPageModel = void 0;
+exports.FilterResultModelMixin = FilterResultModelMixin;
+const swagger_1 = require("@nestjs/swagger");
+const class_transformer_1 = require("class-transformer");
+const class_validator_1 = require("class-validator");
+const query_model_1 = require("../filter/models/query.model");
+class FilterPageModel {
+}
+exports.FilterPageModel = FilterPageModel;
+__decorate([
+    (0, class_validator_1.IsInt)(),
+    (0, swagger_1.ApiProperty)({ type: () => Number }),
+    __metadata("design:type", Number)
+], FilterPageModel.prototype, "number", void 0);
+__decorate([
+    (0, class_validator_1.IsInt)(),
+    (0, swagger_1.ApiProperty)({ type: () => Number }),
+    __metadata("design:type", Number)
+], FilterPageModel.prototype, "size", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsInt)(),
+    (0, swagger_1.ApiPropertyOptional)({ type: () => Number }),
+    __metadata("design:type", Number)
+], FilterPageModel.prototype, "offset", void 0);
+class FilterSearchModel {
+}
+exports.FilterSearchModel = FilterSearchModel;
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterSearchModel.prototype, "value", void 0);
+const directions = ["asc", "desc", ""];
+class OrderModel {
+}
+exports.OrderModel = OrderModel;
+__decorate([
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiProperty)({ type: () => String }),
+    __metadata("design:type", String)
+], OrderModel.prototype, "column", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsIn)(directions),
+    (0, swagger_1.ApiPropertyOptional)({ enum: directions, enumName: "Direction" }),
+    __metadata("design:type", String)
+], OrderModel.prototype, "direction", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    (0, swagger_1.ApiPropertyOptional)({ type: () => Boolean }),
+    __metadata("design:type", Boolean)
+], OrderModel.prototype, "nullLast", void 0);
+let FilterQueryModel = class FilterQueryModel {
+};
+exports.FilterQueryModel = FilterQueryModel;
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => FilterPageModel),
+    (0, swagger_1.ApiPropertyOptional)({ type: () => FilterPageModel }),
+    __metadata("design:type", FilterPageModel)
+], FilterQueryModel.prototype, "page", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => FilterSearchModel),
+    (0, swagger_1.ApiPropertyOptional)({ type: () => FilterSearchModel }),
+    __metadata("design:type", FilterSearchModel)
+], FilterQueryModel.prototype, "search", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => query_model_1.QueryModel),
+    (0, swagger_1.ApiPropertyOptional)({ type: () => query_model_1.QueryModel }),
+    __metadata("design:type", query_model_1.QueryModel)
+], FilterQueryModel.prototype, "query", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => OrderModel),
+    (0, swagger_1.ApiPropertyOptional)({
+        oneOf: [
+            {
+                $ref: (0, swagger_1.getSchemaPath)(OrderModel),
+            },
+            {
+                type: "array",
+                items: { $ref: (0, swagger_1.getSchemaPath)(OrderModel) },
+            },
+        ],
+    }),
+    __metadata("design:type", Object)
+], FilterQueryModel.prototype, "order", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsObject)(),
+    (0, swagger_1.ApiPropertyOptional)({ type: () => Object }),
+    __metadata("design:type", Object)
+], FilterQueryModel.prototype, "data", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)(),
+    (0, swagger_1.ApiPropertyOptional)({ type: () => String }),
+    __metadata("design:type", String)
+], FilterQueryModel.prototype, "groupBy", void 0);
+exports.FilterQueryModel = FilterQueryModel = __decorate([
+    (0, swagger_1.ApiExtraModels)(OrderModel)
+], FilterQueryModel);
+class PageModel {
+}
+exports.PageModel = PageModel;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => Number }),
+    __metadata("design:type", Number)
+], PageModel.prototype, "number", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: () => Number }),
+    __metadata("design:type", Number)
+], PageModel.prototype, "size", void 0);
+function FilterResultModelMixin(Base) {
+    class _FilterResultModel {
+    }
+    __decorate([
+        (0, swagger_1.ApiProperty)({ type: () => Base, isArray: true }),
+        __metadata("design:type", Array)
+    ], _FilterResultModel.prototype, "values", void 0);
+    __decorate([
+        (0, swagger_1.ApiProperty)({ type: () => Number }),
+        __metadata("design:type", Number)
+    ], _FilterResultModel.prototype, "total", void 0);
+    __decorate([
+        (0, swagger_1.ApiPropertyOptional)({ type: () => PageModel }),
+        __metadata("design:type", PageModel)
+    ], _FilterResultModel.prototype, "page", void 0);
+    Object.defineProperty(_FilterResultModel, "name", { value: `${Base.name}FilterResultModel` });
+    return _FilterResultModel;
+}

package/lib/models/include.model.d.ts

@@ -6,6 +6,7 @@ export interface IncludeConfig {
     path: string;
     attributes?: FindAttributeOptions;
     searchableAttributes?: string[];
+    searchableTranslationAttributes?: string[];
     ignoreInSearch?: boolean;
     order?: Order;
     where?: IncludeWhereModel;
@@ -19,6 +20,7 @@ export interface IncludeModel {
     path: string;
     attributes?: FindAttributeOptions;
     searchableAttributes?: string[];
+    searchableTranslationAttributes?: string[];
     ignoreInSearch?: boolean;
     order?: Order;
     where?: WhereOptions;

package/lib/models/search-attributes.model.d.ts

@@ -3,4 +3,5 @@ export interface SearchAttributesModel {
     key: string;
     literalKey?: string;
     isJson?: boolean;
+    isTranslationAttribute?: boolean;
 }

package/lib/scanners/sequelize-model.scanner.d.ts

@@ -6,7 +6,7 @@ import { PathModel } from "../models/path.model";
 import { SearchAttributesModel } from "../models/search-attributes.model";
 export declare class SequelizeModelScanner {
     getIncludes(model: typeof Model, path: PathModel, additionalIncludes: IncludeModel[], attributes?: FindAttributeOptions | null, ignoreAttributes?: boolean): IncludeOptions[];
-    getAttributes(model: typeof Model, path: PathModel, additionalIncludes: IncludeModel[], attributes?: FindAttributeOptions): SearchAttributesModel[];
+    getAttributes(model: typeof Model, path: PathModel, additionalIncludes: IncludeModel[], attributes?: FindAttributeOptions, isTranslationAttribute?: boolean): SearchAttributesModel[];
     getOrder(model: typeof Model, orderObj: OrderModel): Order | undefined;
     getGroup(model: typeof Model, orderObj: OrderModel): string[];
     getOrderIncludes(model: typeof Model, orderObj: OrderModel): IncludeOptions[];

package/lib/scanners/sequelize-model.scanner.js

@@ -71,7 +71,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
         (_b = includes[0].include) === null || _b === void 0 ? void 0 : _b.push(...sequelize_utils_1.SequelizeUtils.reduceIncludes(addIncludes, ignoreAttributes));
         return result;
     }
-    getAttributes(model, path, additionalIncludes, attributes) {
+    getAttributes(model, path, additionalIncludes, attributes, isTranslationAttribute = false) {
         var _a;
         const objects = path.path.split(".");
         if (!objects.length) {
@@ -89,20 +89,27 @@ let SequelizeModelScanner = class SequelizeModelScanner {
             name: a,
             key: sequelize_utils_1.SequelizeUtils.getAttributeFullName(a, path.path),
             literalKey: sequelize_utils_1.SequelizeUtils.getLiteralFullName(a, path.path),
-            isJson: sequelize_utils_1.SequelizeUtils.isColumnJson(model, a)
+            isJson: sequelize_utils_1.SequelizeUtils.isColumnJson(model, a),
+            isTranslationAttribute
         })));
-        for (const include of additionalIncludes) {
-            if (include.ignoreInSearch) {
-                continue;
+        if (!isTranslationAttribute) {
+            for (const include of additionalIncludes) {
+                if (include.ignoreInSearch) {
+                    continue;
+                }
+                result.push(...this.getAttributes(model, {
+                    path: include.path
+                }, [], (_a = include.searchableAttributes) !== null && _a !== void 0 ? _a : include.attributes).map(a => {
+                    var _a, _b;
+                    return ({
+                        name: a.name,
+                        key: sequelize_utils_1.SequelizeUtils.getAttributeFullName(a.name, [path.path, include.path].join(".")),
+                        literalKey: sequelize_utils_1.SequelizeUtils.getLiteralFullName(a.name, [path.path, include.path].join(".")),
+                        isJson: a.isJson,
+                        isTranslationAttribute: (_b = (_a = include.searchableTranslationAttributes) === null || _a === void 0 ? void 0 : _a.includes(a.name)) !== null && _b !== void 0 ? _b : false
+                    });
+                }));
             }
-            result.push(...this.getAttributes(model, {
-                path: include.path
-            }, [], (_a = include.searchableAttributes) !== null && _a !== void 0 ? _a : include.attributes).map(a => ({
-                name: a.name,
-                key: sequelize_utils_1.SequelizeUtils.getAttributeFullName(a.name, [path.path, include.path].join(".")),
-                literalKey: sequelize_utils_1.SequelizeUtils.getLiteralFullName(a.name, [path.path, include.path].join(".")),
-                isJson: a.isJson
-            })));
         }
         return result;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-data-filter",
-    "version": "11.0.0",
+    "version": "11.1.1",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {
@@ -28,6 +28,7 @@
         "sequelize-typescript": ">=2.1.0"
     },
     "dependencies": {
+        "@nestjs/swagger": "^11.1.0",
         "csv-stringify": "^6.5.2",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
     },