@bobbykim/manguito-cms-api 0.6.0 → 0.7.0

package/dist/index.mjs

@@ -8,7 +8,7 @@ import {
   persistParagraphField,
   resolveRelationBareIds,
   resolveRelationField
-} from "./chunk-JVP33FI2.mjs";
+} from "./chunk-FXPKGPYF.mjs";
 
 // src/paths.ts
 function normalizePrefix(prefix) {
@@ -617,14 +617,16 @@ function isPlainRow(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v) && !(v instanceof Date);
 }
 var MEDIA_FIELD_TYPES = /* @__PURE__ */ new Set(["image", "video", "file"]);
-function nestedTargets(fields) {
+function nestedTargets(fields, map) {
   const out = [];
   for (const f of fields) {
     if (MEDIA_FIELD_TYPES.has(f.field_type)) continue;
     if (f.field_type !== "paragraph" && f.field_type !== "reference") continue;
     const ref = f.ui_component.ref;
     if (!ref) continue;
-    out.push({ label: f.name, target: ref });
+    const label = isColumnBacked(f) ? map.labelFor(f.db_column.column_name) : f.name;
+    if (label === void 0) continue;
+    out.push({ label, target: ref });
   }
   return out;
 }
@@ -642,7 +644,7 @@ function buildProjectors(registry, fieldKeyMaps, fallbacks) {
       const typeFallbacks = fallbacks?.[typeName];
       projectors[typeName] = {
         map,
-        nested: nestedTargets(type.fields),
+        nested: nestedTargets(type.fields, map),
         // Spread rather than assign: with exactOptionalPropertyTypes, an optional
         // property may be ABSENT but not present-and-undefined.
         ...typeFallbacks !== void 0 && { fallbacks: typeFallbacks }
@@ -726,7 +728,28 @@ function parseFilters(url, validFields, columnFor) {
 function isPublished(item) {
   return item["published"] === true;
 }
-function registerPublicContentRoutes(app, registry, repos, projectors, paths, listRateLimit, resolver) {
+function registerPublicContentRoutes(app, registry, repos, projectors, paths, listRateLimit, resolver, resolverProjectors) {
+  const forResolver = resolverProjectors ?? projectors;
+  function pickProgrammatic(resolved, names) {
+    const out = {};
+    for (const name of names) if (name in resolved) out[name] = resolved[name];
+    return out;
+  }
+  async function respondItem(row, typeName, programmatic) {
+    const data = projectRow(row, typeName, projectors);
+    if (!resolver?.hasSchema(typeName)) return data;
+    const resolved = await resolver.resolveItem(typeName, projectRow(row, typeName, forResolver));
+    return { ...data, ...pickProgrammatic(resolved, programmatic) };
+  }
+  async function respondList(rows, typeName, programmatic) {
+    const data = rows.map((row) => projectRow(row, typeName, projectors));
+    if (!resolver?.hasSchema(typeName)) return data;
+    const resolved = await resolver.resolveList(
+      typeName,
+      rows.map((row) => projectRow(row, typeName, forResolver))
+    );
+    return data.map((d, i) => ({ ...d, ...pickProgrammatic(resolved[i], programmatic) }));
+  }
   function registerListRoute(path, handler) {
     if (listRateLimit) {
       app.get(path, listRateLimit, handler);
@@ -750,18 +773,29 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
     return c.json({ ok: true, data });
   });
   for (const [typeName, contentType] of Object.entries(registry.content_types)) {
+    let translateInclude2 = function(requested) {
+      const include = [];
+      for (const field of requested) {
+        const registryName = includeNames.get(field);
+        if (registryName === void 0) return { ok: false, field };
+        include.push(registryName);
+      }
+      return { ok: true, include };
+    };
+    var translateInclude = translateInclude2;
     const basePath = contentType.default_base_path;
     const repo = repos[typeName];
     if (!repo) continue;
     const fieldKeys = projectors[typeName].map;
-    const relationFieldNames = /* @__PURE__ */ new Set();
+    const programmatic = contentType.fields.filter((f) => f.field_type === "programmatic").map((f) => f.name);
+    const includeNames = /* @__PURE__ */ new Map();
     for (const f of contentType.fields) {
       if (!RELATION_FIELD_TYPES.has(f.field_type)) continue;
       if (isColumnBacked(f)) {
         const label = fieldKeys.labelFor(f.db_column.column_name);
-        if (label !== void 0) relationFieldNames.add(label);
+        if (label !== void 0) includeNames.set(label, f.name);
       } else {
-        relationFieldNames.add(f.name);
+        includeNames.set(f.name, f.name);
       }
     }
     const filterableFieldNames = /* @__PURE__ */ new Set([
@@ -780,8 +814,11 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             404
           );
         }
-        let data = projectRow(result.data[0], typeName, projectors);
-        if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+        const data = await respondItem(
+          result.data[0],
+          typeName,
+          programmatic
+        );
         return c.json({ ok: true, data });
       });
     } else {
@@ -838,21 +875,20 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             400
           );
         }
-        const include = parseInclude(c.req.query("include"));
-        for (const field of include) {
-          if (!relationFieldNames.has(field)) {
-            return c.json(
-              {
-                ok: false,
-                error: {
-                  code: "INVALID_INCLUDE_FIELD",
-                  message: `'${field}' is not a valid relation field`
-                }
-              },
-              400
-            );
-          }
+        const translated = translateInclude2(parseInclude(c.req.query("include")));
+        if (!translated.ok) {
+          return c.json(
+            {
+              ok: false,
+              error: {
+                code: "INVALID_INCLUDE_FIELD",
+                message: `'${translated.field}' is not a valid relation field`
+              }
+            },
+            400
+          );
         }
+        const include = translated.include;
         const sortColumn = fieldKeys.labels.includes(sortBy) ? fieldKeys.columnFor(sortBy) : sortBy;
         const result = await repo.findMany({
           published_only: true,
@@ -863,29 +899,25 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
           filters: filtersResult.filters,
           include
         });
-        const labeled = result.data.map(
-          (row) => projectRow(row, typeName, projectors)
-        );
-        const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
+        const data = await respondList(result.data, typeName, programmatic);
         return c.json({ ...result, data });
       });
       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) {
-          if (!relationFieldNames.has(field)) {
-            return c.json(
-              {
-                ok: false,
-                error: {
-                  code: "INVALID_INCLUDE_FIELD",
-                  message: `'${field}' is not a valid relation field`
-                }
-              },
-              400
-            );
-          }
+        const translated = translateInclude2(parseInclude(c.req.query("include")));
+        if (!translated.ok) {
+          return c.json(
+            {
+              ok: false,
+              error: {
+                code: "INVALID_INCLUDE_FIELD",
+                message: `'${translated.field}' is not a valid relation field`
+              }
+            },
+            400
+          );
         }
+        const include = translated.include;
         const item = await repo.findBySlug(slug, include);
         if (!item || !isPublished(item)) {
           return c.json(
@@ -896,15 +928,15 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
             404
           );
         }
-        let data = projectRow(item, typeName, projectors);
-        if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+        const data = await respondItem(item, typeName, programmatic);
         return c.json({ ok: true, data });
       });
     }
   }
-  for (const [typeName] of Object.entries(registry.taxonomy_types)) {
+  for (const [typeName, taxonomyType] of Object.entries(registry.taxonomy_types)) {
     const repo = repos[typeName];
     if (!repo) continue;
+    const programmatic = taxonomyType.fields.filter((f) => f.field_type === "programmatic").map((f) => f.name);
     registerListRoute(paths.taxonomyCollection(typeName), async (c) => {
       const pagination = parsePagination(c.req.query("page"), c.req.query("per_page"));
       if (!pagination.ok) {
@@ -924,10 +956,7 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
         page: pagination.page,
         per_page: pagination.per_page
       });
-      const labeled = result.data.map(
-        (row) => projectRow(row, typeName, projectors)
-      );
-      const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
+      const data = await respondList(result.data, typeName, programmatic);
       return c.json({ ...result, data });
     });
     app.get(paths.taxonomyItem(typeName), async (c) => {
@@ -942,8 +971,7 @@ function registerPublicContentRoutes(app, registry, repos, projectors, paths, li
           404
         );
       }
-      let data = projectRow(item, typeName, projectors);
-      if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
+      const data = await respondItem(item, typeName, programmatic);
       return c.json({ ok: true, data });
     });
   }
@@ -2733,7 +2761,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 import { sql as sql5 } from "drizzle-orm";
 var API_VERSION = (() => {
   try {
-    return "0.6.0";
+    return "0.7.0";
   } catch {
     return "0.0.0";
   }
@@ -3389,7 +3417,7 @@ function createCmsApp(options) {
         app.use(path, attachDeprecationHeaders);
       }
     }
-    registerPublicContentRoutes(app, registry, surface.repos, surface.projectors, surface.paths, listRateLimit, programmaticResolver);
+    registerPublicContentRoutes(app, registry, surface.repos, surface.projectors, surface.paths, listRateLimit, programmaticResolver, projectors);
   }
   if (options.versions !== void 0) {
     app.all(`${prefix}/:version/*`, async (c, next) => {
@@ -3431,7 +3459,7 @@ function createCmsApp(options) {
       handler: null,
       error: null
     }));
-    const ready = import("./handler-XZVDLKZ2.mjs").then(({ createGraphQLHandler }) => {
+    const ready = import("./handler-GED3I7Z2.mjs").then(({ createGraphQLHandler }) => {
       gqlPasses.forEach((pass, i) => {
         const mount = mounts[i];
         try {
@@ -3455,7 +3483,8 @@ function createCmsApp(options) {
               endpoint: mount.path,
               currentVersion: model.current,
               ...projection !== void 0 && { projection },
-              ...currentProjection !== void 0 && { currentProjection }
+              ...currentProjection !== void 0 && { currentProjection },
+              currentFieldKeyMaps: fieldKeyMaps
             }
           );
         } catch (err) {