remult 0.13.26 → 0.13.29

package/package.json

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

package/readme.md

@@ -21,6 +21,9 @@
 	<a href="https://discord.gg/GXHk7ZfuG5">
 		<img alt="chat on discord" src="https://img.shields.io/badge/chat-on%20discord-blueviolet"/>
 	</a>
+	<a href="https://twitter.com/remultjs">
+	<img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/remultjs?style=social">
+	</a>
 </div>
 
 ## What is Remult?
@@ -114,24 +117,29 @@ static async increasePriceOfTofu(priceIncrease: number, remult?: Remult) {
 ### :ballot_box_with_check: Data validation and constraints - defined once
 
 ```ts
-import { Entity, Fields } from 'remult';
+import { Entity, Fields, Validators } from 'remult';
 
 @Entity('products', {
     allowApiCrud: true
 })
 export class Product {
+    @Fields.string({
+        validate: Validators.required
+    })
+    name = '';
+
     @Fields.string<Product>({
         validate: product => {
-            if (product.name.trim().length == 0)
-                throw 'required';
+            if (product.description.trim().length < 50)
+                throw "too short";
         }
     })
-    name = '';
+    description = '';
 
     @Fields.number({
         validate: (_, field) => {
             if (field.value < 0)
-                throw "must not be less than 0";
+                field.error = "must not be less than 0"; // or: throw "must not be less than 0";
         }
     })
     unitPrice = 0;
@@ -181,7 +189,11 @@ export class Article {
 [CRM demo](https://github.com/remult/crm-demo) with a React + [MUI](https://mui.com) front-end and Postgres database.
 
 ## Contributing
-Contributions are welcome. See [CONTRIBUTING](CONTRIBUTING.md).
+Contributions are welcome. See [CONTRIBUTING.md](CONTRIBUTING.md).
+
+* :speech_balloon: Any feedback or suggestions? Start a [discussion](https://github.com/remult/remult/discussions).
+* :muscle: Want to help out? Look for "help wanted" labeled [issues](https://github.com/remult/remult/issues).
+* :star: Give this repo a star.
 
 ## License
 Remult is [MIT Licensed](LICENSE).

package/server/expressBridge.d.ts

@@ -21,6 +21,7 @@ export declare function remultExpress(options?: {
     entities?: ClassType<any>[];
     controllers?: ClassType<any>[];
     bodyParser?: boolean;
+    rootPath?: string;
 }): RemultExpressBridge;
 export interface RemultExpressBridge extends express.RequestHandler {
     getRemult(req: express.Request): Promise<Remult>;

package/server/expressBridge.js

@@ -61,7 +61,9 @@ function remultExpress(options) {
     var bridge = new ExpressBridge(app, new inProcessQueueHandler(options.queueStorage), options.initRequest, dataProvider);
     if (options.logApiEndPoints !== undefined)
         bridge.logApiEndPoints = options.logApiEndPoints;
-    var apiArea = bridge.addArea(__1.Remult.apiBaseUrl);
+    if (options.rootPath === undefined)
+        options.rootPath = __1.Remult.apiBaseUrl;
+    var apiArea = bridge.addArea(options.rootPath);
     if (!options.disableAutoApi) {
         var actions = [];
         if (options.entities)
@@ -856,3 +858,4 @@ var JobsInQueueEntity = /** @class */ (function (_super) {
     return JobsInQueueEntity;
 }(__1.IdEntity));
 exports.JobsInQueueEntity = JobsInQueueEntity;
+context_1.allEntities.splice(context_1.allEntities.indexOf(JobsInQueueEntity), 1);

package/src/context.d.ts

@@ -44,6 +44,7 @@ export declare class Remult {
         sub?: string;
         name?: string;
         permissions?: string[];
+        username?: string;
     }): Promise<void>;
     private _user;
     private _userChangeEvent;
@@ -55,12 +56,12 @@ export declare class Remult {
      * @see
      * [Allowed](https://remult.dev/docs/allowed.html)
      */
-    isAllowed(roles: Allowed): boolean;
+    isAllowed(roles?: Allowed): boolean;
     /** checks if the user matches the allowedForInstance callback
      * @see
      * [Allowed](https://remult.dev/docs/allowed.html)
      */
-    isAllowedForInstance(instance: any, x: AllowedForInstance<any>): boolean;
+    isAllowedForInstance(instance: any, allowed?: AllowedForInstance<any>): boolean;
     /** returns a dispatcher object that fires once a user has changed*/
     get userChange(): EventDispatcher;
     private repCache;

package/src/context.js

@@ -41,28 +41,28 @@ var HttpProviderBridgeToRestDataProviderHttpProvider = /** @class */ (function (
 }());
 exports.HttpProviderBridgeToRestDataProviderHttpProvider = HttpProviderBridgeToRestDataProviderHttpProvider;
 function retry(what) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var err_1;
-        return tslib_1.__generator(this, function (_d) {
-            switch (_d.label) {
+        return tslib_1.__generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
                     if (!true) return [3 /*break*/, 7];
-                    _d.label = 1;
+                    _e.label = 1;
                 case 1:
-                    _d.trys.push([1, 3, , 6]);
+                    _e.trys.push([1, 3, , 6]);
                     return [4 /*yield*/, what()];
-                case 2: return [2 /*return*/, _d.sent()];
+                case 2: return [2 /*return*/, _e.sent()];
                 case 3:
-                    err_1 = _d.sent();
-                    if (!(((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.startsWith("Error occurred while trying to proxy")) || ((_b = err_1.message) === null || _b === void 0 ? void 0 : _b.startsWith("Error occured while trying to proxy")) || ((_c = err_1.message) === null || _c === void 0 ? void 0 : _c.startsWith("Gateway Timeout")))) return [3 /*break*/, 5];
+                    err_1 = _e.sent();
+                    if (!(((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.startsWith("Error occurred while trying to proxy")) || ((_b = err_1.message) === null || _b === void 0 ? void 0 : _b.startsWith("Error occured while trying to proxy")) || ((_c = err_1.message) === null || _c === void 0 ? void 0 : _c.includes("http proxy error")) || ((_d = err_1.message) === null || _d === void 0 ? void 0 : _d.startsWith("Gateway Timeout")))) return [3 /*break*/, 5];
                     return [4 /*yield*/, new Promise(function (res, req) {
                             setTimeout(function () {
                                 res({});
                             }, 250);
                         })];
                 case 4:
-                    _d.sent();
+                    _e.sent();
                     return [3 /*break*/, 0];
                 case 5: throw err_1;
                 case 6: return [3 /*break*/, 0];
@@ -214,6 +214,8 @@ var Remult = /** @class */ (function () {
                             if (!this._user.roles && auth.permissions) {
                                 this._user.roles = auth.permissions;
                             }
+                            if (!this._user.name)
+                                this._user.name = auth.username;
                         }
                         if (this._user && !this._user.roles)
                             this._user.roles = [];
@@ -271,13 +273,13 @@ var Remult = /** @class */ (function () {
      * @see
      * [Allowed](https://remult.dev/docs/allowed.html)
      */
-    Remult.prototype.isAllowedForInstance = function (instance, x) {
+    Remult.prototype.isAllowedForInstance = function (instance, allowed) {
         var e_2, _a;
-        if (Array.isArray(x)) {
+        if (Array.isArray(allowed)) {
             {
                 try {
-                    for (var x_1 = tslib_1.__values(x), x_1_1 = x_1.next(); !x_1_1.done; x_1_1 = x_1.next()) {
-                        var item = x_1_1.value;
+                    for (var allowed_1 = tslib_1.__values(allowed), allowed_1_1 = allowed_1.next(); !allowed_1_1.done; allowed_1_1 = allowed_1.next()) {
+                        var item = allowed_1_1.value;
                         if (this.isAllowedForInstance(instance, item))
                             return true;
                     }
@@ -285,17 +287,17 @@ var Remult = /** @class */ (function () {
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (x_1_1 && !x_1_1.done && (_a = x_1.return)) _a.call(x_1);
+                        if (allowed_1_1 && !allowed_1_1.done && (_a = allowed_1.return)) _a.call(allowed_1);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
             }
         }
-        else if (typeof (x) === "function") {
-            return x(this, instance);
+        else if (typeof (allowed) === "function") {
+            return allowed(this, instance);
         }
         else
-            return this.isAllowed(x);
+            return this.isAllowed(allowed);
     };
     Object.defineProperty(Remult.prototype, "userChange", {
         /** returns a dispatcher object that fires once a user has changed*/

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

@@ -4,7 +4,6 @@ exports.ArrayEntityDataProvider = void 0;
 var tslib_1 = require("tslib");
 var filter_interfaces_1 = require("../filter/filter-interfaces");
 var column_1 = require("../column");
-var sort_1 = require("../sort");
 var ArrayEntityDataProvider = /** @class */ (function () {
     function ArrayEntityDataProvider(entity, rows) {
         var e_1, _a;
@@ -220,34 +219,38 @@ var ArrayEntityDataProvider = /** @class */ (function () {
     ArrayEntityDataProvider.prototype.insert = function (data) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var idf, lastRow, j;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        idf = this.entity.idMetadata.field;
-                        if (!!(idf instanceof column_1.CompoundIdField)) return [3 /*break*/, 3];
-                        if (!(((_a = idf.options.valueConverter) === null || _a === void 0 ? void 0 : _a.fieldTypeInDb) === 'autoincrement')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.find({ orderBy: new sort_1.Sort({ field: idf, isDescending: true }) })];
-                    case 1:
-                        lastRow = _b.sent();
-                        if (lastRow.length > 0)
-                            data[idf.key] = lastRow[0][idf.key] + 1;
-                        else
-                            data[idf.key] = 1;
-                        _b.label = 2;
-                    case 2:
-                        if (data[idf.key])
-                            this.rows.forEach(function (i) {
-                                if (data[idf.key] == i[idf.key])
-                                    throw Error("id already exists");
-                            });
-                        _b.label = 3;
-                    case 3:
-                        j = this.translateToJson(data);
-                        this.verifyThatRowHasAllNotNullColumns(j);
-                        this.rows.push(j);
-                        return [2 /*return*/, Promise.resolve(this.translateFromJson(j))];
+            var idf, _b, _c, row, j;
+            var e_6, _d;
+            return tslib_1.__generator(this, function (_e) {
+                idf = this.entity.idMetadata.field;
+                if (!(idf instanceof column_1.CompoundIdField)) {
+                    if (((_a = idf.options.valueConverter) === null || _a === void 0 ? void 0 : _a.fieldTypeInDb) === 'autoincrement') {
+                        data[idf.key] = 1;
+                        try {
+                            for (_b = tslib_1.__values(this.rows), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                row = _c.value;
+                                if (row[idf.key] >= data[idf.key])
+                                    data[idf.key] = row[idf.key] + 1;
+                            }
+                        }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        finally {
+                            try {
+                                if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
+                            }
+                            finally { if (e_6) throw e_6.error; }
+                        }
+                    }
+                    if (data[idf.key])
+                        this.rows.forEach(function (i) {
+                            if (data[idf.key] == i[idf.key])
+                                throw Error("id already exists");
+                        });
                 }
+                j = this.translateToJson(data);
+                this.verifyThatRowHasAllNotNullColumns(j);
+                this.rows.push(j);
+                return [2 /*return*/, Promise.resolve(this.translateFromJson(j))];
             });
         });
     };
@@ -287,7 +290,7 @@ var FilterConsumerBridgeToObject = /** @class */ (function () {
         throw new Error('Custom Filter should be translated before it gets here');
     };
     FilterConsumerBridgeToObject.prototype.or = function (orElements) {
-        var e_6, _a;
+        var e_7, _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;
@@ -298,12 +301,12 @@ var FilterConsumerBridgeToObject = /** @class */ (function () {
                 }
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (orElements_1_1 && !orElements_1_1.done && (_a = orElements_1.return)) _a.call(orElements_1);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         this.ok = false;
     };
@@ -316,7 +319,7 @@ var FilterConsumerBridgeToObject = /** @class */ (function () {
             this.ok = false;
     };
     FilterConsumerBridgeToObject.prototype.isIn = function (col, val) {
-        var e_7, _a;
+        var e_8, _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;
@@ -325,12 +328,12 @@ var FilterConsumerBridgeToObject = /** @class */ (function () {
                 }
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (val_1_1 && !val_1_1.done && (_a = val_1.return)) _a.call(val_1);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         this.ok = false;
     };