remult 0.14.15 → 0.14.19

package/esm/remult-middleware.js

@@ -38,7 +38,28 @@ class middleware {
         return route;
     }
     handleRequest(req, res, next) {
-        let lowerPath = req.path.toLowerCase();
+        let theUrl = req.url;
+        if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
+            theUrl = 'http:' + theUrl;
+        const url = new URL(theUrl);
+        const path = url.pathname;
+        if (!req.query) {
+            let query = {};
+            url.searchParams.forEach((val, key) => {
+                let current = query[key];
+                if (!current) {
+                    query[key] = val;
+                    return;
+                }
+                if (Array.isArray(current)) {
+                    current.push(val);
+                    return;
+                }
+                query[key] = [current, val];
+            });
+            req.query = query;
+        }
+        let lowerPath = path.toLowerCase();
         let m = this.map.get(lowerPath);
         if (m) {
             let h = m.get(req.method.toLowerCase());
@@ -47,14 +68,16 @@ class middleware {
                 return;
             }
         }
-        let idPosition = req.path.lastIndexOf('/');
+        let idPosition = path.lastIndexOf('/');
         if (idPosition >= 0) {
-            lowerPath = req.path.substring(0, idPosition) + '/:id';
+            lowerPath = path.substring(0, idPosition) + '/:id';
             m = this.map.get(lowerPath);
             if (m) {
                 let h = m.get(req.method.toLowerCase());
                 if (h) {
-                    req.params.id = req.path.substring(idPosition + 1);
+                    if (!req.params)
+                        req.params = {};
+                    req.params.id = path.substring(idPosition + 1);
                     h(req, res, next);
                     return;
                 }

package/esm/server/expressBridge.d.ts

@@ -32,11 +32,10 @@ export interface RemultExpressBridge extends GenericRequestHandler {
 }
 export interface GenericRequest {
     method: any;
-    path: any;
-    originalUrl: any;
-    query: any;
+    url: any;
+    query?: any;
     body: any;
-    params: any;
+    params?: any;
 }
 export interface GenericResponse {
     json(data: any): any;

package/esm/server/expressBridge.js

@@ -505,7 +505,7 @@ class ExpressResponseBridgeToDataApiResponse {
         console.error({
             message: data.message,
             stack: data.stack?.split('\n'),
-            url: this.req.originalUrl ?? this.req.path,
+            url: this.req.url,
             method: this.req.method
         });
         this.r.statusCode = 400;

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:3001/api';
+Remult.apiBaseUrl = 'http://localhost:8000/api';
 const path = Remult.apiBaseUrl + '/tasks';
 fit("works", async () => {
     const repo = await create3Tasks();
@@ -61,7 +61,7 @@ fit("test http 404", async () => {
     expect(error.response.status).toBe(404);
 });
 fit("test http 201", async () => {
-    let result = await axios.post('http://localhost:3001/api/tasks', { title: "z", id: "" });
+    let result = await axios.post(path, { title: "z", id: "" });
     expect(result.data.title).toBe("z");
     expect(result.status).toBe(201);
     result = await axios.delete(path + "/" + result.data.id);

package/package.json

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

package/remult-middleware.js

@@ -42,7 +42,28 @@ var middleware = /** @class */ (function () {
         return route;
     };
     middleware.prototype.handleRequest = function (req, res, next) {
-        var lowerPath = req.path.toLowerCase();
+        var theUrl = req.url;
+        if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
+            theUrl = 'http:' + theUrl;
+        var url = new URL(theUrl);
+        var path = url.pathname;
+        if (!req.query) {
+            var query_1 = {};
+            url.searchParams.forEach(function (val, key) {
+                var current = query_1[key];
+                if (!current) {
+                    query_1[key] = val;
+                    return;
+                }
+                if (Array.isArray(current)) {
+                    current.push(val);
+                    return;
+                }
+                query_1[key] = [current, val];
+            });
+            req.query = query_1;
+        }
+        var lowerPath = path.toLowerCase();
         var m = this.map.get(lowerPath);
         if (m) {
             var h = m.get(req.method.toLowerCase());
@@ -51,14 +72,16 @@ var middleware = /** @class */ (function () {
                 return;
             }
         }
-        var idPosition = req.path.lastIndexOf('/');
+        var idPosition = path.lastIndexOf('/');
         if (idPosition >= 0) {
-            lowerPath = req.path.substring(0, idPosition) + '/:id';
+            lowerPath = path.substring(0, idPosition) + '/:id';
             m = this.map.get(lowerPath);
             if (m) {
                 var h = m.get(req.method.toLowerCase());
                 if (h) {
-                    req.params.id = req.path.substring(idPosition + 1);
+                    if (!req.params)
+                        req.params = {};
+                    req.params.id = path.substring(idPosition + 1);
                     h(req, res, next);
                     return;
                 }

package/server/expressBridge.d.ts

@@ -32,11 +32,10 @@ export interface RemultExpressBridge extends GenericRequestHandler {
 }
 export interface GenericRequest {
     method: any;
-    path: any;
-    originalUrl: any;
-    query: any;
+    url: any;
+    query?: any;
     body: any;
-    params: any;
+    params?: any;
 }
 export interface GenericResponse {
     json(data: any): any;

package/server/expressBridge.js

@@ -599,12 +599,12 @@ var ExpressResponseBridgeToDataApiResponse = /** @class */ (function () {
         this.sendStatus(404);
     };
     ExpressResponseBridgeToDataApiResponse.prototype.error = function (data) {
-        var _a, _b;
+        var _a;
         data = data_api_1.serializeError(data);
         console.error({
             message: data.message,
             stack: (_a = data.stack) === null || _a === void 0 ? void 0 : _a.split('\n'),
-            url: (_b = this.req.originalUrl) !== null && _b !== void 0 ? _b : this.req.path,
+            url: this.req.url,
             method: this.req.method
         });
         this.r.statusCode = 400;

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:3001/api';
+context_1.Remult.apiBaseUrl = 'http://localhost:8000/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;
@@ -138,7 +138,7 @@ fit("test http 201", function () { return tslib_1.__awaiter(void 0, void 0, void
     var result;
     return tslib_1.__generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, axios_1.default.post('http://localhost:3001/api/tasks', { title: "z", id: "" })];
+            case 0: return [4 /*yield*/, axios_1.default.post(path, { title: "z", id: "" })];
             case 1:
                 result = _a.sent();
                 expect(result.data.title).toBe("z");