remult 0.26.21 → 0.26.23-next.0

package/src/server-action.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.classBackendMethodsArray = exports.prepareReceivedArgs = exports.prepareArgsToSend = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.myServerAction = exports.ForbiddenError = exports.Action = void 0;
+exports.classBackendMethodsArray = exports.ProgressListener = exports.myServerAction = exports.ForbiddenError = exports.Action = void 0;
+exports.Controller = Controller;
+exports.BackendMethod = BackendMethod;
+exports.prepareArgsToSend = prepareArgsToSend;
+exports.prepareReceivedArgs = prepareReceivedArgs;
 var tslib_1 = require("tslib");
 require("reflect-metadata");
 var buildRestDataProvider_js_1 = require("./buildRestDataProvider.js");
@@ -123,7 +127,8 @@ exports.ForbiddenError = ForbiddenError;
 var myServerAction = /** @class */ (function (_super) {
     tslib_1.__extends(myServerAction, _super);
     function myServerAction(name, types, options, originalMethod) {
-        var _this = _super.call(this, name, options.queue, options.allowed) || this;
+        var _a;
+        var _this = _super.call(this, name, (_a = options.queue) !== null && _a !== void 0 ? _a : false, options.allowed) || this;
         _this.types = types;
         _this.options = options;
         _this.originalMethod = originalMethod;
@@ -183,7 +188,6 @@ function Controller(key) {
         return target;
     };
 }
-exports.Controller = Controller;
 /** Indicates that the decorated methods runs on the backend. See: [Backend Methods](https://remult.dev/docs/backendMethods.html) */
 function BackendMethod(options) {
     var _this = this;
@@ -237,7 +241,9 @@ function BackendMethod(options) {
                                 if (!!(0, context_js_1.isBackend)()) return [3 /*break*/, 2];
                                 return [4 /*yield*/, serverAction_1.doWork(args, undefined)];
                             case 1: return [2 /*return*/, _a.sent()];
-                            case 2: return [4 /*yield*/, originalMethod.apply(this, args)];
+                            case 2: return [4 /*yield*/, originalMethod.apply(
+                                //@ts-expect-error I specifically referred to the this of the original function - so it'll be sent inside
+                                this, args)];
                             case 3: return [2 /*return*/, _a.sent()];
                         }
                     });
@@ -261,6 +267,7 @@ function BackendMethod(options) {
             __register: function (reg) {
                 var e_1, _a;
                 var _this = this;
+                var _b;
                 var c = new context_js_1.Remult();
                 var _loop_1 = function (constructor) {
                     var controllerOptions = x.classes.get(constructor);
@@ -270,7 +277,7 @@ function BackendMethod(options) {
                     reg(controllerOptions.key +
                         '/' +
                         ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') +
-                        key, options ? options.queue : false, options.allowed, function (d, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        key, options ? (_b = options.queue) !== null && _b !== void 0 ? _b : false : false, options.allowed, function (d, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         var allowed, remult_1, r_1, err_3;
                         var _this = this;
                         return tslib_1.__generator(this, function (_a) {
@@ -283,55 +290,57 @@ function BackendMethod(options) {
                                     _a.trys.push([1, 3, , 4]);
                                     remult_1 = req;
                                     return [4 /*yield*/, (0, context_js_1.doTransaction)(remult_1, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                            var _a, repo, y, rowHelper, rows, defs, err_4, y, controllerRef, err_5;
+                                            var _a, repo, y, rowInfo, rowHelper, rows, defs, err_4, y, controllerRef, err_5;
                                             var _b, _c, _d;
-                                            return tslib_1.__generator(this, function (_e) {
-                                                switch (_e.label) {
+                                            var _e;
+                                            return tslib_1.__generator(this, function (_f) {
+                                                switch (_f.label) {
                                                     case 0:
                                                         _a = d;
                                                         return [4 /*yield*/, prepareReceivedArgs(getTypes(), d.args, remult_1, remult_1.dataProvider, res)];
                                                     case 1:
-                                                        _a.args = _e.sent();
+                                                        _a.args = _f.sent();
                                                         if (!remult_static_js_1.remultStatic.allEntities.includes(constructor)) return [3 /*break*/, 13];
                                                         repo = remult_1.repo(constructor);
                                                         y = void 0;
-                                                        if (!d.rowInfo.isNewRow) return [3 /*break*/, 3];
+                                                        rowInfo = d.rowInfo;
+                                                        if (!rowInfo.isNewRow) return [3 /*break*/, 3];
                                                         y = repo.create();
                                                         rowHelper = repo.getEntityRef(y);
-                                                        return [4 /*yield*/, rowHelper._updateEntityBasedOnApi(d.rowInfo.data)];
+                                                        return [4 /*yield*/, rowHelper._updateEntityBasedOnApi(rowInfo.data)];
                                                     case 2:
-                                                        _e.sent();
+                                                        _f.sent();
                                                         return [3 /*break*/, 6];
                                                     case 3: return [4 /*yield*/, repo.find({
-                                                            where: tslib_1.__assign(tslib_1.__assign({}, repo.metadata.idMetadata.getIdFilter(d.rowInfo.id)), { $and: [repo.metadata.options.apiPrefilter] }),
+                                                            where: tslib_1.__assign(tslib_1.__assign({}, repo.metadata.idMetadata.getIdFilter(rowInfo.id)), { $and: [(_e = repo.metadata.options.apiPrefilter) !== null && _e !== void 0 ? _e : {}] }),
                                                         })];
                                                     case 4:
-                                                        rows = _e.sent();
+                                                        rows = _f.sent();
                                                         if (rows.length != 1)
                                                             throw new Error('not found or too many matches');
                                                         y = rows[0];
-                                                        return [4 /*yield*/, repo.getEntityRef(y)._updateEntityBasedOnApi(d.rowInfo.data)];
+                                                        return [4 /*yield*/, repo.getEntityRef(y)._updateEntityBasedOnApi(rowInfo.data)];
                                                     case 5:
-                                                        _e.sent();
-                                                        _e.label = 6;
+                                                        _f.sent();
+                                                        _f.label = 6;
                                                     case 6:
                                                         if (!remult_1.isAllowedForInstance(y, allowed))
                                                             throw new ForbiddenError();
                                                         defs = (0, getEntityRef_js_1.getEntityRef)(y);
                                                         return [4 /*yield*/, defs.__validateEntity()];
                                                     case 7:
-                                                        _e.sent();
-                                                        _e.label = 8;
+                                                        _f.sent();
+                                                        _f.label = 8;
                                                     case 8:
-                                                        _e.trys.push([8, 11, , 12]);
+                                                        _f.trys.push([8, 11, , 12]);
                                                         _b = {};
                                                         return [4 /*yield*/, originalMethod.apply(y, d.args)];
                                                     case 9:
-                                                        _b.result = _e.sent();
+                                                        _b.result = _f.sent();
                                                         _c = {};
                                                         return [4 /*yield*/, defs.toApiJson()];
                                                     case 10:
-                                                        r_1 = (_b.rowInfo = (_c.data = _e.sent(),
+                                                        r_1 = (_b.rowInfo = (_c.data = _f.sent(),
                                                             _c.isNewRow = defs.isNew(),
                                                             _c.wasChanged = defs.wasChanged(),
                                                             _c.id = defs.getOriginalId(),
@@ -339,7 +348,7 @@ function BackendMethod(options) {
                                                             _b);
                                                         return [3 /*break*/, 12];
                                                     case 11:
-                                                        err_4 = _e.sent();
+                                                        err_4 = _f.sent();
                                                         throw defs.catchSaveErrors(err_4);
                                                     case 12: return [3 /*break*/, 20];
                                                     case 13:
@@ -347,26 +356,26 @@ function BackendMethod(options) {
                                                         controllerRef = (0, RepositoryImplementation_js_1.getControllerRef)(y, remult_1);
                                                         return [4 /*yield*/, controllerRef._updateEntityBasedOnApi(d.fields)];
                                                     case 14:
-                                                        _e.sent();
+                                                        _f.sent();
                                                         if (!remult_1.isAllowedForInstance(y, allowed))
                                                             throw new ForbiddenError();
                                                         return [4 /*yield*/, controllerRef.__validateEntity()];
                                                     case 15:
-                                                        _e.sent();
-                                                        _e.label = 16;
+                                                        _f.sent();
+                                                        _f.label = 16;
                                                     case 16:
-                                                        _e.trys.push([16, 19, , 20]);
+                                                        _f.trys.push([16, 19, , 20]);
                                                         _d = {};
                                                         return [4 /*yield*/, originalMethod.apply(y, d.args)];
                                                     case 17:
-                                                        _d.result = _e.sent();
+                                                        _d.result = _f.sent();
                                                         return [4 /*yield*/, controllerRef.toApiJson()];
                                                     case 18:
-                                                        r_1 = (_d.fields = _e.sent(),
+                                                        r_1 = (_d.fields = _f.sent(),
                                                             _d);
                                                         return [3 /*break*/, 20];
                                                     case 19:
-                                                        err_5 = _e.sent();
+                                                        err_5 = _f.sent();
                                                         throw controllerRef.catchSaveErrors(err_5);
                                                     case 20: return [2 /*return*/];
                                                 }
@@ -390,15 +399,15 @@ function BackendMethod(options) {
                     }); });
                 };
                 try {
-                    for (var _b = tslib_1.__values(x.classes.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var constructor = _c.value;
+                    for (var _c = tslib_1.__values(x.classes.keys()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var constructor = _d.value;
                         _loop_1(constructor);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -407,22 +416,23 @@ function BackendMethod(options) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var defs, classOptions_1, r, _a, _b, err_6, defs, r, _c, _d, e_2;
                     var _e, _f, _g;
-                    return tslib_1.__generator(this, function (_h) {
-                        switch (_h.label) {
+                    var _h, _j;
+                    return tslib_1.__generator(this, function (_k) {
+                        switch (_k.label) {
                             case 0:
                                 args = prepareArgsToSend(getTypes(), args);
                                 if (!remult_static_js_1.remultStatic.allEntities.includes(target.constructor)) return [3 /*break*/, 8];
                                 defs = (0, getEntityRef_js_1.getEntityRef)(self);
                                 return [4 /*yield*/, defs.__validateEntity()];
                             case 1:
-                                _h.sent();
+                                _k.sent();
                                 classOptions_1 = x.classes.get(self.constructor);
                                 if (!classOptions_1.key) {
                                     classOptions_1.key = defs.repository.metadata.key + '_methods';
                                 }
-                                _h.label = 2;
+                                _k.label = 2;
                             case 2:
-                                _h.trys.push([2, 6, , 7]);
+                                _k.trys.push([2, 6, , 7]);
                                 _b = (_a = new (/** @class */ (function (_super) {
                                     tslib_1.__extends(class_1, _super);
                                     function class_1() {
@@ -432,13 +442,13 @@ function BackendMethod(options) {
                                 }(Action)))(classOptions_1.key +
                                     '/' +
                                     ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') +
-                                    key, options ? options.queue : false, options.allowed)).run;
+                                    key, (_h = options === null || options === void 0 ? void 0 : options.queue) !== null && _h !== void 0 ? _h : false, options.allowed)).run;
                                 _e = {
                                     args: args
                                 };
                                 _f = {};
                                 return [4 /*yield*/, defs.toApiJson()];
-                            case 3: return [4 /*yield*/, _b.apply(_a, [(_e.rowInfo = (_f.data = _h.sent(),
+                            case 3: return [4 /*yield*/, _b.apply(_a, [(_e.rowInfo = (_f.data = _k.sent(),
                                         _f.isNewRow = defs.isNew(),
                                         _f.wasChanged = defs.wasChanged(),
                                         _f.id = defs.getOriginalId(),
@@ -446,23 +456,23 @@ function BackendMethod(options) {
                                         _e), baseUrl,
                                     http])];
                             case 4:
-                                r = _h.sent();
+                                r = _k.sent();
                                 return [4 /*yield*/, defs._updateEntityBasedOnApi(r.rowInfo.data, true)];
                             case 5:
-                                _h.sent();
+                                _k.sent();
                                 return [2 /*return*/, r.result];
                             case 6:
-                                err_6 = _h.sent();
+                                err_6 = _k.sent();
                                 throw defs.catchSaveErrors(err_6);
                             case 7: return [3 /*break*/, 15];
                             case 8:
                                 defs = (0, RepositoryImplementation_js_1.getControllerRef)(self, undefined);
-                                _h.label = 9;
+                                _k.label = 9;
                             case 9:
-                                _h.trys.push([9, 14, , 15]);
+                                _k.trys.push([9, 14, , 15]);
                                 return [4 /*yield*/, defs.__validateEntity()];
                             case 10:
-                                _h.sent();
+                                _k.sent();
                                 _d = (_c = new (/** @class */ (function (_super) {
                                     tslib_1.__extends(class_2, _super);
                                     function class_2() {
@@ -472,22 +482,22 @@ function BackendMethod(options) {
                                 }(Action)))(x.classes.get(self.constructor).key +
                                     '/' +
                                     ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') +
-                                    key, options ? options.queue : false, options.allowed)).run;
+                                    key, (_j = options === null || options === void 0 ? void 0 : options.queue) !== null && _j !== void 0 ? _j : false, options.allowed)).run;
                                 _g = {
                                     args: args
                                 };
                                 return [4 /*yield*/, defs.toApiJson()];
-                            case 11: return [4 /*yield*/, _d.apply(_c, [(_g.fields = _h.sent(),
+                            case 11: return [4 /*yield*/, _d.apply(_c, [(_g.fields = _k.sent(),
                                         _g), baseUrl,
                                     http])];
                             case 12:
-                                r = _h.sent();
+                                r = _k.sent();
                                 return [4 /*yield*/, defs._updateEntityBasedOnApi(r.fields)];
                             case 13:
-                                _h.sent();
+                                _k.sent();
                                 return [2 /*return*/, r.result];
                             case 14:
-                                e_2 = _h.sent();
+                                e_2 = _k.sent();
                                 throw defs.catchSaveErrors(e_2);
                             case 15: return [2 /*return*/];
                         }
@@ -501,14 +511,14 @@ function BackendMethod(options) {
                 args[_i] = arguments[_i];
             }
             return tslib_1.__awaiter(this, void 0, void 0, function () {
-                var self_1;
+                var self;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            self = this;
                             if (!!(0, context_js_1.isBackend)()) return [3 /*break*/, 1];
-                            self_1 = this;
-                            return [2 /*return*/, serverAction.doWork(args, self_1)];
-                        case 1: return [4 /*yield*/, originalMethod.apply(this, args)];
+                            return [2 /*return*/, serverAction.doWork(args, self)];
+                        case 1: return [4 /*yield*/, originalMethod.apply(self, args)];
                         case 2: return [2 /*return*/, _a.sent()];
                     }
                 });
@@ -524,7 +534,6 @@ function BackendMethod(options) {
             return result;
     };
 }
-exports.BackendMethod = BackendMethod;
 var customUndefined = {
     _isUndefined: true,
 };
@@ -583,7 +592,6 @@ function prepareArgsToSend(types, args) {
     }
     return args.map(function (x) { return (x !== undefined ? x : customUndefined); });
 }
-exports.prepareArgsToSend = prepareArgsToSend;
 function prepareReceivedArgs(types, args, remult, ds, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var index, element, i, x, eo, _a, _b;
@@ -636,5 +644,4 @@ function prepareReceivedArgs(types, args, remult, ds, res) {
         });
     });
 }
-exports.prepareReceivedArgs = prepareReceivedArgs;
 exports.classBackendMethodsArray = Symbol.for('classBackendMethodsArray');

package/src/sort.d.ts

@@ -46,7 +46,7 @@ export declare class Sort {
      * @param {EntityOrderBy<T>} [orderBy] The `EntityOrderBy` to be translated.
      * @returns {Sort} A `Sort` instance representing the translated order by.
      */
-    static translateOrderByToSort<T>(entityDefs: EntityMetadata<T>, orderBy?: EntityOrderBy<T>): Sort;
+    static translateOrderByToSort<T>(entityDefs: EntityMetadata<T>, orderBy: EntityOrderBy<T>): Sort;
     /**
      * Creates a unique `Sort` instance based on the provided `Sort` and the entity metadata.
      * This ensures that the sort criteria result in a unique ordering of entities.

package/src/sort.js

@@ -107,8 +107,6 @@ var Sort = /** @class */ (function () {
      * @returns {Sort} A `Sort` instance representing the translated order by.
      */
     Sort.translateOrderByToSort = function (entityDefs, orderBy) {
-        if (!orderBy)
-            return undefined;
         var sort = new Sort();
         if (orderBy) {
             var _loop_1 = function (key) {

package/src/sql-command.d.ts

@@ -1,6 +1,6 @@
 import type { EntityMetadata } from './remult3/remult3.js';
 export interface SqlImplementation extends HasWrapIdentifier {
-    getLimitSqlSyntax(limit: number, offset: number): any;
+    getLimitSqlSyntax(limit: number, offset: number): string;
     createCommand(): SqlCommand;
     transaction(action: (sql: SqlImplementation) => Promise<void>): Promise<void>;
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;

package/src/validators.d.ts

@@ -47,4 +47,4 @@ export type ValidatorWithArgs<valueType, argsType> = (args: argsType, message?:
 export declare function createValidatorWithArgs<valueType, argsType>(validate: (entity: any, e: ValidateFieldEvent<any, valueType>, args: argsType) => Promise<boolean | string> | boolean | string, defaultMessage: ValidationMessage<valueType, argsType>): ValidatorWithArgs<valueType, argsType> & {
     defaultMessage: ValidationMessage<valueType, argsType>;
 };
-export declare function getEnumValues<theEnum = any>(enumObj: theEnum): any[];
+export declare function getEnumValues<theEnum extends object>(enumObj: theEnum): any[];

package/src/validators.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnumValues = exports.createValidatorWithArgs = exports.createValueValidatorWithArgs = exports.createValueValidator = exports.valueValidator = exports.createValidator = exports.Validators = void 0;
+exports.Validators = void 0;
+exports.createValidator = createValidator;
+exports.valueValidator = valueValidator;
+exports.createValueValidator = createValueValidator;
+exports.createValueValidatorWithArgs = createValueValidatorWithArgs;
+exports.createValidatorWithArgs = createValidatorWithArgs;
+exports.getEnumValues = getEnumValues;
 var tslib_1 = require("tslib");
 var Validators = /** @class */ (function () {
     function Validators() {
@@ -52,15 +58,17 @@ var Validators = /** @class */ (function () {
         return "Value must be one of: ".concat(values
             .map(function (y) {
             return typeof y === 'object'
-                ? y['id'] !== undefined
-                    ? y['id']
-                    : y.toString()
+                ? (y === null || y === void 0 ? void 0 : y['id']) !== undefined
+                    ? y === null || y === void 0 ? void 0 : y['id']
+                    : y === null || y === void 0 ? void 0 : y.toString()
                 : y;
         })
             .join(', '));
     });
     Validators.notNull = createValueValidator(function (val) { return val != null; }, 'Should not be null');
-    Validators.enum = createValueValidatorWithArgs(function (value, enumObj) { return Object.values(enumObj).includes(value); }, function (enumObj) { return "Value must be one of ".concat(getEnumValues(enumObj).join(', ')); });
+    Validators.enum = createValueValidatorWithArgs(function (value, enumObj) { return Object.values(enumObj).includes(value); }, function (enumObj) {
+        return "Value must be one of ".concat(getEnumValues(enumObj).join(', '));
+    });
     Validators.relationExists = createValidator(function (_, e) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var _b;
         return tslib_1.__generator(_a, function (_c) {
@@ -136,13 +144,11 @@ function createValidator(validate, defaultMessage) {
         },
     });
 }
-exports.createValidator = createValidator;
 function valueValidator(validate, defaultMessage) {
     return function (entity, e) {
         return validate(e.value) || defaultMessage || false;
     };
 }
-exports.valueValidator = valueValidator;
 function createValueValidator(validate, defaultMessage) {
     return createValidator(function (_, e) {
         if (e.value === undefined || e.value === null)
@@ -150,7 +156,6 @@ function createValueValidator(validate, defaultMessage) {
         return validate(e.value);
     }, defaultMessage);
 }
-exports.createValueValidator = createValueValidator;
 function createValueValidatorWithArgs(validate, defaultMessage) {
     var result = createValidatorWithArgsInternal(function (_, e, args) {
         if (e.value === undefined || e.value === null)
@@ -169,11 +174,9 @@ function createValueValidatorWithArgs(validate, defaultMessage) {
         },
     });
 }
-exports.createValueValidatorWithArgs = createValueValidatorWithArgs;
 function createValidatorWithArgs(validate, defaultMessage) {
     return createValidatorWithArgsInternal(validate, defaultMessage);
 }
-exports.createValidatorWithArgs = createValidatorWithArgs;
 function createValidatorWithArgsInternal(validate, defaultMessage, isValueValidator) {
     var _this = this;
     if (isValueValidator === void 0) { isValueValidator = false; }
@@ -216,4 +219,3 @@ function createValidatorWithArgsInternal(validate, defaultMessage, isValueValida
 function getEnumValues(enumObj) {
     return Object.values(enumObj).filter(function (x) { return typeof enumObj[x] !== 'number'; });
 }
-exports.getEnumValues = getEnumValues;

package/src/valueConverters.js

@@ -78,7 +78,7 @@ var ValueConverters = /** @class */ (function () {
             if (!val)
                 return null;
             return ValueConverters.DateOnly.fromJson(ValueConverters.DateOnly.toJson(val));
-        },
+        }, //when using date storage,  the database expects and returns a date local and every where else we reflect on date iso
         fromDb: function (val) {
             return ValueConverters.Date.fromDb(val);
         },
@@ -143,7 +143,8 @@ var ValueConverters = /** @class */ (function () {
             return r;
         },
         toInput: function (x, type) {
-            return x === null || x === void 0 ? void 0 : x.toString();
+            var _a;
+            return (_a = x === null || x === void 0 ? void 0 : x.toString()) !== null && _a !== void 0 ? _a : '';
         },
         inputType: inputTypes_js_1.InputTypes.number,
     };