remult 0.27.11 → 0.27.13

package/server/remult-admin.d.ts

@@ -1,12 +1,14 @@
 import { type RelationFields } from '../src/remult3/relationInfoMember.js';
 import type { ClassType } from '../classType.js';
 import type { Remult } from '../src/context.js';
+import { EntityFilter } from '../src/remult3/remult3.js';
 export interface EntityUIInfo {
     key: string;
     caption: string;
     fields: FieldUIInfo[];
     ids: Record<string, true>;
     relations: EntityRelationToManyInfo[];
+    defaultOrderBy?: EntityFilter<any>;
     color?: string;
 }
 export interface EntityRelationToManyInfo extends RelationFields {
@@ -24,6 +26,7 @@ export interface FieldUIInfo {
     valFieldKey: string;
     caption: string;
     type: FieldUIInfoType;
+    inputType: string;
     relationToOne?: FieldRelationToOneInfo;
 }
 export interface FieldRelationToOneInfo extends RelationFields {
@@ -41,3 +44,4 @@ export interface DisplayOptions {
 }
 export default function remultAdminHtml(options: AdminOptions): string;
 export declare function buildEntityInfo(options: AdminOptions): EntityUIInfo[];
+export type RelationsToOneValues = Record<string, Map<any, any>>;

package/server/remult-admin.js

@@ -13,24 +13,24 @@ function remultAdminHtml(options) {
 }
 function buildEntityInfo(options) {
     var e_1, _a, e_2, _b, e_3, _c;
-    var _d;
+    var _d, _e;
     var entities = [];
     try {
-        for (var _e = tslib_1.__values(options.entities.map(function (e) { return options.remult.repo(e).metadata; })), _f = _e.next(); !_f.done; _f = _e.next()) {
-            var metadata = _f.value;
+        for (var _f = tslib_1.__values(options.entities.map(function (e) { return options.remult.repo(e).metadata; })), _g = _f.next(); !_g.done; _g = _f.next()) {
+            var metadata = _g.value;
             var fields = [];
             var relations = [];
             var ids = {};
             try {
-                for (var _g = (e_2 = void 0, tslib_1.__values(metadata.idMetadata.fields)), _h = _g.next(); !_h.done; _h = _g.next()) {
-                    var f = _h.value;
+                for (var _h = (e_2 = void 0, tslib_1.__values(metadata.idMetadata.fields)), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var f = _j.value;
                     ids[f.key] = true;
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                    if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -77,6 +77,7 @@ function buildEntityInfo(options) {
                     valFieldKey: valFieldKey,
                     caption: x.caption,
                     relationToOne: relation,
+                    inputType: x.inputType,
                     type: x.valueConverter.fieldTypeInDb == 'json'
                         ? 'json'
                         : x.valueType === Number
@@ -89,15 +90,15 @@ function buildEntityInfo(options) {
                 });
             };
             try {
-                for (var _j = (e_3 = void 0, tslib_1.__values(metadata.fields.toArray())), _k = _j.next(); !_k.done; _k = _j.next()) {
-                    var x = _k.value;
+                for (var _k = (e_3 = void 0, tslib_1.__values(metadata.fields.toArray())), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var x = _l.value;
                     _loop_1(x);
                 }
             }
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (_k && !_k.done && (_c = _j.return)) _c.call(_j);
+                    if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -108,6 +109,7 @@ function buildEntityInfo(options) {
                     ids: ids,
                     fields: fields,
                     relations: relations,
+                    defaultOrderBy: (_e = metadata.options.defaultOrderBy) !== null && _e !== void 0 ? _e : { id: 'asc' },
                 });
             }
         }
@@ -115,7 +117,7 @@ function buildEntityInfo(options) {
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
-            if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+            if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
         }
         finally { if (e_1) throw e_1.error; }
     }

package/server/remult-api-server.js

@@ -39,8 +39,6 @@ function createRemultServerCore(options, serverCoreOptions) {
     context_js_1.RemultAsyncLocalStorage.enable();
     {
         var allControllers = [];
-        if (!safeOptions.entities)
-            safeOptions.entities = tslib_1.__spreadArray([], tslib_1.__read(remult_static_js_1.remultStatic.allEntities), false);
         if (safeOptions.entities)
             allControllers.push.apply(allControllers, tslib_1.__spreadArray([], tslib_1.__read(safeOptions.entities), false));
         if (safeOptions.controllers)
@@ -189,7 +187,8 @@ var RemultServerImplementation = /** @class */ (function () {
                                             started_1 = true;
                                             console.time('Schema ensured');
                                         };
-                                        entitiesMetaData.push.apply(entitiesMetaData, tslib_1.__spreadArray([], tslib_1.__read(options.entities.map(function (e) { return remult.repo(e).metadata; })), false));
+                                        if (options.entities)
+                                            entitiesMetaData.push.apply(entitiesMetaData, tslib_1.__spreadArray([], tslib_1.__read(options.entities.map(function (e) { return remult.repo(e).metadata; })), false));
                                         if (!dp.ensureSchema) return [3 /*break*/, 2];
                                         startConsoleLog();
                                         return [4 /*yield*/, dp.ensureSchema(entitiesMetaData)];
@@ -297,13 +296,14 @@ var RemultServerImplementation = /** @class */ (function () {
     RemultServerImplementation.prototype.registerRouter = function (r) {
         var e_3, _a, e_4, _b;
         var _this = this;
+        var _c;
         if (this.registeredRouter)
             throw 'Router already registered';
         this.registeredRouter = true;
         {
             try {
-                for (var _c = tslib_1.__values(this.options.controllers), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var c = _d.value;
+                for (var _d = tslib_1.__values(this.options.controllers), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    var c = _e.value;
                     var z = c[server_action_js_1.classBackendMethodsArray];
                     if (z)
                         try {
@@ -328,7 +328,7 @@ var RemultServerImplementation = /** @class */ (function () {
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -432,7 +432,7 @@ var RemultServerImplementation = /** @class */ (function () {
                 });
             }); }));
         }
-        this.options.entities.forEach(function (e) {
+        (_c = this.options.entities) === null || _c === void 0 ? void 0 : _c.forEach(function (e) {
             var key = (0, getEntityRef_js_1.getEntityKey)(e);
             if (key != undefined)
                 _this.add(key, function (c) {
@@ -589,13 +589,13 @@ var RemultServerImplementation = /** @class */ (function () {
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        if (!req) return [3 /*break*/, 8];
+                                        if (!req) return [3 /*break*/, 9];
                                         ;
                                         remult.context.request = req;
                                         remult_static_js_1.remultStatic.asyncContext.setInInitRequest(true);
                                         _a.label = 1;
                                     case 1:
-                                        _a.trys.push([1, , 7, 8]);
+                                        _a.trys.push([1, , 8, 9]);
                                         user = void 0;
                                         if (!this.options.getUser) return [3 /*break*/, 3];
                                         return [4 /*yield*/, this.options.getUser(req)];
@@ -623,14 +623,14 @@ var RemultServerImplementation = /** @class */ (function () {
                                     case 5:
                                         _a.sent();
                                         _a.label = 6;
-                                    case 6: return [3 /*break*/, 8];
+                                    case 6: return [4 /*yield*/, what(remult, myReq, myRes, genReq, origRes, req)];
                                     case 7:
+                                        _a.sent();
+                                        return [3 /*break*/, 9];
+                                    case 8:
                                         remult_static_js_1.remultStatic.asyncContext.setInInitRequest(false);
                                         return [7 /*endfinally*/];
-                                    case 8: return [4 /*yield*/, what(remult, myReq, myRes, genReq, origRes, req)];
-                                    case 9:
-                                        _a.sent();
-                                        return [2 /*return*/];
+                                    case 9: return [2 /*return*/];
                                 }
                             });
                         }); })];

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

@@ -463,25 +463,26 @@ var ArrayEntityDataProvider = /** @class */ (function () {
     };
     ArrayEntityDataProvider.prototype.update = function (id, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var names, idMatches, keys, i, r, newR, _a, _b, f;
-            var e_14, _c;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var names, idMatches, keys, _loop_2, this_1, i, state_2;
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
-                        names = _d.sent();
+                        names = _a.sent();
                         idMatches = this.idMatches(id, names);
                         keys = Object.keys(data);
-                        for (i = 0; i < this.rows().length; i++) {
-                            r = this.rows()[i];
+                        _loop_2 = function (i) {
+                            var e_14, _b;
+                            var r = this_1.rows()[i];
                             if (idMatches(r)) {
-                                newR = tslib_1.__assign({}, r);
+                                var newR_1 = tslib_1.__assign({}, r);
                                 try {
-                                    for (_a = (e_14 = void 0, tslib_1.__values(this.entity.fields)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                        f = _b.value;
+                                    for (var _c = (e_14 = void 0, tslib_1.__values(this_1.entity.fields)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                        var f = _d.value;
                                         if (!(0, filter_consumer_bridge_to_sql_request_js_1.isDbReadonly)(f, names)) {
                                             if (keys.includes(f.key)) {
-                                                newR[names.$dbNameOf(f)] = f.valueConverter.toJson(data[f.key]);
+                                                newR_1[names.$dbNameOf(f)] = f.valueConverter.toJson(data[f.key]);
                                             }
                                         }
                                     }
@@ -489,14 +490,41 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                                 catch (e_14_1) { e_14 = { error: e_14_1 }; }
                                 finally {
                                     try {
-                                        if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                        if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                                     }
                                     finally { if (e_14) throw e_14.error; }
                                 }
-                                this.verifyThatRowHasAllNotNullColumns(newR, names);
-                                this.rows()[i] = newR;
-                                return [2 /*return*/, Promise.resolve(this.translateFromJson(this.rows()[i], names))];
+                                if (this_1.entity.idMetadata.fields.find(function (x) { return newR_1[names.$dbNameOf(x)] != r[names.$dbNameOf(x)]; }) &&
+                                    this_1.rows().find(function (x) {
+                                        var e_15, _a;
+                                        try {
+                                            for (var _b = (e_15 = void 0, tslib_1.__values(_this.entity.idMetadata.fields)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                                var f = _c.value;
+                                                if (x[names.$dbNameOf(f)] != newR_1[names.$dbNameOf(f)])
+                                                    return false;
+                                            }
+                                        }
+                                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                                        finally {
+                                            try {
+                                                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                            }
+                                            finally { if (e_15) throw e_15.error; }
+                                        }
+                                        return true;
+                                    })) {
+                                    throw Error('id already exists');
+                                }
+                                this_1.verifyThatRowHasAllNotNullColumns(newR_1, names);
+                                this_1.rows()[i] = newR_1;
+                                return { value: Promise.resolve(this_1.translateFromJson(this_1.rows()[i], names)) };
                             }
+                        };
+                        this_1 = this;
+                        for (i = 0; i < this.rows().length; i++) {
+                            state_2 = _loop_2(i);
+                            if (typeof state_2 === "object")
+                                return [2 /*return*/, state_2.value];
                         }
                         throw new Error("ArrayEntityDataProvider: Couldn't find row with id \"".concat(id, "\" in entity \"").concat(this.entity.key, "\" to update"));
                 }
@@ -526,7 +554,8 @@ var ArrayEntityDataProvider = /** @class */ (function () {
     ArrayEntityDataProvider.prototype.insert = function (data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var names, j, idf, _a, _b, row;
-            var e_15, _c;
+            var e_16, _c;
+            var _this = this;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0: return [4 /*yield*/, this.init()];
@@ -534,29 +563,45 @@ var ArrayEntityDataProvider = /** @class */ (function () {
                         names = _d.sent();
                         j = this.translateToJson(data, names);
                         idf = this.entity.idMetadata.field;
-                        if (!(idf instanceof CompoundIdField_js_1.CompoundIdField)) {
-                            if (idf.valueConverter.fieldTypeInDb === 'autoincrement') {
-                                j[idf.key] = 1;
+                        if (!(idf instanceof CompoundIdField_js_1.CompoundIdField) &&
+                            idf.valueConverter.fieldTypeInDb === 'autoincrement') {
+                            j[idf.key] = 1;
+                            try {
+                                for (_a = tslib_1.__values(this.rows()), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                    row = _b.value;
+                                    if (row[idf.key] >= j[idf.key])
+                                        j[idf.key] = row[idf.key] + 1;
+                                }
+                            }
+                            catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                            finally {
                                 try {
-                                    for (_a = tslib_1.__values(this.rows()), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                        row = _b.value;
-                                        if (row[idf.key] >= j[idf.key])
-                                            j[idf.key] = row[idf.key] + 1;
+                                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                }
+                                finally { if (e_16) throw e_16.error; }
+                            }
+                        }
+                        else {
+                            if (this.rows().find(function (x) {
+                                var e_17, _a;
+                                try {
+                                    for (var _b = tslib_1.__values(_this.entity.idMetadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                        var f = _c.value;
+                                        if (x[names.$dbNameOf(f)] != j[names.$dbNameOf(f)])
+                                            return false;
                                     }
                                 }
-                                catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                                catch (e_17_1) { e_17 = { error: e_17_1 }; }
                                 finally {
                                     try {
-                                        if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                                     }
-                                    finally { if (e_15) throw e_15.error; }
+                                    finally { if (e_17) throw e_17.error; }
                                 }
+                                return true;
+                            })) {
+                                throw Error('id already exists');
                             }
-                            if (j[idf.key])
-                                this.rows().forEach(function (i) {
-                                    if (j[idf.key] == i[idf.key])
-                                        throw Error('id already exists');
-                                });
                         }
                         this.verifyThatRowHasAllNotNullColumns(j, names);
                         this.rows().push(j);
@@ -602,7 +647,7 @@ var FilterConsumerBridgeToObject = /** @class */ (function () {
         throw new Error('Custom Filter should be translated before it gets here');
     };
     FilterConsumerBridgeToObject.prototype.or = function (orElements) {
-        var e_16, _a;
+        var e_18, _a;
         try {
             for (var orElements_1 = tslib_1.__values(orElements), orElements_1_1 = orElements_1.next(); !orElements_1_1.done; orElements_1_1 = orElements_1.next()) {
                 var element = orElements_1_1.value;
@@ -613,12 +658,12 @@ var FilterConsumerBridgeToObject = /** @class */ (function () {
                 }
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (orElements_1_1 && !orElements_1_1.done && (_a = orElements_1.return)) _a.call(orElements_1);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_18) throw e_18.error; }
         }
         this.ok = false;
     };
@@ -637,7 +682,7 @@ var FilterConsumerBridgeToObject = /** @class */ (function () {
             this.ok = false;
     };
     FilterConsumerBridgeToObject.prototype.isIn = function (col, val) {
-        var e_17, _a;
+        var e_19, _a;
         try {
             for (var val_1 = tslib_1.__values(val), val_1_1 = val_1.next(); !val_1_1.done; val_1_1 = val_1.next()) {
                 var v = val_1_1.value;
@@ -646,12 +691,12 @@ var FilterConsumerBridgeToObject = /** @class */ (function () {
                 }
             }
         }
-        catch (e_17_1) { e_17 = { error: e_17_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (val_1_1 && !val_1_1.done && (_a = val_1.return)) _a.call(val_1);
             }
-            finally { if (e_17) throw e_17.error; }
+            finally { if (e_19) throw e_19.error; }
         }
         this.ok = false;
     };

package/src/data-providers/in-memory-database.js

@@ -32,7 +32,7 @@ var InMemoryDataProvider = /** @class */ (function () {
     };
     InMemoryDataProvider.prototype.getEntityDataProvider = function (entity) {
         var _this = this;
-        var name = entity.key;
+        var name = entity.dbName;
         if (!this.rows[name])
             this.rows[name] = [];
         return new array_entity_data_provider_js_1.ArrayEntityDataProvider(entity, function () { return _this.rows[name]; });

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

@@ -738,65 +738,6 @@ var myDummySQLCommand = /** @class */ (function () {
     };
     return myDummySQLCommand;
 }());
-function bulkInsert(array, db) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var chunkSize, _loop_1, i;
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (array.length == 0)
-                        return [2 /*return*/];
-                    chunkSize = 250;
-                    _loop_1 = function (i) {
-                        var items, c, sql, _b, _c;
-                        return tslib_1.__generator(this, function (_d) {
-                            switch (_d.label) {
-                                case 0:
-                                    items = array.slice(i, i + chunkSize);
-                                    c = db.createCommand();
-                                    _b = 'insert into ';
-                                    return [4 /*yield*/, items[0]._.metadata.dbName];
-                                case 1:
-                                    _c = _b +
-                                        (_d.sent()) +
-                                        ' (';
-                                    return [4 /*yield*/, Promise.all(items[0]._.metadata.fields.toArray().map(function (f) { return f.dbName; }))];
-                                case 2:
-                                    sql = _c +
-                                        (_d.sent()).join(',') +
-                                        ') values ';
-                                    sql += items
-                                        .map(function (row) {
-                                        return '(' +
-                                            row.$.toArray()
-                                                .map(function (f) { return c.param(f.metadata.valueConverter.toDb(f.value)); })
-                                                .join(', ') +
-                                            ')';
-                                    })
-                                        .join(',');
-                                    return [4 /*yield*/, c.execute(sql)];
-                                case 3:
-                                    _d.sent();
-                                    return [2 /*return*/];
-                            }
-                        });
-                    };
-                    i = 0;
-                    _a.label = 1;
-                case 1:
-                    if (!(i < array.length)) return [3 /*break*/, 4];
-                    return [5 /*yield**/, _loop_1(i)];
-                case 2:
-                    _a.sent();
-                    _a.label = 3;
-                case 3:
-                    i += chunkSize;
-                    return [3 /*break*/, 1];
-                case 4: return [2 /*return*/];
-            }
-        });
-    });
-}
 function getRowAfterUpdate(meta, dataProvider, data, id, operation) {
     var idFilter = id !== undefined ? meta.idMetadata.getIdFilter(id) : {};
     return dataProvider
@@ -832,7 +773,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                 ? "count (distinct ".concat(dbName, ")")
                 : "".concat(operator, "( ").concat(dbName, " )");
         }
-        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 select, groupBy, processResultRow, _loop_1, _a, _b, x, _loop_2, 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) {
@@ -844,7 +785,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                         theResult[remult3_js_1.GroupByCountMember] = Number(sqlVal);
                     });
                     if (options === null || options === void 0 ? void 0 : options.group) {
-                        _loop_2 = function (x) {
+                        _loop_1 = function (x) {
                             if (x.isServerExpression) {
                             }
                             else {
@@ -864,7 +805,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                         try {
                             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);
+                                _loop_1(x);
                             }
                         }
                         catch (e_10_1) { e_10 = { error: e_10_1 }; }
@@ -875,15 +816,15 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                             finally { if (e_10) throw e_10.error; }
                         }
                     }
-                    _loop_3 = function (operator) {
-                        var fields, _loop_4, fields_1, fields_1_1, x, e_11_1;
+                    _loop_2 = function (operator) {
+                        var fields, _loop_3, fields_1, fields_1_1, x, e_11_1;
                         var e_11, _l;
                         return tslib_1.__generator(this, function (_m) {
                             switch (_m.label) {
                                 case 0:
                                     fields = options === null || options === void 0 ? void 0 : options[operator];
                                     if (!fields) return [3 /*break*/, 8];
-                                    _loop_4 = function (x) {
+                                    _loop_3 = function (x) {
                                         var dbName, turnToNumber;
                                         return tslib_1.__generator(this, function (_o) {
                                             switch (_o.label) {
@@ -915,7 +856,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                                 case 2:
                                     if (!!fields_1_1.done) return [3 /*break*/, 5];
                                     x = fields_1_1.value;
-                                    return [5 /*yield**/, _loop_4(x)];
+                                    return [5 /*yield**/, _loop_3(x)];
                                 case 3:
                                     _m.sent();
                                     _m.label = 4;
@@ -945,7 +886,7 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                 case 2:
                     if (!!GroupByOperators_1_1.done) return [3 /*break*/, 5];
                     operator = GroupByOperators_1_1.value;
-                    return [5 /*yield**/, _loop_3(operator)];
+                    return [5 /*yield**/, _loop_2(operator)];
                 case 3:
                     _k.sent();
                     _k.label = 4;
@@ -1012,9 +953,9 @@ function groupByImpl(options, e, r, orderByNullFirst, limitSyntax) {
                         orderBy += ' desc';
                     if (orderByNullFirst) {
                         if (x.isDescending)
-                            select += ' nulls last';
+                            orderBy += ' nulls last';
                         else
-                            select += ' nulls first';
+                            orderBy += ' nulls first';
                     }
                     _k.label = 15;
                 case 15:

package/src/entity.d.ts

@@ -1,6 +1,6 @@
 import type { Allowed, AllowedForInstance } from './context.js';
 import type { FieldMetadata } from './column-interfaces.js';
-import type { EntityFilter, EntityIdFields, EntityMetadata, EntityOrderBy, EntityRef, FieldsMetadata, LifecycleEvent } from './remult3/remult3.js';
+import type { EntityFilter, EntityIdFields, EntityMetadata, EntityOrderBy, EntityRef, FieldsMetadata, LifecycleEvent, MembersOnly } from './remult3/remult3.js';
 import type { FilterPreciseValues } from './filter/filter-interfaces.js';
 export interface EntityOptions<entityType = unknown> {
     /**A human readable name for the entity */
@@ -173,12 +173,12 @@ export interface EntityOptions<entityType = unknown> {
     /** An arrow function that identifies the `id` column to use for this entity
      * @example
      * //Single column id
-     * @Entity<Products>("products", { id: {productCode: true} })
+     * @Entity<Products>("products", { id: 'productCode' })
      * @example
      * //Multiple columns id
-     * @Entity<OrderDetails>("orderDetails", { id:{ orderId:true, productCode:true} })
+     * @Entity<OrderDetails>("orderDetails", { id:['orderId:', 'productCode'] })
      */
-    id?: EntityIdFields<entityType> | ((entity: FieldsMetadata<entityType>) => FieldMetadata | FieldMetadata[]);
+    id?: keyof MembersOnly<entityType> | (keyof MembersOnly<entityType>)[] | EntityIdFields<entityType> | ((entity: FieldsMetadata<entityType>) => FieldMetadata | FieldMetadata[]);
     entityRefInit?: (ref: EntityRef<entityType>, row: entityType) => void;
     apiRequireId?: Allowed;
 }

package/src/filter/filter-interfaces.js

@@ -267,6 +267,7 @@ var Filter = /** @class */ (function () {
                                             found = true;
                                             break;
                                         case '$ne':
+                                        case '$not':
                                         case '!=':
                                         case '$nin':
                                             found = true;

package/src/remult3/RepositoryImplementation.js

@@ -1203,7 +1203,9 @@ var RepositoryImplementation = /** @class */ (function () {
                 //I've used define property to hide this member from console.lo g
                 get: function () { return row_2; },
             });
+            row_2.id = row_2.getId();
             row_2.saveOriginalData();
+            row_2.originalId = row_2.id;
             return result;
         }
     };
@@ -2335,7 +2337,10 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 21:
                         updatedRow = (_t.sent())[0];
                         return [3 /*break*/, 24];
-                    case 22: return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
+                    case 22:
+                        if (this.id === undefined)
+                            throw new Error('Invalid operation, id is undefined');
+                        return [4 /*yield*/, this.edp.update(this.id, changesOnly)];
                     case 23:
                         updatedRow = _t.sent();
                         _t.label = 24;
@@ -2497,6 +2502,8 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                     case 3:
                         _e.trys.push([3, 16, , 18]);
                         if (!doDelete) return [3 /*break*/, 5];
+                        if (this.id === undefined)
+                            throw new Error('Invalid operation, id is undefined');
                         return [4 /*yield*/, this.edp.delete(this.id)];
                     case 4:
                         _e.sent();
@@ -3376,9 +3383,13 @@ var EntityFullInfo = /** @class */ (function () {
         this.fields = r;
         this.caption = buildCaption(entityInfo.caption, this.key, remult, this);
         if (entityInfo.id) {
-            var r_2 = typeof entityInfo.id === 'function'
-                ? entityInfo.id(this.fields)
-                : Object.keys(entityInfo.id).map(function (x) { return _this.fields.find(x); });
+            var r_2 = typeof entityInfo.id === 'string'
+                ? this.fields.find(entityInfo.id)
+                : Array.isArray(entityInfo.id)
+                    ? entityInfo.id.map(function (x) { return _this.fields.find(x); })
+                    : typeof entityInfo.id === 'function'
+                        ? entityInfo.id(this.fields)
+                        : Object.keys(entityInfo.id).map(function (x) { return _this.fields.find(x); });
             if (Array.isArray(r_2)) {
                 if (r_2.length > 1)
                     this.idMetadata.field = new (CompoundIdField_js_1.CompoundIdField.bind.apply(CompoundIdField_js_1.CompoundIdField, tslib_1.__spreadArray([void 0], tslib_1.__read(r_2), false)))();