@recursyve/nestjs-data-filter 9.3.3 → 9.4.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/adapters/default-access-control.adapter.js +3 -3
- package/lib/adapters/default-export.adapter.js +3 -3
- package/lib/adapters/default-translate.adapter.js +3 -3
- package/lib/data-filter.repository.d.ts +5 -3
- package/lib/data-filter.repository.js +19 -16
- package/lib/data-filter.service.d.ts +4 -4
- package/lib/data-filter.service.js +10 -9
- package/lib/filter/base-filter.d.ts +3 -0
- package/lib/filter/base-filter.js +19 -1
- package/lib/filter/controllers/dynamic-filter.controller.js +2 -2
- package/lib/filter/controllers/filter.controller.js +2 -2
- package/lib/filter/decorators/inject-filter.decorator.d.ts +1 -1
- package/lib/filter/filter.factory.d.ts +2 -1
- package/lib/filter/filter.factory.js +3 -3
- package/lib/filter/filter.provider.js +3 -2
- package/lib/filter/filter.service.d.ts +3 -1
- package/lib/filter/filter.service.js +20 -13
- package/lib/filter/filters/date-time.filter.js +12 -5
- package/lib/filter/filters/filter.d.ts +3 -0
- package/lib/filter/filters/filter.js +7 -4
- package/lib/filter/filters/geo-bounds.filter.js +2 -3
- package/lib/filter/filters/geo-localization.filter.js +2 -2
- package/lib/filter/filters/group.filter.d.ts +3 -0
- package/lib/filter/filters/group.filter.js +9 -2
- package/lib/filter/guards/filter-query.guard.js +3 -3
- package/lib/filter/interceptors/data-file-download.interceptor.js +3 -3
- package/lib/filter/operators.js +2 -2
- package/lib/filter/order-rules/enum.order-rule.js +2 -3
- package/lib/filter/order-rules/if.order-rule.js +2 -3
- package/lib/filter/order-rules/is-null.order-rule.js +2 -3
- package/lib/filter/order-rules/order-rule.d.ts +3 -0
- package/lib/filter/order-rules/order-rule.js +5 -2
- package/lib/filter/type.js +2 -2
- package/lib/index.js +6 -5
- package/lib/models/attributes.model.d.ts +8 -1
- package/lib/models/attributes.model.js +21 -11
- package/lib/models/count.model.d.ts +11 -4
- package/lib/models/count.model.js +25 -14
- package/lib/models/custom-attributes.model.d.ts +6 -2
- package/lib/models/custom-attributes.model.js +5 -1
- package/lib/models/data-filter.model.d.ts +9 -2
- package/lib/models/data-filter.model.js +40 -30
- package/lib/models/distance.model.d.ts +10 -3
- package/lib/models/distance.model.js +29 -18
- package/lib/models/export-types.model.js +2 -2
- package/lib/models/sum.model.d.ts +10 -3
- package/lib/models/sum.model.js +19 -8
- package/lib/scanners/data-filter.scanner.js +3 -3
- package/lib/scanners/sequelize-model.scanner.d.ts +4 -2
- package/lib/scanners/sequelize-model.scanner.js +20 -11
- package/lib/sequelize.utils.d.ts +0 -3
- package/lib/sequelize.utils.js +1 -18
- package/lib/services/data-filter-validation.service.js +3 -3
- package/lib/services/dialect-formatter.service.js +3 -3
- package/package.json +1 -1
- package/lib/filter/filters/options.filter.d.ts +0 -46
- package/lib/filter/filters/options.filter.js +0 -111
|
@@ -1,20 +1,34 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DistanceAttributesConfig = void 0;
|
|
3
|
+
exports.DistanceAttributesContext = exports.DistanceAttributesConfig = void 0;
|
|
4
4
|
const sequelize_1 = require("sequelize");
|
|
5
|
-
const
|
|
5
|
+
const custom_attributes_model_1 = require("./custom-attributes.model");
|
|
6
6
|
class DistanceAttributesConfig {
|
|
7
7
|
constructor(key, config) {
|
|
8
8
|
this.key = key;
|
|
9
9
|
this.config = config;
|
|
10
10
|
this.type = "distance";
|
|
11
11
|
}
|
|
12
|
+
withContext(dialectFormatterService) {
|
|
13
|
+
return new DistanceAttributesContext(this, dialectFormatterService);
|
|
14
|
+
}
|
|
15
|
+
shouldGroupBy() {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
exports.DistanceAttributesConfig = DistanceAttributesConfig;
|
|
20
|
+
class DistanceAttributesContext extends custom_attributes_model_1.CustomAttributesContext {
|
|
21
|
+
constructor(config, dialectFormatterService) {
|
|
22
|
+
super();
|
|
23
|
+
this.config = config;
|
|
24
|
+
this.dialectFormatterService = dialectFormatterService;
|
|
25
|
+
}
|
|
12
26
|
transform(options, path) {
|
|
13
27
|
var _a, _b;
|
|
14
28
|
if (!options) {
|
|
15
29
|
return null;
|
|
16
30
|
}
|
|
17
|
-
const coordinates = this.config.coordinates(options);
|
|
31
|
+
const coordinates = this.config.config.coordinates(options);
|
|
18
32
|
if (!coordinates || coordinates.length < 2) {
|
|
19
33
|
return null;
|
|
20
34
|
}
|
|
@@ -22,26 +36,23 @@ class DistanceAttributesConfig {
|
|
|
22
36
|
if (typeof latitude !== "number" || typeof longitude !== "number") {
|
|
23
37
|
return null;
|
|
24
38
|
}
|
|
25
|
-
if (path || this.config.path) {
|
|
26
|
-
path = [path, this.config.path].filter(x => x).join(".");
|
|
39
|
+
if (path || this.config.config.path) {
|
|
40
|
+
path = [path, this.config.config.path].filter(x => x).join(".");
|
|
27
41
|
}
|
|
28
|
-
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);
|
|
29
|
-
return [(0, sequelize_1.fn)("ST_Distance_Sphere", this.getPointAttribute(path), location), (_b = this.config.name) !== null && _b !== void 0 ? _b : this.key];
|
|
30
|
-
}
|
|
31
|
-
shouldGroupBy() {
|
|
32
|
-
return false;
|
|
42
|
+
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);
|
|
43
|
+
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];
|
|
33
44
|
}
|
|
34
45
|
getPointAttribute(path) {
|
|
35
|
-
if (this.config.attribute) {
|
|
36
|
-
const att = this.config.attribute;
|
|
37
|
-
return (0, sequelize_1.literal)(path ?
|
|
46
|
+
if (this.config.config.attribute) {
|
|
47
|
+
const att = this.config.config.attribute;
|
|
48
|
+
return (0, sequelize_1.literal)(path ? this.dialectFormatterService.getLiteralFullName(att, path) : att);
|
|
38
49
|
}
|
|
39
|
-
const lat = path ? (0, sequelize_1.literal)(
|
|
40
|
-
const lng = path ? (0, sequelize_1.literal)(
|
|
50
|
+
const lat = path ? (0, sequelize_1.literal)(this.dialectFormatterService.getLiteralFullName(this.config.config.latAttribute, path)) : this.config.config.latAttribute;
|
|
51
|
+
const lng = path ? (0, sequelize_1.literal)(this.dialectFormatterService.getLiteralFullName(this.config.config.lngAttribute, path)) : this.config.config.lngAttribute;
|
|
41
52
|
const point = (0, sequelize_1.fn)("Point", lng, lat);
|
|
42
|
-
return this.config.srid ? (0, sequelize_1.fn)("ST_SRID", point, this.config.srid) : point;
|
|
53
|
+
return this.config.config.srid ? (0, sequelize_1.fn)("ST_SRID", point, this.config.config.srid) : point;
|
|
43
54
|
}
|
|
44
55
|
}
|
|
45
|
-
exports.
|
|
56
|
+
exports.DistanceAttributesContext = DistanceAttributesContext;
|
|
46
57
|
|
|
47
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvZGlzdGFuY2UubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEseUNBQXlEO0FBRXpELHVFQUltQztBQWtCbkMsTUFBYSx3QkFBd0I7SUFHakMsWUFBbUIsR0FBVyxFQUFTLE1BQXNCO1FBQTFDLFFBQUcsR0FBSCxHQUFHLENBQVE7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFnQjtRQUZ0RCxTQUFJLEdBQUcsVUFBVSxDQUFDO0lBRXVDLENBQUM7SUFFMUQsV0FBVyxDQUFDLHVCQUFnRDtRQUMvRCxPQUFPLElBQUkseUJBQXlCLENBQUMsSUFBSSxFQUFFLHVCQUF1QixDQUFDLENBQUM7SUFDeEUsQ0FBQztJQUVNLGFBQWE7UUFDaEIsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztDQUNKO0FBWkQsNERBWUM7QUFFRCxNQUFhLHlCQUEwQixTQUFRLGlEQUF1QjtJQUNsRSxZQUFvQixNQUFnQyxFQUFVLHVCQUFnRDtRQUMxRyxLQUFLLEVBQUUsQ0FBQztRQURRLFdBQU0sR0FBTixNQUFNLENBQTBCO1FBQVUsNEJBQXVCLEdBQXZCLHVCQUF1QixDQUF5QjtJQUU5RyxDQUFDO0lBRU0sU0FBUyxDQUFDLE9BQWUsRUFBRSxJQUFhOztRQUMzQyxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ1YsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUVELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsV0FBVyxJQUFJLFdBQVcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ3hDLE9BQU8sSUFBSSxDQUFDO1NBQ2Y7UUFFRCxNQUFNLENBQUMsUUFBUSxFQUFFLFNBQVMsQ0FBQyxHQUFHLFdBQVcsQ0FBQztRQUMxQyxJQUFJLE9BQU8sUUFBUSxLQUFLLFFBQVEsSUFBSSxPQUFPLFNBQVMsS0FBSyxRQUFRLEVBQUU7WUFDL0QsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUNELElBQUksSUFBSSxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtZQUNqQyxJQUFJLEdBQUcsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1NBQ25FO1FBRUQsTUFBTSxRQUFRLEdBQUcsSUFBQSxjQUFFLEVBQUMscUJBQXFCLEVBQUUsSUFBQSxtQkFBTyxFQUFDLFVBQVUsUUFBUSxJQUFJLFNBQVMsSUFBSSxDQUFDLEVBQUUsTUFBQSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLG1DQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ3ZILE9BQU8sQ0FBQyxJQUFBLGNBQUUsRUFBQyxvQkFBb0IsRUFBRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQUUsUUFBUSxDQUFDLEVBQUUsTUFBQSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLG1DQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUgsQ0FBQztJQUVPLGlCQUFpQixDQUFDLElBQVk7UUFDbEMsSUFBSyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQWtDLENBQUMsU0FBUyxFQUFFO1lBQzNELE1BQU0sR0FBRyxHQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBa0MsQ0FBQyxTQUFTLENBQUM7WUFDdEUsT0FBTyxJQUFBLG1CQUFPLEVBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUMzRjtRQUVELE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBTyxFQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxrQkFBa0IsQ0FBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQW1DLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBbUMsQ0FBQyxZQUFZLENBQUM7UUFDak4sTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFPLEVBQUMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLGtCQUFrQixDQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBbUMsQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFtQyxDQUFDLFlBQVksQ0FBQztRQUNqTixNQUFNLEtBQUssR0FBRyxJQUFBLGNBQUUsRUFBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3BDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLGNBQUUsRUFBQyxTQUFTLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7SUFDM0YsQ0FBQztDQUNKO0FBdENELDhEQXNDQyIsImZpbGUiOiJsaWIvbW9kZWxzL2Rpc3RhbmNlLm1vZGVsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZm4sIGxpdGVyYWwsIFByb2plY3Rpb25BbGlhcyB9IGZyb20gXCJzZXF1ZWxpemVcIjtcbmltcG9ydCB7IERpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlIH0gZnJvbSBcIi4uL3NlcnZpY2VzL2RpYWxlY3QtZm9ybWF0dGVyLnNlcnZpY2VcIjtcbmltcG9ydCB7XG4gICAgQ3VzdG9tQXR0cmlidXRlc0NvbmZpZyxcbiAgICBDdXN0b21BdHRyaWJ1dGVzQ29udGV4dCxcbiAgICBDdXN0b21BdHRyaWJ1dGVzT3B0aW9uQ29uZmlnXG59IGZyb20gXCIuL2N1c3RvbS1hdHRyaWJ1dGVzLm1vZGVsXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgQmFzZURpc3RhbmNlQ29uZmlnIGV4dGVuZHMgQ3VzdG9tQXR0cmlidXRlc09wdGlvbkNvbmZpZyB7XG4gICAgY29vcmRpbmF0ZXM6IChvcHRpb24/KSA9PiBbbnVtYmVyLCBudW1iZXJdO1xuICAgIHNyaWQ/OiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGlzdGFuY2VDb25maWdXaXRoUG9pbnQge1xuICAgIGF0dHJpYnV0ZTogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIERpc3RhbmNlQ29uZmlnV2l0aExhdExuZyB7XG4gICAgbGF0QXR0cmlidXRlOiBzdHJpbmc7XG4gICAgbG5nQXR0cmlidXRlOiBzdHJpbmc7XG59XG5cbmV4cG9ydCB0eXBlIERpc3RhbmNlQ29uZmlnID0gQmFzZURpc3RhbmNlQ29uZmlnICYgKERpc3RhbmNlQ29uZmlnV2l0aFBvaW50IHwgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKTtcblxuZXhwb3J0IGNsYXNzIERpc3RhbmNlQXR0cmlidXRlc0NvbmZpZyBpbXBsZW1lbnRzIEN1c3RvbUF0dHJpYnV0ZXNDb25maWc8RGlzdGFuY2VDb25maWcsIERpc3RhbmNlQXR0cmlidXRlc0NvbnRleHQ+IHtcbiAgICBwdWJsaWMgdHlwZSA9IFwiZGlzdGFuY2VcIjtcblxuICAgIGNvbnN0cnVjdG9yKHB1YmxpYyBrZXk6IHN0cmluZywgcHVibGljIGNvbmZpZzogRGlzdGFuY2VDb25maWcpIHt9XG5cbiAgICBwdWJsaWMgd2l0aENvbnRleHQoZGlhbGVjdEZvcm1hdHRlclNlcnZpY2U6IERpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlKTogRGlzdGFuY2VBdHRyaWJ1dGVzQ29udGV4dCB7XG4gICAgICAgIHJldHVybiBuZXcgRGlzdGFuY2VBdHRyaWJ1dGVzQ29udGV4dCh0aGlzLCBkaWFsZWN0Rm9ybWF0dGVyU2VydmljZSk7XG4gICAgfVxuXG4gICAgcHVibGljIHNob3VsZEdyb3VwQnkoKTogYm9vbGVhbiB7XG4gICAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG59XG5cbmV4cG9ydCBjbGFzcyBEaXN0YW5jZUF0dHJpYnV0ZXNDb250ZXh0IGV4dGVuZHMgQ3VzdG9tQXR0cmlidXRlc0NvbnRleHQge1xuICAgIGNvbnN0cnVjdG9yKHByaXZhdGUgY29uZmlnOiBEaXN0YW5jZUF0dHJpYnV0ZXNDb25maWcsIHByaXZhdGUgZGlhbGVjdEZvcm1hdHRlclNlcnZpY2U6IERpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlKSB7XG4gICAgICAgIHN1cGVyKCk7XG4gICAgfVxuXG4gICAgcHVibGljIHRyYW5zZm9ybShvcHRpb25zOiBvYmplY3QsIHBhdGg/OiBzdHJpbmcpOiBzdHJpbmcgfCBQcm9qZWN0aW9uQWxpYXMge1xuICAgICAgICBpZiAoIW9wdGlvbnMpIHtcbiAgICAgICAgICAgIHJldHVybiBudWxsO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgY29vcmRpbmF0ZXMgPSB0aGlzLmNvbmZpZy5jb25maWcuY29vcmRpbmF0ZXMob3B0aW9ucyk7XG4gICAgICAgIGlmICghY29vcmRpbmF0ZXMgfHwgY29vcmRpbmF0ZXMubGVuZ3RoIDwgMikge1xuICAgICAgICAgICAgcmV0dXJuIG51bGw7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBbbGF0aXR1ZGUsIGxvbmdpdHVkZV0gPSBjb29yZGluYXRlcztcbiAgICAgICAgaWYgKHR5cGVvZiBsYXRpdHVkZSAhPT0gXCJudW1iZXJcIiB8fCB0eXBlb2YgbG9uZ2l0dWRlICE9PSBcIm51bWJlclwiKSB7XG4gICAgICAgICAgICByZXR1cm4gbnVsbDtcbiAgICAgICAgfVxuICAgICAgICBpZiAocGF0aCB8fCB0aGlzLmNvbmZpZy5jb25maWcucGF0aCkge1xuICAgICAgICAgICAgcGF0aCA9IFtwYXRoLCB0aGlzLmNvbmZpZy5jb25maWcucGF0aF0uZmlsdGVyKHggPT4geCkuam9pbihcIi5cIik7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBsb2NhdGlvbiA9IGZuKFwiU1RfR2VvbWV0cnlGcm9tVGV4dFwiLCBsaXRlcmFsKGAnUE9JTlQoJHtsYXRpdHVkZX0gJHtsb25naXR1ZGV9KSdgKSwgdGhpcy5jb25maWcuY29uZmlnLnNyaWQgPz8gMCk7XG4gICAgICAgIHJldHVybiBbZm4oXCJTVF9EaXN0YW5jZV9TcGhlcmVcIiwgdGhpcy5nZXRQb2ludEF0dHJpYnV0ZShwYXRoKSwgbG9jYXRpb24pLCB0aGlzLmNvbmZpZy5jb25maWcubmFtZSA/PyB0aGlzLmNvbmZpZy5rZXldO1xuICAgIH1cblxuICAgIHByaXZhdGUgZ2V0UG9pbnRBdHRyaWJ1dGUocGF0aDogc3RyaW5nKSB7XG4gICAgICAgIGlmICgodGhpcy5jb25maWcuY29uZmlnIGFzIERpc3RhbmNlQ29uZmlnV2l0aFBvaW50KS5hdHRyaWJ1dGUpIHtcbiAgICAgICAgICAgIGNvbnN0IGF0dCA9ICh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoUG9pbnQpLmF0dHJpYnV0ZTtcbiAgICAgICAgICAgIHJldHVybiBsaXRlcmFsKHBhdGggPyB0aGlzLmRpYWxlY3RGb3JtYXR0ZXJTZXJ2aWNlLmdldExpdGVyYWxGdWxsTmFtZShhdHQsIHBhdGgpIDogYXR0KTtcbiAgICAgICAgfVxuXG4gICAgICAgIGNvbnN0IGxhdCA9IHBhdGggPyBsaXRlcmFsKHRoaXMuZGlhbGVjdEZvcm1hdHRlclNlcnZpY2UuZ2V0TGl0ZXJhbEZ1bGxOYW1lKCh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sYXRBdHRyaWJ1dGUsIHBhdGgpKSA6ICh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sYXRBdHRyaWJ1dGU7XG4gICAgICAgIGNvbnN0IGxuZyA9IHBhdGggPyBsaXRlcmFsKHRoaXMuZGlhbGVjdEZvcm1hdHRlclNlcnZpY2UuZ2V0TGl0ZXJhbEZ1bGxOYW1lKCh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sbmdBdHRyaWJ1dGUsIHBhdGgpKSA6ICh0aGlzLmNvbmZpZy5jb25maWcgYXMgRGlzdGFuY2VDb25maWdXaXRoTGF0TG5nKS5sbmdBdHRyaWJ1dGU7XG4gICAgICAgIGNvbnN0IHBvaW50ID0gZm4oXCJQb2ludFwiLCBsbmcsIGxhdCk7XG4gICAgICAgIHJldHVybiB0aGlzLmNvbmZpZy5jb25maWcuc3JpZCA/IGZuKFwiU1RfU1JJRFwiLCBwb2ludCwgdGhpcy5jb25maWcuY29uZmlnLnNyaWQpIDogcG9pbnQ7XG4gICAgfVxufSJdfQ==
|
|
@@ -8,6 +8,6 @@ var ExportTypes;
|
|
|
8
8
|
ExportTypes["CSV"] = "csv";
|
|
9
9
|
ExportTypes["PDF"] = "pdf";
|
|
10
10
|
ExportTypes["ZIP"] = "zip";
|
|
11
|
-
})(ExportTypes
|
|
11
|
+
})(ExportTypes = exports.ExportTypes || (exports.ExportTypes = {}));
|
|
12
12
|
|
|
13
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvZXhwb3J0LXR5cGVzLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLElBQVksV0FNWDtBQU5ELFdBQVksV0FBVztJQUNuQiw0QkFBWSxDQUFBO0lBQ1osNEJBQVksQ0FBQTtJQUNaLDBCQUFVLENBQUE7SUFDViwwQkFBVSxDQUFBO0lBQ1YsMEJBQVUsQ0FBQTtBQUNkLENBQUMsRUFOVyxXQUFXLEdBQVgsbUJBQVcsS0FBWCxtQkFBVyxRQU10QiIsImZpbGUiOiJsaWIvbW9kZWxzL2V4cG9ydC10eXBlcy5tb2RlbC5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIEV4cG9ydFR5cGVzIHtcbiAgICBYTFNYPSBcInhsc3hcIixcbiAgICBIVE1MPSBcImh0bWxcIixcbiAgICBDU1Y9IFwiY3N2XCIsXG4gICAgUERGPSBcInBkZlwiLFxuICAgIFpJUD0gXCJ6aXBcIixcbn1cbiJdfQ==
|
|
@@ -1,13 +1,20 @@
|
|
|
1
1
|
import { ProjectionAlias } from "sequelize";
|
|
2
|
-
import {
|
|
2
|
+
import { DialectFormatterService } from "../services/dialect-formatter.service";
|
|
3
|
+
import { CustomAttributesConfig, CustomAttributesContext, CustomAttributesOptionConfig } from "./custom-attributes.model";
|
|
3
4
|
export interface SumConfig extends CustomAttributesOptionConfig {
|
|
4
5
|
attribute: string;
|
|
5
6
|
}
|
|
6
|
-
export declare class SumAttributesConfig implements CustomAttributesConfig<SumConfig> {
|
|
7
|
+
export declare class SumAttributesConfig implements CustomAttributesConfig<SumConfig, SumAttributesContext> {
|
|
7
8
|
key: string;
|
|
8
9
|
config: SumConfig;
|
|
9
10
|
type: string;
|
|
10
11
|
constructor(key: string, config: SumConfig);
|
|
11
|
-
|
|
12
|
+
withContext(dialectFormatterService: DialectFormatterService): SumAttributesContext;
|
|
12
13
|
shouldGroupBy(): boolean;
|
|
13
14
|
}
|
|
15
|
+
export declare class SumAttributesContext extends CustomAttributesContext {
|
|
16
|
+
private config;
|
|
17
|
+
private dialectFormatterService;
|
|
18
|
+
constructor(config: SumAttributesConfig, dialectFormatterService: DialectFormatterService);
|
|
19
|
+
transform(options: object, path?: string): string | ProjectionAlias;
|
|
20
|
+
}
|
package/lib/models/sum.model.js
CHANGED
|
@@ -1,24 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SumAttributesConfig = void 0;
|
|
3
|
+
exports.SumAttributesContext = exports.SumAttributesConfig = void 0;
|
|
4
4
|
const sequelize_1 = require("sequelize");
|
|
5
|
-
const
|
|
5
|
+
const custom_attributes_model_1 = require("./custom-attributes.model");
|
|
6
6
|
class SumAttributesConfig {
|
|
7
7
|
constructor(key, config) {
|
|
8
8
|
this.key = key;
|
|
9
9
|
this.config = config;
|
|
10
10
|
this.type = "sum";
|
|
11
11
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
? (0, sequelize_1.literal)(sequelize_utils_1.SequelizeUtils.getLiteralFullName(this.config.attribute, this.config.path))
|
|
15
|
-
: this.config.attribute;
|
|
16
|
-
return [(0, sequelize_1.fn)("SUM", attribute), this.key];
|
|
12
|
+
withContext(dialectFormatterService) {
|
|
13
|
+
return new SumAttributesContext(this, dialectFormatterService);
|
|
17
14
|
}
|
|
18
15
|
shouldGroupBy() {
|
|
19
16
|
return true;
|
|
20
17
|
}
|
|
21
18
|
}
|
|
22
19
|
exports.SumAttributesConfig = SumAttributesConfig;
|
|
20
|
+
class SumAttributesContext extends custom_attributes_model_1.CustomAttributesContext {
|
|
21
|
+
constructor(config, dialectFormatterService) {
|
|
22
|
+
super();
|
|
23
|
+
this.config = config;
|
|
24
|
+
this.dialectFormatterService = dialectFormatterService;
|
|
25
|
+
}
|
|
26
|
+
transform(options, path) {
|
|
27
|
+
const attribute = this.config.config.path
|
|
28
|
+
? (0, sequelize_1.literal)(this.dialectFormatterService.getLiteralFullName(this.config.config.attribute, this.config.config.path))
|
|
29
|
+
: this.config.config.attribute;
|
|
30
|
+
return [(0, sequelize_1.fn)("SUM", attribute), this.config.key];
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
exports.SumAttributesContext = SumAttributesContext;
|
|
23
34
|
|
|
24
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9tb2RlbHMvc3VtLm1vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlDQUF5RDtBQUV6RCx1RUFJbUM7QUFNbkMsTUFBYSxtQkFBbUI7SUFHNUIsWUFBbUIsR0FBVyxFQUFTLE1BQWlCO1FBQXJDLFFBQUcsR0FBSCxHQUFHLENBQVE7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFXO1FBRmpELFNBQUksR0FBRyxLQUFLLENBQUM7SUFFdUMsQ0FBQztJQUVyRCxXQUFXLENBQUMsdUJBQWdEO1FBQy9ELE9BQU8sSUFBSSxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsdUJBQXVCLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRU0sYUFBYTtRQUNoQixPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0NBQ0o7QUFaRCxrREFZQztBQUVELE1BQWEsb0JBQXFCLFNBQVEsaURBQXVCO0lBQzdELFlBQW9CLE1BQTJCLEVBQVUsdUJBQWdEO1FBQ3JHLEtBQUssRUFBRSxDQUFDO1FBRFEsV0FBTSxHQUFOLE1BQU0sQ0FBcUI7UUFBVSw0QkFBdUIsR0FBdkIsdUJBQXVCLENBQXlCO0lBRXpHLENBQUM7SUFFTSxTQUFTLENBQUMsT0FBZSxFQUFFLElBQWE7UUFDM0MsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSTtZQUNyQyxDQUFDLENBQUMsSUFBQSxtQkFBTyxFQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDakgsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztRQUNuQyxPQUFPLENBQUMsSUFBQSxjQUFFLEVBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbkQsQ0FBQztDQUNKO0FBWEQsb0RBV0MiLCJmaWxlIjoibGliL21vZGVscy9zdW0ubW9kZWwuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmbiwgbGl0ZXJhbCwgUHJvamVjdGlvbkFsaWFzIH0gZnJvbSBcInNlcXVlbGl6ZVwiO1xuaW1wb3J0IHsgRGlhbGVjdEZvcm1hdHRlclNlcnZpY2UgfSBmcm9tIFwiLi4vc2VydmljZXMvZGlhbGVjdC1mb3JtYXR0ZXIuc2VydmljZVwiO1xuaW1wb3J0IHtcbiAgICBDdXN0b21BdHRyaWJ1dGVzQ29uZmlnLFxuICAgIEN1c3RvbUF0dHJpYnV0ZXNDb250ZXh0LFxuICAgIEN1c3RvbUF0dHJpYnV0ZXNPcHRpb25Db25maWdcbn0gZnJvbSBcIi4vY3VzdG9tLWF0dHJpYnV0ZXMubW9kZWxcIjtcblxuZXhwb3J0IGludGVyZmFjZSBTdW1Db25maWcgZXh0ZW5kcyBDdXN0b21BdHRyaWJ1dGVzT3B0aW9uQ29uZmlnIHtcbiAgICBhdHRyaWJ1dGU6IHN0cmluZztcbn1cblxuZXhwb3J0IGNsYXNzIFN1bUF0dHJpYnV0ZXNDb25maWcgaW1wbGVtZW50cyBDdXN0b21BdHRyaWJ1dGVzQ29uZmlnPFN1bUNvbmZpZywgU3VtQXR0cmlidXRlc0NvbnRleHQ+IHtcbiAgICBwdWJsaWMgdHlwZSA9IFwic3VtXCI7XG5cbiAgICBjb25zdHJ1Y3RvcihwdWJsaWMga2V5OiBzdHJpbmcsIHB1YmxpYyBjb25maWc6IFN1bUNvbmZpZykge31cblxuICAgIHB1YmxpYyB3aXRoQ29udGV4dChkaWFsZWN0Rm9ybWF0dGVyU2VydmljZTogRGlhbGVjdEZvcm1hdHRlclNlcnZpY2UpOiBTdW1BdHRyaWJ1dGVzQ29udGV4dCB7XG4gICAgICAgIHJldHVybiBuZXcgU3VtQXR0cmlidXRlc0NvbnRleHQodGhpcywgZGlhbGVjdEZvcm1hdHRlclNlcnZpY2UpO1xuICAgIH1cblxuICAgIHB1YmxpYyBzaG91bGRHcm91cEJ5KCk6IGJvb2xlYW4ge1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG59XG5cbmV4cG9ydCBjbGFzcyBTdW1BdHRyaWJ1dGVzQ29udGV4dCBleHRlbmRzIEN1c3RvbUF0dHJpYnV0ZXNDb250ZXh0IHtcbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIGNvbmZpZzogU3VtQXR0cmlidXRlc0NvbmZpZywgcHJpdmF0ZSBkaWFsZWN0Rm9ybWF0dGVyU2VydmljZTogRGlhbGVjdEZvcm1hdHRlclNlcnZpY2UpIHtcbiAgICAgICAgc3VwZXIoKTtcbiAgICB9XG5cbiAgICBwdWJsaWMgdHJhbnNmb3JtKG9wdGlvbnM6IG9iamVjdCwgcGF0aD86IHN0cmluZyk6IHN0cmluZyB8IFByb2plY3Rpb25BbGlhcyB7XG4gICAgICAgIGNvbnN0IGF0dHJpYnV0ZSA9IHRoaXMuY29uZmlnLmNvbmZpZy5wYXRoXG4gICAgICAgICAgICA/IGxpdGVyYWwodGhpcy5kaWFsZWN0Rm9ybWF0dGVyU2VydmljZS5nZXRMaXRlcmFsRnVsbE5hbWUodGhpcy5jb25maWcuY29uZmlnLmF0dHJpYnV0ZSwgdGhpcy5jb25maWcuY29uZmlnLnBhdGgpKVxuICAgICAgICAgICAgOiB0aGlzLmNvbmZpZy5jb25maWcuYXR0cmlidXRlO1xuICAgICAgICByZXR1cm4gW2ZuKFwiU1VNXCIsIGF0dHJpYnV0ZSksIHRoaXMuY29uZmlnLmtleV07XG4gICAgfVxufSJdfQ==
|
|
@@ -18,9 +18,9 @@ let DataFilterScanner = class DataFilterScanner {
|
|
|
18
18
|
return (_a = Reflect.getMetadata(constant_1.ATTRIBUTES, target.prototype)) !== null && _a !== void 0 ? _a : [];
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
|
-
|
|
22
|
-
exports.DataFilterScanner = DataFilterScanner = __decorate([
|
|
21
|
+
DataFilterScanner = __decorate([
|
|
23
22
|
(0, common_1.Injectable)()
|
|
24
23
|
], DataFilterScanner);
|
|
24
|
+
exports.DataFilterScanner = DataFilterScanner;
|
|
25
25
|
|
|
26
|
-
//# sourceMappingURL=data:application/json;charset=utf8;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL2xpYi9zY2FubmVycy9kYXRhLWZpbHRlci5zY2FubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLDJDQUE0QztBQUM1QywwQ0FBdUQ7QUFLaEQsSUFBTSxpQkFBaUIsR0FBdkIsTUFBTSxpQkFBaUI7SUFDbkIsYUFBYSxDQUFDLE1BQVc7UUFDNUIsT0FBTyxPQUFPLENBQUMsV0FBVyxDQUFDLHNCQUFXLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUVNLGFBQWEsQ0FBQyxNQUFXOztRQUM1QixPQUFPLE1BQUEsT0FBTyxDQUFDLFdBQVcsQ0FBQyxxQkFBVSxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsbUNBQUksRUFBRSxDQUFDO0lBQ25FLENBQUM7Q0FDSixDQUFBO0FBUlksaUJBQWlCO0lBRDdCLElBQUEsbUJBQVUsR0FBRTtHQUNBLGlCQUFpQixDQVE3QjtBQVJZLDhDQUFpQiIsImZpbGUiOiJsaWIvc2Nhbm5lcnMvZGF0YS1maWx0ZXIuc2Nhbm5lci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tIFwiQG5lc3Rqcy9jb21tb25cIjtcbmltcG9ydCB7IEFUVFJJQlVURVMsIERBVEFfRklMVEVSLCB9IGZyb20gXCIuLi9jb25zdGFudFwiO1xuaW1wb3J0IHsgRGF0YUZpbHRlckNvbmZpZyB9IGZyb20gXCIuLi9tb2RlbHMvZGF0YS1maWx0ZXIubW9kZWxcIjtcbmltcG9ydCB7IEF0dHJpYnV0ZXNDb25maWcgfSBmcm9tIFwiLi4vbW9kZWxzL2F0dHJpYnV0ZXMubW9kZWxcIjtcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIERhdGFGaWx0ZXJTY2FubmVyIHtcbiAgICBwdWJsaWMgZ2V0RGF0YUZpbHRlcih0YXJnZXQ6IGFueSk6IERhdGFGaWx0ZXJDb25maWcge1xuICAgICAgICByZXR1cm4gUmVmbGVjdC5nZXRNZXRhZGF0YShEQVRBX0ZJTFRFUiwgdGFyZ2V0KTtcbiAgICB9XG5cbiAgICBwdWJsaWMgZ2V0QXR0cmlidXRlcyh0YXJnZXQ6IGFueSk6IEF0dHJpYnV0ZXNDb25maWdbXSB7XG4gICAgICAgIHJldHVybiBSZWZsZWN0LmdldE1ldGFkYXRhKEFUVFJJQlVURVMsIHRhcmdldC5wcm90b3R5cGUpID8/IFtdO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { FindAttributeOptions, IncludeOptions, Order } from "sequelize";
|
|
2
2
|
import { Model } from "sequelize-typescript";
|
|
3
|
-
import { OrderModel } from "..";
|
|
4
|
-
import { IncludeModel } from "..";
|
|
3
|
+
import { IncludeModel, OrderModel } from "..";
|
|
5
4
|
import { PathModel } from "../models/path.model";
|
|
6
5
|
import { SearchAttributesModel } from "../models/search-attributes.model";
|
|
6
|
+
import { DialectFormatterService } from "../services/dialect-formatter.service";
|
|
7
7
|
export declare class SequelizeModelScanner {
|
|
8
|
+
private dialectFormatterService;
|
|
9
|
+
constructor(dialectFormatterService: DialectFormatterService);
|
|
8
10
|
getIncludes(model: typeof Model, path: PathModel, additionalIncludes: IncludeModel[], attributes?: FindAttributeOptions, ignoreAttributes?: boolean): IncludeOptions[];
|
|
9
11
|
getAttributes(model: typeof Model, path: PathModel, additionalIncludes: IncludeModel[], attributes?: FindAttributeOptions): SearchAttributesModel[];
|
|
10
12
|
getOrder(model: typeof Model, orderObj: OrderModel): Order;
|
|
@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
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;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
8
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
12
|
exports.SequelizeModelScanner = void 0;
|
|
10
13
|
const common_1 = require("@nestjs/common");
|
|
@@ -12,7 +15,11 @@ const nestjs_common_1 = require("@recursyve/nestjs-common");
|
|
|
12
15
|
const sequelize_1 = require("sequelize");
|
|
13
16
|
const sequelize_typescript_1 = require("sequelize-typescript");
|
|
14
17
|
const sequelize_utils_1 = require("../sequelize.utils");
|
|
18
|
+
const dialect_formatter_service_1 = require("../services/dialect-formatter.service");
|
|
15
19
|
let SequelizeModelScanner = class SequelizeModelScanner {
|
|
20
|
+
constructor(dialectFormatterService) {
|
|
21
|
+
this.dialectFormatterService = dialectFormatterService;
|
|
22
|
+
}
|
|
16
23
|
getIncludes(model, path, additionalIncludes, attributes, ignoreAttributes = false) {
|
|
17
24
|
var _a;
|
|
18
25
|
const objects = (_a = path === null || path === void 0 ? void 0 : path.path) === null || _a === void 0 ? void 0 : _a.split(".");
|
|
@@ -29,7 +36,8 @@ let SequelizeModelScanner = class SequelizeModelScanner {
|
|
|
29
36
|
model: association.getAssociatedClass(),
|
|
30
37
|
attributes: ignoreAttributes ? [] : { include: [] },
|
|
31
38
|
include: [],
|
|
32
|
-
required: false
|
|
39
|
+
required: false,
|
|
40
|
+
...(ignoreAttributes && association.getAssociation() === "belongsToMany" && { through: { attributes: [] } })
|
|
33
41
|
});
|
|
34
42
|
if (i++ < objects.length - 1) {
|
|
35
43
|
model = includes[0].model;
|
|
@@ -88,7 +96,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
|
|
|
88
96
|
result.push(...attributes.map(a => ({
|
|
89
97
|
name: a,
|
|
90
98
|
key: sequelize_utils_1.SequelizeUtils.getAttributeFullName(a, path.path),
|
|
91
|
-
literalKey:
|
|
99
|
+
literalKey: this.dialectFormatterService.getLiteralFullName(a, path.path),
|
|
92
100
|
isJson: sequelize_utils_1.SequelizeUtils.isColumnJson(model, a)
|
|
93
101
|
})));
|
|
94
102
|
for (const include of additionalIncludes) {
|
|
@@ -100,7 +108,7 @@ let SequelizeModelScanner = class SequelizeModelScanner {
|
|
|
100
108
|
}, [], (_a = include.searchableAttributes) !== null && _a !== void 0 ? _a : include.attributes).map(a => ({
|
|
101
109
|
name: a.name,
|
|
102
110
|
key: sequelize_utils_1.SequelizeUtils.getAttributeFullName(a.name, [path.path, include.path].join(".")),
|
|
103
|
-
literalKey:
|
|
111
|
+
literalKey: this.dialectFormatterService.getLiteralFullName(a.name, [path.path, include.path].join(".")),
|
|
104
112
|
isJson: a.isJson
|
|
105
113
|
})));
|
|
106
114
|
}
|
|
@@ -118,8 +126,8 @@ let SequelizeModelScanner = class SequelizeModelScanner {
|
|
|
118
126
|
}
|
|
119
127
|
const col = sequelize_utils_1.SequelizeUtils.findColumnFieldName(model, column);
|
|
120
128
|
let literalOrder = values.length ?
|
|
121
|
-
|
|
122
|
-
|
|
129
|
+
this.dialectFormatterService.getLiteralFullName(col, values) :
|
|
130
|
+
this.dialectFormatterService.formatCol(model.name, col);
|
|
123
131
|
if (orderObj.nullLast) {
|
|
124
132
|
literalOrder = `-${literalOrder}`;
|
|
125
133
|
orderObj.direction = orderObj.direction === "asc" ? "desc" : "asc";
|
|
@@ -142,8 +150,8 @@ let SequelizeModelScanner = class SequelizeModelScanner {
|
|
|
142
150
|
group.push(value);
|
|
143
151
|
}
|
|
144
152
|
return [
|
|
145
|
-
|
|
146
|
-
|
|
153
|
+
this.dialectFormatterService.getOrderFullName("id", group),
|
|
154
|
+
this.dialectFormatterService.getOrderFullName(sequelize_utils_1.SequelizeUtils.findColumnFieldName(model, column), group)
|
|
147
155
|
];
|
|
148
156
|
}
|
|
149
157
|
getOrderIncludes(model, orderObj) {
|
|
@@ -187,9 +195,10 @@ let SequelizeModelScanner = class SequelizeModelScanner {
|
|
|
187
195
|
return association;
|
|
188
196
|
}
|
|
189
197
|
};
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
(
|
|
198
|
+
SequelizeModelScanner = __decorate([
|
|
199
|
+
(0, common_1.Injectable)(),
|
|
200
|
+
__metadata("design:paramtypes", [dialect_formatter_service_1.DialectFormatterService])
|
|
193
201
|
], SequelizeModelScanner);
|
|
202
|
+
exports.SequelizeModelScanner = SequelizeModelScanner;
|
|
194
203
|
|
|
195
|
-
//# 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;AAK5F,wDAAuD;AAGhD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACvB,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,gCAAc,CAAC,kBAAkB,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC;YAC3D,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,gCAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC1F,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,gCAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;YAChD,KAAK,KAAK,CAAC,IAAI,QAAQ,GAAG,IAAI,CAAC;QAEnC,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,gCAAc,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC;YAC5C,gCAAc,CAAC,gBAAgB,CAAC,gCAAc,CAAC,mBAAmB,CAAC,KAAiB,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC;SACxG,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;AAlOY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;GACA,qBAAqB,CAkOjC","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"]}
|
|
204
|
+
//# 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;IACpE,CAAC;IAEM,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;gBACf,GAAG,CAAC,gBAAgB,IAAI,WAAW,CAAC,cAAc,EAAE,KAAK,eAAe,IAAI,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC;aAC/G,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;AAtOY,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAEoC,mDAAuB;GAD3D,qBAAqB,CAsOjC;AAtOY,sDAAqB","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\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                ...(ignoreAttributes && association.getAssociation() === \"belongsToMany\" && { through: { attributes: [] } })\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"]}
|
package/lib/sequelize.utils.d.ts
CHANGED
|
@@ -18,13 +18,10 @@ export declare class SequelizeUtils {
|
|
|
18
18
|
static mergeOrder(a: Order, b: Order): Order;
|
|
19
19
|
static generateWhereValue(rule: RuleModel): WhereAttributeHashValue<any>;
|
|
20
20
|
static getAttributeFullName(attribute: string, path: string): string;
|
|
21
|
-
static getLiteralFullName(attribute: string, path: string | string[]): string;
|
|
22
|
-
static getOrderFullName(attribute: string, path: string[]): string;
|
|
23
21
|
static getModelSearchableAttributes(model: typeof M): string[];
|
|
24
22
|
static getModelSearchableFieldAttributes(model: typeof M, fields: string[]): string[];
|
|
25
23
|
static reduceModelFromPath(model: M, path: string): any;
|
|
26
24
|
static findColumnFieldName(model: typeof M, name: string): string;
|
|
27
25
|
static isColumnJson(model: typeof M, name: string): boolean;
|
|
28
|
-
static getGroupLiteral(model: typeof M, group: string): string;
|
|
29
26
|
static generateWhereConditions(model: IncludeWhereModel, options?: object): WhereOptions;
|
|
30
27
|
}
|