opacacms 0.1.20 → 0.2.0

package/dist/{chunk-wq314kkx.js → chunk-d1asgtke.js}

@@ -3,18 +3,18 @@ import {
   flattenPayload,
   pushSchema,
   unflattenRow
-} from "./chunk-xtwc125q.js";
+} from "./chunk-dykn5hr6.js";
 import {
   BaseDatabaseAdapter
 } from "./chunk-s8mqwnm1.js";
-import {
-  logger
-} from "./chunk-62ev8gnc.js";
 import {
   flattenFields,
   getRelationalFields,
   toSnakeCase
-} from "./chunk-2kyhqvhc.js";
+} from "./chunk-qxt9vge8.js";
+import {
+  logger
+} from "./chunk-t0zg026p.js";
 
 // src/db/d1.ts
 import fs from "node:fs/promises";
@@ -127,19 +127,11 @@ class D1Adapter extends BaseDatabaseAdapter {
     const dbFields = flattenFields(colDef?.fields || []);
     const validCols = new Set(dbFields.map((f) => toSnakeCase(f.name)));
     validCols.add("id");
-    const ts = colDef?.timestamps !== false;
-    if (ts) {
-      const config = typeof colDef?.timestamps === "object" ? colDef.timestamps : {};
-      const createdAtField = toSnakeCase(config.createdAt || "createdAt");
-      const updatedAtField = toSnakeCase(config.updatedAt || "updatedAt");
-      const now = new Date().toISOString();
-      if (!flatData[createdAtField])
-        flatData[createdAtField] = now;
-      if (!flatData[updatedAtField])
-        flatData[updatedAtField] = now;
-      validCols.add(createdAtField);
-      validCols.add(updatedAtField);
-    }
+    validCols.add(toSnakeCase("createdAt"));
+    validCols.add(toSnakeCase("updatedAt"));
+    const now = new Date().toISOString();
+    flatData[toSnakeCase("createdAt")] = now;
+    flatData[toSnakeCase("updatedAt")] = now;
     const filteredData = {};
     for (const col of Object.keys(flatData)) {
       if (validCols.has(col)) {
@@ -272,7 +264,87 @@ class D1Adapter extends BaseDatabaseAdapter {
       qb = qb.orderBy("created_at", "desc");
     }
     const rows = await qb.execute();
-    const docs = await Promise.all(rows.map((row) => this.findOne(collection, { id: row.id })));
+    if (rows.length === 0) {
+      const totalPages2 = Math.ceil(total / limit);
+      return {
+        docs: [],
+        totalDocs: total,
+        limit,
+        totalPages: totalPages2,
+        page,
+        pagingCounter: offset + 1,
+        hasNextPage: page * limit < total,
+        hasPrevPage: page > 1,
+        prevPage: page > 1 ? page - 1 : null,
+        nextPage: page < totalPages2 ? page + 1 : null
+      };
+    }
+    const rowIds = rows.map((r) => r.id);
+    const docs = rows.map((r) => unflattenRow(r));
+    const colDef = this._collections.find((c) => c.slug === collection);
+    if (colDef) {
+      const relationalFields = getRelationalFields(colDef.fields);
+      for (const field of relationalFields) {
+        if (!field.name)
+          continue;
+        const snakeName = toSnakeCase(field.name);
+        if (field.type === "relationship" && "hasMany" in field && field.hasMany) {
+          const joinTableName = `${toSnakeCase(collection)}_${snakeName}_relations`.toLowerCase();
+          try {
+            const allRelations = await this._db.selectFrom(joinTableName).selectAll().where("source_id", "in", rowIds).orderBy("order", "asc").execute();
+            const relationsBySource = allRelations.reduce((acc, r) => {
+              if (!acc[r.source_id])
+                acc[r.source_id] = [];
+              acc[r.source_id].push(r.target_id);
+              return acc;
+            }, {});
+            const parts = field.name.split("__");
+            for (let docIdx = 0;docIdx < docs.length; docIdx++) {
+              const rowId = rowIds[docIdx];
+              let current = docs[docIdx];
+              for (let i = 0;i < parts.length - 1; i++) {
+                if (!current[parts[i]])
+                  current[parts[i]] = {};
+                current = current[parts[i]];
+              }
+              current[parts[parts.length - 1]] = relationsBySource[rowId] || [];
+            }
+          } catch (e) {}
+        } else if (field.type === "blocks" && field.blocks) {
+          const blocksBySource = {};
+          for (const b of field.blocks) {
+            const blockTableName = `${collection}_${snakeName}_${toSnakeCase(b.slug)}`.toLowerCase();
+            try {
+              const allBlocks = await this._db.selectFrom(blockTableName).selectAll().where("_parent_id", "in", rowIds).execute();
+              for (const blk of allBlocks) {
+                const uf = unflattenRow(blk);
+                uf.blockType = blk.block_type;
+                if (!blocksBySource[blk._parent_id])
+                  blocksBySource[blk._parent_id] = [];
+                blocksBySource[blk._parent_id].push(uf);
+              }
+            } catch (e) {}
+          }
+          const parts = field.name.split("__");
+          for (let docIdx = 0;docIdx < docs.length; docIdx++) {
+            const rowId = rowIds[docIdx];
+            const blockData = blocksBySource[rowId] || [];
+            blockData.sort((a, b) => a._order - b._order);
+            blockData.forEach((b) => {
+              delete b._order;
+              delete b._parentId;
+            });
+            let current = docs[docIdx];
+            for (let i = 0;i < parts.length - 1; i++) {
+              if (!current[parts[i]])
+                current[parts[i]] = {};
+              current = current[parts[i]];
+            }
+            current[parts[parts.length - 1]] = blockData;
+          }
+        }
+      }
+    }
     const totalPages = Math.ceil(total / limit);
     return {
       docs: docs.filter(Boolean),
@@ -515,21 +587,12 @@ class D1Adapter extends BaseDatabaseAdapter {
     const existing = await this.findGlobal(slug);
     const flatData = flattenPayload(data);
     const globalDef = this._globals.find((g) => g.slug === slug);
-    const ts = globalDef?.timestamps !== false;
-    if (ts) {
-      const config = typeof globalDef?.timestamps === "object" ? globalDef.timestamps : {};
-      const updatedField = toSnakeCase(config.updatedAt || "updatedAt");
-      flatData[updatedField] = new Date().toISOString();
-    }
+    const now = new Date().toISOString();
+    flatData[toSnakeCase("updatedAt")] = now;
     if (!existing) {
       if (!flatData.id)
         flatData.id = "global";
-      if (ts) {
-        const config = typeof globalDef?.timestamps === "object" ? globalDef.timestamps : {};
-        const createdField = toSnakeCase(config.createdAt || "createdAt");
-        if (!flatData[createdField])
-          flatData[createdField] = flatData[toSnakeCase(config.updatedAt || "updatedAt")];
-      }
+      flatData[toSnakeCase("createdAt")] = now;
       await this._db.insertInto(tableName).values(flatData).execute();
     } else {
       await this._db.updateTable(tableName).set(flatData).where("id", "=", existing.id).execute();

package/dist/{chunk-xtwc125q.js → chunk-dykn5hr6.js}

@@ -1,23 +1,23 @@
-import {
-  logger
-} from "./chunk-62ev8gnc.js";
 import {
   flattenFields,
   getRelationalFields,
   mapFieldToPostgresType,
   mapFieldToSQLiteType,
   toSnakeCase
-} from "./chunk-2kyhqvhc.js";
+} from "./chunk-qxt9vge8.js";
 import {
   getSystemCollections,
   init_system_schema
-} from "./chunk-ybbbqj63.js";
+} from "./chunk-v9z61v3g.js";
+import {
+  logger
+} from "./chunk-t0zg026p.js";
 
 // src/db/kysely/data-mapper.ts
 function toCamelCase(str) {
   if (str.startsWith("_"))
     return str;
-  return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+  return str.replace(/_+([a-z])/g, (_, letter) => letter.toUpperCase());
 }
 function flattenPayload(payload, prefix = "", excludeKeys = []) {
   if (typeof payload !== "object" || payload === null || Array.isArray(payload))
@@ -39,7 +39,7 @@ function flattenPayload(payload, prefix = "", excludeKeys = []) {
         if (value === undefined)
           continue;
         const colName = `${prefix}${toSnakeCase(key)}`;
-        if (typeof value === "object" && value !== null) {
+        if (typeof value === "object" && value !== null && !(value instanceof Date)) {
           result[colName] = JSON.stringify(value);
         } else {
           result[colName] = value;
@@ -240,7 +240,7 @@ async function pushSchema(db, dialect, collections, globals = [], options = {})
     assertSafeIdentifier(tableName);
     expectedTableNames.add(tableName);
     const flattenedFields = flattenFields(collection.fields);
-    const hasTimestamps = collection.timestamps !== false;
+    const hasTimestamps = true;
     const versions = collection.versions;
     if (!existingTableSet.has(tableName)) {
       logger.info(`  -> Creating table: ${logger.format("green", `"${tableName}"`)}`);

package/dist/{chunk-pxh5encs.js → chunk-esrg9qj0.js}

@@ -3,16 +3,17 @@ import {
   flattenPayload,
   pushSchema,
   unflattenRow
-} from "./chunk-xtwc125q.js";
+} from "./chunk-dykn5hr6.js";
 import {
   BaseDatabaseAdapter
 } from "./chunk-s8mqwnm1.js";
 import {
-  logger
-} from "./chunk-62ev8gnc.js";
-import {
+  getRelationalFields,
   toSnakeCase
-} from "./chunk-2kyhqvhc.js";
+} from "./chunk-qxt9vge8.js";
+import {
+  logger
+} from "./chunk-t0zg026p.js";
 import {
   __require
 } from "./chunk-8sqjbsgt.js";
@@ -131,16 +132,13 @@ class PostgresAdapter extends BaseDatabaseAdapter {
       }
       if (!flatData.id)
         flatData.id = crypto.randomUUID();
-      const ts = colDef?.timestamps !== false;
-      if (ts) {
-        const config = typeof colDef?.timestamps === "object" ? colDef.timestamps : {};
-        const createdField = toSnakeCase(config.createdAt || "createdAt");
-        const updatedField = toSnakeCase(config.updatedAt || "updatedAt");
-        if (!flatData[createdField])
-          flatData[createdField] = new Date().toISOString();
-        if (!flatData[updatedField])
-          flatData[updatedField] = new Date().toISOString();
-      }
+      const now = new Date().toISOString();
+      const createdKey = toSnakeCase("createdAt");
+      const updatedKey = toSnakeCase("updatedAt");
+      if (!flatData[createdKey])
+        flatData[createdKey] = now;
+      if (!flatData[updatedKey])
+        flatData[updatedKey] = now;
       await tx.insertInto(tableName).values(flatData).execute();
       for (const [key, values] of Object.entries(hasManyData)) {
         const joinTableName = `${tableName}_${toSnakeCase(key)}_relations`.toLowerCase();
@@ -187,8 +185,8 @@ class PostgresAdapter extends BaseDatabaseAdapter {
     const unflattened = unflattenRow(row);
     const colDef = this._collections.find((c) => c.slug === collection);
     if (colDef) {
-      const { getRelationalFields, toSnakeCase: toSnakeCase2 } = await import("./chunk-7fyepksb.js");
-      const relationalFields = getRelationalFields(colDef.fields);
+      const { getRelationalFields: getRelationalFields2, toSnakeCase: toSnakeCase2 } = await import("./chunk-526a3gqx.js");
+      const relationalFields = getRelationalFields2(colDef.fields);
       for (const field of relationalFields) {
         if (!field.name)
           continue;
@@ -258,7 +256,87 @@ class PostgresAdapter extends BaseDatabaseAdapter {
       qb = qb.orderBy("created_at", "desc");
     }
     const rows = await qb.execute();
-    const docs = await Promise.all(rows.map((row) => this.findOne(collection, { id: row.id })));
+    if (rows.length === 0) {
+      const totalPages2 = Math.ceil(total / limit);
+      return {
+        docs: [],
+        totalDocs: total,
+        limit,
+        totalPages: totalPages2,
+        page,
+        pagingCounter: offset + 1,
+        hasNextPage: page * limit < total,
+        hasPrevPage: page > 1,
+        prevPage: page > 1 ? page - 1 : null,
+        nextPage: page < totalPages2 ? page + 1 : null
+      };
+    }
+    const rowIds = rows.map((r) => r.id);
+    const docs = rows.map((r) => unflattenRow(r));
+    const colDef = this._collections.find((c) => c.slug === collection);
+    if (colDef) {
+      const relationalFields = getRelationalFields(colDef.fields);
+      for (const field of relationalFields) {
+        if (!field.name)
+          continue;
+        const snakeName = toSnakeCase(field.name);
+        if (field.type === "relationship" && "hasMany" in field && field.hasMany) {
+          const joinTableName = `${toSnakeCase(collection)}_${snakeName}_relations`.toLowerCase();
+          try {
+            const allRelations = await this._db.selectFrom(joinTableName).selectAll().where("source_id", "in", rowIds).orderBy("order", "asc").execute();
+            const relationsBySource = allRelations.reduce((acc, r) => {
+              if (!acc[r.source_id])
+                acc[r.source_id] = [];
+              acc[r.source_id].push(r.target_id);
+              return acc;
+            }, {});
+            const parts = field.name.split("__");
+            for (let docIdx = 0;docIdx < docs.length; docIdx++) {
+              const rowId = rowIds[docIdx];
+              let current = docs[docIdx];
+              for (let i = 0;i < parts.length - 1; i++) {
+                if (!current[parts[i]])
+                  current[parts[i]] = {};
+                current = current[parts[i]];
+              }
+              current[parts[parts.length - 1]] = relationsBySource[rowId] || [];
+            }
+          } catch (e) {}
+        } else if (field.type === "blocks" && field.blocks) {
+          const blocksBySource = {};
+          for (const b of field.blocks) {
+            const blockTableName = `${collection}_${snakeName}_${toSnakeCase(b.slug)}`.toLowerCase();
+            try {
+              const allBlocks = await this._db.selectFrom(blockTableName).selectAll().where("_parent_id", "in", rowIds).execute();
+              for (const blk of allBlocks) {
+                const uf = unflattenRow(blk);
+                uf.blockType = blk.block_type;
+                if (!blocksBySource[blk._parent_id])
+                  blocksBySource[blk._parent_id] = [];
+                blocksBySource[blk._parent_id].push(uf);
+              }
+            } catch (e) {}
+          }
+          const parts = field.name.split("__");
+          for (let docIdx = 0;docIdx < docs.length; docIdx++) {
+            const rowId = rowIds[docIdx];
+            const blockData = blocksBySource[rowId] || [];
+            blockData.sort((a, b) => a._order - b._order);
+            blockData.forEach((b) => {
+              delete b._order;
+              delete b._parentId;
+            });
+            let current = docs[docIdx];
+            for (let i = 0;i < parts.length - 1; i++) {
+              if (!current[parts[i]])
+                current[parts[i]] = {};
+              current = current[parts[i]];
+            }
+            current[parts[parts.length - 1]] = blockData;
+          }
+        }
+      }
+    }
     const totalPages = Math.ceil(total / limit);
     return {
       docs: docs.filter(Boolean),
@@ -300,12 +378,7 @@ class PostgresAdapter extends BaseDatabaseAdapter {
           delete flatData[key];
         }
       }
-      const ts = colDef?.timestamps !== false;
-      if (ts) {
-        const config = typeof colDef?.timestamps === "object" ? colDef.timestamps : {};
-        const updatedField = toSnakeCase(config.updatedAt || "updatedAt");
-        flatData[updatedField] = new Date().toISOString();
-      }
+      flatData.updatedAt = new Date().toISOString();
       const tableName = toSnakeCase(collection);
       if (Object.keys(flatData).length > 0) {
         await tx.updateTable(tableName).set(flatData).where("id", "=", current.id).execute();
@@ -365,13 +438,7 @@ class PostgresAdapter extends BaseDatabaseAdapter {
           delete flatData[key];
         }
       }
-      const colDef = this._collections.find((c) => c.slug === collection);
-      const ts = colDef?.timestamps !== false;
-      if (ts) {
-        const config = typeof colDef?.timestamps === "object" ? colDef.timestamps : {};
-        const updatedField = toSnakeCase(config.updatedAt || "updatedAt");
-        flatData[updatedField] = new Date().toISOString();
-      }
+      flatData.updatedAt = new Date().toISOString();
       if (Object.keys(flatData).length > 0) {
         const result = await qb.set(flatData).executeTakeFirst();
         return Number(result.numUpdatedRows || 0);
@@ -465,21 +532,12 @@ class PostgresAdapter extends BaseDatabaseAdapter {
     const globalDef = this._globals.find((g) => g.slug === slug);
     const jsonFields = globalDef?.fields.filter((f) => f.name && (["richtext", "json", "file"].includes(f.type) || f.localized)).map((f) => f.name) || [];
     const flatData = flattenPayload(data, "", jsonFields);
-    const ts = globalDef?.timestamps !== false;
-    if (ts) {
-      const config = typeof globalDef?.timestamps === "object" ? globalDef.timestamps : {};
-      const updatedField = toSnakeCase(config.updatedAt || "updatedAt");
-      flatData[updatedField] = new Date().toISOString();
-    }
+    const now = new Date().toISOString();
+    flatData[toSnakeCase("updatedAt")] = now;
     if (!existing) {
       if (!flatData.id)
         flatData.id = "global";
-      if (ts) {
-        const config = typeof globalDef?.timestamps === "object" ? globalDef.timestamps : {};
-        const createdField = toSnakeCase(config.createdAt || "createdAt");
-        if (!flatData[createdField])
-          flatData[createdField] = new Date().toISOString();
-      }
+      flatData[toSnakeCase("createdAt")] = now;
       await this._db.insertInto(tableName).values(flatData).execute();
     } else {
       await this._db.updateTable(tableName).set(flatData).where("id", "=", existing.id).execute();
@@ -510,7 +568,7 @@ class PostgresAdapter extends BaseDatabaseAdapter {
     }
   }
   async migrate(collections, globals = []) {
-    const { getSystemCollections } = await import("./chunk-v521d72w.js");
+    const { getSystemCollections } = await import("./chunk-3rdhbedb.js");
     this._collections = [...getSystemCollections(), ...collections];
     this._globals = globals;
     if (this.push && this._db) {

package/dist/chunk-fj19qccp.js

@@ -0,0 +1,78 @@
+import {
+  pluginSyncCommand
+} from "./chunk-twpvxfce.js";
+import {
+  logger
+} from "./chunk-t0zg026p.js";
+import {
+  __require
+} from "./chunk-8sqjbsgt.js";
+
+// src/cli/commands/plugin-build.ts
+import fs from "node:fs";
+import path from "node:path";
+async function pluginBuildCommand(projectRoot) {
+  const srcDir = path.resolve(projectRoot, "src");
+  const distDir = path.resolve(projectRoot, "dist");
+  if (!fs.existsSync(srcDir)) {
+    logger.error(`No 'src' directory found in ${projectRoot}.`);
+    process.exit(1);
+  }
+  logger.info("Syncing plugin UI...");
+  await pluginSyncCommand(projectRoot, false);
+  const entryFiles = ["index.tsx", "index.ts", "plugin.tsx", "plugin.ts"];
+  let mainEntry = "";
+  for (const file of entryFiles) {
+    const fullPath = path.join(srcDir, file);
+    if (fs.existsSync(fullPath)) {
+      mainEntry = fullPath;
+      break;
+    }
+  }
+  if (!mainEntry) {
+    logger.error(`Could not find a main entry file in ${srcDir}`);
+    process.exit(1);
+  }
+  logger.info(`Building plugin entry: ${path.basename(mainEntry)}...`);
+  if (!fs.existsSync(distDir)) {
+    fs.mkdirSync(distDir, { recursive: true });
+  }
+  const buildResult = await Bun.build({
+    entrypoints: [mainEntry],
+    outdir: distDir,
+    target: "node",
+    format: "esm",
+    external: [
+      "opacacms",
+      "opacacms/types",
+      "opacacms/plugins",
+      "opacacms/schema",
+      "hono",
+      "zod",
+      "react",
+      "react-dom"
+    ]
+  });
+  if (!buildResult.success) {
+    logger.error("Plugin build failed.");
+    for (const msg of buildResult.logs) {
+      console.error(msg);
+    }
+    process.exit(1);
+  }
+  try {
+    logger.info("Generating type declarations...");
+    const { execSync } = await import("node:child_process");
+    execSync("bunx tsc --emitDeclarationOnly --outDir dist", {
+      cwd: projectRoot,
+      stdio: "ignore"
+    });
+    logger.success("Types generated.");
+  } catch (err) {
+    logger.warn("Failed to generate types. Make sure typescript is installed.");
+  }
+  logger.success(`Plugin built successfully in ${distDir}!`);
+}
+export {
+  pluginBuildCommand
+};

package/dist/{chunk-x2ejaftz.js → chunk-gmee4mdc.js}

@@ -3,17 +3,18 @@ import {
   flattenPayload,
   pushSchema,
   unflattenRow
-} from "./chunk-xtwc125q.js";
+} from "./chunk-dykn5hr6.js";
 import {
   BaseDatabaseAdapter
 } from "./chunk-s8mqwnm1.js";
-import {
-  logger
-} from "./chunk-62ev8gnc.js";
 import {
   flattenFields,
+  getRelationalFields,
   toSnakeCase
-} from "./chunk-2kyhqvhc.js";
+} from "./chunk-qxt9vge8.js";
+import {
+  logger
+} from "./chunk-t0zg026p.js";
 import {
   __require
 } from "./chunk-8sqjbsgt.js";
@@ -67,7 +68,7 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
     if (!colDef)
       return data;
     const result = { ...data };
-    const { flattenFields: flattenFields2 } = await import("./chunk-7fyepksb.js");
+    const { flattenFields: flattenFields2 } = await import("./chunk-526a3gqx.js");
     const allFields = flattenFields2(colDef.fields);
     for (const field of allFields) {
       const colName = toSnakeCase(field.name);
@@ -139,12 +140,11 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
       const dbFields = flattenFields(colDef?.fields || []);
       const validCols = new Set(dbFields.map((f) => toSnakeCase(f.name)));
       validCols.add("id");
-      const ts = colDef?.timestamps !== false;
-      if (ts) {
-        const config = typeof colDef?.timestamps === "object" ? colDef.timestamps : {};
-        validCols.add(toSnakeCase(config.createdAt || "createdAt"));
-        validCols.add(toSnakeCase(config.updatedAt || "updatedAt"));
-      }
+      validCols.add(toSnakeCase("createdAt"));
+      validCols.add(toSnakeCase("updatedAt"));
+      const now = new Date().toISOString();
+      flatData[toSnakeCase("createdAt")] = now;
+      flatData[toSnakeCase("updatedAt")] = now;
       const filteredData = {};
       for (const col of Object.keys(flatData)) {
         if (validCols.has(col)) {
@@ -205,8 +205,8 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
     const unflattened = unflattenRow(row);
     const colDef = this._collections.find((c) => c.slug === collection);
     if (colDef) {
-      const { getRelationalFields, toSnakeCase: toSnakeCase2 } = await import("./chunk-7fyepksb.js");
-      const relationalFields = getRelationalFields(colDef.fields);
+      const { getRelationalFields: getRelationalFields2, toSnakeCase: toSnakeCase2 } = await import("./chunk-526a3gqx.js");
+      const relationalFields = getRelationalFields2(colDef.fields);
       for (const field of relationalFields) {
         if (!field.name)
           continue;
@@ -259,7 +259,87 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
       qb = qb.orderBy("created_at", "desc");
     }
     const rows = await qb.execute();
-    const docs = await Promise.all(rows.map((row) => this.findOne(collection, { id: row.id })));
+    if (rows.length === 0) {
+      const totalPages2 = Math.ceil(total / limit);
+      return {
+        docs: [],
+        totalDocs: total,
+        limit,
+        totalPages: totalPages2,
+        page,
+        pagingCounter: offset + 1,
+        hasNextPage: page * limit < total,
+        hasPrevPage: page > 1,
+        prevPage: page > 1 ? page - 1 : null,
+        nextPage: page < totalPages2 ? page + 1 : null
+      };
+    }
+    const rowIds = rows.map((r) => r.id);
+    const docs = rows.map((r) => unflattenRow(r));
+    const colDef = this._collections.find((c) => c.slug === collection);
+    if (colDef) {
+      const relationalFields = getRelationalFields(colDef.fields);
+      for (const field of relationalFields) {
+        if (!field.name)
+          continue;
+        const snakeName = toSnakeCase(field.name);
+        if (field.type === "relationship" && "hasMany" in field && field.hasMany) {
+          const joinTableName = `${toSnakeCase(collection)}_${snakeName}_relations`.toLowerCase();
+          try {
+            const allRelations = await this._db.selectFrom(joinTableName).selectAll().where("source_id", "in", rowIds).orderBy("order", "asc").execute();
+            const relationsBySource = allRelations.reduce((acc, r) => {
+              if (!acc[r.source_id])
+                acc[r.source_id] = [];
+              acc[r.source_id].push(r.target_id);
+              return acc;
+            }, {});
+            const parts = field.name.split("__");
+            for (let docIdx = 0;docIdx < docs.length; docIdx++) {
+              const rowId = rowIds[docIdx];
+              let current = docs[docIdx];
+              for (let i = 0;i < parts.length - 1; i++) {
+                if (!current[parts[i]])
+                  current[parts[i]] = {};
+                current = current[parts[i]];
+              }
+              current[parts[parts.length - 1]] = relationsBySource[rowId] || [];
+            }
+          } catch (e) {}
+        } else if (field.type === "blocks" && field.blocks) {
+          const blocksBySource = {};
+          for (const b of field.blocks) {
+            const blockTableName = `${collection}_${snakeName}_${toSnakeCase(b.slug)}`.toLowerCase();
+            try {
+              const allBlocks = await this._db.selectFrom(blockTableName).selectAll().where("_parent_id", "in", rowIds).execute();
+              for (const blk of allBlocks) {
+                const uf = unflattenRow(blk);
+                uf.blockType = blk.block_type;
+                if (!blocksBySource[blk._parent_id])
+                  blocksBySource[blk._parent_id] = [];
+                blocksBySource[blk._parent_id].push(uf);
+              }
+            } catch (e) {}
+          }
+          const parts = field.name.split("__");
+          for (let docIdx = 0;docIdx < docs.length; docIdx++) {
+            const rowId = rowIds[docIdx];
+            const blockData = blocksBySource[rowId] || [];
+            blockData.sort((a, b) => a._order - b._order);
+            blockData.forEach((b) => {
+              delete b._order;
+              delete b._parentId;
+            });
+            let current = docs[docIdx];
+            for (let i = 0;i < parts.length - 1; i++) {
+              if (!current[parts[i]])
+                current[parts[i]] = {};
+              current = current[parts[i]];
+            }
+            current[parts[parts.length - 1]] = blockData;
+          }
+        }
+      }
+    }
     const totalPages = Math.ceil(total / limit);
     return {
       docs: docs.filter(Boolean),
@@ -464,21 +544,12 @@ class BetterSQLiteAdapter extends BaseDatabaseAdapter {
     const existing = await this.findGlobal(slug);
     const flatData = flattenPayload(data);
     const globalDef = this._globals.find((g) => g.slug === slug);
-    const ts = globalDef?.timestamps !== false;
-    if (ts) {
-      const config = typeof globalDef?.timestamps === "object" ? globalDef.timestamps : {};
-      const updatedField = toSnakeCase(config.updatedAt || "updatedAt");
-      flatData[updatedField] = new Date().toISOString();
-    }
+    const now = new Date().toISOString();
+    flatData[toSnakeCase("updatedAt")] = now;
     if (!existing) {
       if (!flatData.id)
         flatData.id = "global";
-      if (ts) {
-        const config = typeof globalDef?.timestamps === "object" ? globalDef.timestamps : {};
-        const createdField = toSnakeCase(config.createdAt || "createdAt");
-        if (!flatData[createdField])
-          flatData[createdField] = flatData[toSnakeCase(config.updatedAt || "updatedAt")];
-      }
+      flatData[toSnakeCase("createdAt")] = now;
       await this._db.insertInto(tableName).values(flatData).execute();
     } else {
       await this._db.updateTable(tableName).set(flatData).where("id", "=", existing.id).execute();