remult 0.14.29 → 0.14.32

package/esm/graphql.d.ts

@@ -1,5 +1,5 @@
-import { RemultExpressBridge } from "./server/expressBridge";
-export declare function remultGraphql(api: RemultExpressBridge): {
+import { RemultServer } from "./server/expressBridge";
+export declare function remultGraphql(api: RemultServer): {
     rootValue: {};
     schema: string;
 };

package/esm/remult-express.d.ts

@@ -1,11 +1,6 @@
-import { RemultMiddlewareOptions } from './server/expressBridge';
-export declare function remultExpress(options?: RemultMiddlewareOptions & {
+import * as express from 'express';
+import { RemultServer, RemultServerOptions } from './server/expressBridge';
+export declare function remultExpress(options?: RemultServerOptions & {
     bodyParser?: boolean;
     bodySizeLimit?: string;
-}): import("express-serve-static-core").Router & {
-    getRemult: (req: any) => Promise<import(".").Remult>;
-    openApiDoc: (options: {
-        title: string;
-    }) => any;
-    addArea: (x: any) => void;
-};
+}): express.RequestHandler & RemultServer;

package/esm/remult-express.js

@@ -12,10 +12,11 @@ export function remultExpress(options) {
         app.use(express.json({ limit: options.bodySizeLimit }));
         app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
     }
-    const server = buildRemultServer(app, options);
+    const server = buildRemultServer(options);
+    server.registerRouter(app);
     return Object.assign(app, {
         getRemult: (req) => server.getRemult(req),
         openApiDoc: (options) => server.openApiDoc(options),
-        addArea: x => server.addArea(x)
+        registerRouter: x => server.registerRouter(x)
     });
 }

package/esm/remult-fastify.d.ts

@@ -1,3 +1,3 @@
 import type { FastifyPluginCallback } from 'fastify';
-import { RemultServer, RemultMiddlewareOptions } from './server/expressBridge';
-export declare function remultFastify(options: RemultMiddlewareOptions): FastifyPluginCallback & RemultServer;
+import { RemultServer, RemultServerOptions } from './server/expressBridge';
+export declare function remultFastify(options: RemultServerOptions): FastifyPluginCallback & RemultServer;

package/esm/remult-fastify.js

@@ -18,8 +18,8 @@ export function remultFastify(options) {
         };
         return response;
     }
-    let api;
-    const pluginFunction = async (instance, options) => {
+    const api = buildRemultServer(options);
+    const pluginFunction = async (instance, op) => {
         //@ts-ignore
         let fastifyRouter = {
             route(path) {
@@ -42,16 +42,11 @@ export function remultFastify(options) {
                 return r;
             },
         };
-        api = buildRemultServer(fastifyRouter, options);
-    };
-    const getApi = () => {
-        if (!api)
-            throw "Please call fastify's register before using this method";
-        return api;
+        api.registerRouter(fastifyRouter);
     };
     return Object.assign(pluginFunction, {
-        addArea: x => getApi().addArea(x),
-        getRemult: x => getApi().getRemult(x),
-        openApiDoc: x => getApi().openApiDoc(x)
+        getRemult: x => api.getRemult(x),
+        openApiDoc: x => api.openApiDoc(x),
+        handle: (req, res) => api.handle(req, res)
     });
 }

package/esm/remult-fresh.d.ts

@@ -0,0 +1,17 @@
+import { RemultServerOptions, RemultServer } from "./server/expressBridge";
+export declare function remultFresh(options: RemultServerOptions, response: FreshResponse): RemultFresh;
+export interface RemultFresh extends RemultServer {
+    freshHandler(req: FreshRequest, ctx: FreshContext): Promise<FreshResponse>;
+}
+export interface FreshRequest {
+    url: string;
+    method: string;
+    json: () => Promise<any>;
+}
+export interface FreshContext {
+    next: () => Promise<any>;
+}
+export interface FreshResponse {
+    new (body?: any | undefined, init?: ResponseInit): any;
+    json(data: unknown, init?: ResponseInit): any;
+}

package/esm/remult-fresh.js

@@ -0,0 +1,36 @@
+import { buildRemultServer } from "./server/expressBridge";
+export function remultFresh(options, response) {
+    const server = buildRemultServer(options);
+    const orig = server.handle;
+    return Object.assign(server, {
+        freshHandler: async (req, ctx) => {
+            const theReq = {
+                method: req.method,
+                url: req.url,
+                body: undefined
+            };
+            switch (req.method.toLocaleLowerCase()) {
+                case "put":
+                case "post":
+                    theReq.body = await req.json();
+                    break;
+            }
+            let init = {};
+            const res = await orig(theReq);
+            if (res) {
+                init.status = res.statusCode;
+                if (res.data) {
+                    return response.json(res.data, init);
+                }
+                else
+                    return new response(undefined, init);
+            }
+            else {
+                return ctx.next();
+            }
+            ;
+        }
+    });
+}
+;
+;

package/esm/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/esm/remult-middleware.js

@@ -114,3 +114,4 @@ class middleware {
         next();
     }
 }
+export { buildRemultServer };

package/esm/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 {};