remult 0.27.8-next.3 → 0.27.8-next.4

package/esm/remult-knex/index.js

@@ -7,7 +7,7 @@ import { Sort } from '../src/sort.js';
 import { ValueConverters } from '../src/valueConverters.js';
 import { getRepositoryInternals } from '../src/remult3/repository-internals.js';
 import { remultStatic } from '../src/remult-static.js';
-import { aggregateImpl, getRowAfterUpdate, } from '../src/data-providers/sql-database.js';
+import { groupByImpl, getRowAfterUpdate, } from '../src/data-providers/sql-database.js';
 export class KnexDataProvider {
     knex;
     constructor(knex) {
@@ -117,8 +117,8 @@ class KnexEntityDataProvider {
         this.rawSqlWrapIdentifier = rawSqlWrapIdentifier;
         this.dp = dp;
     }
-    async aggregate(options) {
-        return aggregateImpl(options, await this.init(), this.dp.createCommand(), false, (limit, offset) => ' limit ' + limit + ' offset ' + offset);
+    async groupBy(options) {
+        return groupByImpl(options, await this.init(), this.dp.createCommand(), false, (limit, offset) => ' limit ' + limit + ' offset ' + offset);
     }
     async count(where) {
         const e = await this.init();

package/esm/remult-mongo.js

@@ -5,7 +5,7 @@ import { remult as remultContext } from './src/remult-proxy.js';
 import { getRepository } from './src/remult3/RepositoryImplementation.js';
 import { getRepositoryInternals } from './src/remult3/repository-internals.js';
 import { getRowAfterUpdate } from './src/data-providers/sql-database.js';
-import { AggregateCountMember, AggregateOperators, } from './src/remult3/remult3.js';
+import { GroupByCountMember, GroupByOperators } from './src/remult3/remult3.js';
 export class MongoDataProvider {
     db;
     client;
@@ -98,7 +98,7 @@ class MongoEntityDataProvider {
         let w = await x.resolveWhere();
         return await collection.countDocuments(w, { session: this.session });
     }
-    async aggregate(options) {
+    async groupBy(options) {
         let { collection, e } = await this.collection();
         let x = new FilterConsumerBridgeToMongo(e);
         const pipeLine = [];
@@ -112,14 +112,14 @@ class MongoEntityDataProvider {
             __count: { $sum: 1 },
         };
         processResultRow.push((mongoRow, resultRow) => {
-            resultRow[AggregateCountMember] = mongoRow.__count;
+            resultRow[GroupByCountMember] = mongoRow.__count;
         });
         pipeLine.push({ $group });
         const $addFields = {};
         pipeLine.push({ $addFields });
-        if (options?.groupBy) {
+        if (options?.group) {
             $group._id = {};
-            for (const element of options.groupBy) {
+            for (const element of options.group) {
                 const name = e.$dbNameOf(element);
                 $group._id[name] = `$${name}`;
                 processResultRow.push((mongoRow, resultRow) => {
@@ -130,7 +130,7 @@ class MongoEntityDataProvider {
         else {
             $group._id = null;
         }
-        for (const operator of AggregateOperators) {
+        for (const operator of GroupByOperators) {
             if (options?.[operator]) {
                 for (const element of options[operator]) {
                     const name = e.$dbNameOf(element) + '_' + operator;

package/esm/src/data-api.js

@@ -2,7 +2,7 @@ import { doTransaction } from './context.js';
 import { findOptionsToJson, liveQueryAction, } from './data-providers/rest-data-provider.js';
 import { Filter, buildFilterFromRequestParameters, customUrlToken, } from './filter/filter-interfaces.js';
 import { getRelationFieldInfo } from './remult3/relationInfoMember.js';
-import { AggregateCountMember, AggregateForApiKey, } from './remult3/remult3.js';
+import { GroupByCountMember, GroupByForApiKey, } from './remult3/remult3.js';
 import { ForbiddenError } from './server-action.js';
 export class DataApi {
     repository;
@@ -19,8 +19,8 @@ export class DataApi {
             case 'get':
             case 'count':
                 return this.count(res, req, undefined);
-            case 'aggregate':
-                return this.aggregate(res, req, undefined);
+            case 'groupBy':
+                return this.groupBy(res, req, undefined);
         }
         return this.getArray(res, req, undefined);
     }
@@ -45,8 +45,8 @@ export class DataApi {
             case 'count':
                 validateWhereInBody();
                 return this.count(res, req, body);
-            case 'aggregate':
-                return this.aggregate(res, req, body);
+            case 'groupBy':
+                return this.groupBy(res, req, body);
             case 'deleteMany':
                 validateWhereInBody();
                 return this.deleteMany(res, req, body);
@@ -103,7 +103,7 @@ export class DataApi {
             response.error(err, this.repository.metadata);
         }
     }
-    async aggregate(response, request, body) {
+    async groupBy(response, request, body) {
         let findOptions = await this.findOptionsFromRequest(request, body);
         let orderBy = {};
         if (body?.orderBy) {
@@ -114,7 +114,7 @@ export class DataApi {
                         orderBy[element.field] = direction;
                         break;
                     case 'count':
-                        orderBy[AggregateCountMember] = direction;
+                        orderBy[GroupByCountMember] = direction;
                         break;
                     default:
                         orderBy[element.field] = {
@@ -125,14 +125,14 @@ export class DataApi {
                 }
             }
         }
-        const groupBy = body?.groupBy?.filter((x) => this.repository.fields.find(x).includedInApi());
-        let result = await this.repository.aggregate({
+        const group = body?.groupBy?.filter((x) => this.repository.fields.find(x).includedInApi());
+        let result = await this.repository.groupBy({
             where: findOptions.where,
             limit: findOptions.limit,
             page: findOptions.page,
             //@ts-expect-error internal key
-            [AggregateForApiKey]: true,
-            groupBy,
+            [GroupByForApiKey]: true,
+            group,
             sum: body?.sum?.filter((x) => this.repository.fields.find(x).includedInApi()),
             avg: body?.avg?.filter((x) => this.repository.fields.find(x).includedInApi()),
             min: body?.min?.filter((x) => this.repository.fields.find(x).includedInApi()),
@@ -140,16 +140,12 @@ export class DataApi {
             distinctCount: body?.distinctCount?.filter((x) => this.repository.fields.find(x).includedInApi()),
             orderBy: orderBy,
         });
-        if (!Array.isArray(result)) {
-            result = [result];
-        }
-        else {
+        if (group)
             result.forEach((x) => {
-                for (const f of groupBy) {
+                for (const f of group) {
                     x[f] = this.repository.fields.find(f).valueConverter.toJson(x[f]);
                 }
             });
-        }
         response.success(result);
     }
     async getArrayImpl(response, request, body) {

package/esm/src/data-providers/array-entity-data-provider.js

@@ -1,7 +1,7 @@
 import { CompoundIdField } from '../CompoundIdField.js';
 import { dbNamesOf, isDbReadonly, } from '../filter/filter-consumer-bridge-to-sql-request.js';
 import { Filter, customDatabaseFilterToken, } from '../filter/filter-interfaces.js';
-import { AggregateCountMember, AggregateOperators, } from '../remult3/remult3.js';
+import { GroupByCountMember, GroupByOperators, } from '../remult3/remult3.js';
 import { compareForSort, Sort } from '../sort.js';
 export class ArrayEntityDataProvider {
     entity;
@@ -17,10 +17,10 @@ export class ArrayEntityDataProvider {
         this.entity = entity;
         this.rows = rows;
     }
-    async aggregate(options) {
+    async groupBy(options) {
         const sort = new Sort();
-        if (options?.groupBy)
-            for (const field of options?.groupBy) {
+        if (options?.group)
+            for (const field of options?.group) {
                 sort.Segments.push({ field: field });
             }
         const rows = await this.find({ orderBy: sort, where: options?.where });
@@ -112,7 +112,7 @@ export class ArrayEntityDataProvider {
                 };
             },
         };
-        for (let operator of AggregateOperators) {
+        for (let operator of GroupByOperators) {
             if (options?.[operator]) {
                 for (const element of options[operator]) {
                     aggregates.push(operatorImpl[operator](element.key));
@@ -124,15 +124,15 @@ export class ArrayEntityDataProvider {
             for (const a of aggregates) {
                 a.finishGroup(r);
             }
-            r[AggregateCountMember] = count;
+            r[GroupByCountMember] = count;
             result.push(r);
             first = true;
             count = 0;
         }
         for (const row of rows) {
-            if (options?.groupBy) {
+            if (options?.group) {
                 if (!first) {
-                    for (const field of options?.groupBy) {
+                    for (const field of options?.group) {
                         if (group[field.key] != row[field.key]) {
                             finishGroup();
                             break;
@@ -140,7 +140,7 @@ export class ArrayEntityDataProvider {
                     }
                 }
                 if (first) {
-                    for (const field of options?.groupBy) {
+                    for (const field of options?.group) {
                         group[field.key] = row[field.key];
                     }
                 }
@@ -157,12 +157,12 @@ export class ArrayEntityDataProvider {
                 for (const x of options.orderBy) {
                     const getValue = (row) => {
                         if (!x.field && x.operation == 'count') {
-                            return row[AggregateCountMember];
+                            return row[GroupByCountMember];
                         }
                         else {
                             switch (x.operation) {
                                 case 'count':
-                                    return row[AggregateCountMember];
+                                    return row[GroupByCountMember];
                                 case undefined:
                                     return row[x.field.key];
                                 default:

package/esm/src/data-providers/json-data-provider.js

@@ -22,8 +22,8 @@ class JsonEntityDataProvider {
         this.helper = helper;
         this.formatted = formatted;
     }
-    aggregate(options) {
-        return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.aggregate(options))));
+    groupBy(options) {
+        return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.groupBy(options))));
     }
     async loadEntityData(what) {
         let data = [];

package/esm/src/data-providers/rest-data-provider.js

@@ -101,14 +101,14 @@ export class RestEntityDataProvider {
         this.http = http;
         this.entity = entity;
     }
-    async aggregate(options) {
+    async groupBy(options) {
         const { run } = this.buildFindRequest({
             where: options?.where,
             limit: options?.limit,
             page: options?.page,
         });
         const body = {
-            groupBy: options?.groupBy?.map((x) => x.key),
+            groupBy: options?.group?.map((x) => x.key),
             sum: options?.sum?.map((x) => x.key),
             avg: options?.avg?.map((x) => x.key),
             min: options?.min?.map((x) => x.key),
@@ -116,10 +116,10 @@ export class RestEntityDataProvider {
             distinctCount: options?.distinctCount?.map((x) => x.key),
             orderBy: options?.orderBy?.map((x) => ({ ...x, field: x.field?.key })),
         };
-        const result = await run('aggregate', Object.keys(body).length > 0 ? body : undefined);
-        if (options?.groupBy)
+        const result = await run('groupBy', Object.keys(body).length > 0 ? body : undefined);
+        if (options?.group)
             result.forEach((row) => {
-                for (const g of options.groupBy) {
+                for (const g of options.group) {
                     row[g.key] = g.valueConverter.fromJson(row[g.key]);
                 }
             });

package/esm/src/data-providers/sql-database.js

@@ -1,7 +1,7 @@
 import { FilterConsumerBridgeToSqlRequest, dbNamesOfWithForceSqlExpression, isDbReadonly, } from '../filter/filter-consumer-bridge-to-sql-request.js';
 import { Filter, customDatabaseFilterToken, } from '../filter/filter-interfaces.js';
 import { remult as defaultRemult } from '../remult-proxy.js';
-import { AggregateCountMember, AggregateOperators, } from '../remult3/remult3.js';
+import { GroupByCountMember, GroupByOperators, } from '../remult3/remult3.js';
 import { getRepository, isAutoIncrement, } from '../remult3/RepositoryImplementation.js';
 import { Sort } from '../sort.js';
 import { ValueConverters } from '../valueConverters.js';
@@ -287,8 +287,8 @@ class ActualSQLEntityDataProvider {
             return Number(r.rows[0].count);
         });
     }
-    async aggregate(options) {
-        return await aggregateImpl(options, await this.init(), this.sql.createCommand(), this.sql._getSourceSql().orderByNullsFirst, this.sql._getSourceSql().getLimitSqlSyntax);
+    async groupBy(options) {
+        return await groupByImpl(options, await this.init(), this.sql.createCommand(), this.sql._getSourceSql().orderByNullsFirst, this.sql._getSourceSql().getLimitSqlSyntax);
     }
     async find(options) {
         let e = await this.init();
@@ -541,15 +541,15 @@ export function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
         return r[0];
     });
 }
-export async function aggregateImpl(options, e, r, orderByNullFirst, limitSyntax) {
+export async function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
     let select = 'select count(*) as count';
     let groupBy = '';
     const processResultRow = [];
     processResultRow.push((sqlVal, theResult) => {
-        theResult[AggregateCountMember] = Number(sqlVal);
+        theResult[GroupByCountMember] = Number(sqlVal);
     });
-    if (options?.groupBy)
-        for (const x of options?.groupBy) {
+    if (options?.group)
+        for (const x of options?.group) {
             if (x.isServerExpression) {
             }
             else {
@@ -566,7 +566,7 @@ export async function aggregateImpl(options, e, r, orderByNullFirst, limitSyntax
                 theResult[x.key] = x.valueConverter.fromDb(sqlResult);
             });
         }
-    for (const operator of AggregateOperators) {
+    for (const operator of GroupByOperators) {
         const fields = options?.[operator];
         if (fields)
             for (const x of fields) {

package/esm/src/remult-proxy.js

@@ -112,6 +112,11 @@ export class RemultProxy {
                 .remultFactory()
                 .repo(...args)
                 .find(...args2),
+            groupBy: (...args2) => self
+                .remultFactory()
+                .repo(...args)
+                //@ts-ignore
+                .groupBy(...args2),
             aggregate: (...args2) => self
                 .remultFactory()
                 .repo(...args)

package/esm/src/remult3/RepositoryImplementation.js

@@ -3,7 +3,7 @@ import { CompoundIdField } from '../CompoundIdField.js';
 import { Remult, isBackend, queryConfig } from '../context.js';
 import { Filter } from '../filter/filter-interfaces.js';
 import { Sort } from '../sort.js';
-import { AggregateForApiKey, } from './remult3.js';
+import { GroupByForApiKey, } from './remult3.js';
 import { assign } from '../../assign.js';
 import { ValueConverters } from '../valueConverters.js';
 import { findOptionsToJson } from '../data-providers/rest-data-provider.js';
@@ -129,6 +129,9 @@ export class RepositoryImplementation {
         this._defaultFindOptions = _defaultFindOptions;
     }
     async aggregate(options) {
+        return (await this.groupBy(options))[0];
+    }
+    async groupBy(options) {
         let findOptions = await this._buildEntityDataProviderFindOptions({
             ...options,
         });
@@ -139,7 +142,7 @@ export class RepositoryImplementation {
             return r;
         };
         const getFieldNotInGroupBy = (key) => {
-            if (options?.groupBy?.includes(key))
+            if (options?.group?.includes(key))
                 throw Error(`field "${key}" cannot be used both in an aggregate and in group by`);
             return getField(key);
         };
@@ -147,7 +150,7 @@ export class RepositoryImplementation {
             where: findOptions.where,
             limit: findOptions.limit,
             page: findOptions.page,
-            groupBy: options?.groupBy?.map(getField),
+            group: options?.group?.map(getField),
             sum: options?.sum?.map(getFieldNotInGroupBy),
             avg: options?.avg?.map(getFieldNotInGroupBy),
             min: options?.min?.map(getFieldNotInGroupBy),
@@ -182,19 +185,17 @@ export class RepositoryImplementation {
                 }
             }
         }
-        const result = await this._edp.aggregate(dpOptions);
-        if (!options?.groupBy)
-            return result[0];
+        const result = await this._edp.groupBy(dpOptions);
         //@ts-expect-error an internal option
-        if (!options?.[AggregateForApiKey]) {
+        if (!options?.[GroupByForApiKey] && options.group) {
             const loaderOptions = {
                 include: {},
             };
-            for (const key of options.groupBy) {
+            for (const key of options.group) {
                 loaderOptions.include[key] = true;
             }
             const loader = new RelationLoader();
-            await this.populateRelationsForFields(dpOptions.groupBy, loaderOptions, result, loader);
+            await this.populateRelationsForFields(dpOptions.group, loaderOptions, result, loader);
             await loader.resolveAll();
         }
         return result;

package/esm/src/remult3/remult3.js

@@ -1,6 +1,6 @@
-export const AggregateCountMember = '$count';
-export const AggregateForApiKey = Symbol.for('AggregateForApiKey');
-export const AggregateOperators = [
+export const GroupByCountMember = '$count';
+export const GroupByForApiKey = Symbol.for('GroupByForApiKey');
+export const GroupByOperators = [
     'sum',
     'avg',
     'min',
@@ -16,6 +16,7 @@ export const flags = {
 /*p1 - min, max, avg, sum, countDistinct - noam come up with an api
   p1 - handle relations
 */
+//y1 - find and count / aggregate with a single call
 /*p1 - add id and use uuid by default, but allow changes with Fields.id.defaultIdProvider NO but defaultProvider yes???
   //p1 - replace uuid with crypto.randomUUID and allow custom fallback NO
   //p1 - Add example for luid

package/index.d.ts

@@ -2,7 +2,7 @@ import type { ClassType } from './classType.js';
 import type { DataProvider } from './src/data-interfaces.js';
 export { ArrayEntityDataProvider } from './src/data-providers/array-entity-data-provider.js';
 export type { ClassType } from './classType.js';
-export { ValidateFieldEvent, MembersOnly, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, QueryResult, QueryOptions, Repository, AggregateOptions, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
+export { ValidateFieldEvent, MembersOnly, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, QueryResult, QueryOptions, Repository, GroupByOptions, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
 LifecycleEvent, FieldsRefBase, FieldsRefForEntityBase, RepositoryRelationsForEntityBase, ControllerRefForControllerBase, ControllerRefBase, ControllerRef, EntityRefForEntityBase, IdMetadata, FindFirstOptionsBase, } from './src/remult3/remult3.js';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, CaptionTransformer, } from './src/remult3/RepositoryImplementation.js';
 export { Entity } from './src/remult3/entity.js';
@@ -11,7 +11,7 @@ export { Field, Fields, StringFieldOptions, Relations, } from './src/remult3/Fie
 export { IdEntity } from './src/remult3/IdEntity.js';
 export { describeClass, describeBackendMethods, describeEntity, } from './src/remult3/classDescribers.js';
 export { EntityOptions, PreprocessFilterEvent } from './src/entity.js';
-export { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider, } from './src/data-interfaces.js';
+export { DataProvider, EntityDataProvider, EntityDataProviderGroupByOptions, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider, } from './src/data-interfaces.js';
 export { SqlCommand, SqlCommandWithParameters, SqlImplementation, SqlResult, } from './src/sql-command.js';
 export { FieldMetadata, FieldOptions, FieldValidator, ValueConverter, ValueListItem, // reconsider, maybe it should go to remult angular as the abstraction ?
 ValueOrExpression, } from './src/column-interfaces.js';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.27.8-next.3",
+    "version": "0.27.8-next.4",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/remult-knex/index.js

@@ -202,13 +202,13 @@ var KnexEntityDataProvider = /** @class */ (function () {
         this.rawSqlWrapIdentifier = rawSqlWrapIdentifier;
         this.dp = dp;
     }
-    KnexEntityDataProvider.prototype.aggregate = function (options) {
+    KnexEntityDataProvider.prototype.groupBy = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = sql_database_js_1.aggregateImpl;
+                        _a = sql_database_js_1.groupByImpl;
                         _b = [options];
                         return [4 /*yield*/, this.init()];
                     case 1: return [2 /*return*/, _a.apply(void 0, _b.concat([_c.sent(), this.dp.createCommand(),

package/remult-mongo.js

@@ -169,9 +169,9 @@ var MongoEntityDataProvider = /** @class */ (function () {
             });
         });
     };
-    MongoEntityDataProvider.prototype.aggregate = function (options) {
+    MongoEntityDataProvider.prototype.groupBy = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, collection, e, x, pipeLine, where, processResultRow, $group, $addFields, _loop_1, _b, _c, element, _loop_2, AggregateOperators_1, AggregateOperators_1_1, operator, sort, _d, _e, x_1, direction, r, r2;
+            var _a, collection, e, x, pipeLine, where, processResultRow, $group, $addFields, _loop_1, _b, _c, element, _loop_2, GroupByOperators_1, GroupByOperators_1_1, operator, sort, _d, _e, x_1, direction, r, r2;
             var e_3, _f, e_4, _g, e_5, _h;
             return tslib_1.__generator(this, function (_j) {
                 switch (_j.label) {
@@ -193,12 +193,12 @@ var MongoEntityDataProvider = /** @class */ (function () {
                             __count: { $sum: 1 },
                         };
                         processResultRow.push(function (mongoRow, resultRow) {
-                            resultRow[remult3_js_1.AggregateCountMember] = mongoRow.__count;
+                            resultRow[remult3_js_1.GroupByCountMember] = mongoRow.__count;
                         });
                         pipeLine.push({ $group: $group });
                         $addFields = {};
                         pipeLine.push({ $addFields: $addFields });
-                        if (options === null || options === void 0 ? void 0 : options.groupBy) {
+                        if (options === null || options === void 0 ? void 0 : options.group) {
                             $group._id = {};
                             _loop_1 = function (element) {
                                 var name_1 = e.$dbNameOf(element);
@@ -208,7 +208,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                                 });
                             };
                             try {
-                                for (_b = tslib_1.__values(options.groupBy), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                for (_b = tslib_1.__values(options.group), _c = _b.next(); !_c.done; _c = _b.next()) {
                                     element = _c.value;
                                     _loop_1(element);
                                 }
@@ -257,15 +257,15 @@ var MongoEntityDataProvider = /** @class */ (function () {
                             }
                         };
                         try {
-                            for (AggregateOperators_1 = tslib_1.__values(remult3_js_1.AggregateOperators), AggregateOperators_1_1 = AggregateOperators_1.next(); !AggregateOperators_1_1.done; AggregateOperators_1_1 = AggregateOperators_1.next()) {
-                                operator = AggregateOperators_1_1.value;
+                            for (GroupByOperators_1 = tslib_1.__values(remult3_js_1.GroupByOperators), GroupByOperators_1_1 = GroupByOperators_1.next(); !GroupByOperators_1_1.done; GroupByOperators_1_1 = GroupByOperators_1.next()) {
+                                operator = GroupByOperators_1_1.value;
                                 _loop_2(operator);
                             }
                         }
                         catch (e_4_1) { e_4 = { error: e_4_1 }; }
                         finally {
                             try {
-                                if (AggregateOperators_1_1 && !AggregateOperators_1_1.done && (_g = AggregateOperators_1.return)) _g.call(AggregateOperators_1);
+                                if (GroupByOperators_1_1 && !GroupByOperators_1_1.done && (_g = GroupByOperators_1.return)) _g.call(GroupByOperators_1);
                             }
                             finally { if (e_4) throw e_4.error; }
                         }

package/src/data-api.d.ts

@@ -12,7 +12,7 @@ export declare class DataApi<T = unknown> {
     get(response: DataApiResponse, id: any): Promise<void>;
     count(response: DataApiResponse, request: DataApiRequest, body?: any): Promise<void>;
     deleteMany(response: DataApiResponse, request: DataApiRequest, body?: any): Promise<void>;
-    aggregate(response: DataApiResponse, request: DataApiRequest, body: any): Promise<void>;
+    groupBy(response: DataApiResponse, request: DataApiRequest, body: any): Promise<void>;
     getArrayImpl(response: DataApiResponse, request: DataApiRequest, body: any): Promise<{
         r: any[];
         findOptions: FindOptions<T>;

package/src/data-api.js

@@ -23,8 +23,8 @@ var DataApi = /** @class */ (function () {
             case 'get':
             case 'count':
                 return this.count(res, req, undefined);
-            case 'aggregate':
-                return this.aggregate(res, req, undefined);
+            case 'groupBy':
+                return this.groupBy(res, req, undefined);
         }
         return this.getArray(res, req, undefined);
     };
@@ -51,7 +51,7 @@ var DataApi = /** @class */ (function () {
                         switch (_a) {
                             case 'get': return [3 /*break*/, 1];
                             case 'count': return [3 /*break*/, 2];
-                            case 'aggregate': return [3 /*break*/, 3];
+                            case 'groupBy': return [3 /*break*/, 3];
                             case 'deleteMany': return [3 /*break*/, 4];
                             case 'updateMany': return [3 /*break*/, 5];
                             case 'endLiveQuery': return [3 /*break*/, 6];
@@ -63,7 +63,7 @@ var DataApi = /** @class */ (function () {
                     case 2:
                         validateWhereInBody();
                         return [2 /*return*/, this.count(res, req, body)];
-                    case 3: return [2 /*return*/, this.aggregate(res, req, body)];
+                    case 3: return [2 /*return*/, this.groupBy(res, req, body)];
                     case 4:
                         validateWhereInBody();
                         return [2 /*return*/, this.deleteMany(res, req, body)];
@@ -204,9 +204,9 @@ var DataApi = /** @class */ (function () {
             });
         });
     };
-    DataApi.prototype.aggregate = function (response, request, body) {
+    DataApi.prototype.groupBy = function (response, request, body) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var findOptions, orderBy, _a, _b, element, direction, groupBy, result;
+            var findOptions, orderBy, _a, _b, element, direction, group, result;
             var e_2, _c, _d, _e;
             var _this = this;
             var _f, _g, _h, _j, _k, _l;
@@ -226,7 +226,7 @@ var DataApi = /** @class */ (function () {
                                             orderBy[element.field] = direction;
                                             break;
                                         case 'count':
-                                            orderBy[remult3_js_1.AggregateCountMember] = direction;
+                                            orderBy[remult3_js_1.GroupByCountMember] = direction;
                                             break;
                                         default:
                                             orderBy[element.field] = tslib_1.__assign(tslib_1.__assign({}, orderBy[element.field]), (_d = {}, _d[element.operation] = direction, _d));
@@ -242,17 +242,17 @@ var DataApi = /** @class */ (function () {
                                 finally { if (e_2) throw e_2.error; }
                             }
                         }
-                        groupBy = (_f = body === null || body === void 0 ? void 0 : body.groupBy) === null || _f === void 0 ? void 0 : _f.filter(function (x) {
+                        group = (_f = body === null || body === void 0 ? void 0 : body.groupBy) === null || _f === void 0 ? void 0 : _f.filter(function (x) {
                             return _this.repository.fields.find(x).includedInApi();
                         });
-                        return [4 /*yield*/, this.repository.aggregate((_e = {
+                        return [4 /*yield*/, this.repository.groupBy((_e = {
                                     where: findOptions.where,
                                     limit: findOptions.limit,
                                     page: findOptions.page
                                 },
                                 //@ts-expect-error internal key
-                                _e[remult3_js_1.AggregateForApiKey] = true,
-                                _e.groupBy = groupBy,
+                                _e[remult3_js_1.GroupByForApiKey] = true,
+                                _e.group = group,
                                 _e.sum = (_g = body === null || body === void 0 ? void 0 : body.sum) === null || _g === void 0 ? void 0 : _g.filter(function (x) {
                                     return _this.repository.fields.find(x).includedInApi();
                                 }),
@@ -272,27 +272,23 @@ var DataApi = /** @class */ (function () {
                                 _e))];
                     case 2:
                         result = _m.sent();
-                        if (!Array.isArray(result)) {
-                            result = [result];
-                        }
-                        else {
+                        if (group)
                             result.forEach(function (x) {
                                 var e_3, _a;
                                 try {
-                                    for (var groupBy_1 = tslib_1.__values(groupBy), groupBy_1_1 = groupBy_1.next(); !groupBy_1_1.done; groupBy_1_1 = groupBy_1.next()) {
-                                        var f = groupBy_1_1.value;
+                                    for (var group_1 = tslib_1.__values(group), group_1_1 = group_1.next(); !group_1_1.done; group_1_1 = group_1.next()) {
+                                        var f = group_1_1.value;
                                         x[f] = _this.repository.fields.find(f).valueConverter.toJson(x[f]);
                                     }
                                 }
                                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                                 finally {
                                     try {
-                                        if (groupBy_1_1 && !groupBy_1_1.done && (_a = groupBy_1.return)) _a.call(groupBy_1);
+                                        if (group_1_1 && !group_1_1.done && (_a = group_1.return)) _a.call(group_1);
                                     }
                                     finally { if (e_3) throw e_3.error; }
                                 }
                             });
-                        }
                         response.success(result);
                         return [2 /*return*/];
                 }

package/src/data-interfaces.d.ts

@@ -1,6 +1,6 @@
 import type { FieldMetadata } from '../index.js';
 import type { Filter } from './filter/filter-interfaces.js';
-import type { AggregateOperators, EntityMetadata, MembersOnly } from './remult3/remult3.js';
+import type { GroupByOperators, EntityMetadata, MembersOnly } from './remult3/remult3.js';
 import { Sort } from './sort.js';
 export interface DataProvider {
     getEntityDataProvider(entity: EntityMetadata): EntityDataProvider;
@@ -11,8 +11,8 @@ export interface DataProvider {
 export interface Storage {
     ensureSchema(): Promise<void>;
 }
-export interface EntityDataProviderAggregateOptions extends Pick<EntityDataProviderFindOptions, 'where' | 'limit' | 'page'> {
-    groupBy?: FieldMetadata[];
+export interface EntityDataProviderGroupByOptions extends Pick<EntityDataProviderFindOptions, 'where' | 'limit' | 'page'> {
+    group?: FieldMetadata[];
     sum?: FieldMetadata[];
     avg?: FieldMetadata[];
     min?: FieldMetadata[];
@@ -21,13 +21,13 @@ export interface EntityDataProviderAggregateOptions extends Pick<EntityDataProvi
     orderBy?: {
         field?: FieldMetadata;
         isDescending?: boolean;
-        operation?: (typeof AggregateOperators)[number] | 'count';
+        operation?: (typeof GroupByOperators)[number] | 'count';
     }[];
 }
 export interface EntityDataProvider {
     count(where: Filter): Promise<number>;
     find(options?: EntityDataProviderFindOptions): Promise<Array<any>>;
-    aggregate(options?: EntityDataProviderAggregateOptions): Promise<any[]>;
+    groupBy(options?: EntityDataProviderGroupByOptions): Promise<any[]>;
     update(id: any, data: any): Promise<any>;
     delete(id: any): Promise<void>;
     insert(data: any): Promise<any>;

package/src/data-providers/array-entity-data-provider.d.ts

@@ -1,4 +1,4 @@
-import type { EntityDataProvider, EntityDataProviderAggregateOptions, EntityDataProviderFindOptions } from '../data-interfaces.js';
+import type { EntityDataProvider, EntityDataProviderGroupByOptions, EntityDataProviderFindOptions } from '../data-interfaces.js';
 import { Filter } from '../filter/filter-interfaces.js';
 import { type EntityFilter, type EntityMetadata } from '../remult3/remult3.js';
 export declare class ArrayEntityDataProvider implements EntityDataProvider {
@@ -6,7 +6,7 @@ export declare class ArrayEntityDataProvider implements EntityDataProvider {
     private rows;
     static rawFilter(filter: CustomArrayFilter): EntityFilter<any>;
     constructor(entity: EntityMetadata, rows: () => any[]);
-    aggregate(options?: EntityDataProviderAggregateOptions): Promise<any[]>;
+    groupBy(options?: EntityDataProviderGroupByOptions): Promise<any[]>;
     count(where?: Filter): Promise<number>;
     find(options?: EntityDataProviderFindOptions): Promise<any[]>;
     update(id: any, data: any): Promise<any>;

package/src/data-providers/array-entity-data-provider.js

@@ -20,7 +20,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
             },
             _a;
     };
-    ArrayEntityDataProvider.prototype.aggregate = function (options) {
+    ArrayEntityDataProvider.prototype.groupBy = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             function finishGroup() {
                 var e_8, _a;
@@ -38,20 +38,20 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                     }
                     finally { if (e_8) throw e_8.error; }
                 }
-                r[remult3_js_1.AggregateCountMember] = count;
+                r[remult3_js_1.GroupByCountMember] = count;
                 result.push(r);
                 first = true;
                 count = 0;
             }
-            var sort, _a, _b, field, rows, result, group, first, count, aggregates, operatorImpl, AggregateOperators_1, AggregateOperators_1_1, operator, _c, _d, element, rows_1, rows_1_1, row, _e, _f, field, _g, _h, field, aggregates_1, aggregates_1_1, a;
+            var sort, _a, _b, field, rows, result, group, first, count, aggregates, operatorImpl, GroupByOperators_1, GroupByOperators_1_1, operator, _c, _d, element, rows_1, rows_1_1, row, _e, _f, field, _g, _h, field, aggregates_1, aggregates_1_1, a;
             var e_1, _j, e_2, _k, e_3, _l, e_4, _m, e_5, _o, e_6, _p, e_7, _q;
             return tslib_1.__generator(this, function (_r) {
                 switch (_r.label) {
                     case 0:
                         sort = new sort_js_1.Sort();
-                        if (options === null || options === void 0 ? void 0 : options.groupBy)
+                        if (options === null || options === void 0 ? void 0 : options.group)
                             try {
-                                for (_a = tslib_1.__values(options === null || options === void 0 ? void 0 : options.groupBy), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                for (_a = tslib_1.__values(options === null || options === void 0 ? void 0 : options.group), _b = _a.next(); !_b.done; _b = _a.next()) {
                                     field = _b.value;
                                     sort.Segments.push({ field: field });
                                 }
@@ -152,8 +152,8 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                             },
                         };
                         try {
-                            for (AggregateOperators_1 = tslib_1.__values(remult3_js_1.AggregateOperators), AggregateOperators_1_1 = AggregateOperators_1.next(); !AggregateOperators_1_1.done; AggregateOperators_1_1 = AggregateOperators_1.next()) {
-                                operator = AggregateOperators_1_1.value;
+                            for (GroupByOperators_1 = tslib_1.__values(remult3_js_1.GroupByOperators), GroupByOperators_1_1 = GroupByOperators_1.next(); !GroupByOperators_1_1.done; GroupByOperators_1_1 = GroupByOperators_1.next()) {
+                                operator = GroupByOperators_1_1.value;
                                 if (options === null || options === void 0 ? void 0 : options[operator]) {
                                     try {
                                         for (_c = (e_3 = void 0, tslib_1.__values(options[operator])), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -174,17 +174,17 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                         catch (e_2_1) { e_2 = { error: e_2_1 }; }
                         finally {
                             try {
-                                if (AggregateOperators_1_1 && !AggregateOperators_1_1.done && (_k = AggregateOperators_1.return)) _k.call(AggregateOperators_1);
+                                if (GroupByOperators_1_1 && !GroupByOperators_1_1.done && (_k = GroupByOperators_1.return)) _k.call(GroupByOperators_1);
                             }
                             finally { if (e_2) throw e_2.error; }
                         }
                         try {
                             for (rows_1 = tslib_1.__values(rows), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
                                 row = rows_1_1.value;
-                                if (options === null || options === void 0 ? void 0 : options.groupBy) {
+                                if (options === null || options === void 0 ? void 0 : options.group) {
                                     if (!first) {
                                         try {
-                                            for (_e = (e_5 = void 0, tslib_1.__values(options === null || options === void 0 ? void 0 : options.groupBy)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                                            for (_e = (e_5 = void 0, tslib_1.__values(options === null || options === void 0 ? void 0 : options.group)), _f = _e.next(); !_f.done; _f = _e.next()) {
                                                 field = _f.value;
                                                 if (group[field.key] != row[field.key]) {
                                                     finishGroup();
@@ -202,7 +202,7 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                                     }
                                     if (first) {
                                         try {
-                                            for (_g = (e_6 = void 0, tslib_1.__values(options === null || options === void 0 ? void 0 : options.groupBy)), _h = _g.next(); !_h.done; _h = _g.next()) {
+                                            for (_g = (e_6 = void 0, tslib_1.__values(options === null || options === void 0 ? void 0 : options.group)), _h = _g.next(); !_h.done; _h = _g.next()) {
                                                 field = _h.value;
                                                 group[field.key] = row[field.key];
                                             }
@@ -247,12 +247,12 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                                 var _loop_1 = function (x) {
                                     var getValue_1 = function (row) {
                                         if (!x.field && x.operation == 'count') {
-                                            return row[remult3_js_1.AggregateCountMember];
+                                            return row[remult3_js_1.GroupByCountMember];
                                         }
                                         else {
                                             switch (x.operation) {
                                                 case 'count':
-                                                    return row[remult3_js_1.AggregateCountMember];
+                                                    return row[remult3_js_1.GroupByCountMember];
                                                 case undefined:
                                                     return row[x.field.key];
                                                 default:

package/src/data-providers/json-data-provider.js

@@ -34,10 +34,10 @@ var JsonEntityDataProvider = /** @class */ (function () {
         this.formatted = formatted;
         this.p = Promise.resolve();
     }
-    JsonEntityDataProvider.prototype.aggregate = function (options) {
+    JsonEntityDataProvider.prototype.groupBy = function (options) {
         var _this = this;
         return (this.p = this.p.then(function () {
-            return _this.loadEntityData(function (dp, save) { return dp.aggregate(options); });
+            return _this.loadEntityData(function (dp, save) { return dp.groupBy(options); });
         }));
     };
     JsonEntityDataProvider.prototype.loadEntityData = function (what) {

package/src/data-providers/rest-data-provider.d.ts

@@ -1,4 +1,4 @@
-import type { DataProvider, EntityDataProvider, EntityDataProviderAggregateOptions, EntityDataProviderFindOptions, ProxyEntityDataProvider, RestDataProviderHttpProvider } from '../data-interfaces.js';
+import type { DataProvider, EntityDataProvider, EntityDataProviderGroupByOptions, EntityDataProviderFindOptions, ProxyEntityDataProvider, RestDataProviderHttpProvider } from '../data-interfaces.js';
 import { UrlBuilder } from '../../urlBuilder.js';
 import type { ApiClient } from '../context.js';
 import { Filter } from '../filter/filter-interfaces.js';
@@ -15,7 +15,7 @@ export declare class RestEntityDataProvider implements EntityDataProvider, Proxy
     private http;
     private entity;
     constructor(url: () => string, http: () => RestDataProviderHttpProvider, entity: EntityMetadata);
-    aggregate(options?: EntityDataProviderAggregateOptions): Promise<any[]>;
+    groupBy(options?: EntityDataProviderGroupByOptions): Promise<any[]>;
     translateFromJson(row: any): any;
     translateToJson(row: any): any;
     count(where: Filter): Promise<number>;

package/src/data-providers/rest-data-provider.js

@@ -117,7 +117,7 @@ var RestEntityDataProvider = /** @class */ (function () {
         this.http = http;
         this.entity = entity;
     }
-    RestEntityDataProvider.prototype.aggregate = function (options) {
+    RestEntityDataProvider.prototype.groupBy = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var run, body, result;
             var _a, _b, _c, _d, _e, _f, _g;
@@ -130,7 +130,7 @@ var RestEntityDataProvider = /** @class */ (function () {
                             page: options === null || options === void 0 ? void 0 : options.page,
                         }).run;
                         body = {
-                            groupBy: (_a = options === null || options === void 0 ? void 0 : options.groupBy) === null || _a === void 0 ? void 0 : _a.map(function (x) { return x.key; }),
+                            groupBy: (_a = options === null || options === void 0 ? void 0 : options.group) === null || _a === void 0 ? void 0 : _a.map(function (x) { return x.key; }),
                             sum: (_b = options === null || options === void 0 ? void 0 : options.sum) === null || _b === void 0 ? void 0 : _b.map(function (x) { return x.key; }),
                             avg: (_c = options === null || options === void 0 ? void 0 : options.avg) === null || _c === void 0 ? void 0 : _c.map(function (x) { return x.key; }),
                             min: (_d = options === null || options === void 0 ? void 0 : options.min) === null || _d === void 0 ? void 0 : _d.map(function (x) { return x.key; }),
@@ -138,14 +138,14 @@ var RestEntityDataProvider = /** @class */ (function () {
                             distinctCount: (_f = options === null || options === void 0 ? void 0 : options.distinctCount) === null || _f === void 0 ? void 0 : _f.map(function (x) { return x.key; }),
                             orderBy: (_g = options === null || options === void 0 ? void 0 : options.orderBy) === null || _g === void 0 ? void 0 : _g.map(function (x) { var _a; return (tslib_1.__assign(tslib_1.__assign({}, x), { field: (_a = x.field) === null || _a === void 0 ? void 0 : _a.key })); }),
                         };
-                        return [4 /*yield*/, run('aggregate', Object.keys(body).length > 0 ? body : undefined)];
+                        return [4 /*yield*/, run('groupBy', Object.keys(body).length > 0 ? body : undefined)];
                     case 1:
                         result = _h.sent();
-                        if (options === null || options === void 0 ? void 0 : options.groupBy)
+                        if (options === null || options === void 0 ? void 0 : options.group)
                             result.forEach(function (row) {
                                 var e_2, _a;
                                 try {
-                                    for (var _b = tslib_1.__values(options.groupBy), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                    for (var _b = tslib_1.__values(options.group), _c = _b.next(); !_c.done; _c = _b.next()) {
                                         var g = _c.value;
                                         row[g.key] = g.valueConverter.fromJson(row[g.key]);
                                     }

package/src/data-providers/sql-database.d.ts

@@ -1,4 +1,4 @@
-import type { DataProvider, EntityDataProvider, EntityDataProviderAggregateOptions } from '../data-interfaces.js';
+import type { DataProvider, EntityDataProvider, EntityDataProviderGroupByOptions } from '../data-interfaces.js';
 import type { HasWrapIdentifier, SqlCommand, SqlCommandFactory, SqlCommandWithParameters, SqlImplementation, SqlResult } from '../sql-command.js';
 import type { CustomSqlFilterBuilderFunction, EntityDbNamesBase } from '../filter/filter-consumer-bridge-to-sql-request.js';
 import { type EntityFilter, type EntityMetadata } from '../remult3/remult3.js';
@@ -95,4 +95,4 @@ export declare class SqlDatabase implements DataProvider, HasWrapIdentifier, Can
     end: () => Promise<void>;
 }
 export declare function getRowAfterUpdate<entityType>(meta: EntityMetadata<entityType>, dataProvider: EntityDataProvider, data: any, id: any, operation: string): any;
-export declare function aggregateImpl(options: EntityDataProviderAggregateOptions | undefined, e: EntityDbNamesBase, r: SqlCommand, orderByNullFirst: boolean | undefined, limitSyntax: (limit: number, offset: number) => string): Promise<any[]>;
+export declare function groupByImpl(options: EntityDataProviderGroupByOptions | undefined, e: EntityDbNamesBase, r: SqlCommand, orderByNullFirst: boolean | undefined, limitSyntax: (limit: number, offset: number) => string): Promise<any[]>;

package/src/data-providers/sql-database.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlDatabase = void 0;
 exports.getRowAfterUpdate = getRowAfterUpdate;
-exports.aggregateImpl = aggregateImpl;
+exports.groupByImpl = groupByImpl;
 var tslib_1 = require("tslib");
 var filter_consumer_bridge_to_sql_request_js_1 = require("../filter/filter-consumer-bridge-to-sql-request.js");
 var filter_interfaces_js_1 = require("../filter/filter-interfaces.js");
@@ -394,13 +394,13 @@ var ActualSQLEntityDataProvider = /** @class */ (function () {
             });
         });
     };
-    ActualSQLEntityDataProvider.prototype.aggregate = function (options) {
+    ActualSQLEntityDataProvider.prototype.groupBy = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = aggregateImpl;
+                        _a = groupByImpl;
                         _b = [options];
                         return [4 /*yield*/, this.init()];
                     case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([_c.sent(), this.sql.createCommand(),
@@ -825,14 +825,14 @@ function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
         return r[0];
     });
 }
-function aggregateImpl(options, e, r, orderByNullFirst, limitSyntax) {
+function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         function aggregateSqlSyntax(operator, dbName) {
             return operator === 'distinctCount'
                 ? "count (distinct ".concat(dbName, ")")
                 : "".concat(operator, "( ").concat(dbName, " )");
         }
-        var select, groupBy, processResultRow, _loop_2, _a, _b, x, _loop_3, AggregateOperators_1, AggregateOperators_1_1, operator, e_8_1, where, _c, orderBy, _d, _e, x, field, _f, e_9_1, page, result;
+        var select, groupBy, processResultRow, _loop_2, _a, _b, x, _loop_3, GroupByOperators_1, GroupByOperators_1_1, operator, e_8_1, where, _c, orderBy, _d, _e, x, field, _f, e_9_1, page, result;
         var e_10, _g, e_8, _h, e_9, _j;
         return tslib_1.__generator(this, function (_k) {
             switch (_k.label) {
@@ -841,9 +841,9 @@ function aggregateImpl(options, e, r, orderByNullFirst, limitSyntax) {
                     groupBy = '';
                     processResultRow = [];
                     processResultRow.push(function (sqlVal, theResult) {
-                        theResult[remult3_js_1.AggregateCountMember] = Number(sqlVal);
+                        theResult[remult3_js_1.GroupByCountMember] = Number(sqlVal);
                     });
-                    if (options === null || options === void 0 ? void 0 : options.groupBy) {
+                    if (options === null || options === void 0 ? void 0 : options.group) {
                         _loop_2 = function (x) {
                             if (x.isServerExpression) {
                             }
@@ -862,7 +862,7 @@ function aggregateImpl(options, e, r, orderByNullFirst, limitSyntax) {
                             });
                         };
                         try {
-                            for (_a = tslib_1.__values(options === null || options === void 0 ? void 0 : options.groupBy), _b = _a.next(); !_b.done; _b = _a.next()) {
+                            for (_a = tslib_1.__values(options === null || options === void 0 ? void 0 : options.group), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 x = _b.value;
                                 _loop_2(x);
                             }
@@ -937,17 +937,17 @@ function aggregateImpl(options, e, r, orderByNullFirst, limitSyntax) {
                     _k.label = 1;
                 case 1:
                     _k.trys.push([1, 6, 7, 8]);
-                    AggregateOperators_1 = tslib_1.__values(remult3_js_1.AggregateOperators), AggregateOperators_1_1 = AggregateOperators_1.next();
+                    GroupByOperators_1 = tslib_1.__values(remult3_js_1.GroupByOperators), GroupByOperators_1_1 = GroupByOperators_1.next();
                     _k.label = 2;
                 case 2:
-                    if (!!AggregateOperators_1_1.done) return [3 /*break*/, 5];
-                    operator = AggregateOperators_1_1.value;
+                    if (!!GroupByOperators_1_1.done) return [3 /*break*/, 5];
+                    operator = GroupByOperators_1_1.value;
                     return [5 /*yield**/, _loop_3(operator)];
                 case 3:
                     _k.sent();
                     _k.label = 4;
                 case 4:
-                    AggregateOperators_1_1 = AggregateOperators_1.next();
+                    GroupByOperators_1_1 = GroupByOperators_1.next();
                     return [3 /*break*/, 2];
                 case 5: return [3 /*break*/, 8];
                 case 6:
@@ -956,7 +956,7 @@ function aggregateImpl(options, e, r, orderByNullFirst, limitSyntax) {
                     return [3 /*break*/, 8];
                 case 7:
                     try {
-                        if (AggregateOperators_1_1 && !AggregateOperators_1_1.done && (_h = AggregateOperators_1.return)) _h.call(AggregateOperators_1);
+                        if (GroupByOperators_1_1 && !GroupByOperators_1_1.done && (_h = GroupByOperators_1.return)) _h.call(GroupByOperators_1);
                     }
                     finally { if (e_8) throw e_8.error; }
                     return [7 /*endfinally*/];

package/src/remult-proxy.js

@@ -121,6 +121,17 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .find.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
+                _a.groupBy = function () {
+                    var _a, _b;
+                    var args2 = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args2[_i] = arguments[_i];
+                    }
+                    return (_a = (_b = self
+                        .remultFactory())
+                        .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
+                        .groupBy.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
+                },
                 _a.aggregate = function () {
                     var _a, _b;
                     var args2 = [];

package/src/remult3/RepositoryImplementation.d.ts

@@ -4,7 +4,7 @@ import type { FieldMetadata, FieldOptions, ValueConverter, ValueListItem } from
 import { Remult } from '../context.js';
 import type { EntityOptions } from '../entity.js';
 import { Filter } from '../filter/filter-interfaces.js';
-import { type AggregateOptions, type AggregateResult, type ControllerRef, type ControllerRefForControllerBase, type EntityFilter, type EntityMetadata, type EntityOrderBy, type EntityRef, type EntityRefForEntityBase, type FieldRef, type FieldsMetadata, type FieldsRef, type FieldsRefForEntityBase, type FindFirstOptions, type FindFirstOptionsBase, type FindOptions, type IdMetadata, type LiveQuery, type LoadOptions, type MembersOnly, type NumericKeys, type QueryOptions, type QueryResult, type Repository, type RepositoryRelations, type Subscribable, type idType } from './remult3.js';
+import { type GroupByOptions, type GroupByResult, type ControllerRef, type ControllerRefForControllerBase, type EntityFilter, type EntityMetadata, type EntityOrderBy, type EntityRef, type EntityRefForEntityBase, type FieldRef, type FieldsMetadata, type FieldsRef, type FieldsRefForEntityBase, type FindFirstOptions, type FindFirstOptionsBase, type FindOptions, type IdMetadata, type LiveQuery, type LoadOptions, type MembersOnly, type NumericKeys, type QueryOptions, type QueryResult, type Repository, type RepositoryRelations, type Subscribable, type idType } from './remult3.js';
 import type { RefSubscriber } from './remult3.js';
 import type { entityEventListener } from '../__EntityValueProvider.js';
 import type { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo } from '../data-interfaces.js';
@@ -32,7 +32,8 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     private __edp?;
     private get _edp();
     constructor(_entity: ClassType<entityType>, _remult: Remult, _dataProvider: DataProvider, _info: EntityFullInfo<entityType>, _defaultFindOptions?: FindOptions<entityType> | undefined);
-    aggregate<groupByFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, sumFields extends NumericKeys<entityType>[] | undefined = undefined, averageFields extends NumericKeys<entityType>[] | undefined = undefined, minFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, maxFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, distinctCountFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined>(options: AggregateOptions<entityType, groupByFields extends undefined ? never : groupByFields, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>): Promise<groupByFields extends undefined ? AggregateResult<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields> : AggregateResult<entityType, groupByFields extends undefined ? never : groupByFields, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>[]>;
+    aggregate<sumFields extends NumericKeys<entityType>[] | undefined = undefined, averageFields extends NumericKeys<entityType>[] | undefined = undefined, minFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, maxFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, distinctCountFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined>(options: Omit<GroupByOptions<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>, 'limit' | 'page' | 'orderBy'>): Promise<GroupByResult<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>>;
+    groupBy<groupByFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, sumFields extends NumericKeys<entityType>[] | undefined = undefined, averageFields extends NumericKeys<entityType>[] | undefined = undefined, minFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, maxFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, distinctCountFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined>(options: GroupByOptions<entityType, groupByFields extends undefined ? never : groupByFields, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>): Promise<GroupByResult<entityType, groupByFields extends undefined ? never : groupByFields, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>[]>;
     _idCache: Map<any, any>;
     _getCachedById(id: any, doNotLoadIfNotFound: boolean): entityType | undefined;
     _getCachedByIdAsync(id: any, doNotLoadIfNotFound: boolean): Promise<entityType | undefined>;

package/src/remult3/RepositoryImplementation.js

@@ -182,6 +182,16 @@ var RepositoryImplementation = /** @class */ (function () {
         configurable: true
     });
     RepositoryImplementation.prototype.aggregate = function (options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.groupBy(options)];
+                    case 1: return [2 /*return*/, (_a.sent())[0]];
+                }
+            });
+        });
+    };
+    RepositoryImplementation.prototype.groupBy = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var findOptions, getField, getFieldNotInGroupBy, dpOptions, key, element, operation, direction, result, loaderOptions, _a, _b, key, loader;
             var e_4, _c;
@@ -200,7 +210,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         };
                         getFieldNotInGroupBy = function (key) {
                             var _a;
-                            if ((_a = options === null || options === void 0 ? void 0 : options.groupBy) === null || _a === void 0 ? void 0 : _a.includes(key))
+                            if ((_a = options === null || options === void 0 ? void 0 : options.group) === null || _a === void 0 ? void 0 : _a.includes(key))
                                 throw Error("field \"".concat(key, "\" cannot be used both in an aggregate and in group by"));
                             return getField(key);
                         };
@@ -208,7 +218,7 @@ var RepositoryImplementation = /** @class */ (function () {
                             where: findOptions.where,
                             limit: findOptions.limit,
                             page: findOptions.page,
-                            groupBy: (_d = options === null || options === void 0 ? void 0 : options.groupBy) === null || _d === void 0 ? void 0 : _d.map(getField),
+                            group: (_d = options === null || options === void 0 ? void 0 : options.group) === null || _d === void 0 ? void 0 : _d.map(getField),
                             sum: (_e = options === null || options === void 0 ? void 0 : options.sum) === null || _e === void 0 ? void 0 : _e.map(getFieldNotInGroupBy),
                             avg: (_f = options === null || options === void 0 ? void 0 : options.avg) === null || _f === void 0 ? void 0 : _f.map(getFieldNotInGroupBy),
                             min: (_g = options === null || options === void 0 ? void 0 : options.min) === null || _g === void 0 ? void 0 : _g.map(getFieldNotInGroupBy),
@@ -243,19 +253,17 @@ var RepositoryImplementation = /** @class */ (function () {
                                 }
                             }
                         }
-                        return [4 /*yield*/, this._edp.aggregate(dpOptions)];
+                        return [4 /*yield*/, this._edp.groupBy(dpOptions)
+                            //@ts-expect-error an internal option
+                        ];
                     case 2:
                         result = _k.sent();
-                        if (!(options === null || options === void 0 ? void 0 : options.groupBy))
-                            return [2 /*return*/, result[0]
-                                //@ts-expect-error an internal option
-                            ];
-                        if (!!(options === null || options === void 0 ? void 0 : options[remult3_js_1.AggregateForApiKey])) return [3 /*break*/, 5];
+                        if (!(!(options === null || options === void 0 ? void 0 : options[remult3_js_1.GroupByForApiKey]) && options.group)) return [3 /*break*/, 5];
                         loaderOptions = {
                             include: {},
                         };
                         try {
-                            for (_a = tslib_1.__values(options.groupBy), _b = _a.next(); !_b.done; _b = _a.next()) {
+                            for (_a = tslib_1.__values(options.group), _b = _a.next(); !_b.done; _b = _a.next()) {
                                 key = _b.value;
                                 loaderOptions.include[key] = true;
                             }
@@ -268,7 +276,7 @@ var RepositoryImplementation = /** @class */ (function () {
                             finally { if (e_4) throw e_4.error; }
                         }
                         loader = new relation_loader_js_1.RelationLoader();
-                        return [4 /*yield*/, this.populateRelationsForFields(dpOptions.groupBy, loaderOptions, result, loader)];
+                        return [4 /*yield*/, this.populateRelationsForFields(dpOptions.group, loaderOptions, result, loader)];
                     case 3:
                         _k.sent();
                         return [4 /*yield*/, loader.resolveAll()];

package/src/remult3/remult3.d.ts

@@ -272,8 +272,8 @@ export type NumericKeys<T> = {
  *
  * @example
  * // Grouping by country and city, summing the salary field, and ordering by country and sum of salary:
- * const results = await repo.aggregate({
- *   groupBy: ['country', 'city'],
+ * const results = await repo.groupBy({
+ *   group: ['country', 'city'],
  *   sum: ['salary'],
  *   where: {
  *     salary: { $ne: 1000 },
@@ -299,11 +299,11 @@ export type NumericKeys<T> = {
  * });
  * console.log(totalSalary.salary.sum); // Outputs the total sum of salaries
  */
-export type AggregateOptions<entityType, groupByFields extends (keyof MembersOnly<entityType>)[], sumFields extends NumericKeys<entityType>[], averageFields extends NumericKeys<entityType>[], minFields extends (keyof MembersOnly<entityType>)[], maxFields extends (keyof MembersOnly<entityType>)[], distinctCountFields extends (keyof MembersOnly<entityType>)[]> = {
+export type GroupByOptions<entityType, groupByFields extends (keyof MembersOnly<entityType>)[], sumFields extends NumericKeys<entityType>[], averageFields extends NumericKeys<entityType>[], minFields extends (keyof MembersOnly<entityType>)[], maxFields extends (keyof MembersOnly<entityType>)[], distinctCountFields extends (keyof MembersOnly<entityType>)[]> = {
     /**
      * Fields to group by. The result will include one entry per unique combination of these fields.
      */
-    groupBy?: groupByFields;
+    group?: groupByFields;
     /**
      * Fields to sum. The result will include the sum of these fields for each group.
      */
@@ -359,10 +359,10 @@ export type AggregateOptions<entityType, groupByFields extends (keyof MembersOnl
         $count?: 'asc' | 'desc';
     };
 } & Pick<FindOptions<entityType>, 'limit' | 'page'>;
-export declare const AggregateCountMember: "$count";
-export declare const AggregateForApiKey: unique symbol;
-export declare const AggregateOperators: readonly ["sum", "avg", "min", "max", "distinctCount"];
-export type AggregateResult<entityType, groupByFields extends (keyof entityType)[], sumFields extends (keyof entityType)[], averageFields extends NumericKeys<entityType>[], minFields extends NumericKeys<entityType>[], maxFields extends NumericKeys<entityType>[], distinctCountFields extends (keyof entityType)[]> = {
+export declare const GroupByCountMember: "$count";
+export declare const GroupByForApiKey: unique symbol;
+export declare const GroupByOperators: readonly ["sum", "avg", "min", "max", "distinctCount"];
+export type GroupByResult<entityType, groupByFields extends (keyof entityType)[], sumFields extends (keyof entityType)[], averageFields extends NumericKeys<entityType>[], minFields extends NumericKeys<entityType>[], maxFields extends NumericKeys<entityType>[], distinctCountFields extends (keyof entityType)[]> = {
     [K in groupByFields[number] | sumFields[number]]: K extends groupByFields[number] ? entityType[K] : K extends sumFields[number] ? {
         sum: number;
     } : never;
@@ -415,13 +415,13 @@ export interface Repository<entityType> {
      * @template sumFields The fields to sum, provided as an array of numeric keys from the entity type.
      * @template averageFields The fields to average, provided as an array of numeric keys from the entity type.
      *
-     * @param {AggregateOptions<entityType, groupByFields, sumFields, averageFields>} options - The options for the aggregation.
-     * @returns {Promise<AggregateResult<entityType, groupByFields, sumFields, averageFields>[] | AggregateResult<entityType, never, sumFields, averageFields>>} The result of the aggregation.
+     * @param {GroupByOptions<entityType, groupByFields, sumFields, averageFields>} options - The options for the aggregation.
+     * @returns {Promise<GroupByResult<entityType, groupByFields, sumFields, averageFields>[]> } The result of the aggregation.
      *
      * @example
      * // Grouping by country and city, summing the salary field, and ordering by country and sum of salary:
-     * const results = await repo.aggregate({
-     *   groupBy: ['country', 'city'],
+     * const results = await repo.groupBy({
+     *   group: ['country', 'city'],
      *   sum: ['salary'],
      *   where: {
      *     salary: { $ne: 1000 },
@@ -440,14 +440,28 @@ export interface Repository<entityType> {
      * console.log(results[0].$count); // count for London, UK
      * console.log(results[0].salary.sum); // Sum of salaries for London, UK
      *
+  
+     */
+    groupBy<groupByFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, sumFields extends NumericKeys<entityType>[] | undefined = undefined, averageFields extends NumericKeys<entityType>[] | undefined = undefined, minFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, maxFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, distinctCountFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined>(options: GroupByOptions<entityType, groupByFields extends undefined ? never : groupByFields, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>): Promise<GroupByResult<entityType, groupByFields extends undefined ? never : groupByFields, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>[]>;
+    /**
+     * Performs an aggregation on the repository's entity type based on the specified options.
+     * @template entityType The type of the entity being aggregated.
+     * @template groupByFields The fields to group by, provided as an array of keys from the entity type.
+     * @template sumFields The fields to sum, provided as an array of numeric keys from the entity type.
+     * @template averageFields The fields to average, provided as an array of numeric keys from the entity type.
+     *
+     * @param {GroupByOptions<entityType, groupByFields, sumFields, averageFields>} options - The options for the aggregation.
+     * @returns {Promise<GroupByResult<entityType, groupByFields, sumFields, averageFields>[]> } The result of the aggregation.
+     *
      * @example
-     * // Aggregating without grouping (summing the salary field across all entities):
+     * // Aggregating  (summing the salary field across all items):
      * const totalSalary = await repo.aggregate({
      *   sum: ['salary'],
      * });
      * console.log(totalSalary.salary.sum); // Outputs the total sum of salaries
+  
      */
-    aggregate<groupByFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, sumFields extends NumericKeys<entityType>[] | undefined = undefined, averageFields extends NumericKeys<entityType>[] | undefined = undefined, minFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, maxFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, distinctCountFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined>(options: AggregateOptions<entityType, groupByFields extends undefined ? never : groupByFields, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>): Promise<groupByFields extends undefined ? AggregateResult<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields> : AggregateResult<entityType, groupByFields extends undefined ? never : groupByFields, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>[]>;
+    aggregate<sumFields extends NumericKeys<entityType>[] | undefined = undefined, averageFields extends NumericKeys<entityType>[] | undefined = undefined, minFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, maxFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined, distinctCountFields extends (keyof MembersOnly<entityType>)[] | undefined = undefined>(options: Omit<GroupByOptions<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>, 'orderBy' | 'limit' | 'page'>): Promise<GroupByResult<entityType, never, sumFields extends undefined ? never : sumFields, averageFields extends undefined ? never : averageFields, minFields extends undefined ? never : minFields, maxFields extends undefined ? never : maxFields, distinctCountFields extends undefined ? never : distinctCountFields>>;
     /**  An alternative form of fetching data from the API server, which is intended for operating on large numbers of entity objects.
      *
      * It also has it's own paging mechanism that can be used n paging scenarios.

package/src/remult3/remult3.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flags = exports.AggregateOperators = exports.AggregateForApiKey = exports.AggregateCountMember = void 0;
-exports.AggregateCountMember = '$count';
-exports.AggregateForApiKey = Symbol.for('AggregateForApiKey');
-exports.AggregateOperators = [
+exports.flags = exports.GroupByOperators = exports.GroupByForApiKey = exports.GroupByCountMember = void 0;
+exports.GroupByCountMember = '$count';
+exports.GroupByForApiKey = Symbol.for('GroupByForApiKey');
+exports.GroupByOperators = [
     'sum',
     'avg',
     'min',
@@ -19,6 +19,7 @@ exports.flags = {
 /*p1 - min, max, avg, sum, countDistinct - noam come up with an api
   p1 - handle relations
 */
+//y1 - find and count / aggregate with a single call
 /*p1 - add id and use uuid by default, but allow changes with Fields.id.defaultIdProvider NO but defaultProvider yes???
   //p1 - replace uuid with crypto.randomUUID and allow custom fallback NO
   //p1 - Add example for luid