remult 0.27.12 → 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

@@ -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/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/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();