remult 0.14.20 → 0.14.21

package/esm/server/expressBridge.d.ts

@@ -31,15 +31,16 @@ export interface RemultExpressBridge extends GenericRequestHandler {
     addArea(rootUrl: string): any;
 }
 export interface GenericRequest {
-    method: any;
-    url: any;
+    url: string;
+    method?: any;
+    body?: any;
     query?: any;
-    body: any;
     params?: any;
 }
 export interface GenericResponse {
     json(data: any): any;
-    statusCode: number;
+    status?(statusCode: number): GenericResponse;
+    setStatus?(statusCode: number): GenericResponse;
     end(): any;
 }
 export declare type GenericRouter = GenericRequestHandler & {

package/esm/server/expressBridge.js

@@ -58,6 +58,7 @@ export function remultMiddlewareBase(app, options) {
         addArea: x => bridge.addArea(x)
     });
 }
+;
 class ExpressBridge {
     constructor(app, queue, initRequest, dataProvider) {
         this.app = app;
@@ -479,11 +480,12 @@ class ExpressResponseBridgeToDataApiResponse {
         this.req = req;
     }
     forbidden() {
-        this.sendStatus(403);
+        this.setStatus(403).end();
     }
-    sendStatus(status) {
-        this.r.statusCode = status;
-        this.r.end();
+    setStatus(status) {
+        if (this.r.setStatus)
+            return this.r.setStatus(status);
+        return this.r.status(status);
     }
     progress(progress) {
     }
@@ -491,14 +493,13 @@ class ExpressResponseBridgeToDataApiResponse {
         this.r.json(data);
     }
     created(data) {
-        this.r.statusCode = 201;
-        this.r.json(data);
+        this.setStatus(201).json(data);
     }
     deleted() {
-        this.sendStatus(204);
+        this.setStatus(204).end();
     }
     notFound() {
-        this.sendStatus(404);
+        this.setStatus(404).end();
     }
     error(data) {
         data = serializeError(data);
@@ -508,8 +509,8 @@ class ExpressResponseBridgeToDataApiResponse {
             url: this.req.url,
             method: this.req.method
         });
-        this.r.statusCode = 400;
-        this.r.json(data);
+        this.setStatus(400).json(data);
+        ;
     }
 }
 function throwError() {

package/esm/src/backend-tests/test-http-server.backend-spec.js

@@ -3,7 +3,7 @@ import axios from 'axios';
 import { HttpProviderBridgeToRestDataProviderHttpProvider, Remult } from '../context';
 import { Entity, Fields } from '../remult3';
 import { Action, BackendMethod } from '../server-action';
-Remult.apiBaseUrl = 'http://localhost:8000/api';
+Remult.apiBaseUrl = 'http://localhost:3001/api';
 const path = Remult.apiBaseUrl + '/tasks';
 fit("works", async () => {
     const repo = await create3Tasks();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.14.20",
+    "version": "0.14.21",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

package/server/expressBridge.d.ts

@@ -31,15 +31,16 @@ export interface RemultExpressBridge extends GenericRequestHandler {
     addArea(rootUrl: string): any;
 }
 export interface GenericRequest {
-    method: any;
-    url: any;
+    url: string;
+    method?: any;
+    body?: any;
     query?: any;
-    body: any;
     params?: any;
 }
 export interface GenericResponse {
     json(data: any): any;
-    statusCode: number;
+    status?(statusCode: number): GenericResponse;
+    setStatus?(statusCode: number): GenericResponse;
     end(): any;
 }
 export declare type GenericRouter = GenericRequestHandler & {

package/server/expressBridge.js

@@ -71,6 +71,7 @@ function remultMiddlewareBase(app, options) {
     });
 }
 exports.remultMiddlewareBase = remultMiddlewareBase;
+;
 var ExpressBridge = /** @class */ (function () {
     function ExpressBridge(app, queue, initRequest, dataProvider) {
         this.app = app;
@@ -577,11 +578,12 @@ var ExpressResponseBridgeToDataApiResponse = /** @class */ (function () {
         this.req = req;
     }
     ExpressResponseBridgeToDataApiResponse.prototype.forbidden = function () {
-        this.sendStatus(403);
+        this.setStatus(403).end();
     };
-    ExpressResponseBridgeToDataApiResponse.prototype.sendStatus = function (status) {
-        this.r.statusCode = status;
-        this.r.end();
+    ExpressResponseBridgeToDataApiResponse.prototype.setStatus = function (status) {
+        if (this.r.setStatus)
+            return this.r.setStatus(status);
+        return this.r.status(status);
     };
     ExpressResponseBridgeToDataApiResponse.prototype.progress = function (progress) {
     };
@@ -589,14 +591,13 @@ var ExpressResponseBridgeToDataApiResponse = /** @class */ (function () {
         this.r.json(data);
     };
     ExpressResponseBridgeToDataApiResponse.prototype.created = function (data) {
-        this.r.statusCode = 201;
-        this.r.json(data);
+        this.setStatus(201).json(data);
     };
     ExpressResponseBridgeToDataApiResponse.prototype.deleted = function () {
-        this.sendStatus(204);
+        this.setStatus(204).end();
     };
     ExpressResponseBridgeToDataApiResponse.prototype.notFound = function () {
-        this.sendStatus(404);
+        this.setStatus(404).end();
     };
     ExpressResponseBridgeToDataApiResponse.prototype.error = function (data) {
         var _a;
@@ -607,8 +608,8 @@ var ExpressResponseBridgeToDataApiResponse = /** @class */ (function () {
             url: this.req.url,
             method: this.req.method
         });
-        this.r.statusCode = 400;
-        this.r.json(data);
+        this.setStatus(400).json(data);
+        ;
     };
     return ExpressResponseBridgeToDataApiResponse;
 }());

package/src/backend-tests/test-http-server.backend-spec.js

@@ -6,7 +6,7 @@ var axios_1 = require("axios");
 var context_1 = require("../context");
 var remult3_1 = require("../remult3");
 var server_action_1 = require("../server-action");
-context_1.Remult.apiBaseUrl = 'http://localhost:8000/api';
+context_1.Remult.apiBaseUrl = 'http://localhost:3001/api';
 var path = context_1.Remult.apiBaseUrl + '/tasks';
 fit("works", function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     var repo, tasks, _a;