remult 0.27.20-next.2 → 0.27.20-next.3

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

@@ -105,9 +105,14 @@ export class RestEntityDataProvider {
     }
     query(options, aggregateOptions) {
         const r = this.buildFindRequest(options);
-        return r.run('query', {
+        return r
+            .run('query', {
             aggregate: this.buildAggregateOptions(aggregateOptions),
-        });
+        })
+            .then(({ items, aggregates }) => ({
+            items: items.map((x) => this.translateFromJson(x)),
+            aggregates,
+        }));
     }
     async groupBy(options) {
         const { run } = this.buildFindRequest({

package/esm/src/remult3/QueryResultImpl.js

@@ -1,4 +1,5 @@
 import { queryConfig } from '../context.js';
+import { isOfType } from '../isOfType.js';
 import { Sort } from '../sort.js';
 import { RelationLoader } from './relation-loader.js';
 export class QueryResultImpl {
@@ -52,11 +53,8 @@ export class QueryResultImpl {
             include: this.options.include,
         };
         let getItems = () => this.repo.find(options);
-        if (this._aggregates === undefined /* &&
-        (isOfType<QueryOptions<entityType, any, any, any, any, any>>(
-          this.options,
-          'aggregate',
-        ))*/) {
+        if (this._aggregates === undefined &&
+            isOfType(this.options, 'aggregate')) {
             let agg = this.options.aggregate;
             if (!this.repo._dataProvider.isProxy) {
                 let itemsPromise = getItems();

package/package.json

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

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

@@ -121,9 +121,18 @@ var RestEntityDataProvider = /** @class */ (function () {
         this.entity = entity;
     }
     RestEntityDataProvider.prototype.query = function (options, aggregateOptions) {
+        var _this = this;
         var r = this.buildFindRequest(options);
-        return r.run('query', {
+        return r
+            .run('query', {
             aggregate: this.buildAggregateOptions(aggregateOptions),
+        })
+            .then(function (_a) {
+            var items = _a.items, aggregates = _a.aggregates;
+            return ({
+                items: items.map(function (x) { return _this.translateFromJson(x); }),
+                aggregates: aggregates,
+            });
         });
     };
     RestEntityDataProvider.prototype.groupBy = function (options) {

package/src/remult3/QueryResultImpl.d.ts

@@ -3,7 +3,7 @@ import type { RepositoryImplementation } from './RepositoryImplementation.js';
 export declare class QueryResultImpl<entityType> implements QueryResult<entityType> {
     private options;
     private repo;
-    constructor(options: QueryOptions<entityType, any, any, any, any, any>, repo: RepositoryImplementation<entityType>);
+    constructor(options: QueryOptions<entityType>, repo: RepositoryImplementation<entityType>);
     private _count;
     private _aggregates;
     getPage(page?: number): Promise<entityType[]>;

package/src/remult3/QueryResultImpl.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryResultImpl = void 0;
 var tslib_1 = require("tslib");
 var context_js_1 = require("../context.js");
+var isOfType_js_1 = require("../isOfType.js");
 var sort_js_1 = require("../sort.js");
 var relation_loader_js_1 = require("./relation-loader.js");
 var QueryResultImpl = /** @class */ (function () {
@@ -116,11 +117,8 @@ var QueryResultImpl = /** @class */ (function () {
                             include: this.options.include,
                         };
                         getItems = function () { return _this.repo.find(options); };
-                        if (this._aggregates === undefined /* &&
-                        (isOfType<QueryOptions<entityType, any, any, any, any, any>>(
-                          this.options,
-                          'aggregate',
-                        ))*/) {
+                        if (this._aggregates === undefined &&
+                            (0, isOfType_js_1.isOfType)(this.options, 'aggregate')) {
                             agg_1 = this.options.aggregate;
                             if (!this.repo._dataProvider.isProxy) {
                                 itemsPromise_1 = getItems();

package/src/remult3/RepositoryImplementation.d.ts

@@ -5,7 +5,7 @@ import { Remult } from '../context.js';
 import type { EntityOptions } from '../entity.js';
 import { Filter } from '../filter/filter-interfaces.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 Repository, type RepositoryRelations, type Subscribable, type idType } from './remult3.js';
-import type { QueryOptions, QueryResult, RefSubscriber, UpsertOptions } from './remult3.js';
+import type { QueryOptions, RefSubscriber, UpsertOptions } from './remult3.js';
 import type { entityEventListener } from '../__EntityValueProvider.js';
 import type { DataProvider, EntityDataProvider, EntityDataProviderGroupByOptions, EntityDataProviderFindOptions, ErrorInfo } from '../data-interfaces.js';
 import type { Unsubscribe } from '../live-query/SubscriptionChannel.js';
@@ -42,7 +42,9 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     get metadata(): EntityMetadata<entityType>;
     listeners?: entityEventListener<entityType>[];
     addEventListener(listener: entityEventListener<entityType>): () => void;
-    query<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?: QueryOptions<entityType, 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>): QueryResult<entityType, 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>;
+    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): any;
     getEntityRef(entity: entityType): EntityRef<entityType>;
     delete(id: idType<entityType>): Promise<void>;
     delete(item: Partial<MembersOnly<entityType>>): Promise<void>;

package/src/remult3/remult3.d.ts

@@ -483,8 +483,8 @@ export interface Repository<entityType> {
      * @template maxFields The fields to find the maximum value, provided as an array of keys from the entity type.
      * @template distinctCountFields The fields to count distinct values, provided as an array of keys from the entity type.
      *
-     * @param {QueryOptionsWithAggregates<entityType, sumFields, averageFields, minFields, maxFields, distinctCountFields>} options - The options for the query and aggregation.
-     * @returns {QueryResultWithAggregates<entityType, sumFields, averageFields, minFields, maxFields, distinctCountFields>} The result of the query, including paginated items and aggregation results.
+     * @param {QueryOptions<entityType, sumFields, averageFields, minFields, maxFields, distinctCountFields>} options - The options for the query and aggregation.
+     * @returns {QueryResult<entityType, sumFields, averageFields, minFields, maxFields, distinctCountFields>} The result of the query, including paginated items and aggregation results.
      *
      * @example
      * // Basic usage with asynchronous iteration:
@@ -526,7 +526,11 @@ export interface Repository<entityType> {
      * console.log('Total salary:', result.aggregates.salary.sum); // Sum of all salaries
      * console.log('Average age:', result.aggregates.age.average);  // Average age
      */
-    query<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?: QueryOptions<entityType, 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>): QueryResult<entityType, 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>;
+    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>;
     /** Returns a count of the items matching the criteria.
      * @see [EntityFilter](http://remult.dev/docs/entityFilter.html)
      * @example
@@ -1049,18 +1053,17 @@ export interface FindFirstOptionsBase<entityType> extends LoadOptions<entityType
     /** If set to true and an item is not found, it's created and returned*/
     createIfNotFound?: boolean;
 }
-export interface QueryOptions<entityType, sumFields extends NumericKeys<entityType>[] = never, averageFields extends NumericKeys<entityType>[] = never, minFields extends (keyof MembersOnly<entityType>)[] = never, maxFields extends (keyof MembersOnly<entityType>)[] = never, distinctCountFields extends (keyof MembersOnly<entityType>)[] = never> extends FindOptionsBase<entityType> {
+export interface QueryOptions<entityType> extends FindOptionsBase<entityType> {
     /** The number of items to return in each step */
     pageSize?: number;
     /** A callback method to indicate the progress of the iteration */
     progress?: {
         progress: (progress: number) => void;
     };
-    aggregate?: Omit<GroupByOptions<entityType, never, sumFields, averageFields, minFields, maxFields, distinctCountFields>, 'group' | 'orderBy' | 'where' | 'limit' | 'page'>;
 }
 /** The result of a call to the `query` method in the `Repository` object.
  */
-export interface QueryResult<entityType, sumFields extends NumericKeys<entityType>[] = never, averageFields extends NumericKeys<entityType>[] = never, minFields extends (keyof MembersOnly<entityType>)[] = never, maxFields extends (keyof MembersOnly<entityType>)[] = never, distinctCountFields extends (keyof MembersOnly<entityType>)[] = never> {
+export interface QueryResult<entityType, AggregateResult = never> {
     /** returns an iterator that iterates the rows in the result using a paging mechanism
      * @example
      * for await (const task of taskRepo.query()) {
@@ -1077,7 +1080,7 @@ export interface QueryResult<entityType, sumFields extends NumericKeys<entityTyp
     /** Performs an operation on all the items matching the query criteria */
     forEach(what: (item: entityType) => Promise<any>): Promise<number>;
     /** Returns a `Paginator` object that is used for efficient paging */
-    paginator(): Promise<Paginator<entityType, sumFields, averageFields, minFields, maxFields, distinctCountFields>>;
+    paginator(): Promise<Paginator<entityType, AggregateResult>>;
 }
 /** An interface used to paginating using the `query` method in the `Repository` object
  *  @example
@@ -1095,7 +1098,7 @@ export interface QueryResult<entityType, sumFields extends NumericKeys<entityTyp
  *   console.log(paginator.items.length)
  * }
  */
-export interface Paginator<entityType, sumFields extends NumericKeys<entityType>[] = never, averageFields extends NumericKeys<entityType>[] = never, minFields extends (keyof MembersOnly<entityType>)[] = never, maxFields extends (keyof MembersOnly<entityType>)[] = never, distinctCountFields extends (keyof MembersOnly<entityType>)[] = never> {
+export type Paginator<entityType, AggregateResult = never> = {
     /** the items in the current page */
     items: entityType[];
     /** True if next page exists */
@@ -1103,9 +1106,9 @@ export interface Paginator<entityType, sumFields extends NumericKeys<entityType>
     /** the count of the total items in the `query`'s result */
     count(): Promise<number>;
     /** Gets the next page in the `query`'s result set */
-    nextPage(): Promise<Paginator<entityType, sumFields, averageFields, minFields, maxFields, distinctCountFields>>;
-    aggregates: GroupByResult<entityType, never, sumFields, averageFields, minFields, maxFields, distinctCountFields>;
-}
+    nextPage(): Promise<Paginator<entityType, AggregateResult>>;
+    aggregates: AggregateResult;
+};
 /**
  * Options for configuring a relation between entities.
  *