@bobbykim/manguito-cms-api 0.8.1 → 0.8.2

package/dist/index.mjs

@@ -1281,6 +1281,46 @@ 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(
     sql4`SELECT id FROM base_paths WHERE path = ${pathOrName} OR name = ${pathOrName} LIMIT 1`
@@ -1436,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(
-                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(
-                (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 });
       }
@@ -1546,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
@@ -1584,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);
@@ -1667,7 +1672,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
         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(
@@ -1683,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"];
@@ -1707,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);
@@ -1850,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 });
       }
@@ -1881,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
@@ -1895,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);
@@ -1929,7 +1909,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
           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(
@@ -1945,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"];
@@ -1965,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);
@@ -2980,7 +2951,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 import { sql as sql7 } from "drizzle-orm";
 var API_VERSION = (() => {
   try {
-    return "0.8.1";
+    return "0.8.2";
   } catch {
     return "0.0.0";
   }