@bobbykim/manguito-cms-api 0.3.2 → 0.4.0

package/dist/index.js

@@ -200,22 +200,34 @@ function groupBy(items, key) {
   }
   return result;
 }
+function needsFkResolution(row, fkColumn, fieldName) {
+  if (fkColumn !== fieldName && !(fkColumn in row)) return false;
+  const current = row[fieldName];
+  return !(typeof current === "object" && current !== null);
+}
 async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOnly = false) {
   if (rows.length === 0) return;
+  const batch = [...new Set(rows)];
   if (rel.type === "paragraph") {
-    const parentIds = rows.map((r) => r["id"]);
+    const parentIds = batch.map((r) => r["id"]);
     const inList = import_drizzle_orm2.sql.join(parentIds.map((id) => import_drizzle_orm2.sql`${id}`), import_drizzle_orm2.sql`, `);
     const result = await db.execute(
       import_drizzle_orm2.sql`SELECT * FROM ${import_drizzle_orm2.sql.raw(quoteIdent(rel.table))} WHERE parent_id IN (${inList}) AND parent_field = ${fieldName} ORDER BY "order" ASC`
     );
     const byParent = groupBy(result.rows, "parent_id");
-    for (const row of rows) {
+    for (const row of batch) {
       row[fieldName] = byParent[row["id"]] ?? [];
     }
   } else if (rel.type === "reference") {
-    const fkValues = rows.map((r) => r[rel.fk_column]).filter(Boolean);
+    const dropFk = rel.fk_column !== fieldName;
+    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column, fieldName));
+    if (pending.length === 0) return;
+    const fkValues = pending.map((r) => r[rel.fk_column]).filter(Boolean);
     if (fkValues.length === 0) {
-      for (const row of rows) row[fieldName] = null;
+      for (const row of pending) {
+        row[fieldName] = null;
+        if (dropFk) delete row[rel.fk_column];
+      }
       return;
     }
     const unique = [...new Set(fkValues)];
@@ -230,12 +242,13 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
         cache.set(`${rel.table}:${item["id"]}`, item);
       }
     }
-    for (const row of rows) {
+    for (const row of pending) {
       const fkVal = row[rel.fk_column];
       row[fieldName] = fkVal ? cache.get(`${rel.table}:${fkVal}`) ?? null : null;
+      if (dropFk) delete row[rel.fk_column];
     }
   } else if (rel.type === "junction") {
-    const parentIds = rows.map((r) => r["id"]);
+    const parentIds = batch.map((r) => r["id"]);
     const inList = import_drizzle_orm2.sql.join(parentIds.map((id) => import_drizzle_orm2.sql`${id}`), import_drizzle_orm2.sql`, `);
     const orderBy = rel.order_column ? import_drizzle_orm2.sql` ORDER BY "order" ASC` : import_drizzle_orm2.sql``;
     const junctionResult = await db.execute(
@@ -255,14 +268,20 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
       }
     }
     const byLeft = groupBy(jRows, rel.left_column);
-    for (const row of rows) {
+    for (const row of batch) {
       const jEntries = byLeft[row["id"]] ?? [];
       row[fieldName] = jEntries.map((jr) => cache.get(`${rel.table}:${jr[rel.right_column]}`)).filter(Boolean);
     }
   } else if (rel.type === "media") {
-    const fkValues = rows.map((r) => r[rel.fk_column]).filter(Boolean);
+    const dropFk = rel.fk_column !== fieldName;
+    const pending = batch.filter((r) => needsFkResolution(r, rel.fk_column, fieldName));
+    if (pending.length === 0) return;
+    const fkValues = pending.map((r) => r[rel.fk_column]).filter(Boolean);
     if (fkValues.length === 0) {
-      for (const row of rows) row[fieldName] = null;
+      for (const row of pending) {
+        row[fieldName] = null;
+        if (dropFk) delete row[rel.fk_column];
+      }
       return;
     }
     const unique = [...new Set(fkValues)];
@@ -274,9 +293,10 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
         cache.set(`media:${item["id"]}`, item);
       }
     }
-    for (const row of rows) {
+    for (const row of pending) {
       const fkVal = row[rel.fk_column];
       row[fieldName] = fkVal ? cache.get(`media:${fkVal}`) ?? null : null;
+      if (dropFk) delete row[rel.fk_column];
     }
   }
 }
@@ -313,6 +333,53 @@ var init_relations = __esm({
   }
 });
 
+// src/field-keys.ts
+function isColumnBacked(field) {
+  const col = field.db_column;
+  if (col === null) return false;
+  if (col.column_name === "") return false;
+  if (col.junction) return false;
+  return true;
+}
+function createFieldKeyMap(fields) {
+  const labelToColumn = /* @__PURE__ */ new Map();
+  const columnToLabel = /* @__PURE__ */ new Map();
+  for (const f of fields) {
+    if (!isColumnBacked(f)) continue;
+    labelToColumn.set(f.name, f.db_column.column_name);
+    columnToLabel.set(f.db_column.column_name, f.name);
+  }
+  for (const f of fields) {
+    const columnOwner = columnToLabel.get(f.name);
+    if (columnOwner !== void 0 && columnOwner !== f.name) {
+      throw new Error(
+        `Fatal: field key map failed to build \u2014 field label "${f.name}" collides with the storage column of field "${columnOwner}". A field label may not reuse another field's column name. Rename the field, then run \`manguito validate\` to check your schema.`
+      );
+    }
+  }
+  const diverges = [...labelToColumn].some(([label, column]) => label !== column);
+  function remap(input, lookup) {
+    const out = {};
+    for (const key of Object.keys(input)) {
+      out[lookup.get(key) ?? key] = input[key];
+    }
+    return out;
+  }
+  return {
+    toStorage: (input) => remap(input, labelToColumn),
+    toLabels: (row) => remap(row, columnToLabel),
+    columnFor: (label) => labelToColumn.get(label),
+    labelFor: (column) => columnToLabel.get(column),
+    labels: [...labelToColumn.keys()],
+    diverges
+  };
+}
+var init_field_keys = __esm({
+  "src/field-keys.ts"() {
+    "use strict";
+  }
+});
+
 // src/graphql/scalars.ts
 var import_graphql, DateTimeScalar, JSONScalar;
 var init_scalars = __esm({
@@ -484,12 +551,13 @@ function buildFilterInputType(type) {
   if (Object.keys(fields).length === 0) return null;
   return new import_graphql3.GraphQLInputObjectType({ name: `${graphqlTypeName(type.name)}Filter`, fields });
 }
-function translateFilters(input, nameMap) {
+function translateFilters(input, nameMap, columnFor) {
   const out = {};
   if (!input) return out;
   for (const [gqlField, raw] of Object.entries(input)) {
     if (raw === null || typeof raw !== "object") continue;
-    const column = nameMap.toSchema(gqlField);
+    const label = nameMap.toSchema(gqlField);
+    const column = columnFor?.(label) ?? label;
     const spec = raw;
     if (spec["eq"] !== void 0) {
       out[column] = spec["eq"];
@@ -541,29 +609,34 @@ function codeError2(code, message) {
 function isPublished2(item) {
   return !!item && item["published"] === true;
 }
-function scalarFieldResolver(schemaName) {
-  return (parent) => parent[schemaName];
+function resolveFieldValue(field, row) {
+  const key = isColumnBacked(field) ? field.db_column.column_name : field.name;
+  return row[key] ?? null;
+}
+function scalarFieldResolver(field) {
+  return (parent) => resolveFieldValue(field, parent);
 }
 function relationFieldResolver(typeName, schemaFieldName) {
   return (parent, _args, ctx) => ctx.loaders.load(typeName, schemaFieldName, parent);
 }
-function programmaticFieldResolver(typeName, schemaFieldName, mediaFieldNames = []) {
+function programmaticFieldResolver(typeName, schemaFieldName, mediaFieldNames = [], fieldKeys) {
   return async (parent, _args, ctx) => {
     let p = ctx.programmaticMemo.get(parent);
     if (!p) {
-      p = resolveProgrammaticRow(typeName, parent, ctx, mediaFieldNames);
+      p = resolveProgrammaticRow(typeName, parent, ctx, mediaFieldNames, fieldKeys);
       ctx.programmaticMemo.set(parent, p);
     }
     return (await p)[schemaFieldName];
   };
 }
-async function resolveProgrammaticRow(typeName, parent, ctx, mediaFieldNames) {
-  if (mediaFieldNames.length === 0) return ctx.resolver.resolveItem(typeName, parent);
+async function resolveProgrammaticRow(typeName, parent, ctx, mediaFieldNames, fieldKeys) {
+  const toLabels = (row) => fieldKeys ? fieldKeys.toLabels(row) : row;
+  if (mediaFieldNames.length === 0) return ctx.resolver.resolveItem(typeName, toLabels(parent));
   const enriched = { ...parent };
   await Promise.all(mediaFieldNames.map((name) => ctx.loaders.load(typeName, name, enriched)));
-  return ctx.resolver.resolveItem(typeName, enriched);
+  return ctx.resolver.resolveItem(typeName, toLabels(enriched));
 }
-function collectionResolver(typeName, nameMap) {
+function collectionResolver(typeName, nameMap, fieldKeys) {
   return async (_root, args, ctx) => {
     const page = args.page ?? 1;
     const perPage = args.perPage ?? 10;
@@ -580,7 +653,7 @@ function collectionResolver(typeName, nameMap) {
       per_page: perPage,
       sort_by: args.sortBy ?? "created_at",
       sort_order: args.sortOrder ?? "asc",
-      filters: translateFilters(args.filter, nameMap)
+      filters: translateFilters(args.filter, nameMap, fieldKeys?.columnFor)
     });
     return { data: result.data, meta: result.meta };
   };
@@ -612,11 +685,12 @@ var init_resolvers = __esm({
     "use strict";
     import_graphql4 = require("graphql");
     init_filters();
+    init_field_keys();
   }
 });
 
 // src/graphql/schema.ts
-function buildGraphQLSchema(registry) {
+function buildGraphQLSchema(registry, fieldKeyMaps = {}) {
   const objectTypes = /* @__PURE__ */ new Map();
   const enumTypes = /* @__PURE__ */ new Map();
   for (const [name, enumType] of Object.entries(registry.enum_types)) {
@@ -692,11 +766,16 @@ function buildGraphQLSchema(registry) {
           const outType = outputTypeForField(field);
           let resolve;
           if (field.field_type === "programmatic") {
-            resolve = programmaticFieldResolver(machineName, field.name, mediaFieldNames);
+            resolve = programmaticFieldResolver(
+              machineName,
+              field.name,
+              mediaFieldNames,
+              fieldKeyMaps[machineName]
+            );
           } else if (field.field_type === "reference" || field.field_type === "paragraph" || field.field_type === "image" || field.field_type === "video" || field.field_type === "file") {
             resolve = relationFieldResolver(machineName, field.name);
           } else {
-            resolve = scalarFieldResolver(field.name);
+            resolve = scalarFieldResolver(field);
           }
           fields[gqlName] = { type: outType, resolve };
         }
@@ -752,7 +831,7 @@ function buildGraphQLSchema(registry) {
         sortOrder: { type: SortOrderEnum },
         ...filterType ? { filter: { type: filterType } } : {}
       },
-      resolve: collectionResolver(name, nameMap)
+      resolve: collectionResolver(name, nameMap, fieldKeyMaps[name])
     };
     queryFields[singleQueryName(name)] = {
       type: objType,
@@ -772,7 +851,7 @@ function buildGraphQLSchema(registry) {
     queryFields[collectionQueryName(name)] = {
       type: new import_graphql5.GraphQLNonNull(listType),
       args: { page: { type: import_graphql5.GraphQLInt }, perPage: { type: import_graphql5.GraphQLInt } },
-      resolve: collectionResolver(name, buildFieldNameMap(tt.fields.map((f) => f.name)))
+      resolve: collectionResolver(name, buildFieldNameMap(tt.fields.map((f) => f.name)), fieldKeyMaps[name])
     };
     queryFields[singleQueryName(name)] = {
       type: objType,
@@ -914,8 +993,8 @@ function isClientSafeGraphQLError(error) {
   }
   return false;
 }
-function createGraphQLHandler(registry, repos, resolver, db, options) {
-  const schema = buildGraphQLSchema(registry);
+function createGraphQLHandler(registry, repos, fieldKeyMaps, resolver, db, options) {
+  const schema = buildGraphQLSchema(registry, fieldKeyMaps);
   const { plugins } = buildArmorPlugin({
     maxDepth: options.maxDepth,
     maxComplexity: options.maxComplexity
@@ -967,6 +1046,25 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/paths.ts
+function normalizePrefix(prefix) {
+  if (prefix === void 0) return "/api";
+  const withSlash = prefix.startsWith("/") ? prefix : `/${prefix}`;
+  const trimmed = withSlash.replace(/\/+$/, "");
+  return trimmed === "" ? "/api" : trimmed;
+}
+function createPublicPaths(prefix) {
+  return {
+    collection: (basePath) => `${prefix}/${basePath}`,
+    item: (basePath) => `${prefix}/${basePath}/:slug`,
+    taxonomyCollection: (typeName) => `${prefix}/taxonomy/${typeName}`,
+    taxonomyItem: (typeName) => `${prefix}/taxonomy/${typeName}/:id`,
+    mediaCollection: () => `${prefix}/media`,
+    mediaItem: () => `${prefix}/media/:id`,
+    openapi: () => `${prefix}/openapi.json`
+  };
+}
+
 // src/app.ts
 var import_hono = require("hono");
 var import_drizzle_orm10 = require("drizzle-orm");
@@ -1565,28 +1663,31 @@ function parseInclude(includeParam) {
   if (!includeParam) return [];
   return includeParam.split(",").map((s) => s.trim()).filter(Boolean);
 }
-function parseFilters(url, validFields) {
+function parseFilters(url, validFields, columnFor) {
   const { searchParams } = new URL(url);
   const filters = {};
+  const toKey = (label) => columnFor?.(label) ?? label;
   for (const [key, value] of searchParams.entries()) {
     const simpleMatch = /^filter\[([^\]]+)\]$/.exec(key);
     const opMatch = /^filter\[([^\]]+)\]\[([^\]]+)\]$/.exec(key);
     if (simpleMatch) {
       const field = simpleMatch[1];
       if (!validFields.has(field)) return { ok: false, invalidField: field };
-      const existing = filters[field];
+      const storageKey = toKey(field);
+      const existing = filters[storageKey];
       if (existing !== void 0) {
-        filters[field] = Array.isArray(existing) ? [...existing, value] : [existing, value];
+        filters[storageKey] = Array.isArray(existing) ? [...existing, value] : [existing, value];
       } else {
-        filters[field] = value;
+        filters[storageKey] = value;
       }
     } else if (opMatch) {
       const field = opMatch[1];
       const operator = opMatch[2];
       if (!validFields.has(field)) return { ok: false, invalidField: field };
       if (!["gt", "gte", "lt", "lte"].includes(operator)) continue;
-      const existing = filters[field] ?? {};
-      filters[field] = { ...existing, [operator]: value };
+      const storageKey = toKey(field);
+      const existing = filters[storageKey] ?? {};
+      filters[storageKey] = { ...existing, [operator]: value };
     }
   }
   return { ok: true, filters };
@@ -1596,7 +1697,7 @@ function parseFilters(url, validFields) {
 function isPublished(item) {
   return item["published"] === true;
 }
-function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolver) {
+function registerPublicContentRoutes(app, registry, repos, fieldKeyMaps, paths, listRateLimit, resolver) {
   function registerListRoute(path, handler) {
     if (listRateLimit) {
       app.get(path, listRateLimit, handler);
@@ -1604,7 +1705,7 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
       app.get(path, handler);
     }
   }
-  registerListRoute("/api/content", (c) => {
+  registerListRoute(paths.collection("content"), (c) => {
     const data = Object.values(registry.content_types).map((ct) => ({
       name: ct.name,
       label: ct.label,
@@ -1612,7 +1713,7 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
     }));
     return c.json({ ok: true, data });
   });
-  registerListRoute("/api/taxonomy", (c) => {
+  registerListRoute(paths.collection("taxonomy"), (c) => {
     const data = Object.values(registry.taxonomy_types).map((tt) => ({
       name: tt.name,
       label: tt.label
@@ -1631,7 +1732,7 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
       ...contentType.system_fields.map((f) => f.name)
     ]);
     if (contentType.only_one) {
-      app.get(`/api/${basePath}`, async (c) => {
+      app.get(paths.collection(basePath), async (c) => {
         const result = await repo.findMany({ published_only: true, page: 1, per_page: 1 });
         if (result.data.length === 0) {
           return c.json(
@@ -1639,12 +1740,13 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
             404
           );
         }
-        let data = result.data[0];
+        let data = fieldKeyMaps[typeName].toLabels(result.data[0]);
         if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
         return c.json({ ok: true, data });
       });
     } else {
-      registerListRoute(`/api/${basePath}`, async (c) => {
+      registerListRoute(paths.collection(basePath), async (c) => {
+        const fieldKeys = fieldKeyMaps[typeName];
         const pagination = parsePagination(c.req.query("page"), c.req.query("per_page"));
         if (!pagination.ok) {
           return c.json(
@@ -1684,7 +1786,7 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
             400
           );
         }
-        const filtersResult = parseFilters(c.req.url, filterableFieldNames);
+        const filtersResult = parseFilters(c.req.url, filterableFieldNames, fieldKeys.columnFor);
         if (!filtersResult.ok) {
           return c.json(
             {
@@ -1721,13 +1823,13 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
           filters: filtersResult.filters,
           include
         });
-        if (resolver?.hasSchema(typeName)) {
-          const resolved = await resolver.resolveList(typeName, result.data);
-          return c.json({ ...result, data: resolved });
-        }
-        return c.json(result);
+        const labeled = result.data.map(
+          (row) => fieldKeys.toLabels(row)
+        );
+        const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
+        return c.json({ ...result, data });
       });
-      app.get(`/api/${basePath}/:slug`, async (c) => {
+      app.get(paths.item(basePath), async (c) => {
         const slug = c.req.param("slug");
         const include = parseInclude(c.req.query("include"));
         for (const field of include) {
@@ -1754,7 +1856,7 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
             404
           );
         }
-        let data = item;
+        let data = fieldKeyMaps[typeName].toLabels(item);
         if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
         return c.json({ ok: true, data });
       });
@@ -1763,7 +1865,7 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
   for (const [typeName] of Object.entries(registry.taxonomy_types)) {
     const repo = repos[typeName];
     if (!repo) continue;
-    registerListRoute(`/api/taxonomy/${typeName}`, async (c) => {
+    registerListRoute(paths.taxonomyCollection(typeName), async (c) => {
       const pagination = parsePagination(c.req.query("page"), c.req.query("per_page"));
       if (!pagination.ok) {
         return c.json(
@@ -1782,13 +1884,14 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
         page: pagination.page,
         per_page: pagination.per_page
       });
-      if (resolver?.hasSchema(typeName)) {
-        const resolved = await resolver.resolveList(typeName, result.data);
-        return c.json({ ...result, data: resolved });
-      }
-      return c.json(result);
+      const fieldKeys = fieldKeyMaps[typeName];
+      const labeled = result.data.map(
+        (row) => fieldKeys.toLabels(row)
+      );
+      const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
+      return c.json({ ...result, data });
     });
-    app.get(`/api/taxonomy/${typeName}/:id`, async (c) => {
+    app.get(paths.taxonomyItem(typeName), async (c) => {
       const id = c.req.param("id");
       const item = await repo.findOne(id);
       if (!item || !isPublished(item)) {
@@ -1800,7 +1903,7 @@ function registerPublicContentRoutes(app, registry, repos, listRateLimit, resolv
           404
         );
       }
-      let data = item;
+      let data = fieldKeyMaps[typeName].toLabels(item);
       if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
       return c.json({ ok: true, data });
     });
@@ -1816,7 +1919,7 @@ function parsePagination2(pageStr, perPageStr) {
   if (!Number.isInteger(per_page) || per_page < 1 || per_page > 100) return { ok: false };
   return { ok: true, page, per_page };
 }
-function registerPublicMediaRoutes(app, mediaRepo, listRateLimit) {
+function registerPublicMediaRoutes(app, mediaRepo, paths, listRateLimit) {
   const mediaListHandler = async (c) => {
     const pagination = parsePagination2(c.req.query("page"), c.req.query("per_page"));
     if (!pagination.ok) {
@@ -1855,11 +1958,11 @@ function registerPublicMediaRoutes(app, mediaRepo, listRateLimit) {
     return c.json(result);
   };
   if (listRateLimit) {
-    app.get("/api/media", listRateLimit, mediaListHandler);
+    app.get(paths.mediaCollection(), listRateLimit, mediaListHandler);
   } else {
-    app.get("/api/media", mediaListHandler);
+    app.get(paths.mediaCollection(), mediaListHandler);
   }
-  app.get("/api/media/:id", async (c) => {
+  app.get(paths.mediaItem(), async (c) => {
     const id = c.req.param("id");
     const item = await mediaRepo.findOne(id);
     if (!item) {
@@ -1883,9 +1986,11 @@ function topLevelMediaDelta(mediaFields, before, after) {
   const added = [];
   const removed = [];
   for (const f of mediaFields) {
-    if (after !== null && !(f.name in after)) continue;
-    const oldId = before ? extractMediaId(before[f.name]) : null;
-    const newId = after ? extractMediaId(after[f.name]) : null;
+    const key = f.db_column?.column_name;
+    if (key === void 0 || key === "") continue;
+    if (after !== null && !(key in after)) continue;
+    const oldId = before ? extractMediaId(before[key]) : null;
+    const newId = after ? extractMediaId(after[key]) : null;
     if (newId === oldId) continue;
     if (oldId) removed.push(oldId);
     if (newId) added.push(newId);
@@ -1909,6 +2014,7 @@ async function applyMediaReferenceDelta(delta, mediaRepo) {
 
 // src/routes/admin/content.ts
 init_relations();
+init_field_keys();
 function quoteIdent2(name) {
   if (!/^[a-z][a-z0-9_-]*$/.test(name)) throw new Error(`Unsafe identifier: ${name}`);
   return `"${name}"`;
@@ -1946,7 +2052,7 @@ function isEmpty(value) {
 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 parseListQuery(url, schemaFieldNames, relationFieldNames) {
+function parseListQuery(url, schemaFieldNames, relationFieldNames, columnFor) {
   const searchParams = new URL(url).searchParams;
   const pagination = parsePagination(
     searchParams.get("page") ?? void 0,
@@ -1981,7 +2087,7 @@ function parseListQuery(url, schemaFieldNames, relationFieldNames) {
       status: 400
     };
   }
-  const filtersResult = parseFilters(url, schemaFieldNames);
+  const filtersResult = parseFilters(url, schemaFieldNames, columnFor);
   if (!filtersResult.ok) {
     return {
       ok: false,
@@ -2013,7 +2119,7 @@ function parseListQuery(url, schemaFieldNames, relationFieldNames) {
     search
   };
 }
-function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePermission, db) {
+function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRepo, requirePermission, db) {
   for (const [typeName, contentType] of Object.entries(registry.content_types)) {
     const basePath = `content/${typeName}`;
     const repo = repos[typeName];
@@ -2025,6 +2131,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
     const relationFieldNames = new Set(
       contentType.fields.filter((f) => RELATION_FIELD_TYPES.has(f.field_type)).map((f) => f.name)
     );
+    const fieldKeys = fieldKeyMaps[typeName];
     const requiredFields = contentType.fields.filter((f) => f.required);
     const mediaFields = contentType.fields.filter(
       (f) => f.field_type === "image" || f.field_type === "video" || f.field_type === "file"
@@ -2038,7 +2145,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       `/admin/api/${basePath}`,
       requirePermission("content:read"),
       async (c) => {
-        const parsed = parseListQuery(c.req.url, schemaFieldNames, relationFieldNames);
+        const parsed = parseListQuery(c.req.url, schemaFieldNames, relationFieldNames, fieldKeys.columnFor);
         if (!parsed.ok) {
           return c.json({ ok: false, error: parsed.response }, parsed.status);
         }
@@ -2058,7 +2165,8 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
           findOpts.search = { term: parsed.search, columns: searchableColumns };
         }
         const result = await repo.findMany(findOpts);
-        return c.json(result);
+        const data = result.data.map((row) => fieldKeys.toLabels(row));
+        return c.json({ ...result, data });
       }
     );
     app.get(
@@ -2093,7 +2201,8 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
             }
           }
         }
-        return c.json({ ok: true, data: item });
+        const data = fieldKeys.toLabels(item);
+        return c.json({ ok: true, data });
       }
     );
     app.post(
@@ -2160,6 +2269,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       }
     );
     const writeNewItem = async (c, body) => {
+      const storageBody = fieldKeys.toStorage(body);
       const fieldErrors = checkRequiredFields(requiredFields, body);
       if (fieldErrors.length > 0) {
         return c.json(
@@ -2183,9 +2293,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       const junctionFields = contentType.fields.filter(
         (f) => f.db_column !== null && f.db_column.junction !== void 0
       );
-      const columnFields = 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
       };
@@ -2194,9 +2302,10 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       } else {
         columnData["slug"] = body["slug"];
       }
-      for (const f of columnFields) {
-        const val = body[f.name];
-        columnData[f.db_column.column_name] = val !== void 0 ? val : null;
+      for (const f of columnBackedFields) {
+        const key = f.db_column.column_name;
+        if (!(key in storageBody)) continue;
+        columnData[key] = storageBody[key];
       }
       if (db) {
         const basePathId = await lookupBasePathId(db, contentType.default_base_path);
@@ -2216,7 +2325,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       }
       const item = await repo.create(columnData);
       const itemId = item["id"];
-      const mediaDeltas = [topLevelMediaDelta(mediaFields, null, body)];
+      const mediaDeltas = [topLevelMediaDelta(mediaFields, null, storageBody)];
       if (db) {
         for (const f of paragraphFields) {
           const comp = f.ui_component;
@@ -2233,7 +2342,8 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
         }
       }
       await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
-      return c.json({ ok: true, data: item }, 201);
+      const data = fieldKeys.toLabels(item);
+      return c.json({ ok: true, data }, 201);
     };
     app.patch(
       `/admin/api/${basePath}/:id`,
@@ -2293,11 +2403,12 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       }
     );
     const writeExistingItem = async (c, id, existing, body) => {
+      const storageBody = fieldKeys.toStorage(body);
       if (body["published"] === true) {
         const publishDeny = await requirePermission("content:edit")(c, async () => {
         });
         if (publishDeny) return publishDeny;
-        const merged = { ...existing, ...body };
+        const merged = { ...fieldKeys.toLabels(existing), ...body };
         const fieldErrors = checkRequiredFields(requiredFields, merged);
         if (fieldErrors.length > 0) {
           return c.json(
@@ -2317,17 +2428,14 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       const patchJunctionFields = contentType.fields.filter(
         (f) => f.db_column !== null && f.db_column.junction !== void 0
       );
-      const patchColumnFields = 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"];
       if ("published" in body) patchData["published"] = body["published"];
-      for (const f of patchColumnFields) {
-        if (f.name in body) {
-          const val = body[f.name];
-          patchData[f.db_column.column_name] = val !== void 0 ? val : null;
-        }
+      for (const f of patchColumnBackedFields) {
+        const key = f.db_column.column_name;
+        if (!(key in storageBody)) continue;
+        patchData[key] = storageBody[key];
       }
       const updated = await repo.update(id, patchData);
       if (!updated) {
@@ -2337,7 +2445,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
         );
       }
       const mediaDeltas = [
-        topLevelMediaDelta(mediaFields, existing, body)
+        topLevelMediaDelta(mediaFields, existing, storageBody)
       ];
       if (db) {
         for (const f of patchParagraphFields) {
@@ -2355,7 +2463,8 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
         }
       }
       await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
-      return c.json({ ok: true, data: updated });
+      const data = fieldKeys.toLabels(updated);
+      return c.json({ ok: true, data });
     };
     if (contentType.only_one) {
       app.put(
@@ -2415,6 +2524,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
     const relationFieldNames = new Set(
       taxonomyType.fields.filter((f) => RELATION_FIELD_TYPES.has(f.field_type)).map((f) => f.name)
     );
+    const fieldKeys = fieldKeyMaps[typeName];
     const requiredFields = taxonomyType.fields.filter((f) => f.required);
     const mediaFields = taxonomyType.fields.filter(
       (f) => f.field_type === "image" || f.field_type === "video" || f.field_type === "file"
@@ -2428,7 +2538,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       `/admin/api/taxonomy/${typeName}`,
       requirePermission("content:read"),
       async (c) => {
-        const parsed = parseListQuery(c.req.url, schemaFieldNames, relationFieldNames);
+        const parsed = parseListQuery(c.req.url, schemaFieldNames, relationFieldNames, fieldKeys.columnFor);
         if (!parsed.ok) {
           return c.json({ ok: false, error: parsed.response }, parsed.status);
         }
@@ -2448,7 +2558,8 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
           findOpts.search = { term: parsed.search, columns: searchableColumns };
         }
         const result = await repo.findMany(findOpts);
-        return c.json(result);
+        const data = result.data.map((row) => fieldKeys.toLabels(row));
+        return c.json({ ...result, data });
       }
     );
     app.get(
@@ -2463,7 +2574,8 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
             404
           );
         }
-        return c.json({ ok: true, data: item });
+        const data = fieldKeys.toLabels(item);
+        return c.json({ ok: true, data });
       }
     );
     app.post(
@@ -2471,6 +2583,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       requirePermission("content:create"),
       async (c) => {
         const body = await c.req.json();
+        const storageBody = fieldKeys.toStorage(body);
         const fieldErrors = checkRequiredFields(requiredFields, body);
         if (fieldErrors.length > 0) {
           return c.json(
@@ -2490,20 +2603,19 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
           });
           if (publishDeny) return publishDeny;
         }
-        const taxColumnFields = taxonomyType.fields.filter(
-          (f) => f.db_column !== null && f.db_column.junction === void 0
-        );
         const taxParagraphFields = taxonomyType.fields.filter((f) => f.db_column === null);
+        const taxColumnBackedFields = taxonomyType.fields.filter(isColumnBacked);
         const taxColumnData = {
           published: body["published"] ?? false
         };
-        for (const f of taxColumnFields) {
-          const val = body[f.name];
-          taxColumnData[f.db_column.column_name] = val !== void 0 ? val : null;
+        for (const f of taxColumnBackedFields) {
+          const key = f.db_column.column_name;
+          if (!(key in storageBody)) continue;
+          taxColumnData[key] = storageBody[key];
         }
         const item = await repo.create(taxColumnData);
         const taxItemId = item["id"];
-        const mediaDeltas = [topLevelMediaDelta(mediaFields, null, body)];
+        const mediaDeltas = [topLevelMediaDelta(mediaFields, null, storageBody)];
         if (db) {
           for (const f of taxParagraphFields) {
             const comp = f.ui_component;
@@ -2515,7 +2627,8 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
           }
         }
         await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
-        return c.json({ ok: true, data: item }, 201);
+        const data = fieldKeys.toLabels(item);
+        return c.json({ ok: true, data }, 201);
       }
     );
     app.patch(
@@ -2524,6 +2637,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
       async (c) => {
         const id = c.req.param("id");
         const body = await c.req.json();
+        const storageBody = fieldKeys.toStorage(body);
         const existing = await repo.findOne(id);
         if (!existing) {
           return c.json(
@@ -2535,7 +2649,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
           const publishDeny = await requirePermission("content:edit")(c, async () => {
           });
           if (publishDeny) return publishDeny;
-          const merged = { ...existing, ...body };
+          const merged = { ...fieldKeys.toLabels(existing), ...body };
           const fieldErrors = checkRequiredFields(requiredFields, merged);
           if (fieldErrors.length > 0) {
             return c.json(
@@ -2551,17 +2665,14 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
             );
           }
         }
-        const taxPatchColumnFields = taxonomyType.fields.filter(
-          (f) => f.db_column !== null && f.db_column.junction === void 0
-        );
         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"];
-        for (const f of taxPatchColumnFields) {
-          if (f.name in body) {
-            const val = body[f.name];
-            taxPatchData[f.db_column.column_name] = val !== void 0 ? val : null;
-          }
+        for (const f of taxPatchColumnBackedFields) {
+          const key = f.db_column.column_name;
+          if (!(key in storageBody)) continue;
+          taxPatchData[key] = storageBody[key];
         }
         const updated = await repo.update(id, taxPatchData);
         if (!updated) {
@@ -2571,7 +2682,7 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
           );
         }
         const mediaDeltas = [
-          topLevelMediaDelta(mediaFields, existing, body)
+          topLevelMediaDelta(mediaFields, existing, storageBody)
         ];
         if (db) {
           for (const f of taxPatchParagraphFields) {
@@ -2584,7 +2695,8 @@ function registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePerm
           }
         }
         await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
-        return c.json({ ok: true, data: updated });
+        const data = fieldKeys.toLabels(updated);
+        return c.json({ ok: true, data });
       }
     );
     app.delete(
@@ -3576,7 +3688,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 var import_drizzle_orm6 = require("drizzle-orm");
 var API_VERSION = (() => {
   try {
-    return "0.3.2";
+    return "0.4.0";
   } catch {
     return "0.0.0";
   }
@@ -3978,6 +4090,7 @@ function createMediaRepository(db) {
 }
 
 // src/app.ts
+init_field_keys();
 var MISSING_STORAGE_ERROR = `\u2717 api.storage is required but not configured.
   Add a storage adapter to your manguito.config.ts:
 
@@ -3991,7 +4104,8 @@ function createCmsApp(options) {
   if (!options.storage) {
     throw new Error(MISSING_STORAGE_ERROR);
   }
-  const prefix = options.prefix ?? "/api";
+  const prefix = normalizePrefix(options.prefix);
+  const publicPaths = createPublicPaths(prefix);
   const { storage, registry, db, rateLimit, media, cors } = options;
   const cmsName = options.name ?? "Manguito CMS";
   const maxFileSize = media?.max_file_size;
@@ -4071,23 +4185,27 @@ function createCmsApp(options) {
   registerAuthRoutes(app, db);
   app.use("/admin/api/*", authMiddleware);
   app.use("/admin/api/*", mustChangePasswordCheck);
-  app.get("/api/openapi.json", (c) => {
+  app.get(publicPaths.openapi(), (c) => {
     const paths = {};
     for (const ct of Object.values(registry.content_types)) {
       const base = ct.default_base_path;
       if (ct.only_one) {
-        paths[`/api/${base}`] = { get: { summary: `Get ${ct.label}`, tags: [ct.label] } };
+        paths[publicPaths.collection(base)] = { get: { summary: `Get ${ct.label}`, tags: [ct.label] } };
       } else {
-        paths[`/api/${base}`] = { get: { summary: `List published ${ct.label}`, tags: [ct.label] } };
-        paths[`/api/${base}/{slug}`] = { get: { summary: `Get ${ct.label} by slug`, tags: [ct.label] } };
+        paths[publicPaths.collection(base)] = { get: { summary: `List published ${ct.label}`, tags: [ct.label] } };
+        paths[publicPaths.item(base).replace(":slug", "{slug}")] = {
+          get: { summary: `Get ${ct.label} by slug`, tags: [ct.label] }
+        };
       }
     }
     for (const tt of Object.values(registry.taxonomy_types)) {
-      paths[`/api/taxonomy/${tt.name}`] = { get: { summary: `List published ${tt.label}`, tags: [tt.label] } };
-      paths[`/api/taxonomy/${tt.name}/{id}`] = { get: { summary: `Get ${tt.label} by id`, tags: [tt.label] } };
+      paths[publicPaths.taxonomyCollection(tt.name)] = { get: { summary: `List published ${tt.label}`, tags: [tt.label] } };
+      paths[publicPaths.taxonomyItem(tt.name).replace(":id", "{id}")] = {
+        get: { summary: `Get ${tt.label} by id`, tags: [tt.label] }
+      };
     }
-    paths["/api/media"] = { get: { summary: "List media items", tags: ["Media"] } };
-    paths["/api/media/{id}"] = { get: { summary: "Get media item by id", tags: ["Media"] } };
+    paths[publicPaths.mediaCollection()] = { get: { summary: "List media items", tags: ["Media"] } };
+    paths[publicPaths.mediaItem().replace(":id", "{id}")] = { get: { summary: "Get media item by id", tags: ["Media"] } };
     return c.json({
       openapi: "3.0.3",
       info: { title: "Manguito CMS Public API", version: "1.0.0" },
@@ -4102,14 +4220,24 @@ function createCmsApp(options) {
       paths: {}
     })
   );
-  registerPublicContentRoutes(app, registry, publicRepos, listRateLimit, programmaticResolver);
-  registerPublicMediaRoutes(app, mediaRepo, listRateLimit);
+  const fieldKeyMaps = Object.fromEntries([
+    ...Object.entries(registry.content_types).map(([typeName, ct]) => [
+      typeName,
+      createFieldKeyMap(ct.fields)
+    ]),
+    ...Object.entries(registry.taxonomy_types).map(([typeName, tt]) => [
+      typeName,
+      createFieldKeyMap(tt.fields)
+    ])
+  ]);
+  registerPublicContentRoutes(app, registry, publicRepos, fieldKeyMaps, publicPaths, listRateLimit, programmaticResolver);
+  registerPublicMediaRoutes(app, mediaRepo, publicPaths, listRateLimit);
   if (options.graphql?.enabled) {
     const gqlOptions = options.graphql;
     let gqlHandler = null;
     let initError = null;
     const ready = Promise.resolve().then(() => (init_handler(), handler_exports)).then(({ createGraphQLHandler: createGraphQLHandler2 }) => {
-      gqlHandler = createGraphQLHandler2(registry, graphqlRepos, programmaticResolver, db, gqlOptions);
+      gqlHandler = createGraphQLHandler2(registry, graphqlRepos, fieldKeyMaps, programmaticResolver, db, gqlOptions);
     }).catch((err) => {
       initError = err;
       const message = err instanceof Error ? err.message : String(err);
@@ -4149,7 +4277,7 @@ function createCmsApp(options) {
   );
   registerSchemaRoute(app, registry, db);
   registerUserRoutes(app, db, requirePermission, requireHierarchy);
-  registerAdminContentRoutes(app, registry, repos, mediaRepo, requirePermission, db);
+  registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRepo, requirePermission, db);
   registerAdminMediaRoutes(app, mediaRepo, storage, requirePermission, maxFileSize);
   return { prefix, app };
 }
@@ -4190,7 +4318,7 @@ function resolveGraphQL(cfg) {
   };
 }
 function createAPIAdapter(options = {}) {
-  const prefix = options.prefix ?? "/api";
+  const prefix = normalizePrefix(options.prefix);
   const media = options.media?.max_file_size !== void 0 ? { max_file_size: options.media.max_file_size } : void 0;
   return {
     prefix,