remult 0.20.0-exp.6 → 0.20.0-exp.8

package/esm/server/expressBridge.js

@@ -256,6 +256,11 @@ export class RemultServerImplementation {
     process(what) {
         return async (req, origRes) => {
             const genReq = this.coreOptions.buildGenericRequest(req);
+            if (!genReq.query) {
+                genReq.query = req["_tempQuery"];
+            }
+            if (!genReq.params)
+                genReq.params = req["_tempParams"];
             let myReq = new ExpressRequestBridgeToDataApiRequest(genReq);
             let myRes = new ExpressResponseBridgeToDataApiResponse(origRes, req);
             await this.runWithRemult(async (remult) => {
@@ -618,22 +623,6 @@ 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];
@@ -869,8 +858,28 @@ class RouteImplementation {
     }
     middleware(origReq, res, next) {
         const req = this.coreOptions.buildGenericRequest(origReq);
-        const url = 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);
         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];
+            });
+            origReq["_tempQuery"] = query;
+            req.query = query;
+        }
         let lowerPath = path.toLowerCase();
         let m = this.map.get(lowerPath);
         if (m) {
@@ -887,8 +896,10 @@ class RouteImplementation {
             if (m) {
                 let h = m.get(req.method.toLowerCase());
                 if (h) {
-                    if (!req.params)
+                    if (!req.params) {
                         req.params = {};
+                        origReq["_tempParams"] = req.params;
+                    }
                     req.params.id = path.substring(idPosition + 1);
                     h(origReq, res, next);
                     return;
@@ -939,10 +950,3 @@ 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.6",
+    "version": "0.20.0-exp.8",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

package/server/expressBridge.js

@@ -478,6 +478,11 @@ var RemultServerImplementation = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         genReq = this.coreOptions.buildGenericRequest(req);
+                        if (!genReq.query) {
+                            genReq.query = req["_tempQuery"];
+                        }
+                        if (!genReq.params)
+                            genReq.params = req["_tempParams"];
                         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 () {
@@ -902,22 +907,6 @@ 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];
@@ -1243,8 +1232,28 @@ var RouteImplementation = /** @class */ (function () {
     };
     RouteImplementation.prototype.middleware = function (origReq, res, next) {
         var req = this.coreOptions.buildGenericRequest(origReq);
-        var url = 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);
         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];
+            });
+            origReq["_tempQuery"] = query_1;
+            req.query = query_1;
+        }
         var lowerPath = path.toLowerCase();
         var m = this.map.get(lowerPath);
         if (m) {
@@ -1261,8 +1270,10 @@ var RouteImplementation = /** @class */ (function () {
             if (m) {
                 var h = m.get(req.method.toLowerCase());
                 if (h) {
-                    if (!req.params)
+                    if (!req.params) {
                         req.params = {};
+                        origReq["_tempParams"] = req.params;
+                    }
                     req.params.id = path.substring(idPosition + 1);
                     h(origReq, res, next);
                     return;
@@ -1319,10 +1330,3 @@ 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;
-}