@dyrected/core 2.5.24 → 2.5.25

package/dist/server.cjs

@@ -109,7 +109,33 @@ var PopulationService = class {
     }
     const populatedDoc = { ...data };
     for (const field of fields) {
-      if (field.type === "join") continue;
+      if (field.type === "join" && field.collection && field.on && currentDepth === 0) {
+        const targetCollection = this.collections.find((c) => c.slug === field.collection);
+        if (targetCollection) {
+          const docId = populatedDoc.id;
+          if (docId) {
+            const where = { [field.on]: { equals: docId } };
+            const joinLimit = field.limit ?? 10;
+            const result = await this.db.find({
+              collection: field.collection,
+              where,
+              limit: joinLimit
+            });
+            const populatedDocs = await this.populate({
+              data: result.docs.map((doc) => DefaultsService.apply(targetCollection.fields, doc)),
+              fields: targetCollection.fields,
+              currentDepth: 1,
+              maxDepth
+            });
+            populatedDoc[field.name] = {
+              docs: populatedDocs,
+              hasNextPage: result.page * result.limit < result.total,
+              totalDocs: result.total
+            };
+          }
+        }
+        continue;
+      }
       if (field.type === "row" && field.fields) {
         const rowPopulated = await this.populate({ data, fields: field.fields, currentDepth, maxDepth });
         Object.assign(populatedDoc, rowPopulated);
@@ -294,7 +320,7 @@ async function runCollectionHooks(hooks, args, options = {}) {
   }
   return currentPayload;
 }
-async function executeFieldBeforeChange(fields, data, originalDoc, user) {
+async function executeFieldBeforeChange(fields, data, originalDoc, user, db) {
   if (!data || typeof data !== "object") return data;
   const result = { ...data };
   for (const field of fields) {
@@ -308,7 +334,8 @@ async function executeFieldBeforeChange(fields, data, originalDoc, user) {
           value: updatedValue,
           originalDoc: originalDoc ?? void 0,
           data: result,
-          user
+          user,
+          db
         });
       }
       result[field.name] = updatedValue;
@@ -319,7 +346,8 @@ async function executeFieldBeforeChange(fields, data, originalDoc, user) {
           field.fields,
           updatedValue,
           origValue,
-          user
+          user,
+          db
         );
       } else if (field.type === "array" && field.fields && Array.isArray(updatedValue)) {
         const arrayResult = [];
@@ -327,7 +355,7 @@ async function executeFieldBeforeChange(fields, data, originalDoc, user) {
           const item = updatedValue[i];
           const origItem = Array.isArray(origValue) ? origValue[i] : null;
           arrayResult.push(
-            await executeFieldBeforeChange(field.fields, item, origItem, user)
+            await executeFieldBeforeChange(field.fields, item, origItem, user, db)
           );
         }
         result[field.name] = arrayResult;
@@ -345,7 +373,8 @@ async function executeFieldBeforeChange(fields, data, originalDoc, user) {
                 blockConfig.fields,
                 blockData,
                 origBlock,
-                user
+                user,
+                db
               )
             );
           } else {
@@ -358,7 +387,7 @@ async function executeFieldBeforeChange(fields, data, originalDoc, user) {
   }
   return result;
 }
-async function executeFieldAfterRead(fields, doc, user) {
+async function executeFieldAfterRead(fields, doc, user, db) {
   if (!doc || typeof doc !== "object") return doc;
   const result = { ...doc };
   for (const field of fields) {
@@ -370,7 +399,8 @@ async function executeFieldAfterRead(fields, doc, user) {
         updatedValue = await hook({
           value: updatedValue,
           doc: result,
-          user
+          user,
+          db
         });
       }
       result[field.name] = updatedValue;
@@ -380,7 +410,8 @@ async function executeFieldAfterRead(fields, doc, user) {
         result[field.name] = await executeFieldAfterRead(
           field.fields,
           updatedValue,
-          user
+          user,
+          db
         );
       } else if (field.type === "array" && field.fields && Array.isArray(updatedValue)) {
         const arrayResult = [];
@@ -389,7 +420,8 @@ async function executeFieldAfterRead(fields, doc, user) {
             await executeFieldAfterRead(
               field.fields,
               item,
-              user
+              user,
+              db
             )
           );
         }
@@ -406,7 +438,8 @@ async function executeFieldAfterRead(fields, doc, user) {
               await executeFieldAfterRead(
                 blockConfig.fields,
                 typedBlock,
-                user
+                user,
+                db
               )
             );
           } else {
@@ -420,6 +453,23 @@ async function executeFieldAfterRead(fields, doc, user) {
   return result;
 }
 
+// src/utils/readonly-db.ts
+var WRITE_METHODS = ["create", "update", "delete", "updateGlobal", "execute"];
+function createReadonlyDb(db) {
+  return new Proxy(db, {
+    get(target, prop) {
+      if (WRITE_METHODS.includes(prop)) {
+        return () => {
+          throw new Error(
+            `[dyrected] Write operation "${String(prop)}" is not allowed in this hook phase. Use afterChange/afterDelete hooks for write operations.`
+          );
+        };
+      }
+      return Reflect.get(target, prop);
+    }
+  });
+}
+
 // src/controllers/collection.controller.ts
 var CollectionController = class {
   collection;
@@ -430,6 +480,7 @@ var CollectionController = class {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const limit = Number(c.req.query("limit")) || 10;
     const page = Number(c.req.query("page")) || 1;
     const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 2;
@@ -446,7 +497,8 @@ var CollectionController = class {
     const beforeReadResult = await runCollectionHooks(this.collection.hooks?.beforeRead, {
       req: c.req,
       query: where,
-      user
+      user,
+      db: readonlyDb
     });
     if (beforeReadResult !== void 0) {
       where = beforeReadResult;
@@ -477,9 +529,10 @@ var CollectionController = class {
       const docWithCollectionHooks = await runCollectionHooks(this.collection.hooks?.afterRead, {
         doc,
         req: c.req,
-        user
+        user,
+        db: readonlyDb
       });
-      const docWithFieldHooks = await executeFieldAfterRead(this.collection.fields, docWithCollectionHooks, user);
+      const docWithFieldHooks = await executeFieldAfterRead(this.collection.fields, docWithCollectionHooks, user, readonlyDb);
       processedDocs.push(docWithFieldHooks);
     }
     result.docs = processedDocs;
@@ -493,6 +546,7 @@ var CollectionController = class {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const id = c.req.param("id");
     const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 10;
     const user = c.get("user");
@@ -503,9 +557,10 @@ var CollectionController = class {
     const docWithCollectionHooks = await runCollectionHooks(this.collection.hooks?.afterRead, {
       doc: docWithDefaults,
       req: c.req,
-      user
+      user,
+      db: readonlyDb
     });
-    const docWithFieldHooks = await executeFieldAfterRead(this.collection.fields, docWithCollectionHooks, user);
+    const docWithFieldHooks = await executeFieldAfterRead(this.collection.fields, docWithCollectionHooks, user, readonlyDb);
     if (depth > 0 && docWithFieldHooks) {
       const populationService = new PopulationService(db, config.collections);
       const populatedDoc = await populationService.populate({
@@ -522,6 +577,7 @@ var CollectionController = class {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const contentType = c.req.header("Content-Type") || "";
     if (contentType.toLowerCase().includes("multipart/form-data")) {
       return this.upload(c);
@@ -539,12 +595,13 @@ var CollectionController = class {
     if (this.collection.auth && data.password) {
       data.password = await hashPassword(data.password);
     }
-    data = await executeFieldBeforeChange(this.collection.fields, data, null, user);
+    data = await executeFieldBeforeChange(this.collection.fields, data, null, user, readonlyDb);
     data = await runCollectionHooks(this.collection.hooks?.beforeChange, {
       data,
       req: c.req,
       user,
-      operation: "create"
+      operation: "create",
+      db: readonlyDb
     });
     const doc = await db.create({ collection: this.collection.slug, data });
     if (this.collection.audit && db) {
@@ -561,20 +618,25 @@ var CollectionController = class {
       doc,
       user,
       req: c.req,
-      operation: "create"
+      operation: "create",
+      db
     }, { isolated: true });
     const readDoc = await runCollectionHooks(this.collection.hooks?.afterRead, {
       doc,
       req: c.req,
-      user
+      user,
+      db: readonlyDb
     });
-    const finalDoc = await executeFieldAfterRead(this.collection.fields, readDoc, user);
+    const finalDoc = await executeFieldAfterRead(this.collection.fields, readDoc, user, readonlyDb);
     return c.json(finalDoc, 201);
   }
   async upload(c) {
     const config = c.get("config");
     const storage = config.storage;
     if (!storage) return c.json({ message: "Storage not configured" }, 500);
+    const db = config.db;
+    if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const formData = await c.req.formData();
     const file = formData.get("file");
     if (!file) return c.json({ message: "No file uploaded" }, 400);
@@ -604,14 +666,15 @@ var CollectionController = class {
       createdBy: user?.sub ?? null,
       updatedBy: user?.sub ?? null
     };
-    data = await executeFieldBeforeChange(this.collection.fields, data, null, user);
+    data = await executeFieldBeforeChange(this.collection.fields, data, null, user, readonlyDb);
     data = await runCollectionHooks(this.collection.hooks?.beforeChange, {
       data,
       req: c.req,
       user,
-      operation: "create"
+      operation: "create",
+      db: readonlyDb
     });
-    const doc = await config.db.create({
+    const doc = await db.create({
       collection: this.collection.slug,
       data
     });
@@ -619,20 +682,23 @@ var CollectionController = class {
       doc,
       user,
       req: c.req,
-      operation: "create"
+      operation: "create",
+      db
     }, { isolated: true });
     const readDoc = await runCollectionHooks(this.collection.hooks?.afterRead, {
       doc,
       req: c.req,
-      user
+      user,
+      db: readonlyDb
     });
-    const finalDoc = await executeFieldAfterRead(this.collection.fields, readDoc, user);
+    const finalDoc = await executeFieldAfterRead(this.collection.fields, readDoc, user, readonlyDb);
     return c.json(finalDoc, 201);
   }
   async update(c) {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const id = c.req.param("id");
     if (!id) return c.json({ message: "Missing ID" }, 400);
     const body = await c.req.json();
@@ -653,13 +719,14 @@ var CollectionController = class {
     if (this.collection.audit) {
       before = originalDoc;
     }
-    data = await executeFieldBeforeChange(this.collection.fields, data, originalDoc, user);
+    data = await executeFieldBeforeChange(this.collection.fields, data, originalDoc, user, readonlyDb);
     data = await runCollectionHooks(this.collection.hooks?.beforeChange, {
       data,
       doc: originalDoc,
       req: c.req,
       user,
-      operation: "update"
+      operation: "update",
+      db: readonlyDb
     });
     const doc = await db.update({ collection: this.collection.slug, id, data });
     if (this.collection.audit && db) {
@@ -677,14 +744,16 @@ var CollectionController = class {
       previousDoc: originalDoc,
       user,
       req: c.req,
-      operation: "update"
+      operation: "update",
+      db
     }, { isolated: true });
     const readDoc = await runCollectionHooks(this.collection.hooks?.afterRead, {
       doc,
       req: c.req,
-      user
+      user,
+      db: readonlyDb
     });
-    const finalDoc = await executeFieldAfterRead(this.collection.fields, readDoc, user);
+    const finalDoc = await executeFieldAfterRead(this.collection.fields, readDoc, user, readonlyDb);
     return c.json(finalDoc);
   }
   /**
@@ -762,6 +831,7 @@ var CollectionController = class {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const id = c.req.param("id");
     if (!id) return c.json({ message: "Missing ID" }, 400);
     const user = c.get("user");
@@ -775,7 +845,8 @@ var CollectionController = class {
       id,
       doc,
       user,
-      req: c.req
+      req: c.req,
+      db: readonlyDb
     });
     await db.delete({ collection: this.collection.slug, id });
     if (this.collection.audit && db) {
@@ -792,7 +863,8 @@ var CollectionController = class {
       id,
       doc,
       user,
-      req: c.req
+      req: c.req,
+      db
     }, { isolated: true });
     return c.json({ message: "Deleted" });
   }
@@ -800,6 +872,7 @@ var CollectionController = class {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const user = c.get("user");
     let ids = [];
     try {
@@ -831,7 +904,8 @@ var CollectionController = class {
           id,
           doc,
           user,
-          req: c.req
+          req: c.req,
+          db: readonlyDb
         });
         await db.delete({ collection: this.collection.slug, id });
         deleted.push(id);
@@ -849,7 +923,8 @@ var CollectionController = class {
           id,
           doc,
           user,
-          req: c.req
+          req: c.req,
+          db
         }, { isolated: true });
       } catch (err) {
         failed.push({ id, error: err?.message ?? "Unknown error" });
@@ -894,13 +969,15 @@ var GlobalController = class {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 10;
     const user = c.get("user");
     let query = void 0;
     const beforeReadResult = await runCollectionHooks(this.global.hooks?.beforeRead, {
       req: c.req,
       query,
-      user
+      user,
+      db: readonlyDb
     });
     if (beforeReadResult !== void 0) {
       query = beforeReadResult;
@@ -916,9 +993,10 @@ var GlobalController = class {
     const docWithCollectionHooks = await runCollectionHooks(this.global.hooks?.afterRead, {
       doc: dataWithDefaults,
       req: c.req,
-      user
+      user,
+      db: readonlyDb
     });
-    const docWithFieldHooks = await executeFieldAfterRead(this.global.fields, docWithCollectionHooks, user);
+    const docWithFieldHooks = await executeFieldAfterRead(this.global.fields, docWithCollectionHooks, user, readonlyDb);
     if (depth > 0 && docWithFieldHooks) {
       const populationService = new PopulationService(db, config.collections);
       const populatedData = await populationService.populate({
@@ -932,18 +1010,21 @@ var GlobalController = class {
     return c.json(docWithFieldHooks);
   }
   async update(c) {
-    const db = c.get("config").db;
+    const config = c.get("config");
+    const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
+    const readonlyDb = createReadonlyDb(db);
     const body = await c.req.json();
     const user = c.get("user");
     const originalDoc = await db.getGlobal({ slug: this.global.slug }) || {};
-    let data = await executeFieldBeforeChange(this.global.fields, body, originalDoc, user);
+    let data = await executeFieldBeforeChange(this.global.fields, body, originalDoc, user, readonlyDb);
     data = await runCollectionHooks(this.global.hooks?.beforeChange, {
       data,
       doc: originalDoc,
       req: c.req,
       user,
-      operation: "update"
+      operation: "update",
+      db: readonlyDb
     });
     const updated = await db.updateGlobal({ slug: this.global.slug, data });
     await runCollectionHooks(this.global.hooks?.afterChange, {
@@ -951,14 +1032,16 @@ var GlobalController = class {
       previousDoc: originalDoc,
       user,
       req: c.req,
-      operation: "update"
+      operation: "update",
+      db
     }, { isolated: true });
     const readDoc = await runCollectionHooks(this.global.hooks?.afterRead, {
       doc: updated,
       req: c.req,
-      user
+      user,
+      db: readonlyDb
     });
-    const finalDoc = await executeFieldAfterRead(this.global.fields, readDoc, user);
+    const finalDoc = await executeFieldAfterRead(this.global.fields, readDoc, user, readonlyDb);
     return c.json(finalDoc);
   }
   async seed(c) {
@@ -2207,6 +2290,9 @@ function registerRoutes(app, config) {
         hasMany: f.hasMany,
         fields: f.fields,
         blocks: f.blocks,
+        collection: f.collection,
+        on: f.on,
+        limit: f.limit,
         admin: f.admin,
         access: {
           read: await serializeAccess(f.access?.read),
@@ -2235,6 +2321,9 @@ function registerRoutes(app, config) {
         hasMany: f.hasMany,
         fields: f.fields,
         blocks: f.blocks,
+        collection: f.collection,
+        on: f.on,
+        limit: f.limit,
         admin: f.admin,
         access: {
           read: await serializeAccess(f.access?.read),

package/dist/server.d.cts

@@ -1,5 +1,5 @@
-import { p as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-C-HgyliB.cjs';
-export { M as createDyrectedApp } from './app-C-HgyliB.cjs';
+import { p as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-BibuoHQG.cjs';
+export { M as createDyrectedApp } from './app-BibuoHQG.cjs';
 import * as hono from 'hono';
 import { Hono, Context } from 'hono';
 import * as hono_utils_http_status from 'hono/utils/http-status';

package/dist/server.d.ts

@@ -1,5 +1,5 @@
-import { p as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-C-HgyliB.js';
-export { M as createDyrectedApp } from './app-C-HgyliB.js';
+import { p as DyrectedContext, D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-BibuoHQG.js';
+export { M as createDyrectedApp } from './app-BibuoHQG.js';
 import * as hono from 'hono';
 import { Hono, Context } from 'hono';
 import * as hono_utils_http_status from 'hono/utils/http-status';

package/dist/server.js

@@ -6,7 +6,7 @@ import {
   PreviewController,
   createDyrectedApp,
   registerRoutes
-} from "./chunk-TUUHGLB5.js";
+} from "./chunk-FDQYPPG3.js";
 export {
   AuthController,
   CollectionController,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/core",
-  "version": "2.5.24",
+  "version": "2.5.25",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",