remult 0.27.8-next.3 → 0.27.8

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;