@bobbykim/manguito-cms-cli 0.8.1 → 0.8.2

package/dist/index.js

@@ -22839,13 +22839,89 @@ function checkRelationInput(fields, body, registry, path5 = "") {
   }
   return errors;
 }
+function paragraphItemsIn(fields, body, registry, path5) {
+  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 = `${path5}${field.name}`;
+    if (relationCardinality(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, path5 = "") {
+  const errors = [];
+  for (const { item, fields: itemFields, prefix } of paragraphItemsIn(fields, body, registry, path5)) {
+    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, path5, 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 = `${path5}${f.name}`;
+    if (typeof value === "string") {
+      out.push({ table, id: value, field: name });
+    } else if (Array.isArray(value)) {
+      value.forEach((v2, i) => {
+        if (typeof v2 === "string") out.push({ table, id: v2, field: `${name}[${i}]` });
+      });
+    }
+  }
+  for (const { item, fields: itemFields, prefix } of paragraphItemsIn(fields, body, registry, path5)) {
+    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(
+      sql`SELECT id FROM ${sql.raw(quoteIdent2(table))} WHERE id IN (${sql.join(ids.map((id) => sql`${id}`), sql`, `)})`
+    );
+    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.` }));
+}
+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(
-    sql`SELECT * FROM ${sql.raw(quoteIdent2(pType.db.table_name))} WHERE parent_id = ${parentId} AND parent_field = ${fieldName} ORDER BY "order" ASC`
+    sql`SELECT * FROM ${sql.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) {
@@ -22870,22 +22946,20 @@ async function lookupBasePathId(db, pathOrName) {
   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;
@@ -23032,7 +23106,7 @@ function registerAdminContentRoutes(app, registry, repos, projectors, mediaRepo,
             } else if (f.db_column.junction) {
               const j = f.db_column.junction;
               const r = await db.execute(
-                sql`SELECT ${sql.raw(quoteIdent2(j.right_column))} FROM ${sql.raw(quoteIdent2(j.table_name))} WHERE ${sql.raw(quoteIdent2(j.left_column))} = ${id}`
+                sql`SELECT ${sql.raw(quoteIdent3(j.right_column))} FROM ${sql.raw(quoteIdent3(j.table_name))} WHERE ${sql.raw(quoteIdent3(j.left_column))} = ${id}`
               );
               row[f.name] = r.rows.map(
                 (row2) => row2[j.right_column]
@@ -23108,8 +23182,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) {
@@ -23244,8 +23318,8 @@ 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 () => {
@@ -23443,8 +23517,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) {
@@ -23507,8 +23581,8 @@ 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 () => {
           });
@@ -24545,7 +24619,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 }
 var API_VERSION = (() => {
   try {
-    return "0.8.0";
+    return "0.8.1";
   } catch {
     return "0.0.0";
   }
@@ -24654,7 +24728,7 @@ function codeError(code, 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}`);
   }
@@ -24705,7 +24779,7 @@ function whereFragment(conds) {
 function createDrizzleContentRepository(db, tableName, options = {}) {
   const { relations = {}, publishedRelations = false, sortableColumns } = options;
   function tableRaw() {
-    return sql.raw(quoteIdent3(tableName));
+    return sql.raw(quoteIdent4(tableName));
   }
   async function resolveRows(rows, include, cache) {
     if (rows.length === 0) return rows;
@@ -24748,7 +24822,7 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
       const offset = (page - 1) * per_page;
       const conds = buildConditions(published_only, filters, search);
       const where = whereFragment(conds);
-      const sortCol = sql.raw(quoteIdent3(sort_by));
+      const sortCol = sql.raw(quoteIdent4(sort_by));
       const sortDir = sql.raw(sort_order === "desc" ? "DESC" : "ASC");
       const countResult = await db.execute(
         sql`SELECT COUNT(*) AS total FROM ${tableRaw()}${where}`
@@ -24802,7 +24876,7 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
         updated_at: /* @__PURE__ */ new Date()
       };
       const entries = Object.entries(record).filter(([, v2]) => v2 !== void 0);
-      const colsSql = sql.join(entries.map(([k]) => sql.raw(quoteIdent3(k))), sql`, `);
+      const colsSql = sql.join(entries.map(([k]) => sql.raw(quoteIdent4(k))), sql`, `);
       const valsSql = sql.join(entries.map(([, v2]) => sql`${v2}`), sql`, `);
       const result = await db.execute(
         sql`INSERT INTO ${tableRaw()} (${colsSql}) VALUES (${valsSql}) RETURNING *`
@@ -24819,7 +24893,7 @@ function createDrizzleContentRepository(db, tableName, options = {}) {
         return this.findOne(id);
       }
       const setClauses = sql.join(
-        entries.map(([k, v2]) => sql`${sql.raw(quoteIdent3(k))} = ${v2}`),
+        entries.map(([k, v2]) => sql`${sql.raw(quoteIdent4(k))} = ${v2}`),
         sql`, `
       );
       const result = await db.execute(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobbykim/manguito-cms-cli",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "license": "MIT",
   "author": "Bobby Kim <bobby.sihun.kim@gmail.com>",
   "homepage": "https://github.com/bobbykim89/manguito-cms",
@@ -31,8 +31,8 @@
     "vite": "^8.1.3",
     "@bobbykim/manguito-cms-admin": "0.5.1",
     "@bobbykim/manguito-cms-core": "0.7.0",
-    "@bobbykim/manguito-cms-api": "0.8.0",
-    "@bobbykim/manguito-cms-db": "0.1.7"
+    "@bobbykim/manguito-cms-db": "0.1.7",
+    "@bobbykim/manguito-cms-api": "0.8.1"
   },
   "devDependencies": {
     "@types/node": "^25.9.5",