@bobbykim/manguito-cms-api 0.4.0 → 0.4.2

package/dist/index.js

@@ -344,10 +344,16 @@ function isColumnBacked(field) {
 function createFieldKeyMap(fields) {
   const labelToColumn = /* @__PURE__ */ new Map();
   const columnToLabel = /* @__PURE__ */ new Map();
+  const droppedKeys = /* @__PURE__ */ new Set();
   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);
+    if (f.removed === true) {
+      droppedKeys.add(f.name);
+      droppedKeys.add(f.db_column.column_name);
+      continue;
+    }
+    labelToColumn.set(f.name, f.db_column.column_name);
   }
   for (const f of fields) {
     const columnOwner = columnToLabel.get(f.name);
@@ -357,10 +363,16 @@ function createFieldKeyMap(fields) {
       );
     }
   }
+  for (const f of fields) {
+    if (isColumnBacked(f) && f.removed === true) {
+      columnToLabel.delete(f.db_column.column_name);
+    }
+  }
   const diverges = [...labelToColumn].some(([label, column]) => label !== column);
   function remap(input, lookup) {
     const out = {};
     for (const key of Object.keys(input)) {
+      if (droppedKeys.has(key)) continue;
       out[lookup.get(key) ?? key] = input[key];
     }
     return out;
@@ -500,7 +512,7 @@ var init_naming = __esm({
 function buildSortFieldEnum(typeName) {
   return new import_graphql3.GraphQLEnumType({
     name: `${typeName}SortField`,
-    values: Object.fromEntries(SORTABLE.map((s) => [s.gql, { value: s.column }]))
+    values: Object.fromEntries(SORTABLE.map((s) => [s.gql, { value: s.value }]))
   });
 }
 function comparableFilterInput(name, scalar) {
@@ -586,9 +598,9 @@ var init_filters = __esm({
       values: { ASC: { value: "asc" }, DESC: { value: "desc" } }
     });
     SORTABLE = [
-      { gql: "title", column: "title" },
-      { gql: "createdAt", column: "created_at" },
-      { gql: "updatedAt", column: "updated_at" }
+      { gql: "title", value: "title" },
+      { gql: "createdAt", value: "created_at" },
+      { gql: "updatedAt", value: "updated_at" }
     ];
     StringFilter = equalityFilterInput("StringFilter", import_graphql3.GraphQLString);
     BooleanFilter = new import_graphql3.GraphQLInputObjectType({
@@ -647,11 +659,13 @@ function collectionResolver(typeName, nameMap, fieldKeys) {
       throw codeError2("INVALID_PAGINATION", "perPage must be between 1 and 100");
     }
     const repo = ctx.repos[typeName];
+    const sortBy = args.sortBy ?? "created_at";
+    const sortColumn = fieldKeys?.columnFor(sortBy) ?? sortBy;
     const result = await repo.findMany({
       published_only: true,
       page,
       per_page: perPage,
-      sort_by: args.sortBy ?? "created_at",
+      sort_by: sortColumn,
       sort_order: args.sortOrder ?? "asc",
       filters: translateFilters(args.filter, nameMap, fieldKeys?.columnFor)
     });
@@ -1643,6 +1657,54 @@ function createProgrammaticResolver(resolvers, options) {
   return { resolveItem, resolveList, hasSchema };
 }
 
+// src/projector.ts
+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) {
+  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 });
+  }
+  return out;
+}
+function buildProjectors(registry, fieldKeyMaps) {
+  const projectors = {};
+  const sources = [
+    registry.content_types,
+    registry.taxonomy_types,
+    registry.paragraph_types
+  ];
+  for (const source of sources) {
+    for (const [typeName, type] of Object.entries(source)) {
+      const map = fieldKeyMaps[typeName];
+      if (!map) continue;
+      projectors[typeName] = { map, nested: nestedTargets(type.fields) };
+    }
+  }
+  return projectors;
+}
+function projectRow(row, typeName, projectors) {
+  const p = projectors[typeName];
+  if (!p) return row;
+  const out = p.map.toLabels(row);
+  for (const { label, target } of p.nested) {
+    const v = out[label];
+    if (v === null || v === void 0) continue;
+    if (Array.isArray(v)) {
+      out[label] = v.map((item) => isPlainRow(item) ? projectRow(item, target, projectors) : item);
+    } else if (isPlainRow(v)) {
+      out[label] = projectRow(v, target, projectors);
+    }
+  }
+  return out;
+}
+
 // src/routes/query-params.ts
 var SORTABLE_FIELDS = /* @__PURE__ */ new Set(["title", "created_at", "updated_at"]);
 var RELATION_FIELD_TYPES = /* @__PURE__ */ new Set([
@@ -1697,7 +1759,7 @@ function parseFilters(url, validFields, columnFor) {
 function isPublished(item) {
   return item["published"] === true;
 }
-function registerPublicContentRoutes(app, registry, repos, fieldKeyMaps, paths, listRateLimit, resolver) {
+function registerPublicContentRoutes(app, registry, repos, projectors, paths, listRateLimit, resolver) {
   function registerListRoute(path, handler) {
     if (listRateLimit) {
       app.get(path, listRateLimit, handler);
@@ -1740,13 +1802,14 @@ function registerPublicContentRoutes(app, registry, repos, fieldKeyMaps, paths,
             404
           );
         }
-        let data = fieldKeyMaps[typeName].toLabels(result.data[0]);
+        let data = projectRow(result.data[0], typeName, projectors);
         if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
         return c.json({ ok: true, data });
       });
     } else {
       registerListRoute(paths.collection(basePath), async (c) => {
-        const fieldKeys = fieldKeyMaps[typeName];
+        const projector = projectors[typeName];
+        const fieldKeys = projector.map;
         const pagination = parsePagination(c.req.query("page"), c.req.query("per_page"));
         if (!pagination.ok) {
           return c.json(
@@ -1814,17 +1877,18 @@ function registerPublicContentRoutes(app, registry, repos, fieldKeyMaps, paths,
             );
           }
         }
+        const sortColumn = fieldKeys.columnFor(sortBy) ?? sortBy;
         const result = await repo.findMany({
           published_only: true,
           page: pagination.page,
           per_page: pagination.per_page,
-          sort_by: sortBy,
+          sort_by: sortColumn,
           sort_order: sortOrder,
           filters: filtersResult.filters,
           include
         });
         const labeled = result.data.map(
-          (row) => fieldKeys.toLabels(row)
+          (row) => projectRow(row, typeName, projectors)
         );
         const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
         return c.json({ ...result, data });
@@ -1856,7 +1920,7 @@ function registerPublicContentRoutes(app, registry, repos, fieldKeyMaps, paths,
             404
           );
         }
-        let data = fieldKeyMaps[typeName].toLabels(item);
+        let data = projectRow(item, typeName, projectors);
         if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
         return c.json({ ok: true, data });
       });
@@ -1884,9 +1948,8 @@ function registerPublicContentRoutes(app, registry, repos, fieldKeyMaps, paths,
         page: pagination.page,
         per_page: pagination.per_page
       });
-      const fieldKeys = fieldKeyMaps[typeName];
       const labeled = result.data.map(
-        (row) => fieldKeys.toLabels(row)
+        (row) => projectRow(row, typeName, projectors)
       );
       const data = resolver?.hasSchema(typeName) ? await resolver.resolveList(typeName, labeled) : labeled;
       return c.json({ ...result, data });
@@ -1903,7 +1966,7 @@ function registerPublicContentRoutes(app, registry, repos, fieldKeyMaps, paths,
           404
         );
       }
-      let data = fieldKeyMaps[typeName].toLabels(item);
+      let data = projectRow(item, typeName, projectors);
       if (resolver?.hasSchema(typeName)) data = await resolver.resolveItem(typeName, data);
       return c.json({ ok: true, data });
     });
@@ -2119,7 +2182,7 @@ function parseListQuery(url, schemaFieldNames, relationFieldNames, columnFor) {
     search
   };
 }
-function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRepo, requirePermission, db) {
+function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo, requirePermission, db) {
   for (const [typeName, contentType] of Object.entries(registry.content_types)) {
     const basePath = `content/${typeName}`;
     const repo = repos[typeName];
@@ -2131,7 +2194,8 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
     const relationFieldNames = new Set(
       contentType.fields.filter((f) => RELATION_FIELD_TYPES.has(f.field_type)).map((f) => f.name)
     );
-    const fieldKeys = fieldKeyMaps[typeName];
+    const projector = projectors[typeName];
+    const fieldKeys = projector.map;
     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"
@@ -2152,10 +2216,11 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
         const publishedParam = c.req.query("published");
         const extraFilters = {};
         if (publishedParam === "false") extraFilters["published"] = false;
+        const sortColumn = fieldKeys.columnFor(parsed.sortBy) ?? parsed.sortBy;
         const findOpts = {
           page: parsed.pagination.page,
           per_page: parsed.pagination.per_page,
-          sort_by: parsed.sortBy,
+          sort_by: sortColumn,
           sort_order: parsed.sortOrder,
           filters: { ...parsed.filters, ...extraFilters },
           include: parsed.include
@@ -2165,7 +2230,9 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
           findOpts.search = { term: parsed.search, columns: searchableColumns };
         }
         const result = await repo.findMany(findOpts);
-        const data = result.data.map((row) => fieldKeys.toLabels(row));
+        const data = result.data.map(
+          (row) => projectRow(row, typeName, projectors)
+        );
         return c.json({ ...result, data });
       }
     );
@@ -2201,7 +2268,7 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
             }
           }
         }
-        const data = fieldKeys.toLabels(item);
+        const data = projectRow(item, typeName, projectors);
         return c.json({ ok: true, data });
       }
     );
@@ -2342,7 +2409,7 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
         }
       }
       await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
-      const data = fieldKeys.toLabels(item);
+      const data = projectRow(item, typeName, projectors);
       return c.json({ ok: true, data }, 201);
     };
     app.patch(
@@ -2463,7 +2530,7 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
         }
       }
       await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
-      const data = fieldKeys.toLabels(updated);
+      const data = projectRow(updated, typeName, projectors);
       return c.json({ ok: true, data });
     };
     if (contentType.only_one) {
@@ -2524,7 +2591,8 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
     const relationFieldNames = new Set(
       taxonomyType.fields.filter((f) => RELATION_FIELD_TYPES.has(f.field_type)).map((f) => f.name)
     );
-    const fieldKeys = fieldKeyMaps[typeName];
+    const projector = projectors[typeName];
+    const fieldKeys = projector.map;
     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"
@@ -2545,10 +2613,11 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
         const publishedParam = c.req.query("published");
         const extraFilters = {};
         if (publishedParam === "false") extraFilters["published"] = false;
+        const sortColumn = fieldKeys.columnFor(parsed.sortBy) ?? parsed.sortBy;
         const findOpts = {
           page: parsed.pagination.page,
           per_page: parsed.pagination.per_page,
-          sort_by: parsed.sortBy,
+          sort_by: sortColumn,
           sort_order: parsed.sortOrder,
           filters: { ...parsed.filters, ...extraFilters },
           include: parsed.include
@@ -2558,7 +2627,9 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
           findOpts.search = { term: parsed.search, columns: searchableColumns };
         }
         const result = await repo.findMany(findOpts);
-        const data = result.data.map((row) => fieldKeys.toLabels(row));
+        const data = result.data.map(
+          (row) => projectRow(row, typeName, projectors)
+        );
         return c.json({ ...result, data });
       }
     );
@@ -2574,7 +2645,7 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
             404
           );
         }
-        const data = fieldKeys.toLabels(item);
+        const data = projectRow(item, typeName, projectors);
         return c.json({ ok: true, data });
       }
     );
@@ -2627,7 +2698,7 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
           }
         }
         await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
-        const data = fieldKeys.toLabels(item);
+        const data = projectRow(item, typeName, projectors);
         return c.json({ ok: true, data }, 201);
       }
     );
@@ -2695,7 +2766,7 @@ function registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRep
           }
         }
         await applyMediaReferenceDelta(mergeMediaDeltas(...mediaDeltas), mediaRepo);
-        const data = fieldKeys.toLabels(updated);
+        const data = projectRow(updated, typeName, projectors);
         return c.json({ ok: true, data });
       }
     );
@@ -3688,7 +3759,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 var import_drizzle_orm6 = require("drizzle-orm");
 var API_VERSION = (() => {
   try {
-    return "0.4.0";
+    return "0.4.2";
   } catch {
     return "0.0.0";
   }
@@ -3734,6 +3805,9 @@ function registerConfigRoute(app, config, registry, db) {
 
 // src/routes/admin/schema.ts
 var import_drizzle_orm7 = require("drizzle-orm");
+function liveFields(fields) {
+  return fields.filter((f) => f.removed !== true);
+}
 function registerSchemaRoute(app, registry, db) {
   app.get("/admin/api/schema", (c) => {
     const content_types = Object.values(registry.content_types).map((ct) => ({
@@ -3742,19 +3816,19 @@ function registerSchemaRoute(app, registry, db) {
       only_one: ct.only_one,
       ui: ct.ui,
       system_fields: ct.system_fields,
-      fields: ct.fields
+      fields: liveFields(ct.fields)
     }));
     const taxonomy_types = Object.values(registry.taxonomy_types).map((tt) => ({
       name: tt.name,
       label: tt.label,
       system_fields: tt.system_fields,
-      fields: tt.fields
+      fields: liveFields(tt.fields)
     }));
     const paragraph_types = Object.values(registry.paragraph_types).map((pt) => ({
       name: pt.name,
       label: pt.label,
       system_fields: pt.system_fields,
-      fields: pt.fields
+      fields: liveFields(pt.fields)
     }));
     const enum_types = Object.values(registry.enum_types).map((et) => ({
       name: et.name,
@@ -3851,7 +3925,7 @@ function whereFragment(conds) {
   return conds.length > 0 ? import_drizzle_orm8.sql` WHERE ${import_drizzle_orm8.sql.join(conds, import_drizzle_orm8.sql` AND `)}` : import_drizzle_orm8.sql``;
 }
 function createDrizzleContentRepository(db, tableName, options = {}) {
-  const { relations = {}, publishedRelations = false } = options;
+  const { relations = {}, publishedRelations = false, sortableColumns } = options;
   function tableRaw() {
     return import_drizzle_orm8.sql.raw(quoteIdent3(tableName));
   }
@@ -3889,8 +3963,9 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
         sort_order = "asc",
         search
       } = opts;
-      if (!SORTABLE_FIELDS2.has(sort_by)) {
-        throw codeError("INVALID_SORT_FIELD", `'${sort_by}' is not sortable. Allowed: title, created_at, updated_at`);
+      const allowed = sortableColumns ?? SORTABLE_FIELDS2;
+      if (!allowed.has(sort_by)) {
+        throw codeError("INVALID_SORT_FIELD", `'${sort_by}' is not sortable.`);
       }
       const offset = (page - 1) * per_page;
       const conds = buildConditions(published_only, filters, search);
@@ -4139,16 +4214,38 @@ function createCmsApp(options) {
     return result.rows[0]?.role ?? null;
   };
   const requireHierarchy = createHierarchyMiddleware(rolesRegistry, getUserRole);
+  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)
+    ]),
+    ...Object.entries(registry.paragraph_types).map(([typeName, pt]) => [
+      typeName,
+      createFieldKeyMap(pt.fields)
+    ])
+  ]);
+  const projectors = buildProjectors(registry, fieldKeyMaps);
+  const sortableColumnsFor = (typeName) => new Set(
+    [...SORTABLE_FIELDS].map((label) => fieldKeyMaps[typeName].columnFor(label) ?? label)
+  );
   const contentRepos = Object.fromEntries(
     Object.entries(registry.content_types).map(([typeName, ct]) => [
       typeName,
-      createDrizzleContentRepository(db, ct.db.table_name)
+      createDrizzleContentRepository(db, ct.db.table_name, {
+        sortableColumns: sortableColumnsFor(typeName)
+      })
     ])
   );
   const taxonomyRepos = Object.fromEntries(
     Object.entries(registry.taxonomy_types).map(([typeName, tt]) => [
       typeName,
-      createDrizzleContentRepository(db, tt.db.table_name)
+      createDrizzleContentRepository(db, tt.db.table_name, {
+        sortableColumns: sortableColumnsFor(typeName)
+      })
     ])
   );
   const repos = { ...contentRepos, ...taxonomyRepos };
@@ -4158,7 +4255,8 @@ function createCmsApp(options) {
       typeName,
       createDrizzleContentRepository(db, ct.db.table_name, {
         relations: buildRelationsMap(ct.fields, registry),
-        publishedRelations: true
+        publishedRelations: true,
+        sortableColumns: sortableColumnsFor(typeName)
       })
     ])
   );
@@ -4167,7 +4265,8 @@ function createCmsApp(options) {
       typeName,
       createDrizzleContentRepository(db, tt.db.table_name, {
         relations: buildRelationsMap(tt.fields, registry),
-        publishedRelations: true
+        publishedRelations: true,
+        sortableColumns: sortableColumnsFor(typeName)
       })
     ])
   );
@@ -4175,11 +4274,15 @@ function createCmsApp(options) {
   const graphqlRepos = Object.fromEntries([
     ...Object.entries(registry.content_types).map(([typeName, ct]) => [
       typeName,
-      createDrizzleContentRepository(db, ct.db.table_name)
+      createDrizzleContentRepository(db, ct.db.table_name, {
+        sortableColumns: sortableColumnsFor(typeName)
+      })
     ]),
     ...Object.entries(registry.taxonomy_types).map(([typeName, tt]) => [
       typeName,
-      createDrizzleContentRepository(db, tt.db.table_name)
+      createDrizzleContentRepository(db, tt.db.table_name, {
+        sortableColumns: sortableColumnsFor(typeName)
+      })
     ])
   ]);
   registerAuthRoutes(app, db);
@@ -4220,17 +4323,7 @@ function createCmsApp(options) {
       paths: {}
     })
   );
-  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);
+  registerPublicContentRoutes(app, registry, publicRepos, projectors, publicPaths, listRateLimit, programmaticResolver);
   registerPublicMediaRoutes(app, mediaRepo, publicPaths, listRateLimit);
   if (options.graphql?.enabled) {
     const gqlOptions = options.graphql;
@@ -4277,7 +4370,7 @@ function createCmsApp(options) {
   );
   registerSchemaRoute(app, registry, db);
   registerUserRoutes(app, db, requirePermission, requireHierarchy);
-  registerAdminContentRoutes(app, registry, repos, fieldKeyMaps, mediaRepo, requirePermission, db);
+  registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo, requirePermission, db);
   registerAdminMediaRoutes(app, mediaRepo, storage, requirePermission, maxFileSize);
   return { prefix, app };
 }