remult 0.20.0-exp.4 → 0.20.0-exp.6

package/esm/server/expressBridge.js

@@ -255,7 +255,8 @@ export class RemultServerImplementation {
     }
     process(what) {
         return async (req, origRes) => {
-            let myReq = new ExpressRequestBridgeToDataApiRequest(this.coreOptions.buildGenericRequest(req));
+            const genReq = this.coreOptions.buildGenericRequest(req);
+            let myReq = new ExpressRequestBridgeToDataApiRequest(genReq);
             let myRes = new ExpressResponseBridgeToDataApiResponse(origRes, req);
             await this.runWithRemult(async (remult) => {
                 remult.liveQueryPublisher = new LiveQueryPublisher(() => remult.subscriptionServer, () => remult.liveQueryStorage, this.runWithSerializedJsonContextData);
@@ -285,7 +286,7 @@ export class RemultServerImplementation {
                         });
                     }
                 }
-                await what(remult, myReq, myRes, req, origRes);
+                await what(remult, myReq, myRes, genReq, origRes);
             });
         };
     }
@@ -617,6 +618,22 @@ export class RemultServerImplementation {
 class ExpressRequestBridgeToDataApiRequest {
     constructor(r) {
         this.r = r;
+        if (!this.r.query) {
+            let query = {};
+            getUrlFromReq(this.r).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];
+            });
+            this.r.query = query;
+        }
     }
     get(key) {
         return this.r.query[key];
@@ -852,27 +869,8 @@ class RouteImplementation {
     }
     middleware(origReq, res, next) {
         const req = this.coreOptions.buildGenericRequest(origReq);
-        let theUrl = req.url;
-        if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
-            theUrl = 'http://stam' + theUrl;
-        const url = new URL(theUrl);
+        const url = getUrlFromReq(req);
         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) {
@@ -941,3 +939,10 @@ JobsInQueueEntity = __decorate([
 ], JobsInQueueEntity);
 export { JobsInQueueEntity };
 allEntities.splice(allEntities.indexOf(JobsInQueueEntity), 1);
+function getUrlFromReq(req) {
+    let theUrl = req.url;
+    if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
+        theUrl = 'http://stam' + theUrl;
+    const url = new URL(theUrl);
+    return url;
+}

package/package.json

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

package/server/expressBridge.js

@@ -472,12 +472,13 @@ var RemultServerImplementation = /** @class */ (function () {
     RemultServerImplementation.prototype.process = function (what) {
         var _this = this;
         return function (req, origRes) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            var myReq, myRes;
+            var genReq, myReq, myRes;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        myReq = new ExpressRequestBridgeToDataApiRequest(this.coreOptions.buildGenericRequest(req));
+                        genReq = this.coreOptions.buildGenericRequest(req);
+                        myReq = new ExpressRequestBridgeToDataApiRequest(genReq);
                         myRes = new ExpressResponseBridgeToDataApiResponse(origRes, req);
                         return [4 /*yield*/, this.runWithRemult(function (remult) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                 var _a, user;
@@ -519,7 +520,7 @@ var RemultServerImplementation = /** @class */ (function () {
                                         case 5:
                                             _b.sent();
                                             _b.label = 6;
-                                        case 6: return [4 /*yield*/, what(remult, myReq, myRes, req, origRes)];
+                                        case 6: return [4 /*yield*/, what(remult, myReq, myRes, genReq, origRes)];
                                         case 7:
                                             _b.sent();
                                             return [2 /*return*/];
@@ -901,6 +902,22 @@ exports.RemultServerImplementation = RemultServerImplementation;
 var ExpressRequestBridgeToDataApiRequest = /** @class */ (function () {
     function ExpressRequestBridgeToDataApiRequest(r) {
         this.r = r;
+        if (!this.r.query) {
+            var query_1 = {};
+            getUrlFromReq(this.r).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];
+            });
+            this.r.query = query_1;
+        }
     }
     ExpressRequestBridgeToDataApiRequest.prototype.get = function (key) {
         return this.r.query[key];
@@ -1226,27 +1243,8 @@ var RouteImplementation = /** @class */ (function () {
     };
     RouteImplementation.prototype.middleware = function (origReq, res, next) {
         var req = this.coreOptions.buildGenericRequest(origReq);
-        var theUrl = req.url;
-        if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
-            theUrl = 'http://stam' + theUrl;
-        var url = new URL(theUrl);
+        var url = getUrlFromReq(req);
         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) {
@@ -1321,3 +1319,10 @@ var JobsInQueueEntity = /** @class */ (function (_super) {
 }(id_entity_1.IdEntity));
 exports.JobsInQueueEntity = JobsInQueueEntity;
 context_1.allEntities.splice(context_1.allEntities.indexOf(JobsInQueueEntity), 1);
+function getUrlFromReq(req) {
+    var theUrl = req.url;
+    if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
+        theUrl = 'http://stam' + theUrl;
+    var url = new URL(theUrl);
+    return url;
+}