@recursyve/nestjs-data-filter 9.4.3 → 9.4.5

package/lib/filter/filters/geo-bounds.filter.js

@@ -24,4 +24,4 @@ class GeoBoundsFilter extends filter_1.Filter {
 }
 exports.GeoBoundsFilter = GeoBoundsFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9nZW8tYm91bmRzLmZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5Q0FBNkQ7QUFDN0QsMkRBQXVEO0FBRXZELDRDQUFvRTtBQUNwRSxrQ0FBcUM7QUFDckMscUNBQXdEO0FBaUJ4RCxNQUFhLGVBQWdCLFNBQVEsZUFBTTtJQU92QyxZQUFZLFVBQXFDO1FBQzdDLEtBQUssQ0FBQyxVQUFrQyxDQUFDLENBQUM7UUFQdkMsU0FBSSxHQUFHLGlCQUFVLENBQUMsU0FBUyxDQUFDO1FBQzVCLGNBQVMsR0FBRyxDQUFDLEdBQUcsMkJBQWUsQ0FBQyxDQUFDO0lBT3hDLENBQUM7SUFFTSxLQUFLLENBQUMsZUFBZSxDQUFDLElBQW9COztRQUM3QyxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBMkIsQ0FBQztRQUNoRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLE1BQU0sZUFBZSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxTQUFTLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxRQUFRLElBQUksU0FBUyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckcsTUFBTSxPQUFPLEdBQUcsSUFBQSxjQUFFLEVBQUMscUJBQXFCLEVBQUUsSUFBQSxtQkFBTyxFQUFDLGFBQWEsZUFBZSxLQUFLLENBQUMsRUFBRSxNQUFBLElBQUksQ0FBQyxJQUFJLG1DQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ3RHLE1BQU0sS0FBSyxHQUFHLE1BQUEsSUFBSSxDQUFDLFNBQVMsbUNBQ3hCLElBQUEsY0FBRSxFQUNFLE9BQU8sRUFDUCxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUN4RyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUMzRyxDQUFDO1FBQ04sT0FBTyxJQUFBLGlCQUFLLEVBQ1IsSUFBQSxjQUFFLEVBQUMsYUFBYSxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLGNBQUUsRUFBQyxTQUFTLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEVBQy9FLElBQUEsbUJBQU8sRUFBQyxHQUFHLElBQUksQ0FBQyxTQUFTLEtBQUssK0JBQW1CLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQ3JFLENBQUM7SUFDTixDQUFDO0NBQ0o7QUEzQkQsMENBMkJDIiwiZmlsZSI6ImxpYi9maWx0ZXIvZmlsdGVycy9nZW8tYm91bmRzLmZpbHRlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZuLCBsaXRlcmFsLCB3aGVyZSwgV2hlcmVPcHRpb25zIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgU2VxdWVsaXplVXRpbHMgfSBmcm9tIFwiLi4vLi4vc2VxdWVsaXplLnV0aWxzXCI7XG5pbXBvcnQgeyBRdWVyeVJ1bGVNb2RlbCB9IGZyb20gXCIuLi9tb2RlbHNcIjtcbmltcG9ydCB7IEZpbHRlck9wZXJhdG9yVHlwZXMsIFNlbGVjdE9wZXJhdG9ycyB9IGZyb20gXCIuLi9vcGVyYXRvcnNcIjtcbmltcG9ydCB7IEZpbHRlclR5cGUgfSBmcm9tIFwiLi4vdHlwZVwiO1xuaW1wb3J0IHsgQmFzZUZpbHRlckRlZmluaXRpb24sIEZpbHRlciB9IGZyb20gXCIuL2ZpbHRlclwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEdlb0JvdW5kc0ZpbHRlckRlZmluaXRpb25XaXRoUG9pbnQge1xuICAgIGF0dHJpYnV0ZTogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEdlb0JvdW5kc0ZpbHRlckRlZmluaXRpb25XaXRoTGF0TG5nIHtcbiAgICBsYXRBdHRyaWJ1dGU6IHN0cmluZztcbiAgICBsbmdBdHRyaWJ1dGU6IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBCYXNlR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbiAgZXh0ZW5kcyBPbWl0PEJhc2VGaWx0ZXJEZWZpbml0aW9uLCBcImF0dHJpYnV0ZVwiPiB7XG4gICAgc3JpZD86IG51bWJlcjtcbn1cblxuZXhwb3J0IHR5cGUgR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbiA9IEJhc2VHZW9Cb3VuZHNGaWx0ZXJEZWZpbml0aW9uICYgKEdlb0JvdW5kc0ZpbHRlckRlZmluaXRpb25XaXRoUG9pbnQgfCBHZW9Cb3VuZHNGaWx0ZXJEZWZpbml0aW9uV2l0aExhdExuZyk7XG5cbmV4cG9ydCBjbGFzcyBHZW9Cb3VuZHNGaWx0ZXIgZXh0ZW5kcyBGaWx0ZXIgaW1wbGVtZW50cyBCYXNlR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbiwgR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbldpdGhQb2ludCwgR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbldpdGhMYXRMbmcgIHtcbiAgICBwdWJsaWMgdHlwZSA9IEZpbHRlclR5cGUuR2VvQm91bmRzO1xuICAgIHB1YmxpYyBvcGVyYXRvcnMgPSBbLi4uU2VsZWN0T3BlcmF0b3JzXTtcbiAgICBwdWJsaWMgbGF0QXR0cmlidXRlITogc3RyaW5nO1xuICAgIHB1YmxpYyBsbmdBdHRyaWJ1dGUhOiBzdHJpbmc7XG4gICAgcHVibGljIHNyaWQ/OiBudW1iZXI7XG5cbiAgICBjb25zdHJ1Y3RvcihkZWZpbml0aW9uOiBHZW9Cb3VuZHNGaWx0ZXJEZWZpbml0aW9uKSB7XG4gICAgICAgIHN1cGVyKGRlZmluaXRpb24gYXMgQmFzZUZpbHRlckRlZmluaXRpb24pO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXRXaGVyZU9wdGlvbnMocnVsZTogUXVlcnlSdWxlTW9kZWwpOiBQcm9taXNlPFdoZXJlT3B0aW9ucz4ge1xuICAgICAgICBjb25zdCBwb2ludHMgPSBydWxlLnZhbHVlIGFzIFtudW1iZXIsIG51bWJlcl1bXTtcbiAgICAgICAgcG9pbnRzLnB1c2gocG9pbnRzWzBdKTtcbiAgICAgICAgY29uc3QgZm9ybWF0dGVkUG9pbnRzID0gcG9pbnRzLm1hcCgoW2xhdGl0dWRlLCBsb25naXR1ZGVdKSA9PiBgJHtsYXRpdHVkZX0gJHtsb25naXR1ZGV9YCkuam9pbihcIiwgXCIpO1xuICAgICAgICBjb25zdCBwb2x5Z29uID0gZm4oXCJTVF9HZW9tZXRyeUZyb21UZXh0XCIsIGxpdGVyYWwoYCdQT0xZR09OKCgke2Zvcm1hdHRlZFBvaW50c30pKSdgKSwgdGhpcy5zcmlkID8/IDApO1xuICAgICAgICBjb25zdCBwb2ludCA9IHRoaXMuYXR0cmlidXRlID8/XG4gICAgICAgICAgICBmbihcbiAgICAgICAgICAgICAgICBcIlBvaW50XCIsXG4gICAgICAgICAgICAgICAgdGhpcy5wYXRoID8gbGl0ZXJhbChTZXF1ZWxpemVVdGlscy5nZXRMaXRlcmFsRnVsbE5hbWUodGhpcy5sbmdBdHRyaWJ1dGUsIHRoaXMucGF0aCkpIDogdGhpcy5sbmdBdHRyaWJ1dGUsXG4gICAgICAgICAgICAgICAgdGhpcy5wYXRoID8gbGl0ZXJhbChTZXF1ZWxpemVVdGlscy5nZXRMaXRlcmFsRnVsbE5hbWUodGhpcy5sYXRBdHRyaWJ1dGUsIHRoaXMucGF0aCkpIDogdGhpcy5sYXRBdHRyaWJ1dGVcbiAgICAgICAgICAgICk7XG4gICAgICAgIHJldHVybiB3aGVyZShcbiAgICAgICAgICAgIGZuKFwiU1RfQ29udGFpbnNcIiwgcG9seWdvbiwgdGhpcy5zcmlkID8gZm4oXCJTVF9TUklEXCIsIHBvaW50LCB0aGlzLnNyaWQpIDogcG9pbnQpLFxuICAgICAgICAgICAgbGl0ZXJhbChgJHtydWxlLm9wZXJhdGlvbiA9PT0gRmlsdGVyT3BlcmF0b3JUeXBlcy5FcXVhbCA/IDEgOiAwfWApXG4gICAgICAgICk7XG4gICAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9nZW8tYm91bmRzLmZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5Q0FBNkQ7QUFDN0QsMkRBQXVEO0FBRXZELDRDQUFvRTtBQUNwRSxrQ0FBcUM7QUFDckMscUNBQXdEO0FBaUJ4RCxNQUFhLGVBQWdCLFNBQVEsZUFBTTtJQU92QyxZQUFZLFVBQXFDO1FBQzdDLEtBQUssQ0FBQyxVQUFrQyxDQUFDLENBQUM7UUFQdkMsU0FBSSxHQUFHLGlCQUFVLENBQUMsU0FBUyxDQUFDO1FBQzVCLGNBQVMsR0FBRyxDQUFDLEdBQUcsMkJBQWUsQ0FBQyxDQUFDO0lBT3hDLENBQUM7SUFFTSxLQUFLLENBQUMsZUFBZSxDQUFDLElBQW9COztRQUM3QyxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBMkIsQ0FBQztRQUNoRCxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLE1BQU0sZUFBZSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxTQUFTLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxRQUFRLElBQUksU0FBUyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckcsTUFBTSxPQUFPLEdBQUcsSUFBQSxjQUFFLEVBQUMscUJBQXFCLEVBQUUsSUFBQSxtQkFBTyxFQUFDLGFBQWEsZUFBZSxLQUFLLENBQUMsRUFBRSxNQUFBLElBQUksQ0FBQyxJQUFJLG1DQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ3RHLE1BQU0sS0FBSyxHQUFHLE1BQUEsSUFBSSxDQUFDLFNBQVMsbUNBQ3hCLElBQUEsY0FBRSxFQUNFLE9BQU8sRUFDUCxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUN4RyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUMzRyxDQUFDO1FBQ04sT0FBTyxJQUFBLGlCQUFLLEVBQ1IsSUFBQSxjQUFFLEVBQUMsYUFBYSxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLGNBQUUsRUFBQyxTQUFTLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEVBQy9FLElBQUEsbUJBQU8sRUFBQyxHQUFHLElBQUksQ0FBQyxTQUFTLEtBQUssK0JBQW1CLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQ3JFLENBQUM7SUFDTixDQUFDO0NBQ0o7QUEzQkQsMENBMkJDIiwiZmlsZSI6ImxpYi9maWx0ZXIvZmlsdGVycy9nZW8tYm91bmRzLmZpbHRlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZuLCBsaXRlcmFsLCB3aGVyZSwgV2hlcmVPcHRpb25zIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgU2VxdWVsaXplVXRpbHMgfSBmcm9tIFwiLi4vLi4vc2VxdWVsaXplLnV0aWxzXCI7XG5pbXBvcnQgeyBRdWVyeVJ1bGVNb2RlbCB9IGZyb20gXCIuLi9tb2RlbHNcIjtcbmltcG9ydCB7IEZpbHRlck9wZXJhdG9yVHlwZXMsIFNlbGVjdE9wZXJhdG9ycyB9IGZyb20gXCIuLi9vcGVyYXRvcnNcIjtcbmltcG9ydCB7IEZpbHRlclR5cGUgfSBmcm9tIFwiLi4vdHlwZVwiO1xuaW1wb3J0IHsgQmFzZUZpbHRlckRlZmluaXRpb24sIEZpbHRlciB9IGZyb20gXCIuL2ZpbHRlclwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEdlb0JvdW5kc0ZpbHRlckRlZmluaXRpb25XaXRoUG9pbnQge1xuICAgIGF0dHJpYnV0ZTogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEdlb0JvdW5kc0ZpbHRlckRlZmluaXRpb25XaXRoTGF0TG5nIHtcbiAgICBsYXRBdHRyaWJ1dGU6IHN0cmluZztcbiAgICBsbmdBdHRyaWJ1dGU6IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBCYXNlR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbiAgZXh0ZW5kcyBPbWl0PEJhc2VGaWx0ZXJEZWZpbml0aW9uLCBcImF0dHJpYnV0ZVwiPiB7XG4gICAgc3JpZD86IG51bWJlcjtcbn1cblxuZXhwb3J0IHR5cGUgR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbiA9IEJhc2VHZW9Cb3VuZHNGaWx0ZXJEZWZpbml0aW9uICYgKEdlb0JvdW5kc0ZpbHRlckRlZmluaXRpb25XaXRoUG9pbnQgfCBHZW9Cb3VuZHNGaWx0ZXJEZWZpbml0aW9uV2l0aExhdExuZyk7XG5cbmV4cG9ydCBjbGFzcyBHZW9Cb3VuZHNGaWx0ZXIgZXh0ZW5kcyBGaWx0ZXIgaW1wbGVtZW50cyBCYXNlR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbiwgR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbldpdGhQb2ludCwgR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbldpdGhMYXRMbmcgIHtcbiAgICBwdWJsaWMgdHlwZSA9IEZpbHRlclR5cGUuR2VvQm91bmRzO1xuICAgIHB1YmxpYyBvcGVyYXRvcnMgPSBbLi4uU2VsZWN0T3BlcmF0b3JzXTtcbiAgICBwdWJsaWMgbGF0QXR0cmlidXRlOiBzdHJpbmc7XG4gICAgcHVibGljIGxuZ0F0dHJpYnV0ZTogc3RyaW5nO1xuICAgIHB1YmxpYyBzcmlkPzogbnVtYmVyO1xuXG4gICAgY29uc3RydWN0b3IoZGVmaW5pdGlvbjogR2VvQm91bmRzRmlsdGVyRGVmaW5pdGlvbikge1xuICAgICAgICBzdXBlcihkZWZpbml0aW9uIGFzIEJhc2VGaWx0ZXJEZWZpbml0aW9uKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0V2hlcmVPcHRpb25zKHJ1bGU6IFF1ZXJ5UnVsZU1vZGVsKTogUHJvbWlzZTxXaGVyZU9wdGlvbnM+IHtcbiAgICAgICAgY29uc3QgcG9pbnRzID0gcnVsZS52YWx1ZSBhcyBbbnVtYmVyLCBudW1iZXJdW107XG4gICAgICAgIHBvaW50cy5wdXNoKHBvaW50c1swXSk7XG4gICAgICAgIGNvbnN0IGZvcm1hdHRlZFBvaW50cyA9IHBvaW50cy5tYXAoKFtsYXRpdHVkZSwgbG9uZ2l0dWRlXSkgPT4gYCR7bGF0aXR1ZGV9ICR7bG9uZ2l0dWRlfWApLmpvaW4oXCIsIFwiKTtcbiAgICAgICAgY29uc3QgcG9seWdvbiA9IGZuKFwiU1RfR2VvbWV0cnlGcm9tVGV4dFwiLCBsaXRlcmFsKGAnUE9MWUdPTigoJHtmb3JtYXR0ZWRQb2ludHN9KSknYCksIHRoaXMuc3JpZCA/PyAwKTtcbiAgICAgICAgY29uc3QgcG9pbnQgPSB0aGlzLmF0dHJpYnV0ZSA/P1xuICAgICAgICAgICAgZm4oXG4gICAgICAgICAgICAgICAgXCJQb2ludFwiLFxuICAgICAgICAgICAgICAgIHRoaXMucGF0aCA/IGxpdGVyYWwoU2VxdWVsaXplVXRpbHMuZ2V0TGl0ZXJhbEZ1bGxOYW1lKHRoaXMubG5nQXR0cmlidXRlLCB0aGlzLnBhdGgpKSA6IHRoaXMubG5nQXR0cmlidXRlLFxuICAgICAgICAgICAgICAgIHRoaXMucGF0aCA/IGxpdGVyYWwoU2VxdWVsaXplVXRpbHMuZ2V0TGl0ZXJhbEZ1bGxOYW1lKHRoaXMubGF0QXR0cmlidXRlLCB0aGlzLnBhdGgpKSA6IHRoaXMubGF0QXR0cmlidXRlXG4gICAgICAgICAgICApO1xuICAgICAgICByZXR1cm4gd2hlcmUoXG4gICAgICAgICAgICBmbihcIlNUX0NvbnRhaW5zXCIsIHBvbHlnb24sIHRoaXMuc3JpZCA/IGZuKFwiU1RfU1JJRFwiLCBwb2ludCwgdGhpcy5zcmlkKSA6IHBvaW50KSxcbiAgICAgICAgICAgIGxpdGVyYWwoYCR7cnVsZS5vcGVyYXRpb24gPT09IEZpbHRlck9wZXJhdG9yVHlwZXMuRXF1YWwgPyAxIDogMH1gKVxuICAgICAgICApO1xuICAgIH1cbn1cbiJdfQ==

package/lib/filter/filters/geo-localization.filter.d.ts

@@ -17,6 +17,6 @@ export declare class GeoLocalizationFilter extends GroupFilter implements GroupF
     valueFilter: NumberFilter;
     srid?: number;
     constructor(definition: GeoLocalizationFilterDefinition);
-    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;
+    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions>;
     static reset(): void;
 }

package/lib/filter/filters/geo-localization.filter.js

@@ -16,9 +16,6 @@ class GeoLocalizationFilter extends group_filter_1.GroupFilter {
     async getWhereOptions(rule) {
         var _a;
         const [root, value] = this.getRules(rule);
-        if (!root || !value) {
-            return;
-        }
         const name = this.rootFilter.path ?
             sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.rootFilter.attribute, this.rootFilter.path) :
             this.rootFilter.attribute;
@@ -35,4 +32,4 @@ exports.GeoLocalizationFilter = GeoLocalizationFilter;
 GeoLocalizationFilter.attributesCounter = 0;
 GeoLocalizationFilter.whereCounter = 0;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9nZW8tbG9jYWxpemF0aW9uLmZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5Q0FBd0U7QUFFeEUsMkRBQXVEO0FBQ3ZELGlEQUFvRTtBQUNwRSwyREFBdUQ7QUFDdkQsbURBQStDO0FBQy9DLGtDQUFxQztBQVFyQyxNQUFhLHFCQUFzQixTQUFRLDBCQUFXO0lBU2xELFlBQVksVUFBMkM7UUFDbkQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBTmYsU0FBSSxHQUFHLGlCQUFVLENBQUMsZUFBZSxDQUFDO1FBRWxDLGdCQUFXLEdBQUcsSUFBSSw0QkFBWSxFQUFFLENBQUM7SUFLeEMsQ0FBQztJQUVNLEtBQUssQ0FBQyxlQUFlLENBQUMsSUFBb0I7O1FBQzdDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQyxJQUFJLENBQUMsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ2pCLE9BQU87U0FDVjtRQUVELE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDL0IsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDcEYsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7UUFDOUIsTUFBTSxDQUFDLFFBQVEsRUFBRSxTQUFTLENBQUMsR0FBRyxvQ0FBZ0IsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDcEUsTUFBTSxRQUFRLEdBQUcsSUFBQSxjQUFFLEVBQUMscUJBQXFCLEVBQUUsSUFBQSxtQkFBTyxFQUFDLFVBQVUsUUFBUSxJQUFJLFNBQVMsSUFBSSxDQUFDLEVBQUUsTUFBQSxJQUFJLENBQUMsSUFBSSxtQ0FBSSxDQUFDLENBQUMsQ0FBQztRQUN6RyxPQUFPLElBQUEsaUJBQUssRUFBQyxJQUFBLGNBQUUsRUFBQyxvQkFBb0IsRUFBRSxJQUFBLG1CQUFPLEVBQUMsSUFBSSxDQUFDLEVBQUUsUUFBUSxDQUFDLEVBQUUsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxLQUFLLENBQWMsQ0FBQyxDQUFBO0lBQzFILENBQUM7SUFFTSxNQUFNLENBQUMsS0FBSztRQUNmLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxDQUFDLENBQUM7UUFDM0IsSUFBSSxDQUFDLFlBQVksR0FBRyxDQUFDLENBQUM7SUFDMUIsQ0FBQzs7QUE5Qkwsc0RBK0JDO0FBOUJrQix1Q0FBaUIsR0FBRyxDQUFDLENBQUM7QUFDdEIsa0NBQVksR0FBRyxDQUFDLENBQUMiLCJmaWxlIjoibGliL2ZpbHRlci9maWx0ZXJzL2dlby1sb2NhbGl6YXRpb24uZmlsdGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZm4sIGxpdGVyYWwsIExvZ2ljVHlwZSwgd2hlcmUsIFdoZXJlT3B0aW9ucyB9IGZyb20gXCJzZXF1ZWxpemVcIjtcbmltcG9ydCB7IFF1ZXJ5UnVsZU1vZGVsIH0gZnJvbSBcIi4uL21vZGVsc1wiO1xuaW1wb3J0IHsgU2VxdWVsaXplVXRpbHMgfSBmcm9tIFwiLi4vLi4vc2VxdWVsaXplLnV0aWxzXCI7XG5pbXBvcnQgeyBHcm91cEZpbHRlciwgR3JvdXBGaWx0ZXJEZWZpbml0aW9uIH0gZnJvbSBcIi4vZ3JvdXAuZmlsdGVyXCI7XG5pbXBvcnQgeyBDb29yZGluYXRlRmlsdGVyIH0gZnJvbSBcIi4vY29vcmRpbmF0ZS5maWx0ZXJcIjtcbmltcG9ydCB7IE51bWJlckZpbHRlciB9IGZyb20gXCIuL251bWJlci5maWx0ZXJcIjtcbmltcG9ydCB7IEZpbHRlclR5cGUgfSBmcm9tIFwiLi4vdHlwZVwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEdlb0xvY2FsaXphdGlvbkZpbHRlckRlZmluaXRpb24ge1xuICAgIHJvb3RGaWx0ZXI6IENvb3JkaW5hdGVGaWx0ZXI7XG4gICAgZ3JvdXA/OiBzdHJpbmc7XG4gICAgc3JpZD86IG51bWJlcjtcbn1cblxuZXhwb3J0IGNsYXNzIEdlb0xvY2FsaXphdGlvbkZpbHRlciBleHRlbmRzIEdyb3VwRmlsdGVyIGltcGxlbWVudHMgR3JvdXBGaWx0ZXJEZWZpbml0aW9uLCBHZW9Mb2NhbGl6YXRpb25GaWx0ZXJEZWZpbml0aW9uIHtcbiAgICBwcml2YXRlIHN0YXRpYyBhdHRyaWJ1dGVzQ291bnRlciA9IDA7XG4gICAgcHJpdmF0ZSBzdGF0aWMgd2hlcmVDb3VudGVyID0gMDtcblxuICAgIHB1YmxpYyB0eXBlID0gRmlsdGVyVHlwZS5HZW9Mb2NhbGl6YXRpb247XG4gICAgcHVibGljIHJvb3RGaWx0ZXIhOiBDb29yZGluYXRlRmlsdGVyO1xuICAgIHB1YmxpYyB2YWx1ZUZpbHRlciA9IG5ldyBOdW1iZXJGaWx0ZXIoKTtcbiAgICBwdWJsaWMgc3JpZD86IG51bWJlcjtcblxuICAgIGNvbnN0cnVjdG9yKGRlZmluaXRpb246IEdlb0xvY2FsaXphdGlvbkZpbHRlckRlZmluaXRpb24pIHtcbiAgICAgICAgc3VwZXIoZGVmaW5pdGlvbik7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIGdldFdoZXJlT3B0aW9ucyhydWxlOiBRdWVyeVJ1bGVNb2RlbCk6IFByb21pc2U8V2hlcmVPcHRpb25zIHwgdW5kZWZpbmVkPiB7XG4gICAgICAgIGNvbnN0IFtyb290LCB2YWx1ZV0gPSB0aGlzLmdldFJ1bGVzKHJ1bGUpO1xuICAgICAgICBpZiAoIXJvb3QgfHwgIXZhbHVlKSB7XG4gICAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBuYW1lID0gdGhpcy5yb290RmlsdGVyLnBhdGggP1xuICAgICAgICAgICAgU2VxdWVsaXplVXRpbHMuZ2V0TGl0ZXJhbEZ1bGxOYW1lKHRoaXMucm9vdEZpbHRlci5hdHRyaWJ1dGUsIHRoaXMucm9vdEZpbHRlci5wYXRoKSA6XG4gICAgICAgICAgICB0aGlzLnJvb3RGaWx0ZXIuYXR0cmlidXRlO1xuICAgICAgICBjb25zdCBbbGF0aXR1ZGUsIGxvbmdpdHVkZV0gPSBDb29yZGluYXRlRmlsdGVyLmdldENvb3JkaW5hdGVzKHJvb3QpO1xuICAgICAgICBjb25zdCBsb2NhdGlvbiA9IGZuKFwiU1RfR2VvbWV0cnlGcm9tVGV4dFwiLCBsaXRlcmFsKGAnUE9JTlQoJHtsYXRpdHVkZX0gJHtsb25naXR1ZGV9KSdgKSwgdGhpcy5zcmlkID8/IDApO1xuICAgICAgICByZXR1cm4gd2hlcmUoZm4oXCJTVF9EaXN0YW5jZV9TcGhlcmVcIiwgbGl0ZXJhbChuYW1lKSwgbG9jYXRpb24pLCBTZXF1ZWxpemVVdGlscy5nZW5lcmF0ZVdoZXJlVmFsdWUodmFsdWUpIGFzIExvZ2ljVHlwZSlcbiAgICB9XG5cbiAgICBwdWJsaWMgc3RhdGljIHJlc2V0KCk6IHZvaWQge1xuICAgICAgICB0aGlzLmF0dHJpYnV0ZXNDb3VudGVyID0gMDtcbiAgICAgICAgdGhpcy53aGVyZUNvdW50ZXIgPSAwO1xuICAgIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9nZW8tbG9jYWxpemF0aW9uLmZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5Q0FBd0U7QUFFeEUsMkRBQXVEO0FBQ3ZELGlEQUFvRTtBQUNwRSwyREFBdUQ7QUFDdkQsbURBQStDO0FBQy9DLGtDQUFxQztBQVFyQyxNQUFhLHFCQUFzQixTQUFRLDBCQUFXO0lBU2xELFlBQVksVUFBMkM7UUFDbkQsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBTmYsU0FBSSxHQUFHLGlCQUFVLENBQUMsZUFBZSxDQUFDO1FBRWxDLGdCQUFXLEdBQUcsSUFBSSw0QkFBWSxFQUFFLENBQUM7SUFLeEMsQ0FBQztJQUVNLEtBQUssQ0FBQyxlQUFlLENBQUMsSUFBb0I7O1FBQzdDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQy9CLGdDQUFjLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1lBQ3BGLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDO1FBQzlCLE1BQU0sQ0FBQyxRQUFRLEVBQUUsU0FBUyxDQUFDLEdBQUcsb0NBQWdCLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3BFLE1BQU0sUUFBUSxHQUFHLElBQUEsY0FBRSxFQUFDLHFCQUFxQixFQUFFLElBQUEsbUJBQU8sRUFBQyxVQUFVLFFBQVEsSUFBSSxTQUFTLElBQUksQ0FBQyxFQUFFLE1BQUEsSUFBSSxDQUFDLElBQUksbUNBQUksQ0FBQyxDQUFDLENBQUM7UUFDekcsT0FBTyxJQUFBLGlCQUFLLEVBQUMsSUFBQSxjQUFFLEVBQUMsb0JBQW9CLEVBQUUsSUFBQSxtQkFBTyxFQUFDLElBQUksQ0FBQyxFQUFFLFFBQVEsQ0FBQyxFQUFFLGdDQUFjLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFjLENBQUMsQ0FBQTtJQUMxSCxDQUFDO0lBRU0sTUFBTSxDQUFDLEtBQUs7UUFDZixJQUFJLENBQUMsaUJBQWlCLEdBQUcsQ0FBQyxDQUFDO1FBQzNCLElBQUksQ0FBQyxZQUFZLEdBQUcsQ0FBQyxDQUFDO0lBQzFCLENBQUM7O0FBMUJMLHNEQTJCQztBQTFCa0IsdUNBQWlCLEdBQUcsQ0FBQyxDQUFDO0FBQ3RCLGtDQUFZLEdBQUcsQ0FBQyxDQUFDIiwiZmlsZSI6ImxpYi9maWx0ZXIvZmlsdGVycy9nZW8tbG9jYWxpemF0aW9uLmZpbHRlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZuLCBsaXRlcmFsLCBMb2dpY1R5cGUsIHdoZXJlLCBXaGVyZU9wdGlvbnMgfSBmcm9tIFwic2VxdWVsaXplXCI7XG5pbXBvcnQgeyBRdWVyeVJ1bGVNb2RlbCB9IGZyb20gXCIuLi9tb2RlbHNcIjtcbmltcG9ydCB7IFNlcXVlbGl6ZVV0aWxzIH0gZnJvbSBcIi4uLy4uL3NlcXVlbGl6ZS51dGlsc1wiO1xuaW1wb3J0IHsgR3JvdXBGaWx0ZXIsIEdyb3VwRmlsdGVyRGVmaW5pdGlvbiB9IGZyb20gXCIuL2dyb3VwLmZpbHRlclwiO1xuaW1wb3J0IHsgQ29vcmRpbmF0ZUZpbHRlciB9IGZyb20gXCIuL2Nvb3JkaW5hdGUuZmlsdGVyXCI7XG5pbXBvcnQgeyBOdW1iZXJGaWx0ZXIgfSBmcm9tIFwiLi9udW1iZXIuZmlsdGVyXCI7XG5pbXBvcnQgeyBGaWx0ZXJUeXBlIH0gZnJvbSBcIi4uL3R5cGVcIjtcblxuZXhwb3J0IGludGVyZmFjZSBHZW9Mb2NhbGl6YXRpb25GaWx0ZXJEZWZpbml0aW9uIHtcbiAgICByb290RmlsdGVyOiBDb29yZGluYXRlRmlsdGVyO1xuICAgIGdyb3VwPzogc3RyaW5nO1xuICAgIHNyaWQ/OiBudW1iZXI7XG59XG5cbmV4cG9ydCBjbGFzcyBHZW9Mb2NhbGl6YXRpb25GaWx0ZXIgZXh0ZW5kcyBHcm91cEZpbHRlciBpbXBsZW1lbnRzIEdyb3VwRmlsdGVyRGVmaW5pdGlvbiwgR2VvTG9jYWxpemF0aW9uRmlsdGVyRGVmaW5pdGlvbiB7XG4gICAgcHJpdmF0ZSBzdGF0aWMgYXR0cmlidXRlc0NvdW50ZXIgPSAwO1xuICAgIHByaXZhdGUgc3RhdGljIHdoZXJlQ291bnRlciA9IDA7XG5cbiAgICBwdWJsaWMgdHlwZSA9IEZpbHRlclR5cGUuR2VvTG9jYWxpemF0aW9uO1xuICAgIHB1YmxpYyByb290RmlsdGVyOiBDb29yZGluYXRlRmlsdGVyO1xuICAgIHB1YmxpYyB2YWx1ZUZpbHRlciA9IG5ldyBOdW1iZXJGaWx0ZXIoKTtcbiAgICBwdWJsaWMgc3JpZD86IG51bWJlcjtcblxuICAgIGNvbnN0cnVjdG9yKGRlZmluaXRpb246IEdlb0xvY2FsaXphdGlvbkZpbHRlckRlZmluaXRpb24pIHtcbiAgICAgICAgc3VwZXIoZGVmaW5pdGlvbik7XG4gICAgfVxuXG4gICAgcHVibGljIGFzeW5jIGdldFdoZXJlT3B0aW9ucyhydWxlOiBRdWVyeVJ1bGVNb2RlbCk6IFByb21pc2U8V2hlcmVPcHRpb25zPiB7XG4gICAgICAgIGNvbnN0IFtyb290LCB2YWx1ZV0gPSB0aGlzLmdldFJ1bGVzKHJ1bGUpO1xuICAgICAgICBjb25zdCBuYW1lID0gdGhpcy5yb290RmlsdGVyLnBhdGggP1xuICAgICAgICAgICAgU2VxdWVsaXplVXRpbHMuZ2V0TGl0ZXJhbEZ1bGxOYW1lKHRoaXMucm9vdEZpbHRlci5hdHRyaWJ1dGUsIHRoaXMucm9vdEZpbHRlci5wYXRoKSA6XG4gICAgICAgICAgICB0aGlzLnJvb3RGaWx0ZXIuYXR0cmlidXRlO1xuICAgICAgICBjb25zdCBbbGF0aXR1ZGUsIGxvbmdpdHVkZV0gPSBDb29yZGluYXRlRmlsdGVyLmdldENvb3JkaW5hdGVzKHJvb3QpO1xuICAgICAgICBjb25zdCBsb2NhdGlvbiA9IGZuKFwiU1RfR2VvbWV0cnlGcm9tVGV4dFwiLCBsaXRlcmFsKGAnUE9JTlQoJHtsYXRpdHVkZX0gJHtsb25naXR1ZGV9KSdgKSwgdGhpcy5zcmlkID8/IDApO1xuICAgICAgICByZXR1cm4gd2hlcmUoZm4oXCJTVF9EaXN0YW5jZV9TcGhlcmVcIiwgbGl0ZXJhbChuYW1lKSwgbG9jYXRpb24pLCBTZXF1ZWxpemVVdGlscy5nZW5lcmF0ZVdoZXJlVmFsdWUodmFsdWUpIGFzIExvZ2ljVHlwZSlcbiAgICB9XG5cbiAgICBwdWJsaWMgc3RhdGljIHJlc2V0KCk6IHZvaWQge1xuICAgICAgICB0aGlzLmF0dHJpYnV0ZXNDb3VudGVyID0gMDtcbiAgICAgICAgdGhpcy53aGVyZUNvdW50ZXIgPSAwO1xuICAgIH1cbn1cbiJdfQ==

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

@@ -1,5 +1,5 @@
 import { WhereOptions } from "sequelize";
-import { DataFilterUserModel, IRule } from "../..";
+import { DataFilterUserModel } from "../..";
 import { TranslateAdapter } from "../../adapters/translate.adapter";
 import { GroupFilterBaseConfigurationModel } from "../models/filter-configuration.model";
 import { QueryRuleModel } from "../models/query.model";
@@ -13,13 +13,13 @@ export interface BaseGroupFilterDefinition {
     lazyLoading?: boolean;
     getValueFilter?: (rule: QueryRuleModel) => Promise<BaseFilterDefinition>;
 }
-export interface GroupFilterDefinition extends BaseGroupFilterDefinition, IRule {
+export interface GroupFilterDefinition extends BaseGroupFilterDefinition {
     getConfig(key: string, user?: DataFilterUserModel): Promise<GroupFilterBaseConfigurationModel>;
-    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;
-    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;
+    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions>;
+    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions>;
 }
 export declare class GroupFilter implements GroupFilterDefinition {
-    readonly _type = "group_filter";
+    private _type;
     protected _translateService: TranslateAdapter;
     set translateService(translateService: TranslateAdapter);
     type: FilterType;
@@ -29,9 +29,9 @@ export declare class GroupFilter implements GroupFilterDefinition {
     lazyLoading?: boolean;
     getValueFilter?: (rule: QueryRuleModel) => Promise<FilterDefinition>;
     constructor(definition: BaseGroupFilterDefinition);
-    static validate(definition: IRule): boolean;
+    static validate(definition: BaseGroupFilterDefinition): boolean;
     getConfig(key: string, user?: DataFilterUserModel): Promise<GroupFilterBaseConfigurationModel>;
-    getWhereOptions(rule: QueryRuleModel, name?: string): Promise<WhereOptions | undefined>;
-    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;
-    protected getRules(rule: QueryRuleModel): [RuleModel | null, RuleModel | null];
+    getWhereOptions(rule: QueryRuleModel, name?: string): Promise<WhereOptions>;
+    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions>;
+    protected getRules(rule: QueryRuleModel): [RuleModel, RuleModel];
 }

package/lib/filter/filters/group.filter.js

@@ -21,7 +21,7 @@ class GroupFilter {
         return definition["_type"] === "group_filter";
     }
     async getConfig(key, user) {
-        var _a, _b;
+        var _a;
         const config = {
             type: this.type,
             rootFilter: await this.rootFilter.getConfig(key, user),
@@ -33,47 +33,42 @@ class GroupFilter {
         if (this.group) {
             config.group = {
                 key: this.group,
-                name: await this._translateService.getTranslation((_b = user === null || user === void 0 ? void 0 : user.language) !== null && _b !== void 0 ? _b : "", filter_utils_1.FilterUtils.getGroupTranslationKey(this.group))
+                name: await this._translateService.getTranslation(user === null || user === void 0 ? void 0 : user.language, filter_utils_1.FilterUtils.getGroupTranslationKey(this.group))
             };
         }
         return config;
     }
     async getWhereOptions(rule, name) {
-        var _a, _b;
+        var _a;
         const [root, value] = this.getRules(rule);
         if (!root || !value) {
             return {};
         }
-        const rootWhere = await this.rootFilter.getWhereOptions(root);
-        const valueFilter = (_a = this.valueFilter) !== null && _a !== void 0 ? _a : await ((_b = this.getValueFilter) === null || _b === void 0 ? void 0 : _b.call(this, root));
-        if (!valueFilter) {
-            return rootWhere;
-        }
-        const valueWhere = await valueFilter.getWhereOptions(value);
-        if (!rootWhere || !valueWhere) {
-            return undefined;
-        }
+        const valueFilter = (_a = this.valueFilter) !== null && _a !== void 0 ? _a : await this.getValueFilter(root);
         return {
-            [sequelize_1.Op.and]: [rootWhere, valueWhere]
+            [sequelize_1.Op.and]: [
+                await this.rootFilter.getWhereOptions(root),
+                await valueFilter.getWhereOptions(value)
+            ]
         };
     }
     async getHavingOptions(rule) {
-        var _a, _b;
+        var _a;
         const [root, value] = this.getRules(rule);
         if (!root || !value) {
             return {};
         }
-        const valueFilter = (_a = this.valueFilter) !== null && _a !== void 0 ? _a : await ((_b = this.getValueFilter) === null || _b === void 0 ? void 0 : _b.call(this, root));
+        const valueFilter = (_a = this.valueFilter) !== null && _a !== void 0 ? _a : await this.getValueFilter(root);
         const rootHaving = await this.rootFilter.getHavingOptions(rule);
-        const valueHaving = await (valueFilter === null || valueFilter === void 0 ? void 0 : valueFilter.getHavingOptions(rule));
-        if (!rootHaving || !valueHaving) {
-            return undefined;
+        const valueHaving = await valueFilter.getHavingOptions(rule);
+        if (!rootHaving && !valueHaving) {
+            return null;
         }
         return {
             [sequelize_1.Op.and]: [
                 rootHaving,
                 valueHaving
-            ]
+            ].filter(x => x)
         };
     }
     getRules(rule) {
@@ -86,4 +81,4 @@ class GroupFilter {
 }
 exports.GroupFilter = GroupFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/group.filter.ts"],"names":[],"mappings":"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","file":"lib/filter/filters/group.filter.js","sourcesContent":["import { Op, WhereOptions } from \"sequelize\";\nimport { DataFilterUserModel, IRule } from \"../..\";\nimport { TranslateAdapter } from \"../../adapters/translate.adapter\";\nimport { FilterUtils } from \"../filter.utils\";\nimport { GroupFilterBaseConfigurationModel } from \"../models/filter-configuration.model\";\nimport { QueryRuleModel } from \"../models/query.model\";\nimport { RuleModel } from \"../models/rule.model\";\nimport { FilterType } from \"../type\";\nimport { BaseFilterDefinition, Filter, FilterDefinition } from \"./filter\";\n\nexport interface BaseGroupFilterDefinition {\n    rootFilter: Filter;\n    group?: string;\n    valueFilter?: Filter;\n    lazyLoading?: boolean;\n    getValueFilter?: (rule: QueryRuleModel) => Promise<BaseFilterDefinition>;\n}\n\nexport interface GroupFilterDefinition extends BaseGroupFilterDefinition, IRule {\n    getConfig(key: string, user?: DataFilterUserModel): Promise<GroupFilterBaseConfigurationModel>;\n    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;\n    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;\n}\n\nexport class GroupFilter implements GroupFilterDefinition {\n    public readonly _type = \"group_filter\";\n    protected _translateService!: TranslateAdapter;\n\n    public set translateService(translateService: TranslateAdapter) {\n        this._translateService = translateService;\n\n        this.rootFilter.translateService = translateService;\n        if (this.valueFilter) {\n            this.valueFilter.translateService = translateService;\n        }\n    }\n\n    public type = FilterType.Group;\n    public group!: string;\n    public rootFilter!: Filter;\n    public valueFilter?: Filter;\n    public lazyLoading?: boolean;\n    public getValueFilter?: (rule: QueryRuleModel) => Promise<FilterDefinition>;\n\n    constructor(definition: BaseGroupFilterDefinition) {\n        Object.assign(this, definition);\n    }\n\n    public static validate(definition: IRule) {\n        return definition[\"_type\"] === \"group_filter\";\n    }\n\n    public async getConfig(key: string, user?: DataFilterUserModel): Promise<GroupFilterBaseConfigurationModel> {\n        const config = {\n            type: this.type,\n            rootFilter: await this.rootFilter.getConfig(key, user),\n            lazyLoading: this.lazyLoading ?? false\n        } as GroupFilterBaseConfigurationModel;\n\n        if (this.valueFilter) {\n            config.valueFilter = await this.valueFilter.getConfig(key, user);\n        }\n        if (this.group) {\n            config.group = {\n                key: this.group,\n                name: await this._translateService.getTranslation(\n                    user?.language ?? \"\",\n                    FilterUtils.getGroupTranslationKey(this.group)\n                )\n            };\n        }\n        return config;\n    }\n\n    public async getWhereOptions(rule: QueryRuleModel, name?: string): Promise<WhereOptions | undefined> {\n        const [root, value] = this.getRules(rule);\n        if (!root || !value) {\n            return {};\n        }\n\n        const rootWhere = await this.rootFilter.getWhereOptions(root as QueryRuleModel);\n        const valueFilter = this.valueFilter ?? await this.getValueFilter?.(root as QueryRuleModel);\n        if (!valueFilter) {\n            return rootWhere;\n        }\n\n        const valueWhere = await valueFilter.getWhereOptions(value as QueryRuleModel);\n        if (!rootWhere || !valueWhere) {\n            return undefined;\n        }\n\n        return {\n            [Op.and]: [rootWhere, valueWhere]\n        };\n    }\n\n    public async getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined> {\n        const [root, value] = this.getRules(rule);\n        if (!root || !value) {\n            return {};\n        }\n\n        const valueFilter = this.valueFilter ?? await this.getValueFilter?.(root as QueryRuleModel);\n        const rootHaving = await this.rootFilter.getHavingOptions(rule);\n        const valueHaving = await valueFilter?.getHavingOptions(rule);\n        if (!rootHaving || !valueHaving) {\n            return undefined;\n        }\n\n        return {\n            [Op.and]: [\n                rootHaving,\n                valueHaving\n            ]\n        };\n    }\n\n    protected getRules(rule: QueryRuleModel): [RuleModel | null, RuleModel | null] {\n        const [root, value] = rule.value as [RuleModel, RuleModel];\n        if (!root.value || !value.value || !value.operation) {\n            return [null, null];\n        }\n\n        return [root, value];\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/group.filter.ts"],"names":[],"mappings":"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","file":"lib/filter/filters/group.filter.js","sourcesContent":["import { Op, WhereOptions } from \"sequelize\";\nimport { DataFilterUserModel } from \"../..\";\nimport { TranslateAdapter } from \"../../adapters/translate.adapter\";\nimport { FilterUtils } from \"../filter.utils\";\nimport { GroupFilterBaseConfigurationModel } from \"../models/filter-configuration.model\";\nimport { QueryRuleModel } from \"../models/query.model\";\nimport { RuleModel } from \"../models/rule.model\";\nimport { FilterType } from \"../type\";\nimport { BaseFilterDefinition, Filter, FilterDefinition } from \"./filter\";\n\nexport interface BaseGroupFilterDefinition {\n    rootFilter: Filter;\n    group?: string;\n    valueFilter?: Filter;\n    lazyLoading?: boolean;\n    getValueFilter?: (rule: QueryRuleModel) => Promise<BaseFilterDefinition>;\n}\n\nexport interface GroupFilterDefinition extends BaseGroupFilterDefinition {\n    getConfig(key: string, user?: DataFilterUserModel): Promise<GroupFilterBaseConfigurationModel>;\n    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions>;\n    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions>;\n}\n\nexport class GroupFilter implements GroupFilterDefinition {\n    private _type = \"group_filter\";\n    protected _translateService: TranslateAdapter;\n\n    public set translateService(translateService: TranslateAdapter) {\n        this._translateService = translateService;\n\n        this.rootFilter.translateService = translateService;\n        if (this.valueFilter) {\n            this.valueFilter.translateService = translateService;\n        }\n    }\n\n    public type = FilterType.Group;\n    public group: string;\n    public rootFilter: Filter;\n    public valueFilter?: Filter;\n    public lazyLoading?: boolean;\n    public getValueFilter?: (rule: QueryRuleModel) => Promise<FilterDefinition>;\n\n    constructor(definition: BaseGroupFilterDefinition) {\n        Object.assign(this, definition);\n    }\n\n    public static validate(definition: BaseGroupFilterDefinition) {\n        return definition[\"_type\"] === \"group_filter\";\n    }\n\n    public async getConfig(key: string, user?: DataFilterUserModel): Promise<GroupFilterBaseConfigurationModel> {\n        const config = {\n            type: this.type,\n            rootFilter: await this.rootFilter.getConfig(key, user),\n            lazyLoading: this.lazyLoading ?? false\n        } as GroupFilterBaseConfigurationModel;\n\n        if (this.valueFilter) {\n            config.valueFilter = await this.valueFilter.getConfig(key, user);\n        }\n        if (this.group) {\n            config.group = {\n                key: this.group,\n                name: await this._translateService.getTranslation(\n                    user?.language,\n                    FilterUtils.getGroupTranslationKey(this.group)\n                )\n            };\n        }\n        return config;\n    }\n\n    public async getWhereOptions(rule: QueryRuleModel, name?: string): Promise<WhereOptions> {\n        const [root, value] = this.getRules(rule);\n        if (!root || !value) {\n            return {};\n        }\n\n        const valueFilter = this.valueFilter ?? await this.getValueFilter(root as QueryRuleModel);\n        return {\n            [Op.and]: [\n                await this.rootFilter.getWhereOptions(root as QueryRuleModel),\n                await valueFilter.getWhereOptions(value as QueryRuleModel)\n            ]\n        };\n    }\n\n    public async getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions> {\n        const [root, value] = this.getRules(rule);\n        if (!root || !value) {\n            return {};\n        }\n\n        const valueFilter = this.valueFilter ?? await this.getValueFilter(root as QueryRuleModel);\n        const rootHaving = await this.rootFilter.getHavingOptions(rule);\n        const valueHaving = await valueFilter.getHavingOptions(rule);\n        if (!rootHaving && !valueHaving) {\n            return null;\n        }\n\n        return {\n            [Op.and]: [\n                rootHaving,\n                valueHaving\n            ].filter(x => x)\n        };\n    }\n\n    protected getRules(rule: QueryRuleModel): [RuleModel, RuleModel] {\n        const [root, value] = rule.value as [RuleModel, RuleModel];\n        if (!root.value || !value.value || !value.operation) {\n            return [null, null];\n        }\n\n        return [root, value];\n    }\n}\n"]}

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

@@ -0,0 +1,47 @@
+import { WhereOptions } from "sequelize";
+import { PathModel } from "../../models/path.model";
+import { DataFilterUserModel } from "../../models/user.model";
+import { QueryRuleModel } from "../models";
+import { FilterBaseConfigurationModel } from "../models/filter-configuration.model";
+import { FilterOperatorTypes } from "../operators";
+import { FilterType } from "../type";
+import { BaseFilterDefinition, Filter, FilterCondition } from "./filter";
+export interface OptionsFilterOption {
+    key: string;
+    value?: unknown;
+    operator?: FilterOperatorTypes;
+    condition?: FilterCondition;
+}
+export declare const optionsFilterSelectionModes: readonly ["radio", "select"];
+export type OptionsFilterSelectionMode = (typeof optionsFilterSelectionModes)[number];
+export interface OptionsFilterDefinition {
+    selectionMode: OptionsFilterSelectionMode;
+    options: OptionsFilterOption[];
+}
+export declare class OptionsFilterOptionConfiguration {
+    key: string;
+    name?: string;
+}
+export interface OptionsFilterConfigurationModel extends FilterBaseConfigurationModel {
+    selectionMode: OptionsFilterSelectionMode;
+    options: OptionsFilterOptionConfiguration[];
+}
+export declare class OptionsFilter extends Filter implements OptionsFilterDefinition {
+    type: FilterType;
+    operators: FilterOperatorTypes[];
+    selectionMode: OptionsFilterSelectionMode;
+    options: OptionsFilterOption[];
+    constructor(definition: BaseFilterDefinition & OptionsFilterDefinition);
+    getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<OptionsFilterConfigurationModel | null>;
+    getIncludePaths<Request>(rule: QueryRuleModel, request: Request, user: DataFilterUserModel | null, data?: object): PathModel[];
+    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;
+    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;
+    private getRulePaths;
+}
+/**
+ * @deprecated: Use OptionsFilter instead
+ */
+export declare class RadioFilter extends OptionsFilter {
+    type: FilterType;
+    constructor(definition: BaseFilterDefinition & Omit<OptionsFilterDefinition, "selectionMode">);
+}

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

@@ -0,0 +1,134 @@
+"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 = 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);
+        this.type = type_1.FilterType.Options;
+        this.operators = [operators_1.FilterOperatorTypes.Equal];
+    }
+    async getConfig(key, request, user) {
+        const config = await super.getConfig(key, request, user);
+        if (!config) {
+            return null;
+        }
+        return {
+            ...config,
+            selectionMode: this.selectionMode,
+            options: await Promise.all(this.options.map(async (x) => {
+                var _a;
+                return ({
+                    key: x.key,
+                    name: await this._translateService.getTranslation((_a = user === null || user === void 0 ? void 0 : user.language) !== null && _a !== void 0 ? _a : "", filter_utils_1.FilterUtils.getRadioOptionTranslationKey(key, x.key))
+                });
+            }))
+        };
+    }
+    getIncludePaths(rule, request, user, data) {
+        const option = this.options.find(x => x.key === rule.value);
+        const condition = option === null || option === void 0 ? void 0 : option.condition;
+        if (!condition) {
+            return super.getIncludePaths(rule, request, user);
+        }
+        return this.getRulePaths(condition.rules, request, user, data);
+    }
+    async getWhereOptions(rule) {
+        const option = this.options.find(x => x.key === rule.value);
+        if (!option) {
+            return super.getWhereOptions(rule);
+        }
+        if (!option.condition) {
+            return super.getWhereOptions({
+                ...rule,
+                value: option.value,
+                operation: option.operator || rule.operation
+            });
+        }
+        const conditions = [];
+        const where = option.condition.condition === "and" ? { [sequelize_1.Op.and]: conditions } : { [sequelize_1.Op.or]: conditions };
+        this.generateRuleWhereOptions(option.condition, conditions, rule);
+        conditions.push(await super.getWhereOptions({
+            ...rule,
+            value: option.value,
+            operation: option.operator || rule.operation
+        }));
+        return where;
+    }
+    async getHavingOptions(rule) {
+        var _a;
+        const option = this.options.find(x => x.key === rule.value);
+        if (!option) {
+            return super.getHavingOptions(rule);
+        }
+        return super.getHavingOptions({
+            ...rule,
+            value: option.value,
+            operation: (_a = option.operator) !== null && _a !== void 0 ? _a : rule.operation
+        });
+    }
+    getRulePaths(rules, request, user, data) {
+        const paths = [];
+        for (const rule of rules) {
+            if (rule.rules) {
+                paths.push(...this.getRulePaths(rule.rules, request, user, data));
+            }
+            else if (rule.path) {
+                if (paths.every((path) => path.path !== rule.path)) {
+                    const r = rule;
+                    if (!r.path) {
+                        continue;
+                    }
+                    if (typeof r.where === "function") {
+                        r.where = r.where({ request, user });
+                    }
+                    paths.push({
+                        path: r.path,
+                        where: filter_utils_1.FilterUtils.generateWhereConditions(r.where, data)
+                    });
+                }
+            }
+        }
+        return paths;
+    }
+}
+exports.OptionsFilter = OptionsFilter;
+/**
+ * @deprecated: Use OptionsFilter instead
+ */
+class RadioFilter extends OptionsFilter {
+    constructor(definition) {
+        super({
+            ...definition,
+            selectionMode: "radio"
+        });
+        this.type = type_1.FilterType.Radio;
+    }
+}
+exports.RadioFilter = RadioFilter;

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

@@ -27,9 +27,9 @@ export declare class RadioFilter extends Filter implements RadioFilterDefinition
     operators: FilterOperatorTypes[];
     options: RadioFilterOption[];
     constructor(definition: BaseFilterDefinition & RadioFilterDefinition);
-    getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<RadioFilterConfigurationModel | null>;
+    getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<RadioFilterConfigurationModel>;
     getIncludePaths(rule: QueryRuleModel, data?: object): PathModel[];
-    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;
-    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined>;
+    getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions>;
+    getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions>;
     private getRulePaths;
 }

package/lib/filter/filters/radio.filter.js

@@ -19,13 +19,10 @@ class RadioFilter extends filter_1.Filter {
         }
         return {
             ...config,
-            options: await Promise.all(this.options.map(async (x) => {
-                var _a;
-                return ({
-                    key: x.key,
-                    name: await this._translateService.getTranslation((_a = user === null || user === void 0 ? void 0 : user.language) !== null && _a !== void 0 ? _a : "", filter_utils_1.FilterUtils.getRadioOptionTranslationKey(key, x.key))
-                });
-            }))
+            options: await Promise.all(this.options.map(async (x) => ({
+                key: x.key,
+                name: await this._translateService.getTranslation(user === null || user === void 0 ? void 0 : user.language, filter_utils_1.FilterUtils.getRadioOptionTranslationKey(key, x.key))
+            })))
         };
     }
     getIncludePaths(rule, data) {
@@ -78,13 +75,9 @@ class RadioFilter extends filter_1.Filter {
             }
             else if (rule.path) {
                 if (paths.every((path) => path.path !== rule.path)) {
-                    const r = rule;
-                    if (!r.path) {
-                        continue;
-                    }
                     paths.push({
-                        path: r.path,
-                        where: filter_utils_1.FilterUtils.generateWhereConditions(r.where, data)
+                        path: rule.path,
+                        where: filter_utils_1.FilterUtils.generateWhereConditions(rule.where, data)
                     });
                 }
             }
@@ -94,4 +87,4 @@ class RadioFilter extends filter_1.Filter {
 }
 exports.RadioFilter = RadioFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/radio.filter.ts"],"names":[],"mappings":"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","file":"lib/filter/filters/radio.filter.js","sourcesContent":["import { Op, WhereOptions } from \"sequelize\";\nimport { PathModel } from \"../../models/path.model\";\nimport { DataFilterUserModel } from \"../../models/user.model\";\nimport { FilterUtils } from \"../filter.utils\";\nimport { QueryRuleModel } from \"../models\";\nimport { FilterBaseConfigurationModel } from \"../models/filter-configuration.model\";\nimport { FilterOperatorTypes } from \"../operators\";\nimport { FilterType } from \"../type\";\nimport { BaseFilterDefinition, Filter, FilterCondition, FilterConditionRule } from \"./filter\";\n\nexport interface RadioFilterOption {\n    key: string;\n    value?: unknown;\n    operator?: FilterOperatorTypes;\n    condition?: FilterCondition;\n}\n\nexport interface RadioFilterDefinition {\n    options: RadioFilterOption[];\n}\n\nexport interface RadioFilterOptionConfiguration {\n    key: string;\n    name?: string;\n}\n\nexport interface RadioFilterConfigurationModel extends FilterBaseConfigurationModel {\n    options: RadioFilterOptionConfiguration[];\n}\n\nexport class RadioFilter extends Filter implements RadioFilterDefinition {\n    public type = FilterType.Radio;\n    public operators = [FilterOperatorTypes.Equal];\n    public options!: RadioFilterOption[];\n\n    constructor(definition: BaseFilterDefinition & RadioFilterDefinition) {\n        super(definition);\n    }\n\n    public async getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<RadioFilterConfigurationModel | null> {\n        const config = await super.getConfig(key, request, user);\n\n        if (!config) {\n            return null;\n        }\n\n        return {\n            ...config,\n            options: await Promise.all(this.options.map(async x => ({\n                key: x.key,\n                name: await this._translateService.getTranslation(\n                    user?.language ?? \"\",\n                    FilterUtils.getRadioOptionTranslationKey(key, x.key)\n                )\n            })))\n        };\n    }\n\n    public getIncludePaths(rule: QueryRuleModel, data?: object): PathModel[] {\n        const option = this.options.find(x => x.key === rule.value);\n        const condition = option?.condition;\n        if (!condition) {\n            return super.getIncludePaths(rule);\n        }\n\n        return this.getRulePaths(condition.rules, data);\n    }\n\n    public async getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined> {\n        const option = this.options.find(x => x.key === rule.value);\n        if (!option) {\n            return super.getWhereOptions(rule);\n        }\n\n        if (!option.condition) {\n            return super.getWhereOptions({\n                ...rule,\n                value: option.value,\n                operation: option.operator || rule.operation\n            });\n        }\n\n        const conditions: any[] = [];\n        const where = option.condition.condition === \"and\" ? { [Op.and]: conditions } : { [Op.or]: conditions };\n        this.generateRuleWhereOptions(option.condition, conditions, rule);\n        conditions.push(\n            await super.getWhereOptions({\n                ...rule,\n                value: option.value,\n                operation: option.operator || rule.operation\n            })\n        );\n        return where;\n    }\n\n    public async getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions | undefined> {\n        const option = this.options.find(x => x.key === rule.value);\n        if (!option) {\n            return super.getHavingOptions(rule);\n        }\n\n        return super.getHavingOptions({\n            ...rule,\n            value: option.value,\n            operation: option.operator ?? rule.operation\n        });\n    }\n\n    private getRulePaths(rules: (FilterConditionRule | FilterCondition)[], data?: object): PathModel[] {\n        const paths: PathModel[] = [];\n\n        for (const rule of rules) {\n            if ((rule as FilterCondition).rules) {\n                paths.push(...this.getRulePaths((rule as FilterCondition).rules, data));\n            } else if ((rule as FilterConditionRule).path) {\n                if (paths.every((path) => path.path !== (rule as FilterConditionRule).path)) {\n                    const r = rule as FilterConditionRule;\n                    if (!r.path) {\n                        continue;\n                    }\n\n                    paths.push({\n                        path: r.path,\n                        where: FilterUtils.generateWhereConditions(r.where, data)\n                    });\n                }\n            }\n        }\n\n        return paths;\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/filter/filters/radio.filter.ts"],"names":[],"mappings":"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","file":"lib/filter/filters/radio.filter.js","sourcesContent":["import { Op, WhereOptions } from \"sequelize\";\nimport { PathModel } from \"../../models/path.model\";\nimport { DataFilterUserModel } from \"../../models/user.model\";\nimport { FilterUtils } from \"../filter.utils\";\nimport { QueryRuleModel } from \"../models\";\nimport { FilterBaseConfigurationModel } from \"../models/filter-configuration.model\";\nimport { FilterOperatorTypes } from \"../operators\";\nimport { FilterType } from \"../type\";\nimport { BaseFilterDefinition, Filter, FilterCondition, FilterConditionRule } from \"./filter\";\n\nexport interface RadioFilterOption {\n    key: string;\n    value?: unknown;\n    operator?: FilterOperatorTypes;\n    condition?: FilterCondition;\n}\n\nexport interface RadioFilterDefinition {\n    options: RadioFilterOption[];\n}\n\nexport interface RadioFilterOptionConfiguration {\n    key: string;\n    name?: string;\n}\n\nexport interface RadioFilterConfigurationModel extends FilterBaseConfigurationModel {\n    options: RadioFilterOptionConfiguration[];\n}\n\nexport class RadioFilter extends Filter implements RadioFilterDefinition {\n    public type = FilterType.Radio;\n    public operators = [FilterOperatorTypes.Equal];\n    public options: RadioFilterOption[];\n\n    constructor(definition: BaseFilterDefinition & RadioFilterDefinition) {\n        super(definition);\n    }\n\n    public async getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<RadioFilterConfigurationModel> {\n        const config = await super.getConfig(key, request, user);\n\n        if (!config) {\n            return null;\n        }\n\n        return {\n            ...config,\n            options: await Promise.all(this.options.map(async x => ({\n                key: x.key,\n                name: await this._translateService.getTranslation(\n                    user?.language,\n                    FilterUtils.getRadioOptionTranslationKey(key, x.key)\n                )\n            })))\n        };\n    }\n\n    public getIncludePaths(rule: QueryRuleModel, data?: object): PathModel[] {\n        const option = this.options.find(x => x.key === rule.value);\n        const condition = option?.condition;\n        if (!condition) {\n            return super.getIncludePaths(rule);\n        }\n\n        return this.getRulePaths(condition.rules, data);\n    }\n\n    public async getWhereOptions(rule: QueryRuleModel): Promise<WhereOptions> {\n        const option = this.options.find(x => x.key === rule.value);\n        if (!option) {\n            return super.getWhereOptions(rule);\n        }\n\n        if (!option.condition) {\n            return super.getWhereOptions({\n                ...rule,\n                value: option.value,\n                operation: option.operator || rule.operation\n            });\n        }\n\n        const conditions = [];\n        const where = option.condition.condition === \"and\" ? { [Op.and]: conditions } : { [Op.or]: conditions };\n        this.generateRuleWhereOptions(option.condition, conditions, rule);\n        conditions.push(\n            await super.getWhereOptions({\n                ...rule,\n                value: option.value,\n                operation: option.operator || rule.operation\n            })\n        );\n        return where;\n    }\n\n    public async getHavingOptions(rule: QueryRuleModel): Promise<WhereOptions> {\n        const option = this.options.find(x => x.key === rule.value);\n        if (!option) {\n            return super.getHavingOptions(rule);\n        }\n\n        return super.getHavingOptions({\n            ...rule,\n            value: option.value,\n            operation: option.operator ?? rule.operation\n        });\n    }\n\n    private getRulePaths(rules: (FilterConditionRule | FilterCondition)[], data?: object): PathModel[] {\n        const paths: PathModel[] = [];\n\n        for (const rule of rules) {\n            if ((rule as FilterCondition).rules) {\n                paths.push(...this.getRulePaths((rule as FilterCondition).rules, data));\n            } else if ((rule as FilterConditionRule).path) {\n                if (paths.every((path) => path.path !== (rule as FilterConditionRule).path)) {\n                    paths.push({\n                        path: (rule as FilterConditionRule).path,\n                        where: FilterUtils.generateWhereConditions((rule as FilterConditionRule).where, data)\n                    });\n                }\n            }\n        }\n\n        return paths;\n    }\n}\n"]}

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

@@ -28,7 +28,7 @@ export declare class SelectFilter<T> extends Filter implements SelectFilterDefin
     operators: import("../operators").FilterOperatorTypes[];
     values: ({ value, user, request }: SelectFilterGetValuesOptions) => Promise<SelectFilterValue[]>;
     getResourceById: ({ id, user, request }: SelectFilterGetResourceOptions) => Promise<SelectFilterValue | null>;
-    lazyLoading: boolean;
+    lazyLoading: any;
     constructor(definition: BaseFilterDefinition & SelectFilterDefinition<T>);
-    getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel | null>;
+    getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel>;
 }

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

@@ -9,7 +9,7 @@ class SelectFilter extends filter_1.Filter {
         super(definition);
         this.type = type_1.FilterType.Select;
         this.operators = [...operators_1.SelectOperators];
-        if (definition.lazyLoading === undefined) {
+        if (this.lazyLoading === undefined) {
             this.lazyLoading = true;
         }
     }
@@ -27,4 +27,4 @@ class SelectFilter extends filter_1.Filter {
 }
 exports.SelectFilter = SelectFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9zZWxlY3QuZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLGtDQUFxQztBQUNyQyw0Q0FBK0M7QUFDL0MscUNBQXdEO0FBNEJ4RCxNQUFhLFlBQWdCLFNBQVEsZUFBTTtJQU92QyxZQUFZLFVBQTREO1FBQ3BFLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQVBmLFNBQUksR0FBRyxpQkFBVSxDQUFDLE1BQU0sQ0FBQztRQUN6QixjQUFTLEdBQUcsQ0FBQyxHQUFHLDJCQUFlLENBQUMsQ0FBQztRQVFwQyxJQUFJLFVBQVUsQ0FBQyxXQUFXLEtBQUssU0FBUyxFQUFFO1lBQ3RDLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDO1NBQzNCO0lBQ0wsQ0FBQztJQUVNLEtBQUssQ0FBQyxTQUFTLENBQVUsR0FBVyxFQUFFLE9BQWdCLEVBQUUsSUFBMEI7UUFDckYsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDekQsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNULE9BQU8sSUFBSSxDQUFDO1NBQ2Y7UUFFRCxPQUFPO1lBQ0gsR0FBRyxNQUFNO1lBQ1QsTUFBTSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDO1lBQzdHLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVztTQUNoQyxDQUFDO0lBQ04sQ0FBQztDQUNKO0FBM0JELG9DQTJCQyIsImZpbGUiOiJsaWIvZmlsdGVyL2ZpbHRlcnMvc2VsZWN0LmZpbHRlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERhdGFGaWx0ZXJVc2VyTW9kZWwgfSBmcm9tIFwiLi4vLi5cIjtcbmltcG9ydCB7IEZpbHRlclR5cGUgfSBmcm9tIFwiLi4vdHlwZVwiO1xuaW1wb3J0IHsgU2VsZWN0T3BlcmF0b3JzIH0gZnJvbSBcIi4uL29wZXJhdG9yc1wiO1xuaW1wb3J0IHsgQmFzZUZpbHRlckRlZmluaXRpb24sIEZpbHRlciB9IGZyb20gXCIuL2ZpbHRlclwiO1xuaW1wb3J0IHsgRmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbCB9IGZyb20gXCIuLi9tb2RlbHMvZmlsdGVyLWNvbmZpZ3VyYXRpb24ubW9kZWxcIjtcblxuZXhwb3J0IGludGVyZmFjZSBTZWxlY3RGaWx0ZXJWYWx1ZSB7XG4gICAgaWQ6IG51bWJlciB8IHN0cmluZztcbiAgICBuYW1lOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgU2VsZWN0RmlsdGVyR2V0VmFsdWVzT3B0aW9uczxUID0gYW55LCBVc2VyID0gYW55LCBSZXF1ZXN0ID0gYW55PiB7XG4gICAgdmFsdWU6IFQ7XG4gICAgdXNlcj86IFVzZXI7XG4gICAgcmVxdWVzdD86IFJlcXVlc3RcbiAgICBwYWdlOiBudW1iZXIgfCBudWxsO1xuICAgIHBhZ2VTaXplOiBudW1iZXIgfCBudWxsO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFNlbGVjdEZpbHRlckdldFJlc291cmNlT3B0aW9uczxVc2VyID0gYW55LCBSZXF1ZXN0ID0gYW55PiB7XG4gICAgaWQ6IG51bWJlciB8IHN0cmluZztcbiAgICB1c2VyPzogVXNlcjtcbiAgICByZXF1ZXN0PzogUmVxdWVzdFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIFNlbGVjdEZpbHRlckRlZmluaXRpb248VD4ge1xuICAgIHZhbHVlczogKHsgdmFsdWUsIHBhZ2UsIHBhZ2VTaXplLCB1c2VyLCByZXF1ZXN0IH06IFNlbGVjdEZpbHRlckdldFZhbHVlc09wdGlvbnMpID0+IFByb21pc2U8U2VsZWN0RmlsdGVyVmFsdWVbXT47XG4gICAgbGF6eUxvYWRpbmc/OiBib29sZWFuO1xuICAgIGdldFJlc291cmNlQnlJZD86ICh7IGlkLCB1c2VyLCByZXF1ZXN0IH06IFNlbGVjdEZpbHRlckdldFJlc291cmNlT3B0aW9ucykgPT4gUHJvbWlzZTxTZWxlY3RGaWx0ZXJWYWx1ZSB8IG51bGw+O1xufVxuXG5leHBvcnQgY2xhc3MgU2VsZWN0RmlsdGVyPFQ+IGV4dGVuZHMgRmlsdGVyIGltcGxlbWVudHMgU2VsZWN0RmlsdGVyRGVmaW5pdGlvbjxUPiB7XG4gICAgcHVibGljIHR5cGUgPSBGaWx0ZXJUeXBlLlNlbGVjdDtcbiAgICBwdWJsaWMgb3BlcmF0b3JzID0gWy4uLlNlbGVjdE9wZXJhdG9yc107XG4gICAgcHVibGljIHZhbHVlcyE6ICh7IHZhbHVlLCB1c2VyLCByZXF1ZXN0IH06IFNlbGVjdEZpbHRlckdldFZhbHVlc09wdGlvbnMpID0+IFByb21pc2U8U2VsZWN0RmlsdGVyVmFsdWVbXT47XG4gICAgcHVibGljIGdldFJlc291cmNlQnlJZCE6ICh7IGlkLCB1c2VyLCByZXF1ZXN0IH06IFNlbGVjdEZpbHRlckdldFJlc291cmNlT3B0aW9ucykgPT4gUHJvbWlzZTxTZWxlY3RGaWx0ZXJWYWx1ZSB8IG51bGw+O1xuICAgIHB1YmxpYyBsYXp5TG9hZGluZyE6IGJvb2xlYW47XG5cbiAgICBjb25zdHJ1Y3RvcihkZWZpbml0aW9uOiBCYXNlRmlsdGVyRGVmaW5pdGlvbiAmIFNlbGVjdEZpbHRlckRlZmluaXRpb248VD4pIHtcbiAgICAgICAgc3VwZXIoZGVmaW5pdGlvbik7XG5cbiAgICAgICAgaWYgKGRlZmluaXRpb24ubGF6eUxvYWRpbmcgPT09IHVuZGVmaW5lZCkge1xuICAgICAgICAgICAgdGhpcy5sYXp5TG9hZGluZyA9IHRydWU7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0Q29uZmlnPFJlcXVlc3Q+KGtleTogc3RyaW5nLCByZXF1ZXN0OiBSZXF1ZXN0LCB1c2VyPzogRGF0YUZpbHRlclVzZXJNb2RlbCk6IFByb21pc2U8RmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbCB8IG51bGw+IHtcbiAgICAgICAgY29uc3QgY29uZmlnID0gYXdhaXQgc3VwZXIuZ2V0Q29uZmlnKGtleSwgcmVxdWVzdCwgdXNlcik7XG4gICAgICAgIGlmICghY29uZmlnKSB7XG4gICAgICAgICAgICByZXR1cm4gbnVsbDtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAuLi5jb25maWcsXG4gICAgICAgICAgICB2YWx1ZXM6IHRoaXMubGF6eUxvYWRpbmcgPyBbXSA6IGF3YWl0IHRoaXMudmFsdWVzKHsgdmFsdWU6IG51bGwsIHVzZXIsIHJlcXVlc3QsIHBhZ2U6IG51bGwsIHBhZ2VTaXplOiBudWxsIH0pLFxuICAgICAgICAgICAgbGF6eUxvYWRpbmc6IHRoaXMubGF6eUxvYWRpbmdcbiAgICAgICAgfTtcbiAgICB9XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy9zZWxlY3QuZmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLGtDQUFxQztBQUNyQyw0Q0FBK0M7QUFDL0MscUNBQXdEO0FBNEJ4RCxNQUFhLFlBQWdCLFNBQVEsZUFBTTtJQU92QyxZQUFZLFVBQTREO1FBQ3BFLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztRQVBmLFNBQUksR0FBRyxpQkFBVSxDQUFDLE1BQU0sQ0FBQztRQUN6QixjQUFTLEdBQUcsQ0FBQyxHQUFHLDJCQUFlLENBQUMsQ0FBQztRQVFwQyxJQUFJLElBQUksQ0FBQyxXQUFXLEtBQUssU0FBUyxFQUFFO1lBQ2hDLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDO1NBQzNCO0lBQ0wsQ0FBQztJQUVNLEtBQUssQ0FBQyxTQUFTLENBQVUsR0FBVyxFQUFFLE9BQWdCLEVBQUUsSUFBMEI7UUFDckYsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFekQsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNULE9BQU8sSUFBSSxDQUFDO1NBQ2Y7UUFFRCxPQUFPO1lBQ0gsR0FBRyxNQUFNO1lBQ1QsTUFBTSxFQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDO1lBQzdHLFdBQVcsRUFBRSxJQUFJLENBQUMsV0FBVztTQUNoQyxDQUFDO0lBQ04sQ0FBQztDQUNKO0FBNUJELG9DQTRCQyIsImZpbGUiOiJsaWIvZmlsdGVyL2ZpbHRlcnMvc2VsZWN0LmZpbHRlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERhdGFGaWx0ZXJVc2VyTW9kZWwgfSBmcm9tIFwiLi4vLi5cIjtcbmltcG9ydCB7IEZpbHRlclR5cGUgfSBmcm9tIFwiLi4vdHlwZVwiO1xuaW1wb3J0IHsgU2VsZWN0T3BlcmF0b3JzIH0gZnJvbSBcIi4uL29wZXJhdG9yc1wiO1xuaW1wb3J0IHsgQmFzZUZpbHRlckRlZmluaXRpb24sIEZpbHRlciB9IGZyb20gXCIuL2ZpbHRlclwiO1xuaW1wb3J0IHsgRmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbCB9IGZyb20gXCIuLi9tb2RlbHMvZmlsdGVyLWNvbmZpZ3VyYXRpb24ubW9kZWxcIjtcblxuZXhwb3J0IGludGVyZmFjZSBTZWxlY3RGaWx0ZXJWYWx1ZSB7XG4gICAgaWQ6IG51bWJlciB8IHN0cmluZztcbiAgICBuYW1lOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgU2VsZWN0RmlsdGVyR2V0VmFsdWVzT3B0aW9uczxUID0gYW55LCBVc2VyID0gYW55LCBSZXF1ZXN0ID0gYW55PiB7XG4gICAgdmFsdWU6IFQ7XG4gICAgdXNlcj86IFVzZXI7XG4gICAgcmVxdWVzdD86IFJlcXVlc3RcbiAgICBwYWdlOiBudW1iZXIgfCBudWxsO1xuICAgIHBhZ2VTaXplOiBudW1iZXIgfCBudWxsO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFNlbGVjdEZpbHRlckdldFJlc291cmNlT3B0aW9uczxVc2VyID0gYW55LCBSZXF1ZXN0ID0gYW55PiB7XG4gICAgaWQ6IG51bWJlciB8IHN0cmluZztcbiAgICB1c2VyPzogVXNlcjtcbiAgICByZXF1ZXN0PzogUmVxdWVzdFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIFNlbGVjdEZpbHRlckRlZmluaXRpb248VD4ge1xuICAgIHZhbHVlczogKHsgdmFsdWUsIHBhZ2UsIHBhZ2VTaXplLCB1c2VyLCByZXF1ZXN0IH06IFNlbGVjdEZpbHRlckdldFZhbHVlc09wdGlvbnMpID0+IFByb21pc2U8U2VsZWN0RmlsdGVyVmFsdWVbXT47XG4gICAgbGF6eUxvYWRpbmc/OiBib29sZWFuO1xuICAgIGdldFJlc291cmNlQnlJZD86ICh7IGlkLCB1c2VyLCByZXF1ZXN0IH06IFNlbGVjdEZpbHRlckdldFJlc291cmNlT3B0aW9ucykgPT4gUHJvbWlzZTxTZWxlY3RGaWx0ZXJWYWx1ZSB8IG51bGw+O1xufVxuXG5leHBvcnQgY2xhc3MgU2VsZWN0RmlsdGVyPFQ+IGV4dGVuZHMgRmlsdGVyIGltcGxlbWVudHMgU2VsZWN0RmlsdGVyRGVmaW5pdGlvbjxUPiB7XG4gICAgcHVibGljIHR5cGUgPSBGaWx0ZXJUeXBlLlNlbGVjdDtcbiAgICBwdWJsaWMgb3BlcmF0b3JzID0gWy4uLlNlbGVjdE9wZXJhdG9yc107XG4gICAgcHVibGljIHZhbHVlczogKHsgdmFsdWUsIHVzZXIsIHJlcXVlc3QgfTogU2VsZWN0RmlsdGVyR2V0VmFsdWVzT3B0aW9ucykgPT4gUHJvbWlzZTxTZWxlY3RGaWx0ZXJWYWx1ZVtdPjtcbiAgICBwdWJsaWMgZ2V0UmVzb3VyY2VCeUlkOiAoeyBpZCwgdXNlciwgcmVxdWVzdCB9OiBTZWxlY3RGaWx0ZXJHZXRSZXNvdXJjZU9wdGlvbnMpID0+IFByb21pc2U8U2VsZWN0RmlsdGVyVmFsdWUgfCBudWxsPjtcbiAgICBwdWJsaWMgbGF6eUxvYWRpbmc7XG5cbiAgICBjb25zdHJ1Y3RvcihkZWZpbml0aW9uOiBCYXNlRmlsdGVyRGVmaW5pdGlvbiAmIFNlbGVjdEZpbHRlckRlZmluaXRpb248VD4pIHtcbiAgICAgICAgc3VwZXIoZGVmaW5pdGlvbik7XG5cbiAgICAgICAgaWYgKHRoaXMubGF6eUxvYWRpbmcgPT09IHVuZGVmaW5lZCkge1xuICAgICAgICAgICAgdGhpcy5sYXp5TG9hZGluZyA9IHRydWU7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwdWJsaWMgYXN5bmMgZ2V0Q29uZmlnPFJlcXVlc3Q+KGtleTogc3RyaW5nLCByZXF1ZXN0OiBSZXF1ZXN0LCB1c2VyPzogRGF0YUZpbHRlclVzZXJNb2RlbCk6IFByb21pc2U8RmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbD4ge1xuICAgICAgICBjb25zdCBjb25maWcgPSBhd2FpdCBzdXBlci5nZXRDb25maWcoa2V5LCByZXF1ZXN0LCB1c2VyKTtcblxuICAgICAgICBpZiAoIWNvbmZpZykge1xuICAgICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgLi4uY29uZmlnLFxuICAgICAgICAgICAgdmFsdWVzOiB0aGlzLmxhenlMb2FkaW5nID8gW10gOiBhd2FpdCB0aGlzLnZhbHVlcyh7IHZhbHVlOiBudWxsLCB1c2VyLCByZXF1ZXN0LCBwYWdlOiBudWxsLCBwYWdlU2l6ZTogbnVsbCB9KSxcbiAgICAgICAgICAgIGxhenlMb2FkaW5nOiB0aGlzLmxhenlMb2FkaW5nXG4gICAgICAgIH07XG4gICAgfVxufVxuIl19

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

@@ -9,5 +9,5 @@ export declare class TextFilter extends Filter {
     operators: import("../operators").FilterOperatorTypes[];
     mask?: string;
     constructor(definition: TextFilterDefinition & BaseFilterDefinition);
-    getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel | null>;
+    getConfig<Request>(key: string, request: Request, user?: DataFilterUserModel): Promise<FilterBaseConfigurationModel>;
 }

package/lib/filter/filters/text.filter.js

@@ -26,4 +26,4 @@ class TextFilter extends filter_1.Filter {
 }
 exports.TextFilter = TextFilter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy90ZXh0LmZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxrQ0FBcUM7QUFDckMsNENBQStDO0FBQy9DLHFDQUF3RDtBQU14RCxNQUFhLFVBQVcsU0FBUSxlQUFNO0lBS2xDLFlBQVksVUFBdUQ7UUFDL0QsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBTGYsU0FBSSxHQUFHLGlCQUFVLENBQUMsSUFBSSxDQUFDO1FBQ3ZCLGNBQVMsR0FBRyxDQUFDLEdBQUcsMkJBQWUsQ0FBQyxDQUFDO0lBS3hDLENBQUM7SUFFTSxLQUFLLENBQUMsU0FBUyxDQUFVLEdBQVcsRUFBRSxPQUFnQixFQUFFLElBQTBCO1FBQ3JGLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ1osT0FBTyxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDOUM7UUFFRCxNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUV6RCxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1QsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE9BQU87WUFDSCxHQUFHLE1BQU07WUFDVixJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUk7U0FDakIsQ0FBQztJQUNOLENBQUM7Q0FDSjtBQXpCRCxnQ0F5QkMiLCJmaWxlIjoibGliL2ZpbHRlci9maWx0ZXJzL3RleHQuZmlsdGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGF0YUZpbHRlclVzZXJNb2RlbCwgRmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbCB9IGZyb20gXCIuLi8uLlwiO1xuaW1wb3J0IHsgRmlsdGVyVHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyBTdHJpbmdPcGVyYXRvcnMgfSBmcm9tIFwiLi4vb3BlcmF0b3JzXCI7XG5pbXBvcnQgeyBCYXNlRmlsdGVyRGVmaW5pdGlvbiwgRmlsdGVyIH0gZnJvbSBcIi4vZmlsdGVyXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgVGV4dEZpbHRlckRlZmluaXRpb24ge1xuICAgIG1hc2s/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjbGFzcyBUZXh0RmlsdGVyIGV4dGVuZHMgRmlsdGVyIHtcbiAgICBwdWJsaWMgdHlwZSA9IEZpbHRlclR5cGUuVGV4dDtcbiAgICBwdWJsaWMgb3BlcmF0b3JzID0gWy4uLlN0cmluZ09wZXJhdG9yc107XG4gICAgcHVibGljIG1hc2s/OiBzdHJpbmc7XG5cbiAgICBjb25zdHJ1Y3RvcihkZWZpbml0aW9uOiBUZXh0RmlsdGVyRGVmaW5pdGlvbiAmIEJhc2VGaWx0ZXJEZWZpbml0aW9uKSB7XG4gICAgICAgIHN1cGVyKGRlZmluaXRpb24pO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXRDb25maWc8UmVxdWVzdD4oa2V5OiBzdHJpbmcsIHJlcXVlc3Q6IFJlcXVlc3QsIHVzZXI/OiBEYXRhRmlsdGVyVXNlck1vZGVsKTogUHJvbWlzZTxGaWx0ZXJCYXNlQ29uZmlndXJhdGlvbk1vZGVsIHwgbnVsbD4ge1xuICAgICAgICBpZiAoIXRoaXMubWFzaykge1xuICAgICAgICAgICAgcmV0dXJuIHN1cGVyLmdldENvbmZpZyhrZXksIHJlcXVlc3QsIHVzZXIpO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgY29uZmlnID0gYXdhaXQgc3VwZXIuZ2V0Q29uZmlnKGtleSwgcmVxdWVzdCwgdXNlcik7XG5cbiAgICAgICAgaWYgKCFjb25maWcpIHtcbiAgICAgICAgICAgIHJldHVybiBudWxsO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIC4uLmNvbmZpZyxcbiAgICAgICAgICAgbWFzazogdGhpcy5tYXNrXG4gICAgICAgIH07XG4gICAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZmlsdGVycy90ZXh0LmZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxrQ0FBcUM7QUFDckMsNENBQStDO0FBQy9DLHFDQUF3RDtBQU14RCxNQUFhLFVBQVcsU0FBUSxlQUFNO0lBS2xDLFlBQVksVUFBdUQ7UUFDL0QsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBTGYsU0FBSSxHQUFHLGlCQUFVLENBQUMsSUFBSSxDQUFDO1FBQ3ZCLGNBQVMsR0FBRyxDQUFDLEdBQUcsMkJBQWUsQ0FBQyxDQUFDO0lBS3hDLENBQUM7SUFFTSxLQUFLLENBQUMsU0FBUyxDQUFVLEdBQVcsRUFBRSxPQUFnQixFQUFFLElBQTBCO1FBQ3JGLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ1osT0FBTyxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7U0FDOUM7UUFFRCxNQUFNLE1BQU0sR0FBRyxNQUFNLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztRQUV6RCxJQUFJLENBQUMsTUFBTSxFQUFFO1lBQ1QsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE9BQU87WUFDSCxHQUFHLE1BQU07WUFDVixJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUk7U0FDakIsQ0FBQztJQUNOLENBQUM7Q0FDSjtBQXpCRCxnQ0F5QkMiLCJmaWxlIjoibGliL2ZpbHRlci9maWx0ZXJzL3RleHQuZmlsdGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGF0YUZpbHRlclVzZXJNb2RlbCwgRmlsdGVyQmFzZUNvbmZpZ3VyYXRpb25Nb2RlbCB9IGZyb20gXCIuLi8uLlwiO1xuaW1wb3J0IHsgRmlsdGVyVHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyBTdHJpbmdPcGVyYXRvcnMgfSBmcm9tIFwiLi4vb3BlcmF0b3JzXCI7XG5pbXBvcnQgeyBCYXNlRmlsdGVyRGVmaW5pdGlvbiwgRmlsdGVyIH0gZnJvbSBcIi4vZmlsdGVyXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgVGV4dEZpbHRlckRlZmluaXRpb24ge1xuICAgIG1hc2s/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjbGFzcyBUZXh0RmlsdGVyIGV4dGVuZHMgRmlsdGVyIHtcbiAgICBwdWJsaWMgdHlwZSA9IEZpbHRlclR5cGUuVGV4dDtcbiAgICBwdWJsaWMgb3BlcmF0b3JzID0gWy4uLlN0cmluZ09wZXJhdG9yc107XG4gICAgcHVibGljIG1hc2s/OiBzdHJpbmc7XG5cbiAgICBjb25zdHJ1Y3RvcihkZWZpbml0aW9uOiBUZXh0RmlsdGVyRGVmaW5pdGlvbiAmIEJhc2VGaWx0ZXJEZWZpbml0aW9uKSB7XG4gICAgICAgIHN1cGVyKGRlZmluaXRpb24pO1xuICAgIH1cblxuICAgIHB1YmxpYyBhc3luYyBnZXRDb25maWc8UmVxdWVzdD4oa2V5OiBzdHJpbmcsIHJlcXVlc3Q6IFJlcXVlc3QsIHVzZXI/OiBEYXRhRmlsdGVyVXNlck1vZGVsKTogUHJvbWlzZTxGaWx0ZXJCYXNlQ29uZmlndXJhdGlvbk1vZGVsPiB7XG4gICAgICAgIGlmICghdGhpcy5tYXNrKSB7XG4gICAgICAgICAgICByZXR1cm4gc3VwZXIuZ2V0Q29uZmlnKGtleSwgcmVxdWVzdCwgdXNlcik7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBjb25maWcgPSBhd2FpdCBzdXBlci5nZXRDb25maWcoa2V5LCByZXF1ZXN0LCB1c2VyKTtcblxuICAgICAgICBpZiAoIWNvbmZpZykge1xuICAgICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgLi4uY29uZmlnLFxuICAgICAgICAgICBtYXNrOiB0aGlzLm1hc2tcbiAgICAgICAgfTtcbiAgICB9XG59XG4iXX0=

package/lib/filter/guards/filter-query.guard.js

@@ -20,16 +20,13 @@ let FilterQueryGuard = class FilterQueryGuard {
         this.option = option;
     }
     canActivate(context) {
-        var _a, _b;
+        var _a;
         const req = context.switchToHttp().getRequest();
         const body = req.body;
         if (!body) {
             return true;
         }
-        if (!((_a = body.page) === null || _a === void 0 ? void 0 : _a.size)) {
-            throw new common_1.BadRequestException(`You muste provide a page size ${this.option.maxPage}`);
-        }
-        if (((_b = body === null || body === void 0 ? void 0 : body.page) === null || _b === void 0 ? void 0 : _b.size) > this.option.maxPage) {
+        if (((_a = body === null || body === void 0 ? void 0 : body.page) === null || _a === void 0 ? void 0 : _a.size) > this.option.maxPage) {
             throw new common_1.BadRequestException(`Page size should be lower than ${this.option.maxPage}`);
         }
         return true;
@@ -42,4 +39,4 @@ FilterQueryGuard = __decorate([
 ], FilterQueryGuard);
 exports.FilterQueryGuard = FilterQueryGuard;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZ3VhcmRzL2ZpbHRlci1xdWVyeS5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBd0c7QUFDeEcsNkNBQStDO0FBS3hDLElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWdCO0lBQ3pCLFlBQTJDLE1BQTBCO1FBQTFCLFdBQU0sR0FBTixNQUFNLENBQW9CO0lBQUcsQ0FBQztJQUVsRSxXQUFXLENBQUMsT0FBeUI7O1FBQ3hDLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNoRCxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsSUFBd0IsQ0FBQztRQUMxQyxJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ1AsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELElBQUksQ0FBQyxDQUFBLE1BQUEsSUFBSSxDQUFDLElBQUksMENBQUUsSUFBSSxDQUFBLEVBQUU7WUFDbEIsTUFBTSxJQUFJLDRCQUFtQixDQUFDLGlDQUFpQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7U0FDekY7UUFFRCxJQUFJLENBQUEsTUFBQSxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsSUFBSSwwQ0FBRSxJQUFJLElBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUU7WUFDeEMsTUFBTSxJQUFJLDRCQUFtQixDQUFDLGtDQUFrQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUM7U0FDMUY7UUFFRCxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0NBQ0osQ0FBQTtBQXBCWSxnQkFBZ0I7SUFENUIsSUFBQSxtQkFBVSxHQUFFO0lBRUksV0FBQSxJQUFBLGVBQU0sRUFBQyx3QkFBYSxDQUFDLENBQUE7O0dBRHpCLGdCQUFnQixDQW9CNUI7QUFwQlksNENBQWdCIiwiZmlsZSI6ImxpYi9maWx0ZXIvZ3VhcmRzL2ZpbHRlci1xdWVyeS5ndWFyZC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEJhZFJlcXVlc3RFeGNlcHRpb24sIENhbkFjdGl2YXRlLCBFeGVjdXRpb25Db250ZXh0LCBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tIFwiQG5lc3Rqcy9jb21tb25cIjtcbmltcG9ydCB7IEZJTFRFUl9PUFRJT04gfSBmcm9tIFwiLi4vLi4vY29uc3RhbnRcIjtcbmltcG9ydCB7IEZpbHRlck9wdGlvbkNvbmZpZyB9IGZyb20gXCIuLi9maWx0ZXIuY29uZmlnXCI7XG5pbXBvcnQgeyBGaWx0ZXJRdWVyeU1vZGVsIH0gZnJvbSBcIi4uLy4uXCI7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBGaWx0ZXJRdWVyeUd1YXJkIGltcGxlbWVudHMgQ2FuQWN0aXZhdGUge1xuICAgIGNvbnN0cnVjdG9yKEBJbmplY3QoRklMVEVSX09QVElPTikgcHJpdmF0ZSBvcHRpb246IEZpbHRlck9wdGlvbkNvbmZpZykge31cblxuICAgIHB1YmxpYyBjYW5BY3RpdmF0ZShjb250ZXh0OiBFeGVjdXRpb25Db250ZXh0KTogYm9vbGVhbiB7XG4gICAgICAgIGNvbnN0IHJlcSA9IGNvbnRleHQuc3dpdGNoVG9IdHRwKCkuZ2V0UmVxdWVzdCgpO1xuICAgICAgICBjb25zdCBib2R5ID0gcmVxLmJvZHkgYXMgRmlsdGVyUXVlcnlNb2RlbDtcbiAgICAgICAgaWYgKCFib2R5KSB7XG4gICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICghYm9keS5wYWdlPy5zaXplKSB7XG4gICAgICAgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbihgWW91IG11c3RlIHByb3ZpZGUgYSBwYWdlIHNpemUgJHt0aGlzLm9wdGlvbi5tYXhQYWdlfWApO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKGJvZHk/LnBhZ2U/LnNpemUgPiB0aGlzLm9wdGlvbi5tYXhQYWdlKSB7XG4gICAgICAgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbihgUGFnZSBzaXplIHNob3VsZCBiZSBsb3dlciB0aGFuICR7dGhpcy5vcHRpb24ubWF4UGFnZX1gKTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvZ3VhcmRzL2ZpbHRlci1xdWVyeS5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBd0c7QUFDeEcsNkNBQStDO0FBS3hDLElBQU0sZ0JBQWdCLEdBQXRCLE1BQU0sZ0JBQWdCO0lBQ3pCLFlBQTJDLE1BQTBCO1FBQTFCLFdBQU0sR0FBTixNQUFNLENBQW9CO0lBQUcsQ0FBQztJQUVsRSxXQUFXLENBQUMsT0FBeUI7O1FBQ3hDLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNoRCxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsSUFBd0IsQ0FBQztRQUMxQyxJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ1AsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELElBQUksQ0FBQSxNQUFBLElBQUksYUFBSixJQUFJLHVCQUFKLElBQUksQ0FBRSxJQUFJLDBDQUFFLElBQUksSUFBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRTtZQUN4QyxNQUFNLElBQUksNEJBQW1CLENBQUMsa0NBQWtDLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztTQUMxRjtRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7Q0FDSixDQUFBO0FBaEJZLGdCQUFnQjtJQUQ1QixJQUFBLG1CQUFVLEdBQUU7SUFFSSxXQUFBLElBQUEsZUFBTSxFQUFDLHdCQUFhLENBQUMsQ0FBQTs7R0FEekIsZ0JBQWdCLENBZ0I1QjtBQWhCWSw0Q0FBZ0IiLCJmaWxlIjoibGliL2ZpbHRlci9ndWFyZHMvZmlsdGVyLXF1ZXJ5Lmd1YXJkLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQmFkUmVxdWVzdEV4Y2VwdGlvbiwgQ2FuQWN0aXZhdGUsIEV4ZWN1dGlvbkNvbnRleHQsIEluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gXCJAbmVzdGpzL2NvbW1vblwiO1xuaW1wb3J0IHsgRklMVEVSX09QVElPTiB9IGZyb20gXCIuLi8uLi9jb25zdGFudFwiO1xuaW1wb3J0IHsgRmlsdGVyT3B0aW9uQ29uZmlnIH0gZnJvbSBcIi4uL2ZpbHRlci5jb25maWdcIjtcbmltcG9ydCB7IEZpbHRlclF1ZXJ5TW9kZWwgfSBmcm9tIFwiLi4vLi5cIjtcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIEZpbHRlclF1ZXJ5R3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XG4gICAgY29uc3RydWN0b3IoQEluamVjdChGSUxURVJfT1BUSU9OKSBwcml2YXRlIG9wdGlvbjogRmlsdGVyT3B0aW9uQ29uZmlnKSB7fVxuXG4gICAgcHVibGljIGNhbkFjdGl2YXRlKGNvbnRleHQ6IEV4ZWN1dGlvbkNvbnRleHQpOiBib29sZWFuIHtcbiAgICAgICAgY29uc3QgcmVxID0gY29udGV4dC5zd2l0Y2hUb0h0dHAoKS5nZXRSZXF1ZXN0KCk7XG4gICAgICAgIGNvbnN0IGJvZHkgPSByZXEuYm9keSBhcyBGaWx0ZXJRdWVyeU1vZGVsO1xuICAgICAgICBpZiAoIWJvZHkpIHtcbiAgICAgICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgICB9XG5cbiAgICAgICAgaWYgKGJvZHk/LnBhZ2U/LnNpemUgPiB0aGlzLm9wdGlvbi5tYXhQYWdlKSB7XG4gICAgICAgICAgICB0aHJvdyBuZXcgQmFkUmVxdWVzdEV4Y2VwdGlvbihgUGFnZSBzaXplIHNob3VsZCBiZSBsb3dlciB0aGFuICR7dGhpcy5vcHRpb24ubWF4UGFnZX1gKTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbn1cbiJdfQ==