@recursyve/nestjs-data-filter 8.2.1 → 8.3.0

package/lib/adapters/access-control.adapter.d.ts

@@ -1,4 +1,4 @@
-import { Where } from "sequelize/types/lib/utils";
+import { Where } from "sequelize/types/utils";
 import { M } from "../sequelize.utils";
 export declare class AccessControlResources {
     all?: boolean;

package/lib/adapters/access-control.adapter.js

@@ -22,4 +22,4 @@ class AccessControlAdapter {
 }
 exports.AccessControlAdapter = AccessControlAdapter;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9hZGFwdGVycy9hY2Nlc3MtY29udHJvbC5hZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLE1BQWEsc0JBQXNCO0lBSy9CLFlBQW9CLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQW9EO1FBQ3JGLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2YsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztJQUN2QixDQUFDO0lBRU0sTUFBTSxDQUFDLEdBQUc7UUFDYixPQUFPLElBQUksc0JBQXNCLENBQUMsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRU0sTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFhO1FBQy9CLE9BQU8sSUFBSSxzQkFBc0IsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVNLE1BQU0sQ0FBQyxhQUFhLENBQUMsS0FBWTtRQUNwQyxPQUFPLElBQUksc0JBQXNCLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7Q0FDSjtBQXRCRCx3REFzQkM7QUFFRCxNQUFzQixvQkFBb0I7Q0FFekM7QUFGRCxvREFFQyIsImZpbGUiOiJsaWIvYWRhcHRlcnMvYWNjZXNzLWNvbnRyb2wuYWRhcHRlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFdoZXJlIH0gZnJvbSBcInNlcXVlbGl6ZS90eXBlcy9saWIvdXRpbHNcIjtcbmltcG9ydCB7IE0gfSBmcm9tIFwiLi4vc2VxdWVsaXplLnV0aWxzXCI7XG5cbmV4cG9ydCBjbGFzcyBBY2Nlc3NDb250cm9sUmVzb3VyY2VzIHtcbiAgICBwdWJsaWMgYWxsPzogYm9vbGVhbjtcbiAgICBwdWJsaWMgaWRzPzogbnVtYmVyW107XG4gICAgcHVibGljIHdoZXJlPzogV2hlcmU7XG5cbiAgICBwcml2YXRlIGNvbnN0cnVjdG9yKHsgYWxsLCBpZHMsIHdoZXJlIH06IHsgYWxsPzogYm9vbGVhbjsgaWRzPzogbnVtYmVyW107IHdoZXJlPzogV2hlcmUgfSkge1xuICAgICAgICB0aGlzLmFsbCA9IGFsbDtcbiAgICAgICAgdGhpcy5pZHMgPSBpZHM7XG4gICAgICAgIHRoaXMud2hlcmUgPSB3aGVyZTtcbiAgICB9XG5cbiAgICBwdWJsaWMgc3RhdGljIGFsbCgpOiBBY2Nlc3NDb250cm9sUmVzb3VyY2VzIHtcbiAgICAgICAgcmV0dXJuIG5ldyBBY2Nlc3NDb250cm9sUmVzb3VyY2VzKHsgYWxsOiB0cnVlIH0pO1xuICAgIH1cblxuICAgIHB1YmxpYyBzdGF0aWMgZnJvbUlkcyhpZHM6IG51bWJlcltdKTogQWNjZXNzQ29udHJvbFJlc291cmNlcyB7XG4gICAgICAgIHJldHVybiBuZXcgQWNjZXNzQ29udHJvbFJlc291cmNlcyh7IGlkcyB9KTtcbiAgICB9XG5cbiAgICBwdWJsaWMgc3RhdGljIGZyb21Db25kaXRpb24od2hlcmU6IFdoZXJlKTogQWNjZXNzQ29udHJvbFJlc291cmNlcyB7XG4gICAgICAgIHJldHVybiBuZXcgQWNjZXNzQ29udHJvbFJlc291cmNlcyh7IHdoZXJlIH0pO1xuICAgIH1cbn1cblxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIEFjY2Vzc0NvbnRyb2xBZGFwdGVyIHtcbiAgICBwdWJsaWMgYWJzdHJhY3QgZ2V0UmVzb3VyY2VzPFVzZXJzPihtb2RlbDogdHlwZW9mIE0sIHVzZXI6IFVzZXJzKTogUHJvbWlzZTxBY2Nlc3NDb250cm9sUmVzb3VyY2VzPjtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9hZGFwdGVycy9hY2Nlc3MtY29udHJvbC5hZGFwdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLE1BQWEsc0JBQXNCO0lBSy9CLFlBQW9CLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQW9EO1FBQ3JGLElBQUksQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2YsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztJQUN2QixDQUFDO0lBRU0sTUFBTSxDQUFDLEdBQUc7UUFDYixPQUFPLElBQUksc0JBQXNCLENBQUMsRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRU0sTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFhO1FBQy9CLE9BQU8sSUFBSSxzQkFBc0IsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVNLE1BQU0sQ0FBQyxhQUFhLENBQUMsS0FBWTtRQUNwQyxPQUFPLElBQUksc0JBQXNCLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7Q0FDSjtBQXRCRCx3REFzQkM7QUFFRCxNQUFzQixvQkFBb0I7Q0FFekM7QUFGRCxvREFFQyIsImZpbGUiOiJsaWIvYWRhcHRlcnMvYWNjZXNzLWNvbnRyb2wuYWRhcHRlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFdoZXJlIH0gZnJvbSBcInNlcXVlbGl6ZS90eXBlcy91dGlsc1wiO1xuaW1wb3J0IHsgTSB9IGZyb20gXCIuLi9zZXF1ZWxpemUudXRpbHNcIjtcblxuZXhwb3J0IGNsYXNzIEFjY2Vzc0NvbnRyb2xSZXNvdXJjZXMge1xuICAgIHB1YmxpYyBhbGw/OiBib29sZWFuO1xuICAgIHB1YmxpYyBpZHM/OiBudW1iZXJbXTtcbiAgICBwdWJsaWMgd2hlcmU/OiBXaGVyZTtcblxuICAgIHByaXZhdGUgY29uc3RydWN0b3IoeyBhbGwsIGlkcywgd2hlcmUgfTogeyBhbGw/OiBib29sZWFuOyBpZHM/OiBudW1iZXJbXTsgd2hlcmU/OiBXaGVyZSB9KSB7XG4gICAgICAgIHRoaXMuYWxsID0gYWxsO1xuICAgICAgICB0aGlzLmlkcyA9IGlkcztcbiAgICAgICAgdGhpcy53aGVyZSA9IHdoZXJlO1xuICAgIH1cblxuICAgIHB1YmxpYyBzdGF0aWMgYWxsKCk6IEFjY2Vzc0NvbnRyb2xSZXNvdXJjZXMge1xuICAgICAgICByZXR1cm4gbmV3IEFjY2Vzc0NvbnRyb2xSZXNvdXJjZXMoeyBhbGw6IHRydWUgfSk7XG4gICAgfVxuXG4gICAgcHVibGljIHN0YXRpYyBmcm9tSWRzKGlkczogbnVtYmVyW10pOiBBY2Nlc3NDb250cm9sUmVzb3VyY2VzIHtcbiAgICAgICAgcmV0dXJuIG5ldyBBY2Nlc3NDb250cm9sUmVzb3VyY2VzKHsgaWRzIH0pO1xuICAgIH1cblxuICAgIHB1YmxpYyBzdGF0aWMgZnJvbUNvbmRpdGlvbih3aGVyZTogV2hlcmUpOiBBY2Nlc3NDb250cm9sUmVzb3VyY2VzIHtcbiAgICAgICAgcmV0dXJuIG5ldyBBY2Nlc3NDb250cm9sUmVzb3VyY2VzKHsgd2hlcmUgfSk7XG4gICAgfVxufVxuXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgQWNjZXNzQ29udHJvbEFkYXB0ZXIge1xuICAgIHB1YmxpYyBhYnN0cmFjdCBnZXRSZXNvdXJjZXM8VXNlcnM+KG1vZGVsOiB0eXBlb2YgTSwgdXNlcjogVXNlcnMpOiBQcm9taXNlPEFjY2Vzc0NvbnRyb2xSZXNvdXJjZXM+O1xufVxuIl19

package/lib/decorators/attributes.decorator.d.ts

@@ -1,2 +1,2 @@
-import { ProjectionAlias } from "sequelize";
-export declare function Attributes(attributes?: (string | ProjectionAlias)[]): PropertyDecorator & ClassDecorator;
+import { FindAttributeOptions } from "sequelize";
+export declare function Attributes(attributes?: FindAttributeOptions): PropertyDecorator & ClassDecorator;

package/lib/decorators/attributes.decorator.js

@@ -21,4 +21,4 @@ function defineAttributesMetadata(target, propertyKey, options) {
     attributes_handler_1.AttributesHandler.saveAttribute(target, attribute);
 }
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9kZWNvcmF0b3JzL2F0dHJpYnV0ZXMuZGVjb3JhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHVFQUFtRTtBQUNuRSx5RUFBb0U7QUFFcEUsU0FBZ0IsVUFBVSxDQUFDLFVBQXlDO0lBQ2hFLE9BQU8sQ0FBQyxNQUFjLEVBQUUsV0FBb0IsRUFBRSxFQUFFO1FBQzVDLHdCQUF3QixDQUFDLE1BQU0sRUFBRSxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDOUQsQ0FBQyxDQUFDO0FBQ04sQ0FBQztBQUpELGdDQUlDO0FBRUQsU0FBUyx3QkFBd0IsQ0FBQyxNQUFjLEVBQUUsV0FBb0IsRUFBRSxPQUFzQztJQUMxRyxJQUFJLENBQUMsV0FBVyxFQUFFO1FBQ2QsTUFBTSxVQUFVLEdBQUcsdUNBQWlCLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzNELFVBQVUsQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEMsdUNBQWlCLENBQUMsY0FBYyxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsQ0FBQztRQUNyRCxPQUFPO0tBQ1Y7SUFFRCxNQUFNLFNBQVMsR0FBRyxzQ0FBaUIsQ0FBQyxZQUFZLENBQUMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3RFLFNBQVMsQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakMsc0NBQWlCLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQztBQUN2RCxDQUFDIiwiZmlsZSI6ImxpYi9kZWNvcmF0b3JzL2F0dHJpYnV0ZXMuZGVjb3JhdG9yLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUHJvamVjdGlvbkFsaWFzIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgQXR0cmlidXRlc0hhbmRsZXIgfSBmcm9tIFwiLi4vaGFuZGxlcnMvYXR0cmlidXRlcy5oYW5kbGVyXCI7XG5pbXBvcnQgeyBEYXRhRmlsdGVySGFuZGxlciB9IGZyb20gXCIuLi9oYW5kbGVycy9kYXRhLWZpbHRlci5oYW5kbGVyXCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBBdHRyaWJ1dGVzKGF0dHJpYnV0ZXM/OiAoc3RyaW5nIHwgUHJvamVjdGlvbkFsaWFzKVtdKTogUHJvcGVydHlEZWNvcmF0b3IgJiBDbGFzc0RlY29yYXRvciB7XG4gICAgcmV0dXJuICh0YXJnZXQ6IE9iamVjdCwgcHJvcGVydHlLZXk/OiBzdHJpbmcpID0+IHtcbiAgICAgICAgZGVmaW5lQXR0cmlidXRlc01ldGFkYXRhKHRhcmdldCwgcHJvcGVydHlLZXksIGF0dHJpYnV0ZXMpO1xuICAgIH07XG59XG5cbmZ1bmN0aW9uIGRlZmluZUF0dHJpYnV0ZXNNZXRhZGF0YSh0YXJnZXQ6IE9iamVjdCwgcHJvcGVydHlLZXk/OiBzdHJpbmcsIG9wdGlvbnM/OiAoc3RyaW5nIHwgUHJvamVjdGlvbkFsaWFzKVtdKSB7XG4gICAgaWYgKCFwcm9wZXJ0eUtleSkge1xuICAgICAgICBjb25zdCBkYXRhRmlsdGVyID0gRGF0YUZpbHRlckhhbmRsZXIuZ2V0RGF0YUZpbHRlcih0YXJnZXQpO1xuICAgICAgICBkYXRhRmlsdGVyLnNldEF0dHJpYnV0ZXMob3B0aW9ucyk7XG4gICAgICAgIERhdGFGaWx0ZXJIYW5kbGVyLnNhdmVEYXRhRmlsdGVyKHRhcmdldCwgZGF0YUZpbHRlcik7XG4gICAgICAgIHJldHVybjtcbiAgICB9XG5cbiAgICBjb25zdCBhdHRyaWJ1dGUgPSBBdHRyaWJ1dGVzSGFuZGxlci5nZXRBdHRyaWJ1dGUodGFyZ2V0LCBwcm9wZXJ0eUtleSk7XG4gICAgYXR0cmlidXRlLnNldEF0dHJpYnV0ZXMob3B0aW9ucyk7XG4gICAgQXR0cmlidXRlc0hhbmRsZXIuc2F2ZUF0dHJpYnV0ZSh0YXJnZXQsIGF0dHJpYnV0ZSk7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9kZWNvcmF0b3JzL2F0dHJpYnV0ZXMuZGVjb3JhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHVFQUFtRTtBQUNuRSx5RUFBb0U7QUFFcEUsU0FBZ0IsVUFBVSxDQUFDLFVBQWlDO0lBQ3hELE9BQU8sQ0FBQyxNQUFjLEVBQUUsV0FBb0IsRUFBRSxFQUFFO1FBQzVDLHdCQUF3QixDQUFDLE1BQU0sRUFBRSxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDOUQsQ0FBQyxDQUFDO0FBQ04sQ0FBQztBQUpELGdDQUlDO0FBRUQsU0FBUyx3QkFBd0IsQ0FBQyxNQUFjLEVBQUUsV0FBb0IsRUFBRSxPQUE4QjtJQUNsRyxJQUFJLENBQUMsV0FBVyxFQUFFO1FBQ2QsTUFBTSxVQUFVLEdBQUcsdUNBQWlCLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzNELFVBQVUsQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDbEMsdUNBQWlCLENBQUMsY0FBYyxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsQ0FBQztRQUNyRCxPQUFPO0tBQ1Y7SUFFRCxNQUFNLFNBQVMsR0FBRyxzQ0FBaUIsQ0FBQyxZQUFZLENBQUMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0lBQ3RFLFNBQVMsQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDakMsc0NBQWlCLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxTQUFTLENBQUMsQ0FBQztBQUN2RCxDQUFDIiwiZmlsZSI6ImxpYi9kZWNvcmF0b3JzL2F0dHJpYnV0ZXMuZGVjb3JhdG9yLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRmluZEF0dHJpYnV0ZU9wdGlvbnMgfSBmcm9tIFwic2VxdWVsaXplXCI7XG5pbXBvcnQgeyBBdHRyaWJ1dGVzSGFuZGxlciB9IGZyb20gXCIuLi9oYW5kbGVycy9hdHRyaWJ1dGVzLmhhbmRsZXJcIjtcbmltcG9ydCB7IERhdGFGaWx0ZXJIYW5kbGVyIH0gZnJvbSBcIi4uL2hhbmRsZXJzL2RhdGEtZmlsdGVyLmhhbmRsZXJcIjtcblxuZXhwb3J0IGZ1bmN0aW9uIEF0dHJpYnV0ZXMoYXR0cmlidXRlcz86IEZpbmRBdHRyaWJ1dGVPcHRpb25zKTogUHJvcGVydHlEZWNvcmF0b3IgJiBDbGFzc0RlY29yYXRvciB7XG4gICAgcmV0dXJuICh0YXJnZXQ6IE9iamVjdCwgcHJvcGVydHlLZXk/OiBzdHJpbmcpID0+IHtcbiAgICAgICAgZGVmaW5lQXR0cmlidXRlc01ldGFkYXRhKHRhcmdldCwgcHJvcGVydHlLZXksIGF0dHJpYnV0ZXMpO1xuICAgIH07XG59XG5cbmZ1bmN0aW9uIGRlZmluZUF0dHJpYnV0ZXNNZXRhZGF0YSh0YXJnZXQ6IE9iamVjdCwgcHJvcGVydHlLZXk/OiBzdHJpbmcsIG9wdGlvbnM/OiBGaW5kQXR0cmlidXRlT3B0aW9ucykge1xuICAgIGlmICghcHJvcGVydHlLZXkpIHtcbiAgICAgICAgY29uc3QgZGF0YUZpbHRlciA9IERhdGFGaWx0ZXJIYW5kbGVyLmdldERhdGFGaWx0ZXIodGFyZ2V0KTtcbiAgICAgICAgZGF0YUZpbHRlci5zZXRBdHRyaWJ1dGVzKG9wdGlvbnMpO1xuICAgICAgICBEYXRhRmlsdGVySGFuZGxlci5zYXZlRGF0YUZpbHRlcih0YXJnZXQsIGRhdGFGaWx0ZXIpO1xuICAgICAgICByZXR1cm47XG4gICAgfVxuXG4gICAgY29uc3QgYXR0cmlidXRlID0gQXR0cmlidXRlc0hhbmRsZXIuZ2V0QXR0cmlidXRlKHRhcmdldCwgcHJvcGVydHlLZXkpO1xuICAgIGF0dHJpYnV0ZS5zZXRBdHRyaWJ1dGVzKG9wdGlvbnMpO1xuICAgIEF0dHJpYnV0ZXNIYW5kbGVyLnNhdmVBdHRyaWJ1dGUodGFyZ2V0LCBhdHRyaWJ1dGUpO1xufVxuIl19

package/lib/filter/operators.d.ts

@@ -1,5 +1,5 @@
 import { WhereOptions } from "sequelize";
-import { Where } from "sequelize/types/lib/utils";
+import { Where } from "sequelize/types/utils";
 export declare enum FilterOperatorTypes {
     Equal = "equal",
     NotEqual = "not_equal",

package/lib/filter/operators.js

@@ -48,4 +48,4 @@ exports.DateOperators = [
 ];
 exports.NullOperators = [FilterOperatorTypes.IsNull, FilterOperatorTypes.IsNotNull];
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvb3BlcmF0b3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLElBQVksbUJBcUJYO0FBckJELFdBQVksbUJBQW1CO0lBQzNCLHNDQUFlLENBQUE7SUFDZiw2Q0FBc0IsQ0FBQTtJQUN0QixnQ0FBUyxDQUFBO0lBQ1QsdUNBQWdCLENBQUE7SUFDaEIsb0NBQWEsQ0FBQTtJQUNiLG9EQUE2QixDQUFBO0lBQzdCLDBDQUFtQixDQUFBO0lBQ25CLDBEQUFtQyxDQUFBO0lBQ25DLDBDQUFtQixDQUFBO0lBQ25CLGlEQUEwQixDQUFBO0lBQzFCLHlDQUFrQixDQUFBO0lBQ2xCLGdEQUF5QixDQUFBO0lBQ3pCLGlEQUEwQixDQUFBO0lBQzFCLHdEQUFpQyxDQUFBO0lBQ2pDLDZDQUFzQixDQUFBO0lBQ3RCLG9EQUE2QixDQUFBO0lBQzdCLDRDQUFxQixDQUFBO0lBQ3JCLG1EQUE0QixDQUFBO0lBQzVCLDJDQUFvQixDQUFBO0lBQ3BCLGtEQUEyQixDQUFBO0FBQy9CLENBQUMsRUFyQlcsbUJBQW1CLEdBQW5CLDJCQUFtQixLQUFuQiwyQkFBbUIsUUFxQjlCO0FBV1ksUUFBQSxlQUFlLEdBQTBCLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRW5HLFFBQUEsZUFBZSxHQUEwQjtJQUNsRCxtQkFBbUIsQ0FBQyxLQUFLO0lBQ3pCLG1CQUFtQixDQUFDLFFBQVE7SUFDNUIsbUJBQW1CLENBQUMsUUFBUTtJQUM1QixtQkFBbUIsQ0FBQyxVQUFVO0lBQzlCLG1CQUFtQixDQUFDLGFBQWE7SUFDakMsbUJBQW1CLENBQUMsUUFBUTtJQUM1QixtQkFBbUIsQ0FBQyxXQUFXO0NBQ2xDLENBQUM7QUFFVyxRQUFBLGVBQWUsR0FBMEI7SUFDbEQsR0FBRyx1QkFBZTtJQUNsQixtQkFBbUIsQ0FBQyxPQUFPO0lBQzNCLG1CQUFtQixDQUFDLGNBQWM7SUFDbEMsbUJBQW1CLENBQUMsSUFBSTtJQUN4QixtQkFBbUIsQ0FBQyxXQUFXO0NBQ2xDLENBQUM7QUFFVyxRQUFBLGFBQWEsR0FBMEI7SUFDaEQsR0FBRyx1QkFBZTtJQUNsQixtQkFBbUIsQ0FBQyxPQUFPO0lBQzNCLG1CQUFtQixDQUFDLFVBQVU7Q0FDakMsQ0FBQztBQUVXLFFBQUEsYUFBYSxHQUEwQixDQUFDLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxTQUFTLENBQUMsQ0FBQyIsImZpbGUiOiJsaWIvZmlsdGVyL29wZXJhdG9ycy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFdoZXJlT3B0aW9ucyB9IGZyb20gXCJzZXF1ZWxpemVcIjtcbmltcG9ydCB7IFdoZXJlIH0gZnJvbSBcInNlcXVlbGl6ZS90eXBlcy9saWIvdXRpbHNcIjtcblxuZXhwb3J0IGVudW0gRmlsdGVyT3BlcmF0b3JUeXBlcyB7XG4gICAgRXF1YWwgPSBcImVxdWFsXCIsXG4gICAgTm90RXF1YWwgPSBcIm5vdF9lcXVhbFwiLFxuICAgIEluID0gXCJpblwiLFxuICAgIE5vdEluID0gXCJub3RfaW5cIixcbiAgICBMZXNzID0gXCJsZXNzXCIsXG4gICAgTGVzc09yRXF1YWwgPSBcImxlc3Nfb3JfZXF1YWxcIixcbiAgICBHcmVhdGVyID0gXCJncmVhdGVyXCIsXG4gICAgR3JlYXRlck9yRXF1YWwgPSBcImdyZWF0ZXJfb3JfZXF1YWxcIixcbiAgICBCZXR3ZWVuID0gXCJiZXR3ZWVuXCIsXG4gICAgTm90QmV0d2VlbiA9IFwibm90X2JldHdlZW5cIixcbiAgICBJc051bGwgPSBcImlzX251bGxcIixcbiAgICBJc05vdE51bGwgPSBcImlzX25vdF9udWxsXCIsXG4gICAgQmVnaW5zV2l0aCA9IFwiYmVnaW5zX3dpdGhcIixcbiAgICBOb3RCZWdpbnNXaXRoID0gXCJub3RfYmVnaW5zX3dpdGhcIixcbiAgICBFbmRzV2l0aCA9IFwiZW5kc193aXRoXCIsXG4gICAgTm90RW5kc1dpdGggPSBcIm5vdF9lbmRzX3dpdGhcIixcbiAgICBDb250YWlucyA9IFwiY29udGFpbnNcIixcbiAgICBOb3RDb250YWlucyA9IFwibm90X2NvbnRhaW5zXCIsXG4gICAgSXNFbXB0eSA9IFwiaXNfZW1wdHlcIixcbiAgICBJc05vdEVtcHR5ID0gXCJpc19ub3RfZW1wdHlcIlxufVxuXG5leHBvcnQgaW50ZXJmYWNlIEN1c3RvbU9wZXJhdG9yIHtcbiAgICBuYW1lOiBzdHJpbmc7XG4gICAgd2hlcmU/OiBXaGVyZU9wdGlvbnMgfCAoKHZhbHVlOiBhbnkpID0+IFdoZXJlT3B0aW9ucyk7XG4gICAgaGF2aW5nPzogV2hlcmU7XG4gICAgb3BlcmF0b3I/OiBGaWx0ZXJPcGVyYXRvclR5cGVzO1xufVxuXG5leHBvcnQgdHlwZSBGaWx0ZXJPcGVyYXRvcnMgPSBGaWx0ZXJPcGVyYXRvclR5cGVzIHwgc3RyaW5nO1xuXG5leHBvcnQgY29uc3QgU2VsZWN0T3BlcmF0b3JzOiBGaWx0ZXJPcGVyYXRvclR5cGVzW10gPSBbRmlsdGVyT3BlcmF0b3JUeXBlcy5FcXVhbCwgRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RFcXVhbF07XG5cbmV4cG9ydCBjb25zdCBTdHJpbmdPcGVyYXRvcnM6IEZpbHRlck9wZXJhdG9yVHlwZXNbXSA9IFtcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkVxdWFsLFxuICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuTm90RXF1YWwsXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Db250YWlucyxcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkJlZ2luc1dpdGgsXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RCZWdpbnNXaXRoLFxuICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuRW5kc1dpdGgsXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RFbmRzV2l0aFxuXTtcblxuZXhwb3J0IGNvbnN0IE51bWJlck9wZXJhdG9yczogRmlsdGVyT3BlcmF0b3JUeXBlc1tdID0gW1xuICAgIC4uLlNlbGVjdE9wZXJhdG9ycyxcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkdyZWF0ZXIsXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5HcmVhdGVyT3JFcXVhbCxcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkxlc3MsXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5MZXNzT3JFcXVhbFxuXTtcblxuZXhwb3J0IGNvbnN0IERhdGVPcGVyYXRvcnM6IEZpbHRlck9wZXJhdG9yVHlwZXNbXSA9IFtcbiAgICAuLi5OdW1iZXJPcGVyYXRvcnMsXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5CZXR3ZWVuLFxuICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuTm90QmV0d2VlblxuXTtcblxuZXhwb3J0IGNvbnN0IE51bGxPcGVyYXRvcnM6IEZpbHRlck9wZXJhdG9yVHlwZXNbXSA9IFtGaWx0ZXJPcGVyYXRvclR5cGVzLklzTnVsbCwgRmlsdGVyT3BlcmF0b3JUeXBlcy5Jc05vdE51bGxdO1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvb3BlcmF0b3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLElBQVksbUJBcUJYO0FBckJELFdBQVksbUJBQW1CO0lBQzNCLHNDQUFlLENBQUE7SUFDZiw2Q0FBc0IsQ0FBQTtJQUN0QixnQ0FBUyxDQUFBO0lBQ1QsdUNBQWdCLENBQUE7SUFDaEIsb0NBQWEsQ0FBQTtJQUNiLG9EQUE2QixDQUFBO0lBQzdCLDBDQUFtQixDQUFBO0lBQ25CLDBEQUFtQyxDQUFBO0lBQ25DLDBDQUFtQixDQUFBO0lBQ25CLGlEQUEwQixDQUFBO0lBQzFCLHlDQUFrQixDQUFBO0lBQ2xCLGdEQUF5QixDQUFBO0lBQ3pCLGlEQUEwQixDQUFBO0lBQzFCLHdEQUFpQyxDQUFBO0lBQ2pDLDZDQUFzQixDQUFBO0lBQ3RCLG9EQUE2QixDQUFBO0lBQzdCLDRDQUFxQixDQUFBO0lBQ3JCLG1EQUE0QixDQUFBO0lBQzVCLDJDQUFvQixDQUFBO0lBQ3BCLGtEQUEyQixDQUFBO0FBQy9CLENBQUMsRUFyQlcsbUJBQW1CLEdBQW5CLDJCQUFtQixLQUFuQiwyQkFBbUIsUUFxQjlCO0FBV1ksUUFBQSxlQUFlLEdBQTBCLENBQUMsbUJBQW1CLENBQUMsS0FBSyxFQUFFLG1CQUFtQixDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRW5HLFFBQUEsZUFBZSxHQUEwQjtJQUNsRCxtQkFBbUIsQ0FBQyxLQUFLO0lBQ3pCLG1CQUFtQixDQUFDLFFBQVE7SUFDNUIsbUJBQW1CLENBQUMsUUFBUTtJQUM1QixtQkFBbUIsQ0FBQyxVQUFVO0lBQzlCLG1CQUFtQixDQUFDLGFBQWE7SUFDakMsbUJBQW1CLENBQUMsUUFBUTtJQUM1QixtQkFBbUIsQ0FBQyxXQUFXO0NBQ2xDLENBQUM7QUFFVyxRQUFBLGVBQWUsR0FBMEI7SUFDbEQsR0FBRyx1QkFBZTtJQUNsQixtQkFBbUIsQ0FBQyxPQUFPO0lBQzNCLG1CQUFtQixDQUFDLGNBQWM7SUFDbEMsbUJBQW1CLENBQUMsSUFBSTtJQUN4QixtQkFBbUIsQ0FBQyxXQUFXO0NBQ2xDLENBQUM7QUFFVyxRQUFBLGFBQWEsR0FBMEI7SUFDaEQsR0FBRyx1QkFBZTtJQUNsQixtQkFBbUIsQ0FBQyxPQUFPO0lBQzNCLG1CQUFtQixDQUFDLFVBQVU7Q0FDakMsQ0FBQztBQUVXLFFBQUEsYUFBYSxHQUEwQixDQUFDLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxTQUFTLENBQUMsQ0FBQyIsImZpbGUiOiJsaWIvZmlsdGVyL29wZXJhdG9ycy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFdoZXJlT3B0aW9ucyB9IGZyb20gXCJzZXF1ZWxpemVcIjtcbmltcG9ydCB7IFdoZXJlIH0gZnJvbSBcInNlcXVlbGl6ZS90eXBlcy91dGlsc1wiO1xuXG5leHBvcnQgZW51bSBGaWx0ZXJPcGVyYXRvclR5cGVzIHtcbiAgICBFcXVhbCA9IFwiZXF1YWxcIixcbiAgICBOb3RFcXVhbCA9IFwibm90X2VxdWFsXCIsXG4gICAgSW4gPSBcImluXCIsXG4gICAgTm90SW4gPSBcIm5vdF9pblwiLFxuICAgIExlc3MgPSBcImxlc3NcIixcbiAgICBMZXNzT3JFcXVhbCA9IFwibGVzc19vcl9lcXVhbFwiLFxuICAgIEdyZWF0ZXIgPSBcImdyZWF0ZXJcIixcbiAgICBHcmVhdGVyT3JFcXVhbCA9IFwiZ3JlYXRlcl9vcl9lcXVhbFwiLFxuICAgIEJldHdlZW4gPSBcImJldHdlZW5cIixcbiAgICBOb3RCZXR3ZWVuID0gXCJub3RfYmV0d2VlblwiLFxuICAgIElzTnVsbCA9IFwiaXNfbnVsbFwiLFxuICAgIElzTm90TnVsbCA9IFwiaXNfbm90X251bGxcIixcbiAgICBCZWdpbnNXaXRoID0gXCJiZWdpbnNfd2l0aFwiLFxuICAgIE5vdEJlZ2luc1dpdGggPSBcIm5vdF9iZWdpbnNfd2l0aFwiLFxuICAgIEVuZHNXaXRoID0gXCJlbmRzX3dpdGhcIixcbiAgICBOb3RFbmRzV2l0aCA9IFwibm90X2VuZHNfd2l0aFwiLFxuICAgIENvbnRhaW5zID0gXCJjb250YWluc1wiLFxuICAgIE5vdENvbnRhaW5zID0gXCJub3RfY29udGFpbnNcIixcbiAgICBJc0VtcHR5ID0gXCJpc19lbXB0eVwiLFxuICAgIElzTm90RW1wdHkgPSBcImlzX25vdF9lbXB0eVwiXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ3VzdG9tT3BlcmF0b3Ige1xuICAgIG5hbWU6IHN0cmluZztcbiAgICB3aGVyZT86IFdoZXJlT3B0aW9ucyB8ICgodmFsdWU6IGFueSkgPT4gV2hlcmVPcHRpb25zKTtcbiAgICBoYXZpbmc/OiBXaGVyZTtcbiAgICBvcGVyYXRvcj86IEZpbHRlck9wZXJhdG9yVHlwZXM7XG59XG5cbmV4cG9ydCB0eXBlIEZpbHRlck9wZXJhdG9ycyA9IEZpbHRlck9wZXJhdG9yVHlwZXMgfCBzdHJpbmc7XG5cbmV4cG9ydCBjb25zdCBTZWxlY3RPcGVyYXRvcnM6IEZpbHRlck9wZXJhdG9yVHlwZXNbXSA9IFtGaWx0ZXJPcGVyYXRvclR5cGVzLkVxdWFsLCBGaWx0ZXJPcGVyYXRvclR5cGVzLk5vdEVxdWFsXTtcblxuZXhwb3J0IGNvbnN0IFN0cmluZ09wZXJhdG9yczogRmlsdGVyT3BlcmF0b3JUeXBlc1tdID0gW1xuICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuRXF1YWwsXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RFcXVhbCxcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkNvbnRhaW5zLFxuICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuQmVnaW5zV2l0aCxcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLk5vdEJlZ2luc1dpdGgsXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5FbmRzV2l0aCxcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLk5vdEVuZHNXaXRoXG5dO1xuXG5leHBvcnQgY29uc3QgTnVtYmVyT3BlcmF0b3JzOiBGaWx0ZXJPcGVyYXRvclR5cGVzW10gPSBbXG4gICAgLi4uU2VsZWN0T3BlcmF0b3JzLFxuICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuR3JlYXRlcixcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkdyZWF0ZXJPckVxdWFsLFxuICAgIEZpbHRlck9wZXJhdG9yVHlwZXMuTGVzcyxcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkxlc3NPckVxdWFsXG5dO1xuXG5leHBvcnQgY29uc3QgRGF0ZU9wZXJhdG9yczogRmlsdGVyT3BlcmF0b3JUeXBlc1tdID0gW1xuICAgIC4uLk51bWJlck9wZXJhdG9ycyxcbiAgICBGaWx0ZXJPcGVyYXRvclR5cGVzLkJldHdlZW4sXG4gICAgRmlsdGVyT3BlcmF0b3JUeXBlcy5Ob3RCZXR3ZWVuXG5dO1xuXG5leHBvcnQgY29uc3QgTnVsbE9wZXJhdG9yczogRmlsdGVyT3BlcmF0b3JUeXBlc1tdID0gW0ZpbHRlck9wZXJhdG9yVHlwZXMuSXNOdWxsLCBGaWx0ZXJPcGVyYXRvclR5cGVzLklzTm90TnVsbF07XG4iXX0=

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

@@ -1,4 +1,4 @@
-import { Col, Fn, Literal } from "sequelize/types/lib/utils";
+import { Col, Fn, Literal } from "sequelize/types/utils";
 export declare type OrderItemColumn = string | Col | Fn | Literal;
 export interface BaseOrderRuleDefinition {
     attribute: string;

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

@@ -14,4 +14,4 @@ class OrderRule {
 }
 exports.OrderRule = OrderRule;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvb3JkZXItcnVsZXMvb3JkZXItcnVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFhQSxNQUFzQixTQUFTO0lBTTNCLFlBQXNCLFVBQW9DO1FBTGxELFVBQUssR0FBRyxZQUFZLENBQUM7UUFNekIsSUFBSSxVQUFVLEVBQUU7WUFDWixNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsQ0FBQztTQUNuQztJQUNMLENBQUM7SUFFTSxNQUFNLENBQUMsUUFBUSxDQUFDLFVBQW1DO1FBQ3RELE9BQU8sVUFBVSxDQUFDLE9BQU8sQ0FBQyxLQUFLLFlBQVksQ0FBQztJQUNoRCxDQUFDO0NBR0o7QUFqQkQsOEJBaUJDIiwiZmlsZSI6ImxpYi9maWx0ZXIvb3JkZXItcnVsZXMvb3JkZXItcnVsZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbCwgRm4sIExpdGVyYWwgfSBmcm9tIFwic2VxdWVsaXplL3R5cGVzL2xpYi91dGlsc1wiO1xuXG5leHBvcnQgdHlwZSBPcmRlckl0ZW1Db2x1bW4gPSBzdHJpbmcgfCBDb2wgfCBGbiB8IExpdGVyYWw7XG5cbmV4cG9ydCBpbnRlcmZhY2UgQmFzZU9yZGVyUnVsZURlZmluaXRpb24ge1xuICAgIGF0dHJpYnV0ZTogc3RyaW5nO1xuICAgIHBhdGg/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgT3JkZXJSdWxlRGVmaW5pdGlvbiBleHRlbmRzIEJhc2VPcmRlclJ1bGVEZWZpbml0aW9uIHtcbiAgICBnZXRPcmRlck9wdGlvbigpOiBPcmRlckl0ZW1Db2x1bW47XG59XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBPcmRlclJ1bGUgaW1wbGVtZW50cyBPcmRlclJ1bGVEZWZpbml0aW9uIHtcbiAgICBwcml2YXRlIF90eXBlID0gXCJvcmRlcl9ydWxlXCI7XG5cbiAgICBwdWJsaWMgYXR0cmlidXRlOiBzdHJpbmc7XG4gICAgcHVibGljIHBhdGg/OiBzdHJpbmc7XG5cbiAgICBwcm90ZWN0ZWQgY29uc3RydWN0b3IoZGVmaW5pdGlvbj86IEJhc2VPcmRlclJ1bGVEZWZpbml0aW9uKSB7XG4gICAgICAgIGlmIChkZWZpbml0aW9uKSB7XG4gICAgICAgICAgICBPYmplY3QuYXNzaWduKHRoaXMsIGRlZmluaXRpb24pO1xuICAgICAgICB9XG4gICAgfVxuXG4gICAgcHVibGljIHN0YXRpYyB2YWxpZGF0ZShkZWZpbml0aW9uOiBCYXNlT3JkZXJSdWxlRGVmaW5pdGlvbikge1xuICAgICAgICByZXR1cm4gZGVmaW5pdGlvbltcIl90eXBlXCJdID09PSBcIm9yZGVyX3J1bGVcIjtcbiAgICB9XG5cbiAgICBwdWJsaWMgYWJzdHJhY3QgZ2V0T3JkZXJPcHRpb24oKTogT3JkZXJJdGVtQ29sdW1uO1xufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9maWx0ZXIvb3JkZXItcnVsZXMvb3JkZXItcnVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFhQSxNQUFzQixTQUFTO0lBTTNCLFlBQXNCLFVBQW9DO1FBTGxELFVBQUssR0FBRyxZQUFZLENBQUM7UUFNekIsSUFBSSxVQUFVLEVBQUU7WUFDWixNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsQ0FBQztTQUNuQztJQUNMLENBQUM7SUFFTSxNQUFNLENBQUMsUUFBUSxDQUFDLFVBQW1DO1FBQ3RELE9BQU8sVUFBVSxDQUFDLE9BQU8sQ0FBQyxLQUFLLFlBQVksQ0FBQztJQUNoRCxDQUFDO0NBR0o7QUFqQkQsOEJBaUJDIiwiZmlsZSI6ImxpYi9maWx0ZXIvb3JkZXItcnVsZXMvb3JkZXItcnVsZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbCwgRm4sIExpdGVyYWwgfSBmcm9tIFwic2VxdWVsaXplL3R5cGVzL3V0aWxzXCI7XG5cbmV4cG9ydCB0eXBlIE9yZGVySXRlbUNvbHVtbiA9IHN0cmluZyB8IENvbCB8IEZuIHwgTGl0ZXJhbDtcblxuZXhwb3J0IGludGVyZmFjZSBCYXNlT3JkZXJSdWxlRGVmaW5pdGlvbiB7XG4gICAgYXR0cmlidXRlOiBzdHJpbmc7XG4gICAgcGF0aD86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBPcmRlclJ1bGVEZWZpbml0aW9uIGV4dGVuZHMgQmFzZU9yZGVyUnVsZURlZmluaXRpb24ge1xuICAgIGdldE9yZGVyT3B0aW9uKCk6IE9yZGVySXRlbUNvbHVtbjtcbn1cblxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIE9yZGVyUnVsZSBpbXBsZW1lbnRzIE9yZGVyUnVsZURlZmluaXRpb24ge1xuICAgIHByaXZhdGUgX3R5cGUgPSBcIm9yZGVyX3J1bGVcIjtcblxuICAgIHB1YmxpYyBhdHRyaWJ1dGU6IHN0cmluZztcbiAgICBwdWJsaWMgcGF0aD86IHN0cmluZztcblxuICAgIHByb3RlY3RlZCBjb25zdHJ1Y3RvcihkZWZpbml0aW9uPzogQmFzZU9yZGVyUnVsZURlZmluaXRpb24pIHtcbiAgICAgICAgaWYgKGRlZmluaXRpb24pIHtcbiAgICAgICAgICAgIE9iamVjdC5hc3NpZ24odGhpcywgZGVmaW5pdGlvbik7XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwdWJsaWMgc3RhdGljIHZhbGlkYXRlKGRlZmluaXRpb246IEJhc2VPcmRlclJ1bGVEZWZpbml0aW9uKSB7XG4gICAgICAgIHJldHVybiBkZWZpbml0aW9uW1wiX3R5cGVcIl0gPT09IFwib3JkZXJfcnVsZVwiO1xuICAgIH1cblxuICAgIHB1YmxpYyBhYnN0cmFjdCBnZXRPcmRlck9wdGlvbigpOiBPcmRlckl0ZW1Db2x1bW47XG59XG4iXX0=

package/lib/models/attributes.model.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AttributesConfig = void 0;
+const sequelize_utils_1 = require("../sequelize.utils");
 class AttributesConfig {
     constructor(key) {
         this.key = key;
@@ -56,10 +57,12 @@ class AttributesConfig {
     transformAttributesConfig(options) {
         const customAttributes = this.getCustomAttributes(options);
         if (this.attributes) {
-            return [
-                ...this.attributes,
-                ...customAttributes.map(x => x.attribute)
-            ];
+            if (this.customAttributes.length) {
+                return sequelize_utils_1.SequelizeUtils.ensureAttributesValidity(sequelize_utils_1.SequelizeUtils.mergeAttributes(this.attributes, {
+                    include: customAttributes.map(x => x.attribute)
+                }));
+            }
+            return sequelize_utils_1.SequelizeUtils.ensureAttributesValidity(this.attributes);
         }
         if (!this.attributes && customAttributes.length) {
             return {
@@ -136,4 +139,4 @@ class AttributesConfig {
 }
 exports.AttributesConfig = AttributesConfig;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/models/attributes.model.ts"],"names":[],"mappings":"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","file":"lib/models/attributes.model.js","sourcesContent":["import { FindAttributeOptions, Order, WhereOptions } from \"sequelize\";\nimport { IncludeConfig, IncludeModel, IncludeWhereModel } from \"./include.model\";\nimport { PathConfig, PathModel } from \"./path.model\";\nimport { CustomAttributesConfig, CustomAttributesModel } from \"./custom-attributes.model\";\n\nexport interface AttributesConfigModel {\n    key: string;\n    attributes?: FindAttributeOptions;\n    path?: PathConfig;\n    includes: IncludeConfig[];\n    customAttributes: CustomAttributesConfig[];\n}\n\nexport class AttributesConfig implements AttributesConfigModel {\n    public attributes?: FindAttributeOptions;\n    public searchableAttributes?: string[];\n    public path: PathConfig;\n    public includes: IncludeConfig[] = [];\n    public customAttributes: CustomAttributesConfig[] = [];\n    public ignoreInSearch = false;\n\n    constructor(public key: string) {\n        this.path = {\n            path: key,\n            paranoid: true\n        };\n    }\n\n    public setAttributes(attributes?: FindAttributeOptions) {\n        this.attributes = attributes;\n    }\n\n    public setSearchableAttributes(attributes: string[]) {\n        this.searchableAttributes = attributes;\n    }\n\n    public setPath(path: PathConfig) {\n        this.path = path;\n    }\n\n    public containsPath(path: string) {\n        return this.path?.path.startsWith(path);\n    }\n\n    public setIgnoreInPath(ignore: boolean) {\n        this.ignoreInSearch = ignore;\n    }\n\n    public setSeparate(): void {\n        this.path.separate = true;\n    }\n\n    public setOrder(order: Order): void {\n        this.path.order = order;\n    }\n\n    public addInclude(include: IncludeConfig) {\n        this.includes.push(include);\n    }\n\n    public addCustomAttribute(attribute: CustomAttributesConfig) {\n        this.customAttributes.push(attribute);\n    }\n\n    public transformPathConfig(options?: object): PathModel {\n        if (!options) {\n            const { where, ...path } = this.path;\n            return path as PathModel;\n        }\n\n        if (this.path.where) {\n            return {\n                ...this.path,\n                where: this.generateWhereConditions(this.path.where, options)\n            };\n        }\n\n        return this.path as PathModel;\n    }\n\n    public transformAttributesConfig(options?: object): FindAttributeOptions {\n        const customAttributes = this.getCustomAttributes(options);\n        if (this.attributes) {\n            return [\n                ...this.attributes as string[],\n                ...customAttributes.map(x => x.attribute)\n            ];\n        }\n        if (!this.attributes && customAttributes.length) {\n            return {\n                include: customAttributes.map(x => x.attribute)\n            };\n        }\n    }\n\n    public transformIncludesConfig(options?: object): IncludeModel[] {\n        return this.includes\n            .map(x => {\n                const customAttributes = this.getCustomAttributes(options, x.path);\n                if (!customAttributes.length) {\n                    return x;\n                }\n\n                if (x.attributes) {\n                    return {\n                        ...x,\n                        attributes: [...x.attributes as string[], ...customAttributes.map(a => a.attribute)]\n                    };\n                } else {\n                    return {\n                        ...x,\n                        attributes: {\n                            include: customAttributes.map(a => a.attribute)\n                        }\n                    };\n                }\n            })\n            .map(x => {\n                if (!options) {\n                    const { where, ...values } = x;\n                    return values;\n                }\n\n                if (!x.where) {\n                    return x;\n                }\n\n                return {\n                    ...x,\n                    where: this.generateWhereConditions(x.where, options)\n                };\n            });\n    }\n\n    public getCustomAttributes(options?: object, path?: string): CustomAttributesModel[] {\n        return this.customAttributes\n            .filter(x => x.config.path === path)\n            .map(x => ({\n                key: x.key,\n                attribute: x.transform(options, this.path.path),\n                path: (x.config as any).path ? {\n                    path: (x.config as any).path,\n                    paranoid: true\n                } : null\n            } as CustomAttributesModel))\n            .filter(x => x.attribute);\n    }\n\n    private generateWhereConditions(model: IncludeWhereModel, options?: object): WhereOptions {\n        const where = {};\n        const keys = [\n            ...Object.keys(model),\n            ...Object.getOwnPropertySymbols(model)\n        ];\n        for (const key of keys) {\n            if (!model.hasOwnProperty(key)) {\n                continue;\n            }\n\n            const value = model[key as any](options);\n            if (typeof value !== \"undefined\") {\n                where[key] = value;\n            }\n        }\n\n        return where;\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/models/attributes.model.ts"],"names":[],"mappings":"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","file":"lib/models/attributes.model.js","sourcesContent":["import { FindAttributeOptions, Order, WhereOptions } from \"sequelize\";\nimport { SequelizeUtils } from \"../sequelize.utils\";\nimport { IncludeConfig, IncludeModel, IncludeWhereModel } from \"./include.model\";\nimport { PathConfig, PathModel } from \"./path.model\";\nimport { CustomAttributesConfig, CustomAttributesModel } from \"./custom-attributes.model\";\n\nexport interface AttributesConfigModel {\n    key: string;\n    attributes?: FindAttributeOptions;\n    path?: PathConfig;\n    includes: IncludeConfig[];\n    customAttributes: CustomAttributesConfig[];\n}\n\nexport class AttributesConfig implements AttributesConfigModel {\n    public attributes?: FindAttributeOptions;\n    public searchableAttributes?: string[];\n    public path: PathConfig;\n    public includes: IncludeConfig[] = [];\n    public customAttributes: CustomAttributesConfig[] = [];\n    public ignoreInSearch = false;\n\n    constructor(public key: string) {\n        this.path = {\n            path: key,\n            paranoid: true\n        };\n    }\n\n    public setAttributes(attributes?: FindAttributeOptions) {\n        this.attributes = attributes;\n    }\n\n    public setSearchableAttributes(attributes: string[]) {\n        this.searchableAttributes = attributes;\n    }\n\n    public setPath(path: PathConfig) {\n        this.path = path;\n    }\n\n    public containsPath(path: string) {\n        return this.path?.path.startsWith(path);\n    }\n\n    public setIgnoreInPath(ignore: boolean) {\n        this.ignoreInSearch = ignore;\n    }\n\n    public setSeparate(): void {\n        this.path.separate = true;\n    }\n\n    public setOrder(order: Order): void {\n        this.path.order = order;\n    }\n\n    public addInclude(include: IncludeConfig) {\n        this.includes.push(include);\n    }\n\n    public addCustomAttribute(attribute: CustomAttributesConfig) {\n        this.customAttributes.push(attribute);\n    }\n\n    public transformPathConfig(options?: object): PathModel {\n        if (!options) {\n            const { where, ...path } = this.path;\n            return path as PathModel;\n        }\n\n        if (this.path.where) {\n            return {\n                ...this.path,\n                where: this.generateWhereConditions(this.path.where, options)\n            };\n        }\n\n        return this.path as PathModel;\n    }\n\n    public transformAttributesConfig(options?: object): FindAttributeOptions {\n        const customAttributes = this.getCustomAttributes(options);\n        if (this.attributes) {\n            if (this.customAttributes.length) {\n                return SequelizeUtils.ensureAttributesValidity(\n                    SequelizeUtils.mergeAttributes(this.attributes, {\n                        include: customAttributes.map(x => x.attribute)\n                    })\n                );\n            }\n\n            return SequelizeUtils.ensureAttributesValidity(this.attributes);\n        }\n        if (!this.attributes && customAttributes.length) {\n            return {\n                include: customAttributes.map(x => x.attribute)\n            };\n        }\n    }\n\n    public transformIncludesConfig(options?: object): IncludeModel[] {\n        return this.includes\n            .map(x => {\n                const customAttributes = this.getCustomAttributes(options, x.path);\n                if (!customAttributes.length) {\n                    return x;\n                }\n\n                if (x.attributes) {\n                    return {\n                        ...x,\n                        attributes: [...x.attributes as string[], ...customAttributes.map(a => a.attribute)]\n                    };\n                } else {\n                    return {\n                        ...x,\n                        attributes: {\n                            include: customAttributes.map(a => a.attribute)\n                        }\n                    };\n                }\n            })\n            .map(x => {\n                if (!options) {\n                    const { where, ...values } = x;\n                    return values;\n                }\n\n                if (!x.where) {\n                    return x;\n                }\n\n                return {\n                    ...x,\n                    where: this.generateWhereConditions(x.where, options)\n                };\n            });\n    }\n\n    public getCustomAttributes(options?: object, path?: string): CustomAttributesModel[] {\n        return this.customAttributes\n            .filter(x => x.config.path === path)\n            .map(x => ({\n                key: x.key,\n                attribute: x.transform(options, this.path.path),\n                path: (x.config as any).path ? {\n                    path: (x.config as any).path,\n                    paranoid: true\n                } : null\n            } as CustomAttributesModel))\n            .filter(x => x.attribute);\n    }\n\n    private generateWhereConditions(model: IncludeWhereModel, options?: object): WhereOptions {\n        const where = {};\n        const keys = [\n            ...Object.keys(model),\n            ...Object.getOwnPropertySymbols(model)\n        ];\n        for (const key of keys) {\n            if (!model.hasOwnProperty(key)) {\n                continue;\n            }\n\n            const value = model[key as any](options);\n            if (typeof value !== \"undefined\") {\n                where[key] = value;\n            }\n        }\n\n        return where;\n    }\n}\n"]}

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

@@ -28,11 +28,12 @@ class DataFilterConfig {
     transformAttributesConfig(options) {
         const customAttributes = this.getCustomAttributes(options);
         if (this.attributes) {
-            return [
-                "id",
-                ...this.attributes,
-                ...customAttributes.map(x => x.attribute)
-            ];
+            if (this.customAttributes.length) {
+                return sequelize_utils_1.SequelizeUtils.ensureAttributesValidity(sequelize_utils_1.SequelizeUtils.mergeAttributes(this.attributes, {
+                    include: customAttributes.map(x => x.attribute)
+                }));
+            }
+            return sequelize_utils_1.SequelizeUtils.ensureAttributesValidity(this.attributes);
         }
         if (!this.attributes && customAttributes.length) {
             return {
@@ -78,4 +79,4 @@ class DataFilterConfig {
 }
 exports.DataFilterConfig = DataFilterConfig;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvZGF0YS1maWx0ZXIubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEsd0RBQXVEO0FBU3ZELE1BQWEsZ0JBQWdCO0lBQTdCO1FBS1cscUJBQWdCLEdBQTZCLEVBQUUsQ0FBQztRQUNoRCxtQkFBYyxHQUFHLEtBQUssQ0FBQztJQWdGbEMsQ0FBQztJQTlFVSxRQUFRLENBQUMsS0FBbUI7UUFDL0IsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7SUFDdkIsQ0FBQztJQUVNLGVBQWUsQ0FBQyxNQUFlO1FBQ2xDLElBQUksQ0FBQyxjQUFjLEdBQUcsTUFBTSxDQUFDO0lBQ2pDLENBQUM7SUFFTSxhQUFhLENBQUMsVUFBaUM7UUFDbEQsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7SUFDakMsQ0FBQztJQUVNLHVCQUF1QixDQUFDLFVBQW9CO1FBQy9DLElBQUksQ0FBQyxvQkFBb0IsR0FBRyxVQUFVLENBQUM7SUFDM0MsQ0FBQztJQUVNLGdCQUFnQixDQUFDLGFBQXVCO1FBQzNDLElBQUksQ0FBQyxhQUFhLEdBQUcsYUFBYSxDQUFDO0lBQ3ZDLENBQUM7SUFFTSxrQkFBa0IsQ0FBQyxTQUFpQztRQUN2RCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFTSx5QkFBeUIsQ0FBQyxPQUFnQjtRQUM3QyxNQUFNLGdCQUFnQixHQUFHLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMzRCxJQUFJLElBQUksQ0FBQyxVQUFVLEVBQUU7WUFDakIsT0FBTztnQkFDSCxJQUFJO2dCQUNKLEdBQUksSUFBSSxDQUFDLFVBQXVCO2dCQUNoQyxHQUFHLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7YUFDNUMsQ0FBQztTQUNMO1FBQ0QsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLElBQUksZ0JBQWdCLENBQUMsTUFBTSxFQUFFO1lBQzdDLE9BQU87Z0JBQ0gsT0FBTyxFQUFFLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7YUFDbEQsQ0FBQztTQUNMO0lBQ0wsQ0FBQztJQUVNLG1CQUFtQixDQUFDLE9BQWdCO1FBQ3ZDLE9BQU8sSUFBSSxDQUFDLGdCQUFnQjthQUN2QixHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ1AsR0FBRyxFQUFFLENBQUMsQ0FBQyxHQUFHO1lBQ1YsU0FBUyxFQUFFLENBQUMsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDO1lBQy9CLElBQUksRUFBRyxDQUFDLENBQUMsTUFBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQzNCLElBQUksRUFBRyxDQUFDLENBQUMsTUFBYyxDQUFDLElBQUk7Z0JBQzVCLFFBQVEsRUFBRSxJQUFJO2FBQ2pCLENBQUMsQ0FBQyxDQUFDLElBQUk7U0FDZSxDQUFBLENBQUM7YUFDM0IsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFTSwyQkFBMkI7UUFDOUIsT0FBTyxJQUFJLENBQUMsZ0JBQWdCO2FBQ3ZCLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDO2FBQzFCLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDUCxVQUFVLEVBQUUsRUFBRTtZQUNkLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUk7WUFDbkIsUUFBUSxFQUFFLElBQUk7U0FDakIsQ0FBQyxDQUFDLENBQUM7SUFDWixDQUFDO0lBRU0sdUJBQXVCOztRQUMxQixJQUFJLElBQUksQ0FBQyxjQUFjLEVBQUU7WUFDckIsT0FBTyxFQUFFLENBQUM7U0FDYjtRQUVELElBQUksSUFBSSxDQUFDLG9CQUFvQixFQUFFO1lBQzNCLE9BQU8sZ0NBQWMsQ0FBQyxpQ0FBaUMsQ0FBQyxJQUFJLENBQUMsS0FBaUIsRUFBRSxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQztTQUM5RztRQUVELE1BQU0sb0JBQW9CLEdBQUcsZ0NBQWMsQ0FBQyw0QkFBNEIsQ0FBQyxJQUFJLENBQUMsS0FBaUIsQ0FBQyxDQUFDO1FBQ2pHLE1BQU0sVUFBVSxHQUFHLGdDQUFjLENBQUMsaUNBQWlDLENBQUMsSUFBSSxDQUFDLEtBQWlCLEVBQUUsTUFBQSxJQUFJLENBQUMsVUFBc0IsbUNBQUksRUFBRSxDQUFDLENBQUM7UUFDL0gsT0FBTyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDdEIsTUFBQyxVQUF1QiwwQ0FBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3RGLG9CQUFvQixDQUFDO0lBQzdCLENBQUM7Q0FDSjtBQXRGRCw0Q0FzRkMiLCJmaWxlIjoibGliL21vZGVscy9kYXRhLWZpbHRlci5tb2RlbC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEZpbmRBdHRyaWJ1dGVPcHRpb25zIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgTW9kZWwgfSBmcm9tIFwic2VxdWVsaXplLXR5cGVzY3JpcHRcIjtcbmltcG9ydCB7IEN1c3RvbUF0dHJpYnV0ZXNDb25maWcsIEN1c3RvbUF0dHJpYnV0ZXNNb2RlbCB9IGZyb20gXCIuL2N1c3RvbS1hdHRyaWJ1dGVzLm1vZGVsXCI7XG5pbXBvcnQgeyBJbmNsdWRlQ29uZmlnIH0gZnJvbSBcIi4vaW5jbHVkZS5tb2RlbFwiO1xuaW1wb3J0IHsgTSwgU2VxdWVsaXplVXRpbHMgfSBmcm9tIFwiLi4vc2VxdWVsaXplLnV0aWxzXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGF0YUZpbHRlckNvbmZpZ01vZGVsIHtcbiAgICBtb2RlbDogdHlwZW9mIE1vZGVsO1xuICAgIGF0dHJpYnV0ZXM/OiBGaW5kQXR0cmlidXRlT3B0aW9ucztcbiAgICBleHBvcnRDb2x1bW5zPzogc3RyaW5nW107XG4gICAgY3VzdG9tQXR0cmlidXRlczogQ3VzdG9tQXR0cmlidXRlc0NvbmZpZ1tdO1xufVxuXG5leHBvcnQgY2xhc3MgRGF0YUZpbHRlckNvbmZpZyBpbXBsZW1lbnRzIERhdGFGaWx0ZXJDb25maWdNb2RlbCB7XG4gICAgcHVibGljIG1vZGVsOiB0eXBlb2YgTW9kZWw7XG4gICAgcHVibGljIGF0dHJpYnV0ZXM/OiBGaW5kQXR0cmlidXRlT3B0aW9ucztcbiAgICBwdWJsaWMgc2VhcmNoYWJsZUF0dHJpYnV0ZXM/OiBzdHJpbmdbXTtcbiAgICBwdWJsaWMgZXhwb3J0Q29sdW1ucz86IHN0cmluZ1tdO1xuICAgIHB1YmxpYyBjdXN0b21BdHRyaWJ1dGVzOiBDdXN0b21BdHRyaWJ1dGVzQ29uZmlnW10gPSBbXTtcbiAgICBwdWJsaWMgaWdub3JlSW5TZWFyY2ggPSBmYWxzZTtcblxuICAgIHB1YmxpYyBzZXRNb2RlbChtb2RlbDogdHlwZW9mIE1vZGVsKSB7XG4gICAgICAgIHRoaXMubW9kZWwgPSBtb2RlbDtcbiAgICB9XG5cbiAgICBwdWJsaWMgc2V0SWdub3JlSW5QYXRoKGlnbm9yZTogYm9vbGVhbikge1xuICAgICAgICB0aGlzLmlnbm9yZUluU2VhcmNoID0gaWdub3JlO1xuICAgIH1cblxuICAgIHB1YmxpYyBzZXRBdHRyaWJ1dGVzKGF0dHJpYnV0ZXM/OiBGaW5kQXR0cmlidXRlT3B0aW9ucykge1xuICAgICAgICB0aGlzLmF0dHJpYnV0ZXMgPSBhdHRyaWJ1dGVzO1xuICAgIH1cblxuICAgIHB1YmxpYyBzZXRTZWFyY2hhYmxlQXR0cmlidXRlcyhhdHRyaWJ1dGVzOiBzdHJpbmdbXSkge1xuICAgICAgICB0aGlzLnNlYXJjaGFibGVBdHRyaWJ1dGVzID0gYXR0cmlidXRlcztcbiAgICB9XG5cbiAgICBwdWJsaWMgc2V0RXhwb3J0Q29sdW1ucyhleHBvcnRDb2x1bW5zOiBzdHJpbmdbXSkge1xuICAgICAgICB0aGlzLmV4cG9ydENvbHVtbnMgPSBleHBvcnRDb2x1bW5zO1xuICAgIH1cblxuICAgIHB1YmxpYyBhZGRDdXN0b21BdHRyaWJ1dGUoYXR0cmlidXRlOiBDdXN0b21BdHRyaWJ1dGVzQ29uZmlnKSB7XG4gICAgICAgIHRoaXMuY3VzdG9tQXR0cmlidXRlcy5wdXNoKGF0dHJpYnV0ZSk7XG4gICAgfVxuXG4gICAgcHVibGljIHRyYW5zZm9ybUF0dHJpYnV0ZXNDb25maWcob3B0aW9ucz86IG9iamVjdCk6IEZpbmRBdHRyaWJ1dGVPcHRpb25zIHtcbiAgICAgICAgY29uc3QgY3VzdG9tQXR0cmlidXRlcyA9IHRoaXMuZ2V0Q3VzdG9tQXR0cmlidXRlcyhvcHRpb25zKTtcbiAgICAgICAgaWYgKHRoaXMuYXR0cmlidXRlcykge1xuICAgICAgICAgICAgcmV0dXJuIFtcbiAgICAgICAgICAgICAgICBcImlkXCIsXG4gICAgICAgICAgICAgICAgLi4uKHRoaXMuYXR0cmlidXRlcyBhcyBzdHJpbmdbXSksXG4gICAgICAgICAgICAgICAgLi4uY3VzdG9tQXR0cmlidXRlcy5tYXAoeCA9PiB4LmF0dHJpYnV0ZSlcbiAgICAgICAgICAgIF07XG4gICAgICAgIH1cbiAgICAgICAgaWYgKCF0aGlzLmF0dHJpYnV0ZXMgJiYgY3VzdG9tQXR0cmlidXRlcy5sZW5ndGgpIHtcbiAgICAgICAgICAgIHJldHVybiB7XG4gICAgICAgICAgICAgICAgaW5jbHVkZTogY3VzdG9tQXR0cmlidXRlcy5tYXAoeCA9PiB4LmF0dHJpYnV0ZSlcbiAgICAgICAgICAgIH07XG4gICAgICAgIH1cbiAgICB9XG5cbiAgICBwdWJsaWMgZ2V0Q3VzdG9tQXR0cmlidXRlcyhvcHRpb25zPzogb2JqZWN0KTogQ3VzdG9tQXR0cmlidXRlc01vZGVsW10ge1xuICAgICAgICByZXR1cm4gdGhpcy5jdXN0b21BdHRyaWJ1dGVzXG4gICAgICAgICAgICAubWFwKHggPT4gKHtcbiAgICAgICAgICAgICAgICBrZXk6IHgua2V5LFxuICAgICAgICAgICAgICAgIGF0dHJpYnV0ZTogeC50cmFuc2Zvcm0ob3B0aW9ucyksXG4gICAgICAgICAgICAgICAgcGF0aDogKHguY29uZmlnIGFzIGFueSkucGF0aCA/IHtcbiAgICAgICAgICAgICAgICAgICAgcGF0aDogKHguY29uZmlnIGFzIGFueSkucGF0aCxcbiAgICAgICAgICAgICAgICAgICAgcGFyYW5vaWQ6IHRydWVcbiAgICAgICAgICAgICAgICB9IDogbnVsbFxuICAgICAgICAgICAgfSBhcyBDdXN0b21BdHRyaWJ1dGVzTW9kZWwpKVxuICAgICAgICAgICAgLmZpbHRlcih4ID0+IHguYXR0cmlidXRlKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgZ2V0Q3VzdG9tQXR0cmlidXRlc0luY2x1ZGVzKCk6IEluY2x1ZGVDb25maWdbXSB7XG4gICAgICAgIHJldHVybiB0aGlzLmN1c3RvbUF0dHJpYnV0ZXNcbiAgICAgICAgICAgIC5maWx0ZXIoeCA9PiB4LmNvbmZpZy5wYXRoKVxuICAgICAgICAgICAgLm1hcCh4ID0+ICh7XG4gICAgICAgICAgICAgICAgYXR0cmlidXRlczogW10sXG4gICAgICAgICAgICAgICAgcGF0aDogeC5jb25maWcucGF0aCxcbiAgICAgICAgICAgICAgICBwYXJhbm9pZDogdHJ1ZVxuICAgICAgICAgICAgfSkpO1xuICAgIH1cblxuICAgIHB1YmxpYyBnZXRTZWFyY2hhYmxlQXR0cmlidXRlcygpOiBzdHJpbmdbXSB7XG4gICAgICAgIGlmICh0aGlzLmlnbm9yZUluU2VhcmNoKSB7XG4gICAgICAgICAgICByZXR1cm4gW107XG4gICAgICAgIH1cblxuICAgICAgICBpZiAodGhpcy5zZWFyY2hhYmxlQXR0cmlidXRlcykge1xuICAgICAgICAgICAgcmV0dXJuIFNlcXVlbGl6ZVV0aWxzLmdldE1vZGVsU2VhcmNoYWJsZUZpZWxkQXR0cmlidXRlcyh0aGlzLm1vZGVsIGFzIHR5cGVvZiBNLCB0aGlzLnNlYXJjaGFibGVBdHRyaWJ1dGVzKTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IHNlYXJjaGFibGVBdHRyaWJ1dGVzID0gU2VxdWVsaXplVXRpbHMuZ2V0TW9kZWxTZWFyY2hhYmxlQXR0cmlidXRlcyh0aGlzLm1vZGVsIGFzIHR5cGVvZiBNKTtcbiAgICAgICAgY29uc3QgYXR0cmlidXRlcyA9IFNlcXVlbGl6ZVV0aWxzLmdldE1vZGVsU2VhcmNoYWJsZUZpZWxkQXR0cmlidXRlcyh0aGlzLm1vZGVsIGFzIHR5cGVvZiBNLCB0aGlzLmF0dHJpYnV0ZXMgYXMgc3RyaW5nW10gPz8gW10pO1xuICAgICAgICByZXR1cm4gYXR0cmlidXRlcy5sZW5ndGggP1xuICAgICAgICAgICAgKGF0dHJpYnV0ZXMgYXMgc3RyaW5nW10pPy5maWx0ZXIoeCA9PiBzZWFyY2hhYmxlQXR0cmlidXRlcy5zb21lKGF0dHIgPT4gYXR0ciA9PT0geCkpIDpcbiAgICAgICAgICAgIHNlYXJjaGFibGVBdHRyaWJ1dGVzO1xuICAgIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/models/data-filter.model.ts"],"names":[],"mappings":"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","file":"lib/models/data-filter.model.js","sourcesContent":["import { FindAttributeOptions } from \"sequelize\";\nimport { Model } from \"sequelize-typescript\";\nimport { CustomAttributesConfig, CustomAttributesModel } from \"./custom-attributes.model\";\nimport { IncludeConfig } from \"./include.model\";\nimport { M, SequelizeUtils } from \"../sequelize.utils\";\n\nexport interface DataFilterConfigModel {\n    model: typeof Model;\n    attributes?: FindAttributeOptions;\n    exportColumns?: string[];\n    customAttributes: CustomAttributesConfig[];\n}\n\nexport class DataFilterConfig implements DataFilterConfigModel {\n    public model: typeof Model;\n    public attributes?: FindAttributeOptions;\n    public searchableAttributes?: string[];\n    public exportColumns?: string[];\n    public customAttributes: CustomAttributesConfig[] = [];\n    public ignoreInSearch = false;\n\n    public setModel(model: typeof Model) {\n        this.model = model;\n    }\n\n    public setIgnoreInPath(ignore: boolean) {\n        this.ignoreInSearch = ignore;\n    }\n\n    public setAttributes(attributes?: FindAttributeOptions) {\n        this.attributes = attributes;\n    }\n\n    public setSearchableAttributes(attributes: string[]) {\n        this.searchableAttributes = attributes;\n    }\n\n    public setExportColumns(exportColumns: string[]) {\n        this.exportColumns = exportColumns;\n    }\n\n    public addCustomAttribute(attribute: CustomAttributesConfig) {\n        this.customAttributes.push(attribute);\n    }\n\n    public transformAttributesConfig(options?: object): FindAttributeOptions {\n        const customAttributes = this.getCustomAttributes(options);\n        if (this.attributes) {\n            if (this.customAttributes.length) {\n                return SequelizeUtils.ensureAttributesValidity(\n                    SequelizeUtils.mergeAttributes(this.attributes, {\n                        include: customAttributes.map(x => x.attribute)\n                    })\n                );\n            }\n\n            return SequelizeUtils.ensureAttributesValidity(this.attributes);\n        }\n        if (!this.attributes && customAttributes.length) {\n            return {\n                include: customAttributes.map(x => x.attribute)\n            };\n        }\n    }\n\n    public getCustomAttributes(options?: object): CustomAttributesModel[] {\n        return this.customAttributes\n            .map(x => ({\n                key: x.key,\n                attribute: x.transform(options),\n                path: (x.config as any).path ? {\n                    path: (x.config as any).path,\n                    paranoid: true\n                } : null\n            } as CustomAttributesModel))\n            .filter(x => x.attribute);\n    }\n\n    public getCustomAttributesIncludes(): IncludeConfig[] {\n        return this.customAttributes\n            .filter(x => x.config.path)\n            .map(x => ({\n                attributes: [],\n                path: x.config.path,\n                paranoid: true\n            }));\n    }\n\n    public getSearchableAttributes(): string[] {\n        if (this.ignoreInSearch) {\n            return [];\n        }\n\n        if (this.searchableAttributes) {\n            return SequelizeUtils.getModelSearchableFieldAttributes(this.model as typeof M, this.searchableAttributes);\n        }\n\n        const searchableAttributes = SequelizeUtils.getModelSearchableAttributes(this.model as typeof M);\n        const attributes = SequelizeUtils.getModelSearchableFieldAttributes(this.model as typeof M, this.attributes as string[] ?? []);\n        return attributes.length ?\n            (attributes as string[])?.filter(x => searchableAttributes.some(attr => attr === x)) :\n            searchableAttributes;\n    }\n}\n"]}

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

@@ -37,7 +37,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
             }
         }
         if (attributes) {
-            includes[0].attributes = ignoreAttributes ? [] : sequelize_utils_1.SequelizeUtils.mergeAttributes(includes[0], { attributes: attributes });
+            includes[0].attributes = ignoreAttributes ? [] : sequelize_utils_1.SequelizeUtils.mergeAttributes(includes[0].attributes, attributes);
         }
         if (path.where) {
             includes[0].where = sequelize_utils_1.SequelizeUtils.mergeWhere(includes[0].where, path.where);
@@ -188,4 +188,4 @@ SequelizeModelScanner = __decorate([
 ], SequelizeModelScanner);
 exports.SequelizeModelScanner = SequelizeModelScanner;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/scanners/sequelize-model.scanner.ts"],"names":[],"mappings":"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","file":"lib/scanners/sequelize-model.scanner.js","sourcesContent":["import { Injectable } from \"@nestjs/common\";\nimport { TypeUtils } from \"@recursyve/nestjs-common\";\nimport { FindAttributeOptions, IncludeOptions, literal, Order } from \"sequelize\";\nimport { Association, BaseAssociation, getAssociations, Model } from \"sequelize-typescript\";\nimport { OrderModel } from \"..\";\nimport { IncludeModel } from \"..\";\nimport { PathModel } from \"../models/path.model\";\nimport { SearchAttributesModel } from \"../models/search-attributes.model\";\nimport { M, SequelizeUtils } from \"../sequelize.utils\";\n\n@Injectable()\nexport class SequelizeModelScanner {\n    public getIncludes(\n        model: typeof Model,\n        path: PathModel,\n        additionalIncludes: IncludeModel[],\n        attributes?: FindAttributeOptions,\n        ignoreAttributes = false\n    ): IncludeOptions[] {\n        const objects = path?.path?.split(\".\");\n        if (!objects?.length) {\n            return [];\n        }\n\n        const result: IncludeOptions[] = [];\n        let includes: IncludeOptions[] = result;\n        let i = 0;\n        for (const obj of objects) {\n            const association = this.findAssociation(model, obj);\n            includes.push({\n                as: association.getAs() as string,\n                model: association.getAssociatedClass(),\n                attributes: ignoreAttributes ? [] : undefined,\n                include: [],\n                required: false\n            });\n\n            if (i++ < objects.length - 1) {\n                model = includes[0].model as unknown as typeof Model;\n                includes = includes[0].include as IncludeOptions[];\n            }\n        }\n\n        if (attributes) {\n            includes[0].attributes = ignoreAttributes ? [] : SequelizeUtils.mergeAttributes(includes[0], { attributes: attributes });\n        }\n        if (path.where) {\n            includes[0].where = SequelizeUtils.mergeWhere(includes[0].where, path.where);\n            includes[0].required = !!path.required;\n        }\n        if (path.required) {\n            includes[0].required = true;\n        }\n\n        includes[0].paranoid = !!path.paranoid;\n        includes[0].separate = !!path.separate;\n        includes[0].order = path.order;\n\n        if (TypeUtils.isNotNullOrUndefined(path.subQuery)) {\n            includes[0].subQuery = path.subQuery;\n        }\n\n        const addIncludes: IncludeOptions[][] = [];\n        for (const include of additionalIncludes) {\n            addIncludes.push(\n                this.getIncludes(\n                    includes[0].model as unknown as typeof Model,\n                    {\n                        path: include.path,\n                        order: include.order,\n                        where: include.where,\n                        required: include.required,\n                        separate: include.separate,\n                        paranoid: include.paranoid,\n                        subQuery: include.subQuery\n                    },\n                    [],\n                    include.attributes,\n                    ignoreAttributes\n                )\n            );\n        }\n\n        includes[0].include.push(...SequelizeUtils.reduceIncludes(addIncludes, ignoreAttributes));\n\n        return result;\n    }\n\n    public getAttributes(\n        model: typeof Model,\n        path: PathModel,\n        additionalIncludes: IncludeModel[],\n        attributes?: FindAttributeOptions\n    ): SearchAttributesModel[] {\n        const objects = path.path.split(\".\");\n        if (!objects.length) {\n            return [];\n        }\n\n        const result: SearchAttributesModel[] = [];\n        for (const obj of objects) {\n            const association = this.findAssociation(model, obj);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n        }\n        attributes = attributes ?\n            SequelizeUtils.getModelSearchableFieldAttributes(model as typeof M, attributes as string[]) :\n            SequelizeUtils.getModelSearchableAttributes(model as typeof M);\n        result.push(\n            ...(attributes as string[]).map(a => ({\n                name: a,\n                key: SequelizeUtils.getAttributeFullName(a, path.path),\n                literalKey: SequelizeUtils.getLiteralFullName(a, path.path),\n                isJson: SequelizeUtils.isColumnJson(model as typeof M, a)\n            }))\n        );\n\n        for (const include of additionalIncludes) {\n            if (include.ignoreInSearch) {\n                continue;\n            }\n\n            result.push(\n                ...this.getAttributes(\n                    model as typeof Model,\n                    {\n                        path: include.path\n                    },\n                    [],\n                    include.searchableAttributes ?? include.attributes\n                ).map(a => ({\n                    name: a.name,\n                    key: SequelizeUtils.getAttributeFullName(a.name, [path.path, include.path].join(\".\")),\n                    literalKey: SequelizeUtils.getLiteralFullName(a.name, [path.path, include.path].join(\".\")),\n                    isJson: a.isJson\n                }))\n            );\n        }\n\n        return result;\n    }\n\n    public getOrder(model: typeof Model, orderObj: OrderModel): Order {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return;\n        }\n\n        const values = orderObj.column.split(\".\");\n        const column = values.pop();\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n        }\n        const col = SequelizeUtils.findColumnFieldName(model as typeof M, column);\n        let literalOrder = values.length ?\n            SequelizeUtils.getLiteralFullName(col, values) :\n            `\\`${model.name}\\`.\\`${col}\\``;\n        if (orderObj.nullLast && orderObj.direction === \"asc\") {\n            literalOrder = `-${literalOrder}`;\n            orderObj.direction = \"desc\";\n        }\n        if (orderObj.direction === \"desc\") {\n            literalOrder += ` DESC`;\n        }\n        return literal(literalOrder) as Order;\n    }\n\n    public getGroup(model: typeof Model, orderObj: OrderModel): string[] {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return;\n        }\n\n        const group: string[] = [];\n        const values = orderObj.column.split(\".\");\n        const column = values.pop();\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n            group.push(value);\n        }\n        return [\n            SequelizeUtils.getOrderFullName(\"id\", group),\n            SequelizeUtils.getOrderFullName(SequelizeUtils.findColumnFieldName(model as typeof M, column), group)\n        ];\n    }\n\n    public getOrderIncludes(model: typeof Model, orderObj: OrderModel): IncludeOptions[] {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return [];\n        }\n\n        const values = orderObj.column.split(\".\");\n        if (values.length <= 1) {\n            return [];\n        }\n\n        const column = values.pop();\n        const result: IncludeOptions[] = [];\n        let includes: IncludeOptions[] = result;\n        let i = 0;\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            includes.push({\n                as: association.getAs() as string,\n                model: association.getAssociatedClass(),\n                attributes: [],\n                include: [],\n                required: false,\n                through: association.getAssociation() === Association.BelongsToMany ? {\n                    attributes: []\n                } : undefined\n            });\n\n            if (i++ < values.length - 1) {\n                model = includes[0].model as unknown as typeof Model;\n                includes = includes[0].include as IncludeOptions[];\n            }\n        }\n\n        includes[0].attributes = [column];\n        return result;\n    }\n\n    private findAssociation(model: typeof Model, obj: string): BaseAssociation<any, any> {\n        const associations = getAssociations(model.prototype);\n\n        const association = associations.find(a => a.getAs() === obj);\n        if (!association) {\n            throw new Error(`Unable to load association for ${obj}`);\n        }\n        return association;\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/scanners/sequelize-model.scanner.ts"],"names":[],"mappings":"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","file":"lib/scanners/sequelize-model.scanner.js","sourcesContent":["import { Injectable } from \"@nestjs/common\";\nimport { TypeUtils } from \"@recursyve/nestjs-common\";\nimport { FindAttributeOptions, IncludeOptions, literal, Order } from \"sequelize\";\nimport { Association, BaseAssociation, getAssociations, Model } from \"sequelize-typescript\";\nimport { OrderModel } from \"..\";\nimport { IncludeModel } from \"..\";\nimport { PathModel } from \"../models/path.model\";\nimport { SearchAttributesModel } from \"../models/search-attributes.model\";\nimport { M, SequelizeUtils } from \"../sequelize.utils\";\n\n@Injectable()\nexport class SequelizeModelScanner {\n    public getIncludes(\n        model: typeof Model,\n        path: PathModel,\n        additionalIncludes: IncludeModel[],\n        attributes?: FindAttributeOptions,\n        ignoreAttributes = false\n    ): IncludeOptions[] {\n        const objects = path?.path?.split(\".\");\n        if (!objects?.length) {\n            return [];\n        }\n\n        const result: IncludeOptions[] = [];\n        let includes: IncludeOptions[] = result;\n        let i = 0;\n        for (const obj of objects) {\n            const association = this.findAssociation(model, obj);\n            includes.push({\n                as: association.getAs() as string,\n                model: association.getAssociatedClass(),\n                attributes: ignoreAttributes ? [] : undefined,\n                include: [],\n                required: false\n            });\n\n            if (i++ < objects.length - 1) {\n                model = includes[0].model as unknown as typeof Model;\n                includes = includes[0].include as IncludeOptions[];\n            }\n        }\n\n        if (attributes) {\n            includes[0].attributes = ignoreAttributes ? [] : SequelizeUtils.mergeAttributes(includes[0].attributes, attributes);\n        }\n        if (path.where) {\n            includes[0].where = SequelizeUtils.mergeWhere(includes[0].where, path.where);\n            includes[0].required = !!path.required;\n        }\n        if (path.required) {\n            includes[0].required = true;\n        }\n\n        includes[0].paranoid = !!path.paranoid;\n        includes[0].separate = !!path.separate;\n        includes[0].order = path.order;\n\n        if (TypeUtils.isNotNullOrUndefined(path.subQuery)) {\n            includes[0].subQuery = path.subQuery;\n        }\n\n        const addIncludes: IncludeOptions[][] = [];\n        for (const include of additionalIncludes) {\n            addIncludes.push(\n                this.getIncludes(\n                    includes[0].model as unknown as typeof Model,\n                    {\n                        path: include.path,\n                        order: include.order,\n                        where: include.where,\n                        required: include.required,\n                        separate: include.separate,\n                        paranoid: include.paranoid,\n                        subQuery: include.subQuery\n                    },\n                    [],\n                    include.attributes,\n                    ignoreAttributes\n                )\n            );\n        }\n\n        includes[0].include.push(...SequelizeUtils.reduceIncludes(addIncludes, ignoreAttributes));\n\n        return result;\n    }\n\n    public getAttributes(\n        model: typeof Model,\n        path: PathModel,\n        additionalIncludes: IncludeModel[],\n        attributes?: FindAttributeOptions\n    ): SearchAttributesModel[] {\n        const objects = path.path.split(\".\");\n        if (!objects.length) {\n            return [];\n        }\n\n        const result: SearchAttributesModel[] = [];\n        for (const obj of objects) {\n            const association = this.findAssociation(model, obj);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n        }\n        attributes = attributes ?\n            SequelizeUtils.getModelSearchableFieldAttributes(model as typeof M, attributes as string[]) :\n            SequelizeUtils.getModelSearchableAttributes(model as typeof M);\n        result.push(\n            ...(attributes as string[]).map(a => ({\n                name: a,\n                key: SequelizeUtils.getAttributeFullName(a, path.path),\n                literalKey: SequelizeUtils.getLiteralFullName(a, path.path),\n                isJson: SequelizeUtils.isColumnJson(model as typeof M, a)\n            }))\n        );\n\n        for (const include of additionalIncludes) {\n            if (include.ignoreInSearch) {\n                continue;\n            }\n\n            result.push(\n                ...this.getAttributes(\n                    model as typeof Model,\n                    {\n                        path: include.path\n                    },\n                    [],\n                    include.searchableAttributes ?? include.attributes\n                ).map(a => ({\n                    name: a.name,\n                    key: SequelizeUtils.getAttributeFullName(a.name, [path.path, include.path].join(\".\")),\n                    literalKey: SequelizeUtils.getLiteralFullName(a.name, [path.path, include.path].join(\".\")),\n                    isJson: a.isJson\n                }))\n            );\n        }\n\n        return result;\n    }\n\n    public getOrder(model: typeof Model, orderObj: OrderModel): Order {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return;\n        }\n\n        const values = orderObj.column.split(\".\");\n        const column = values.pop();\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n        }\n        const col = SequelizeUtils.findColumnFieldName(model as typeof M, column);\n        let literalOrder = values.length ?\n            SequelizeUtils.getLiteralFullName(col, values) :\n            `\\`${model.name}\\`.\\`${col}\\``;\n        if (orderObj.nullLast && orderObj.direction === \"asc\") {\n            literalOrder = `-${literalOrder}`;\n            orderObj.direction = \"desc\";\n        }\n        if (orderObj.direction === \"desc\") {\n            literalOrder += ` DESC`;\n        }\n        return literal(literalOrder) as Order;\n    }\n\n    public getGroup(model: typeof Model, orderObj: OrderModel): string[] {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return;\n        }\n\n        const group: string[] = [];\n        const values = orderObj.column.split(\".\");\n        const column = values.pop();\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            model = association.getAssociatedClass() as unknown as typeof Model;\n            group.push(value);\n        }\n        return [\n            SequelizeUtils.getOrderFullName(\"id\", group),\n            SequelizeUtils.getOrderFullName(SequelizeUtils.findColumnFieldName(model as typeof M, column), group)\n        ];\n    }\n\n    public getOrderIncludes(model: typeof Model, orderObj: OrderModel): IncludeOptions[] {\n        if (!orderObj || !orderObj.column || orderObj.direction === \"\") {\n            return [];\n        }\n\n        const values = orderObj.column.split(\".\");\n        if (values.length <= 1) {\n            return [];\n        }\n\n        const column = values.pop();\n        const result: IncludeOptions[] = [];\n        let includes: IncludeOptions[] = result;\n        let i = 0;\n        for (const value of values) {\n            const association = this.findAssociation(model, value);\n            includes.push({\n                as: association.getAs() as string,\n                model: association.getAssociatedClass(),\n                attributes: [],\n                include: [],\n                required: false,\n                through: association.getAssociation() === Association.BelongsToMany ? {\n                    attributes: []\n                } : undefined\n            });\n\n            if (i++ < values.length - 1) {\n                model = includes[0].model as unknown as typeof Model;\n                includes = includes[0].include as IncludeOptions[];\n            }\n        }\n\n        includes[0].attributes = [column];\n        return result;\n    }\n\n    private findAssociation(model: typeof Model, obj: string): BaseAssociation<any, any> {\n        const associations = getAssociations(model.prototype);\n\n        const association = associations.find(a => a.getAs() === obj);\n        if (!association) {\n            throw new Error(`Unable to load association for ${obj}`);\n        }\n        return association;\n    }\n}\n"]}

package/lib/sequelize.utils.d.ts

@@ -1,5 +1,6 @@
-import { FindAttributeOptions, Includeable, IncludeOptions, Order, WhereOptions, WhereValue } from "sequelize";
+import { FindAttributeOptions, Includeable, IncludeOptions, Order, WhereOptions } from "sequelize";
 import { Model } from "sequelize-typescript";
+import { WhereAttributeHashValue } from "sequelize/types/model";
 import { RuleModel } from "./filter";
 export interface GeoPoint {
     type: "point";
@@ -10,10 +11,11 @@ export declare class M extends Model {
 export declare class SequelizeUtils {
     static reduceIncludes(includes: IncludeOptions[][], ignoreAttributes?: boolean): Includeable[];
     static mergeIncludes(a?: IncludeOptions[], b?: IncludeOptions[], ignoreAttributes?: boolean): IncludeOptions[];
-    static mergeAttributes(a: IncludeOptions, b: IncludeOptions): FindAttributeOptions;
+    static mergeAttributes(a: FindAttributeOptions, b: FindAttributeOptions): FindAttributeOptions;
+    static ensureAttributesValidity(attribute: FindAttributeOptions): FindAttributeOptions;
     static mergeWhere(a: WhereOptions, b: WhereOptions): WhereOptions;
     static mergeOrder(a: Order, b: Order): Order;
-    static generateWhereValue(rule: RuleModel): WhereValue;
+    static generateWhereValue(rule: RuleModel): WhereAttributeHashValue<any>;
     static getAttributeFullName(attribute: string, path: string): string;
     static getLiteralFullName(attribute: string, path: string | string[]): string;
     static getOrderFullName(attribute: string, path: string[]): string;

package/lib/sequelize.utils.js

@@ -22,7 +22,7 @@ class SequelizeUtils {
             if (aChild) {
                 aChild.include = this.mergeIncludes((_a = aChild.include) !== null && _a !== void 0 ? _a : [], (_b = bChild.include) !== null && _b !== void 0 ? _b : [], ignoreAttributes);
                 if ((aChild.attributes || bChild.attributes) && !ignoreAttributes) {
-                    aChild.attributes = this.mergeAttributes(aChild, bChild);
+                    aChild.attributes = this.mergeAttributes(aChild.attributes, bChild.attributes);
                 }
                 const where = this.mergeWhere(aChild.where, bChild.where);
                 if (where) {
@@ -50,31 +50,31 @@ class SequelizeUtils {
         return a;
     }
     static mergeAttributes(a, b) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        if (a.attributes instanceof Array && b.attributes instanceof Array) {
-            return nestjs_common_1.ArrayUtils.uniqueValues([...a.attributes, ...b.attributes, "id"], x => x);
+        var _a, _b, _c, _d, _e, _f;
+        if (a instanceof Array && b instanceof Array) {
+            return nestjs_common_1.ArrayUtils.uniqueValues([...a, ...b, "id"], x => x);
         }
-        else if (a.attributes instanceof Array) {
-            return nestjs_common_1.ArrayUtils.uniqueValues([...a.attributes, "id"], x => x);
+        else if (a instanceof Array) {
+            return nestjs_common_1.ArrayUtils.uniqueValues([...a, "id"], x => x);
         }
-        else if (b.attributes instanceof Array) {
-            return nestjs_common_1.ArrayUtils.uniqueValues([...b.attributes, "id"], x => x);
+        else if (b instanceof Array) {
+            return nestjs_common_1.ArrayUtils.uniqueValues([...b, "id"], x => x);
         }
-        else if (a.attributes || b.attributes) {
-            const aAttributes = ((_a = a.attributes) !== null && _a !== void 0 ? _a : {});
-            const bAttributes = ((_b = b.attributes) !== null && _b !== void 0 ? _b : {});
+        else if (a || b) {
+            const aAttributes = (a !== null && a !== void 0 ? a : {});
+            const bAttributes = (b !== null && b !== void 0 ? b : {});
             const result = {};
-            if ((_c = aAttributes.include) === null || _c === void 0 ? void 0 : _c.length) {
+            if ((_a = aAttributes.include) === null || _a === void 0 ? void 0 : _a.length) {
                 result.include = [...aAttributes.include];
             }
-            if ((_d = bAttributes.include) === null || _d === void 0 ? void 0 : _d.length) {
-                result.include = [...((_e = result.include) !== null && _e !== void 0 ? _e : []), ...bAttributes.include];
+            if ((_b = bAttributes.include) === null || _b === void 0 ? void 0 : _b.length) {
+                result.include = [...((_c = result.include) !== null && _c !== void 0 ? _c : []), ...bAttributes.include];
             }
-            if ((_f = aAttributes.exclude) === null || _f === void 0 ? void 0 : _f.length) {
+            if ((_d = aAttributes.exclude) === null || _d === void 0 ? void 0 : _d.length) {
                 result.exclude = [...aAttributes.exclude];
             }
-            if ((_g = bAttributes.exclude) === null || _g === void 0 ? void 0 : _g.length) {
-                result.exclude = [...((_h = result.exclude) !== null && _h !== void 0 ? _h : []), ...bAttributes.exclude];
+            if ((_e = bAttributes.exclude) === null || _e === void 0 ? void 0 : _e.length) {
+                result.exclude = [...((_f = result.exclude) !== null && _f !== void 0 ? _f : []), ...bAttributes.exclude];
             }
             if (result.include) {
                 result.include = nestjs_common_1.ArrayUtils.uniqueValues(result.include, x => x);
@@ -89,6 +89,23 @@ class SequelizeUtils {
         }
         return undefined;
     }
+    static ensureAttributesValidity(attribute) {
+        if (attribute instanceof Array) {
+            if (attribute.find((x) => x === "id")) {
+                return attribute;
+            }
+            return [
+                "id",
+                ...attribute
+            ];
+        }
+        if (attribute.exclude) {
+            return {
+                exclude: attribute.exclude.filter((x) => x !== "id")
+            };
+        }
+        return attribute;
+    }
     static mergeWhere(a, b) {
         if (!a && !b) {
             return null;
@@ -254,4 +271,4 @@ class SequelizeUtils {
 }
 exports.SequelizeUtils = SequelizeUtils;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/sequelize.utils.ts"],"names":[],"mappings":"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","file":"lib/sequelize.utils.js","sourcesContent":["import { ArrayUtils, TypeUtils } from \"@recursyve/nestjs-common\";\nimport {\n    AbstractDataTypeConstructor,\n    FindAttributeOptions,\n    Includeable,\n    IncludeOptions,\n    Op,\n    Order,\n    OrderItem,\n    WhereOptions,\n    WhereValue\n} from \"sequelize\";\nimport { Model } from \"sequelize-typescript\";\nimport { RuleModel } from \"./filter\";\n\nexport interface GeoPoint {\n    type: \"point\",\n    coordinates: number[];\n}\n\nexport class M extends Model {}\n\nexport class SequelizeUtils {\n    public static reduceIncludes(includes: IncludeOptions[][], ignoreAttributes = false): Includeable[] {\n        let include: IncludeOptions[] = [];\n        for (const i of includes) {\n            include = this.mergeIncludes(include, i, ignoreAttributes);\n        }\n\n        return include;\n    }\n\n    public static mergeIncludes(a: IncludeOptions[] = [], b: IncludeOptions[] = [], ignoreAttributes = false) {\n        for (const bChild of b) {\n            const aChild = a.find(value => value.model === bChild.model && value.as === bChild.as);\n            if (aChild) {\n                aChild.include = this.mergeIncludes(\n                    (aChild.include as IncludeOptions[]) ?? [],\n                    (bChild.include as IncludeOptions[]) ?? [],\n                    ignoreAttributes\n                );\n                if ((aChild.attributes || bChild.attributes) && !ignoreAttributes) {\n                    aChild.attributes = this.mergeAttributes(aChild, bChild);\n                }\n                const where = this.mergeWhere(aChild.where, bChild.where);\n                if (where) {\n                    aChild.where = where;\n                }\n                const order = this.mergeOrder(aChild.order, bChild.order);\n                if (order) {\n                    aChild.order = order;\n                }\n                if (aChild.required || bChild.required) {\n                    aChild.required = true;\n                }\n                if (aChild.separate || bChild.separate) {\n                    aChild.separate = true;\n                }\n                aChild.paranoid = !(aChild.paranoid === false || bChild.paranoid === false);\n                if (TypeUtils.isNotNullOrUndefined(aChild.subQuery) || TypeUtils.isNotNullOrUndefined(bChild.subQuery)) {\n                    aChild.subQuery = aChild.subQuery ?? bChild.subQuery;\n                }\n            } else {\n                a.push(bChild);\n            }\n        }\n\n        return a;\n    }\n\n    public static mergeAttributes(a: IncludeOptions, b: IncludeOptions): FindAttributeOptions {\n        if (a.attributes instanceof Array && b.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...a.attributes, ...b.attributes, \"id\"], x => x);\n        } else if (a.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...a.attributes, \"id\"], x => x);\n        } else if (b.attributes instanceof Array) {\n            return ArrayUtils.uniqueValues([...b.attributes, \"id\"], x => x);\n        } else if (a.attributes || b.attributes) {\n            const aAttributes = (a.attributes ?? {}) as { include: string[]; exclude: string[] };\n            const bAttributes = (b.attributes ?? {}) as { include: string[]; exclude: string[] };\n            const result: { include?: string[]; exclude?: string[] } = {};\n\n            if (aAttributes.include?.length) {\n                result.include = [...aAttributes.include];\n            }\n            if (bAttributes.include?.length) {\n                result.include = [...(result.include ?? []), ...bAttributes.include];\n            }\n\n            if (aAttributes.exclude?.length) {\n                result.exclude = [...aAttributes.exclude];\n            }\n            if (bAttributes.exclude?.length) {\n                result.exclude = [...(result.exclude ?? []), ...bAttributes.exclude];\n            }\n\n            if (result.include) {\n                result.include = ArrayUtils.uniqueValues(result.include, x => x);\n            }\n            if (result.exclude) {\n                result.exclude = ArrayUtils.uniqueValues(result.exclude, x => x);\n            }\n\n            if (!result.include && !result.exclude) {\n                return undefined;\n            }\n\n            return result as FindAttributeOptions;\n        }\n        return undefined;\n    }\n\n    public static mergeWhere(a: WhereOptions, b: WhereOptions): WhereOptions {\n        if (!a && !b) {\n            return null;\n        }\n        return Object.assign(a ?? {}, b ?? {});\n    }\n\n    public static mergeOrder(a: Order, b: Order): Order {\n        if (!a && !b) {\n            return null;\n        }\n        if (a && !b) {\n            return a;\n        }\n        if (!a && b) {\n            return b;\n        }\n\n        const res: OrderItem[] = [];\n        if (a instanceof Array) {\n            res.push(...a);\n        } else {\n            res.push(a);\n        }\n        if (b instanceof Array) {\n            res.push(...b);\n        } else {\n            res.push(b);\n        }\n        return res;\n    }\n\n    public static generateWhereValue(rule: RuleModel): WhereValue {\n        switch (rule.operation) {\n            case \"equal\":\n                return rule.value as any;\n\n            case \"not_equal\":\n                return { [Op.ne]: rule.value };\n\n            case \"in\":\n                return { [Op.in]: rule.value as any[] };\n\n            case \"not_in\":\n                return { [Op.notIn]: rule.value as any[] };\n\n            case \"less\":\n                return { [Op.lt]: rule.value as any};\n\n            case \"less_or_equal\":\n                return { [Op.lte]: rule.value as any};\n\n            case \"greater\":\n                return { [Op.gt]: rule.value as any};\n\n            case \"greater_or_equal\":\n                return { [Op.gte]: rule.value as any};\n\n            case \"between\":\n                return { [Op.between]: rule.value as any };\n\n            case \"not_between\":\n                return { [Op.notBetween]: rule.value as any };\n\n            case \"is_null\":\n                return { [Op.eq]: null };\n\n            case \"is_not_null\":\n                return { [Op.ne]: null };\n\n            case \"begins_with\":\n                return { [Op.like]: `${rule.value}%` };\n\n            case \"not_begins_with\":\n                return { [Op.notLike]: `${rule.value}%` };\n\n            case \"contains\":\n                return { [Op.like]: `%${rule.value}%` };\n\n            case \"not_contains\":\n                return { [Op.notLike]: `%${rule.value}%` };\n\n            case \"ends_with\":\n                return { [Op.like]: `%${rule.value}` };\n\n            case \"not_ends_with\":\n                return { [Op.notLike]: `%${rule.value}` };\n\n            case \"is_empty\":\n                return \"\";\n\n            case \"is_not_empty\":\n                return { [Op.ne]: \"\" };\n        }\n    }\n\n    public static getAttributeFullName(attribute: string, path: string) {\n        return `$${path}.${attribute}$`;\n    }\n\n    public static getLiteralFullName(attribute: string, path: string | string[]) {\n        if (typeof path === \"string\") {\n            path = path.split(\".\");\n        }\n        return `\\`${path.join(\"->\")}\\`.\\`${attribute}\\``;\n    }\n\n    public static getOrderFullName(attribute: string, path: string[]) {\n        return `${path.join(\"->\")}.${attribute}`;\n    }\n\n    public static getModelSearchableAttributes(model: typeof M): string[] {\n        return Object.keys(model.rawAttributes).filter(\n            a => ![\"DATE\", \"DATEONLY\", \"VIRTUAL\"].some(t => t === (model.rawAttributes[a].type as AbstractDataTypeConstructor).key)\n        ).map(x => {\n            const attr = model.rawAttributes[x];\n            if (!attr) {\n                return x;\n            }\n            return attr.field ? attr.field : x;\n        });\n    }\n\n    public static getModelSearchableFieldAttributes(model: typeof M, fields: string[]): string[] {\n        const attributes = model.rawAttributes;\n        return fields\n            .filter(x => {\n                const attr = attributes[x];\n                if (!attr) {\n                    return false;\n                }\n\n                return ![\"DATE\", \"DATEONLY\", \"VIRTUAL\"].some(t => t === (attr.type as AbstractDataTypeConstructor).key);\n            }).\n            map(x => {\n                const attr = attributes[x];\n                if (!attr) {\n                    return x;\n                }\n\n                return attr.field ? attr.field : x;\n            })\n    }\n\n    public static reduceModelFromPath(model: M, path: string) {\n        const steps = path.split(\".\");\n\n        let step = steps.shift();\n        while (step) {\n            if (model[step] instanceof Array) {\n                if (!steps.length) {\n                    return model[step];\n                }\n\n                return (model[step] as Array<any>)\n                    .map(x => this.reduceModelFromPath(x, steps.join(\".\")))\n                    .reduce((all, current) => {\n                        if (current instanceof Array) {\n                            return [...all, ...current];\n                        }\n                        return [...all, current];\n                    }, []);\n            }\n\n            model = model[step];\n            if (!model) {\n                return undefined;\n            }\n\n            step = steps.shift();\n        }\n\n        return model;\n    }\n\n    public static findColumnFieldName(model: typeof M, name: string): string {\n        const field = Object.keys(model.rawAttributes).find((key) => {\n            if (key === name) {\n                return true;\n            }\n\n            return model.rawAttributes[key].field === name;\n        });\n        return model.rawAttributes[field].field ?? name;\n    }\n\n    public static isColumnJson(model: typeof M, name: string): boolean {\n        const attr = model.rawAttributes[name] ?? Object.values(model.rawAttributes).find((x) => x.field === name);\n        return (attr?.type as AbstractDataTypeConstructor)?.key === \"JSON\";\n    }\n\n    public static getGroupLiteral(model: typeof M, group: string): string {\n        const items = group.split(\".\");\n        if (items.length > 1) {\n            const column = items[items.length - 1];\n            return SequelizeUtils.getLiteralFullName(column, items.slice(0, items.length - 1));\n        }\n\n        return `\\`${model.name}\\`.\\`${group}\\``;\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/sequelize.utils.ts"],"names":[],"mappings":"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","file":"lib/sequelize.utils.js","sourcesContent":["import { ArrayUtils, TypeUtils } from \"@recursyve/nestjs-common\";\nimport {\n    AbstractDataTypeConstructor,\n    FindAttributeOptions,\n    Includeable,\n    IncludeOptions,\n    Op,\n    Order,\n    OrderItem,\n    WhereOptions\n} from \"sequelize\";\nimport { Model } from \"sequelize-typescript\";\nimport { WhereAttributeHashValue } from \"sequelize/types/model\";\nimport { RuleModel } from \"./filter\";\n\nexport interface GeoPoint {\n    type: \"point\",\n    coordinates: number[];\n}\n\nexport class M extends Model {}\n\nexport class SequelizeUtils {\n    public static reduceIncludes(includes: IncludeOptions[][], ignoreAttributes = false): Includeable[] {\n        let include: IncludeOptions[] = [];\n        for (const i of includes) {\n            include = this.mergeIncludes(include, i, ignoreAttributes);\n        }\n\n        return include;\n    }\n\n    public static mergeIncludes(a: IncludeOptions[] = [], b: IncludeOptions[] = [], ignoreAttributes = false) {\n        for (const bChild of b) {\n            const aChild = a.find(value => value.model === bChild.model && value.as === bChild.as);\n            if (aChild) {\n                aChild.include = this.mergeIncludes(\n                    (aChild.include as IncludeOptions[]) ?? [],\n                    (bChild.include as IncludeOptions[]) ?? [],\n                    ignoreAttributes\n                );\n                if ((aChild.attributes || bChild.attributes) && !ignoreAttributes) {\n                    aChild.attributes = this.mergeAttributes(aChild.attributes, bChild.attributes);\n                }\n                const where = this.mergeWhere(aChild.where, bChild.where);\n                if (where) {\n                    aChild.where = where;\n                }\n                const order = this.mergeOrder(aChild.order, bChild.order);\n                if (order) {\n                    aChild.order = order;\n                }\n                if (aChild.required || bChild.required) {\n                    aChild.required = true;\n                }\n                if (aChild.separate || bChild.separate) {\n                    aChild.separate = true;\n                }\n                aChild.paranoid = !(aChild.paranoid === false || bChild.paranoid === false);\n                if (TypeUtils.isNotNullOrUndefined(aChild.subQuery) || TypeUtils.isNotNullOrUndefined(bChild.subQuery)) {\n                    aChild.subQuery = aChild.subQuery ?? bChild.subQuery;\n                }\n            } else {\n                a.push(bChild);\n            }\n        }\n\n        return a;\n    }\n\n    public static mergeAttributes(a: FindAttributeOptions, b: FindAttributeOptions): FindAttributeOptions {\n        if (a instanceof Array && b instanceof Array) {\n            return ArrayUtils.uniqueValues([...a, ...b, \"id\"], x => x);\n        } else if (a instanceof Array) {\n            return ArrayUtils.uniqueValues([...a, \"id\"], x => x);\n        } else if (b instanceof Array) {\n            return ArrayUtils.uniqueValues([...b, \"id\"], x => x);\n        } else if (a || b) {\n            const aAttributes = (a ?? {}) as { include: string[]; exclude: string[] };\n            const bAttributes = (b ?? {}) as { include: string[]; exclude: string[] };\n            const result: { include?: string[]; exclude?: string[] } = {};\n\n            if (aAttributes.include?.length) {\n                result.include = [...aAttributes.include];\n            }\n            if (bAttributes.include?.length) {\n                result.include = [...(result.include ?? []), ...bAttributes.include];\n            }\n\n            if (aAttributes.exclude?.length) {\n                result.exclude = [...aAttributes.exclude];\n            }\n            if (bAttributes.exclude?.length) {\n                result.exclude = [...(result.exclude ?? []), ...bAttributes.exclude];\n            }\n\n            if (result.include) {\n                result.include = ArrayUtils.uniqueValues(result.include, x => x);\n            }\n            if (result.exclude) {\n                result.exclude = ArrayUtils.uniqueValues(result.exclude, x => x);\n            }\n\n            if (!result.include && !result.exclude) {\n                return undefined;\n            }\n\n            return result as FindAttributeOptions;\n        }\n        return undefined;\n    }\n\n    public static ensureAttributesValidity(attribute: FindAttributeOptions): FindAttributeOptions {\n        if (attribute instanceof Array) {\n            if (attribute.find((x) => x === \"id\")) {\n                return attribute;\n            }\n            return [\n                \"id\",\n                ...attribute\n            ];\n        }\n\n        if (attribute.exclude) {\n            return {\n                exclude: attribute.exclude.filter((x) => x !== \"id\")\n            }\n        }\n\n        return attribute;\n    }\n\n    public static mergeWhere(a: WhereOptions, b: WhereOptions): WhereOptions {\n        if (!a && !b) {\n            return null;\n        }\n        return Object.assign(a ?? {}, b ?? {});\n    }\n\n    public static mergeOrder(a: Order, b: Order): Order {\n        if (!a && !b) {\n            return null;\n        }\n        if (a && !b) {\n            return a;\n        }\n        if (!a && b) {\n            return b;\n        }\n\n        const res: OrderItem[] = [];\n        if (a instanceof Array) {\n            res.push(...a);\n        } else {\n            res.push(a);\n        }\n        if (b instanceof Array) {\n            res.push(...b);\n        } else {\n            res.push(b);\n        }\n        return res;\n    }\n\n    public static generateWhereValue(rule: RuleModel): WhereAttributeHashValue<any> {\n        switch (rule.operation) {\n            case \"equal\":\n                return rule.value as any;\n\n            case \"not_equal\":\n                return { [Op.ne]: rule.value };\n\n            case \"in\":\n                return { [Op.in]: rule.value as any[] };\n\n            case \"not_in\":\n                return { [Op.notIn]: rule.value as any[] };\n\n            case \"less\":\n                return { [Op.lt]: rule.value as any};\n\n            case \"less_or_equal\":\n                return { [Op.lte]: rule.value as any};\n\n            case \"greater\":\n                return { [Op.gt]: rule.value as any};\n\n            case \"greater_or_equal\":\n                return { [Op.gte]: rule.value as any};\n\n            case \"between\":\n                return { [Op.between]: rule.value as any };\n\n            case \"not_between\":\n                return { [Op.notBetween]: rule.value as any };\n\n            case \"is_null\":\n                return { [Op.eq]: null };\n\n            case \"is_not_null\":\n                return { [Op.ne]: null };\n\n            case \"begins_with\":\n                return { [Op.like]: `${rule.value}%` };\n\n            case \"not_begins_with\":\n                return { [Op.notLike]: `${rule.value}%` };\n\n            case \"contains\":\n                return { [Op.like]: `%${rule.value}%` };\n\n            case \"not_contains\":\n                return { [Op.notLike]: `%${rule.value}%` };\n\n            case \"ends_with\":\n                return { [Op.like]: `%${rule.value}` };\n\n            case \"not_ends_with\":\n                return { [Op.notLike]: `%${rule.value}` };\n\n            case \"is_empty\":\n                return \"\";\n\n            case \"is_not_empty\":\n                return { [Op.ne]: \"\" };\n        }\n    }\n\n    public static getAttributeFullName(attribute: string, path: string) {\n        return `$${path}.${attribute}$`;\n    }\n\n    public static getLiteralFullName(attribute: string, path: string | string[]) {\n        if (typeof path === \"string\") {\n            path = path.split(\".\");\n        }\n        return `\\`${path.join(\"->\")}\\`.\\`${attribute}\\``;\n    }\n\n    public static getOrderFullName(attribute: string, path: string[]) {\n        return `${path.join(\"->\")}.${attribute}`;\n    }\n\n    public static getModelSearchableAttributes(model: typeof M): string[] {\n        return Object.keys(model.rawAttributes).filter(\n            a => ![\"DATE\", \"DATEONLY\", \"VIRTUAL\"].some(t => t === (model.rawAttributes[a].type as AbstractDataTypeConstructor).key)\n        ).map(x => {\n            const attr = model.rawAttributes[x];\n            if (!attr) {\n                return x;\n            }\n            return attr.field ? attr.field : x;\n        });\n    }\n\n    public static getModelSearchableFieldAttributes(model: typeof M, fields: string[]): string[] {\n        const attributes = model.rawAttributes;\n        return fields\n            .filter(x => {\n                const attr = attributes[x];\n                if (!attr) {\n                    return false;\n                }\n\n                return ![\"DATE\", \"DATEONLY\", \"VIRTUAL\"].some(t => t === (attr.type as AbstractDataTypeConstructor).key);\n            }).\n            map(x => {\n                const attr = attributes[x];\n                if (!attr) {\n                    return x;\n                }\n\n                return attr.field ? attr.field : x;\n            })\n    }\n\n    public static reduceModelFromPath(model: M, path: string) {\n        const steps = path.split(\".\");\n\n        let step = steps.shift();\n        while (step) {\n            if (model[step] instanceof Array) {\n                if (!steps.length) {\n                    return model[step];\n                }\n\n                return (model[step] as Array<any>)\n                    .map(x => this.reduceModelFromPath(x, steps.join(\".\")))\n                    .reduce((all, current) => {\n                        if (current instanceof Array) {\n                            return [...all, ...current];\n                        }\n                        return [...all, current];\n                    }, []);\n            }\n\n            model = model[step];\n            if (!model) {\n                return undefined;\n            }\n\n            step = steps.shift();\n        }\n\n        return model;\n    }\n\n    public static findColumnFieldName(model: typeof M, name: string): string {\n        const field = Object.keys(model.rawAttributes).find((key) => {\n            if (key === name) {\n                return true;\n            }\n\n            return model.rawAttributes[key].field === name;\n        });\n        return model.rawAttributes[field].field ?? name;\n    }\n\n    public static isColumnJson(model: typeof M, name: string): boolean {\n        const attr = model.rawAttributes[name] ?? Object.values(model.rawAttributes).find((x) => x.field === name);\n        return (attr?.type as AbstractDataTypeConstructor)?.key === \"JSON\";\n    }\n\n    public static getGroupLiteral(model: typeof M, group: string): string {\n        const items = group.split(\".\");\n        if (items.length > 1) {\n            const column = items[items.length - 1];\n            return SequelizeUtils.getLiteralFullName(column, items.slice(0, items.length - 1));\n        }\n\n        return `\\`${model.name}\\`.\\`${group}\\``;\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@recursyve/nestjs-data-filter",
-    "version": "8.2.1",
+    "version": "8.3.0",
     "description": "NestJs DataFilter library",
     "main": "index.js",
     "scripts": {
@@ -23,7 +23,7 @@
         "@nestjs/core": ">=8.0.0",
         "@recursyve/nestjs-common": ">=8.0.0",
         "moment": "^2.29.0",
-        "sequelize": ">=6.6.0",
+        "sequelize": ">=6.19.0",
         "sequelize-typescript": ">=2.1.0"
     },
     "devDependencies": {
@@ -44,8 +44,8 @@
         "jest": "^27.5.0",
         "reflect-metadata": "^0.1.13",
         "rxjs": "^7.5.2",
-        "sequelize": "^6.15.0",
-        "sequelize-typescript": "^2.1.2",
+        "sequelize": "^6.19.0",
+        "sequelize-typescript": "^2.1.3",
         "sqlite3": "^5.0.2",
         "ts-jest": "^27.1.3",
         "ts-node": "^10.4.0",