@taylordb/query-builder 0.9.15 → 0.10.0

package/dist/esm/aggregation-helpers.js

@@ -0,0 +1,92 @@
+/**
+ * Helper functions for creating aggregation metrics.
+ * These functions return objects that describe the aggregation to perform.
+ */
+/**
+ * Creates a count aggregation for the specified field.
+ * @param field - The field name to count.
+ * @returns An aggregation helper object.
+ *
+ * @example
+ * ```typescript
+ * count('id')
+ * ```
+ */
+export function count(field) {
+    return { field, aggregation: 'count' };
+}
+/**
+ * Creates an average aggregation for the specified field.
+ * @param field - The field name to average.
+ * @returns An aggregation helper object.
+ *
+ * @example
+ * ```typescript
+ * avg('age')
+ * ```
+ */
+export function avg(field) {
+    return { field, aggregation: 'average' };
+}
+/**
+ * Creates a sum aggregation for the specified field.
+ * @param field - The field name to sum.
+ * @returns An aggregation helper object.
+ *
+ * @example
+ * ```typescript
+ * sum('age')
+ * ```
+ */
+export function sum(field) {
+    return { field, aggregation: 'sum' };
+}
+/**
+ * Creates a median aggregation for the specified field.
+ * @param field - The field name to calculate median for.
+ * @returns An aggregation helper object.
+ */
+export function median(field) {
+    return { field, aggregation: 'median' };
+}
+/**
+ * Creates a min aggregation for the specified field.
+ * @param field - The field name to find minimum for.
+ * @returns An aggregation helper object.
+ */
+export function min(field) {
+    return { field, aggregation: 'min' };
+}
+/**
+ * Creates a max aggregation for the specified field.
+ * @param field - The field name to find maximum for.
+ * @returns An aggregation helper object.
+ */
+export function max(field) {
+    return { field, aggregation: 'max' };
+}
+/**
+ * Creates a range aggregation for the specified field.
+ * @param field - The field name to calculate range for.
+ * @returns An aggregation helper object.
+ */
+export function range(field) {
+    return { field, aggregation: 'range' };
+}
+/**
+ * Creates a standard deviation aggregation for the specified field.
+ * @param field - The field name to calculate standard deviation for.
+ * @returns An aggregation helper object.
+ */
+export function stdDev(field) {
+    return { field, aggregation: 'standardDeviation' };
+}
+/**
+ * Creates a unique count aggregation for the specified field.
+ * @param field - The field name to count unique values for.
+ * @returns An aggregation helper object.
+ */
+export function unique(field) {
+    return { field, aggregation: 'unique' };
+}
+//# sourceMappingURL=aggregation-helpers.js.map

package/dist/esm/aggregation-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aggregation-helpers.js","sourceRoot":"","sources":["../../src/aggregation-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH;;;;;;;;;GASG;AACH,MAAM,UAAU,KAAK,CACnB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,OAAgB,EAAE,CAAC;AAClD,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,GAAG,CACjB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAkB,EAAE,CAAC;AACpD,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,GAAG,CACjB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAc,EAAE,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,MAAM,CACpB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAiB,EAAE,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,GAAG,CACjB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAc,EAAE,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,GAAG,CACjB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,KAAc,EAAE,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,KAAK,CACnB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,OAAgB,EAAE,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,MAAM,CACpB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,mBAA4B,EAAE,CAAC;AAC9D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,MAAM,CACpB,KAAa;IAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,QAAiB,EAAE,CAAC;AACnD,CAAC"}

package/dist/esm/aggregation-query-builder.d.ts

@@ -1,5 +1,6 @@
-import type { AggregateNode, AggregateRecord } from './@types/aggregate.js';
+import type { AggregateNode, AggregateRecord, MetricsRecord } from './@types/aggregate.js';
 import type { AnyDB } from './@types/internal-types.js';
+import type { AggregationHelper } from './aggregation-helpers.js';
 import { Executor } from './executor.js';
 import { FilterableQueryBuilder } from './where-query-builder.js';
 /**
@@ -11,9 +12,9 @@ import { FilterableQueryBuilder } from './where-query-builder.js';
  */
 export declare class AggregationQueryBuilder<DB extends AnyDB, TableName extends keyof DB, TGroupBy extends readonly (keyof DB[TableName] & string)[] = [], TAggregations extends {
     [K in keyof DB[TableName] & string]?: readonly (keyof DB[TableName][K]['aggregations'])[];
-} = object> extends FilterableQueryBuilder<DB, TableName> {
+} = object, TMetrics extends Record<string, AggregationHelper> | undefined = undefined> extends FilterableQueryBuilder<DB, TableName> {
     #private;
-    constructor(node: AggregateNode, executor: Executor);
+    constructor(node: AggregateNode, executor: Executor, metrics?: TMetrics);
     /**
      * Groups the results by a specified field.
      * @param field - The field to group by.
@@ -25,73 +26,80 @@ export declare class AggregationQueryBuilder<DB extends AnyDB, TableName extends
      * const userCounts = await qb
      *   .aggregateFrom('users')
      *   .groupBy('role')
-     *   .withAggregates({ id: ['count'] })
+     *   .metrics({ count: count('id') })
      *   .execute();
      * ```
      */
     groupBy<const TField extends keyof DB[TableName] & string>(field: TField, direction?: 'asc' | 'desc'): AggregationQueryBuilder<DB, TableName, [
         ...TGroupBy,
         TField
-    ], TAggregations>;
+    ], TAggregations, TMetrics>;
     /**
-     * Specifies the aggregations to perform.
-     * @param aggregates - An object where the keys are field names and the values are arrays of aggregation functions.
-     * @returns A new `AggregationQueryBuilder` instance with the aggregations applied.
+     * Specifies the metrics to compute using helper functions.
+     * Returns a flat array of records with groupBy fields and metrics at the top level.
+     * @param metrics - An object where keys are metric names and values are aggregation helper functions.
+     * @returns A new `AggregationQueryBuilder` instance with the metrics applied.
      *
      * @example
      * ```typescript
      * const userStats = await qb
      *   .aggregateFrom('users')
-     *   .withAggregates({
-     *     id: ['count'],
-     *     age: ['avg', 'sum'],
+     *   .groupBy('role', 'asc')
+     *   .groupBy('permission', 'desc')
+     *   .metrics({
+     *     idCount: count('id'),
+     *     ageAvg: avg('age'),
+     *     ageSum: sum('age')
      *   })
      *   .execute();
      * ```
      */
-    withAggregates<const T extends {
-        [K in keyof DB[TableName] & string]?: readonly (keyof DB[TableName][K]['aggregations'])[];
-    }>(aggregates: T): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations & T>;
+    metrics<const T extends Record<string, AggregationHelper>>(metrics: T): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations, T>;
     /**
      * Sets the maximum number of records to return.
      * @param count - The maximum number of records.
      * @returns A new `AggregationQueryBuilder` instance with the limit applied.
      */
-    limit(count: number): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations>;
+    limit(count: number): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations, TMetrics>;
     /**
      * Sets the number of records to skip.
      * @param count - The number of records to skip.
      * @returns A new `AggregationQueryBuilder` instance with the offset applied.
      */
-    offset(count: number): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations>;
+    offset(count: number): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations, TMetrics>;
     /**
      * Paginates the results.
      * @param page - The page number to retrieve.
      * @param limit - The number of records per page.
      * @returns A new `AggregationQueryBuilder` instance with pagination applied.
      */
-    paginate(page: number, limit: number): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations>;
+    paginate(page: number, limit: number): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations, TMetrics>;
     /**
      * Sorts the results by a specified field.
      * @param field - The field to sort by.
      * @param direction - The sort direction ('asc' or 'desc').
      * @returns A new `AggregationQueryBuilder` instance with the sorting applied.
      */
-    orderBy(field: keyof DB[TableName], direction?: 'asc' | 'desc'): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations>;
+    orderBy(field: keyof DB[TableName], direction?: 'asc' | 'desc'): AggregationQueryBuilder<DB, TableName, TGroupBy, TAggregations, TMetrics>;
     /**
      * Executes the aggregation query.
      * @returns A promise that resolves with an array of the aggregation results.
+     * If metrics were specified, returns a flat array. Otherwise, returns the nested structure.
      *
      * @example
      * ```typescript
      * const userCounts = await qb
      *   .aggregateFrom('users')
      *   .groupBy('role')
-     *   .withAggregates({ id: ['count'] })
+     *   .metrics({ count: count('id') })
      *   .execute();
      * ```
      */
-    execute(): Promise<AggregateRecord<DB, TableName, TGroupBy, TAggregations>[]>;
+    execute(): Promise<TMetrics extends Record<string, AggregationHelper> ? MetricsRecord<DB, TableName, TGroupBy, TMetrics>[] : AggregateRecord<DB, TableName, TGroupBy, TAggregations>[]>;
+    /**
+     * Flattens the nested AggregateRecord structure into a flat array of metrics records.
+     */
+    private _flattenMetrics;
     /**
      * Subscribes to the results of the aggregation query.
      * @param callback - A callback function that will be called with the results of the aggregation query.
@@ -102,7 +110,7 @@ export declare class AggregationQueryBuilder<DB extends AnyDB, TableName extends
      * const unsubscribe = qb
      *   .aggregateFrom('users')
      *   .groupBy('role')
-     *   .withAggregates({ id: ['count'] })
+     *   .metrics({ count: count('id') })
      *   .subscribe((userCounts) => {
      *     console.log('User counts by role:', userCounts);
      *   });
@@ -111,7 +119,7 @@ export declare class AggregationQueryBuilder<DB extends AnyDB, TableName extends
      * unsubscribe();
      * ```
      */
-    subscribe(callback: (result: AggregateRecord<DB, TableName, TGroupBy, TAggregations>[]) => void): Promise<{
+    subscribe(callback: (result: TMetrics extends Record<string, AggregationHelper> ? MetricsRecord<DB, TableName, TGroupBy, TMetrics>[] : AggregateRecord<DB, TableName, TGroupBy, TAggregations>[]) => void): Promise<{
         unsubscribe: () => Promise<void>;
     }>;
     compile(): {

package/dist/esm/aggregation-query-builder.js

@@ -1,3 +1,4 @@
+import { isEmpty } from 'lodash';
 import { FilterableQueryBuilder } from './where-query-builder.js';
 /**
  * A query builder for performing aggregation queries.
@@ -8,9 +9,11 @@ import { FilterableQueryBuilder } from './where-query-builder.js';
  */
 export class AggregationQueryBuilder extends FilterableQueryBuilder {
     #node;
-    constructor(node, executor) {
+    #metrics;
+    constructor(node, executor, metrics) {
         super(node, executor);
         this.#node = node;
+        this.#metrics = metrics;
     }
     /**
      * Groups the results by a specified field.
@@ -23,7 +26,7 @@ export class AggregationQueryBuilder extends FilterableQueryBuilder {
      * const userCounts = await qb
      *   .aggregateFrom('users')
      *   .groupBy('role')
-     *   .withAggregates({ id: ['count'] })
+     *   .metrics({ count: count('id') })
      *   .execute();
      * ```
      */
@@ -35,33 +38,48 @@ export class AggregationQueryBuilder extends FilterableQueryBuilder {
         return new AggregationQueryBuilder({
             ...this.#node,
             groupings: [...(this.#node.groupings || []), newGrouping],
-        }, this._executor);
+        }, this._executor, this.#metrics);
     }
     /**
-     * Specifies the aggregations to perform.
-     * @param aggregates - An object where the keys are field names and the values are arrays of aggregation functions.
-     * @returns A new `AggregationQueryBuilder` instance with the aggregations applied.
+     * Specifies the metrics to compute using helper functions.
+     * Returns a flat array of records with groupBy fields and metrics at the top level.
+     * @param metrics - An object where keys are metric names and values are aggregation helper functions.
+     * @returns A new `AggregationQueryBuilder` instance with the metrics applied.
      *
      * @example
      * ```typescript
      * const userStats = await qb
      *   .aggregateFrom('users')
-     *   .withAggregates({
-     *     id: ['count'],
-     *     age: ['avg', 'sum'],
+     *   .groupBy('role', 'asc')
+     *   .groupBy('permission', 'desc')
+     *   .metrics({
+     *     idCount: count('id'),
+     *     ageAvg: avg('age'),
+     *     ageSum: sum('age')
      *   })
      *   .execute();
      * ```
      */
-    withAggregates(aggregates) {
-        const newAggregates = { ...this.#node.aggregations };
-        for (const key in aggregates) {
-            newAggregates[key] = aggregates[key].map(aggregate => aggregate);
+    metrics(metrics) {
+        // Convert metrics format to aggregations format for the backend
+        const newAggregates = {
+            ...this.#node.aggregations,
+        };
+        for (const metricName in metrics) {
+            const helper = metrics[metricName];
+            const field = helper.field;
+            const aggregation = helper.aggregation;
+            if (!newAggregates[field]) {
+                newAggregates[field] = [];
+            }
+            if (!newAggregates[field].includes(aggregation)) {
+                newAggregates[field].push(aggregation);
+            }
         }
         return new AggregationQueryBuilder({
             ...this.#node,
             aggregations: newAggregates,
-        }, this._executor);
+        }, this._executor, metrics);
     }
     /**
      * Sets the maximum number of records to return.
@@ -72,7 +90,7 @@ export class AggregationQueryBuilder extends FilterableQueryBuilder {
         return new AggregationQueryBuilder({
             ...this.#node,
             pagination: { ...this.#node.pagination, limit: count },
-        }, this._executor);
+        }, this._executor, this.#metrics);
     }
     /**
      * Sets the number of records to skip.
@@ -83,7 +101,7 @@ export class AggregationQueryBuilder extends FilterableQueryBuilder {
         return new AggregationQueryBuilder({
             ...this.#node,
             pagination: { ...this.#node.pagination, offset: count },
-        }, this._executor);
+        }, this._executor, this.#metrics);
     }
     /**
      * Paginates the results.
@@ -108,25 +126,101 @@ export class AggregationQueryBuilder extends FilterableQueryBuilder {
         return new AggregationQueryBuilder({
             ...this.#node,
             sorting: [...(this.#node.sorting || []), newSorting],
-        }, this._executor);
+        }, this._executor, this.#metrics);
     }
     /**
      * Executes the aggregation query.
      * @returns A promise that resolves with an array of the aggregation results.
+     * If metrics were specified, returns a flat array. Otherwise, returns the nested structure.
      *
      * @example
      * ```typescript
      * const userCounts = await qb
      *   .aggregateFrom('users')
      *   .groupBy('role')
-     *   .withAggregates({ id: ['count'] })
+     *   .metrics({ count: count('id') })
      *   .execute();
      * ```
      */
     async execute() {
         const response = await this._executor.execute(this);
+        // If metrics are used, flatten the nested structure
+        if (this.#metrics) {
+            return this._flattenMetrics(response[0], this.#node.groupings
+                ?.filter((g) => 'field' in g && !('formula' in g))
+                .map(g => g.field) || [], this.#metrics);
+        }
         return response;
     }
+    /**
+     * Flattens the nested AggregateRecord structure into a flat array of metrics records.
+     */
+    _flattenMetrics(records, groupByFields, metrics) {
+        const result = [];
+        const flatten = (record, path) => {
+            if ('slug' in record && 'value' in record) {
+                const currentPath = {
+                    ...path,
+                    [record.slug]: record.value,
+                };
+                if ('children' in record &&
+                    Array.isArray(record.children) &&
+                    !isEmpty(record.children)) {
+                    // Has children, recurse
+                    for (const child of record.children) {
+                        flatten(child, currentPath);
+                    }
+                }
+                else {
+                    // Leaf node, create flat record
+                    const flatRecord = { ...currentPath };
+                    // Add metrics
+                    for (const metricName in metrics) {
+                        const helper = metrics[metricName];
+                        const field = helper.field;
+                        const aggregation = helper.aggregation;
+                        // Extract the metric value from aggregates
+                        if (record.aggregates &&
+                            field in record.aggregates &&
+                            record.aggregates[field] &&
+                            typeof record.aggregates[field] === 'object' &&
+                            aggregation in record.aggregates[field]) {
+                            flatRecord[metricName] = record.aggregates[field][aggregation];
+                        }
+                        else {
+                            flatRecord[metricName] = null;
+                        }
+                    }
+                    result.push(flatRecord);
+                }
+            }
+            else {
+                // No groupBy, just metrics
+                const flatRecord = {};
+                // Add metrics
+                for (const metricName in metrics) {
+                    const helper = metrics[metricName];
+                    const field = helper.field;
+                    const aggregation = helper.aggregation;
+                    if (record.aggregates &&
+                        field in record.aggregates &&
+                        record.aggregates[field] &&
+                        typeof record.aggregates[field] === 'object' &&
+                        aggregation in record.aggregates[field]) {
+                        flatRecord[metricName] = record.aggregates[field][aggregation];
+                    }
+                    else {
+                        flatRecord[metricName] = null;
+                    }
+                }
+                result.push(flatRecord);
+            }
+        };
+        for (const record of records) {
+            flatten(record, {});
+        }
+        return result;
+    }
     /**
      * Subscribes to the results of the aggregation query.
      * @param callback - A callback function that will be called with the results of the aggregation query.
@@ -137,7 +231,7 @@ export class AggregationQueryBuilder extends FilterableQueryBuilder {
      * const unsubscribe = qb
      *   .aggregateFrom('users')
      *   .groupBy('role')
-     *   .withAggregates({ id: ['count'] })
+     *   .metrics({ count: count('id') })
      *   .subscribe((userCounts) => {
      *     console.log('User counts by role:', userCounts);
      *   });
@@ -147,7 +241,17 @@ export class AggregationQueryBuilder extends FilterableQueryBuilder {
      * ```
      */
     subscribe(callback) {
-        return this._executor.subscribe([this], callback);
+        return this._executor.subscribe([this], (rawResult) => {
+            if (this.#metrics) {
+                const flattened = this._flattenMetrics(rawResult, this.#node.groupings
+                    ?.filter((g) => 'field' in g && !('formula' in g))
+                    .map(g => g.field) || [], this.#metrics);
+                callback(flattened);
+            }
+            else {
+                callback(rawResult);
+            }
+        });
     }
     compile() {
         const query = 'mutation ($metadata: JSON) { execute(metadata: $metadata) }';

package/dist/esm/aggregation-query-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregation-query-builder.js","sourceRoot":"","sources":["../../src/aggregation-query-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aggregation-query-builder.js","sourceRoot":"","sources":["../../src/aggregation-query-builder.ts"],"names":[],"mappings":"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"}

package/dist/esm/batch-query-builder.d.ts

@@ -42,7 +42,7 @@ export declare class BatchQueryBuilder<const TBuilders extends readonly AnyQuery
      * ```typescript
      * const unsubscribe = qb.batch([
      *   qb.selectFrom('users').select(['id', 'name']),
-     *   qb.aggregateFrom('users').groupBy('role').withAggregates({ id: ['count'] }),
+     *   qb.aggregateFrom('users').groupBy('role').metrics({ count: count('id') }),
      * ]).subscribe(([users, userAggregates]) => {
      *   console.log('Users:', users);
      *   console.log('User Aggregates:', userAggregates);

package/dist/esm/batch-query-builder.js

@@ -36,7 +36,7 @@ export class BatchQueryBuilder {
      * ```typescript
      * const unsubscribe = qb.batch([
      *   qb.selectFrom('users').select(['id', 'name']),
-     *   qb.aggregateFrom('users').groupBy('role').withAggregates({ id: ['count'] }),
+     *   qb.aggregateFrom('users').groupBy('role').metrics({ count: count('id') }),
      * ]).subscribe(([users, userAggregates]) => {
      *   console.log('Users:', users);
      *   console.log('User Aggregates:', userAggregates);

package/dist/esm/index.d.ts

@@ -1 +1,3 @@
+export { avg, count, max, median, min, range, stdDev, sum, unique, } from './aggregation-helpers.js';
+export type { AggregationHelper } from './aggregation-helpers.js';
 export { createQueryBuilder } from './query-builder.js';

package/dist/esm/index.js

@@ -1,2 +1,3 @@
+export { avg, count, max, median, min, range, stdDev, sum, unique, } from './aggregation-helpers.js';
 export { createQueryBuilder } from './query-builder.js';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,KAAK,EACL,GAAG,EACH,MAAM,EACN,GAAG,EACH,KAAK,EACL,MAAM,EACN,GAAG,EACH,MAAM,GACP,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}