@loomcore/api 0.1.100 → 0.1.101

package/dist/databases/postgres/utils/build-join-clauses.js

@@ -1,6 +1,5 @@
 import { LeftJoin } from "../../operations/left-join.operation.js";
 import { InnerJoin } from "../../operations/inner-join.operation.js";
-import { LeftJoinMany } from "../../operations/left-join-many.operation.js";
 import { toSnakeCase } from "./convert-keys.util.js";
 function convertFieldToSnakeCase(field) {
     if (field.startsWith("_")) {
@@ -20,7 +19,7 @@ function resolveLocalField(localField, mainTableName) {
 export function buildJoinClauses(operations, mainTableName) {
     let joinClause = "";
     for (const operation of operations) {
-        if (operation instanceof LeftJoin || operation instanceof InnerJoin || operation instanceof LeftJoinMany) {
+        if (operation instanceof LeftJoin || operation instanceof InnerJoin) {
             const localRef = resolveLocalField(operation.localField, mainTableName);
             const foreignSnake = convertFieldToSnakeCase(operation.foreignField);
             const joinType = operation instanceof InnerJoin ? "INNER JOIN" : "LEFT JOIN";

package/dist/databases/postgres/utils/build-select-clause.js

@@ -1,6 +1,22 @@
 import { LeftJoin } from '../../operations/left-join.operation.js';
 import { InnerJoin } from '../../operations/inner-join.operation.js';
 import { LeftJoinMany } from '../../operations/left-join-many.operation.js';
+import { toSnakeCase } from './convert-keys.util.js';
+function convertFieldToSnakeCase(field) {
+    if (field.startsWith('_')) {
+        return field;
+    }
+    return toSnakeCase(field);
+}
+function resolveLocalRef(localField, mainTableName) {
+    if (!localField.includes('.')) {
+        const snake = convertFieldToSnakeCase(localField);
+        return `"${mainTableName}"."${snake}"`;
+    }
+    const [alias, field] = localField.split('.');
+    const snake = convertFieldToSnakeCase(field);
+    return `${alias}."${snake}"`;
+}
 async function getTableColumns(client, tableName) {
     const result = await client.query(`
             SELECT column_name
@@ -40,7 +56,13 @@ export async function buildSelectClause(client, mainTableName, mainTableAlias, o
         if (enrichment) {
             continue;
         }
-        joinSelects.push(`${joinMany.as}.aggregated AS "${joinMany.as}"`);
+        const manyColumns = await getTableColumns(client, joinMany.from);
+        const foreignSnake = convertFieldToSnakeCase(joinMany.foreignField);
+        const localRef = resolveLocalRef(joinMany.localField, mainTableName);
+        const subAlias = `_sub_${joinMany.as}`;
+        const objParts = manyColumns.map(c => `'${c.replace(/'/g, "''")}', ${subAlias}."${c}"`).join(', ');
+        const subquery = `(SELECT COALESCE(jsonb_agg(jsonb_build_object(${objParts})), '[]'::jsonb) FROM "${joinMany.from}" AS ${subAlias} WHERE ${subAlias}."${foreignSnake}" = ${localRef})`;
+        joinSelects.push(`${subquery} AS "${joinMany.as}"`);
     }
     const allSelects = [...mainSelects, ...joinSelects];
     return allSelects.join(', ');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.1.100",
+  "version": "0.1.101",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {