remult 0.21.1 → 0.22.1

package/remult-mongo.js

@@ -17,7 +17,7 @@ var MongoDataProvider = /** @class */ (function () {
     MongoDataProvider.getDb = function (remult) {
         var r = (remult || remult_proxy_1.remult).dataProvider;
         if (!r.db)
-            throw "the data provider is not a MongoDataProvider";
+            throw 'the data provider is not a MongoDataProvider';
         return { db: r.db, session: r.session };
     };
     MongoDataProvider.prototype.getEntityDataProvider = function (entity) {
@@ -28,32 +28,38 @@ var MongoDataProvider = /** @class */ (function () {
             var session, db, err_1;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.client.startSession()];
+                    case 0:
+                        if (!this.disableTransactions) return [3 /*break*/, 2];
+                        return [4 /*yield*/, action(this)];
                     case 1:
+                        _a.sent();
+                        return [3 /*break*/, 11];
+                    case 2: return [4 /*yield*/, this.client.startSession()];
+                    case 3:
                         session = _a.sent();
                         session.startTransaction();
                         db = this.client.db(this.db.databaseName);
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 5, 7, 9]);
+                        _a.label = 4;
+                    case 4:
+                        _a.trys.push([4, 7, 9, 11]);
                         return [4 /*yield*/, action(new MongoDataProvider(db, undefined, { session: session }))];
-                    case 3:
+                    case 5:
                         _a.sent();
                         return [4 /*yield*/, session.commitTransaction()];
-                    case 4:
+                    case 6:
                         _a.sent();
-                        return [3 /*break*/, 9];
-                    case 5:
+                        return [3 /*break*/, 11];
+                    case 7:
                         err_1 = _a.sent();
                         return [4 /*yield*/, session.abortTransaction()];
-                    case 6:
+                    case 8:
                         _a.sent();
                         throw err_1;
-                    case 7: return [4 /*yield*/, session.endSession()];
-                    case 8:
+                    case 9: return [4 /*yield*/, session.endSession()];
+                    case 10:
                         _a.sent();
                         return [7 /*endfinally*/];
-                    case 9: return [2 /*return*/];
+                    case 11: return [2 /*return*/];
                 }
             });
         });
@@ -70,7 +76,7 @@ var MongoDataProvider = /** @class */ (function () {
                     case 1:
                         b = new (_a.apply(FilterConsumerBridgeToMongo, [void 0, _b.sent()]))();
                         b._addWhere = false;
-                        return [4 /*yield*/, (repo.translateWhereToFilter(condition))];
+                        return [4 /*yield*/, repo.translateWhereToFilter(condition)];
                     case 2: return [4 /*yield*/, (_b.sent()).__applyToConsumer(b)];
                     case 3:
                         _b.sent();
@@ -85,7 +91,7 @@ var MongoDataProvider = /** @class */ (function () {
     return MongoDataProvider;
 }());
 exports.MongoDataProvider = MongoDataProvider;
-var NULL = { $null: "$null" };
+var NULL = { $null: '$null' };
 function isNull(x) {
     return (x === null || x === void 0 ? void 0 : x.$null) === NULL.$null;
 }
@@ -173,7 +179,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                     case 2:
                         where = _g.sent();
                         op = {
-                            session: this.session
+                            session: this.session,
                         };
                         if (options.limit) {
                             op.limit = options.limit;
@@ -198,7 +204,10 @@ var MongoEntityDataProvider = /** @class */ (function () {
                             }
                         }
                         _e = (_d = Promise).all;
-                        return [4 /*yield*/, collection.find(where, op).map(function (x) { return _this.translateFromJson(x, e); }).toArray()];
+                        return [4 /*yield*/, collection
+                                .find(where, op)
+                                .map(function (x) { return _this.translateFromJson(x, e); })
+                                .toArray()];
                     case 3: return [4 /*yield*/, _e.apply(_d, [_g.sent()])];
                     case 4: return [2 /*return*/, _g.sent()];
                 }
@@ -256,11 +265,14 @@ var MongoEntityDataProvider = /** @class */ (function () {
                         _g = (_f = collection).updateOne;
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2: return [4 /*yield*/, _g.apply(_f, [_k.sent(), {
-                                $set: newR
-                            }, { session: this.session }])];
+                                $set: newR,
+                            },
+                            { session: this.session }])];
                     case 3:
                         r = _k.sent();
-                        return [2 /*return*/, this.find({ where: _1.Filter.fromEntityFilter(this.entity, resultFilter) }).then(function (y) { return y[0]; })];
+                        return [2 /*return*/, this.find({
+                                where: _1.Filter.fromEntityFilter(this.entity, resultFilter),
+                            }).then(function (y) { return y[0]; })];
                 }
             });
         });
@@ -294,7 +306,9 @@ var MongoEntityDataProvider = /** @class */ (function () {
                         _a = _e.sent(), collection = _a.collection, e = _a.e;
                         _c = (_b = collection).insertOne;
                         return [4 /*yield*/, this.translateToJson(data, e)];
-                    case 2: return [4 /*yield*/, _c.apply(_b, [_e.sent(), { session: this.session }])];
+                    case 2: return [4 /*yield*/, _c.apply(_b, [_e.sent(), {
+                                session: this.session,
+                            }])];
                     case 3:
                         r = _e.sent();
                         _d = this.translateFromJson;
@@ -376,7 +390,7 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
         });
     };
     FilterConsumerBridgeToMongo.prototype.custom = function (key, customItem) {
-        throw new Error("Custom filter should be translated before it gets here");
+        throw new Error('Custom filter should be translated before it gets here');
     };
     FilterConsumerBridgeToMongo.prototype.or = function (orElements) {
         var _this = this;
@@ -424,7 +438,7 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
                         return [7 /*endfinally*/];
                     case 8:
                         this.result.push(function () { return ({
-                            $or: result
+                            $or: result,
                         }); });
                         return [2 /*return*/];
                 }
@@ -432,10 +446,10 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
         }); })());
     };
     FilterConsumerBridgeToMongo.prototype.isNull = function (col) {
-        this.add(col, NULL, "$eq");
+        this.add(col, NULL, '$eq');
     };
     FilterConsumerBridgeToMongo.prototype.isNotNull = function (col) {
-        this.add(col, NULL, "$ne");
+        this.add(col, NULL, '$ne');
     };
     FilterConsumerBridgeToMongo.prototype.isIn = function (col, val) {
         var _this = this;
@@ -443,31 +457,31 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
             var _a;
             return (_a = {},
                 _a[_this.nameProvider.$dbNameOf(col)] = {
-                    $in: val.map(function (x) { return col.valueConverter.toDb(x); })
+                    $in: val.map(function (x) { return col.valueConverter.toDb(x); }),
                 },
                 _a);
         });
     };
     FilterConsumerBridgeToMongo.prototype.isEqualTo = function (col, val) {
-        this.add(col, val, "$eq");
+        this.add(col, val, '$eq');
     };
     FilterConsumerBridgeToMongo.prototype.isDifferentFrom = function (col, val) {
-        this.add(col, val, "$ne");
+        this.add(col, val, '$ne');
     };
     FilterConsumerBridgeToMongo.prototype.isGreaterOrEqualTo = function (col, val) {
-        this.add(col, val, "$gte");
+        this.add(col, val, '$gte');
     };
     FilterConsumerBridgeToMongo.prototype.isGreaterThan = function (col, val) {
-        this.add(col, val, "$gt");
+        this.add(col, val, '$gt');
     };
     FilterConsumerBridgeToMongo.prototype.isLessOrEqualTo = function (col, val) {
-        this.add(col, val, "$lte");
+        this.add(col, val, '$lte');
     };
     FilterConsumerBridgeToMongo.prototype.isLessThan = function (col, val) {
-        this.add(col, val, "$lt");
+        this.add(col, val, '$lt');
     };
     FilterConsumerBridgeToMongo.prototype.containsCaseInsensitive = function (col, val) {
-        throw "containsCaseInsensitive not yet implemented";
+        throw 'containsCaseInsensitive not yet implemented';
         // this.promises.push(col.getDbName().then(colName => {
         //     this.result.push(b => b.whereRaw(
         //         'lower (' + colName + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')"));
@@ -478,12 +492,14 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
         this.result.push(function () {
             var _a, _b;
             return (_a = {},
-                _a[_this.nameProvider.$dbNameOf(col)] = (_b = {}, _b[operator] = isNull(val) ? val : col.valueConverter.toDb(val), _b),
+                _a[_this.nameProvider.$dbNameOf(col)] = (_b = {},
+                    _b[operator] = isNull(val) ? val : col.valueConverter.toDb(val),
+                    _b),
                 _a);
         });
     };
     FilterConsumerBridgeToMongo.prototype.databaseCustom = function (databaseCustom) {
-        throw "error";
+        throw 'error';
         //   this.promises.push((async () => {
         //     if (databaseCustom?.buildSql) {
         //       let item = new CustomSqlFilterBuilder(this.knex);

package/remult-next.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import type { GetServerSideProps, NextApiRequest, PreviewData, NextApiHandler } from "next";
-import type { ParsedUrlQuery } from "querystring";
-import { RemultServerCore, RemultServerOptions } from "./server";
+import type { GetServerSideProps, NextApiRequest, PreviewData, NextApiHandler } from 'next';
+import type { ParsedUrlQuery } from 'querystring';
+import { RemultServerCore, RemultServerOptions } from './server';
 export declare function remultNext(options?: RemultServerOptions<NextApiRequest>): RemultNextServer;
 export declare type RemultNextServer = RemultServerCore<NextApiRequest> & NextApiHandler & {
     getServerSideProps<P extends {

package/remult-next.js

@@ -9,7 +9,7 @@ function remultNext(options) {
         buildGenericRequestInfo: function (req) { return req; },
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.body];
-        }); }); }
+        }); }); },
     });
     return Object.assign(function (req, res) { return result.handle(req, res).then(function () { }); }, result, {
         getRemult: function (req) { return result.getRemult(req); },
@@ -68,7 +68,7 @@ function remultNext(options) {
                     }
                 });
             }); };
-        }
+        },
     });
 }
 exports.remultNext = remultNext;
@@ -81,8 +81,9 @@ function remultNextApp(options) {
             url: req === null || req === void 0 ? void 0 : req.url,
             method: req === null || req === void 0 ? void 0 : req.method,
             on: function (e, do1) {
-                if (e === "close") {
-                    req["_tempOnClose"] = do1;
+                if (e === 'close') {
+                    ;
+                    req['_tempOnClose'] = do1;
                 }
             },
         }); },
@@ -93,7 +94,7 @@ function remultNextApp(options) {
             switch (_a.label) {
                 case 0:
                     sseResponse_1 = undefined;
-                    req["_tempOnClose"] = function () { };
+                    req['_tempOnClose'] = function () { };
                     response_1 = {
                         end: function () { },
                         json: function () { },
@@ -103,8 +104,8 @@ function remultNextApp(options) {
                         write: function () { },
                         writeHead: function (status, headers) {
                             if (status === 200 && headers) {
-                                var contentType = headers["Content-Type"];
-                                if (contentType === "text/event-stream") {
+                                var contentType = headers['Content-Type'];
+                                if (contentType === 'text/event-stream') {
                                     var messages_1 = [];
                                     response_1.write = function (x) { return messages_1.push(x); };
                                     var stream = new ReadableStream({
@@ -129,7 +130,7 @@ function remultNextApp(options) {
                                         },
                                         cancel: function () {
                                             response_1.write = function () { };
-                                            req["_tempOnClose"]();
+                                            req['_tempOnClose']();
                                         },
                                     });
                                     sseResponse_1 = new Response(stream, { headers: headers });
@@ -148,6 +149,11 @@ function remultNextApp(options) {
                                 status: responseFromRemultHandler.statusCode,
                             })];
                     }
+                    if (!responseFromRemultHandler) {
+                        return [2 /*return*/, new Response('', {
+                                status: 404,
+                            })];
+                    }
                     return [2 /*return*/];
             }
         });
@@ -159,9 +165,7 @@ function remultNextApp(options) {
         POST: handler,
         PUT: handler,
         DELETE: handler,
-        withRemult: function (what) {
-            return result.withRemultPromise({}, what);
-        },
+        withRemult: function (what) { return result.withRemultPromise({}, what); },
     };
 }
 exports.remultNextApp = remultNextApp;

package/remult-sveltekit.js

@@ -6,17 +6,16 @@ var server_1 = require("./server");
 function remultSveltekit(options) {
     var _this = this;
     var result = server_1.createRemultServer(options, {
-        buildGenericRequestInfo: function (event) {
-            return ({
-                url: event.request.url,
-                method: event.request.method,
-                on: function (e, do1) {
-                    if (e === 'close') {
-                        event.locals["_tempOnClose"] = do1;
-                    }
+        buildGenericRequestInfo: function (event) { return ({
+            url: event.request.url,
+            method: event.request.method,
+            on: function (e, do1) {
+                if (e === 'close') {
+                    event.locals['_tempOnClose'] = do1;
                 }
-            });
-        }, getRequestBody: function (event) { return event.request.json(); }
+            },
+        }); },
+        getRequestBody: function (event) { return event.request.json(); },
     });
     var handler = function (_a) {
         var event = _a.event, resolve = _a.resolve;
@@ -28,7 +27,7 @@ function remultSveltekit(options) {
                     case 0:
                         if (!event.url.pathname.startsWith(options.rootPath)) return [3 /*break*/, 2];
                         sseResponse_1 = undefined;
-                        event.locals["_tempOnClose"] = function () { };
+                        event.locals['_tempOnClose'] = function () { };
                         response_1 = {
                             end: function () { },
                             json: function () { },
@@ -64,13 +63,13 @@ function remultSveltekit(options) {
                                             },
                                             cancel: function () {
                                                 response_1.write = function () { };
-                                                event.locals["_tempOnClose"]();
-                                            }
+                                                event.locals['_tempOnClose']();
+                                            },
                                         });
                                         sseResponse_1 = new Response(stream, { headers: headers });
                                     }
                                 }
-                            }
+                            },
                         };
                         return [4 /*yield*/, result.handle(event, response_1)];
                     case 1:
@@ -80,7 +79,7 @@ function remultSveltekit(options) {
                         }
                         if (responseFromRemultHandler) {
                             return [2 /*return*/, new Response(JSON.stringify(responseFromRemultHandler.data), {
-                                    status: responseFromRemultHandler.statusCode
+                                    status: responseFromRemultHandler.statusCode,
                                 })];
                         }
                         _b.label = 2;

package/server/core.d.ts

@@ -1,4 +1,4 @@
-export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
-export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
+export { queuedJobInfo, QueueStorage, GenericRequestInfo, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServerCore, RemultServerOptions, SpecificRoute, RemultServer, } from './expressBridge';
+export { JsonEntityFileStorage, JsonFileDataProvider, } from './JsonEntityFileStorage';
 export { SseSubscriptionServer } from '../SseSubscriptionServer';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage';

package/server/expressBridge.d.ts

@@ -18,19 +18,19 @@ export interface RemultServerOptions<RequestType> {
     /** Data Provider to use for the api.
      *
      * @see [Connecting to a Database](https://remult.dev/docs/databases.html).
-    */
+     */
     dataProvider?: DataProvider | Promise<DataProvider> | (() => Promise<DataProvider | undefined>);
     /** Will create tables and columns in supporting databases. default: true
      *
      * @description
      * when set to true, it'll create entities that do not exist, and add columns that are missing.
-    */
+     */
     ensureSchema?: boolean;
     /** The path to use for the api, default:/api
      *
      * @description
      * If you want to use a different api path adjust this field
-    */
+     */
     rootPath?: string;
     /** The default limit to use for find requests that did not specify a limit */
     defaultGetLimit?: number;
@@ -91,15 +91,6 @@ export interface GenericResponse {
     status(statusCode: number): GenericResponse;
     end(): any;
 }
-export declare class RemultAsyncLocalStorage {
-    private readonly remultObjectStorage;
-    static enable(): void;
-    static disable(): void;
-    constructor(remultObjectStorage: import('async_hooks').AsyncLocalStorage<Remult>);
-    run(remult: Remult, callback: VoidFunction): void;
-    getRemult(): Remult;
-    static instance: RemultAsyncLocalStorage;
-}
 export interface queuedJobInfo {
     info: queuedJobInfoResponse;
     userId: string;