@recursyve/nestjs-data-filter 9.4.0-beta.0 → 9.4.1

package/lib/models/count.model.js

@@ -1,41 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CountAttributesContext = exports.CountAttributesConfig = void 0;
+exports.CountAttributesConfig = void 0;
 const sequelize_1 = require("sequelize");
-const custom_attributes_model_1 = require("./custom-attributes.model");
+const sequelize_utils_1 = require("../sequelize.utils");
 class CountAttributesConfig {
     constructor(key, config) {
         this.key = key;
         this.config = config;
         this.type = "count";
     }
-    withContext(dialectFormatterService) {
-        return new CountAttributesContext(this, dialectFormatterService);
+    transform(options, path) {
+        if (this.config.distinct) {
+            const attribute = this.config.path
+                ? sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.config.attribute, this.config.path)
+                : this.config.attribute;
+            return [(0, sequelize_1.literal)(`COUNT(DISTINCT ${attribute})`), this.key];
+        }
+        const attribute = this.config.path
+            ? (0, sequelize_1.literal)(sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.config.attribute, this.config.path))
+            : this.config.attribute;
+        return [(0, sequelize_1.fn)("COUNT", attribute), this.key];
     }
     shouldGroupBy() {
         return true;
     }
 }
 exports.CountAttributesConfig = CountAttributesConfig;
-class CountAttributesContext extends custom_attributes_model_1.CustomAttributesContext {
-    constructor(config, dialectFormatterService) {
-        super();
-        this.config = config;
-        this.dialectFormatterService = dialectFormatterService;
-    }
-    transform(options, path) {
-        if (this.config.config.distinct) {
-            const attribute = this.config.config.path
-                ? this.dialectFormatterService.getLiteralFullName(this.config.config.attribute, this.config.config.path)
-                : this.config.config.attribute;
-            return [(0, sequelize_1.literal)(`COUNT(DISTINCT ${attribute})`), this.config.key];
-        }
-        const attribute = this.config.config.path
-            ? (0, sequelize_1.literal)(this.dialectFormatterService.getLiteralFullName(this.config.config.attribute, this.config.config.path))
-            : this.config.config.attribute;
-        return [(0, sequelize_1.fn)("COUNT", attribute), this.config.key];
-    }
-}
-exports.CountAttributesContext = CountAttributesContext;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvY291bnQubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQXdDO0FBR3hDLHVFQUltQztBQU9uQyxNQUFhLHFCQUFxQjtJQUc5QixZQUFtQixHQUFXLEVBQVMsTUFBbUI7UUFBdkMsUUFBRyxHQUFILEdBQUcsQ0FBUTtRQUFTLFdBQU0sR0FBTixNQUFNLENBQWE7UUFGbkQsU0FBSSxHQUFHLE9BQU8sQ0FBQztJQUV1QyxDQUFDO0lBRXZELFdBQVcsQ0FBQyx1QkFBZ0Q7UUFDL0QsT0FBTyxJQUFJLHNCQUFzQixDQUFDLElBQUksRUFBRSx1QkFBdUIsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFFTSxhQUFhO1FBQ2hCLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7Q0FDSjtBQVpELHNEQVlDO0FBRUQsTUFBYSxzQkFBdUIsU0FBUSxpREFBdUI7SUFDL0QsWUFBb0IsTUFBNkIsRUFBVSx1QkFBZ0Q7UUFDdkcsS0FBSyxFQUFFLENBQUM7UUFEUSxXQUFNLEdBQU4sTUFBTSxDQUF1QjtRQUFVLDRCQUF1QixHQUF2Qix1QkFBdUIsQ0FBeUI7SUFFM0csQ0FBQztJQUVNLFNBQVMsQ0FBQyxPQUFlLEVBQUUsSUFBYTtRQUMzQyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRTtZQUM3QixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJO2dCQUNyQyxDQUFDLENBQUMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUM7Z0JBQ3hHLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7WUFDbkMsT0FBTyxDQUFDLElBQUEsbUJBQU8sRUFBQyxrQkFBa0IsU0FBUyxHQUFHLENBQUMsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ3JFO1FBRUQsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSTtZQUNyQyxDQUFDLENBQUMsSUFBQSxtQkFBTyxFQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDakgsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztRQUNuQyxPQUFPLENBQUMsSUFBQSxjQUFFLEVBQUMsT0FBTyxFQUFFLFNBQVMsQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDckQsQ0FBQztDQUNKO0FBbEJELHdEQWtCQyIsImZpbGUiOiJsaWIvbW9kZWxzL2NvdW50Lm1vZGVsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZm4sIGxpdGVyYWwgfSBmcm9tIFwic2VxdWVsaXplXCI7XG5pbXBvcnQgeyBQcm9qZWN0aW9uQWxpYXMgfSBmcm9tIFwic2VxdWVsaXplL3R5cGVzL21vZGVsXCI7XG5pbXBvcnQgeyBEaWFsZWN0Rm9ybWF0dGVyU2VydmljZSB9IGZyb20gXCIuLi9zZXJ2aWNlcy9kaWFsZWN0LWZvcm1hdHRlci5zZXJ2aWNlXCI7XG5pbXBvcnQge1xuICAgIEN1c3RvbUF0dHJpYnV0ZXNDb25maWcsXG4gICAgQ3VzdG9tQXR0cmlidXRlc0NvbnRleHQsXG4gICAgQ3VzdG9tQXR0cmlidXRlc09wdGlvbkNvbmZpZ1xufSBmcm9tIFwiLi9jdXN0b20tYXR0cmlidXRlcy5tb2RlbFwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIENvdW50Q29uZmlnIGV4dGVuZHMgQ3VzdG9tQXR0cmlidXRlc09wdGlvbkNvbmZpZyB7XG4gICAgYXR0cmlidXRlOiBzdHJpbmc7XG4gICAgZGlzdGluY3Q/OiBib29sZWFuO1xufVxuXG5leHBvcnQgY2xhc3MgQ291bnRBdHRyaWJ1dGVzQ29uZmlnIGltcGxlbWVudHMgQ3VzdG9tQXR0cmlidXRlc0NvbmZpZzxDb3VudENvbmZpZywgQ291bnRBdHRyaWJ1dGVzQ29udGV4dD4ge1xuICAgIHB1YmxpYyB0eXBlID0gXCJjb3VudFwiO1xuXG4gICAgY29uc3RydWN0b3IocHVibGljIGtleTogc3RyaW5nLCBwdWJsaWMgY29uZmlnOiBDb3VudENvbmZpZykge31cblxuICAgIHB1YmxpYyB3aXRoQ29udGV4dChkaWFsZWN0Rm9ybWF0dGVyU2VydmljZTogRGlhbGVjdEZvcm1hdHRlclNlcnZpY2UpOiBDb3VudEF0dHJpYnV0ZXNDb250ZXh0IHtcbiAgICAgICAgcmV0dXJuIG5ldyBDb3VudEF0dHJpYnV0ZXNDb250ZXh0KHRoaXMsIGRpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgc2hvdWxkR3JvdXBCeSgpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxufVxuXG5leHBvcnQgY2xhc3MgQ291bnRBdHRyaWJ1dGVzQ29udGV4dCBleHRlbmRzIEN1c3RvbUF0dHJpYnV0ZXNDb250ZXh0IHtcbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIGNvbmZpZzogQ291bnRBdHRyaWJ1dGVzQ29uZmlnLCBwcml2YXRlIGRpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlOiBEaWFsZWN0Rm9ybWF0dGVyU2VydmljZSkge1xuICAgICAgICBzdXBlcigpO1xuICAgIH1cblxuICAgIHB1YmxpYyB0cmFuc2Zvcm0ob3B0aW9uczogb2JqZWN0LCBwYXRoPzogc3RyaW5nKTogc3RyaW5nIHwgUHJvamVjdGlvbkFsaWFzIHtcbiAgICAgICAgaWYgKHRoaXMuY29uZmlnLmNvbmZpZy5kaXN0aW5jdCkge1xuICAgICAgICAgICAgY29uc3QgYXR0cmlidXRlID0gdGhpcy5jb25maWcuY29uZmlnLnBhdGhcbiAgICAgICAgICAgICAgICA/IHRoaXMuZGlhbGVjdEZvcm1hdHRlclNlcnZpY2UuZ2V0TGl0ZXJhbEZ1bGxOYW1lKHRoaXMuY29uZmlnLmNvbmZpZy5hdHRyaWJ1dGUsIHRoaXMuY29uZmlnLmNvbmZpZy5wYXRoKVxuICAgICAgICAgICAgICAgIDogdGhpcy5jb25maWcuY29uZmlnLmF0dHJpYnV0ZTtcbiAgICAgICAgICAgIHJldHVybiBbbGl0ZXJhbChgQ09VTlQoRElTVElOQ1QgJHthdHRyaWJ1dGV9KWApLCB0aGlzLmNvbmZpZy5rZXldO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgYXR0cmlidXRlID0gdGhpcy5jb25maWcuY29uZmlnLnBhdGhcbiAgICAgICAgICAgID8gbGl0ZXJhbCh0aGlzLmRpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlLmdldExpdGVyYWxGdWxsTmFtZSh0aGlzLmNvbmZpZy5jb25maWcuYXR0cmlidXRlLCB0aGlzLmNvbmZpZy5jb25maWcucGF0aCkpXG4gICAgICAgICAgICA6IHRoaXMuY29uZmlnLmNvbmZpZy5hdHRyaWJ1dGU7XG4gICAgICAgIHJldHVybiBbZm4oXCJDT1VOVFwiLCBhdHRyaWJ1dGUpLCB0aGlzLmNvbmZpZy5rZXldO1xuICAgIH1cbn0iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvY291bnQubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EseUNBQXlEO0FBRXpELHdEQUFvRDtBQVFwRCxNQUFhLHFCQUFxQjtJQUc5QixZQUFtQixHQUFXLEVBQVMsTUFBbUI7UUFBdkMsUUFBRyxHQUFILEdBQUcsQ0FBUTtRQUFTLFdBQU0sR0FBTixNQUFNLENBQWE7UUFGbkQsU0FBSSxHQUFHLE9BQU8sQ0FBQztJQUV1QyxDQUFDO0lBRXZELFNBQVMsQ0FBQyxPQUFlLEVBQUUsSUFBYTtRQUMzQyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFO1lBQ3RCLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSTtnQkFDOUIsQ0FBQyxDQUFDLGdDQUFjLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUM7Z0JBQzVFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztZQUM1QixPQUFPLENBQUMsSUFBQSxtQkFBTyxFQUFDLGtCQUFrQixTQUFTLEdBQUcsQ0FBQyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUM5RDtRQUVELE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSTtZQUM5QixDQUFDLENBQUMsSUFBQSxtQkFBTyxFQUFDLGdDQUFjLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNyRixDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7UUFDNUIsT0FBTyxDQUFDLElBQUEsY0FBRSxFQUFDLE9BQU8sRUFBRSxTQUFTLENBQUMsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUVNLGFBQWE7UUFDaEIsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztDQUNKO0FBdEJELHNEQXNCQyIsImZpbGUiOiJsaWIvbW9kZWxzL2NvdW50Lm1vZGVsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgdHIgfSBmcm9tIFwiZGF0ZS1mbnMvbG9jYWxlXCI7XG5pbXBvcnQgeyBmbiwgbGl0ZXJhbCwgUHJvamVjdGlvbkFsaWFzIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgR3JvdXBPcHRpb24gfSBmcm9tIFwic2VxdWVsaXplL3R5cGVzL21vZGVsXCI7XG5pbXBvcnQgeyBTZXF1ZWxpemVVdGlscyB9IGZyb20gXCIuLi9zZXF1ZWxpemUudXRpbHNcIjtcbmltcG9ydCB7IEN1c3RvbUF0dHJpYnV0ZXNDb25maWcsIEN1c3RvbUF0dHJpYnV0ZXNPcHRpb25Db25maWcgfSBmcm9tIFwiLi9jdXN0b20tYXR0cmlidXRlcy5tb2RlbFwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIENvdW50Q29uZmlnIGV4dGVuZHMgQ3VzdG9tQXR0cmlidXRlc09wdGlvbkNvbmZpZyB7XG4gICAgYXR0cmlidXRlOiBzdHJpbmc7XG4gICAgZGlzdGluY3Q/OiBib29sZWFuO1xufVxuXG5leHBvcnQgY2xhc3MgQ291bnRBdHRyaWJ1dGVzQ29uZmlnIGltcGxlbWVudHMgQ3VzdG9tQXR0cmlidXRlc0NvbmZpZzxDb3VudENvbmZpZz4ge1xuICAgIHB1YmxpYyB0eXBlID0gXCJjb3VudFwiO1xuXG4gICAgY29uc3RydWN0b3IocHVibGljIGtleTogc3RyaW5nLCBwdWJsaWMgY29uZmlnOiBDb3VudENvbmZpZykge31cblxuICAgIHB1YmxpYyB0cmFuc2Zvcm0ob3B0aW9uczogb2JqZWN0LCBwYXRoPzogc3RyaW5nKTogc3RyaW5nIHwgUHJvamVjdGlvbkFsaWFzIHtcbiAgICAgICAgaWYgKHRoaXMuY29uZmlnLmRpc3RpbmN0KSB7XG4gICAgICAgICAgICBjb25zdCBhdHRyaWJ1dGUgPSB0aGlzLmNvbmZpZy5wYXRoXG4gICAgICAgICAgICAgICAgPyBTZXF1ZWxpemVVdGlscy5nZXRMaXRlcmFsRnVsbE5hbWUodGhpcy5jb25maWcuYXR0cmlidXRlLCB0aGlzLmNvbmZpZy5wYXRoKVxuICAgICAgICAgICAgICAgIDogdGhpcy5jb25maWcuYXR0cmlidXRlO1xuICAgICAgICAgICAgcmV0dXJuIFtsaXRlcmFsKGBDT1VOVChESVNUSU5DVCAke2F0dHJpYnV0ZX0pYCksIHRoaXMua2V5XTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IGF0dHJpYnV0ZSA9IHRoaXMuY29uZmlnLnBhdGhcbiAgICAgICAgICAgID8gbGl0ZXJhbChTZXF1ZWxpemVVdGlscy5nZXRMaXRlcmFsRnVsbE5hbWUodGhpcy5jb25maWcuYXR0cmlidXRlLCB0aGlzLmNvbmZpZy5wYXRoKSlcbiAgICAgICAgICAgIDogdGhpcy5jb25maWcuYXR0cmlidXRlO1xuICAgICAgICByZXR1cm4gW2ZuKFwiQ09VTlRcIiwgYXR0cmlidXRlKSwgdGhpcy5rZXldO1xuICAgIH1cblxuICAgIHB1YmxpYyBzaG91bGRHcm91cEJ5KCk6IGJvb2xlYW4ge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG59XG4iXX0=

package/lib/models/custom-attributes.model.d.ts

@@ -1,5 +1,4 @@
 import { ProjectionAlias } from "sequelize";
-import { DialectFormatterService } from "../services/dialect-formatter.service";
 import { IncludeWhereModel } from "./include.model";
 import { PathModel } from "./path.model";
 export interface CustomAttributesOptionConfig {
@@ -7,16 +6,13 @@ export interface CustomAttributesOptionConfig {
     path?: string;
     where?: IncludeWhereModel;
 }
-export interface CustomAttributesConfig<T extends CustomAttributesOptionConfig = CustomAttributesOptionConfig, context = CustomAttributesContext> {
+export interface CustomAttributesConfig<T extends CustomAttributesOptionConfig = CustomAttributesOptionConfig> {
     key: string;
     type: string;
     config?: T;
-    withContext(dialectFormatterService: DialectFormatterService): context;
+    transform(options?: object, path?: string): string | ProjectionAlias;
     shouldGroupBy(): boolean;
 }
-export declare abstract class CustomAttributesContext {
-    abstract transform(options?: object, path?: string): string | ProjectionAlias;
-}
 export interface CustomAttributesModel {
     key: string;
     attribute: string | ProjectionAlias;

package/lib/models/custom-attributes.model.js

@@ -1,8 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomAttributesContext = void 0;
-class CustomAttributesContext {
-}
-exports.CustomAttributesContext = CustomAttributesContext;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvY3VzdG9tLWF0dHJpYnV0ZXMubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBcUJBLE1BQXNCLHVCQUF1QjtDQUU1QztBQUZELDBEQUVDIiwiZmlsZSI6ImxpYi9tb2RlbHMvY3VzdG9tLWF0dHJpYnV0ZXMubW9kZWwuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBQcm9qZWN0aW9uQWxpYXMgfSBmcm9tIFwic2VxdWVsaXplXCI7XG5pbXBvcnQgeyBHcm91cE9wdGlvbiB9IGZyb20gXCJzZXF1ZWxpemUvdHlwZXMvbW9kZWxcIjtcbmltcG9ydCB7IERpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlIH0gZnJvbSBcIi4uL3NlcnZpY2VzL2RpYWxlY3QtZm9ybWF0dGVyLnNlcnZpY2VcIjtcbmltcG9ydCB7IEluY2x1ZGVXaGVyZU1vZGVsIH0gZnJvbSBcIi4vaW5jbHVkZS5tb2RlbFwiO1xuaW1wb3J0IHsgUGF0aE1vZGVsIH0gZnJvbSBcIi4vcGF0aC5tb2RlbFwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEN1c3RvbUF0dHJpYnV0ZXNPcHRpb25Db25maWcge1xuICAgIG5hbWU6IHN0cmluZztcbiAgICBwYXRoPzogc3RyaW5nO1xuICAgIHdoZXJlPzogSW5jbHVkZVdoZXJlTW9kZWw7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ3VzdG9tQXR0cmlidXRlc0NvbmZpZzxUIGV4dGVuZHMgQ3VzdG9tQXR0cmlidXRlc09wdGlvbkNvbmZpZyA9IEN1c3RvbUF0dHJpYnV0ZXNPcHRpb25Db25maWcsIGNvbnRleHQgPSBDdXN0b21BdHRyaWJ1dGVzQ29udGV4dD4ge1xuICAgIGtleTogc3RyaW5nO1xuICAgIHR5cGU6IHN0cmluZztcbiAgICBjb25maWc/OiBUO1xuXG4gICAgd2l0aENvbnRleHQoZGlhbGVjdEZvcm1hdHRlclNlcnZpY2U6IERpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlKTogY29udGV4dDtcbiAgICBzaG91bGRHcm91cEJ5KCk6IGJvb2xlYW47XG59XG5cbmV4cG9ydCBhYnN0cmFjdCBjbGFzcyBDdXN0b21BdHRyaWJ1dGVzQ29udGV4dCB7XG4gICAgcHVibGljIGFic3RyYWN0IHRyYW5zZm9ybShvcHRpb25zPzogb2JqZWN0LCBwYXRoPzogc3RyaW5nKTogc3RyaW5nIHwgUHJvamVjdGlvbkFsaWFzO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEN1c3RvbUF0dHJpYnV0ZXNNb2RlbCB7XG4gICAga2V5OiBzdHJpbmc7XG4gICAgYXR0cmlidXRlOiBzdHJpbmcgfCBQcm9qZWN0aW9uQWxpYXM7XG4gICAgcGF0aD86IFBhdGhNb2RlbDtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvY3VzdG9tLWF0dHJpYnV0ZXMubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJsaWIvbW9kZWxzL2N1c3RvbS1hdHRyaWJ1dGVzLm1vZGVsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUHJvamVjdGlvbkFsaWFzIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgR3JvdXBPcHRpb24gfSBmcm9tIFwic2VxdWVsaXplL3R5cGVzL21vZGVsXCI7XG5pbXBvcnQgeyBJbmNsdWRlV2hlcmVNb2RlbCB9IGZyb20gXCIuL2luY2x1ZGUubW9kZWxcIjtcbmltcG9ydCB7IFBhdGhNb2RlbCB9IGZyb20gXCIuL3BhdGgubW9kZWxcIjtcblxuZXhwb3J0IGludGVyZmFjZSBDdXN0b21BdHRyaWJ1dGVzT3B0aW9uQ29uZmlnIHtcbiAgICBuYW1lOiBzdHJpbmc7XG4gICAgcGF0aD86IHN0cmluZztcbiAgICB3aGVyZT86IEluY2x1ZGVXaGVyZU1vZGVsO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEN1c3RvbUF0dHJpYnV0ZXNDb25maWc8VCBleHRlbmRzIEN1c3RvbUF0dHJpYnV0ZXNPcHRpb25Db25maWcgPSBDdXN0b21BdHRyaWJ1dGVzT3B0aW9uQ29uZmlnPiB7XG4gICAga2V5OiBzdHJpbmc7XG4gICAgdHlwZTogc3RyaW5nO1xuICAgIGNvbmZpZz86IFQ7XG5cbiAgICB0cmFuc2Zvcm0ob3B0aW9ucz86IG9iamVjdCwgcGF0aD86IHN0cmluZyk6IHN0cmluZyB8IFByb2plY3Rpb25BbGlhcztcbiAgICBzaG91bGRHcm91cEJ5KCk6IGJvb2xlYW47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ3VzdG9tQXR0cmlidXRlc01vZGVsIHtcbiAgICBrZXk6IHN0cmluZztcbiAgICBhdHRyaWJ1dGU6IHN0cmluZyB8IFByb2plY3Rpb25BbGlhcztcbiAgICBwYXRoPzogUGF0aE1vZGVsO1xufVxuIl19

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

@@ -1,6 +1,5 @@
 import { FindAttributeOptions } from "sequelize";
 import { Model } from "sequelize-typescript";
-import { DialectFormatterService } from "../services/dialect-formatter.service";
 import { CustomAttributesConfig, CustomAttributesModel } from "./custom-attributes.model";
 import { IncludeConfig } from "./include.model";
 export interface DataFilterConfigModel {
@@ -16,20 +15,14 @@ export declare class DataFilterConfig implements DataFilterConfigModel {
     exportColumns?: string[];
     customAttributes: CustomAttributesConfig[];
     ignoreInSearch: boolean;
-    withContext(dialectFormatterService: DialectFormatterService): DataFilterContext;
     setModel(model: typeof Model): void;
     setIgnoreInPath(ignore: boolean): void;
     setAttributes(attributes?: FindAttributeOptions): void;
     setSearchableAttributes(attributes: string[]): void;
     setExportColumns(exportColumns: string[]): void;
     addCustomAttribute(attribute: CustomAttributesConfig): void;
-    getCustomAttributesIncludes(): IncludeConfig[];
-    getSearchableAttributes(): string[];
-}
-export declare class DataFilterContext {
-    private config;
-    private dialectFormatterService;
-    constructor(config: DataFilterConfig, dialectFormatterService: DialectFormatterService);
     transformAttributesConfig(options?: object): FindAttributeOptions;
     getCustomAttributes(options?: object): CustomAttributesModel[];
+    getCustomAttributesIncludes(): IncludeConfig[];
+    getSearchableAttributes(): string[];
 }

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

@@ -1,15 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataFilterContext = exports.DataFilterConfig = void 0;
+exports.DataFilterConfig = void 0;
 const sequelize_utils_1 = require("../sequelize.utils");
 class DataFilterConfig {
     constructor() {
         this.customAttributes = [];
         this.ignoreInSearch = false;
     }
-    withContext(dialectFormatterService) {
-        return new DataFilterContext(this, dialectFormatterService);
-    }
     setModel(model) {
         this.model = model;
     }
@@ -28,6 +25,34 @@ class DataFilterConfig {
     addCustomAttribute(attribute) {
         this.customAttributes.push(attribute);
     }
+    transformAttributesConfig(options) {
+        const customAttributes = this.getCustomAttributes(options);
+        if (this.attributes) {
+            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 {
+                include: customAttributes.map(x => x.attribute)
+            };
+        }
+    }
+    getCustomAttributes(options) {
+        return this.customAttributes
+            .map(x => ({
+            key: x.key,
+            attribute: x.transform(options),
+            path: x.config.path ? {
+                path: x.config.path,
+                paranoid: true
+            } : null
+        }))
+            .filter(x => x.attribute);
+    }
     getCustomAttributesIncludes() {
         return this.customAttributes
             .filter(x => x.config.path)
@@ -54,40 +79,5 @@ class DataFilterConfig {
     }
 }
 exports.DataFilterConfig = DataFilterConfig;
-class DataFilterContext {
-    constructor(config, dialectFormatterService) {
-        this.config = config;
-        this.dialectFormatterService = dialectFormatterService;
-    }
-    transformAttributesConfig(options) {
-        const customAttributes = this.getCustomAttributes(options);
-        if (this.config.attributes) {
-            if (this.config.customAttributes.length) {
-                return sequelize_utils_1.SequelizeUtils.ensureAttributesValidity(sequelize_utils_1.SequelizeUtils.mergeAttributes(this.config.attributes, {
-                    include: customAttributes.map(x => x.attribute)
-                }));
-            }
-            return sequelize_utils_1.SequelizeUtils.ensureAttributesValidity(this.config.attributes);
-        }
-        if (!this.config.attributes && customAttributes.length) {
-            return {
-                include: customAttributes.map(x => x.attribute)
-            };
-        }
-    }
-    getCustomAttributes(options) {
-        return this.config.customAttributes
-            .map(x => ({
-            key: x.key,
-            attribute: x.withContext(this.dialectFormatterService).transform(options),
-            path: x.config.path ? {
-                path: x.config.path,
-                paranoid: true
-            } : null
-        }))
-            .filter(x => x.attribute);
-    }
-}
-exports.DataFilterContext = DataFilterContext;
 
-//# 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 { DialectFormatterService } from \"../services/dialect-formatter.service\";\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 withContext(dialectFormatterService: DialectFormatterService): DataFilterContext {\n        return new DataFilterContext(this, dialectFormatterService);\n    }\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 getCustomAttributesIncludes(): IncludeConfig[] {\n        return this.customAttributes\n            .filter(x => x.config.path)\n            .map(x => ({\n                attributes: { include: [] },\n                path: x.config.path,\n                where: x.config.where,\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\nexport class DataFilterContext {\n    constructor(private config: DataFilterConfig, private dialectFormatterService: DialectFormatterService) {}\n\n    public transformAttributesConfig(options?: object): FindAttributeOptions {\n        const customAttributes = this.getCustomAttributes(options);\n        if (this.config.attributes) {\n            if (this.config.customAttributes.length) {\n                return SequelizeUtils.ensureAttributesValidity(\n                    SequelizeUtils.mergeAttributes(this.config.attributes, {\n                        include: customAttributes.map(x => x.attribute)\n                    })\n                );\n            }\n\n            return SequelizeUtils.ensureAttributesValidity(this.config.attributes);\n        }\n        if (!this.config.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.config.customAttributes\n            .map(x => ({\n                key: x.key,\n                attribute: x.withContext(this.dialectFormatterService).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}"]}
+//# 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: { include: [] },\n                path: x.config.path,\n                where: x.config.where,\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/models/distance.model.d.ts

@@ -1,6 +1,5 @@
 import { ProjectionAlias } from "sequelize";
-import { DialectFormatterService } from "../services/dialect-formatter.service";
-import { CustomAttributesConfig, CustomAttributesContext, CustomAttributesOptionConfig } from "./custom-attributes.model";
+import { CustomAttributesConfig, CustomAttributesOptionConfig } from "./custom-attributes.model";
 export interface BaseDistanceConfig extends CustomAttributesOptionConfig {
     coordinates: (option?: any) => [number, number];
     srid?: number;
@@ -13,18 +12,12 @@ export interface DistanceConfigWithLatLng {
     lngAttribute: string;
 }
 export type DistanceConfig = BaseDistanceConfig & (DistanceConfigWithPoint | DistanceConfigWithLatLng);
-export declare class DistanceAttributesConfig implements CustomAttributesConfig<DistanceConfig, DistanceAttributesContext> {
+export declare class DistanceAttributesConfig implements CustomAttributesConfig<DistanceConfig> {
     key: string;
     config: DistanceConfig;
     type: string;
     constructor(key: string, config: DistanceConfig);
-    withContext(dialectFormatterService: DialectFormatterService): DistanceAttributesContext;
-    shouldGroupBy(): boolean;
-}
-export declare class DistanceAttributesContext extends CustomAttributesContext {
-    private config;
-    private dialectFormatterService;
-    constructor(config: DistanceAttributesConfig, dialectFormatterService: DialectFormatterService);
     transform(options: object, path?: string): string | ProjectionAlias;
+    shouldGroupBy(): boolean;
     private getPointAttribute;
 }

package/lib/models/distance.model.js

@@ -1,34 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DistanceAttributesContext = exports.DistanceAttributesConfig = void 0;
+exports.DistanceAttributesConfig = void 0;
 const sequelize_1 = require("sequelize");
-const custom_attributes_model_1 = require("./custom-attributes.model");
+const sequelize_utils_1 = require("../sequelize.utils");
 class DistanceAttributesConfig {
     constructor(key, config) {
         this.key = key;
         this.config = config;
         this.type = "distance";
     }
-    withContext(dialectFormatterService) {
-        return new DistanceAttributesContext(this, dialectFormatterService);
-    }
-    shouldGroupBy() {
-        return false;
-    }
-}
-exports.DistanceAttributesConfig = DistanceAttributesConfig;
-class DistanceAttributesContext extends custom_attributes_model_1.CustomAttributesContext {
-    constructor(config, dialectFormatterService) {
-        super();
-        this.config = config;
-        this.dialectFormatterService = dialectFormatterService;
-    }
     transform(options, path) {
         var _a, _b;
         if (!options) {
             return null;
         }
-        const coordinates = this.config.config.coordinates(options);
+        const coordinates = this.config.coordinates(options);
         if (!coordinates || coordinates.length < 2) {
             return null;
         }
@@ -36,23 +22,26 @@ class DistanceAttributesContext extends custom_attributes_model_1.CustomAttribut
         if (typeof latitude !== "number" || typeof longitude !== "number") {
             return null;
         }
-        if (path || this.config.config.path) {
-            path = [path, this.config.config.path].filter(x => x).join(".");
+        if (path || this.config.path) {
+            path = [path, this.config.path].filter(x => x).join(".");
         }
-        const location = (0, sequelize_1.fn)("ST_GeometryFromText", (0, sequelize_1.literal)(`'POINT(${latitude} ${longitude})'`), (_a = this.config.config.srid) !== null && _a !== void 0 ? _a : 0);
-        return [(0, sequelize_1.fn)("ST_Distance_Sphere", this.getPointAttribute(path), location), (_b = this.config.config.name) !== null && _b !== void 0 ? _b : this.config.key];
+        const location = (0, sequelize_1.fn)("ST_GeometryFromText", (0, sequelize_1.literal)(`'POINT(${latitude} ${longitude})'`), (_a = this.config.srid) !== null && _a !== void 0 ? _a : 0);
+        return [(0, sequelize_1.fn)("ST_Distance_Sphere", this.getPointAttribute(path), location), (_b = this.config.name) !== null && _b !== void 0 ? _b : this.key];
+    }
+    shouldGroupBy() {
+        return false;
     }
     getPointAttribute(path) {
-        if (this.config.config.attribute) {
-            const att = this.config.config.attribute;
-            return (0, sequelize_1.literal)(path ? this.dialectFormatterService.getLiteralFullName(att, path) : att);
+        if (this.config.attribute) {
+            const att = this.config.attribute;
+            return (0, sequelize_1.literal)(path ? sequelize_utils_1.SequelizeUtils.getLiteralFullName(att, path) : att);
         }
-        const lat = path ? (0, sequelize_1.literal)(this.dialectFormatterService.getLiteralFullName(this.config.config.latAttribute, path)) : this.config.config.latAttribute;
-        const lng = path ? (0, sequelize_1.literal)(this.dialectFormatterService.getLiteralFullName(this.config.config.lngAttribute, path)) : this.config.config.lngAttribute;
+        const lat = path ? (0, sequelize_1.literal)(sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.config.latAttribute, path)) : this.config.latAttribute;
+        const lng = path ? (0, sequelize_1.literal)(sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.config.lngAttribute, path)) : this.config.lngAttribute;
         const point = (0, sequelize_1.fn)("Point", lng, lat);
-        return this.config.config.srid ? (0, sequelize_1.fn)("ST_SRID", point, this.config.config.srid) : point;
+        return this.config.srid ? (0, sequelize_1.fn)("ST_SRID", point, this.config.srid) : point;
     }
 }
-exports.DistanceAttributesContext = DistanceAttributesContext;
+exports.DistanceAttributesConfig = DistanceAttributesConfig;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvZGlzdGFuY2UubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQXlEO0FBRXpELHVFQUltQztBQWtCbkMsTUFBYSx3QkFBd0I7SUFHakMsWUFBbUIsR0FBVyxFQUFTLE1BQXNCO1FBQTFDLFFBQUcsR0FBSCxHQUFHLENBQVE7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFnQjtRQUZ0RCxTQUFJLEdBQUcsVUFBVSxDQUFDO0lBRXVDLENBQUM7SUFFMUQsV0FBVyxDQUFDLHVCQUFnRDtRQUMvRCxPQUFPLElBQUkseUJBQXlCLENBQUMsSUFBSSxFQUFFLHVCQUF1QixDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUVNLGFBQWE7UUFDaEIsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztDQUNKO0FBWkQsNERBWUM7QUFFRCxNQUFhLHlCQUEwQixTQUFRLGlEQUF1QjtJQUNsRSxZQUFvQixNQUFnQyxFQUFVLHVCQUFnRDtRQUMxRyxLQUFLLEVBQUUsQ0FBQztRQURRLFdBQU0sR0FBTixNQUFNLENBQTBCO1FBQVUsNEJBQXVCLEdBQXZCLHVCQUF1QixDQUF5QjtJQUU5RyxDQUFDO0lBRU0sU0FBUyxDQUFDLE9BQWUsRUFBRSxJQUFhOztRQUMzQyxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ1YsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsV0FBVyxJQUFJLFdBQVcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ3hDLE9BQU8sSUFBSSxDQUFDO1NBQ2Y7UUFFRCxNQUFNLENBQUMsUUFBUSxFQUFFLFNBQVMsQ0FBQyxHQUFHLFdBQVcsQ0FBQztRQUMxQyxJQUFJLE9BQU8sUUFBUSxLQUFLLFFBQVEsSUFBSSxPQUFPLFNBQVMsS0FBSyxRQUFRLEVBQUU7WUFDL0QsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUNELElBQUksSUFBSSxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtZQUNqQyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ25FO1FBRUQsTUFBTSxRQUFRLEdBQUcsSUFBQSxjQUFFLEVBQUMscUJBQXFCLEVBQUUsSUFBQSxtQkFBTyxFQUFDLFVBQVUsUUFBUSxJQUFJLFNBQVMsSUFBSSxDQUFDLEVBQUUsTUFBQSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLG1DQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ3ZILE9BQU8sQ0FBQyxJQUFBLGNBQUUsRUFBQyxvQkFBb0IsRUFBRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQUUsUUFBUSxDQUFDLEVBQUUsTUFBQSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLG1DQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUgsQ0FBQztJQUVPLGlCQUFpQixDQUFDLElBQVk7UUFDbEMsSUFBSyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQWtDLENBQUMsU0FBUyxFQUFFO1lBQzNELE1BQU0sR0FBRyxHQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBa0MsQ0FBQyxTQUFTLENBQUM7WUFDdEUsT0FBTyxJQUFBLG1CQUFPLEVBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUMzRjtRQUVELE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBTyxFQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxrQkFBa0IsQ0FBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQW1DLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBbUMsQ0FBQyxZQUFZLENBQUM7UUFDak4sTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLGtCQUFrQixDQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBbUMsQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFtQyxDQUFDLFlBQVksQ0FBQztRQUNqTixNQUFNLEtBQUssR0FBRyxJQUFBLGNBQUUsRUFBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3BDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLGNBQUUsRUFBQyxTQUFTLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7SUFDM0YsQ0FBQztDQUNKO0FBdENELDhEQXNDQyIsImZpbGUiOiJsaWIvbW9kZWxzL2Rpc3RhbmNlLm1vZGVsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZm4sIGxpdGVyYWwsIFByb2plY3Rpb25BbGlhcyB9IGZyb20gXCJzZXF1ZWxpemVcIjtcbmltcG9ydCB7IERpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlIH0gZnJvbSBcIi4uL3NlcnZpY2VzL2RpYWxlY3QtZm9ybWF0dGVyLnNlcnZpY2VcIjtcbmltcG9ydCB7XG4gICAgQ3VzdG9tQXR0cmlidXRlc0NvbmZpZyxcbiAgICBDdXN0b21BdHRyaWJ1dGVzQ29udGV4dCxcbiAgICBDdXN0b21BdHRyaWJ1dGVzT3B0aW9uQ29uZmlnXG59IGZyb20gXCIuL2N1c3RvbS1hdHRyaWJ1dGVzLm1vZGVsXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgQmFzZURpc3RhbmNlQ29uZmlnIGV4dGVuZHMgQ3VzdG9tQXR0cmlidXRlc09wdGlvbkNvbmZpZyB7XG4gICAgY29vcmRpbmF0ZXM6IChvcHRpb24/KSA9PiBbbnVtYmVyLCBudW1iZXJdO1xuICAgIHNyaWQ/OiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGlzdGFuY2VDb25maWdXaXRoUG9pbnQge1xuICAgIGF0dHJpYnV0ZTogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIERpc3RhbmNlQ29uZmlnV2l0aExhdExuZyB7XG4gICAgbGF0QXR0cmlidXRlOiBzdHJpbmc7XG4gICAgbG5nQXR0cmlidXRlOiBzdHJpbmc7XG59XG5cbmV4cG9ydCB0eXBlIERpc3RhbmNlQ29uZmlnID0gQmFzZURpc3RhbmNlQ29uZmlnICYgKERpc3RhbmNlQ29uZmlnV2l0aFBvaW50IHwgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKTtcblxuZXhwb3J0IGNsYXNzIERpc3RhbmNlQXR0cmlidXRlc0NvbmZpZyBpbXBsZW1lbnRzIEN1c3RvbUF0dHJpYnV0ZXNDb25maWc8RGlzdGFuY2VDb25maWcsIERpc3RhbmNlQXR0cmlidXRlc0NvbnRleHQ+IHtcbiAgICBwdWJsaWMgdHlwZSA9IFwiZGlzdGFuY2VcIjtcblxuICAgIGNvbnN0cnVjdG9yKHB1YmxpYyBrZXk6IHN0cmluZywgcHVibGljIGNvbmZpZzogRGlzdGFuY2VDb25maWcpIHt9XG5cbiAgICBwdWJsaWMgd2l0aENvbnRleHQoZGlhbGVjdEZvcm1hdHRlclNlcnZpY2U6IERpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlKTogRGlzdGFuY2VBdHRyaWJ1dGVzQ29udGV4dCB7XG4gICAgICAgIHJldHVybiBuZXcgRGlzdGFuY2VBdHRyaWJ1dGVzQ29udGV4dCh0aGlzLCBkaWFsZWN0Rm9ybWF0dGVyU2VydmljZSk7XG4gICAgfVxuXG4gICAgcHVibGljIHNob3VsZEdyb3VwQnkoKTogYm9vbGVhbiB7XG4gICAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG59XG5cbmV4cG9ydCBjbGFzcyBEaXN0YW5jZUF0dHJpYnV0ZXNDb250ZXh0IGV4dGVuZHMgQ3VzdG9tQXR0cmlidXRlc0NvbnRleHQge1xuICAgIGNvbnN0cnVjdG9yKHByaXZhdGUgY29uZmlnOiBEaXN0YW5jZUF0dHJpYnV0ZXNDb25maWcsIHByaXZhdGUgZGlhbGVjdEZvcm1hdHRlclNlcnZpY2U6IERpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlKSB7XG4gICAgICAgIHN1cGVyKCk7XG4gICAgfVxuXG4gICAgcHVibGljIHRyYW5zZm9ybShvcHRpb25zOiBvYmplY3QsIHBhdGg/OiBzdHJpbmcpOiBzdHJpbmcgfCBQcm9qZWN0aW9uQWxpYXMge1xuICAgICAgICBpZiAoIW9wdGlvbnMpIHtcbiAgICAgICAgICAgIHJldHVybiBudWxsO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgY29vcmRpbmF0ZXMgPSB0aGlzLmNvbmZpZy5jb25maWcuY29vcmRpbmF0ZXMob3B0aW9ucyk7XG4gICAgICAgIGlmICghY29vcmRpbmF0ZXMgfHwgY29vcmRpbmF0ZXMubGVuZ3RoIDwgMikge1xuICAgICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBbbGF0aXR1ZGUsIGxvbmdpdHVkZV0gPSBjb29yZGluYXRlcztcbiAgICAgICAgaWYgKHR5cGVvZiBsYXRpdHVkZSAhPT0gXCJudW1iZXJcIiB8fCB0eXBlb2YgbG9uZ2l0dWRlICE9PSBcIm51bWJlclwiKSB7XG4gICAgICAgICAgICByZXR1cm4gbnVsbDtcbiAgICAgICAgfVxuICAgICAgICBpZiAocGF0aCB8fCB0aGlzLmNvbmZpZy5jb25maWcucGF0aCkge1xuICAgICAgICAgICAgcGF0aCA9IFtwYXRoLCB0aGlzLmNvbmZpZy5jb25maWcucGF0aF0uZmlsdGVyKHggPT4geCkuam9pbihcIi5cIik7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBsb2NhdGlvbiA9IGZuKFwiU1RfR2VvbWV0cnlGcm9tVGV4dFwiLCBsaXRlcmFsKGAnUE9JTlQoJHtsYXRpdHVkZX0gJHtsb25naXR1ZGV9KSdgKSwgdGhpcy5jb25maWcuY29uZmlnLnNyaWQgPz8gMCk7XG4gICAgICAgIHJldHVybiBbZm4oXCJTVF9EaXN0YW5jZV9TcGhlcmVcIiwgdGhpcy5nZXRQb2ludEF0dHJpYnV0ZShwYXRoKSwgbG9jYXRpb24pLCB0aGlzLmNvbmZpZy5jb25maWcubmFtZSA/PyB0aGlzLmNvbmZpZy5rZXldO1xuICAgIH1cblxuICAgIHByaXZhdGUgZ2V0UG9pbnRBdHRyaWJ1dGUocGF0aDogc3RyaW5nKSB7XG4gICAgICAgIGlmICgodGhpcy5jb25maWcuY29uZmlnIGFzIERpc3RhbmNlQ29uZmlnV2l0aFBvaW50KS5hdHRyaWJ1dGUpIHtcbiAgICAgICAgICAgIGNvbnN0IGF0dCA9ICh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoUG9pbnQpLmF0dHJpYnV0ZTtcbiAgICAgICAgICAgIHJldHVybiBsaXRlcmFsKHBhdGggPyB0aGlzLmRpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlLmdldExpdGVyYWxGdWxsTmFtZShhdHQsIHBhdGgpIDogYXR0KTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IGxhdCA9IHBhdGggPyBsaXRlcmFsKHRoaXMuZGlhbGVjdEZvcm1hdHRlclNlcnZpY2UuZ2V0TGl0ZXJhbEZ1bGxOYW1lKCh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sYXRBdHRyaWJ1dGUsIHBhdGgpKSA6ICh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sYXRBdHRyaWJ1dGU7XG4gICAgICAgIGNvbnN0IGxuZyA9IHBhdGggPyBsaXRlcmFsKHRoaXMuZGlhbGVjdEZvcm1hdHRlclNlcnZpY2UuZ2V0TGl0ZXJhbEZ1bGxOYW1lKCh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sbmdBdHRyaWJ1dGUsIHBhdGgpKSA6ICh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sbmdBdHRyaWJ1dGU7XG4gICAgICAgIGNvbnN0IHBvaW50ID0gZm4oXCJQb2ludFwiLCBsbmcsIGxhdCk7XG4gICAgICAgIHJldHVybiB0aGlzLmNvbmZpZy5jb25maWcuc3JpZCA/IGZuKFwiU1RfU1JJRFwiLCBwb2ludCwgdGhpcy5jb25maWcuY29uZmlnLnNyaWQpIDogcG9pbnQ7XG4gICAgfVxufSJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvZGlzdGFuY2UubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQXlEO0FBRXpELHdEQUFvRDtBQW1CcEQsTUFBYSx3QkFBd0I7SUFHakMsWUFBbUIsR0FBVyxFQUFTLE1BQXNCO1FBQTFDLFFBQUcsR0FBSCxHQUFHLENBQVE7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFnQjtRQUZ0RCxTQUFJLEdBQUcsVUFBVSxDQUFDO0lBRXVDLENBQUM7SUFFMUQsU0FBUyxDQUFDLE9BQWUsRUFBRSxJQUFhOztRQUMzQyxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ1YsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3JELElBQUksQ0FBQyxXQUFXLElBQUksV0FBVyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDeEMsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE1BQU0sQ0FBQyxRQUFRLEVBQUUsU0FBUyxDQUFDLEdBQUcsV0FBVyxDQUFDO1FBQzFDLElBQUksT0FBTyxRQUFRLEtBQUssUUFBUSxJQUFJLE9BQU8sU0FBUyxLQUFLLFFBQVEsRUFBRTtZQUMvRCxPQUFPLElBQUksQ0FBQztTQUNmO1FBQ0QsSUFBSSxJQUFJLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7WUFDMUIsSUFBSSxHQUFHLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQzVEO1FBRUQsTUFBTSxRQUFRLEdBQUcsSUFBQSxjQUFFLEVBQUMscUJBQXFCLEVBQUUsSUFBQSxtQkFBTyxFQUFDLFVBQVUsUUFBUSxJQUFJLFNBQVMsSUFBSSxDQUFDLEVBQUUsTUFBQSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksbUNBQUksQ0FBQyxDQUFDLENBQUM7UUFDaEgsT0FBTyxDQUFDLElBQUEsY0FBRSxFQUFDLG9CQUFvQixFQUFFLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFBRSxRQUFRLENBQUMsRUFBRSxNQUFBLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxtQ0FBSSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDNUcsQ0FBQztJQUVNLGFBQWE7UUFDaEIsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVPLGlCQUFpQixDQUFDLElBQVk7UUFDbEMsSUFBSyxJQUFJLENBQUMsTUFBa0MsQ0FBQyxTQUFTLEVBQUU7WUFDcEQsTUFBTSxHQUFHLEdBQUksSUFBSSxDQUFDLE1BQWtDLENBQUMsU0FBUyxDQUFDO1lBQy9ELE9BQU8sSUFBQSxtQkFBTyxFQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQzdFO1FBRUQsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBRSxJQUFJLENBQUMsTUFBbUMsQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUUsSUFBSSxDQUFDLE1BQW1DLENBQUMsWUFBWSxDQUFDO1FBQ3JMLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBTyxFQUFDLGdDQUFjLENBQUMsa0JBQWtCLENBQUUsSUFBSSxDQUFDLE1BQW1DLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFFLElBQUksQ0FBQyxNQUFtQyxDQUFDLFlBQVksQ0FBQztRQUNyTCxNQUFNLEtBQUssR0FBRyxJQUFBLGNBQUUsRUFBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3BDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUEsY0FBRSxFQUFDLFNBQVMsRUFBRSxLQUFLLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO0lBQzdFLENBQUM7Q0FDSjtBQTFDRCw0REEwQ0MiLCJmaWxlIjoibGliL21vZGVscy9kaXN0YW5jZS5tb2RlbC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZuLCBsaXRlcmFsLCBQcm9qZWN0aW9uQWxpYXMgfSBmcm9tIFwic2VxdWVsaXplXCI7XG5pbXBvcnQgeyBHcm91cE9wdGlvbiB9IGZyb20gXCJzZXF1ZWxpemUvdHlwZXMvbW9kZWxcIjtcbmltcG9ydCB7IFNlcXVlbGl6ZVV0aWxzIH0gZnJvbSBcIi4uL3NlcXVlbGl6ZS51dGlsc1wiO1xuaW1wb3J0IHsgQ3VzdG9tQXR0cmlidXRlc0NvbmZpZywgQ3VzdG9tQXR0cmlidXRlc09wdGlvbkNvbmZpZyB9IGZyb20gXCIuL2N1c3RvbS1hdHRyaWJ1dGVzLm1vZGVsXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgQmFzZURpc3RhbmNlQ29uZmlnIGV4dGVuZHMgQ3VzdG9tQXR0cmlidXRlc09wdGlvbkNvbmZpZyB7XG4gICAgY29vcmRpbmF0ZXM6IChvcHRpb24/KSA9PiBbbnVtYmVyLCBudW1iZXJdO1xuICAgIHNyaWQ/OiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGlzdGFuY2VDb25maWdXaXRoUG9pbnQge1xuICAgIGF0dHJpYnV0ZTogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIERpc3RhbmNlQ29uZmlnV2l0aExhdExuZyB7XG4gICAgbGF0QXR0cmlidXRlOiBzdHJpbmc7XG4gICAgbG5nQXR0cmlidXRlOiBzdHJpbmc7XG59XG5cbmV4cG9ydCB0eXBlIERpc3RhbmNlQ29uZmlnID0gQmFzZURpc3RhbmNlQ29uZmlnICYgKERpc3RhbmNlQ29uZmlnV2l0aFBvaW50IHwgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKTtcblxuZXhwb3J0IGNsYXNzIERpc3RhbmNlQXR0cmlidXRlc0NvbmZpZyBpbXBsZW1lbnRzIEN1c3RvbUF0dHJpYnV0ZXNDb25maWc8RGlzdGFuY2VDb25maWc+IHtcbiAgICBwdWJsaWMgdHlwZSA9IFwiZGlzdGFuY2VcIjtcblxuICAgIGNvbnN0cnVjdG9yKHB1YmxpYyBrZXk6IHN0cmluZywgcHVibGljIGNvbmZpZzogRGlzdGFuY2VDb25maWcpIHt9XG5cbiAgICBwdWJsaWMgdHJhbnNmb3JtKG9wdGlvbnM6IG9iamVjdCwgcGF0aD86IHN0cmluZyk6IHN0cmluZyB8IFByb2plY3Rpb25BbGlhcyB7XG4gICAgICAgIGlmICghb3B0aW9ucykge1xuICAgICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBjb29yZGluYXRlcyA9IHRoaXMuY29uZmlnLmNvb3JkaW5hdGVzKG9wdGlvbnMpO1xuICAgICAgICBpZiAoIWNvb3JkaW5hdGVzIHx8IGNvb3JkaW5hdGVzLmxlbmd0aCA8IDIpIHtcbiAgICAgICAgICAgIHJldHVybiBudWxsO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgW2xhdGl0dWRlLCBsb25naXR1ZGVdID0gY29vcmRpbmF0ZXM7XG4gICAgICAgIGlmICh0eXBlb2YgbGF0aXR1ZGUgIT09IFwibnVtYmVyXCIgfHwgdHlwZW9mIGxvbmdpdHVkZSAhPT0gXCJudW1iZXJcIikge1xuICAgICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cbiAgICAgICAgaWYgKHBhdGggfHwgdGhpcy5jb25maWcucGF0aCkge1xuICAgICAgICAgICAgcGF0aCA9IFtwYXRoLCB0aGlzLmNvbmZpZy5wYXRoXS5maWx0ZXIoeCA9PiB4KS5qb2luKFwiLlwiKTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IGxvY2F0aW9uID0gZm4oXCJTVF9HZW9tZXRyeUZyb21UZXh0XCIsIGxpdGVyYWwoYCdQT0lOVCgke2xhdGl0dWRlfSAke2xvbmdpdHVkZX0pJ2ApLCB0aGlzLmNvbmZpZy5zcmlkID8/IDApO1xuICAgICAgICByZXR1cm4gW2ZuKFwiU1RfRGlzdGFuY2VfU3BoZXJlXCIsIHRoaXMuZ2V0UG9pbnRBdHRyaWJ1dGUocGF0aCksIGxvY2F0aW9uKSwgdGhpcy5jb25maWcubmFtZSA/PyB0aGlzLmtleV07XG4gICAgfVxuXG4gICAgcHVibGljIHNob3VsZEdyb3VwQnkoKTogYm9vbGVhbiB7XG4gICAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICBwcml2YXRlIGdldFBvaW50QXR0cmlidXRlKHBhdGg6IHN0cmluZykge1xuICAgICAgICBpZiAoKHRoaXMuY29uZmlnIGFzIERpc3RhbmNlQ29uZmlnV2l0aFBvaW50KS5hdHRyaWJ1dGUpIHtcbiAgICAgICAgICAgIGNvbnN0IGF0dCA9ICh0aGlzLmNvbmZpZyBhcyBEaXN0YW5jZUNvbmZpZ1dpdGhQb2ludCkuYXR0cmlidXRlO1xuICAgICAgICAgICAgcmV0dXJuIGxpdGVyYWwocGF0aCA/IFNlcXVlbGl6ZVV0aWxzLmdldExpdGVyYWxGdWxsTmFtZShhdHQsIHBhdGgpIDogYXR0KTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IGxhdCA9IHBhdGggPyBsaXRlcmFsKFNlcXVlbGl6ZVV0aWxzLmdldExpdGVyYWxGdWxsTmFtZSgodGhpcy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sYXRBdHRyaWJ1dGUsIHBhdGgpKSA6ICh0aGlzLmNvbmZpZyBhcyBEaXN0YW5jZUNvbmZpZ1dpdGhMYXRMbmcpLmxhdEF0dHJpYnV0ZTtcbiAgICAgICAgY29uc3QgbG5nID0gcGF0aCA/IGxpdGVyYWwoU2VxdWVsaXplVXRpbHMuZ2V0TGl0ZXJhbEZ1bGxOYW1lKCh0aGlzLmNvbmZpZyBhcyBEaXN0YW5jZUNvbmZpZ1dpdGhMYXRMbmcpLmxuZ0F0dHJpYnV0ZSwgcGF0aCkpIDogKHRoaXMuY29uZmlnIGFzIERpc3RhbmNlQ29uZmlnV2l0aExhdExuZykubG5nQXR0cmlidXRlO1xuICAgICAgICBjb25zdCBwb2ludCA9IGZuKFwiUG9pbnRcIiwgbG5nLCBsYXQpO1xuICAgICAgICByZXR1cm4gdGhpcy5jb25maWcuc3JpZCA/IGZuKFwiU1RfU1JJRFwiLCBwb2ludCwgdGhpcy5jb25maWcuc3JpZCkgOiBwb2ludDtcbiAgICB9XG59XG4iXX0=

package/lib/models/export-types.model.js

@@ -8,6 +8,6 @@ var ExportTypes;
     ExportTypes["CSV"] = "csv";
     ExportTypes["PDF"] = "pdf";
     ExportTypes["ZIP"] = "zip";
-})(ExportTypes || (exports.ExportTypes = ExportTypes = {}));
+})(ExportTypes = exports.ExportTypes || (exports.ExportTypes = {}));
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvZXhwb3J0LXR5cGVzLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLElBQVksV0FNWDtBQU5ELFdBQVksV0FBVztJQUNuQiw0QkFBWSxDQUFBO0lBQ1osNEJBQVksQ0FBQTtJQUNaLDBCQUFVLENBQUE7SUFDViwwQkFBVSxDQUFBO0lBQ1YsMEJBQVUsQ0FBQTtBQUNkLENBQUMsRUFOVyxXQUFXLDJCQUFYLFdBQVcsUUFNdEIiLCJmaWxlIjoibGliL21vZGVscy9leHBvcnQtdHlwZXMubW9kZWwuanMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZW51bSBFeHBvcnRUeXBlcyB7XG4gICAgWExTWD0gXCJ4bHN4XCIsXG4gICAgSFRNTD0gXCJodG1sXCIsXG4gICAgQ1NWPSBcImNzdlwiLFxuICAgIFBERj0gXCJwZGZcIixcbiAgICBaSVA9IFwiemlwXCIsXG59XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvZXhwb3J0LXR5cGVzLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLElBQVksV0FNWDtBQU5ELFdBQVksV0FBVztJQUNuQiw0QkFBWSxDQUFBO0lBQ1osNEJBQVksQ0FBQTtJQUNaLDBCQUFVLENBQUE7SUFDViwwQkFBVSxDQUFBO0lBQ1YsMEJBQVUsQ0FBQTtBQUNkLENBQUMsRUFOVyxXQUFXLEdBQVgsbUJBQVcsS0FBWCxtQkFBVyxRQU10QiIsImZpbGUiOiJsaWIvbW9kZWxzL2V4cG9ydC10eXBlcy5tb2RlbC5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIEV4cG9ydFR5cGVzIHtcbiAgICBYTFNYPSBcInhsc3hcIixcbiAgICBIVE1MPSBcImh0bWxcIixcbiAgICBDU1Y9IFwiY3N2XCIsXG4gICAgUERGPSBcInBkZlwiLFxuICAgIFpJUD0gXCJ6aXBcIixcbn1cbiJdfQ==

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

@@ -1,20 +1,13 @@
 import { ProjectionAlias } from "sequelize";
-import { DialectFormatterService } from "../services/dialect-formatter.service";
-import { CustomAttributesConfig, CustomAttributesContext, CustomAttributesOptionConfig } from "./custom-attributes.model";
+import { CustomAttributesConfig, CustomAttributesOptionConfig } from "./custom-attributes.model";
 export interface SumConfig extends CustomAttributesOptionConfig {
     attribute: string;
 }
-export declare class SumAttributesConfig implements CustomAttributesConfig<SumConfig, SumAttributesContext> {
+export declare class SumAttributesConfig implements CustomAttributesConfig<SumConfig> {
     key: string;
     config: SumConfig;
     type: string;
     constructor(key: string, config: SumConfig);
-    withContext(dialectFormatterService: DialectFormatterService): SumAttributesContext;
-    shouldGroupBy(): boolean;
-}
-export declare class SumAttributesContext extends CustomAttributesContext {
-    private config;
-    private dialectFormatterService;
-    constructor(config: SumAttributesConfig, dialectFormatterService: DialectFormatterService);
     transform(options: object, path?: string): string | ProjectionAlias;
+    shouldGroupBy(): boolean;
 }

package/lib/models/sum.model.js

@@ -1,35 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SumAttributesContext = exports.SumAttributesConfig = void 0;
+exports.SumAttributesConfig = void 0;
 const sequelize_1 = require("sequelize");
-const custom_attributes_model_1 = require("./custom-attributes.model");
+const sequelize_utils_1 = require("../sequelize.utils");
 class SumAttributesConfig {
     constructor(key, config) {
         this.key = key;
         this.config = config;
         this.type = "sum";
     }
-    withContext(dialectFormatterService) {
-        return new SumAttributesContext(this, dialectFormatterService);
+    transform(options, path) {
+        const attribute = this.config.path
+            ? (0, sequelize_1.literal)(sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.config.attribute, this.config.path))
+            : this.config.attribute;
+        return [(0, sequelize_1.fn)("SUM", attribute), this.key];
     }
     shouldGroupBy() {
         return true;
     }
 }
 exports.SumAttributesConfig = SumAttributesConfig;
-class SumAttributesContext extends custom_attributes_model_1.CustomAttributesContext {
-    constructor(config, dialectFormatterService) {
-        super();
-        this.config = config;
-        this.dialectFormatterService = dialectFormatterService;
-    }
-    transform(options, path) {
-        const attribute = this.config.config.path
-            ? (0, sequelize_1.literal)(this.dialectFormatterService.getLiteralFullName(this.config.config.attribute, this.config.config.path))
-            : this.config.config.attribute;
-        return [(0, sequelize_1.fn)("SUM", attribute), this.config.key];
-    }
-}
-exports.SumAttributesContext = SumAttributesContext;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvc3VtLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUF5RDtBQUV6RCx1RUFJbUM7QUFNbkMsTUFBYSxtQkFBbUI7SUFHNUIsWUFBbUIsR0FBVyxFQUFTLE1BQWlCO1FBQXJDLFFBQUcsR0FBSCxHQUFHLENBQVE7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFXO1FBRmpELFNBQUksR0FBRyxLQUFLLENBQUM7SUFFdUMsQ0FBQztJQUVyRCxXQUFXLENBQUMsdUJBQWdEO1FBQy9ELE9BQU8sSUFBSSxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsdUJBQXVCLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRU0sYUFBYTtRQUNoQixPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0NBQ0o7QUFaRCxrREFZQztBQUVELE1BQWEsb0JBQXFCLFNBQVEsaURBQXVCO0lBQzdELFlBQW9CLE1BQTJCLEVBQVUsdUJBQWdEO1FBQ3JHLEtBQUssRUFBRSxDQUFDO1FBRFEsV0FBTSxHQUFOLE1BQU0sQ0FBcUI7UUFBVSw0QkFBdUIsR0FBdkIsdUJBQXVCLENBQXlCO0lBRXpHLENBQUM7SUFFTSxTQUFTLENBQUMsT0FBZSxFQUFFLElBQWE7UUFDM0MsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSTtZQUNyQyxDQUFDLENBQUMsSUFBQSxtQkFBTyxFQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDakgsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztRQUNuQyxPQUFPLENBQUMsSUFBQSxjQUFFLEVBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbkQsQ0FBQztDQUNKO0FBWEQsb0RBV0MiLCJmaWxlIjoibGliL21vZGVscy9zdW0ubW9kZWwuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmbiwgbGl0ZXJhbCwgUHJvamVjdGlvbkFsaWFzIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgRGlhbGVjdEZvcm1hdHRlclNlcnZpY2UgfSBmcm9tIFwiLi4vc2VydmljZXMvZGlhbGVjdC1mb3JtYXR0ZXIuc2VydmljZVwiO1xuaW1wb3J0IHtcbiAgICBDdXN0b21BdHRyaWJ1dGVzQ29uZmlnLFxuICAgIEN1c3RvbUF0dHJpYnV0ZXNDb250ZXh0LFxuICAgIEN1c3RvbUF0dHJpYnV0ZXNPcHRpb25Db25maWdcbn0gZnJvbSBcIi4vY3VzdG9tLWF0dHJpYnV0ZXMubW9kZWxcIjtcblxuZXhwb3J0IGludGVyZmFjZSBTdW1Db25maWcgZXh0ZW5kcyBDdXN0b21BdHRyaWJ1dGVzT3B0aW9uQ29uZmlnIHtcbiAgICBhdHRyaWJ1dGU6IHN0cmluZztcbn1cblxuZXhwb3J0IGNsYXNzIFN1bUF0dHJpYnV0ZXNDb25maWcgaW1wbGVtZW50cyBDdXN0b21BdHRyaWJ1dGVzQ29uZmlnPFN1bUNvbmZpZywgU3VtQXR0cmlidXRlc0NvbnRleHQ+IHtcbiAgICBwdWJsaWMgdHlwZSA9IFwic3VtXCI7XG5cbiAgICBjb25zdHJ1Y3RvcihwdWJsaWMga2V5OiBzdHJpbmcsIHB1YmxpYyBjb25maWc6IFN1bUNvbmZpZykge31cblxuICAgIHB1YmxpYyB3aXRoQ29udGV4dChkaWFsZWN0Rm9ybWF0dGVyU2VydmljZTogRGlhbGVjdEZvcm1hdHRlclNlcnZpY2UpOiBTdW1BdHRyaWJ1dGVzQ29udGV4dCB7XG4gICAgICAgIHJldHVybiBuZXcgU3VtQXR0cmlidXRlc0NvbnRleHQodGhpcywgZGlhbGVjdEZvcm1hdHRlclNlcnZpY2UpO1xuICAgIH1cblxuICAgIHB1YmxpYyBzaG91bGRHcm91cEJ5KCk6IGJvb2xlYW4ge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG59XG5cbmV4cG9ydCBjbGFzcyBTdW1BdHRyaWJ1dGVzQ29udGV4dCBleHRlbmRzIEN1c3RvbUF0dHJpYnV0ZXNDb250ZXh0IHtcbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIGNvbmZpZzogU3VtQXR0cmlidXRlc0NvbmZpZywgcHJpdmF0ZSBkaWFsZWN0Rm9ybWF0dGVyU2VydmljZTogRGlhbGVjdEZvcm1hdHRlclNlcnZpY2UpIHtcbiAgICAgICAgc3VwZXIoKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgdHJhbnNmb3JtKG9wdGlvbnM6IG9iamVjdCwgcGF0aD86IHN0cmluZyk6IHN0cmluZyB8IFByb2plY3Rpb25BbGlhcyB7XG4gICAgICAgIGNvbnN0IGF0dHJpYnV0ZSA9IHRoaXMuY29uZmlnLmNvbmZpZy5wYXRoXG4gICAgICAgICAgICA/IGxpdGVyYWwodGhpcy5kaWFsZWN0Rm9ybWF0dGVyU2VydmljZS5nZXRMaXRlcmFsRnVsbE5hbWUodGhpcy5jb25maWcuY29uZmlnLmF0dHJpYnV0ZSwgdGhpcy5jb25maWcuY29uZmlnLnBhdGgpKVxuICAgICAgICAgICAgOiB0aGlzLmNvbmZpZy5jb25maWcuYXR0cmlidXRlO1xuICAgICAgICByZXR1cm4gW2ZuKFwiU1VNXCIsIGF0dHJpYnV0ZSksIHRoaXMuY29uZmlnLmtleV07XG4gICAgfVxufSJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvc3VtLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLHlDQUF5RDtBQUV6RCx3REFBb0Q7QUFPcEQsTUFBYSxtQkFBbUI7SUFHNUIsWUFBbUIsR0FBVyxFQUFTLE1BQWlCO1FBQXJDLFFBQUcsR0FBSCxHQUFHLENBQVE7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFXO1FBRmpELFNBQUksR0FBRyxLQUFLLENBQUM7SUFFdUMsQ0FBQztJQUVyRCxTQUFTLENBQUMsT0FBZSxFQUFFLElBQWE7UUFDM0MsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJO1lBQzlCLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsZ0NBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3JGLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztRQUM1QixPQUFPLENBQUMsSUFBQSxjQUFFLEVBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM1QyxDQUFDO0lBRU0sYUFBYTtRQUNoQixPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0NBQ0o7QUFmRCxrREFlQyIsImZpbGUiOiJsaWIvbW9kZWxzL3N1bS5tb2RlbC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHRyIH0gZnJvbSBcImRhdGUtZm5zL2xvY2FsZVwiO1xuaW1wb3J0IHsgZm4sIGxpdGVyYWwsIFByb2plY3Rpb25BbGlhcyB9IGZyb20gXCJzZXF1ZWxpemVcIjtcbmltcG9ydCB7IEdyb3VwT3B0aW9uIH0gZnJvbSBcInNlcXVlbGl6ZS90eXBlcy9tb2RlbFwiO1xuaW1wb3J0IHsgU2VxdWVsaXplVXRpbHMgfSBmcm9tIFwiLi4vc2VxdWVsaXplLnV0aWxzXCI7XG5pbXBvcnQgeyBDdXN0b21BdHRyaWJ1dGVzQ29uZmlnLCBDdXN0b21BdHRyaWJ1dGVzT3B0aW9uQ29uZmlnIH0gZnJvbSBcIi4vY3VzdG9tLWF0dHJpYnV0ZXMubW9kZWxcIjtcblxuZXhwb3J0IGludGVyZmFjZSBTdW1Db25maWcgZXh0ZW5kcyBDdXN0b21BdHRyaWJ1dGVzT3B0aW9uQ29uZmlnIHtcbiAgICBhdHRyaWJ1dGU6IHN0cmluZztcbn1cblxuZXhwb3J0IGNsYXNzIFN1bUF0dHJpYnV0ZXNDb25maWcgaW1wbGVtZW50cyBDdXN0b21BdHRyaWJ1dGVzQ29uZmlnPFN1bUNvbmZpZz4ge1xuICAgIHB1YmxpYyB0eXBlID0gXCJzdW1cIjtcblxuICAgIGNvbnN0cnVjdG9yKHB1YmxpYyBrZXk6IHN0cmluZywgcHVibGljIGNvbmZpZzogU3VtQ29uZmlnKSB7fVxuXG4gICAgcHVibGljIHRyYW5zZm9ybShvcHRpb25zOiBvYmplY3QsIHBhdGg/OiBzdHJpbmcpOiBzdHJpbmcgfCBQcm9qZWN0aW9uQWxpYXMge1xuICAgICAgICBjb25zdCBhdHRyaWJ1dGUgPSB0aGlzLmNvbmZpZy5wYXRoXG4gICAgICAgICAgICA/IGxpdGVyYWwoU2VxdWVsaXplVXRpbHMuZ2V0TGl0ZXJhbEZ1bGxOYW1lKHRoaXMuY29uZmlnLmF0dHJpYnV0ZSwgdGhpcy5jb25maWcucGF0aCkpXG4gICAgICAgICAgICA6IHRoaXMuY29uZmlnLmF0dHJpYnV0ZTtcbiAgICAgICAgcmV0dXJuIFtmbihcIlNVTVwiLCBhdHRyaWJ1dGUpLCB0aGlzLmtleV07XG4gICAgfVxuXG4gICAgcHVibGljIHNob3VsZEdyb3VwQnkoKTogYm9vbGVhbiB7XG4gICAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbn1cbiJdfQ==

package/lib/scanners/data-filter.scanner.js

@@ -18,9 +18,9 @@ let DataFilterScanner = class DataFilterScanner {
         return (_a = Reflect.getMetadata(constant_1.ATTRIBUTES, target.prototype)) !== null && _a !== void 0 ? _a : [];
     }
 };
-exports.DataFilterScanner = DataFilterScanner;
-exports.DataFilterScanner = DataFilterScanner = __decorate([
+DataFilterScanner = __decorate([
     (0, common_1.Injectable)()
 ], DataFilterScanner);
+exports.DataFilterScanner = DataFilterScanner;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9zY2FubmVycy9kYXRhLWZpbHRlci5zY2FubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLDJDQUE0QztBQUM1QywwQ0FBdUQ7QUFLaEQsSUFBTSxpQkFBaUIsR0FBdkIsTUFBTSxpQkFBaUI7SUFDbkIsYUFBYSxDQUFDLE1BQVc7UUFDNUIsT0FBTyxPQUFPLENBQUMsV0FBVyxDQUFDLHNCQUFXLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVNLGFBQWEsQ0FBQyxNQUFXOztRQUM1QixPQUFPLE1BQUEsT0FBTyxDQUFDLFdBQVcsQ0FBQyxxQkFBVSxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsbUNBQUksRUFBRSxDQUFDO0lBQ25FLENBQUM7Q0FDSixDQUFBO0FBUlksOENBQWlCOzRCQUFqQixpQkFBaUI7SUFEN0IsSUFBQSxtQkFBVSxHQUFFO0dBQ0EsaUJBQWlCLENBUTdCIiwiZmlsZSI6ImxpYi9zY2FubmVycy9kYXRhLWZpbHRlci5zY2FubmVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gXCJAbmVzdGpzL2NvbW1vblwiO1xuaW1wb3J0IHsgQVRUUklCVVRFUywgREFUQV9GSUxURVIsIH0gZnJvbSBcIi4uL2NvbnN0YW50XCI7XG5pbXBvcnQgeyBEYXRhRmlsdGVyQ29uZmlnIH0gZnJvbSBcIi4uL21vZGVscy9kYXRhLWZpbHRlci5tb2RlbFwiO1xuaW1wb3J0IHsgQXR0cmlidXRlc0NvbmZpZyB9IGZyb20gXCIuLi9tb2RlbHMvYXR0cmlidXRlcy5tb2RlbFwiO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgRGF0YUZpbHRlclNjYW5uZXIge1xuICAgIHB1YmxpYyBnZXREYXRhRmlsdGVyKHRhcmdldDogYW55KTogRGF0YUZpbHRlckNvbmZpZyB7XG4gICAgICAgIHJldHVybiBSZWZsZWN0LmdldE1ldGFkYXRhKERBVEFfRklMVEVSLCB0YXJnZXQpO1xuICAgIH1cblxuICAgIHB1YmxpYyBnZXRBdHRyaWJ1dGVzKHRhcmdldDogYW55KTogQXR0cmlidXRlc0NvbmZpZ1tdIHtcbiAgICAgICAgcmV0dXJuIFJlZmxlY3QuZ2V0TWV0YWRhdGEoQVRUUklCVVRFUywgdGFyZ2V0LnByb3RvdHlwZSkgPz8gW107XG4gICAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9zY2FubmVycy9kYXRhLWZpbHRlci5zY2FubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLDJDQUE0QztBQUM1QywwQ0FBdUQ7QUFLaEQsSUFBTSxpQkFBaUIsR0FBdkIsTUFBTSxpQkFBaUI7SUFDbkIsYUFBYSxDQUFDLE1BQVc7UUFDNUIsT0FBTyxPQUFPLENBQUMsV0FBVyxDQUFDLHNCQUFXLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVNLGFBQWEsQ0FBQyxNQUFXOztRQUM1QixPQUFPLE1BQUEsT0FBTyxDQUFDLFdBQVcsQ0FBQyxxQkFBVSxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsbUNBQUksRUFBRSxDQUFDO0lBQ25FLENBQUM7Q0FDSixDQUFBO0FBUlksaUJBQWlCO0lBRDdCLElBQUEsbUJBQVUsR0FBRTtHQUNBLGlCQUFpQixDQVE3QjtBQVJZLDhDQUFpQiIsImZpbGUiOiJsaWIvc2Nhbm5lcnMvZGF0YS1maWx0ZXIuc2Nhbm5lci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tIFwiQG5lc3Rqcy9jb21tb25cIjtcbmltcG9ydCB7IEFUVFJJQlVURVMsIERBVEFfRklMVEVSLCB9IGZyb20gXCIuLi9jb25zdGFudFwiO1xuaW1wb3J0IHsgRGF0YUZpbHRlckNvbmZpZyB9IGZyb20gXCIuLi9tb2RlbHMvZGF0YS1maWx0ZXIubW9kZWxcIjtcbmltcG9ydCB7IEF0dHJpYnV0ZXNDb25maWcgfSBmcm9tIFwiLi4vbW9kZWxzL2F0dHJpYnV0ZXMubW9kZWxcIjtcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIERhdGFGaWx0ZXJTY2FubmVyIHtcbiAgICBwdWJsaWMgZ2V0RGF0YUZpbHRlcih0YXJnZXQ6IGFueSk6IERhdGFGaWx0ZXJDb25maWcge1xuICAgICAgICByZXR1cm4gUmVmbGVjdC5nZXRNZXRhZGF0YShEQVRBX0ZJTFRFUiwgdGFyZ2V0KTtcbiAgICB9XG5cbiAgICBwdWJsaWMgZ2V0QXR0cmlidXRlcyh0YXJnZXQ6IGFueSk6IEF0dHJpYnV0ZXNDb25maWdbXSB7XG4gICAgICAgIHJldHVybiBSZWZsZWN0LmdldE1ldGFkYXRhKEFUVFJJQlVURVMsIHRhcmdldC5wcm90b3R5cGUpID8/IFtdO1xuICAgIH1cbn1cbiJdfQ==

package/lib/scanners/sequelize-model.scanner.d.ts

@@ -1,12 +1,10 @@
 import { FindAttributeOptions, IncludeOptions, Order } from "sequelize";
 import { Model } from "sequelize-typescript";
-import { IncludeModel, OrderModel } from "..";
+import { OrderModel } from "..";
+import { IncludeModel } from "..";
 import { PathModel } from "../models/path.model";
 import { SearchAttributesModel } from "../models/search-attributes.model";
-import { DialectFormatterService } from "../services/dialect-formatter.service";
 export declare class SequelizeModelScanner {
-    private dialectFormatterService;
-    constructor(dialectFormatterService: DialectFormatterService);
     getIncludes(model: typeof Model, path: PathModel, additionalIncludes: IncludeModel[], attributes?: FindAttributeOptions, ignoreAttributes?: boolean): IncludeOptions[];
     getAttributes(model: typeof Model, path: PathModel, additionalIncludes: IncludeModel[], attributes?: FindAttributeOptions): SearchAttributesModel[];
     getOrder(model: typeof Model, orderObj: OrderModel): Order;