remult 0.20.0-exp.16 → 0.20.0-exp.18

package/esm/graphql.d.ts

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

package/esm/postgres/postgres-data-provider.d.ts

@@ -28,4 +28,9 @@ export declare function createPostgresConnection(options?: {
     sslInDev?: boolean;
     configuration?: "heroku" | PoolConfig;
 }): Promise<SqlDatabase>;
+export declare function createPostgresDataProvider(options?: {
+    connectionString?: string;
+    sslInDev?: boolean;
+    configuration?: "heroku" | PoolConfig;
+}): Promise<SqlDatabase>;
 export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge").EntityQueueStorage>;

package/esm/postgres/postgres-data-provider.js

@@ -37,6 +37,7 @@ export class PostgresDataProvider {
                 entityIsUsedForTheFirstTime: this.entityIsUsedForTheFirstTime,
                 transaction: () => { throw "nested transactions not allowed"; },
                 getLimitSqlSyntax: this.getLimitSqlSyntax,
+                supportsJsonColumnType: this.supportsJsonColumnType,
                 //@ts-ignore
                 pool: client
             });
@@ -74,6 +75,9 @@ class PostgresBridgeToSQLQueryResult {
     }
 }
 export async function createPostgresConnection(options) {
+    return createPostgresDataProvider(options);
+}
+export async function createPostgresDataProvider(options) {
     if (!options)
         options = {};
     let config = {};

package/esm/server/expressBridge.d.ts

@@ -44,7 +44,7 @@ export interface RemultServerOptions<RequestType> {
     /** Used to store the context relevant info for re running a live query */
     contextSerializer?: {
         serialize(remult: Remult): Promise<any>;
-        deserialize(json: any, remult: Remult): Promise<void>;
+        deserialize(json: any, options: InitRequestOptions): Promise<void>;
     };
     /** Storage to use for backend methods that use queue */
     queueStorage?: QueueStorage;

package/esm/server/expressBridge.js

@@ -125,7 +125,15 @@ export class RemultServerImplementation {
                     await this.runWithRemult(async (remult) => {
                         remult.user = jsonContextData.user;
                         if (this.options.contextSerializer) {
-                            await this.options.contextSerializer.deserialize(jsonContextData, remult);
+                            await this.options.contextSerializer.deserialize(jsonContextData, {
+                                remult,
+                                get liveQueryStorage() {
+                                    return remult.liveQueryStorage;
+                                },
+                                set liveQueryStorage(value) {
+                                    remult.liveQueryStorage = value;
+                                }
+                            });
                         }
                         await what(remult.repo(e));
                     });

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

@@ -5,8 +5,8 @@ export declare class DataApi<T = any> {
     private repository;
     private remult;
     constructor(repository: Repository<T>, remult: Remult);
-    httpGet(res: DataApiResponse, req: DataApiRequest, serializeRequest: () => Promise<any>): Promise<void>;
-    httpPost(res: DataApiResponse, req: DataApiRequest, body: any, serializeRequest: () => Promise<any>): Promise<void>;
+    httpGet(res: DataApiResponse, req: DataApiRequest, serializeContext: () => Promise<any>): Promise<void>;
+    httpPost(res: DataApiResponse, req: DataApiRequest, body: any, serializeContext: () => Promise<any>): Promise<void>;
     static defaultGetLimit: number;
     get(response: DataApiResponse, id: any): Promise<void>;
     count(response: DataApiResponse, request: DataApiRequest, filterBody?: any): Promise<void>;
@@ -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, serializeContext: () => Promise<any>, queryChannel: string): Promise<void>;
     private buildWhere;
     private doOnId;
     put(response: DataApiResponse, id: any, body: any): Promise<void>;

package/esm/src/data-api.js

@@ -8,10 +8,10 @@ export class DataApi {
         this.repository = repository;
         this.remult = remult;
     }
-    httpGet(res, req, serializeRequest) {
+    httpGet(res, req, serializeContext) {
         const action = req?.get("__action");
         if (action?.startsWith(liveQueryAction))
-            return this.liveQuery(res, req, undefined, serializeRequest, getLiveQueryChannel(action.substring(liveQueryAction.length), this.remult.user?.id));
+            return this.liveQuery(res, req, undefined, serializeContext, getLiveQueryChannel(action.substring(liveQueryAction.length), this.remult.user?.id));
         switch (action) {
             case "get":
             case "count":
@@ -19,10 +19,10 @@ export class DataApi {
         }
         return this.getArray(res, req, undefined);
     }
-    async httpPost(res, req, body, serializeRequest) {
+    async httpPost(res, req, body, serializeContext) {
         const action = req?.get("__action");
         if (action?.startsWith(liveQueryAction))
-            return this.liveQuery(res, req, undefined, serializeRequest, getLiveQueryChannel(action.substring(liveQueryAction.length), this.remult.user?.id));
+            return this.liveQuery(res, req, undefined, serializeContext, getLiveQueryChannel(action.substring(liveQueryAction.length), this.remult.user?.id));
         switch (action) {
             case "get":
                 return this.getArray(res, req, body);
@@ -120,7 +120,7 @@ export class DataApi {
                 response.error(err);
         }
     }
-    async liveQuery(response, request, filterBody, serializeRequest, queryChannel) {
+    async liveQuery(response, request, filterBody, serializeContext, queryChannel) {
         if (!this.repository.metadata.apiReadAllowed) {
             response.forbidden();
             return;
@@ -128,7 +128,7 @@ export class DataApi {
         try {
             const r = await this.getArrayImpl(response, request, filterBody);
             const data = {
-                requestJson: await serializeRequest(),
+                requestJson: await serializeContext(),
                 findOptionsJson: findOptionsToJson(r.findOptions, this.repository.metadata),
                 lastIds: r.r.map(y => this.repository.metadata.idMetadata.getId(y))
             };

package/graphql.d.ts

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

package/package.json

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

package/postgres/postgres-data-provider.d.ts

@@ -28,4 +28,9 @@ export declare function createPostgresConnection(options?: {
     sslInDev?: boolean;
     configuration?: "heroku" | PoolConfig;
 }): Promise<SqlDatabase>;
+export declare function createPostgresDataProvider(options?: {
+    connectionString?: string;
+    sslInDev?: boolean;
+    configuration?: "heroku" | PoolConfig;
+}): Promise<SqlDatabase>;
 export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge").EntityQueueStorage>;

package/postgres/postgres-data-provider.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.preparePostgresQueueStorage = exports.createPostgresConnection = exports.PostgresDataProvider = void 0;
+exports.preparePostgresQueueStorage = exports.createPostgresDataProvider = exports.createPostgresConnection = exports.PostgresDataProvider = void 0;
 var tslib_1 = require("tslib");
 var pg_1 = require("pg");
 var context_1 = require("../src/context");
@@ -67,6 +67,7 @@ var PostgresDataProvider = /** @class */ (function () {
                                 entityIsUsedForTheFirstTime: this.entityIsUsedForTheFirstTime,
                                 transaction: function () { throw "nested transactions not allowed"; },
                                 getLimitSqlSyntax: this.getLimitSqlSyntax,
+                                supportsJsonColumnType: this.supportsJsonColumnType,
                                 //@ts-ignore
                                 pool: client
                             })];
@@ -119,6 +120,14 @@ var PostgresBridgeToSQLQueryResult = /** @class */ (function () {
     return PostgresBridgeToSQLQueryResult;
 }());
 function createPostgresConnection(options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/, createPostgresDataProvider(options)];
+        });
+    });
+}
+exports.createPostgresConnection = createPostgresConnection;
+function createPostgresDataProvider(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var config, db, remult;
         return tslib_1.__generator(this, function (_a) {
@@ -150,7 +159,7 @@ function createPostgresConnection(options) {
         });
     });
 }
-exports.createPostgresConnection = createPostgresConnection;
+exports.createPostgresDataProvider = createPostgresDataProvider;
 function preparePostgresQueueStorage(sql) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var c, JobsInQueueEntity, e;

package/server/expressBridge.d.ts

@@ -44,7 +44,7 @@ export interface RemultServerOptions<RequestType> {
     /** Used to store the context relevant info for re running a live query */
     contextSerializer?: {
         serialize(remult: Remult): Promise<any>;
-        deserialize(json: any, remult: Remult): Promise<void>;
+        deserialize(json: any, options: InitRequestOptions): Promise<void>;
     };
     /** Storage to use for backend methods that use queue */
     queueStorage?: QueueStorage;

package/server/expressBridge.js

@@ -192,7 +192,15 @@ var RemultServerImplementation = /** @class */ (function () {
                                                         case 0:
                                                             remult.user = jsonContextData.user;
                                                             if (!this.options.contextSerializer) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, this.options.contextSerializer.deserialize(jsonContextData, remult)];
+                                                            return [4 /*yield*/, this.options.contextSerializer.deserialize(jsonContextData, {
+                                                                    remult: remult,
+                                                                    get liveQueryStorage() {
+                                                                        return remult.liveQueryStorage;
+                                                                    },
+                                                                    set liveQueryStorage(value) {
+                                                                        remult.liveQueryStorage = value;
+                                                                    }
+                                                                })];
                                                         case 1:
                                                             _a.sent();
                                                             _a.label = 2;

package/src/data-api.d.ts

@@ -5,8 +5,8 @@ export declare class DataApi<T = any> {
     private repository;
     private remult;
     constructor(repository: Repository<T>, remult: Remult);
-    httpGet(res: DataApiResponse, req: DataApiRequest, serializeRequest: () => Promise<any>): Promise<void>;
-    httpPost(res: DataApiResponse, req: DataApiRequest, body: any, serializeRequest: () => Promise<any>): Promise<void>;
+    httpGet(res: DataApiResponse, req: DataApiRequest, serializeContext: () => Promise<any>): Promise<void>;
+    httpPost(res: DataApiResponse, req: DataApiRequest, body: any, serializeContext: () => Promise<any>): Promise<void>;
     static defaultGetLimit: number;
     get(response: DataApiResponse, id: any): Promise<void>;
     count(response: DataApiResponse, request: DataApiRequest, filterBody?: any): Promise<void>;
@@ -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, serializeContext: () => Promise<any>, queryChannel: string): Promise<void>;
     private buildWhere;
     private doOnId;
     put(response: DataApiResponse, id: any, body: any): Promise<void>;

package/src/data-api.js

@@ -12,11 +12,11 @@ var DataApi = /** @class */ (function () {
         this.repository = repository;
         this.remult = remult;
     }
-    DataApi.prototype.httpGet = function (res, req, serializeRequest) {
+    DataApi.prototype.httpGet = function (res, req, serializeContext) {
         var _a;
         var action = req === null || req === void 0 ? void 0 : req.get("__action");
         if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_1.liveQueryAction))
-            return this.liveQuery(res, req, undefined, serializeRequest, getLiveQueryChannel(action.substring(rest_data_provider_1.liveQueryAction.length), (_a = this.remult.user) === null || _a === void 0 ? void 0 : _a.id));
+            return this.liveQuery(res, req, undefined, serializeContext, getLiveQueryChannel(action.substring(rest_data_provider_1.liveQueryAction.length), (_a = this.remult.user) === null || _a === void 0 ? void 0 : _a.id));
         switch (action) {
             case "get":
             case "count":
@@ -24,7 +24,7 @@ var DataApi = /** @class */ (function () {
         }
         return this.getArray(res, req, undefined);
     };
-    DataApi.prototype.httpPost = function (res, req, body, serializeRequest) {
+    DataApi.prototype.httpPost = function (res, req, body, serializeContext) {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var action, _c;
@@ -33,7 +33,7 @@ var DataApi = /** @class */ (function () {
                     case 0:
                         action = req === null || req === void 0 ? void 0 : req.get("__action");
                         if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_1.liveQueryAction))
-                            return [2 /*return*/, this.liveQuery(res, req, undefined, serializeRequest, getLiveQueryChannel(action.substring(rest_data_provider_1.liveQueryAction.length), (_a = this.remult.user) === null || _a === void 0 ? void 0 : _a.id))];
+                            return [2 /*return*/, this.liveQuery(res, req, undefined, serializeContext, getLiveQueryChannel(action.substring(rest_data_provider_1.liveQueryAction.length), (_a = this.remult.user) === null || _a === void 0 ? void 0 : _a.id))];
                         _c = action;
                         switch (_c) {
                             case "get": return [3 /*break*/, 1];
@@ -207,7 +207,7 @@ var DataApi = /** @class */ (function () {
             });
         });
     };
-    DataApi.prototype.liveQuery = function (response, request, filterBody, serializeRequest, queryChannel) {
+    DataApi.prototype.liveQuery = function (response, request, filterBody, serializeContext, queryChannel) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var r, data, err_3;
             var _a;
@@ -226,7 +226,7 @@ var DataApi = /** @class */ (function () {
                     case 2:
                         r = _b.sent();
                         _a = {};
-                        return [4 /*yield*/, serializeRequest()];
+                        return [4 /*yield*/, serializeContext()];
                     case 3:
                         data = (_a.requestJson = _b.sent(),
                             _a.findOptionsJson = rest_data_provider_1.findOptionsToJson(r.findOptions, this.repository.metadata),