remult 0.14.24 → 0.14.27

package/esm/remult-express.d.ts

@@ -7,5 +7,5 @@ export declare function remultExpress(options?: RemultMiddlewareOptions & {
     openApiDoc: (options: {
         title: string;
     }) => any;
-    addArea: (x: any) => any;
+    addArea: (x: any) => void;
 };

package/esm/remult-middleware.d.ts

@@ -1,8 +1,9 @@
-import { RemultMiddlewareOptions } from './server/expressBridge';
-export declare function remultMiddleware(options?: RemultMiddlewareOptions): ((req: any, res: any, next: any) => void) & {
-    getRemult: (req: any) => Promise<import(".").Remult>;
-    openApiDoc: (options: {
-        title: string;
-    }) => any;
-    addArea: (x: any) => any;
-};
+import { GenericRequest, GenericRequestHandler, GenericResponse, RemultMiddlewareOptions, RemultServer } from './server/expressBridge';
+export declare function remultMiddleware(options?: RemultMiddlewareOptions): RemultMiddleware;
+export interface RemultMiddleware extends GenericRequestHandler, RemultServer {
+    handle(req: GenericRequest, gRes?: GenericResponse): Promise<MiddlewareResponse>;
+}
+export interface MiddlewareResponse {
+    data?: any;
+    statusCode?: number;
+}

package/esm/remult-middleware.js

@@ -5,7 +5,8 @@ export function remultMiddleware(options) {
     return Object.assign((req, res, next) => m.handleRequest(req, res, next), {
         getRemult: (req) => server.getRemult(req),
         openApiDoc: (options) => server.openApiDoc(options),
-        addArea: x => server.addArea(x)
+        addArea: x => server.addArea(x),
+        handle: req => m.handle(req)
     });
 }
 class middleware {
@@ -39,6 +40,31 @@ class middleware {
         };
         return route;
     }
+    async handle(req, gRes) {
+        return new Promise(res => {
+            const response = new class {
+                json(data) {
+                    if (gRes)
+                        gRes.json(data);
+                    res({ statusCode: this.statusCode, data });
+                }
+                status(statusCode) {
+                    if (gRes)
+                        gRes.status(statusCode);
+                    this.statusCode = statusCode;
+                    return this;
+                }
+                end() {
+                    if (gRes)
+                        gRes.end();
+                    res({
+                        statusCode: this.statusCode
+                    });
+                }
+            };
+            this.handleRequest(req, response, () => res(undefined));
+        });
+    }
     handleRequest(req, res, next) {
         let theUrl = req.url;
         if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url

package/esm/server/expressBridge.d.ts

@@ -31,7 +31,7 @@ export interface RemultServer {
     openApiDoc(options: {
         title: string;
     }): any;
-    addArea(rootUrl: string): any;
+    addArea(rootUrl: string): void;
 }
 export declare type GenericRouter = {
     route(path: string): SpecificRoute;
@@ -43,7 +43,7 @@ export declare type SpecificRoute = {
     delete(handler: GenericRequestHandler): SpecificRoute;
 };
 export interface GenericRequest {
-    url: string;
+    url?: string;
     method?: any;
     body?: any;
     query?: any;

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

@@ -12,6 +12,8 @@ const environments = [
     ["fastify", 3003],
     ["express", 3004],
     ["middleware", 3005],
+    ["optine", 3006],
+    ["fresh", 8000],
 ];
 function test(name, test) {
     for (const [env, port] of environments) {

package/package.json

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

package/remult-express.d.ts

@@ -7,5 +7,5 @@ export declare function remultExpress(options?: RemultMiddlewareOptions & {
     openApiDoc: (options: {
         title: string;
     }) => any;
-    addArea: (x: any) => any;
+    addArea: (x: any) => void;
 };

package/remult-middleware.d.ts

@@ -1,8 +1,9 @@
-import { RemultMiddlewareOptions } from './server/expressBridge';
-export declare function remultMiddleware(options?: RemultMiddlewareOptions): ((req: any, res: any, next: any) => void) & {
-    getRemult: (req: any) => Promise<import(".").Remult>;
-    openApiDoc: (options: {
-        title: string;
-    }) => any;
-    addArea: (x: any) => any;
-};
+import { GenericRequest, GenericRequestHandler, GenericResponse, RemultMiddlewareOptions, RemultServer } from './server/expressBridge';
+export declare function remultMiddleware(options?: RemultMiddlewareOptions): RemultMiddleware;
+export interface RemultMiddleware extends GenericRequestHandler, RemultServer {
+    handle(req: GenericRequest, gRes?: GenericResponse): Promise<MiddlewareResponse>;
+}
+export interface MiddlewareResponse {
+    data?: any;
+    statusCode?: number;
+}

package/remult-middleware.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remultMiddleware = void 0;
+var tslib_1 = require("tslib");
 var expressBridge_1 = require("./server/expressBridge");
 function remultMiddleware(options) {
     var m = new middleware();
@@ -8,7 +9,8 @@ function remultMiddleware(options) {
     return Object.assign(function (req, res, next) { return m.handleRequest(req, res, next); }, {
         getRemult: function (req) { return server.getRemult(req); },
         openApiDoc: function (options) { return server.openApiDoc(options); },
-        addArea: function (x) { return server.addArea(x); }
+        addArea: function (x) { return server.addArea(x); },
+        handle: function (req) { return m.handle(req); }
     });
 }
 exports.remultMiddleware = remultMiddleware;
@@ -43,6 +45,39 @@ var middleware = /** @class */ (function () {
         };
         return route;
     };
+    middleware.prototype.handle = function (req, gRes) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib_1.__generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (res) {
+                        var response = new /** @class */ (function () {
+                            function class_1() {
+                            }
+                            class_1.prototype.json = function (data) {
+                                if (gRes)
+                                    gRes.json(data);
+                                res({ statusCode: this.statusCode, data: data });
+                            };
+                            class_1.prototype.status = function (statusCode) {
+                                if (gRes)
+                                    gRes.status(statusCode);
+                                this.statusCode = statusCode;
+                                return this;
+                            };
+                            class_1.prototype.end = function () {
+                                if (gRes)
+                                    gRes.end();
+                                res({
+                                    statusCode: this.statusCode
+                                });
+                            };
+                            return class_1;
+                        }());
+                        _this.handleRequest(req, response, function () { return res(undefined); });
+                    })];
+            });
+        });
+    };
     middleware.prototype.handleRequest = function (req, res, next) {
         var theUrl = req.url;
         if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url

package/server/expressBridge.d.ts

@@ -31,7 +31,7 @@ export interface RemultServer {
     openApiDoc(options: {
         title: string;
     }): any;
-    addArea(rootUrl: string): any;
+    addArea(rootUrl: string): void;
 }
 export declare type GenericRouter = {
     route(path: string): SpecificRoute;
@@ -43,7 +43,7 @@ export declare type SpecificRoute = {
     delete(handler: GenericRequestHandler): SpecificRoute;
 };
 export interface GenericRequest {
-    url: string;
+    url?: string;
     method?: any;
     body?: any;
     query?: any;

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

@@ -15,6 +15,8 @@ var environments = [
     ["fastify", 3003],
     ["express", 3004],
     ["middleware", 3005],
+    ["optine", 3006],
+    ["fresh", 8000],
 ];
 function test(name, test) {
     var e_1, _a;