@zudojs/database 1.2.0 → 1.2.1

package/dist/cache/cache.memory.js

@@ -303,19 +303,24 @@ export async function getOrSet(cache, key, loader, options) {
     const pending = inflight.get(key);
     if (pending)
         return pending;
+    // The cleanup lives outside the promise: the body runs synchronously up to
+    // its first `await`, so a loader that throws synchronously would otherwise
+    // run the cleanup before the entry is registered and leave the rejected
+    // promise cached for the lifetime of the cache.
     const promise = (async () => {
-        try {
-            const value = await loader();
-            if (value !== undefined)
-                cache.set(key, value, options);
-            return value;
-        }
-        finally {
-            inflight.delete(key);
-        }
+        const value = await loader();
+        if (value !== undefined)
+            cache.set(key, value, options);
+        return value;
     })();
     inflight.set(key, promise);
-    return promise;
+    try {
+        return await promise;
+    }
+    finally {
+        if (inflight.get(key) === promise)
+            inflight.delete(key);
+    }
 }
 /**
  * Invalidates all entries whose keys start with a prefix.

package/dist/relations/relations.definition.js

@@ -84,6 +84,23 @@ export function validateInclude(include) {
         validateInclude(nested);
     }
 }
+/**
+ * Validates a single include level: its shape, relation name and select
+ * fields, leaving nested includes to the caller.
+ *
+ * `buildInclude` uses this so the depth bound applies per level — a
+ * recursive validation would walk the whole caller-supplied subtree before
+ * the depth guard could refuse it.
+ */
+function validateIncludeLevel(include) {
+    if (!include || typeof include !== "object") {
+        throw new TypeError("A relation include is required.");
+    }
+    validateRelationName(include.relation);
+    for (const field of include.select ?? []) {
+        validateFieldName(field);
+    }
+}
 /**
  * Translates relation includes into a Prisma `include` object.
  *
@@ -105,10 +122,13 @@ function buildInclude(includes, options, parent, depth, maxDepth, path) {
     if (depth > maxDepth) {
         throw new RangeError(`Relation include depth exceeds the maximum of ${maxDepth}.`);
     }
-    const result = {};
+    // A null-prototype accumulator: relation names such as `toString` or
+    // `__proto__` must behave as ordinary keys. It is spread into a plain
+    // object before it is returned.
+    const result = Object.create(null);
     for (const include of includes) {
-        validateInclude(include);
-        if (include.relation in result) {
+        validateIncludeLevel(include);
+        if (Object.hasOwn(result, include.relation)) {
             throw new TypeError(`Relation "${include.relation}" is included more than once.`);
         }
         let definition;
@@ -123,11 +143,11 @@ function buildInclude(includes, options, parent, depth, maxDepth, path) {
         }
         const entry = {};
         if (include.select && include.select.length > 0) {
-            const select = {};
+            const select = Object.create(null);
             for (const field of include.select) {
                 select[field] = true;
             }
-            entry["select"] = select;
+            entry["select"] = { ...select };
         }
         if (include.include && include.include.length > 0) {
             const nested = buildInclude(include.include, options, definition ? definition.child : undefined, depth + 1, maxDepth, definition ? [...path, definition] : path);
@@ -147,7 +167,7 @@ function buildInclude(includes, options, parent, depth, maxDepth, path) {
         }
         result[include.relation] = Object.keys(entry).length === 0 ? true : entry;
     }
-    return result;
+    return { ...result };
 }
 /**
  * Creates a nested relation include.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zudojs/database",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Database abstraction layer with clients, repositories, transactions, and query building for Zudojs applications.",
   "license": "MIT",
   "author": {
@@ -41,9 +41,9 @@
     "!dist/.tsbuildinfo"
   ],
   "dependencies": {
-    "@zudojs/errors": "1.1.0",
-    "@zudojs/logger": "1.2.0",
-    "@zudojs/types": "1.1.0"
+    "@zudojs/errors": "1.2.0",
+    "@zudojs/logger": "1.3.0",
+    "@zudojs/types": "1.1.1"
   },
   "peerDependencies": {
     "@prisma/client": ">=7.0.0 <8"