remult 0.27.21 → 0.27.22-next.0

package/esm/remult-sveltekit.js

@@ -71,16 +71,7 @@ export function remultSveltekit(options) {
         });
     };
     const handler = async ({ event, resolve }) => {
-        if (event.url.pathname.startsWith(options.rootPath)) {
-            const result = await serverHandler(event);
-            if (result != null && result?.status != 404)
-                return result;
-        }
-        return new Promise((res) => {
-            result.withRemult(event, undefined, async () => {
-                res(await resolve(event));
-            });
-        });
+        return result.withRemultAsync(event, async () => await resolve(event));
     };
     return Object.assign(handler, {
         getRemult: (req) => result.getRemult(req),
@@ -88,6 +79,7 @@ export function remultSveltekit(options) {
         withRemult(request, what) {
             return result.withRemultAsync(request, what);
         },
+        hookHandler: handler,
         GET: serverHandler,
         PUT: serverHandler,
         POST: serverHandler,

package/esm/server/remult-api-server.js

@@ -154,7 +154,7 @@ export class RemultServerImplementation {
     withRemult = async (req, res, next) => {
         await this.process(async () => {
             await next();
-        })(req, res);
+        }, true)(req, res);
     };
     routeImpl;
     getRouteImpl() {
@@ -293,7 +293,7 @@ export class RemultServerImplementation {
             dataProvider: dataProvider,
         });
     }
-    process(what) {
+    process(what, doNotReuseInitRequest) {
         return async (req, origRes) => {
             const genReq = req ? this.coreOptions.buildGenericRequestInfo(req) : {};
             if (req) {
@@ -306,7 +306,8 @@ export class RemultServerImplementation {
             let myReq = new RequestBridgeToDataApiRequest(genReq);
             let myRes = new ResponseBridgeToDataApiResponse(origRes, req, genReq, this.options.error);
             try {
-                if (remultStatic.asyncContext.isInInitRequest())
+                if (remultStatic.asyncContext.isInInitRequest() &&
+                    !doNotReuseInitRequest)
                     return await what(remultStatic.asyncContext.getStore().remult, myReq, myRes, genReq, origRes, req);
                 else
                     await this.runWithRemult(async (remult) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.27.21",
+    "version": "0.27.22-next.0",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/remult-sveltekit.js

@@ -95,35 +95,15 @@ function remultSveltekit(options) {
         });
     }); };
     var handler = function (_a) { return tslib_1.__awaiter(_this, [_a], void 0, function (_b) {
-        var result_1;
         var _this = this;
         var event = _b.event, resolve = _b.resolve;
         return tslib_1.__generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    if (!event.url.pathname.startsWith(options.rootPath)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, serverHandler(event)];
-                case 1:
-                    result_1 = _c.sent();
-                    if (result_1 != null && (result_1 === null || result_1 === void 0 ? void 0 : result_1.status) != 404)
-                        return [2 /*return*/, result_1];
-                    _c.label = 2;
-                case 2: return [2 /*return*/, new Promise(function (res) {
-                        result.withRemult(event, undefined, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var _a;
-                            return tslib_1.__generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        _a = res;
-                                        return [4 /*yield*/, resolve(event)];
-                                    case 1:
-                                        _a.apply(void 0, [_b.sent()]);
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); });
-                    })];
-            }
+            return [2 /*return*/, result.withRemultAsync(event, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, resolve(event)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                }); }); })];
         });
     }); };
     return Object.assign(handler, {
@@ -132,6 +112,7 @@ function remultSveltekit(options) {
         withRemult: function (request, what) {
             return result.withRemultAsync(request, what);
         },
+        hookHandler: handler,
         GET: serverHandler,
         PUT: serverHandler,
         POST: serverHandler,

package/server/remult-api-server.js

@@ -155,7 +155,7 @@ var RemultServerImplementation = /** @class */ (function () {
                                         return [2 /*return*/];
                                 }
                             });
-                        }); })(req, res)];
+                        }); }, true)(req, res)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -574,7 +574,7 @@ var RemultServerImplementation = /** @class */ (function () {
             });
         });
     };
-    RemultServerImplementation.prototype.process = function (what) {
+    RemultServerImplementation.prototype.process = function (what, doNotReuseInitRequest) {
         var _this = this;
         return function (req, origRes) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var genReq, myReq, myRes, err_2;
@@ -595,7 +595,8 @@ var RemultServerImplementation = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 6, , 7]);
-                        if (!remult_static_js_1.remultStatic.asyncContext.isInInitRequest()) return [3 /*break*/, 3];
+                        if (!(remult_static_js_1.remultStatic.asyncContext.isInInitRequest() &&
+                            !doNotReuseInitRequest)) return [3 /*break*/, 3];
                         return [4 /*yield*/, what(remult_static_js_1.remultStatic.asyncContext.getStore().remult, myReq, myRes, genReq, origRes, req)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3: return [4 /*yield*/, this.runWithRemult(function (remult) { return tslib_1.__awaiter(_this, void 0, void 0, function () {