@bobbykim/manguito-cms-api 0.9.2 → 0.9.3

package/dist/graphql/index.js

@@ -621,15 +621,30 @@ var import_dataloader = __toESM(require("dataloader"));
 
 // src/relations.ts
 var import_node_crypto = __toESM(require("crypto"));
+var import_drizzle_orm2 = require("drizzle-orm");
+var import_manguito_cms_core3 = require("@bobbykim/manguito-cms-core");
+
+// src/relation-input.ts
 var import_drizzle_orm = require("drizzle-orm");
 var import_manguito_cms_core2 = require("@bobbykim/manguito-cms-core");
+
+// src/relations.ts
 function quoteIdent(name) {
   if (!/^[a-z][a-z0-9_-]*$/.test(name)) throw new Error(`Unsafe identifier: ${name}`);
   return `"${name}"`;
 }
 function junctionOrderBy(junction) {
-  const right = import_drizzle_orm.sql.raw(quoteIdent(junction.right_column));
-  return junction.order_column ? import_drizzle_orm.sql` ORDER BY "order" ASC, ${right} ASC` : import_drizzle_orm.sql` ORDER BY ${right} ASC`;
+  const right = import_drizzle_orm2.sql.raw(quoteIdent(junction.right_column));
+  return junction.order_column ? import_drizzle_orm2.sql` ORDER BY "order" ASC, ${right} ASC` : import_drizzle_orm2.sql` ORDER BY ${right} ASC`;
+}
+function firstOfEach(items, key) {
+  const seen = /* @__PURE__ */ new Set();
+  return items.filter((item) => {
+    const k = key(item);
+    if (seen.has(k)) return false;
+    seen.add(k);
+    return true;
+  });
 }
 function oneOrMany(cardinality, list) {
   return cardinality === "one" ? list[0] ?? null : list;
@@ -647,7 +662,7 @@ function buildRelationsMap(fields, registry) {
       relations[field.name] = {
         type: "paragraph",
         table: pType.db.table_name,
-        cardinality: (0, import_manguito_cms_core2.relationCardinality)(field) ?? "many"
+        cardinality: (0, import_manguito_cms_core3.relationCardinality)(field) ?? "many"
       };
     } else if (field.field_type === "reference") {
       if (!field.db_column) continue;
@@ -690,9 +705,9 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
   const batch = [...new Set(rows)];
   if (rel.type === "paragraph") {
     const parentIds = batch.map((r) => r["id"]);
-    const inList = import_drizzle_orm.sql.join(parentIds.map((id) => import_drizzle_orm.sql`${id}`), import_drizzle_orm.sql`, `);
+    const inList = import_drizzle_orm2.sql.join(parentIds.map((id) => import_drizzle_orm2.sql`${id}`), import_drizzle_orm2.sql`, `);
     const result = await db.execute(
-      import_drizzle_orm.sql`SELECT * FROM ${import_drizzle_orm.sql.raw(quoteIdent(rel.table))} WHERE parent_id IN (${inList}) AND parent_field = ${fieldName} ORDER BY "order" ASC`
+      import_drizzle_orm2.sql`SELECT * FROM ${import_drizzle_orm2.sql.raw(quoteIdent(rel.table))} WHERE parent_id IN (${inList}) AND parent_field = ${fieldName} ORDER BY "order" ASC, id ASC`
     );
     const byParent = groupBy(result.rows, "parent_id");
     for (const row of batch) {
@@ -709,10 +724,10 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
     const unique = [...new Set(fkValues)];
     const uncached = unique.filter((id) => !cache.has(`${rel.table}:${id}`));
     if (uncached.length > 0) {
-      const inList = import_drizzle_orm.sql.join(uncached.map((id) => import_drizzle_orm.sql`${id}`), import_drizzle_orm.sql`, `);
-      const publishedCond = publishedOnly ? import_drizzle_orm.sql` AND published = true` : import_drizzle_orm.sql``;
+      const inList = import_drizzle_orm2.sql.join(uncached.map((id) => import_drizzle_orm2.sql`${id}`), import_drizzle_orm2.sql`, `);
+      const publishedCond = publishedOnly ? import_drizzle_orm2.sql` AND published = true` : import_drizzle_orm2.sql``;
       const result = await db.execute(
-        import_drizzle_orm.sql`SELECT * FROM ${import_drizzle_orm.sql.raw(quoteIdent(rel.table))} WHERE id IN (${inList})${publishedCond}`
+        import_drizzle_orm2.sql`SELECT * FROM ${import_drizzle_orm2.sql.raw(quoteIdent(rel.table))} WHERE id IN (${inList})${publishedCond}`
       );
       for (const item of result.rows) {
         cache.set(`${rel.table}:${item["id"]}`, item);
@@ -724,18 +739,18 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
     }
   } else if (rel.type === "junction") {
     const parentIds = batch.map((r) => r["id"]);
-    const inList = import_drizzle_orm.sql.join(parentIds.map((id) => import_drizzle_orm.sql`${id}`), import_drizzle_orm.sql`, `);
+    const inList = import_drizzle_orm2.sql.join(parentIds.map((id) => import_drizzle_orm2.sql`${id}`), import_drizzle_orm2.sql`, `);
     const junctionResult = await db.execute(
-      import_drizzle_orm.sql`SELECT * FROM ${import_drizzle_orm.sql.raw(quoteIdent(rel.junction_table))} WHERE ${import_drizzle_orm.sql.raw(quoteIdent(rel.left_column))} IN (${inList})${junctionOrderBy(rel)}`
+      import_drizzle_orm2.sql`SELECT * FROM ${import_drizzle_orm2.sql.raw(quoteIdent(rel.junction_table))} WHERE ${import_drizzle_orm2.sql.raw(quoteIdent(rel.left_column))} IN (${inList})${junctionOrderBy(rel)}`
     );
     const jRows = junctionResult.rows;
     const rightIds = [...new Set(jRows.map((r) => r[rel.right_column]))];
     const uncached = rightIds.filter((id) => !cache.has(`${rel.table}:${id}`));
     if (uncached.length > 0) {
-      const rightInList = import_drizzle_orm.sql.join(uncached.map((id) => import_drizzle_orm.sql`${id}`), import_drizzle_orm.sql`, `);
-      const publishedCond = publishedOnly ? import_drizzle_orm.sql` AND published = true` : import_drizzle_orm.sql``;
+      const rightInList = import_drizzle_orm2.sql.join(uncached.map((id) => import_drizzle_orm2.sql`${id}`), import_drizzle_orm2.sql`, `);
+      const publishedCond = publishedOnly ? import_drizzle_orm2.sql` AND published = true` : import_drizzle_orm2.sql``;
       const entitiesResult = await db.execute(
-        import_drizzle_orm.sql`SELECT * FROM ${import_drizzle_orm.sql.raw(quoteIdent(rel.table))} WHERE id IN (${rightInList})${publishedCond}`
+        import_drizzle_orm2.sql`SELECT * FROM ${import_drizzle_orm2.sql.raw(quoteIdent(rel.table))} WHERE id IN (${rightInList})${publishedCond}`
       );
       for (const item of entitiesResult.rows) {
         cache.set(`${rel.table}:${item["id"]}`, item);
@@ -743,7 +758,7 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
     }
     const byLeft = groupBy(jRows, rel.left_column);
     for (const row of batch) {
-      const jEntries = byLeft[row["id"]] ?? [];
+      const jEntries = firstOfEach(byLeft[row["id"]] ?? [], (jr) => jr[rel.right_column]);
       row[fieldName] = jEntries.map((jr) => cache.get(`${rel.table}:${jr[rel.right_column]}`)).filter(Boolean);
     }
   } else if (rel.type === "media") {
@@ -757,8 +772,8 @@ async function resolveRelationField(db, rows, fieldName, rel, cache, publishedOn
     const unique = [...new Set(fkValues)];
     const uncached = unique.filter((id) => !cache.has(`media:${id}`));
     if (uncached.length > 0) {
-      const inList = import_drizzle_orm.sql.join(uncached.map((id) => import_drizzle_orm.sql`${id}`), import_drizzle_orm.sql`, `);
-      const result = await db.execute(import_drizzle_orm.sql`SELECT * FROM "media" WHERE id IN (${inList})`);
+      const inList = import_drizzle_orm2.sql.join(uncached.map((id) => import_drizzle_orm2.sql`${id}`), import_drizzle_orm2.sql`, `);
+      const result = await db.execute(import_drizzle_orm2.sql`SELECT * FROM "media" WHERE id IN (${inList})`);
       for (const item of result.rows) {
         cache.set(`media:${item["id"]}`, item);
       }