remult 3.0.6 → 3.1.0-next.1

package/README.md

@@ -76,7 +76,7 @@ import { Entity, Fields } from 'remult'
   allowApiCrud: true,
 })
 export class Product {
-  @Fields.cuid()
+  @Fields.id()
   id = ''
 
   @Fields.string()
@@ -166,7 +166,7 @@ import { Entity, Fields, Validators } from 'remult'
   allowApiCrud: true,
 })
 export class Product {
-  @Fields.cuid()
+  @Fields.id()
   id = ''
 
   @Fields.string({

package/SseSubscriptionServer.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clientConnection = exports.SseSubscriptionServer = void 0;
 var tslib_1 = require("tslib");
-var uuid_1 = require("uuid");
 var SseSubscriptionClient_js_1 = require("./src/live-query/SseSubscriptionClient.js");
 var SseSubscriptionServer = /** @class */ (function () {
     function SseSubscriptionServer(canUserConnectToChannel) {
@@ -113,7 +112,7 @@ var clientConnection = /** @class */ (function () {
         this.response = response;
         this.channels = {};
         this.closed = false;
-        this.connectionId = (0, uuid_1.v4)();
+        this.connectionId = crypto.randomUUID();
         this.write(this.connectionId, 'connectionId');
         this.sendLiveMessage();
     }

package/async-hooks.d.ts

@@ -1 +1,26 @@
-export { initAsyncHooks } from './server/initAsyncHooks.js';
+/**
+ * Initializes and enables async context tracking for the server.
+ *
+ * This should be called before handling any incoming requests or calling `withRemult()`.
+ * @example
+ * import { remult, repo, withRemult } from 'remult';
+ * import { initAsyncHooks } from 'remult/async-hooks';
+ *
+ * import { Task } from './entities/Task.js';
+ *
+ * initAsyncHooks();
+ *
+ * // Thx to the `initAsyncHooks` above,
+ * // we have isolated async contexts with multiple `withRemult()`,
+ * // without needing to initialize a `remultApi` all the time!
+ * withRemult(async () => {
+ *     remult.user = { id: '42' };
+ *     repo(Task).find()
+ * });
+ *
+ * withRemult(async () => {
+ *     remult.user = { id: '21' };
+ *     repo(Task).find()
+ * });
+ */
+export declare function initAsyncHooks(): void;

package/async-hooks.js

@@ -1,5 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initAsyncHooks = void 0;
+exports.initAsyncHooks = initAsyncHooks;
+var context_js_1 = require("./src/context.js");
 var initAsyncHooks_js_1 = require("./server/initAsyncHooks.js");
-Object.defineProperty(exports, "initAsyncHooks", { enumerable: true, get: function () { return initAsyncHooks_js_1.initAsyncHooks; } });
+/**
+ * Initializes and enables async context tracking for the server.
+ *
+ * This should be called before handling any incoming requests or calling `withRemult()`.
+ * @example
+ * import { remult, repo, withRemult } from 'remult';
+ * import { initAsyncHooks } from 'remult/async-hooks';
+ *
+ * import { Task } from './entities/Task.js';
+ *
+ * initAsyncHooks();
+ *
+ * // Thx to the `initAsyncHooks` above,
+ * // we have isolated async contexts with multiple `withRemult()`,
+ * // without needing to initialize a `remultApi` all the time!
+ * withRemult(async () => {
+ *     remult.user = { id: '42' };
+ *     repo(Task).find()
+ * });
+ *
+ * withRemult(async () => {
+ *     remult.user = { id: '21' };
+ *     repo(Task).find()
+ * });
+ */
+function initAsyncHooks() {
+    (0, initAsyncHooks_js_1.initAsyncHooks)();
+    context_js_1.RemultAsyncLocalStorage.enable();
+}

package/esm/SseSubscriptionServer.js

@@ -1,4 +1,3 @@
-import { v4 as uuid } from 'uuid';
 import { ConnectionNotFoundError } from './src/live-query/SseSubscriptionClient.js';
 export class SseSubscriptionServer {
     canUserConnectToChannel;
@@ -90,7 +89,7 @@ export class clientConnection {
         if (this.response.flush)
             this.response.flush();
     }
-    connectionId = uuid();
+    connectionId = crypto.randomUUID();
     constructor(response) {
         this.response = response;
         this.write(this.connectionId, 'connectionId');

package/esm/async-hooks.js

@@ -1 +1,31 @@
-export { initAsyncHooks } from './server/initAsyncHooks.js';
+import { RemultAsyncLocalStorage } from './src/context.js';
+import { initAsyncHooks as _initAsyncHooks } from './server/initAsyncHooks.js';
+/**
+ * Initializes and enables async context tracking for the server.
+ *
+ * This should be called before handling any incoming requests or calling `withRemult()`.
+ * @example
+ * import { remult, repo, withRemult } from 'remult';
+ * import { initAsyncHooks } from 'remult/async-hooks';
+ *
+ * import { Task } from './entities/Task.js';
+ *
+ * initAsyncHooks();
+ *
+ * // Thx to the `initAsyncHooks` above,
+ * // we have isolated async contexts with multiple `withRemult()`,
+ * // without needing to initialize a `remultApi` all the time!
+ * withRemult(async () => {
+ *     remult.user = { id: '42' };
+ *     repo(Task).find()
+ * });
+ *
+ * withRemult(async () => {
+ *     remult.user = { id: '21' };
+ *     repo(Task).find()
+ * });
+ */
+export function initAsyncHooks() {
+    _initAsyncHooks();
+    RemultAsyncLocalStorage.enable();
+}

package/esm/remult-express.js

@@ -8,15 +8,24 @@ export function remultApi(options) {
     if (options.bodySizeLimit === undefined) {
         options.bodySizeLimit = '10mb';
     }
+    const expressVersion = typeof app.del === 'function' ? 4 : 5;
     if (options?.bodyParser !== false) {
         app.use(express.json({ limit: options.bodySizeLimit }));
         app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
     }
     const server = createRemultServer(options, {
-        buildGenericRequestInfo: (req) => ({
-            internal: { ...req, on: req.on },
-            public: { headers: new Headers(req.headers) },
-        }),
+        buildGenericRequestInfo: (req) => {
+            const internal = { ...req, on: req.on };
+            if (expressVersion === 5) {
+                if (!internal.query) {
+                    internal.query = req.query;
+                }
+            }
+            return {
+                internal,
+                public: { headers: new Headers(req.headers) },
+            };
+        },
         getRequestBody: async (req) => req.body,
     });
     server.registerRouter(app);