@forestadmin/datasource-customizer 1.67.4 → 1.68.0
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.
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Caller, CollectionSchema, ColumnSchemaValidation, Filter, RecordData } from '@forestadmin/datasource-toolkit';
|
|
1
|
+
import type { AggregateResult, Aggregation, Caller, CollectionSchema, ColumnSchemaValidation, Filter, RecordData } from '@forestadmin/datasource-toolkit';
|
|
2
2
|
import { CollectionDecorator } from '@forestadmin/datasource-toolkit';
|
|
3
3
|
type ValidationRule = ColumnSchemaValidation[number];
|
|
4
4
|
export default class ValidationDecorator extends CollectionDecorator {
|
|
@@ -8,7 +8,9 @@ export default class ValidationDecorator extends CollectionDecorator {
|
|
|
8
8
|
setNullable(name: string): void;
|
|
9
9
|
create(caller: Caller, data: RecordData[]): Promise<RecordData[]>;
|
|
10
10
|
update(caller: Caller, filter: Filter, patch: RecordData): Promise<void>;
|
|
11
|
+
aggregate(caller: Caller, filter: Filter, aggregation: Aggregation, limit?: number): Promise<AggregateResult[]>;
|
|
11
12
|
protected refineSchema(subSchema: CollectionSchema): CollectionSchema;
|
|
13
|
+
private validateAggregation;
|
|
12
14
|
private validate;
|
|
13
15
|
}
|
|
14
16
|
export {};
|
|
@@ -33,6 +33,10 @@ class ValidationDecorator extends datasource_toolkit_1.CollectionDecorator {
|
|
|
33
33
|
this.validate(patch, caller.timezone, false);
|
|
34
34
|
return super.update(caller, filter, patch);
|
|
35
35
|
}
|
|
36
|
+
async aggregate(caller, filter, aggregation, limit) {
|
|
37
|
+
this.validateAggregation(aggregation);
|
|
38
|
+
return super.aggregate(caller, filter, aggregation, limit);
|
|
39
|
+
}
|
|
36
40
|
refineSchema(subSchema) {
|
|
37
41
|
const schema = { ...subSchema, fields: { ...subSchema.fields } };
|
|
38
42
|
for (const [name, rules] of Object.entries(this.validation)) {
|
|
@@ -48,6 +52,41 @@ class ValidationDecorator extends datasource_toolkit_1.CollectionDecorator {
|
|
|
48
52
|
});
|
|
49
53
|
return schema;
|
|
50
54
|
}
|
|
55
|
+
validateAggregation(aggregation) {
|
|
56
|
+
const capabilities = this.schema.aggregationCapabilities;
|
|
57
|
+
if (!capabilities)
|
|
58
|
+
return;
|
|
59
|
+
const groups = aggregation.groups ?? [];
|
|
60
|
+
if (groups.length === 0)
|
|
61
|
+
return;
|
|
62
|
+
if (!capabilities.supportGroups) {
|
|
63
|
+
throw new datasource_toolkit_1.ValidationError('This collection does not support aggregate with groups.');
|
|
64
|
+
}
|
|
65
|
+
for (const group of groups) {
|
|
66
|
+
let { field } = group;
|
|
67
|
+
let { schema } = this;
|
|
68
|
+
if (field.includes(':')) {
|
|
69
|
+
const paths = field.split(':');
|
|
70
|
+
field = paths.pop();
|
|
71
|
+
schema = paths.reduce((s, path) => {
|
|
72
|
+
return this.dataSource.getCollection(s.fields[path].foreignCollection)
|
|
73
|
+
.schema;
|
|
74
|
+
}, this.schema);
|
|
75
|
+
}
|
|
76
|
+
if (!schema.fields[field].isGroupable) {
|
|
77
|
+
throw new datasource_toolkit_1.ValidationError(`Field '${group.field}' is not groupable on "${this.name}".`);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
for (const group of groups) {
|
|
81
|
+
if (group.operation && !capabilities.supportedDateOperations.has(group.operation)) {
|
|
82
|
+
const supported = capabilities.supportedDateOperations.size > 0
|
|
83
|
+
? [...capabilities.supportedDateOperations].join(', ')
|
|
84
|
+
: 'none';
|
|
85
|
+
throw new datasource_toolkit_1.ValidationError(`Collection "${this.name}" does not support the '${group.operation}' date operation. ` +
|
|
86
|
+
`Supported date operations: [${supported}].`);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
51
90
|
validate(record, timezone, allFields) {
|
|
52
91
|
for (const [name, rules] of Object.entries(this.validation)) {
|
|
53
92
|
if (allFields || record[name] !== undefined) {
|
|
@@ -69,4 +108,4 @@ class ValidationDecorator extends datasource_toolkit_1.CollectionDecorator {
|
|
|
69
108
|
}
|
|
70
109
|
}
|
|
71
110
|
exports.default = ValidationDecorator;
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL3ZhbGlkYXRpb24vY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQWFBLHdFQU15QztBQUl6QyxNQUFxQixtQkFBb0IsU0FBUSx3Q0FBbUI7SUFBcEU7O1FBQ1UsZUFBVSxHQUErQyxFQUFFLENBQUM7UUFDNUQsbUJBQWMsR0FBYSxFQUFFLENBQUM7SUFxSXhDLENBQUM7SUFuSUMsYUFBYSxDQUFDLElBQVksRUFBRSxVQUEwQjs7UUFDcEQsbUNBQWMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRXBDLE1BQU0sS0FBSyxHQUFHLGdDQUFXLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVsRSxJQUFJLEtBQUssRUFBRSxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDN0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxrRUFBa0UsQ0FBQyxDQUFDO1FBQ3RGLENBQUM7UUFFRCxJQUFJLEtBQUssQ0FBQyxVQUFVO1lBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQywyQ0FBMkMsQ0FBQyxDQUFDO1FBRW5GLE1BQUEsSUFBSSxDQUFDLFVBQVUsRUFBQyxJQUFJLFNBQUosSUFBSSxJQUFNLEVBQUUsRUFBQztRQUM3QixJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN2QyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRUQsV0FBVyxDQUFDLElBQVk7UUFDdEIsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDL0IsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVRLEtBQUss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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/datasource-customizer",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.68.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@types/uuid": "^10.0.0"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@forestadmin/datasource-toolkit": "1.
|
|
32
|
+
"@forestadmin/datasource-toolkit": "1.51.0",
|
|
33
33
|
"antlr4": "^4.13.1-patch-1",
|
|
34
34
|
"file-type": "^16.5.4",
|
|
35
35
|
"luxon": "^3.2.1",
|