@recursyve/nestjs-data-filter 11.1.0 → 11.1.2

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

@@ -11,22 +11,27 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterConfigurationSearchModel = void 0;
 const swagger_1 = require("@nestjs/swagger");
+const class_transformer_1 = require("class-transformer");
 class FilterConfigurationSearchModel {
 }
 exports.FilterConfigurationSearchModel = FilterConfigurationSearchModel;
 __decorate([
+    (0, class_transformer_1.Expose)(),
     (0, swagger_1.ApiProperty)({ type: () => String }),
     __metadata("design:type", String)
 ], FilterConfigurationSearchModel.prototype, "id", void 0);
 __decorate([
+    (0, class_transformer_1.Expose)(),
     (0, swagger_1.ApiProperty)({ type: () => Object }),
     __metadata("design:type", Object)
 ], FilterConfigurationSearchModel.prototype, "value", void 0);
 __decorate([
+    (0, class_transformer_1.Expose)(),
     (0, swagger_1.ApiPropertyOptional)({ type: () => Number }),
     __metadata("design:type", Number)
 ], FilterConfigurationSearchModel.prototype, "pageSize", void 0);
 __decorate([
+    (0, class_transformer_1.Expose)(),
     (0, swagger_1.ApiPropertyOptional)({ type: () => Number }),
     __metadata("design:type", Number)
 ], FilterConfigurationSearchModel.prototype, "page", void 0);

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

@@ -11,14 +11,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FilterResourceValueModel = void 0;
 const swagger_1 = require("@nestjs/swagger");
+const class_transformer_1 = require("class-transformer");
 class FilterResourceValueModel {
 }
 exports.FilterResourceValueModel = FilterResourceValueModel;
 __decorate([
+    (0, class_transformer_1.Expose)(),
     (0, swagger_1.ApiProperty)({ type: () => String }),
     __metadata("design:type", String)
 ], FilterResourceValueModel.prototype, "id", void 0);
 __decorate([
+    (0, class_transformer_1.Expose)(),
     (0, swagger_1.ApiProperty)({ oneOf: [{ type: "string" }, { type: "number" }] }),
     __metadata("design:type", Object)
 ], FilterResourceValueModel.prototype, "resourceId", void 0);

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

@@ -11,12 +11,14 @@ var __metadata = (this && this.__metadata) || function (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);
@@ -24,10 +26,12 @@ 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) } },

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

@@ -11,15 +11,18 @@ var __metadata = (this && this.__metadata) || function (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" } }],
     }),

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

@@ -1,5 +1,5 @@
+import { Type as _Type } from "@nestjs/common";
 import { QueryModel } from "../filter/models/query.model";
-import { Type } from "@nestjs/common";
 export declare class FilterPageModel {
     number: number;
     size: number;
@@ -35,5 +35,5 @@ export declare class PageModel {
     number: number;
     size: number;
 }
-export declare function FilterResultModelMixin<T extends Type>(Base: T): Type<FilterResultModel<T>>;
+export declare function FilterResultModelMixin<T extends _Type>(Base: T): _Type<FilterResultModel<T>>;
 export {};

package/lib/models/filter.model.js

@@ -12,19 +12,25 @@ 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);
@@ -32,6 +38,7 @@ 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);
@@ -40,14 +47,19 @@ 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);
@@ -55,18 +67,29 @@ 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.IsDefined)(),
     (0, swagger_1.ApiPropertyOptional)({
         oneOf: [
             {
@@ -81,10 +104,14 @@ __decorate([
     __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);

package/package.json

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