remult 0.14.29 → 0.14.32

package/remult-fresh.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remultFresh = void 0;
+var tslib_1 = require("tslib");
+var expressBridge_1 = require("./server/expressBridge");
+function remultFresh(options, response) {
+    var _this = this;
+    var server = expressBridge_1.buildRemultServer(options);
+    var orig = server.handle;
+    return Object.assign(server, {
+        freshHandler: function (req, ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            var theReq, _a, _b, init, res;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        theReq = {
+                            method: req.method,
+                            url: req.url,
+                            body: undefined
+                        };
+                        _a = req.method.toLocaleLowerCase();
+                        switch (_a) {
+                            case "put": return [3 /*break*/, 1];
+                            case "post": return [3 /*break*/, 1];
+                        }
+                        return [3 /*break*/, 3];
+                    case 1:
+                        _b = theReq;
+                        return [4 /*yield*/, req.json()];
+                    case 2:
+                        _b.body = _c.sent();
+                        return [3 /*break*/, 3];
+                    case 3:
+                        init = {};
+                        return [4 /*yield*/, orig(theReq)];
+                    case 4:
+                        res = _c.sent();
+                        if (res) {
+                            init.status = res.statusCode;
+                            if (res.data) {
+                                return [2 /*return*/, response.json(res.data, init)];
+                            }
+                            else
+                                return [2 /*return*/, new response(undefined, init)];
+                        }
+                        else {
+                            return [2 /*return*/, ctx.next()];
+                        }
+                        ;
+                        return [2 /*return*/];
+                }
+            });
+        }); }
+    });
+}
+exports.remultFresh = remultFresh;
+;
+;

package/remult-middleware.d.ts

@@ -1,9 +1,10 @@
-import { GenericRequest, GenericRequestHandler, GenericResponse, RemultMiddlewareOptions, RemultServer } from './server/expressBridge';
-export declare function remultMiddleware(options?: RemultMiddlewareOptions): RemultMiddleware;
-export interface RemultMiddleware extends GenericRequestHandler, RemultServer {
+import { GenericRequest, GenericMiddleware, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './server/expressBridge';
+export declare function remultMiddleware(options?: RemultServerOptions): RemultMiddleware;
+export interface RemultMiddleware extends GenericMiddleware, RemultServer {
     handle(req: GenericRequest, gRes?: GenericResponse): Promise<MiddlewareResponse>;
 }
 export interface MiddlewareResponse {
     data?: any;
     statusCode?: number;
 }
+export { GenericRequest, GenericMiddleware as GenericRequestHandler, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions as RemultMiddlewareOptions, SpecificRoute, RemultServer };

package/remult-middleware.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remultMiddleware = void 0;
+exports.buildRemultServer = exports.remultMiddleware = void 0;
 var tslib_1 = require("tslib");
 var expressBridge_1 = require("./server/expressBridge");
+Object.defineProperty(exports, "buildRemultServer", { enumerable: true, get: function () { return expressBridge_1.buildRemultServer; } });
 function remultMiddleware(options) {
     var m = new middleware();
     var server = expressBridge_1.buildRemultServer(m, options);

package/server/expressBridge.d.ts

@@ -1,37 +1,39 @@
 import { queuedJobInfoResponse } from '../src/server-action';
 import { DataProvider } from '../src/data-interfaces';
-import { DataApi, DataApiRequest, DataApiResponse } from '../src/data-api';
-import { AllowedForInstance, Remult, UserInfo } from '../src/context';
+import { DataApiRequest } from '../src/data-api';
+import { Remult, UserInfo } from '../src/context';
 import { ClassType } from '../classType';
 import { Repository } from '../src/remult3';
 import { IdEntity } from '../src/id-entity';
-export declare type RemultMiddlewareOptions = {
+export declare type RemultServerOptions = {
     /** Sets a database connection for Remult.
      *
      * @see [Connecting to a Database](https://remult.dev/docs/databases.html).
     */
     dataProvider?: DataProvider | Promise<DataProvider> | (() => Promise<DataProvider | undefined>);
-    disableAutoApi?: boolean;
     queueStorage?: QueueStorage;
     initRequest?: (remult: Remult, origReq: GenericRequest) => Promise<void>;
+    getUser?: (request: GenericRequest) => Promise<UserInfo>;
     initApi?: (remult: Remult) => void | Promise<void>;
     logApiEndPoints?: boolean;
     defaultGetLimit?: number;
     entities?: ClassType<any>[];
     controllers?: ClassType<any>[];
-    bodyParser?: boolean;
     rootPath?: string;
 };
-export declare function buildRemultServer(app: GenericRouter, options: RemultMiddlewareOptions): RemultServer;
+export declare function buildRemultServer(options: RemultServerOptions): RemultServer;
 export declare type GenericRequestHandler = (req: GenericRequest, res: GenericResponse, next: VoidFunction) => void;
-export interface RemultExpressBridge extends GenericRequestHandler, RemultServer {
+export interface ServerHandleResponse {
+    data?: any;
+    statusCode: number;
 }
 export interface RemultServer {
     getRemult(req: GenericRequest): Promise<Remult>;
     openApiDoc(options: {
         title: string;
     }): any;
-    addArea(rootUrl: string): void;
+    registerRouter(r: GenericRouter): void;
+    handle(req: GenericRequest, gRes?: GenericResponse): Promise<ServerHandleResponse | undefined>;
 }
 export declare type GenericRouter = {
     route(path: string): SpecificRoute;
@@ -48,8 +50,6 @@ export interface GenericRequest {
     body?: any;
     query?: any;
     params?: any;
-    user?: UserInfo;
-    auth?: UserInfo;
 }
 export interface GenericResponse {
     json(data: any): any;
@@ -57,53 +57,11 @@ export interface GenericResponse {
     setStatus?(statusCode: number): GenericResponse;
     end(): any;
 }
-declare class ExpressBridge {
-    private app;
-    queue: inProcessQueueHandler;
-    initRequest: (remult: Remult, origReq: GenericRequest) => Promise<void>;
-    dataProvider: DataProvider | Promise<DataProvider>;
-    openApiDoc(options: {
-        title: string;
-        version?: string;
-    }): any;
-    backendMethodsOpenApi: {
-        path: string;
-        allowed: AllowedForInstance<any>;
-        tag: string;
-    }[];
-    constructor(app: GenericRouter, queue: inProcessQueueHandler, initRequest: (remult: Remult, origReq: GenericRequest) => Promise<void>, dataProvider: DataProvider | Promise<DataProvider>);
-    logApiEndPoints: boolean;
-    private firstArea;
-    addArea(rootUrl: string): SiteArea;
-    getRemult(req?: GenericRequest): Promise<Remult>;
-}
-export declare class SiteArea {
-    private bridge;
-    private app;
-    private rootUrl;
-    private logApiEndpoints;
-    constructor(bridge: ExpressBridge, app: GenericRouter, rootUrl: string, logApiEndpoints: boolean);
-    add(key: string, dataApiFactory: ((req: Remult) => DataApi)): void;
-    process(what: (remult: Remult, myReq: DataApiRequest, myRes: DataApiResponse, origReq: GenericRequest) => Promise<void>): (req: GenericRequest, res: GenericResponse) => Promise<void>;
-    getRemult(req: GenericRequest): Promise<Remult>;
-    initQueue(): void;
-    addAction(action: {
-        __register: (reg: (url: string, queue: boolean, allowed: AllowedForInstance<any>, what: ((data: any, req: Remult, res: DataApiResponse) => void)) => void) => void;
-    }): void;
-}
 export declare class ExpressRequestBridgeToDataApiRequest implements DataApiRequest {
     private r;
     get(key: string): any;
     constructor(r: GenericRequest);
 }
-declare class inProcessQueueHandler {
-    private storage;
-    constructor(storage: QueueStorage);
-    submitJob(url: string, req: Remult, body: any): Promise<string>;
-    mapQueuedAction(url: string, what: (data: any, r: Remult, res: ApiActionResponse) => void): void;
-    actions: Map<string, (data: any, r: Remult, res: ApiActionResponse) => void>;
-    getJobInfo(queuedJobId: string): Promise<queuedJobInfo>;
-}
 export interface queuedJobInfo {
     info: queuedJobInfoResponse;
     userId: string;
@@ -138,4 +96,3 @@ export declare class JobsInQueueEntity extends IdEntity {
     error: boolean;
     progress: number;
 }
-export {};