@recursyve/nestjs-data-filter 11.1.2 → 11.2.0

package/lib/data-filter.repository.js

@@ -229,9 +229,6 @@ let DataFilterRepository = class DataFilterRepository {
     }
     getSearchTranslationAttributes() {
         var _a;
-        if (!this._config.getSearchableTranslationAttributes().length) {
-            return [];
-        }
         const attributes = [];
         const modelAttr = this._config.getSearchableTranslationAttributes();
         attributes.push(...modelAttr.map(attribute => ({

package/lib/filter/controllers/open-api-dynamic-filter.controller.d.ts

@@ -0,0 +1,4 @@
+import { Type } from "@nestjs/common";
+import { DynamicFilterController } from "../..";
+import { FilterService } from "../filter.service";
+export declare function OpenApiDynamicFilterController<T extends Type, D>(Base: T): Type<DynamicFilterController<D>> & (abstract new (filterService: FilterService<D>) => DynamicFilterController<D>);

package/lib/filter/controllers/open-api-dynamic-filter.controller.js

@@ -0,0 +1,124 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenApiDynamicFilterController = OpenApiDynamicFilterController;
+const common_1 = require("@nestjs/common");
+const swagger_1 = require("@nestjs/swagger");
+const __1 = require("../..");
+const filter_query_guard_1 = require("../guards/filter-query.guard");
+const data_file_download_interceptor_1 = require("../interceptors/data-file-download.interceptor");
+const filter_resource_value_model_1 = require("../models/filter-resource-value.model");
+function OpenApiDynamicFilterController(Base) {
+    const _FilterResultModel = (0, __1.FilterResultModelMixin)(Base);
+    class _FilterController extends __1.DynamicFilterController {
+        async filter(query, req) {
+            return super.filter(query, req);
+        }
+        async filterCount(query, req) {
+            return super.filterCount(query, req);
+        }
+        async downloadData(query, type, req) {
+            return super.downloadData(query, type, req);
+        }
+        async getFilterConfig(req) {
+            return super.getFilterConfig(req);
+        }
+        async searchFilterResourceValue(search, req) {
+            return super.searchFilterResourceValue(search, req);
+        }
+        async searchFilterConfigValues(search, req) {
+            return super.searchFilterConfigValues(search, req);
+        }
+    }
+    __decorate([
+        (0, common_1.Post)("filter"),
+        (0, common_1.HttpCode)(common_1.HttpStatus.OK),
+        (0, common_1.UseGuards)(filter_query_guard_1.FilterQueryGuard),
+        (0, swagger_1.ApiOkResponse)({ type: () => _FilterResultModel }),
+        (0, swagger_1.ApiOperation)({ operationId: `filter${Base.name}` }),
+        __param(0, (0, common_1.Body)()),
+        __param(1, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [__1.FilterQueryModel, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "filter", null);
+    __decorate([
+        (0, common_1.Post)("filter-count"),
+        (0, common_1.HttpCode)(common_1.HttpStatus.OK),
+        (0, swagger_1.ApiOkResponse)({ schema: { type: "number" } }),
+        (0, swagger_1.ApiOperation)({ operationId: `filter${Base.name}Count` }),
+        __param(0, (0, common_1.Body)()),
+        __param(1, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [__1.FilterQueryModel, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "filterCount", null);
+    __decorate([
+        (0, common_1.Post)("download/:type"),
+        (0, common_1.HttpCode)(common_1.HttpStatus.OK),
+        (0, common_1.UseInterceptors)(data_file_download_interceptor_1.DataFileDownloadInterceptor),
+        (0, swagger_1.ApiOkResponse)({
+            description: 'Returns file data as binary (Buffer) or as text (string) depending on the export type.',
+            content: {
+                'application/octet-stream': {
+                    schema: {
+                        oneOf: [
+                            { type: 'string', format: 'binary' },
+                            { type: 'string' }
+                        ]
+                    }
+                }
+            }
+        }),
+        (0, swagger_1.ApiParam)({ name: "type", enum: __1.ExportTypes, enumName: "ExportTypes" }),
+        (0, swagger_1.ApiOperation)({ operationId: `download${Base.name}Data` }),
+        __param(0, (0, common_1.Body)()),
+        __param(1, (0, common_1.Param)("type")),
+        __param(2, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [__1.FilterQueryModel, String, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "downloadData", null);
+    __decorate([
+        (0, common_1.Post)("filter/config"),
+        (0, swagger_1.ApiOkResponse)({ type: () => __1.FilterConfigurationModel, isArray: true }),
+        (0, swagger_1.ApiOperation)({ operationId: `get${Base.name}FilterConfig` }),
+        __param(0, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "getFilterConfig", null);
+    __decorate([
+        (0, common_1.Post)("filter/config/id"),
+        (0, swagger_1.ApiOkResponse)({ type: () => __1.SelectFilterValue }),
+        (0, swagger_1.ApiOperation)({ operationId: `search${Base.name}FilterResourceValue` }),
+        __param(0, (0, common_1.Query)()),
+        __param(1, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [filter_resource_value_model_1.FilterResourceValueModel, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "searchFilterResourceValue", null);
+    __decorate([
+        (0, common_1.Post)("filter/config/value"),
+        (0, swagger_1.ApiOkResponse)({ type: () => __1.SelectFilterValue, isArray: true }),
+        (0, swagger_1.ApiOperation)({ operationId: `search${Base.name}FilterConfigValues` }),
+        __param(0, (0, common_1.Query)()),
+        __param(1, (0, common_1.Req)()),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [__1.FilterConfigurationSearchModel, Object]),
+        __metadata("design:returntype", Promise)
+    ], _FilterController.prototype, "searchFilterConfigValues", null);
+    // @ts-ignore
+    return _FilterController;
+}

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-dynamic-filter.controller";
 export * from "./controllers/open-api-filter.controller";
 export * from "./decorators/inject-filter.decorator";
 export * from "./filter.utils";

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-dynamic-filter.controller"), exports);
 __exportStar(require("./controllers/open-api-filter.controller"), exports);
 __exportStar(require("./decorators/inject-filter.decorator"), exports);
 __exportStar(require("./filter.utils"), exports);

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

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

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

@@ -8,4 +8,5 @@ export declare class JsonOrderRule extends OrderRule implements JsonRuleDefiniti
     json: JsonConfig;
     constructor(definition: BaseOrderRuleDefinition & JsonRuleDefinition);
     getOrderOption(model: typeof M, context: OrderRuleContext): OrderItemColumn;
+    private getModelPath;
 }

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

@@ -2,14 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonOrderRule = void 0;
 const sequelize_1 = require("sequelize");
+const sequelize_utils_1 = require("../../sequelize.utils");
 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}')))`);
+        const jsonPath = typeof this.json.path === "function" ? this.json.path(context) : this.json.path;
+        const modelPath = this.getModelPath(model);
+        return (0, sequelize_1.literal)(`UPPER(JSON_UNQUOTE(JSON_EXTRACT(${modelPath}, '$.${jsonPath}')))`);
+    }
+    getModelPath(model) {
+        if (this.path) {
+            return sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.attribute, this.path);
+        }
+        return `\`${model.name}\`.\`${this.attribute}\``;
     }
 }
 exports.JsonOrderRule = JsonOrderRule;

package/lib/sequelize.utils.js

@@ -268,14 +268,15 @@ class SequelizeUtils {
         return model;
     }
     static findColumnFieldName(model, name) {
-        var _a;
+        var _a, _b;
         const field = Object.keys(model.rawAttributes).find((key) => {
+            var _a;
             if (key === name) {
                 return true;
             }
-            return model.rawAttributes[key].field === name;
+            return ((_a = model.rawAttributes[key]) === null || _a === void 0 ? void 0 : _a.field) === name;
         });
-        return (_a = model.rawAttributes[field].field) !== null && _a !== void 0 ? _a : name;
+        return (_b = (_a = model.rawAttributes[field]) === null || _a === void 0 ? void 0 : _a.field) !== null && _b !== void 0 ? _b : name;
     }
     static isColumnJson(model, name) {
         var _a, _b;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-data-filter",
-    "version": "11.1.2",
+    "version": "11.2.0",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {