remult 0.20.0-exp.10 → 0.20.0-exp.2

package/esm/remult-next.js

@@ -3,7 +3,7 @@ export function remultNext(options) {
     let result = createRemultServer(options, {
         buildGenericRequest: req => req
     });
-    return Object.assign((req, res) => result.handle(req, res).then(() => { }), result, {
+    return Object.assign((req, res) => result.handle(req, res), result, {
         getRemult: (...args) => result.getRemult(...args),
         handle: (...args) => result.handle(...args),
         openApiDoc: (...args) => result.openApiDoc(...args),

package/esm/server/expressBridge.js

@@ -255,13 +255,7 @@ 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 myReq = new ExpressRequestBridgeToDataApiRequest(req);
             let myRes = new ExpressResponseBridgeToDataApiResponse(origRes, req);
             await this.runWithRemult(async (remult) => {
                 remult.liveQueryPublisher = new LiveQueryPublisher(() => remult.subscriptionServer, () => remult.liveQueryStorage, this.runWithSerializedJsonContextData);
@@ -291,7 +285,7 @@ export class RemultServerImplementation {
                         });
                     }
                 }
-                await what(remult, myReq, myRes, genReq, origRes);
+                await what(remult, myReq, myRes, req, origRes);
             });
         };
     }
@@ -877,7 +871,6 @@ class RouteImplementation {
                 }
                 query[key] = [current, val];
             });
-            origReq["_tempQuery"] = query;
             req.query = query;
         }
         let lowerPath = path.toLowerCase();
@@ -885,7 +878,7 @@ class RouteImplementation {
         if (m) {
             let h = m.get(req.method.toLowerCase());
             if (h) {
-                h(origReq, res, next);
+                h(req, res, next);
                 return;
             }
         }
@@ -896,12 +889,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);
+                    h(req, res, next);
                     return;
                 }
             }

package/esm/src/data-api.d.ts

@@ -15,7 +15,7 @@ export declare class DataApi<T = any> {
         findOptions: FindOptions<T>;
     }>;
     getArray(response: DataApiResponse, request: DataApiRequest, filterBody?: any): Promise<void>;
-    liveQuery(response: DataApiResponse, request: DataApiRequest, filterBody: any, serializeRequest: () => Promise<any>, queryChannel: string): Promise<void>;
+    liveQuery(response: DataApiResponse, request: DataApiRequest, filterBody: any, serializeRequest: () => any, queryChannel: string): Promise<void>;
     private buildWhere;
     private doOnId;
     put(response: DataApiResponse, id: any, body: any): Promise<void>;

package/esm/src/data-api.js

@@ -128,7 +128,7 @@ export class DataApi {
         try {
             const r = await this.getArrayImpl(response, request, filterBody);
             const data = {
-                requestJson: await serializeRequest(),
+                requestJson: serializeRequest(),
                 findOptionsJson: findOptionsToJson(r.findOptions, this.repository.metadata),
                 lastIds: r.r.map(y => this.repository.metadata.idMetadata.getId(y))
             };

package/package.json

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

package/remult-next.js

@@ -8,7 +8,7 @@ function remultNext(options) {
     var result = server_1.createRemultServer(options, {
         buildGenericRequest: function (req) { return req; }
     });
-    return Object.assign(function (req, res) { return result.handle(req, res).then(function () { }); }, result, {
+    return Object.assign(function (req, res) { return result.handle(req, res); }, result, {
         getRemult: function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {

package/server/expressBridge.js

@@ -472,18 +472,12 @@ 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 genReq, myReq, myRes;
+            var myReq, myRes;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 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);
+                        myReq = new ExpressRequestBridgeToDataApiRequest(req);
                         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;
@@ -525,7 +519,7 @@ var RemultServerImplementation = /** @class */ (function () {
                                         case 5:
                                             _b.sent();
                                             _b.label = 6;
-                                        case 6: return [4 /*yield*/, what(remult, myReq, myRes, genReq, origRes)];
+                                        case 6: return [4 /*yield*/, what(remult, myReq, myRes, req, origRes)];
                                         case 7:
                                             _b.sent();
                                             return [2 /*return*/];
@@ -1251,7 +1245,6 @@ var RouteImplementation = /** @class */ (function () {
                 }
                 query_1[key] = [current, val];
             });
-            origReq["_tempQuery"] = query_1;
             req.query = query_1;
         }
         var lowerPath = path.toLowerCase();
@@ -1259,7 +1252,7 @@ var RouteImplementation = /** @class */ (function () {
         if (m) {
             var h = m.get(req.method.toLowerCase());
             if (h) {
-                h(origReq, res, next);
+                h(req, res, next);
                 return;
             }
         }
@@ -1270,12 +1263,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);
+                    h(req, res, next);
                     return;
                 }
             }

package/src/data-api.d.ts

@@ -15,7 +15,7 @@ export declare class DataApi<T = any> {
         findOptions: FindOptions<T>;
     }>;
     getArray(response: DataApiResponse, request: DataApiRequest, filterBody?: any): Promise<void>;
-    liveQuery(response: DataApiResponse, request: DataApiRequest, filterBody: any, serializeRequest: () => Promise<any>, queryChannel: string): Promise<void>;
+    liveQuery(response: DataApiResponse, request: DataApiRequest, filterBody: any, serializeRequest: () => any, queryChannel: string): Promise<void>;
     private buildWhere;
     private doOnId;
     put(response: DataApiResponse, id: any, body: any): Promise<void>;

package/src/data-api.js

@@ -210,45 +210,42 @@ var DataApi = /** @class */ (function () {
     DataApi.prototype.liveQuery = function (response, request, filterBody, serializeRequest, queryChannel) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var r, data, err_3;
-            var _a;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         if (!this.repository.metadata.apiReadAllowed) {
                             response.forbidden();
                             return [2 /*return*/];
                         }
-                        _b.label = 1;
+                        _a.label = 1;
                     case 1:
-                        _b.trys.push([1, 5, , 6]);
+                        _a.trys.push([1, 4, , 5]);
                         return [4 /*yield*/, this.getArrayImpl(response, request, filterBody)];
                     case 2:
-                        r = _b.sent();
-                        _a = {};
-                        return [4 /*yield*/, serializeRequest()];
-                    case 3:
-                        data = (_a.requestJson = _b.sent(),
-                            _a.findOptionsJson = rest_data_provider_1.findOptionsToJson(r.findOptions, this.repository.metadata),
-                            _a.lastIds = r.r.map(function (y) { return _this.repository.metadata.idMetadata.getId(y); }),
-                            _a);
+                        r = _a.sent();
+                        data = {
+                            requestJson: serializeRequest(),
+                            findOptionsJson: rest_data_provider_1.findOptionsToJson(r.findOptions, this.repository.metadata),
+                            lastIds: r.r.map(function (y) { return _this.repository.metadata.idMetadata.getId(y); })
+                        };
                         return [4 /*yield*/, this.remult.liveQueryStorage.add({
                                 entityKey: this.repository.metadata.key,
                                 id: queryChannel,
                                 data: data
                             })];
-                    case 4:
-                        _b.sent();
+                    case 3:
+                        _a.sent();
                         response.success(r.r);
-                        return [3 /*break*/, 6];
-                    case 5:
-                        err_3 = _b.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_3 = _a.sent();
                         if (err_3.isForbiddenError)
                             response.forbidden();
                         else
                             response.error(err_3);
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });