@webtypen/webframez-core 0.3.104 → 0.3.106

package/dist/Database/Model.js

@@ -267,7 +267,7 @@ class Model {
                 type: "aggregation",
                 table: collection ? collection : model ? model.__table : undefined,
                 aggregation: aggregation,
-            }, model.__connection);
+            }, model.__connection, options);
         });
     }
     buildRelationship(model, foreignKey, localKey) {

package/dist/Datatable/Datatable.d.ts

@@ -37,6 +37,8 @@ export declare class Datatable {
     autoApplyFilter: "begin" | "end" | null;
     autoApplySearch: "begin" | "end" | null;
     logAggregation: boolean;
+    deferPresentation: boolean;
+    collation: Record<string, any> | ((req: Request) => Record<string, any> | Promise<Record<string, any>>);
     defaultUnwind?: string | null;
     disablePerPageConfig: boolean;
     selectable: boolean;
@@ -77,6 +79,8 @@ export declare class Datatable {
     }[] | null>;
     getAggregation(req: Request): Promise<any>;
     getSubAggregation(req: Request): Promise<any>;
+    /** Filtered source for whole-result statistics; presentation and pagination are excluded. */
+    getStatisticsAggregation(req: Request): Promise<any[]>;
     getCollection(req: Request): Promise<any>;
     getData(req: Request, context?: DatatableColumnContext): Promise<{
         page: number;

package/dist/Datatable/Datatable.js

@@ -43,6 +43,8 @@ class Datatable {
         this.autoApplyFilter = "begin";
         this.autoApplySearch = null;
         this.logAggregation = false;
+        this.deferPresentation = false;
+        this.collation = { locale: "de", strength: 2 };
         this.defaultUnwind = null;
         this.disablePerPageConfig = false;
         this.selectable = false;
@@ -252,10 +254,7 @@ class Datatable {
             const results = yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(yield this.getCollection(req))
                 .aggregate(aggregation, {
-                collation: {
-                    locale: "de",
-                    strength: 2,
-                },
+                collation: typeof this.collation === "function" ? yield this.collation(req) : this.collation,
             })
                 .toArray();
             if (!results[0]) {
@@ -353,6 +352,17 @@ class Datatable {
             return typeof this.subAggregation === "function" ? yield this.subAggregation(req, yield this.getColumnContext(req)) : this.subAggregation;
         });
     }
+    /** Filtered source for whole-result statistics; presentation and pagination are excluded. */
+    getStatisticsAggregation(req) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return [...(yield this.getAggregation(req)) || [], ...(yield this.getSubAggregation(req)) || []]
+                .filter(stage => !stage.skipStats && !stage.$sort && stage.$skip === undefined && stage.$limit === undefined)
+                .map((_a) => {
+                var { skipStats } = _a, stage = __rest(_a, ["skipStats"]);
+                return stage;
+            });
+        });
+    }
     getCollection(req) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.collection && typeof this.collection === "function") {
@@ -373,16 +383,21 @@ class Datatable {
             let hasSkip = false;
             let hasLimit = false;
             if (aggregationDef && aggregationDef.length > 0) {
-                for (let entry of aggregationDef) {
+                for (const definition of aggregationDef) {
+                    const { skipStats } = definition, entry = __rest(definition, ["skipStats"]);
                     if (entry.$skip !== undefined) {
                         hasSkip = true;
                     }
                     if (entry.$limit !== undefined) {
                         hasLimit = true;
                     }
-                    if (entry.skipStats) {
-                        delete entry.skipStats;
-                        aggregation.push(entry);
+                    if (skipStats) {
+                        if (this.deferPresentation && !entry.$sort && entry.$skip === undefined && entry.$limit === undefined) {
+                            subAggregation.push(entry);
+                        }
+                        else {
+                            aggregation.push(entry);
+                        }
                     }
                     else {
                         aggregation.push(entry);
@@ -391,15 +406,15 @@ class Datatable {
                 }
             }
             if (subAggregationDef && subAggregationDef.length > 0) {
-                for (let entry of subAggregationDef) {
+                for (const definition of subAggregationDef) {
+                    const { skipStats } = definition, entry = __rest(definition, ["skipStats"]);
                     if (entry.$skip !== undefined) {
                         hasSkip = true;
                     }
                     if (entry.$limit !== undefined) {
                         hasLimit = true;
                     }
-                    if (entry.skipStats) {
-                        delete entry.skipStats;
+                    if (skipStats) {
                         subAggregation.push(entry);
                     }
                     else {
@@ -423,10 +438,7 @@ class Datatable {
             const results = yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(yield this.getCollection(req))
                 .aggregate(aggr, {
-                collation: {
-                    locale: "de",
-                    strength: 2,
-                },
+                collation: typeof this.collation === "function" ? yield this.collation(req) : this.collation,
             })
                 .toArray();
             const sumsAfter = [];
@@ -511,23 +523,17 @@ class Datatable {
     }
     getTotalData(req) {
         return __awaiter(this, void 0, void 0, function* () {
-            const aggregation = [];
-            const aggregationDef = yield this.getAggregation(req);
-            if (aggregationDef && aggregationDef.length > 0) {
-                for (let entry of aggregationDef) {
-                    if (entry.skipStats) {
-                        delete entry.skipStats;
-                        aggregation.push(entry);
-                    }
-                    else {
-                        aggregation.push(entry);
-                    }
-                }
-            }
+            const aggregation = [...(yield this.getAggregation(req)) || [], ...(yield this.getSubAggregation(req)) || []]
+                .map((_a) => {
+                var { skipStats } = _a, stage = __rest(_a, ["skipStats"]);
+                return stage;
+            });
             const connection = yield DBConnection_1.DBConnection.getConnection();
             return yield DBConnection_1.DBConnection.documentStore(connection)
                 .collection(yield this.getCollection(req))
-                .aggregate([...(aggregation ? aggregation : [])])
+                .aggregate(aggregation, {
+                collation: typeof this.collation === "function" ? yield this.collation(req) : this.collation,
+            })
                 .toArray();
         });
     }

package/docs/datatables.md

@@ -126,3 +126,26 @@ creates an optional column catalog from nested DataBuilder/DataSchema fields.
 The `prepare(column, field, path)` callback can attach inline or lazy display
 options, change the mapping, or return null to omit a field. Plugin installation,
 tenant checks and relation hydration belong in the host adapter.
+
+## Statistics and collation
+
+`getStatisticsAggregation(req)` returns the filtered aggregation and sub-aggregation,
+excluding stages marked `skipStats: true`, sorting and pagination. It does not mutate
+stage definitions. Keep tenant and filter dependencies unmarked; calculate statistic-only
+fields in the statistics service instead of depending on presentation projections.
+
+`collation` defaults to `{ locale: "de", strength: 2 }` for compatibility. It can be
+an object or an async request callback. Tables sorting numeric/date fields can return
+`{ locale: "simple" }` to use matching binary indexes. Keep language collation for
+text sorting or filters that depend on it; collation applies to the entire data query.
+
+Exports (`getTotalData`) execute both aggregation phases with the same collation as
+the table, without injecting page limits. Explicit limits in the table definition
+remain effective, including bounded notification exports.
+
+Tables can opt into `deferPresentation = true` to execute aggregation stages marked
+`skipStats: true` after pagination, before explicit `subAggregation`. Sort/skip/limit
+stages stay in the selection phase. Only mark cardinality-preserving display stages:
+any join or calculation required by a filter, sort, or later selection stage must
+remain unmarked. Exports retain all stages in their original order. The default is
+false, so existing definitions keep their behavior until explicitly reviewed.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.3.104",
+    "version": "0.3.106",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",