remult 0.13.22 → 0.13.25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.13.22",
+    "version": "0.13.25",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev/",
     "repository": {
@@ -13,7 +13,6 @@
     },
     "dependencies": {
         "uuid": "^8.3.2",
-        "body-parser": "^1.18.3",
         "reflect-metadata": "^0.1.13",
         "tslib": "^2.3.1"
     }

package/readme.md

@@ -4,7 +4,7 @@
   </a>
   <h1>Remult</h1>
 	<a href="https://circleci.com/gh/remult/remult/tree/master">
-		<img alt="CircleCI" src="https://circleci.com/gh/remult/remult/tree/master.svg?style=svg">
+		<img alt="CircleCI" src="https://circleci.com/gh/remult/remult/tree/master.svg?style=shield">
 	</a>
 	<a href="https://codecov.io/gh/remult/remult">
         	<img src="https://codecov.io/gh/remult/remult/branch/master/graph/badge.svg?token=LYWQRUN3D1"/>
@@ -18,11 +18,9 @@
 	<a href="https://www.npmjs.com/package/remult">
 		<img alt="npm downloads" src="https://img.shields.io/npm/dm/remult">
 	</a>
-	<a href="https://snyk.io/test/npm/remult">
-		<img alt="snyk" src="https://snyk.io/test/npm/remult/badge.svg"/>
-		</a>
-	<a href="https://github.com/remult/remult/pulse" alt="Activity">
-        <img src="https://img.shields.io/github/commit-activity/m/remult/remult" /></a>
+	<a href="https://discord.gg/GXHk7ZfuG5">
+		<img alt="chat on discord" src="https://img.shields.io/badge/chat-on%20discord-blueviolet"/>
+	</a>
 </div>
 
 ## What is Remult?
@@ -33,15 +31,15 @@
 * Type-safe frontend API client
 * Type-safe backend query builder
 
-#### Remult :heart: Monorepos
+#### Remult :heart: Code Sharing
 
-Using a `monorepo` approach, with model types shared between frontend and backend code, Remult can enforce data validation and constraints, defined once, on both frontend and REST API levels.
+With model types shared between frontend and backend code, Remult can **enforce data validation and constraints, defined once, both in the front-end and witin back-end API routes**.
 
 ## Getting started
 The best way to learn Remult is by following a tutorial of a simple Todo web app with a Node.js Express backend. 
 
 * [Tutorial with React](https://remult.dev/tutorials/react/) 
-* [Tutorial with Angular](https://remult.dev/tutorials/tutorial-angular.html)
+* [Tutorial with Angular](https://remult.dev/tutorials/angular/)
 
 ## Installation
 ```sh
@@ -123,7 +121,7 @@ export class Product {
     @Fields.string<Product>({
         validate: product => {
             if (product.name.trim().length == 0)
-                product.$.name.error = 'required';
+                throw 'required';
         }
     })
     name = '';
@@ -131,7 +129,7 @@ export class Product {
     @Fields.number({
         validate: (_, field) => {
             if (field.value < 0)
-                field.error = "must not be less than 0";
+                throw "must not be less than 0";
         }
     })
     unitPrice = 0;
@@ -145,14 +143,14 @@ const product = productsRepo.create();
 try {
   await productsRepo.save(product);
 }
-catch (e: ErrorInfo<Product>) {
+catch (e: any) {
   console.error(e.message); // Browser console will display - "Name: required"
 }
 ```
 
 ### Enforced in backend:
 ```sh
-> curl -d "{""unitPrice"":-1}" -H "Content-Type: application/json" -X POST http://localhost:3001/api/products
+> curl http://localhost:3001/api/products -H "Content-Type: application/json" -d "{""unitPrice"":-1}"
 
 {"modelState":{"unitPrice":"must not be less than 0","name":"required"},"message":"Name: required"}
 ```
@@ -176,6 +174,10 @@ export class Article {
 }
 ```
 
+## Example App
+
+[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).
 

package/server/expressBridge.d.ts

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

package/server/expressBridge.js

@@ -4,7 +4,6 @@ exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.ExpressRequestB
 var tslib_1 = require("tslib");
 var __1 = require("../");
 var express = require("express");
-var bodyParser = require("body-parser");
 var register_actions_on_server_1 = require("./register-actions-on-server");
 var register_entities_on_server_1 = require("./register-entities-on-server");
 var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
@@ -29,8 +28,10 @@ function remultExpress(options) {
     if (!options.queueStorage) {
         options.queueStorage = new InMemoryQueueStorage();
     }
-    app.use(bodyParser.json({ limit: options.bodySizeLimit }));
-    app.use(bodyParser.urlencoded({ extended: true, limit: options.bodySizeLimit }));
+    if ((options === null || options === void 0 ? void 0 : options.bodyParser) !== false) {
+        app.use(express.json({ limit: options.bodySizeLimit }));
+        app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
+    }
     var dataProvider;
     if (typeof options.dataProvider === "function") {
         dataProvider = options.dataProvider();
@@ -62,8 +63,13 @@ function remultExpress(options) {
         bridge.logApiEndPoints = options.logApiEndPoints;
     var apiArea = bridge.addArea(__1.Remult.apiBaseUrl);
     if (!options.disableAutoApi) {
-        register_actions_on_server_1.registerActionsOnServer(apiArea);
-        register_entities_on_server_1.registerEntitiesOnServer(apiArea);
+        var actions = [];
+        if (options.entities)
+            actions.push.apply(actions, tslib_1.__spread(options.entities));
+        if (options.controllers)
+            actions.push.apply(actions, tslib_1.__spread(options.controllers));
+        register_actions_on_server_1.registerActionsOnServer(apiArea, actions);
+        register_entities_on_server_1.registerEntitiesOnServer(apiArea, options.entities);
     }
     return Object.assign(app, {
         getRemult: function (req) { return bridge.getRemult(req); },
@@ -576,7 +582,10 @@ var ExpressResponseBridgeToDataApiResponse = /** @class */ (function () {
         this.req = req;
     }
     ExpressResponseBridgeToDataApiResponse.prototype.forbidden = function () {
-        this.r.sendStatus(403);
+        this.sendStatus(403);
+    };
+    ExpressResponseBridgeToDataApiResponse.prototype.sendStatus = function (status) {
+        this.r.writeHead(status).end();
     };
     ExpressResponseBridgeToDataApiResponse.prototype.progress = function (progress) {
     };
@@ -588,10 +597,10 @@ var ExpressResponseBridgeToDataApiResponse = /** @class */ (function () {
         this.r.json(data);
     };
     ExpressResponseBridgeToDataApiResponse.prototype.deleted = function () {
-        this.r.sendStatus(204);
+        this.sendStatus(204);
     };
     ExpressResponseBridgeToDataApiResponse.prototype.notFound = function () {
-        this.r.sendStatus(404);
+        this.sendStatus(404);
     };
     ExpressResponseBridgeToDataApiResponse.prototype.error = function (data) {
         var _a, _b;

package/server/register-actions-on-server.d.ts

@@ -1,2 +1,3 @@
 import { SiteArea } from "./expressBridge";
-export declare function registerActionsOnServer(area: SiteArea): void;
+import { ClassType } from "../classType";
+export declare function registerActionsOnServer(area: SiteArea, controllers?: ClassType<any>[]): void;

package/server/register-actions-on-server.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerActionsOnServer = void 0;
+var tslib_1 = require("tslib");
 var server_action_1 = require("../src/server-action");
-function registerActionsOnServer(area) {
+function registerActionsOnServer(area, controllers) {
+    var e_1, _a, e_2, _b;
     var addAction = function (a) {
         var x = a[server_action_1.serverActionField];
         if (!x) {
@@ -11,8 +13,38 @@ function registerActionsOnServer(area) {
         area.addAction(x);
     };
     server_action_1.actionInfo.runningOnServer = true;
-    server_action_1.actionInfo.allActions.forEach(function (a) {
-        addAction(a);
-    });
+    if (controllers && controllers.length > 0) {
+        try {
+            for (var controllers_1 = tslib_1.__values(controllers), controllers_1_1 = controllers_1.next(); !controllers_1_1.done; controllers_1_1 = controllers_1.next()) {
+                var c = controllers_1_1.value;
+                var z = c[server_action_1.classBackendMethodsArray];
+                if (z)
+                    try {
+                        for (var z_1 = (e_2 = void 0, tslib_1.__values(z)), z_1_1 = z_1.next(); !z_1_1.done; z_1_1 = z_1.next()) {
+                            var a = z_1_1.value;
+                            addAction(a);
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (z_1_1 && !z_1_1.done && (_b = z_1.return)) _b.call(z_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                    }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (controllers_1_1 && !controllers_1_1.done && (_a = controllers_1.return)) _a.call(controllers_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    }
+    else
+        server_action_1.actionInfo.allActions.forEach(function (a) {
+            addAction(a);
+        });
 }
 exports.registerActionsOnServer = registerActionsOnServer;

package/server/register-entities-on-server.d.ts

@@ -1,2 +1,3 @@
 import { SiteArea } from "./expressBridge";
-export declare function registerEntitiesOnServer(area: SiteArea): void;
+import { ClassType } from "../classType";
+export declare function registerEntitiesOnServer(area: SiteArea, entities?: ClassType<any>[]): void;

package/server/register-entities-on-server.js

@@ -4,9 +4,11 @@ exports.registerEntitiesOnServer = void 0;
 var remult3_1 = require("../src/remult3");
 var context_1 = require("../src/context");
 var data_api_1 = require("../src/data-api");
-function registerEntitiesOnServer(area) {
+function registerEntitiesOnServer(area, entities) {
+    if (!entities)
+        entities = context_1.allEntities;
     //add Api Entries
-    context_1.allEntities.forEach(function (e) {
+    entities.forEach(function (e) {
         var key = remult3_1.getEntityKey(e);
         if (key != undefined)
             area.add(key, function (c) {

package/src/data-providers/web-sql-data-provider.d.ts

@@ -6,7 +6,7 @@ export declare class WebSqlDataProvider implements SqlImplementation, __RowsOfDa
     rows: {
         [tableName: string]: any;
     };
-    constructor(databaseName: string);
+    constructor(databaseName: string, databaseSize?: number);
     getLimitSqlSyntax(limit: number, offset: number): string;
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
     dropTable(entity: EntityMetadata): Promise<void>;

package/src/data-providers/web-sql-data-provider.js

@@ -7,10 +7,11 @@ var sql_database_1 = require("./sql-database");
 var filter_consumer_bridge_to_sql_request_1 = require("../filter/filter-consumer-bridge-to-sql-request");
 //SqlDatabase.LogToConsole = true;
 var WebSqlDataProvider = /** @class */ (function () {
-    function WebSqlDataProvider(databaseName) {
+    function WebSqlDataProvider(databaseName, databaseSize) {
+        if (databaseSize === void 0) { databaseSize = 2 * 1024 * 1024; }
         this.databaseName = databaseName;
         //@ts-ignore
-        this.db = window.openDatabase(databaseName, '1.0', databaseName, 2 * 1024 * 1024);
+        this.db = window.openDatabase(databaseName, '1.0', databaseName, databaseSize);
     }
     WebSqlDataProvider.prototype.getLimitSqlSyntax = function (limit, offset) {
         return ' limit ' + limit + ' offset ' + offset;

package/src/remult3/RepositoryImplementation.d.ts

@@ -224,7 +224,7 @@ export declare function isAutoIncrement(f: FieldMetadata): boolean;
 export interface StringFieldOptions<entityType = any> extends FieldOptions<entityType, string> {
     maxLength?: number;
 }
-export declare function ValueListFieldType<entityType = any, valueType extends ValueListItem = any>(...options: (ValueListFieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => void;
+export declare function ValueListFieldType<valueType extends ValueListItem = any>(...options: (ValueListFieldOptions<any, valueType> | ((options: FieldOptions<any, valueType>, remult: Remult) => void))[]): (type: ClassType<valueType>) => void;
 export interface ValueListFieldOptions<entityType, valueType> extends FieldOptions<entityType, valueType> {
     getValues?: () => valueType[];
 }

package/src/server-action.d.ts

@@ -66,4 +66,5 @@ export declare class ProgressListener {
 }
 export declare function prepareArgsToSend(types: any[], args: any[]): any[];
 export declare function prepareReceivedArgs(types: any[], args: any[], remult: Remult, ds: DataProvider, res: DataApiResponse): Promise<any[]>;
+export declare const classBackendMethodsArray: unique symbol;
 export {};

package/src/server-action.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareReceivedArgs = exports.prepareArgsToSend = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.serverActionField = exports.actionInfo = exports.myServerAction = exports.Action = void 0;
+exports.classBackendMethodsArray = exports.prepareReceivedArgs = exports.prepareArgsToSend = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.serverActionField = exports.actionInfo = exports.myServerAction = exports.Action = void 0;
 var tslib_1 = require("tslib");
 require("reflect-metadata");
 var context_1 = require("./context");
@@ -216,7 +216,7 @@ function BackendMethod(options) {
                     });
                 });
             };
-            exports.actionInfo.allActions.push(descriptor.value);
+            registerAction(target, descriptor);
             descriptor.value[exports.serverActionField] = serverAction_1;
             return descriptor;
         }
@@ -479,7 +479,7 @@ function BackendMethod(options) {
                 });
             });
         };
-        exports.actionInfo.allActions.push(descriptor.value);
+        registerAction(target.constructor, descriptor);
         descriptor.value[exports.serverActionField] = serverAction;
         return descriptor;
     };
@@ -488,6 +488,10 @@ exports.BackendMethod = BackendMethod;
 var customUndefined = {
     _isUndefined: true
 };
+function registerAction(target, descriptor) {
+    (target[exports.classBackendMethodsArray] || (target[exports.classBackendMethodsArray] = [])).push(descriptor.value);
+    exports.actionInfo.allActions.push(descriptor.value);
+}
 function isCustomUndefined(x) {
     return x && x._isUndefined;
 }
@@ -592,3 +596,4 @@ function prepareReceivedArgs(types, args, remult, ds, res) {
     });
 }
 exports.prepareReceivedArgs = prepareReceivedArgs;
+exports.classBackendMethodsArray = Symbol('classBackendMethodsArray');