remult 0.23.0-exp.21 → 0.23.0-exp.23

package/esm/remult-sveltekit.d.ts

@@ -1,4 +1,6 @@
 import type { Handle, RequestEvent } from '@sveltejs/kit';
 import type { RemultServerCore, RemultServerOptions } from './server';
 export declare function remultSveltekit(options?: RemultServerOptions<RequestEvent>): RemultSveltekitServer;
-export type RemultSveltekitServer = RemultServerCore<RequestEvent> & Handle;
+export type RemultSveltekitServer = RemultServerCore<RequestEvent> & Handle & {
+    withRemult<T>(request: RequestEvent, what: () => Promise<T>): Promise<T>;
+};

package/esm/remult-sveltekit.js

@@ -67,5 +67,8 @@ export function remultSveltekit(options) {
     return Object.assign(handler, {
         getRemult: (req) => result.getRemult(req),
         openApiDoc: (options) => result.openApiDoc(options),
+        withRemult(request, what) {
+            return result.withRemultPromise(request, what);
+        },
     });
 }

package/esm/server/expressBridge.d.ts

@@ -112,6 +112,14 @@ export declare class EntityQueueStorage implements QueueStorage {
     getJobInfo(queuedJobId: string): Promise<queuedJobInfo>;
     createJob(url: string, userId: string): Promise<string>;
 }
+export declare class RouteImplementation<RequestType> {
+    private coreOptions;
+    constructor(coreOptions: ServerCoreOptions<RequestType>);
+    map: Map<string, Map<string, GenericRequestHandler>>;
+    route(path: string): SpecificRoute;
+    handle(req: RequestType, gRes?: GenericResponse): Promise<ServerHandleResponse | undefined>;
+    middleware(origReq: RequestType, res: GenericResponse, next: VoidFunction): void;
+}
 export declare class JobsInQueueEntity extends IdEntity {
     userId: string;
     url: string;

package/esm/server/expressBridge.js

@@ -811,7 +811,7 @@ export class EntityQueueStorage {
         return q.id;
     }
 }
-class RouteImplementation {
+export class RouteImplementation {
     coreOptions;
     constructor(coreOptions) {
         this.coreOptions = coreOptions;
@@ -845,7 +845,7 @@ class RouteImplementation {
         return route;
     }
     async handle(req, gRes) {
-        return new Promise((res) => {
+        return new Promise((res, rej) => {
             const response = new (class {
                 write(data) {
                     ;
@@ -881,7 +881,12 @@ class RouteImplementation {
                     });
                 }
             })();
-            this.middleware(req, response, () => res(undefined));
+            try {
+                this.middleware(req, response, () => res(undefined));
+            }
+            catch (err) {
+                rej(err);
+            }
         });
     }
     middleware(origReq, res, next) {
@@ -920,7 +925,7 @@ class RouteImplementation {
         }
         let idPosition = path.lastIndexOf('/');
         if (idPosition >= 0) {
-            lowerPath = path.substring(0, idPosition) + '/:id';
+            lowerPath = lowerPath.substring(0, idPosition) + '/:id';
             m = this.map.get(lowerPath);
             if (m) {
                 let h = m.get(req.method.toLowerCase());
@@ -929,7 +934,7 @@ class RouteImplementation {
                         req.params = {};
                         origReq['_tempParams'] = req.params;
                     }
-                    req.params.id = path.substring(idPosition + 1);
+                    req.params.id = path.substring(idPosition + 1).replace(/%2C/g, ',');
                     h(origReq, res, next);
                     return;
                 }
@@ -987,3 +992,4 @@ JobsInQueueEntity = __decorate([
 ], JobsInQueueEntity);
 export { JobsInQueueEntity };
 allEntities.splice(allEntities.indexOf(JobsInQueueEntity), 1);
+//p1 - https://codesandbox.io/p/sandbox/fervent-yalow-66m78n?file=%2Fsrc%2Findex.ts%3A35%2C93

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.23.0-exp.21",
+    "version": "0.23.0-exp.23",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",

package/remult-sveltekit.d.ts

@@ -1,4 +1,6 @@
 import type { Handle, RequestEvent } from '@sveltejs/kit';
 import type { RemultServerCore, RemultServerOptions } from './server';
 export declare function remultSveltekit(options?: RemultServerOptions<RequestEvent>): RemultSveltekitServer;
-export type RemultSveltekitServer = RemultServerCore<RequestEvent> & Handle;
+export type RemultSveltekitServer = RemultServerCore<RequestEvent> & Handle & {
+    withRemult<T>(request: RequestEvent, what: () => Promise<T>): Promise<T>;
+};

package/remult-sveltekit.js

@@ -105,6 +105,9 @@ function remultSveltekit(options) {
     return Object.assign(handler, {
         getRemult: function (req) { return result.getRemult(req); },
         openApiDoc: function (options) { return result.openApiDoc(options); },
+        withRemult: function (request, what) {
+            return result.withRemultPromise(request, what);
+        },
     });
 }
 exports.remultSveltekit = remultSveltekit;

package/server/expressBridge.d.ts

@@ -112,6 +112,14 @@ export declare class EntityQueueStorage implements QueueStorage {
     getJobInfo(queuedJobId: string): Promise<queuedJobInfo>;
     createJob(url: string, userId: string): Promise<string>;
 }
+export declare class RouteImplementation<RequestType> {
+    private coreOptions;
+    constructor(coreOptions: ServerCoreOptions<RequestType>);
+    map: Map<string, Map<string, GenericRequestHandler>>;
+    route(path: string): SpecificRoute;
+    handle(req: RequestType, gRes?: GenericResponse): Promise<ServerHandleResponse | undefined>;
+    middleware(origReq: RequestType, res: GenericResponse, next: VoidFunction): void;
+}
 export declare class JobsInQueueEntity extends IdEntity {
     userId: string;
     url: string;

package/server/expressBridge.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.RemultServerImplementation = exports.createRemultServerCore = void 0;
+exports.JobsInQueueEntity = exports.RouteImplementation = exports.EntityQueueStorage = exports.RemultServerImplementation = exports.createRemultServerCore = void 0;
 var tslib_1 = require("tslib");
 var SseSubscriptionServer_1 = require("../SseSubscriptionServer");
 var context_1 = require("../src/context");
@@ -1255,7 +1255,7 @@ var RouteImplementation = /** @class */ (function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (res) {
+                return [2 /*return*/, new Promise(function (res, rej) {
                         var response = new (/** @class */ (function () {
                             function class_1() {
                                 this.statusCode = 200;
@@ -1294,7 +1294,12 @@ var RouteImplementation = /** @class */ (function () {
                             };
                             return class_1;
                         }()))();
-                        _this.middleware(req, response, function () { return res(undefined); });
+                        try {
+                            _this.middleware(req, response, function () { return res(undefined); });
+                        }
+                        catch (err) {
+                            rej(err);
+                        }
                     })];
             });
         });
@@ -1335,7 +1340,7 @@ var RouteImplementation = /** @class */ (function () {
         }
         var idPosition = path.lastIndexOf('/');
         if (idPosition >= 0) {
-            lowerPath = path.substring(0, idPosition) + '/:id';
+            lowerPath = lowerPath.substring(0, idPosition) + '/:id';
             m = this.map.get(lowerPath);
             if (m) {
                 var h = m.get(req.method.toLowerCase());
@@ -1344,7 +1349,7 @@ var RouteImplementation = /** @class */ (function () {
                         req.params = {};
                         origReq['_tempParams'] = req.params;
                     }
-                    req.params.id = path.substring(idPosition + 1);
+                    req.params.id = path.substring(idPosition + 1).replace(/%2C/g, ',');
                     h(origReq, res, next);
                     return;
                 }
@@ -1354,6 +1359,7 @@ var RouteImplementation = /** @class */ (function () {
     };
     return RouteImplementation;
 }());
+exports.RouteImplementation = RouteImplementation;
 var JobsInQueueEntity = /** @class */ (function (_super) {
     tslib_1.__extends(JobsInQueueEntity, _super);
     function JobsInQueueEntity() {
@@ -1400,3 +1406,4 @@ var JobsInQueueEntity = /** @class */ (function (_super) {
 }(IdEntity_1.IdEntity));
 exports.JobsInQueueEntity = JobsInQueueEntity;
 context_1.allEntities.splice(context_1.allEntities.indexOf(JobsInQueueEntity), 1);
+//p1 - https://codesandbox.io/p/sandbox/fervent-yalow-66m78n?file=%2Fsrc%2Findex.ts%3A35%2C93