remult 3.3.2 → 3.3.4-next.0

package/esm/internals.js

@@ -8,3 +8,4 @@ export const actionInfo = remultStatic.actionInfo;
 export { isOfType } from './src/isOfType.js';
 export { flags } from './src/remult3/remult3.js';
 export { DataProviderPromiseWrapper } from './src/data-interfaces.js';
+export { pagedQueryResult } from './src/remult3/pagedQueryResult.js';

package/esm/remult-knex/index.js

@@ -117,7 +117,9 @@ class KnexEntityDataProvider {
         this.dp = dp;
     }
     async groupBy(options) {
-        return groupByImpl(options, await dbNamesOf(this.entity, this.dp.wrapIdentifier), this.dp.createCommand(), false, (limit, offset) => ' limit ' + limit + ' offset ' + offset);
+        return groupByImpl(options, await dbNamesOf(this.entity, this.dp.wrapIdentifier), this.dp.createCommand(), false, (limit, offset) => this.knex.client.config.client?.includes('mssql')
+            ? ' offset ' + offset + ' rows fetch next ' + limit + ' rows only'
+            : ' limit ' + limit + ' offset ' + offset);
     }
     getEntityFrom(e) {
         if (this.entity.options.sqlExpression)

package/esm/remult-sqlite-core.js

@@ -78,7 +78,9 @@ export class SqliteCoreDataProvider {
     addColumnSqlSyntax(x, dbName, isAlterTable) {
         let result = dbName;
         const nullNumber = x.allowNull ? '' : ' default 0 not null';
-        if (x.valueType == Date)
+        if (x.valueConverter.fieldTypeInDb)
+            result += ' ' + x.valueConverter.fieldTypeInDb + ' ' + nullNumber;
+        else if (x.valueType == Date)
             result += ' integer';
         else if (x.valueType == Boolean)
             result += ' integer ' + nullNumber;

package/esm/server/test-api-data-provider.js

@@ -29,7 +29,9 @@ export function TestApiDataProvider(options) {
                 if ((result?.statusCode ?? 200) >= 400) {
                     throw { ...result?.data, status: result?.statusCode ?? 500 };
                 }
-                return result?.data;
+                return result?.data
+                    ? JSON.parse(JSON.stringify(result.data))
+                    : undefined;
             });
         });
     }

package/esm/src/data-api.js

@@ -205,6 +205,8 @@ export class DataApi {
             }
         }
         const group = body?.groupBy?.filter((x) => this.repository.fields.find(x).includedInApi());
+        const min = body?.min?.filter((x) => this.repository.fields.find(x).includedInApi());
+        const max = body?.max?.filter((x) => this.repository.fields.find(x).includedInApi());
         let result = await this.repository.groupBy({
             where: findOptions.where,
             limit: findOptions.limit,
@@ -214,8 +216,8 @@ export class DataApi {
             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()),
-            max: body?.max?.filter((x) => this.repository.fields.find(x).includedInApi()),
+            min,
+            max,
             distinctCount: body?.distinctCount?.filter((x) => this.repository.fields.find(x).includedInApi()),
             orderBy: orderBy,
         });
@@ -225,6 +227,17 @@ export class DataApi {
                     x[f] = this.repository.fields.find(f).valueConverter.toJson(x[f]);
                 }
             });
+        const minMax = { min, max };
+        for (const element of ['min', 'max']) {
+            if (minMax[element])
+                result.forEach((x) => {
+                    for (const f of minMax[element]) {
+                        x[f][element] = this.repository.fields
+                            .find(f)
+                            .valueConverter.toJson(x[f][element]);
+                    }
+                });
+        }
         return result;
     }
     async getArrayImpl(request, body) {

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

@@ -142,6 +142,14 @@ export class RestEntityDataProvider {
                     row[g.key] = g.valueConverter.fromJson(row[g.key]);
                 }
             });
+        for (const element of ['min', 'max']) {
+            if (options?.[element])
+                result.forEach((row) => {
+                    for (const f of options[element]) {
+                        row[f.key][element] = f.valueConverter.fromJson(row[f.key][element]);
+                    }
+                });
+        }
         return result;
     }
     buildAggregateOptions(options) {

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

@@ -581,6 +581,8 @@ export async function groupByImpl(options, e, r, orderByNullFirst, limitSyntax)
                 processResultRow.push((sqlResult, theResult) => {
                     if (turnToNumber)
                         sqlResult = Number(sqlResult);
+                    if (operator === 'max' || operator === 'min')
+                        sqlResult = x.valueConverter.fromDb(sqlResult);
                     theResult[x.key] = { ...theResult[x.key], [operator]: sqlResult };
                 });
             }

package/esm/src/filter/filter-interfaces.js

@@ -175,6 +175,8 @@ export class Filter {
                     }
                     else {
                         const field = entity.fields[key];
+                        if (!field)
+                            throw new Error(`Field ${key} not found in entity ${entity.key}`);
                         const rel = getRelationFieldInfo(field);
                         const op = field.options;
                         let fh = rel?.type === 'toOne'

package/esm/src/remult3/RepositoryImplementation.js

@@ -698,10 +698,12 @@ export class RepositoryImplementation {
                 if (incl) {
                     const otherRepo = rel.toRepo;
                     for (const row of result) {
-                        let { findOptions, returnNull } = this._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo);
+                        let { findOptions, returnNull, returnUndefined } = this._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo);
                         const colKey = col.key;
                         if (returnNull)
                             row[colKey] = null;
+                        else if (returnUndefined)
+                            row[colKey] = undefined;
                         else {
                             const entityType = rel.toEntity;
                             const toRepo = otherRepo;
@@ -797,7 +799,13 @@ export class RepositoryImplementation {
             }
         for (const key in relFields.fields) {
             if (Object.prototype.hasOwnProperty.call(relFields.fields, key)) {
-                where.push({ [key]: getFieldValue(relFields.fields[key]) });
+                const val = getFieldValue(relFields.fields[key]);
+                if (val === null)
+                    returnNull = true;
+                else if (val === undefined)
+                    returnUndefined = true;
+                else
+                    where.push({ [key]: val });
             }
         }
         findOptions.where = { $and: where };
@@ -2076,7 +2084,7 @@ export class columnDefsImpl {
     displayValue(item) {
         return this.entityDefs
             .getEntityMetadataWithoutBreakingTheEntity(item)
-            .fields.find(this.key).displayValue;
+            .fields.find(this.key)?.displayValue;
     }
     includedInApi(item) {
         if (this.options.includeInApi === undefined)

package/esm/src/remult3/pagedQueryResult.js

@@ -0,0 +1,62 @@
+export function pagedQueryResult(pageSize, getPage, count) {
+    const iterator = () => {
+        let pageNumber = 1;
+        let currentPage = [];
+        let itemIndex = 0;
+        return {
+            next: async () => {
+                if (itemIndex >= currentPage.length) {
+                    currentPage = await getPage(pageNumber);
+                    if (currentPage.length === 0) {
+                        return { value: undefined, done: true };
+                    }
+                    pageNumber++;
+                    itemIndex = 0;
+                }
+                const value = currentPage[itemIndex++];
+                return { value, done: false };
+            },
+        };
+    };
+    return {
+        count,
+        getPage,
+        forEach: async (what) => {
+            let i = 0;
+            const it = iterator();
+            while (true) {
+                const { value, done } = await it.next();
+                if (done)
+                    break;
+                await what(value);
+                i++;
+            }
+            return i;
+        },
+        [Symbol.asyncIterator]: iterator,
+        paginator: async () => {
+            const createPaginator = async (pageNumber) => {
+                const items = await getPage(pageNumber);
+                const hasNextPage = items.length === pageSize;
+                const emptyPaginator = {
+                    items: [],
+                    hasNextPage: false,
+                    count,
+                    nextPage: async () => emptyPaginator,
+                };
+                return {
+                    items,
+                    hasNextPage,
+                    count,
+                    nextPage: async () => {
+                        if (!hasNextPage) {
+                            return emptyPaginator;
+                        }
+                        return createPaginator(pageNumber + 1);
+                    },
+                };
+            };
+            return createPaginator(1);
+        },
+    };
+}

package/esm/src/valueConverters.js

@@ -90,6 +90,7 @@ export class ValueConverters {
     };
     static DateOnlyString = {
         ...ValueConverters.DateOnly,
+        fieldTypeInDb: 'char(8)',
         toDb: (d) => {
             if (d === zeroDate)
                 return '00000000';

package/internals.d.ts

@@ -16,3 +16,4 @@ export { isOfType } from './src/isOfType.js';
 export type { ClassType } from './classType.js';
 export { flags } from './src/remult3/remult3.js';
 export { DataProviderPromiseWrapper } from './src/data-interfaces.js';
+export { pagedQueryResult } from './src/remult3/pagedQueryResult.js';

package/internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataProviderPromiseWrapper = exports.flags = exports.isOfType = exports.actionInfo = exports.__updateEntityBasedOnWhere = exports.getEntitySettings = exports.fieldOptionsEnricher = exports.getControllerRef = exports.controllerRefImpl = exports.decorateColumnSettings = exports.getRelationFieldInfo = exports.getRelationInfo = exports.sqlRelationsFilter = exports.sqlRelations = void 0;
+exports.pagedQueryResult = exports.DataProviderPromiseWrapper = exports.flags = exports.isOfType = exports.actionInfo = exports.__updateEntityBasedOnWhere = exports.getEntitySettings = exports.fieldOptionsEnricher = exports.getControllerRef = exports.controllerRefImpl = exports.decorateColumnSettings = exports.getRelationFieldInfo = exports.getRelationInfo = exports.sqlRelationsFilter = exports.sqlRelations = void 0;
 var remult_static_js_1 = require("./src/remult-static.js");
 var sql_relations_js_1 = require("./src/data-providers/sql-relations.js");
 Object.defineProperty(exports, "sqlRelations", { enumerable: true, get: function () { return sql_relations_js_1.sqlRelations; } });
@@ -24,3 +24,5 @@ var remult3_js_1 = require("./src/remult3/remult3.js");
 Object.defineProperty(exports, "flags", { enumerable: true, get: function () { return remult3_js_1.flags; } });
 var data_interfaces_js_1 = require("./src/data-interfaces.js");
 Object.defineProperty(exports, "DataProviderPromiseWrapper", { enumerable: true, get: function () { return data_interfaces_js_1.DataProviderPromiseWrapper; } });
+var pagedQueryResult_js_1 = require("./src/remult3/pagedQueryResult.js");
+Object.defineProperty(exports, "pagedQueryResult", { enumerable: true, get: function () { return pagedQueryResult_js_1.pagedQueryResult; } });

package/package.json

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

package/remult-knex/index.js

@@ -204,6 +204,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
     KnexEntityDataProvider.prototype.groupBy = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a, _b;
+            var _this = this;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -212,7 +213,12 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_2.dbNamesOf)(this.entity, this.dp.wrapIdentifier)];
                     case 1: return [2 /*return*/, _a.apply(void 0, _b.concat([_c.sent(), this.dp.createCommand(),
                             false,
-                            function (limit, offset) { return ' limit ' + limit + ' offset ' + offset; }]))];
+                            function (limit, offset) {
+                                var _a;
+                                return ((_a = _this.knex.client.config.client) === null || _a === void 0 ? void 0 : _a.includes('mssql'))
+                                    ? ' offset ' + offset + ' rows fetch next ' + limit + ' rows only'
+                                    : ' limit ' + limit + ' offset ' + offset;
+                            }]))];
                 }
             });
         });

package/remult-sqlite-core.js

@@ -199,7 +199,9 @@ var SqliteCoreDataProvider = /** @class */ (function () {
     SqliteCoreDataProvider.prototype.addColumnSqlSyntax = function (x, dbName, isAlterTable) {
         var result = dbName;
         var nullNumber = x.allowNull ? '' : ' default 0 not null';
-        if (x.valueType == Date)
+        if (x.valueConverter.fieldTypeInDb)
+            result += ' ' + x.valueConverter.fieldTypeInDb + ' ' + nullNumber;
+        else if (x.valueType == Date)
             result += ' integer';
         else if (x.valueType == Boolean)
             result += ' integer ' + nullNumber;

package/server/test-api-data-provider.js

@@ -55,7 +55,9 @@ function TestApiDataProvider(options) {
                                                     if (((_c = result === null || result === void 0 ? void 0 : result.statusCode) !== null && _c !== void 0 ? _c : 200) >= 400) {
                                                         throw tslib_1.__assign(tslib_1.__assign({}, result === null || result === void 0 ? void 0 : result.data), { status: (_d = result === null || result === void 0 ? void 0 : result.statusCode) !== null && _d !== void 0 ? _d : 500 });
                                                     }
-                                                    return [2 /*return*/, result === null || result === void 0 ? void 0 : result.data];
+                                                    return [2 /*return*/, (result === null || result === void 0 ? void 0 : result.data)
+                                                            ? JSON.parse(JSON.stringify(result.data))
+                                                            : undefined];
                                             }
                                         });
                                     }); })];

package/src/data-api.js

@@ -365,19 +365,19 @@ var DataApi = /** @class */ (function () {
     };
     DataApi.prototype.groupBy = function (request, body) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var findOptions, orderBy, _a, _b, element, direction, group, result;
-            var e_3, _c, _d, _e;
+            var findOptions, orderBy, _a, _b, element, direction, group, min, max, result, minMax, _loop_1, _c, _d, element;
+            var e_3, _e, _f, _g, e_4, _h;
             var _this = this;
-            var _f, _g, _h, _j, _k, _l;
-            return tslib_1.__generator(this, function (_m) {
-                switch (_m.label) {
+            var _j, _k, _l, _m, _o, _p;
+            return tslib_1.__generator(this, function (_q) {
+                switch (_q.label) {
                     case 0:
                         if (!this.repository.metadata.apiReadAllowed) {
                             throw new server_action_js_1.ForbiddenError();
                         }
                         return [4 /*yield*/, this.findOptionsFromRequest(request, body)];
                     case 1:
-                        findOptions = _m.sent();
+                        findOptions = _q.sent();
                         orderBy = {};
                         if (body === null || body === void 0 ? void 0 : body.orderBy) {
                             try {
@@ -392,7 +392,7 @@ var DataApi = /** @class */ (function () {
                                             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));
+                                            orderBy[element.field] = tslib_1.__assign(tslib_1.__assign({}, orderBy[element.field]), (_f = {}, _f[element.operation] = direction, _f));
                                             break;
                                     }
                                 }
@@ -400,58 +400,95 @@ var DataApi = /** @class */ (function () {
                             catch (e_3_1) { e_3 = { error: e_3_1 }; }
                             finally {
                                 try {
-                                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                    if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                                 }
                                 finally { if (e_3) throw e_3.error; }
                             }
                         }
-                        group = (_f = body === null || body === void 0 ? void 0 : body.groupBy) === null || _f === void 0 ? void 0 : _f.filter(function (x) {
+                        group = (_j = body === null || body === void 0 ? void 0 : body.groupBy) === null || _j === void 0 ? void 0 : _j.filter(function (x) {
                             return _this.repository.fields.find(x).includedInApi();
                         });
-                        return [4 /*yield*/, this.repository.groupBy((_e = {
+                        min = (_k = body === null || body === void 0 ? void 0 : body.min) === null || _k === void 0 ? void 0 : _k.filter(function (x) {
+                            return _this.repository.fields.find(x).includedInApi();
+                        });
+                        max = (_l = body === null || body === void 0 ? void 0 : body.max) === null || _l === void 0 ? void 0 : _l.filter(function (x) {
+                            return _this.repository.fields.find(x).includedInApi();
+                        });
+                        return [4 /*yield*/, this.repository.groupBy((_g = {
                                     where: findOptions.where,
                                     limit: findOptions.limit,
                                     page: findOptions.page
                                 },
                                 //@ts-expect-error internal key
-                                _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();
-                                }),
-                                _e.avg = (_h = body === null || body === void 0 ? void 0 : body.avg) === null || _h === void 0 ? void 0 : _h.filter(function (x) {
+                                _g[remult3_js_1.GroupByForApiKey] = true,
+                                _g.group = group,
+                                _g.sum = (_m = body === null || body === void 0 ? void 0 : body.sum) === null || _m === void 0 ? void 0 : _m.filter(function (x) {
                                     return _this.repository.fields.find(x).includedInApi();
                                 }),
-                                _e.min = (_j = body === null || body === void 0 ? void 0 : body.min) === null || _j === void 0 ? void 0 : _j.filter(function (x) {
+                                _g.avg = (_o = body === null || body === void 0 ? void 0 : body.avg) === null || _o === void 0 ? void 0 : _o.filter(function (x) {
                                     return _this.repository.fields.find(x).includedInApi();
                                 }),
-                                _e.max = (_k = body === null || body === void 0 ? void 0 : body.max) === null || _k === void 0 ? void 0 : _k.filter(function (x) {
+                                _g.min = min,
+                                _g.max = max,
+                                _g.distinctCount = (_p = body === null || body === void 0 ? void 0 : body.distinctCount) === null || _p === void 0 ? void 0 : _p.filter(function (x) {
                                     return _this.repository.fields.find(x).includedInApi();
                                 }),
-                                _e.distinctCount = (_l = body === null || body === void 0 ? void 0 : body.distinctCount) === null || _l === void 0 ? void 0 : _l.filter(function (x) {
-                                    return _this.repository.fields.find(x).includedInApi();
-                                }),
-                                _e.orderBy = orderBy,
-                                _e))];
+                                _g.orderBy = orderBy,
+                                _g))];
                     case 2:
-                        result = _m.sent();
+                        result = _q.sent();
                         if (group)
                             result.forEach(function (x) {
-                                var e_4, _a;
+                                var e_5, _a;
                                 try {
                                     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_4_1) { e_4 = { error: e_4_1 }; }
+                                catch (e_5_1) { e_5 = { error: e_5_1 }; }
                                 finally {
                                     try {
                                         if (group_1_1 && !group_1_1.done && (_a = group_1.return)) _a.call(group_1);
                                     }
-                                    finally { if (e_4) throw e_4.error; }
+                                    finally { if (e_5) throw e_5.error; }
                                 }
                             });
+                        minMax = { min: min, max: max };
+                        _loop_1 = function (element) {
+                            if (minMax[element])
+                                result.forEach(function (x) {
+                                    var e_6, _a;
+                                    try {
+                                        for (var _b = (e_6 = void 0, tslib_1.__values(minMax[element])), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                            var f = _c.value;
+                                            x[f][element] = _this.repository.fields
+                                                .find(f)
+                                                .valueConverter.toJson(x[f][element]);
+                                        }
+                                    }
+                                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                                    finally {
+                                        try {
+                                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                        }
+                                        finally { if (e_6) throw e_6.error; }
+                                    }
+                                });
+                        };
+                        try {
+                            for (_c = tslib_1.__values(['min', 'max']), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                element = _d.value;
+                                _loop_1(element);
+                            }
+                        }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        finally {
+                            try {
+                                if (_d && !_d.done && (_h = _c.return)) _h.call(_c);
+                            }
+                            finally { if (e_4) throw e_4.error; }
+                        }
                         return [2 /*return*/, result];
                 }
             });
@@ -564,7 +601,7 @@ var DataApi = /** @class */ (function () {
         });
     };
     DataApi.prototype.includeNone = function () {
-        var e_5, _a;
+        var e_7, _a;
         var include = {};
         try {
             for (var _b = tslib_1.__values(this.repository.metadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -574,12 +611,12 @@ var DataApi = /** @class */ (function () {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         return include;
     };
@@ -800,8 +837,8 @@ var DataApi = /** @class */ (function () {
                     case 1:
                         where_2 = _a.sent();
                         return [4 /*yield*/, (0, context_js_1.doTransaction)(this.remult, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var updated, _a, _b, _c, x, e_6_1;
-                                var _d, e_6, _e, _f;
+                                var updated, _a, _b, _c, x, e_8_1;
+                                var _d, e_8, _e, _f;
                                 return tslib_1.__generator(this, function (_g) {
                                     switch (_g.label) {
                                         case 0:
@@ -831,8 +868,8 @@ var DataApi = /** @class */ (function () {
                                             return [3 /*break*/, 2];
                                         case 6: return [3 /*break*/, 13];
                                         case 7:
-                                            e_6_1 = _g.sent();
-                                            e_6 = { error: e_6_1 };
+                                            e_8_1 = _g.sent();
+                                            e_8 = { error: e_8_1 };
                                             return [3 /*break*/, 13];
                                         case 8:
                                             _g.trys.push([8, , 11, 12]);
@@ -843,7 +880,7 @@ var DataApi = /** @class */ (function () {
                                             _g.label = 10;
                                         case 10: return [3 /*break*/, 12];
                                         case 11:
-                                            if (e_6) throw e_6.error;
+                                            if (e_8) throw e_8.error;
                                             return [7 /*endfinally*/];
                                         case 12: return [7 /*endfinally*/];
                                         case 13:
@@ -979,8 +1016,8 @@ var DataApi = /** @class */ (function () {
                         if (!Array.isArray(body)) return [3 /*break*/, 2];
                         result_1 = [];
                         return [4 /*yield*/, (0, context_js_1.doTransaction)(this.remult, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                var body_2, body_2_1, item, _a, _b, e_7_1;
-                                var e_7, _c;
+                                var body_2, body_2_1, item, _a, _b, e_9_1;
+                                var e_9, _c;
                                 return tslib_1.__generator(this, function (_d) {
                                     switch (_d.label) {
                                         case 0:
@@ -1000,14 +1037,14 @@ var DataApi = /** @class */ (function () {
                                             return [3 /*break*/, 1];
                                         case 4: return [3 /*break*/, 7];
                                         case 5:
-                                            e_7_1 = _d.sent();
-                                            e_7 = { error: e_7_1 };
+                                            e_9_1 = _d.sent();
+                                            e_9 = { error: e_9_1 };
                                             return [3 /*break*/, 7];
                                         case 6:
                                             try {
                                                 if (body_2_1 && !body_2_1.done && (_c = body_2.return)) _c.call(body_2);
                                             }
-                                            finally { if (e_7) throw e_7.error; }
+                                            finally { if (e_9) throw e_9.error; }
                                             return [7 /*endfinally*/];
                                         case 7: return [2 /*return*/];
                                     }

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

@@ -151,9 +151,10 @@ var RestEntityDataProvider = /** @class */ (function () {
     };
     RestEntityDataProvider.prototype.groupBy = function (options) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var run, body, result;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            var run, body, result, _loop_1, _a, _b, element;
+            var e_2, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         run = this.buildFindRequest({
                             where: options === null || options === void 0 ? void 0 : options.where,
@@ -163,24 +164,56 @@ var RestEntityDataProvider = /** @class */ (function () {
                         body = this.buildAggregateOptions(options);
                         return [4 /*yield*/, run('groupBy', Object.keys(body).length > 0 ? body : undefined)];
                     case 1:
-                        result = _a.sent();
+                        result = _d.sent();
                         if (options === null || options === void 0 ? void 0 : options.group)
                             result.forEach(function (row) {
-                                var e_2, _a;
+                                var e_3, _a;
                                 try {
                                     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]);
                                     }
                                 }
-                                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                                catch (e_3_1) { e_3 = { error: e_3_1 }; }
                                 finally {
                                     try {
                                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                                     }
-                                    finally { if (e_2) throw e_2.error; }
+                                    finally { if (e_3) throw e_3.error; }
                                 }
                             });
+                        _loop_1 = function (element) {
+                            if (options === null || options === void 0 ? void 0 : options[element])
+                                result.forEach(function (row) {
+                                    var e_4, _a;
+                                    try {
+                                        for (var _b = (e_4 = void 0, tslib_1.__values(options[element])), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                            var f = _c.value;
+                                            row[f.key][element] = f.valueConverter.fromJson(row[f.key][element]);
+                                        }
+                                    }
+                                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                                    finally {
+                                        try {
+                                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                        }
+                                        finally { if (e_4) throw e_4.error; }
+                                    }
+                                });
+                        };
+                        try {
+                            for (_a = tslib_1.__values(['min', 'max']), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                element = _b.value;
+                                _loop_1(element);
+                            }
+                        }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                            }
+                            finally { if (e_2) throw e_2.error; }
+                        }
                         return [2 /*return*/, result];
                 }
             });
@@ -199,7 +232,7 @@ var RestEntityDataProvider = /** @class */ (function () {
         };
     };
     RestEntityDataProvider.prototype.translateFromJson = function (row) {
-        var e_3, _a;
+        var e_5, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -207,17 +240,17 @@ var RestEntityDataProvider = /** @class */ (function () {
                 result[col.key] = col.valueConverter.fromJson(row[col.key]);
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         return result;
     };
     RestEntityDataProvider.prototype.translateToJson = function (row) {
-        var e_4, _a;
+        var e_6, _a;
         var result = {};
         try {
             for (var _b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -225,12 +258,12 @@ var RestEntityDataProvider = /** @class */ (function () {
                 result[col.key] = col.valueConverter.toJson(row[col.key]);
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_4) throw e_4.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         return result;
     };
@@ -389,7 +422,7 @@ var RestEntityDataProvider = /** @class */ (function () {
             .then(function (y) { return _this.translateFromJson(y); });
     };
     RestEntityDataProvider.prototype.toJsonOfIncludedKeys = function (data) {
-        var e_5, _a;
+        var e_7, _a;
         var result = {};
         var keys = Object.keys(data);
         try {
@@ -399,12 +432,12 @@ var RestEntityDataProvider = /** @class */ (function () {
                     result[col.key] = col.valueConverter.toJson(data[col.key]);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         return result;
     };
@@ -453,7 +486,7 @@ function addFilterToUrlAndReturnTrueIfSuccessful(filter, url) {
                 return false;
         }
     }
-    var _loop_1 = function (key) {
+    var _loop_2 = function (key) {
         if (Object.prototype.hasOwnProperty.call(filter, key)) {
             var element = filter[key];
             if (Array.isArray(element)) {
@@ -469,7 +502,7 @@ function addFilterToUrlAndReturnTrueIfSuccessful(filter, url) {
         }
     };
     for (var key in filter) {
-        _loop_1(key);
+        _loop_2(key);
     }
     return true;
 }

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

@@ -912,6 +912,8 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                                                         var _a;
                                                         if (turnToNumber)
                                                             sqlResult = Number(sqlResult);
+                                                        if (operator === 'max' || operator === 'min')
+                                                            sqlResult = x.valueConverter.fromDb(sqlResult);
                                                         theResult[x.key] = tslib_1.__assign(tslib_1.__assign({}, theResult[x.key]), (_a = {}, _a[operator] = sqlResult, _a));
                                                     });
                                                     return [2 /*return*/];

package/src/filter/filter-interfaces.js

@@ -231,6 +231,8 @@ var Filter = /** @class */ (function () {
                     }
                     else {
                         var field = entity.fields[key];
+                        if (!field)
+                            throw new Error("Field ".concat(key, " not found in entity ").concat(entity.key));
                         var rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(field);
                         var op = field.options;
                         var fh = (rel === null || rel === void 0 ? void 0 : rel.type) === 'toOne'

package/src/remult3/RepositoryImplementation.js

@@ -1183,10 +1183,12 @@ var RepositoryImplementation = /** @class */ (function () {
                 if (incl) {
                     var otherRepo = rel.toRepo;
                     var _loop_2 = function (row) {
-                        var _e = this_1._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo), findOptions = _e.findOptions, returnNull = _e.returnNull;
+                        var _e = this_1._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo), findOptions = _e.findOptions, returnNull = _e.returnNull, returnUndefined = _e.returnUndefined;
                         var colKey = col.key;
                         if (returnNull)
                             row[colKey] = null;
+                        else if (returnUndefined)
+                            row[colKey] = undefined;
                         else {
                             var entityType = rel.toEntity;
                             var toRepo_1 = otherRepo;
@@ -1345,7 +1347,13 @@ var RepositoryImplementation = /** @class */ (function () {
             }
         for (var key in relFields.fields) {
             if (Object.prototype.hasOwnProperty.call(relFields.fields, key)) {
-                where.push((_d = {}, _d[key] = getFieldValue(relFields.fields[key]), _d));
+                var val = getFieldValue(relFields.fields[key]);
+                if (val === null)
+                    returnNull = true;
+                else if (val === undefined)
+                    returnUndefined = true;
+                else
+                    where.push((_d = {}, _d[key] = val, _d));
             }
         }
         findOptions.where = { $and: where };
@@ -3497,9 +3505,10 @@ var columnDefsImpl = /** @class */ (function () {
         return this.remult.isAllowedForInstance(item, this.options.allowApiUpdate);
     };
     columnDefsImpl.prototype.displayValue = function (item) {
-        return this.entityDefs
+        var _a;
+        return (_a = this.entityDefs
             .getEntityMetadataWithoutBreakingTheEntity(item)
-            .fields.find(this.key).displayValue;
+            .fields.find(this.key)) === null || _a === void 0 ? void 0 : _a.displayValue;
     };
     columnDefsImpl.prototype.includedInApi = function (item) {
         if (this.options.includeInApi === undefined)

package/src/remult3/pagedQueryResult.d.ts

@@ -0,0 +1,2 @@
+import type { QueryResult } from './remult3.js';
+export declare function pagedQueryResult<T>(pageSize: number, getPage: (pageNumber?: number) => Promise<T[]>, count: () => Promise<number>): QueryResult<T>;

package/src/remult3/pagedQueryResult.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pagedQueryResult = pagedQueryResult;
+var tslib_1 = require("tslib");
+function pagedQueryResult(pageSize, getPage, count) {
+    var _a;
+    var _this = this;
+    var iterator = function () {
+        var pageNumber = 1;
+        var currentPage = [];
+        var itemIndex = 0;
+        return {
+            next: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var value;
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!(itemIndex >= currentPage.length)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, getPage(pageNumber)];
+                        case 1:
+                            currentPage = _a.sent();
+                            if (currentPage.length === 0) {
+                                return [2 /*return*/, { value: undefined, done: true }];
+                            }
+                            pageNumber++;
+                            itemIndex = 0;
+                            _a.label = 2;
+                        case 2:
+                            value = currentPage[itemIndex++];
+                            return [2 /*return*/, { value: value, done: false }];
+                    }
+                });
+            }); },
+        };
+    };
+    return _a = {
+            count: count,
+            getPage: getPage,
+            forEach: function (what) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                var i, it, _a, value, done;
+                return tslib_1.__generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            i = 0;
+                            it = iterator();
+                            _b.label = 1;
+                        case 1:
+                            if (!true) return [3 /*break*/, 4];
+                            return [4 /*yield*/, it.next()];
+                        case 2:
+                            _a = _b.sent(), value = _a.value, done = _a.done;
+                            if (done)
+                                return [3 /*break*/, 4];
+                            return [4 /*yield*/, what(value)];
+                        case 3:
+                            _b.sent();
+                            i++;
+                            return [3 /*break*/, 1];
+                        case 4: return [2 /*return*/, i];
+                    }
+                });
+            }); }
+        },
+        _a[Symbol.asyncIterator] = iterator,
+        _a.paginator = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var createPaginator;
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                createPaginator = function (pageNumber) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    var items, hasNextPage, emptyPaginator;
+                    var _this = this;
+                    return tslib_1.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, getPage(pageNumber)];
+                            case 1:
+                                items = _a.sent();
+                                hasNextPage = items.length === pageSize;
+                                emptyPaginator = {
+                                    items: [],
+                                    hasNextPage: false,
+                                    count: count,
+                                    nextPage: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                                        return [2 /*return*/, emptyPaginator];
+                                    }); }); },
+                                };
+                                return [2 /*return*/, {
+                                        items: items,
+                                        hasNextPage: hasNextPage,
+                                        count: count,
+                                        nextPage: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                            return tslib_1.__generator(this, function (_a) {
+                                                if (!hasNextPage) {
+                                                    return [2 /*return*/, emptyPaginator];
+                                                }
+                                                return [2 /*return*/, createPaginator(pageNumber + 1)];
+                                            });
+                                        }); },
+                                    }];
+                        }
+                    });
+                }); };
+                return [2 /*return*/, createPaginator(1)];
+            });
+        }); },
+        _a;
+}

package/src/remult3/remult3.d.ts

@@ -380,11 +380,11 @@ export type GroupByResult<entityType, groupByFields extends (keyof entityType)[]
     };
 } & {
     [K in minFields[number]]: {
-        min: number;
+        min: entityType[K];
     };
 } & {
     [K in maxFields[number]]: {
-        max: number;
+        max: entityType[K];
     };
 } & {
     [K in distinctCountFields[number]]: {

package/src/valueConverters.js

@@ -94,7 +94,7 @@ var ValueConverters = /** @class */ (function () {
             return value.toLocaleDateString(undefined);
         },
     };
-    ValueConverters.DateOnlyString = tslib_1.__assign(tslib_1.__assign({}, ValueConverters.DateOnly), { toDb: function (d) {
+    ValueConverters.DateOnlyString = tslib_1.__assign(tslib_1.__assign({}, ValueConverters.DateOnly), { fieldTypeInDb: 'char(8)', toDb: function (d) {
             if (d === zeroDate)
                 return '00000000';
             var val = ValueConverters.DateOnly.toJson(d);