@bobbykim/manguito-cms-api 0.8.0 → 0.8.2

package/dist/index.mjs

@@ -38,7 +38,7 @@ function createVersionedPaths(prefix, version) {
 
 // src/app.ts
 import { Hono } from "hono";
-import { sql as sql10 } from "drizzle-orm";
+import { sql as sql11 } from "drizzle-orm";
 
 // src/middleware/cors.ts
 function createCorsMiddleware(corsConfig) {
@@ -1049,7 +1049,7 @@ function registerPublicMediaRoutes(app, mediaRepo, paths, listRateLimit) {
 }
 
 // src/routes/admin/content.ts
-import { sql as sql3 } from "drizzle-orm";
+import { sql as sql4 } from "drizzle-orm";
 
 // src/references-in-use.ts
 import { sql as sql2 } from "drizzle-orm";
@@ -1134,6 +1134,7 @@ async function applyMediaReferenceDelta(delta, mediaRepo) {
 }
 
 // src/relation-input.ts
+import { sql as sql3 } from "drizzle-orm";
 import { relationCardinality as relationCardinality2 } from "@bobbykim/manguito-cms-core";
 var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function isUuid(v) {
@@ -1178,15 +1179,91 @@ function checkRelationInput(fields, body, registry, path = "") {
   }
   return errors;
 }
+function paragraphItemsIn(fields, body, registry, path) {
+  const out = [];
+  for (const field of fields) {
+    if (field.field_type !== "paragraph" || !(field.name in body)) continue;
+    const comp = field.ui_component;
+    const pType = comp.component === "paragraph-embed" ? registry.paragraph_types[comp.ref] : void 0;
+    if (!pType) continue;
+    const value = body[field.name];
+    const name = `${path}${field.name}`;
+    if (relationCardinality2(field) === "one") {
+      if (isPlainObject(value)) out.push({ item: value, fields: pType.fields, prefix: `${name}.` });
+    } else if (Array.isArray(value)) {
+      value.forEach((item, i) => {
+        if (isPlainObject(item)) out.push({ item, fields: pType.fields, prefix: `${name}[${i}].` });
+      });
+    }
+  }
+  return out;
+}
+function isMissing(value) {
+  if (value === null || value === void 0) return true;
+  if (typeof value === "string" && value.trim() === "") return true;
+  if (Array.isArray(value) && value.length === 0) return true;
+  return false;
+}
+function checkRequiredInParagraphItems(fields, body, registry, path = "") {
+  const errors = [];
+  for (const { item, fields: itemFields, prefix } of paragraphItemsIn(fields, body, registry, path)) {
+    for (const f of itemFields) {
+      if (!f.required || f.removed === true || !f.db_column || f.db_column.junction) continue;
+      if (isMissing(item[f.name])) {
+        errors.push({ field: `${prefix}${f.name}`, message: `${prefix}${f.name} is required.` });
+      }
+    }
+    errors.push(...checkRequiredInParagraphItems(itemFields, item, registry, prefix));
+  }
+  return errors;
+}
+function quoteIdent2(name) {
+  if (!/^[a-z][a-z0-9_-]*$/.test(name)) throw new Error(`Unsafe identifier: ${name}`);
+  return `"${name}"`;
+}
+function collectReferences(fields, body, registry, path, out) {
+  for (const f of fields) {
+    if (!(f.name in body) || !f.db_column) continue;
+    const table = f.db_column.junction ? f.db_column.junction.right_table : f.db_column.foreign_key?.table;
+    if (!table) continue;
+    const value = body[f.name];
+    const name = `${path}${f.name}`;
+    if (typeof value === "string") {
+      out.push({ table, id: value, field: name });
+    } else if (Array.isArray(value)) {
+      value.forEach((v, i) => {
+        if (typeof v === "string") out.push({ table, id: v, field: `${name}[${i}]` });
+      });
+    }
+  }
+  for (const { item, fields: itemFields, prefix } of paragraphItemsIn(fields, body, registry, path)) {
+    collectReferences(itemFields, item, registry, prefix, out);
+  }
+}
+async function findMissingReferences(db, fields, body, registry) {
+  const uses = [];
+  collectReferences(fields, body, registry, "", uses);
+  if (uses.length === 0) return [];
+  const lookups = [...new Set(uses.map((u) => u.table))].map(async (table) => {
+    const ids = [...new Set(uses.filter((u) => u.table === table && isUuid(u.id)).map((u) => u.id.toLowerCase()))];
+    if (ids.length === 0) return [table, /* @__PURE__ */ new Set()];
+    const result = await db.execute(
+      sql3`SELECT id FROM ${sql3.raw(quoteIdent2(table))} WHERE id IN (${sql3.join(ids.map((id) => sql3`${id}`), sql3`, `)})`
+    );
+    return [table, new Set(result.rows.map((r) => String(r.id).toLowerCase()))];
+  });
+  const found = new Map(await Promise.all(lookups));
+  return uses.filter((u) => !found.get(u.table).has(u.id.toLowerCase())).map((u) => ({ field: u.field, message: `${u.field} refers to an item that does not exist.` }));
+}
 
 // src/routes/admin/content.ts
-function quoteIdent2(name) {
+function quoteIdent3(name) {
   if (!/^[a-z][a-z0-9_-]*$/.test(name)) throw new Error(`Unsafe identifier: ${name}`);
   return `"${name}"`;
 }
 async function loadParagraphRows(db, registry, pType, parentId, fieldName) {
   const result = await db.execute(
-    sql3`SELECT * FROM ${sql3.raw(quoteIdent2(pType.db.table_name))} WHERE parent_id = ${parentId} AND parent_field = ${fieldName} ORDER BY "order" ASC`
+    sql4`SELECT * FROM ${sql4.raw(quoteIdent3(pType.db.table_name))} WHERE parent_id = ${parentId} AND parent_field = ${fieldName} ORDER BY "order" ASC`
   );
   const rows = result.rows;
   for (const nf of pType.fields) {
@@ -1204,29 +1281,67 @@ async function loadParagraphRows(db, registry, pType, parentId, fieldName) {
   }
   return rows;
 }
+async function loadRelationsForEdit(db, registry, fields, id, row) {
+  for (const f of fields) {
+    if (f.db_column === null) {
+      const comp = f.ui_component;
+      if (comp.component !== "paragraph-embed" || !comp.ref) continue;
+      const pType = registry.paragraph_types[comp.ref];
+      if (!pType) continue;
+      row[f.name] = oneOrMany(relationCardinality3(f) ?? "many", await loadParagraphRows(db, registry, pType, id, f.name));
+    } else if (f.db_column.junction) {
+      const j = f.db_column.junction;
+      const r = await db.execute(
+        sql4`SELECT ${sql4.raw(quoteIdent3(j.right_column))} FROM ${sql4.raw(quoteIdent3(j.table_name))} WHERE ${sql4.raw(quoteIdent3(j.left_column))} = ${id}`
+      );
+      row[f.name] = r.rows.map((linked) => linked[j.right_column]);
+    }
+  }
+}
+async function valuesForPublishCheck(db, registry, requiredFields, id, storedLabels, body) {
+  const stored = { ...storedLabels };
+  if (db) await loadRelationsForEdit(db, registry, requiredFields.filter((f) => !(f.name in body)), id, stored);
+  return { ...stored, ...body };
+}
+async function persistRelationFields(db, registry, fields, body, itemId, ownerTable) {
+  const deltas = [];
+  for (const f of fields) {
+    if (!(f.name in body)) continue;
+    if (f.db_column === null) {
+      const comp = f.ui_component;
+      if (comp.component !== "paragraph-embed" || !comp.ref) continue;
+      const pType = registry.paragraph_types[comp.ref];
+      if (!pType) continue;
+      deltas.push(await persistParagraphField(db, itemId, ownerTable, f.name, pType, paragraphItems(f, body[f.name]), registry));
+    } else if (f.db_column.junction) {
+      const value = body[f.name];
+      const relatedIds = Array.isArray(value) ? value.filter((v) => typeof v === "string") : [];
+      await persistJunctionField(db, itemId, f.db_column.junction, relatedIds);
+    }
+  }
+  return deltas;
+}
 async function lookupBasePathId(db, pathOrName) {
   const r = await db.execute(
-    sql3`SELECT id FROM base_paths WHERE path = ${pathOrName} OR name = ${pathOrName} LIMIT 1`
+    sql4`SELECT id FROM base_paths WHERE path = ${pathOrName} OR name = ${pathOrName} LIMIT 1`
   );
   return r.rows[0]?.id ?? null;
 }
 var SLUG_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-function isEmpty(value) {
-  if (value === null || value === void 0) return true;
-  if (typeof value === "string" && value.trim() === "") return true;
-  if (Array.isArray(value) && value.length === 0) return true;
-  return false;
-}
 function checkRequiredFields(fields, data) {
-  return fields.filter((f) => f.required && isEmpty(data[f.name])).map((f) => ({ field: f.name, message: `${f.label} is required` }));
-}
-function relationShapeError(c, fields, body, registry) {
-  const details = checkRelationInput(fields, body, registry);
-  if (details.length === 0) return null;
-  return c.json(
-    { ok: false, error: { code: "VALIDATION_ERROR", message: "Relation fields have the wrong shape", details } },
-    422
-  );
+  return fields.filter((f) => f.required && isMissing(data[f.name])).map((f) => ({ field: f.name, message: `${f.label} is required` }));
+}
+async function relationInputError(c, fields, body, registry, db) {
+  const refuse = (message, details) => c.json({ ok: false, error: { code: "VALIDATION_ERROR", message, details } }, 422);
+  const shape = checkRelationInput(fields, body, registry);
+  if (shape.length > 0) return refuse("Relation fields have the wrong shape", shape);
+  const required = checkRequiredInParagraphItems(fields, body, registry);
+  if (required.length > 0) return refuse("Required fields are missing", required);
+  if (db) {
+    const missing = await findMissingReferences(db, fields, body, registry);
+    if (missing.length > 0) return refuse("Relation fields refer to items that do not exist", missing);
+  }
+  return null;
 }
 function parseListQuery(url, schemaFieldNames, relationFieldNames, columnFor) {
   const searchParams = new URL(url).searchParams;
@@ -1361,26 +1476,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
             404
           );
         }
-        if (db) {
-          const row = item;
-          for (const f of contentType.fields) {
-            if (f.db_column === null) {
-              const comp = f.ui_component;
-              if (comp.component !== "paragraph-embed" || !comp.ref) continue;
-              const pType = registry.paragraph_types[comp.ref];
-              if (!pType) continue;
-              row[f.name] = oneOrMany(relationCardinality3(f) ?? "many", await loadParagraphRows(db, registry, pType, id, f.name));
-            } else if (f.db_column.junction) {
-              const j = f.db_column.junction;
-              const r = await db.execute(
-                sql3`SELECT ${sql3.raw(quoteIdent2(j.right_column))} FROM ${sql3.raw(quoteIdent2(j.table_name))} WHERE ${sql3.raw(quoteIdent2(j.left_column))} = ${id}`
-              );
-              row[f.name] = r.rows.map(
-                (row2) => row2[j.right_column]
-              );
-            }
-          }
-        }
+        if (db) await loadRelationsForEdit(db, registry, contentType.fields, id, item);
         const data = projectRow(item, typeName, projectors);
         return c.json({ ok: true, data });
       }
@@ -1449,8 +1545,8 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
       }
     );
     const writeNewItem = async (c, body) => {
-      const shapeError = relationShapeError(c, contentType.fields, body, registry);
-      if (shapeError) return shapeError;
+      const inputError = await relationInputError(c, contentType.fields, body, registry, db);
+      if (inputError) return inputError;
       const storageBody = fieldKeys.toStorage(body);
       const fieldErrors = checkRequiredFields(requiredFields, body);
       if (fieldErrors.length > 0) {
@@ -1471,10 +1567,6 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
         });
         if (publishDeny) return publishDeny;
       }
-      const paragraphFields = contentType.fields.filter((f) => f.db_column === null);
-      const junctionFields = contentType.fields.filter(
-        (f) => f.db_column !== null && f.db_column.junction !== void 0
-      );
       const columnBackedFields = contentType.fields.filter(isColumnBacked);
       const columnData = {
         published: body["published"] ?? false
@@ -1509,19 +1601,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
       const itemId = item["id"];
       const mediaDeltas = [topLevelMediaDelta(mediaFields, null, storageBody)];
       if (db) {
-        for (const f of paragraphFields) {
-          const comp = f.ui_component;
-          if (comp.component !== "paragraph-embed" || !comp.ref) continue;
-          const pType = registry.paragraph_types[comp.ref];
-          if (!pType) continue;
-          const items = paragraphItems(f, body[f.name]);
-          mediaDeltas.push(await persistParagraphField(db, itemId, contentType.db.table_name, f.name, pType, items, registry));
-        }
-        for (const f of junctionFields) {
-          const junction = f.db_column.junction;
-          const relatedIds = Array.isArray(body[f.name]) ? body[f.name].filter((v) => typeof v === "string") : [];
-          await persistJunctionField(db, itemId, junction, relatedIds);
-        }
+        mediaDeltas.push(...await persistRelationFields(db, registry, contentType.fields, body, itemId, contentType.db.table_name));
       }
       await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
       const data = projectRow(item, typeName, projectors);
@@ -1585,14 +1665,14 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
       }
     );
     const writeExistingItem = async (c, id, existing, body) => {
-      const shapeError = relationShapeError(c, contentType.fields, body, registry);
-      if (shapeError) return shapeError;
+      const inputError = await relationInputError(c, contentType.fields, body, registry, db);
+      if (inputError) return inputError;
       const storageBody = fieldKeys.toStorage(body);
       if (body["published"] === true) {
         const publishDeny = await requirePermission("content:edit")(c, async () => {
         });
         if (publishDeny) return publishDeny;
-        const merged = { ...fieldKeys.toLabels(existing), ...body };
+        const merged = await valuesForPublishCheck(db, registry, requiredFields, id, fieldKeys.toLabels(existing), body);
         const fieldErrors = checkRequiredFields(requiredFields, merged);
         if (fieldErrors.length > 0) {
           return c.json(
@@ -1608,10 +1688,6 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
           );
         }
       }
-      const patchParagraphFields = contentType.fields.filter((f) => f.db_column === null);
-      const patchJunctionFields = contentType.fields.filter(
-        (f) => f.db_column !== null && f.db_column.junction !== void 0
-      );
       const patchColumnBackedFields = contentType.fields.filter(isColumnBacked);
       const patchData = {};
       if (!contentType.only_one && "slug" in body) patchData["slug"] = body["slug"];
@@ -1632,21 +1708,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
         topLevelMediaDelta(mediaFields, existing, storageBody)
       ];
       if (db) {
-        for (const f of patchParagraphFields) {
-          if (!(f.name in body)) continue;
-          const comp = f.ui_component;
-          if (comp.component !== "paragraph-embed" || !comp.ref) continue;
-          const pType = registry.paragraph_types[comp.ref];
-          if (!pType) continue;
-          const items = paragraphItems(f, body[f.name]);
-          mediaDeltas.push(await persistParagraphField(db, id, contentType.db.table_name, f.name, pType, items, registry));
-        }
-        for (const f of patchJunctionFields) {
-          if (!(f.name in body)) continue;
-          const junction = f.db_column.junction;
-          const relatedIds = Array.isArray(body[f.name]) ? body[f.name].filter((v) => typeof v === "string") : [];
-          await persistJunctionField(db, id, junction, relatedIds);
-        }
+        mediaDeltas.push(...await persistRelationFields(db, registry, contentType.fields, body, id, contentType.db.table_name));
       }
       await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
       const data = projectRow(updated, typeName, projectors);
@@ -1775,6 +1837,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
             404
           );
         }
+        if (db) await loadRelationsForEdit(db, registry, taxonomyType.fields, id, item);
         const data = projectRow(item, typeName, projectors);
         return c.json({ ok: true, data });
       }
@@ -1784,8 +1847,8 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
       requirePermission("content:create"),
       async (c) => {
         const body = await c.req.json();
-        const shapeError = relationShapeError(c, taxonomyType.fields, body, registry);
-        if (shapeError) return shapeError;
+        const inputError = await relationInputError(c, taxonomyType.fields, body, registry, db);
+        if (inputError) return inputError;
         const storageBody = fieldKeys.toStorage(body);
         const fieldErrors = checkRequiredFields(requiredFields, body);
         if (fieldErrors.length > 0) {
@@ -1806,7 +1869,6 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
           });
           if (publishDeny) return publishDeny;
         }
-        const taxParagraphFields = taxonomyType.fields.filter((f) => f.db_column === null);
         const taxColumnBackedFields = taxonomyType.fields.filter(isColumnBacked);
         const taxColumnData = {
           published: body["published"] ?? false
@@ -1820,14 +1882,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
         const taxItemId = item["id"];
         const mediaDeltas = [topLevelMediaDelta(mediaFields, null, storageBody)];
         if (db) {
-          for (const f of taxParagraphFields) {
-            const comp = f.ui_component;
-            if (comp.component !== "paragraph-embed" || !comp.ref) continue;
-            const pType = registry.paragraph_types[comp.ref];
-            if (!pType) continue;
-            const items = paragraphItems(f, body[f.name]);
-            mediaDeltas.push(await persistParagraphField(db, taxItemId, taxonomyType.db.table_name, f.name, pType, items, registry));
-          }
+          mediaDeltas.push(...await persistRelationFields(db, registry, taxonomyType.fields, body, taxItemId, taxonomyType.db.table_name));
         }
         await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
         const data = projectRow(item, typeName, projectors);
@@ -1848,13 +1903,13 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
             404
           );
         }
-        const shapeError = relationShapeError(c, taxonomyType.fields, body, registry);
-        if (shapeError) return shapeError;
+        const inputError = await relationInputError(c, taxonomyType.fields, body, registry, db);
+        if (inputError) return inputError;
         if (body["published"] === true) {
           const publishDeny = await requirePermission("content:edit")(c, async () => {
           });
           if (publishDeny) return publishDeny;
-          const merged = { ...fieldKeys.toLabels(existing), ...body };
+          const merged = await valuesForPublishCheck(db, registry, requiredFields, id, fieldKeys.toLabels(existing), body);
           const fieldErrors = checkRequiredFields(requiredFields, merged);
           if (fieldErrors.length > 0) {
             return c.json(
@@ -1870,7 +1925,6 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
             );
           }
         }
-        const taxPatchParagraphFields = taxonomyType.fields.filter((f) => f.db_column === null);
         const taxPatchColumnBackedFields = taxonomyType.fields.filter(isColumnBacked);
         const taxPatchData = {};
         if ("published" in body) taxPatchData["published"] = body["published"];
@@ -1890,15 +1944,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
           topLevelMediaDelta(mediaFields, existing, storageBody)
         ];
         if (db) {
-          for (const f of taxPatchParagraphFields) {
-            if (!(f.name in body)) continue;
-            const comp = f.ui_component;
-            if (comp.component !== "paragraph-embed" || !comp.ref) continue;
-            const pType = registry.paragraph_types[comp.ref];
-            if (!pType) continue;
-            const items = paragraphItems(f, body[f.name]);
-            mediaDeltas.push(await persistParagraphField(db, id, taxonomyType.db.table_name, f.name, pType, items, registry));
-          }
+          mediaDeltas.push(...await persistRelationFields(db, registry, taxonomyType.fields, body, id, taxonomyType.db.table_name));
         }
         await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
         const data = projectRow(updated, typeName, projectors);
@@ -2403,7 +2449,7 @@ function registerAdminMediaRoutes(app, mediaRepo, storage, requirePermission, ma
 
 // src/routes/admin/auth.ts
 import { getCookie as getCookie2 } from "hono/cookie";
-import { sql as sql4 } from "drizzle-orm";
+import { sql as sql5 } from "drizzle-orm";
 
 // src/auth/password.ts
 import { hashPassword, verifyPassword } from "@bobbykim/manguito-cms-core";
@@ -2469,7 +2515,7 @@ function registerAuthRoutes(app, db) {
       );
     }
     const userResult = await db.execute(
-      sql4`SELECT id, email, password_hash, role_id, token_version
+      sql5`SELECT id, email, password_hash, role_id, token_version
           FROM users WHERE email = ${email} LIMIT 1`
     );
     const user = userResult.rows[0];
@@ -2482,7 +2528,7 @@ function registerAuthRoutes(app, db) {
       return c.json(invalidCredentials, 401);
     }
     const roleResult = await db.execute(
-      sql4`SELECT r.name AS name, u.must_change_password
+      sql5`SELECT r.name AS name, u.must_change_password
           FROM roles r
           JOIN users u ON u.role_id = r.id
           WHERE r.id = ${user.role_id} AND u.id = ${user.id}
@@ -2542,7 +2588,7 @@ function registerAuthRoutes(app, db) {
       );
     }
     const rowResult = await db.execute(
-      sql4`SELECT u.token_version, r.name AS role
+      sql5`SELECT u.token_version, r.name AS role
           FROM users u
           JOIN roles r ON r.id = u.role_id
           WHERE u.id = ${payload.user_id}
@@ -2566,7 +2612,7 @@ function registerAuthRoutes(app, db) {
   app.post("/admin/api/auth/logout", authMiddleware, async (c) => {
     const user = c.get("user");
     await db.execute(
-      sql4`UPDATE users SET token_version = token_version + 1 WHERE id = ${user.id}`
+      sql5`UPDATE users SET token_version = token_version + 1 WHERE id = ${user.id}`
     );
     clearAuthCookie(c, "auth_token");
     clearAuthCookie(c, "refresh_token", "/admin/api/auth");
@@ -2575,7 +2621,7 @@ function registerAuthRoutes(app, db) {
 }
 
 // src/routes/admin/users.ts
-import { sql as sql5 } from "drizzle-orm";
+import { sql as sql6 } from "drizzle-orm";
 import { randomBytes } from "crypto";
 function getActingUser(c) {
   return c.get("user");
@@ -2610,7 +2656,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
       );
     }
     const hashResult = await db.execute(
-      sql5`SELECT password_hash FROM users WHERE id = ${actingUser.id} LIMIT 1`
+      sql6`SELECT password_hash FROM users WHERE id = ${actingUser.id} LIMIT 1`
     );
     const hashRow = hashResult.rows[0];
     if (!hashRow || !await verifyPassword(currentPassword, hashRow.password_hash)) {
@@ -2621,7 +2667,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
     }
     const newHash = await hashPassword(newPassword);
     await db.execute(
-      sql5`UPDATE users
+      sql6`UPDATE users
           SET password_hash       = ${newHash},
               must_change_password = false,
               token_version        = token_version + 1,
@@ -2632,7 +2678,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
   });
   app.get("/admin/api/users", requirePermission("users:read"), async (c) => {
     const result = await db.execute(
-      sql5`SELECT u.id, u.email, r.name AS role, u.must_change_password,
+      sql6`SELECT u.id, u.email, r.name AS role, u.must_change_password,
                  u.created_at, u.updated_at
           FROM users u
           JOIN roles r ON r.id = u.role_id
@@ -2643,7 +2689,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
   app.get("/admin/api/users/:id", requirePermission("users:read"), async (c) => {
     const id = c.req.param("id");
     const result = await db.execute(
-      sql5`SELECT u.id, u.email, r.name AS role, u.must_change_password,
+      sql6`SELECT u.id, u.email, r.name AS role, u.must_change_password,
                  u.created_at, u.updated_at
           FROM users u
           JOIN roles r ON r.id = u.role_id
@@ -2688,7 +2734,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
         );
       }
       const roleResult = await db.execute(
-        sql5`SELECT id FROM roles WHERE name = ${roleName} LIMIT 1`
+        sql6`SELECT id FROM roles WHERE name = ${roleName} LIMIT 1`
       );
       const roleRow = roleResult.rows[0];
       if (!roleRow) {
@@ -2703,7 +2749,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
       const tempPassword = generateTempPassword();
       const passwordHash = await hashPassword(tempPassword);
       const insertResult = await db.execute(
-        sql5`INSERT INTO users
+        sql6`INSERT INTO users
               (id, email, password_hash, role_id, must_change_password, token_version,
                created_at, updated_at)
             VALUES
@@ -2758,7 +2804,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
         );
       }
       const existingResult = await db.execute(
-        sql5`SELECT id, email, role_id FROM users WHERE id = ${id} LIMIT 1`
+        sql6`SELECT id, email, role_id FROM users WHERE id = ${id} LIMIT 1`
       );
       const existing = existingResult.rows[0];
       if (!existing) {
@@ -2772,7 +2818,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
       let changeRole = false;
       if (typeof body.role === "string" && body.role) {
         const roleResult = await db.execute(
-          sql5`SELECT id FROM roles WHERE name = ${body.role} LIMIT 1`
+          sql6`SELECT id FROM roles WHERE name = ${body.role} LIMIT 1`
         );
         const roleRow = roleResult.rows[0];
         if (!roleRow) {
@@ -2792,7 +2838,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
       }
       if (changeRole) {
         await db.execute(
-          sql5`UPDATE users
+          sql6`UPDATE users
               SET email         = ${newEmail},
                   role_id       = ${newRoleId},
                   token_version = token_version + 1,
@@ -2801,7 +2847,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
         );
       } else {
         await db.execute(
-          sql5`UPDATE users
+          sql6`UPDATE users
               SET email      = ${newEmail},
                   role_id    = ${newRoleId},
                   updated_at = NOW()
@@ -2809,7 +2855,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
         );
       }
       const updatedResult = await db.execute(
-        sql5`SELECT u.id, u.email, r.name AS role, u.must_change_password,
+        sql6`SELECT u.id, u.email, r.name AS role, u.must_change_password,
                    u.created_at, u.updated_at
             FROM users u
             JOIN roles r ON r.id = u.role_id
@@ -2846,7 +2892,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
         );
       }
       const result = await db.execute(
-        sql5`DELETE FROM users WHERE id = ${id} RETURNING id`
+        sql6`DELETE FROM users WHERE id = ${id} RETURNING id`
       );
       if (result.rows.length === 0) {
         return c.json(
@@ -2877,7 +2923,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
         );
       }
       const existingResult = await db.execute(
-        sql5`SELECT id FROM users WHERE id = ${id} LIMIT 1`
+        sql6`SELECT id FROM users WHERE id = ${id} LIMIT 1`
       );
       const existing = existingResult.rows[0];
       if (!existing) {
@@ -2889,7 +2935,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
       const tempPassword = generateTempPassword();
       const passwordHash = await hashPassword(tempPassword);
       await db.execute(
-        sql5`UPDATE users
+        sql6`UPDATE users
             SET password_hash        = ${passwordHash},
                 must_change_password = true,
                 token_version        = token_version + 1,
@@ -2902,10 +2948,10 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 }
 
 // src/routes/admin/config.ts
-import { sql as sql6 } from "drizzle-orm";
+import { sql as sql7 } from "drizzle-orm";
 var API_VERSION = (() => {
   try {
-    return "0.8.0";
+    return "0.8.2";
   } catch {
     return "0.0.0";
   }
@@ -2924,7 +2970,7 @@ function registerConfigRoute(app, config, registry, db) {
       permissions: r.permissions
     }));
     const userResult = await db.execute(
-      sql6`SELECT email, must_change_password FROM users WHERE id = ${actingUser.id} LIMIT 1`
+      sql7`SELECT email, must_change_password FROM users WHERE id = ${actingUser.id} LIMIT 1`
     );
     const userRow = userResult.rows[0];
     return c.json({
@@ -2950,7 +2996,7 @@ function registerConfigRoute(app, config, registry, db) {
 }
 
 // src/routes/admin/schema.ts
-import { sql as sql7 } from "drizzle-orm";
+import { sql as sql8 } from "drizzle-orm";
 function liveFields(fields) {
   return fields.filter((f) => f.removed !== true);
 }
@@ -2990,7 +3036,7 @@ function registerSchemaRoute(app, registry, db) {
     const data = await Promise.all(
       Object.values(registry.content_types).map(async (ct) => {
         const result = await db.execute(
-          sql7`SELECT COUNT(*)::int AS count FROM ${sql7.raw(`"${ct.db.table_name}"`)}`
+          sql8`SELECT COUNT(*)::int AS count FROM ${sql8.raw(`"${ct.db.table_name}"`)}`
         );
         const count = Number(result.rows[0].count);
         return { name: ct.name, label: ct.label, only_one: ct.only_one, count };
@@ -3002,7 +3048,7 @@ function registerSchemaRoute(app, registry, db) {
     const data = await Promise.all(
       Object.values(registry.taxonomy_types).map(async (tt) => {
         const result = await db.execute(
-          sql7`SELECT COUNT(*)::int AS count FROM ${sql7.raw(`"${tt.db.table_name}"`)}`
+          sql8`SELECT COUNT(*)::int AS count FROM ${sql8.raw(`"${tt.db.table_name}"`)}`
         );
         const count = Number(result.rows[0].count);
         return { name: tt.name, label: tt.label, count };
@@ -3014,14 +3060,14 @@ function registerSchemaRoute(app, registry, db) {
 
 // src/repositories/content.ts
 import crypto from "crypto";
-import { sql as sql8 } from "drizzle-orm";
+import { sql as sql9 } from "drizzle-orm";
 var SORTABLE_FIELDS2 = /* @__PURE__ */ new Set(["title", "created_at", "updated_at"]);
 function codeError(code, message) {
   const err = new Error(message);
   err.code = code;
   return err;
 }
-function quoteIdent3(name) {
+function quoteIdent4(name) {
   if (!/^[a-z][a-z0-9_-]*$/.test(name)) {
     throw new Error(`Unsafe SQL identifier: ${name}`);
   }
@@ -3036,43 +3082,43 @@ function quoteField(name) {
 function buildConditions(published_only, filters, search) {
   const conds = [];
   if (published_only) {
-    conds.push(sql8`published = true`);
+    conds.push(sql9`published = true`);
   }
   if (search && search.term.trim() !== "" && search.columns.length > 0) {
     const pattern = `%${search.term.trim()}%`;
-    const orConds = search.columns.map((col) => sql8`${sql8.raw(quoteField(col))} ILIKE ${pattern}`);
-    conds.push(sql8`(${sql8.join(orConds, sql8` OR `)})`);
+    const orConds = search.columns.map((col) => sql9`${sql9.raw(quoteField(col))} ILIKE ${pattern}`);
+    conds.push(sql9`(${sql9.join(orConds, sql9` OR `)})`);
   }
   if (filters) {
     for (const [field, value] of Object.entries(filters)) {
-      const col = sql8.raw(quoteField(field));
+      const col = sql9.raw(quoteField(field));
       if (Array.isArray(value)) {
         if (value.length === 0) continue;
-        const inList = sql8.join(
-          value.map((v) => sql8`${v}`),
-          sql8`, `
+        const inList = sql9.join(
+          value.map((v) => sql9`${v}`),
+          sql9`, `
         );
-        conds.push(sql8`${col} IN (${inList})`);
+        conds.push(sql9`${col} IN (${inList})`);
       } else if (typeof value === "object" && value !== null) {
         const op = value;
-        if (op.gt !== void 0) conds.push(sql8`${col} > ${op.gt}`);
-        if (op.gte !== void 0) conds.push(sql8`${col} >= ${op.gte}`);
-        if (op.lt !== void 0) conds.push(sql8`${col} < ${op.lt}`);
-        if (op.lte !== void 0) conds.push(sql8`${col} <= ${op.lte}`);
+        if (op.gt !== void 0) conds.push(sql9`${col} > ${op.gt}`);
+        if (op.gte !== void 0) conds.push(sql9`${col} >= ${op.gte}`);
+        if (op.lt !== void 0) conds.push(sql9`${col} < ${op.lt}`);
+        if (op.lte !== void 0) conds.push(sql9`${col} <= ${op.lte}`);
       } else {
-        conds.push(sql8`${col} = ${value}`);
+        conds.push(sql9`${col} = ${value}`);
       }
     }
   }
   return conds;
 }
 function whereFragment(conds) {
-  return conds.length > 0 ? sql8` WHERE ${sql8.join(conds, sql8` AND `)}` : sql8``;
+  return conds.length > 0 ? sql9` WHERE ${sql9.join(conds, sql9` AND `)}` : sql9``;
 }
 function createDrizzleContentRepository(db, tableName, options = {}) {
   const { relations = {}, publishedRelations = false, sortableColumns } = options;
   function tableRaw() {
-    return sql8.raw(quoteIdent3(tableName));
+    return sql9.raw(quoteIdent4(tableName));
   }
   async function resolveRows(rows, include, cache) {
     if (rows.length === 0) return rows;
@@ -3115,14 +3161,14 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
       const offset = (page - 1) * per_page;
       const conds = buildConditions(published_only, filters, search);
       const where = whereFragment(conds);
-      const sortCol = sql8.raw(quoteIdent3(sort_by));
-      const sortDir = sql8.raw(sort_order === "desc" ? "DESC" : "ASC");
+      const sortCol = sql9.raw(quoteIdent4(sort_by));
+      const sortDir = sql9.raw(sort_order === "desc" ? "DESC" : "ASC");
       const countResult = await db.execute(
-        sql8`SELECT COUNT(*) AS total FROM ${tableRaw()}${where}`
+        sql9`SELECT COUNT(*) AS total FROM ${tableRaw()}${where}`
       );
       const total = Number(countResult.rows[0]?.["total"] ?? 0);
       const dataResult = await db.execute(
-        sql8`SELECT * FROM ${tableRaw()}${where} ORDER BY ${sortCol} ${sortDir} LIMIT ${per_page} OFFSET ${offset}`
+        sql9`SELECT * FROM ${tableRaw()}${where} ORDER BY ${sortCol} ${sortDir} LIMIT ${per_page} OFFSET ${offset}`
       );
       const rows = dataResult.rows;
       const cache = /* @__PURE__ */ new Map();
@@ -3143,7 +3189,7 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
     },
     async findOne(id, include = []) {
       const result = await db.execute(
-        sql8`SELECT * FROM ${tableRaw()} WHERE id = ${id} LIMIT 1`
+        sql9`SELECT * FROM ${tableRaw()} WHERE id = ${id} LIMIT 1`
       );
       if (result.rows.length === 0) return null;
       const rows = result.rows;
@@ -3153,7 +3199,7 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
     },
     async findBySlug(slug, include = []) {
       const result = await db.execute(
-        sql8`SELECT * FROM ${tableRaw()} WHERE slug = ${slug} LIMIT 1`
+        sql9`SELECT * FROM ${tableRaw()} WHERE slug = ${slug} LIMIT 1`
       );
       if (result.rows.length === 0) return null;
       const rows = result.rows;
@@ -3169,10 +3215,10 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
         updated_at: /* @__PURE__ */ new Date()
       };
       const entries = Object.entries(record).filter(([, v]) => v !== void 0);
-      const colsSql = sql8.join(entries.map(([k]) => sql8.raw(quoteIdent3(k))), sql8`, `);
-      const valsSql = sql8.join(entries.map(([, v]) => sql8`${v}`), sql8`, `);
+      const colsSql = sql9.join(entries.map(([k]) => sql9.raw(quoteIdent4(k))), sql9`, `);
+      const valsSql = sql9.join(entries.map(([, v]) => sql9`${v}`), sql9`, `);
       const result = await db.execute(
-        sql8`INSERT INTO ${tableRaw()} (${colsSql}) VALUES (${valsSql}) RETURNING *`
+        sql9`INSERT INTO ${tableRaw()} (${colsSql}) VALUES (${valsSql}) RETURNING *`
       );
       return result.rows[0];
     },
@@ -3185,25 +3231,25 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
       if (entries.length === 0) {
         return this.findOne(id);
       }
-      const setClauses = sql8.join(
-        entries.map(([k, v]) => sql8`${sql8.raw(quoteIdent3(k))} = ${v}`),
-        sql8`, `
+      const setClauses = sql9.join(
+        entries.map(([k, v]) => sql9`${sql9.raw(quoteIdent4(k))} = ${v}`),
+        sql9`, `
       );
       const result = await db.execute(
-        sql8`UPDATE ${tableRaw()} SET ${setClauses} WHERE id = ${id} RETURNING *`
+        sql9`UPDATE ${tableRaw()} SET ${setClauses} WHERE id = ${id} RETURNING *`
       );
       if (result.rows.length === 0) return null;
       return result.rows[0];
     },
     async delete(id) {
-      await db.execute(sql8`DELETE FROM ${tableRaw()} WHERE id = ${id}`);
+      await db.execute(sql9`DELETE FROM ${tableRaw()} WHERE id = ${id}`);
     },
     async findAll(opts = {}) {
       const { include = [], published_only } = opts;
       const conds = buildConditions(published_only, void 0, void 0);
       const where = whereFragment(conds);
       const result = await db.execute(
-        sql8`SELECT * FROM ${tableRaw()}${where} ORDER BY created_at ASC`
+        sql9`SELECT * FROM ${tableRaw()}${where} ORDER BY created_at ASC`
       );
       const rows = result.rows;
       const cache = /* @__PURE__ */ new Map();
@@ -3215,23 +3261,23 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
 
 // src/repositories/media.ts
 import crypto2 from "crypto";
-import { sql as sql9 } from "drizzle-orm";
+import { sql as sql10 } from "drizzle-orm";
 function createMediaRepository(db) {
-  const TABLE = sql9.raw('"media"');
+  const TABLE = sql10.raw('"media"');
   return {
     async findMany(opts = {}) {
       const { page = 1, per_page = 10, type, orphaned } = opts;
       const offset = (page - 1) * per_page;
       const conds = [];
-      if (type) conds.push(sql9`type = ${type}`);
-      if (orphaned) conds.push(sql9`reference_count = 0`);
-      const where = conds.length > 0 ? sql9` WHERE ${sql9.join(conds, sql9` AND `)}` : sql9``;
-      const countResult = await db.execute(sql9`SELECT COUNT(*) AS total FROM ${TABLE}${where}`);
+      if (type) conds.push(sql10`type = ${type}`);
+      if (orphaned) conds.push(sql10`reference_count = 0`);
+      const where = conds.length > 0 ? sql10` WHERE ${sql10.join(conds, sql10` AND `)}` : sql10``;
+      const countResult = await db.execute(sql10`SELECT COUNT(*) AS total FROM ${TABLE}${where}`);
       const total = Number(
         countResult.rows[0]?.["total"] ?? 0
       );
       const dataResult = await db.execute(
-        sql9`SELECT * FROM ${TABLE}${where} ORDER BY created_at DESC LIMIT ${per_page} OFFSET ${offset}`
+        sql10`SELECT * FROM ${TABLE}${where} ORDER BY created_at DESC LIMIT ${per_page} OFFSET ${offset}`
       );
       const total_pages = Math.ceil(total / per_page);
       return {
@@ -3249,7 +3295,7 @@ function createMediaRepository(db) {
     },
     async findOne(id) {
       const result = await db.execute(
-        sql9`SELECT * FROM ${TABLE} WHERE id = ${id} LIMIT 1`
+        sql10`SELECT * FROM ${TABLE} WHERE id = ${id} LIMIT 1`
       );
       if (result.rows.length === 0) return null;
       return result.rows[0];
@@ -3263,10 +3309,10 @@ function createMediaRepository(db) {
         updated_at: /* @__PURE__ */ new Date()
       };
       const entries = Object.entries(record).filter(([, v]) => v !== void 0);
-      const colsSql = sql9.join(entries.map(([k]) => sql9.raw(`"${k}"`)), sql9`, `);
-      const valsSql = sql9.join(entries.map(([, v]) => sql9`${v}`), sql9`, `);
+      const colsSql = sql10.join(entries.map(([k]) => sql10.raw(`"${k}"`)), sql10`, `);
+      const valsSql = sql10.join(entries.map(([, v]) => sql10`${v}`), sql10`, `);
       const result = await db.execute(
-        sql9`INSERT INTO ${TABLE} (${colsSql}) VALUES (${valsSql}) RETURNING *`
+        sql10`INSERT INTO ${TABLE} (${colsSql}) VALUES (${valsSql}) RETURNING *`
       );
       return result.rows[0];
     },
@@ -3276,31 +3322,31 @@ function createMediaRepository(db) {
         ([k, v]) => k !== "id" && v !== void 0
       );
       if (entries.length === 0) return this.findOne(id);
-      const setClauses = sql9.join(
-        entries.map(([k, v]) => sql9`${sql9.raw(`"${k}"`)} = ${v}`),
-        sql9`, `
+      const setClauses = sql10.join(
+        entries.map(([k, v]) => sql10`${sql10.raw(`"${k}"`)} = ${v}`),
+        sql10`, `
       );
       const result = await db.execute(
-        sql9`UPDATE ${TABLE} SET ${setClauses} WHERE id = ${id} RETURNING *`
+        sql10`UPDATE ${TABLE} SET ${setClauses} WHERE id = ${id} RETURNING *`
       );
       if (result.rows.length === 0) return null;
       return result.rows[0];
     },
     async delete(id) {
-      await db.execute(sql9`DELETE FROM ${TABLE} WHERE id = ${id}`);
+      await db.execute(sql10`DELETE FROM ${TABLE} WHERE id = ${id}`);
     },
     async incrementReferenceCount(ids) {
       if (ids.length === 0) return;
-      const inList = sql9.join(ids.map((id) => sql9`${id}`), sql9`, `);
+      const inList = sql10.join(ids.map((id) => sql10`${id}`), sql10`, `);
       await db.execute(
-        sql9`UPDATE ${TABLE} SET reference_count = reference_count + 1, updated_at = NOW() WHERE id IN (${inList})`
+        sql10`UPDATE ${TABLE} SET reference_count = reference_count + 1, updated_at = NOW() WHERE id IN (${inList})`
       );
     },
     async decrementReferenceCount(ids) {
       if (ids.length === 0) return;
-      const inList = sql9.join(ids.map((id) => sql9`${id}`), sql9`, `);
+      const inList = sql10.join(ids.map((id) => sql10`${id}`), sql10`, `);
       await db.execute(
-        sql9`UPDATE ${TABLE} SET reference_count = GREATEST(reference_count - 1, 0), updated_at = NOW() WHERE id IN (${inList})`
+        sql10`UPDATE ${TABLE} SET reference_count = GREATEST(reference_count - 1, 0), updated_at = NOW() WHERE id IN (${inList})`
       );
     }
   };
@@ -3433,7 +3479,7 @@ function createCmsApp(options) {
   const requirePermission = createPermissionMiddleware(rolesRegistry);
   const getUserRole = async (userId) => {
     const result = await db.execute(
-      sql10`SELECT r.name AS role
+      sql11`SELECT r.name AS role
           FROM users u
           JOIN roles r ON r.id = u.role_id
           WHERE u.id = ${userId}