@bobbykim/manguito-cms-cli 0.8.2 → 0.9.1

package/dist/{chunk-4LYEA2W3.js → chunk-L36JYVXK.js}

@@ -25993,6 +25993,22 @@ function buildFields(rawFields, sourceFile, ownerTableName) {
   }
   return { fields, errors };
 }
+function collectJunctionTables(fields) {
+  const junctionTables = [];
+  for (const field of fields) {
+    if (field.field_type === "reference" && field.db_column?.junction) {
+      const j = field.db_column.junction;
+      junctionTables.push({
+        table_name: j.table_name,
+        left_column: j.left_column,
+        right_column: j.right_column,
+        right_table: j.right_table,
+        order_column: j.order_column
+      });
+    }
+  }
+  return junctionTables;
+}
 function parseContentType(raw, sourceFile) {
   const result = ContentTypeRawSchema.safeParse(raw);
   if (!result.success) {
@@ -26018,19 +26034,6 @@ function parseContentType(raw, sourceFile) {
   const tableName = machineNameToTableName(v.name);
   const { fields, errors } = buildFields(flatRawFields, sourceFile, tableName);
   if (errors.length > 0) return { ok: false, errors };
-  const junctionTables = [];
-  for (const field of fields) {
-    if (field.field_type === "reference" && field.db_column?.junction) {
-      const j = field.db_column.junction;
-      junctionTables.push({
-        table_name: j.table_name,
-        left_column: j.left_column,
-        right_column: j.right_column,
-        right_table: j.right_table,
-        order_column: j.order_column
-      });
-    }
-  }
   const nameKebab = nameSegmentToKebab(getNameSegment(v.name));
   const api = v.only_one ? {
     default_base_path: v.default_base_path,
@@ -26052,7 +26055,7 @@ function parseContentType(raw, sourceFile) {
     system_fields: CONTENT_SYSTEM_FIELDS,
     fields,
     ui: { tabs },
-    db: { table_name: tableName, junction_tables: junctionTables },
+    db: { table_name: tableName, junction_tables: collectJunctionTables(fields) },
     api
   };
   return { ok: true, schema };
@@ -26105,7 +26108,7 @@ function parseTaxonomyType(raw, sourceFile) {
     source_file: sourceFile,
     system_fields: TAXONOMY_SYSTEM_FIELDS,
     fields,
-    db: { table_name: tableName },
+    db: { table_name: tableName, junction_tables: collectJunctionTables(fields) },
     api: {
       collection_path: basePath,
       item_path: `${basePath}/:id`

package/dist/{handler-VEOWJRAL-AUA3O2FA.js → handler-VEOWJRAL-6WUFNANJ.js}

@@ -12,7 +12,7 @@ import {
   isColumnBacked,
   relationCardinality,
   resolveRelationField
-} from "./chunk-4LYEA2W3.js";
+} from "./chunk-L36JYVXK.js";
 
 // ../../node_modules/.pnpm/@whatwg-node+fetch@0.10.13/node_modules/@whatwg-node/fetch/dist/shouldSkipPonyfill.js
 var require_shouldSkipPonyfill = __commonJS({

package/dist/index.js

@@ -54,7 +54,7 @@ import {
   validateCrossReferences,
   verifyPassword,
   walkSchemaDirectory
-} from "./chunk-4LYEA2W3.js";
+} from "./chunk-L36JYVXK.js";
 
 // ../../node_modules/.pnpm/postgres-array@2.0.0/node_modules/postgres-array/index.js
 var require_postgres_array = __commonJS({
@@ -16975,9 +16975,13 @@ function orderParagraphTypes(paragraphs) {
 }
 function generateJunctionTables(registry) {
   const tables = [];
-  for (const ct2 of Object.values(registry.content_types)) {
-    const leftVar = tableNameToVarName(ct2.db.table_name);
-    for (const jt of ct2.db.junction_tables) {
+  const owners = [
+    ...Object.values(registry.content_types),
+    ...Object.values(registry.taxonomy_types)
+  ];
+  for (const owner of owners) {
+    const leftVar = tableNameToVarName(owner.db.table_name);
+    for (const jt of owner.db.junction_tables) {
       const varName = tableNameToVarName(jt.table_name);
       const rightVar = tableNameToVarName(jt.right_table);
       const orderLine = jt.order_column ? `    order: s.integer('order').notNull().default(0),` : null;
@@ -17526,11 +17530,18 @@ function fieldToZodSchema(field, registry) {
       return "z.unknown()";
   }
 }
+function acceptsNull(f) {
+  if (relationCardinality(f) === "many") return false;
+  return f.db_column ? f.db_column.nullable : f.nullable;
+}
+function fieldEntrySchema(f, registry) {
+  let s = fieldToZodSchema(f, registry);
+  if (acceptsNull(f)) s += ".nullable()";
+  if (!f.required) s += ".optional()";
+  return s;
+}
 function generateParagraphObjectSchema(paragraph, registry) {
-  const entries = paragraph.fields.map((f) => {
-    const zodType = fieldToZodSchema(f, registry);
-    return `${f.name}: ${f.required ? zodType : `${zodType}.optional()`}`;
-  });
+  const entries = paragraph.fields.map((f) => `${f.name}: ${fieldEntrySchema(f, registry)}`);
   if (entries.length === 0) return "z.object({})";
   return `z.object({ ${entries.join(", ")} })`;
 }
@@ -17545,10 +17556,7 @@ function systemFieldEntries(schema) {
   return entries;
 }
 function schemaFieldEntries(fields, registry) {
-  return fields.map((f) => {
-    const zodType = fieldToZodSchema(f, registry);
-    return `  ${f.name}: ${f.required ? zodType : `${zodType}.optional()`}`;
-  });
+  return fields.map((f) => `  ${f.name}: ${fieldEntrySchema(f, registry)}`);
 }
 function generateContentSchema(schema, registry) {
   const name = schemaVar(schema.name);
@@ -17611,6 +17619,10 @@ var ADMIN_LIST_QUERY = `z.object({
   })`;
 var SLUG_PARAMS = `z.object({ slug: z.string() })`;
 var ID_PARAMS = `z.object({ id: z.string().uuid() })`;
+var ITEM_IN_USE_RESPONSE = `{
+      content: { 'application/json': { schema: ErrorResponseSchema } },
+      description: 'ITEM_IN_USE: a required reference elsewhere still points at this item',
+    }`;
 var INCLUDE_QUERY = `z.object({ include: z.string().optional().describe('Comma-separated relation field names to expand') })`;
 function generateContentRoutes(contentType) {
   const sVar = schemaVar(contentType.name);
@@ -17770,6 +17782,7 @@ function generateContentRoutes(contentType) {
       content: { 'application/json': { schema: ErrorResponseSchema } },
       description: '${label} not found',
     },
+    409: ${ITEM_IN_USE_RESPONSE},
   },
 })`
     );
@@ -18031,6 +18044,7 @@ function generateTaxonomyRoutes(taxonomyType) {
       content: { 'application/json': { schema: ErrorResponseSchema } },
       description: '${label} not found',
     },
+    409: ${ITEM_IN_USE_RESPONSE},
   },
 })`
   );
@@ -22939,6 +22953,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(relationCardinality(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(
+        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((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((v2) => typeof v2 === "string") : [];
+      await persistJunctionField(db, itemId, f.db_column.junction, relatedIds);
+    }
+  }
+  return deltas;
+}
 async function lookupBasePathId(db, pathOrName) {
   const r = await db.execute(
     sql`SELECT id FROM base_paths WHERE path = ${pathOrName} OR name = ${pathOrName} LIMIT 1`
@@ -23094,26 +23148,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(relationCardinality(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(
-                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]
-              );
-            }
-          }
-        }
+        if (db) await loadRelationsForEdit(db, registry, contentType.fields, id, item);
         const data = projectRow(item, typeName, projectors);
         return c.json({ ok: true, data });
       }
@@ -23204,10 +23239,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
@@ -23242,19 +23273,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((v2) => typeof v2 === "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);
@@ -23325,7 +23344,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(
@@ -23341,10 +23360,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"];
@@ -23365,21 +23380,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((v2) => typeof v2 === "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);
@@ -23508,6 +23509,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 });
       }
@@ -23539,7 +23541,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
@@ -23553,14 +23554,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);
@@ -23587,7 +23581,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(
@@ -23603,7 +23597,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"];
@@ -23623,15 +23616,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);
@@ -24619,7 +24604,7 @@ function registerUserRoutes(app, db, requirePermission, requireHierarchy) {
 }
 var API_VERSION = (() => {
   try {
-    return "0.8.1";
+    return "0.8.3";
   } catch {
     return "0.0.0";
   }
@@ -25302,7 +25287,7 @@ function createCmsApp(options) {
       handler: null,
       error: null
     }));
-    const ready = import("./handler-VEOWJRAL-AUA3O2FA.js").then(({ createGraphQLHandler }) => {
+    const ready = import("./handler-VEOWJRAL-6WUFNANJ.js").then(({ createGraphQLHandler }) => {
       gqlPasses.forEach((pass, i) => {
         const mount = mounts[i];
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobbykim/manguito-cms-cli",
-  "version": "0.8.2",
+  "version": "0.9.1",
   "license": "MIT",
   "author": "Bobby Kim <bobby.sihun.kim@gmail.com>",
   "homepage": "https://github.com/bobbykim89/manguito-cms",
@@ -29,10 +29,10 @@
     "tsup": "^8.5.1",
     "typescript": "^6.0.3",
     "vite": "^8.1.3",
-    "@bobbykim/manguito-cms-admin": "0.5.1",
-    "@bobbykim/manguito-cms-core": "0.7.0",
-    "@bobbykim/manguito-cms-db": "0.1.7",
-    "@bobbykim/manguito-cms-api": "0.8.1"
+    "@bobbykim/manguito-cms-admin": "0.5.2",
+    "@bobbykim/manguito-cms-core": "0.8.0",
+    "@bobbykim/manguito-cms-api": "0.8.3",
+    "@bobbykim/manguito-cms-db": "0.1.8"
   },
   "devDependencies": {
     "@types/node": "^25.9.5",
@@ -43,7 +43,7 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "test": "dotenv -e ../../.env.test -- vitest run",
-    "lint": "eslint src",
+    "lint": "eslint src tests",
     "typecheck": "tsc --noEmit"
   }
 }