@recursyve/nestjs-data-filter 11.1.1 → 11.1.3

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/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/models/filter.model.js

@@ -89,8 +89,7 @@ __decorate([
 ], FilterQueryModel.prototype, "query", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
-    (0, class_validator_1.ValidateNested)(),
-    (0, class_transformer_1.Type)(() => OrderModel),
+    (0, class_validator_1.IsDefined)(),
     (0, swagger_1.ApiPropertyOptional)({
         oneOf: [
             {

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.1",
+    "version": "11.1.3",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {