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

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":";;;AAKA,wDAAuD;AASvD,MAAa,gBAAgB;IAA7B;QAKW,qBAAgB,GAA6B,EAAE,CAAC;QAChD,mBAAc,GAAG,KAAK,CAAC;IAwDlC,CAAC;IAtDU,WAAW,CAAC,uBAAgD;QAC/D,OAAO,IAAI,iBAAiB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;IAChE,CAAC;IAEM,QAAQ,CAAC,KAAmB;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEM,eAAe,CAAC,MAAe;QAClC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IACjC,CAAC;IAEM,aAAa,CAAC,UAAiC;QAClD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,uBAAuB,CAAC,UAAoB;QAC/C,IAAI,CAAC,oBAAoB,GAAG,UAAU,CAAC;IAC3C,CAAC;IAEM,gBAAgB,CAAC,aAAuB;QAC3C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAEM,kBAAkB,CAAC,SAAiC;QACvD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAEM,2BAA2B;QAC9B,OAAO,IAAI,CAAC,gBAAgB;aACvB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;aAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACP,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI;YACnB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;YACrB,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC,CAAC;IACZ,CAAC;IAEM,uBAAuB;;QAC1B,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,OAAO,EAAE,CAAC;SACb;QAED,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC3B,OAAO,gCAAc,CAAC,iCAAiC,CAAC,IAAI,CAAC,KAAiB,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;SAC9G;QAED,MAAM,oBAAoB,GAAG,gCAAc,CAAC,4BAA4B,CAAC,IAAI,CAAC,KAAiB,CAAC,CAAC;QACjG,MAAM,UAAU,GAAG,gCAAc,CAAC,iCAAiC,CAAC,IAAI,CAAC,KAAiB,EAAE,MAAA,IAAI,CAAC,UAAsB,mCAAI,EAAE,CAAC,CAAC;QAC/H,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;YACrB,UAAuB,aAAvB,UAAU,uBAAV,UAAU,CAAe,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACtF,oBAAoB,CAAC;IAC7B,CAAC;CACJ;AA9DD,4CA8DC;AAED,MAAa,iBAAiB;IAC1B,YAAoB,MAAwB,EAAU,uBAAgD;QAAlF,WAAM,GAAN,MAAM,CAAkB;QAAU,4BAAuB,GAAvB,uBAAuB,CAAyB;IAAG,CAAC;IAEnG,yBAAyB,CAAC,OAAgB;QAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACxB,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE;gBACrC,OAAO,gCAAc,CAAC,wBAAwB,CAC1C,gCAAc,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;oBACnD,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;iBAClD,CAAC,CACL,CAAC;aACL;YAED,OAAO,gCAAc,CAAC,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAC1E;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,gBAAgB,CAAC,MAAM,EAAE;YACpD,OAAO;gBACH,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAClD,CAAC;SACL;IACL,CAAC;IAEM,mBAAmB,CAAC,OAAgB;QACvC,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB;aAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACP,GAAG,EAAE,CAAC,CAAC,GAAG;YACV,SAAS,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC;YACzE,IAAI,EAAG,CAAC,CAAC,MAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3B,IAAI,EAAG,CAAC,CAAC,MAAc,CAAC,IAAI;gBAC5B,QAAQ,EAAE,IAAI;aACjB,CAAC,CAAC,CAAC,IAAI;SACe,CAAA,CAAC;aAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;CACJ;AAnCD,8CAmCC","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/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/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;

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

@@ -5,9 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequelizeModelScanner = void 0;
 const common_1 = require("@nestjs/common");
@@ -15,11 +12,7 @@ const nestjs_common_1 = require("@recursyve/nestjs-common");
 const sequelize_1 = require("sequelize");
 const sequelize_typescript_1 = require("sequelize-typescript");
 const sequelize_utils_1 = require("../sequelize.utils");
-const dialect_formatter_service_1 = require("../services/dialect-formatter.service");
 let SequelizeModelScanner = class SequelizeModelScanner {
-    constructor(dialectFormatterService) {
-        this.dialectFormatterService = dialectFormatterService;
-    }
     getIncludes(model, path, additionalIncludes, attributes, ignoreAttributes = false) {
         var _a;
         const objects = (_a = path === null || path === void 0 ? void 0 : path.path) === null || _a === void 0 ? void 0 : _a.split(".");
@@ -95,7 +88,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
         result.push(...attributes.map(a => ({
             name: a,
             key: sequelize_utils_1.SequelizeUtils.getAttributeFullName(a, path.path),
-            literalKey: this.dialectFormatterService.getLiteralFullName(a, path.path),
+            literalKey: sequelize_utils_1.SequelizeUtils.getLiteralFullName(a, path.path),
             isJson: sequelize_utils_1.SequelizeUtils.isColumnJson(model, a)
         })));
         for (const include of additionalIncludes) {
@@ -107,7 +100,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
             }, [], (_a = include.searchableAttributes) !== null && _a !== void 0 ? _a : include.attributes).map(a => ({
                 name: a.name,
                 key: sequelize_utils_1.SequelizeUtils.getAttributeFullName(a.name, [path.path, include.path].join(".")),
-                literalKey: this.dialectFormatterService.getLiteralFullName(a.name, [path.path, include.path].join(".")),
+                literalKey: sequelize_utils_1.SequelizeUtils.getLiteralFullName(a.name, [path.path, include.path].join(".")),
                 isJson: a.isJson
             })));
         }
@@ -125,8 +118,8 @@ let SequelizeModelScanner = class SequelizeModelScanner {
         }
         const col = sequelize_utils_1.SequelizeUtils.findColumnFieldName(model, column);
         let literalOrder = values.length ?
-            this.dialectFormatterService.getLiteralFullName(col, values) :
-            this.dialectFormatterService.formatCol(model.name, col);
+            sequelize_utils_1.SequelizeUtils.getLiteralFullName(col, values) :
+            `\`${model.name}\`.\`${col}\``;
         if (orderObj.nullLast) {
             literalOrder = `-${literalOrder}`;
             orderObj.direction = orderObj.direction === "asc" ? "desc" : "asc";
@@ -149,8 +142,8 @@ let SequelizeModelScanner = class SequelizeModelScanner {
             group.push(value);
         }
         return [
-            this.dialectFormatterService.getOrderFullName("id", group),
-            this.dialectFormatterService.getOrderFullName(sequelize_utils_1.SequelizeUtils.findColumnFieldName(model, column), group)
+            sequelize_utils_1.SequelizeUtils.getOrderFullName("id", group),
+            sequelize_utils_1.SequelizeUtils.getOrderFullName(sequelize_utils_1.SequelizeUtils.findColumnFieldName(model, column), group)
         ];
     }
     getOrderIncludes(model, orderObj) {
@@ -196,8 +189,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
 };
 exports.SequelizeModelScanner = SequelizeModelScanner;
 exports.SequelizeModelScanner = SequelizeModelScanner = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [dialect_formatter_service_1.DialectFormatterService])
+    (0, common_1.Injectable)()
 ], SequelizeModelScanner);
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["../lib/scanners/sequelize-model.scanner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,4DAAqD;AACrD,yCAAiF;AACjF,+DAA4F;AAI5F,wDAAuD;AACvD,qFAAgF;AAGzE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,YAAoB,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;IAAG,CAAC;IAEjE,WAAW,CACd,KAAmB,EACnB,IAAe,EACf,kBAAkC,EAClC,UAAiC,EACjC,gBAAgB,GAAG,KAAK;;QAExB,MAAM,OAAO,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,0CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAA,EAAE;YAClB,OAAO,EAAE,CAAC;SACb;QAED,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,IAAI,QAAQ,GAAqB,MAAM,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;YACvB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACrD,QAAQ,CAAC,IAAI,CAAC;gBACV,EAAE,EAAE,WAAW,CAAC,KAAK,EAAY;gBACjC,KAAK,EAAE,WAAW,CAAC,kBAAkB,EAAE;gBACvC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;gBACnD,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,KAAK;aAClB,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC1B,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAgC,CAAC;gBACrD,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAA2B,CAAC;aACtD;SACJ;QAED,IAAI,UAAU,EAAE;YACZ,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gCAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;SACvH;QACD,IAAI,IAAI,CAAC,KAAK,EAAE;YACZ,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,gCAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7E,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC1C;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;SAC/B;QACD,IAAI,IAAI,CAAC,KAAK,EAAE;YACZ,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;SAClC;QAED,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QACvC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QACvC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAE/B,IAAI,yBAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC/C,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;SACxC;QAED,MAAM,WAAW,GAAuB,EAAE,CAAC;QAC3C,KAAK,MAAM,OAAO,IAAI,kBAAkB,EAAE;YACtC,WAAW,CAAC,IAAI,CACZ,IAAI,CAAC,WAAW,CACZ,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAgC,EAC5C;gBACI,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;aACvB,EACD,EAAE,EACF,OAAO,CAAC,UAAU,EAClB,gBAAgB,CACnB,CACJ,CAAC;SACL;QAED,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,gCAAc,CAAC,cAAc,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAE1F,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,aAAa,CAChB,KAAmB,EACnB,IAAe,EACf,kBAAkC,EAClC,UAAiC;;QAEjC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACjB,OAAO,EAAE,CAAC;SACb;QAED,MAAM,MAAM,GAA4B,EAAE,CAAC;QAC3C,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;YACvB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACrD,KAAK,GAAG,WAAW,CAAC,kBAAkB,EAA6B,CAAC;SACvE;QACD,UAAU,GAAG,UAAU,CAAC,CAAC;YACrB,gCAAc,CAAC,iCAAiC,CAAC,KAAiB,EAAE,UAAsB,CAAC,CAAC,CAAC;YAC7F,gCAAc,CAAC,4BAA4B,CAAC,KAAiB,CAAC,CAAC;QACnE,MAAM,CAAC,IAAI,CACP,GAAI,UAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAClC,IAAI,EAAE,CAAC;YACP,GAAG,EAAE,gCAAc,CAAC,oBAAoB,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC;YACtD,UAAU,EAAE,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC;YACzE,MAAM,EAAE,gCAAc,CAAC,YAAY,CAAC,KAAiB,EAAE,CAAC,CAAC;SAC5D,CAAC,CAAC,CACN,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,kBAAkB,EAAE;YACtC,IAAI,OAAO,CAAC,cAAc,EAAE;gBACxB,SAAS;aACZ;YAED,MAAM,CAAC,IAAI,CACP,GAAG,IAAI,CAAC,aAAa,CACjB,KAAqB,EACrB;gBACI,IAAI,EAAE,OAAO,CAAC,IAAI;aACrB,EACD,EAAE,EACF,MAAA,OAAO,CAAC,oBAAoB,mCAAI,OAAO,CAAC,UAAU,CACrD,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACR,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,GAAG,EAAE,gCAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrF,UAAU,EAAE,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxG,MAAM,EAAE,CAAC,CAAC,MAAM;aACnB,CAAC,CAAC,CACN,CAAC;SACL;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,QAAQ,CAAC,KAAmB,EAAE,QAAoB;QACrD,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAA,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE;YAC1C,OAAO;SACV;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;QAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YACxB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACvD,KAAK,GAAG,WAAW,CAAC,kBAAkB,EAA6B,CAAC;SACvE;QACD,MAAM,GAAG,GAAG,gCAAc,CAAC,mBAAmB,CAAC,KAAiB,EAAE,MAAM,CAAC,CAAC;QAC1E,IAAI,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;YAC9B,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;YAC9D,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAE5D,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACnB,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;YAClC,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;SACtE;QAED,IAAI,QAAQ,CAAC,SAAS,KAAK,MAAM,EAAE;YAC/B,YAAY,IAAI,OAAO,CAAC;SAC3B;QACD,OAAO,IAAA,mBAAO,EAAC,YAAY,CAAU,CAAC;IAC1C,CAAC;IAEM,QAAQ,CAAC,KAAmB,EAAE,QAAoB;QACrD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,SAAS,KAAK,EAAE,EAAE;YAC5D,OAAO;SACV;QAED,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;QAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YACxB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACvD,KAAK,GAAG,WAAW,CAAC,kBAAkB,EAA6B,CAAC;YACpE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACrB;QACD,OAAO;YACH,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC;YAC1D,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,gCAAc,CAAC,mBAAmB,CAAC,KAAiB,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC;SACtH,CAAC;IACN,CAAC;IAEM,gBAAgB,CAAC,KAAmB,EAAE,QAAoB;QAC7D,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,SAAS,KAAK,EAAE,EAAE;YAC5D,OAAO,EAAE,CAAC;SACb;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;YACpB,OAAO,EAAE,CAAC;SACb;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAqB,EAAE,CAAC;QACpC,IAAI,QAAQ,GAAqB,MAAM,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YACxB,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACvD,QAAQ,CAAC,IAAI,CAAC;gBACV,EAAE,EAAE,WAAW,CAAC,KAAK,EAAY;gBACjC,KAAK,EAAE,WAAW,CAAC,kBAAkB,EAAE;gBACvC,UAAU,EAAE,EAAE;gBACd,OAAO,EAAE,EAAE;gBACX,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,WAAW,CAAC,cAAc,EAAE,KAAK,kCAAW,CAAC,aAAa,CAAC,CAAC,CAAC;oBAClE,UAAU,EAAE,EAAE;iBACjB,CAAC,CAAC,CAAC,SAAS;aAChB,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAgC,CAAC;gBACrD,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAA2B,CAAC;aACtD;SACJ;QAED,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,eAAe,CAAC,KAAmB,EAAE,GAAW;QACpD,MAAM,YAAY,GAAG,IAAA,sCAAe,EAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC;QAC9D,IAAI,CAAC,WAAW,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,EAAE,CAAC,CAAC;SAC5D;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ,CAAA;AApOY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAEoC,mDAAuB;GAD3D,qBAAqB,CAoOjC","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 { IncludeModel, OrderModel } from \"..\";\nimport { PathModel } from \"../models/path.model\";\nimport { SearchAttributesModel } from \"../models/search-attributes.model\";\nimport { M, SequelizeUtils } from \"../sequelize.utils\";\nimport { DialectFormatterService } from \"../services/dialect-formatter.service\";\n\n@Injectable()\nexport class SequelizeModelScanner {\n    constructor(private dialectFormatterService: DialectFormatterService) {}\n\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 ? [] : { include: [] },\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        if (path.limit) {\n            includes[0].limit = path.limit;\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                        limit: include.limit\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: this.dialectFormatterService.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: this.dialectFormatterService.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?.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            this.dialectFormatterService.getLiteralFullName(col, values) :\n            this.dialectFormatterService.formatCol(model.name, col);\n\n        if (orderObj.nullLast) {\n            literalOrder = `-${literalOrder}`;\n            orderObj.direction = orderObj.direction === \"asc\" ? \"desc\" : \"asc\";\n        }\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            this.dialectFormatterService.getOrderFullName(\"id\", group),\n            this.dialectFormatterService.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 ? [] : { include: [] },\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        if (path.limit) {\n            includes[0].limit = path.limit;\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                        limit: include.limit\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?.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\n        if (orderObj.nullLast) {\n            literalOrder = `-${literalOrder}`;\n            orderObj.direction = orderObj.direction === \"asc\" ? \"desc\" : \"asc\";\n        }\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

@@ -18,10 +18,13 @@ export declare class SequelizeUtils {
     static mergeOrder(a: Order, b: Order): Order;
     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;
     static getModelSearchableAttributes(model: typeof M): string[];
     static getModelSearchableFieldAttributes(model: typeof M, fields: string[]): string[];
     static reduceModelFromPath(model: M, path: string): any;
     static findColumnFieldName(model: typeof M, name: string): string;
     static isColumnJson(model: typeof M, name: string): boolean;
+    static getGroupLiteral(model: typeof M, group: string): string;
     static generateWhereConditions(model: IncludeWhereModel, options?: object): WhereOptions;
 }