remult 0.27.20-next.3 → 0.27.20-next.4

package/package.json

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

package/src/remult3/remult3.d.ts

@@ -529,8 +529,8 @@ export interface Repository<entityType> {
     query<Options extends QueryOptions<entityType> & {
         aggregate?: Omit<GroupByOptions<entityType, never, NumericKeys<entityType>[], NumericKeys<entityType>[], (keyof MembersOnly<entityType>)[], (keyof MembersOnly<entityType>)[], (keyof MembersOnly<entityType>)[]>, 'group' | 'orderBy' | 'where' | 'limit' | 'page'>;
     }>(options?: Options): Options extends {
-        aggregate: GroupByOptions<entityType, never, infer sumFields, infer averageFields, infer minFields, infer maxFields, infer distinctCountFields>;
-    } ? QueryResult<entityType, GroupByResult<entityType, never, sumFields, averageFields, minFields, maxFields, distinctCountFields>> : QueryResult<entityType>;
+        aggregate: Omit<GroupByOptions<entityType, never, NumericKeys<entityType>[], NumericKeys<entityType>[], (keyof MembersOnly<entityType>)[], (keyof MembersOnly<entityType>)[], (keyof MembersOnly<entityType>)[]>, 'group' | 'orderBy' | 'where' | 'limit' | 'page'>;
+    } ? QueryResult<entityType, GroupByResult<entityType, never, NonNullable<Options['aggregate']['sum']>, NonNullable<Options['aggregate']['avg']>, NonNullable<Options['aggregate']['min']>, NonNullable<Options['aggregate']['max']>, NonNullable<Options['aggregate']['distinctCount']>>> : QueryResult<entityType>;
     /** Returns a count of the items matching the criteria.
      * @see [EntityFilter](http://remult.dev/docs/entityFilter.html)
      * @example
@@ -1061,9 +1061,10 @@ export interface QueryOptions<entityType> extends FindOptionsBase<entityType> {
         progress: (progress: number) => void;
     };
 }
+export type EmptyAggregateResult = 'EmptyAggregateResult';
 /** The result of a call to the `query` method in the `Repository` object.
  */
-export interface QueryResult<entityType, AggregateResult = never> {
+export interface QueryResult<entityType, AggregateResult = EmptyAggregateResult> {
     /** returns an iterator that iterates the rows in the result using a paging mechanism
      * @example
      * for await (const task of taskRepo.query()) {
@@ -1098,7 +1099,7 @@ export interface QueryResult<entityType, AggregateResult = never> {
  *   console.log(paginator.items.length)
  * }
  */
-export type Paginator<entityType, AggregateResult = never> = {
+export type Paginator<entityType, AggregateResult = EmptyAggregateResult> = {
     /** the items in the current page */
     items: entityType[];
     /** True if next page exists */
@@ -1107,8 +1108,9 @@ export type Paginator<entityType, AggregateResult = never> = {
     count(): Promise<number>;
     /** Gets the next page in the `query`'s result set */
     nextPage(): Promise<Paginator<entityType, AggregateResult>>;
+} & (AggregateResult extends EmptyAggregateResult ? {} : {
     aggregates: AggregateResult;
-};
+});
 /**
  * Options for configuring a relation between entities.
  *