@objectstack/service-analytics 9.2.0 → 9.3.0

package/dist/index.d.cts

@@ -452,7 +452,10 @@ type CompareTo = DatasetCompareTo;
  *   - applies measure-scoped filters via supplementary grouped queries,
  *   - evaluates derived measures (ratio/sum/difference/product) row-by-row (Q1),
  *   - shifts the query for `compareTo` (previousPeriod / previousYear) and
- *     attaches `<measure>__compare` columns.
+ *     attaches `<measure>__compare` columns,
+ *   - computes server-side totals (`selection.totals.groupings`, #1753) by
+ *     re-running the selection per dimension subset, so matrix subtotals and
+ *     the grand total use each measure's true aggregate.
  *
  * RLS/tenant scoping is NOT handled here — it is enforced inside the strategy
  * via the StrategyContext read-scope hook (D-C). This layer is pure query
@@ -478,6 +481,7 @@ declare class DatasetExecutor {
      *   applied per request (ADR-0021 D-C).
      */
     execute(compiled: CompiledDataset, selection: DatasetSelection, context?: ExecutionContext): Promise<AnalyticsResult>;
+    private executeSelection;
     private buildQuery;
     private runCompare;
 }

package/dist/index.d.ts

@@ -452,7 +452,10 @@ type CompareTo = DatasetCompareTo;
  *   - applies measure-scoped filters via supplementary grouped queries,
  *   - evaluates derived measures (ratio/sum/difference/product) row-by-row (Q1),
  *   - shifts the query for `compareTo` (previousPeriod / previousYear) and
- *     attaches `<measure>__compare` columns.
+ *     attaches `<measure>__compare` columns,
+ *   - computes server-side totals (`selection.totals.groupings`, #1753) by
+ *     re-running the selection per dimension subset, so matrix subtotals and
+ *     the grand total use each measure's true aggregate.
  *
  * RLS/tenant scoping is NOT handled here — it is enforced inside the strategy
  * via the StrategyContext read-scope hook (D-C). This layer is pure query
@@ -478,6 +481,7 @@ declare class DatasetExecutor {
      *   applied per request (ADR-0021 D-C).
      */
     execute(compiled: CompiledDataset, selection: DatasetSelection, context?: ExecutionContext): Promise<AnalyticsResult>;
+    private executeSelection;
     private buildQuery;
     private runCompare;
 }

package/dist/index.js

@@ -986,6 +986,33 @@ var DatasetExecutor = class {
    *   applied per request (ADR-0021 D-C).
    */
   async execute(compiled, selection, context) {
+    const result = await this.executeSelection(compiled, selection, context);
+    const groupings = selection.totals?.groupings;
+    if (groupings?.length) {
+      const selected = new Set(selection.dimensions ?? []);
+      const totals = [];
+      for (const grouping of groupings) {
+        const unknown = grouping.filter((d) => !selected.has(d));
+        if (unknown.length) {
+          throw new Error(
+            `[dataset-executor] totals grouping [${grouping.join(", ")}] is not a subset of the selected dimensions \u2014 unknown: ${unknown.join(", ")}.`
+          );
+        }
+        const sub = await this.executeSelection(compiled, {
+          ...selection,
+          dimensions: grouping,
+          totals: void 0,
+          order: void 0,
+          limit: void 0,
+          offset: void 0
+        }, context);
+        totals.push({ dimensions: grouping, rows: sub.rows });
+      }
+      result.totals = totals;
+    }
+    return result;
+  }
+  async executeSelection(compiled, selection, context) {
     const derivedByName = new Map(compiled.derived.map((d) => [d.name, d]));
     const selectedDerived = selection.measures.map((m) => derivedByName.get(m)).filter((d) => !!d);
     const baseMeasures = /* @__PURE__ */ new Set();
@@ -1534,6 +1561,12 @@ var AnalyticsService = class {
       if (dims.length) {
         try {
           await resolveDimensionLabels(dataset.object, dims, result.rows, this.labelResolver);
+          for (const total of result.totals ?? []) {
+            const subset = dims.filter((d) => total.dimensions.includes(d.name));
+            if (subset.length) {
+              await resolveDimensionLabels(dataset.object, subset, total.rows, this.labelResolver);
+            }
+          }
         } catch (e) {
           this.logger?.warn?.(`[Analytics] dimension label resolution failed for "${dataset.name}": ${String(e?.message ?? e)}`);
         }