@loomcore/api 0.1.104 → 0.1.106

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

@@ -19,7 +19,8 @@ function resolveLocalRef(localField, mainTableName, operations, currentIndex) {
     const leftJoinMany = priorOps.find((op) => op instanceof LeftJoinMany && op.as === alias);
     if (leftJoinMany) {
         const castType = field === '_id' || snake === '_id' ? '::int' : '::text';
-        return `(SELECT jsonb_array_elements("${alias}")->>'${snake}'${castType})`;
+        const elemAlias = `_elem_${alias}`;
+        return `(SELECT (${elemAlias}->>'${snake}')${castType} FROM jsonb_array_elements("${alias}") AS ${elemAlias})`;
     }
     return `${alias}."${snake}"`;
 }
@@ -59,21 +60,23 @@ export async function buildSelectClause(client, mainTableName, mainTableAlias, o
     }
     for (let i = 0; i < leftJoinManyOperations.length; i++) {
         const joinMany = leftJoinManyOperations[i];
-        const enrichment = findEnrichmentTarget(joinMany, operations);
-        if (enrichment) {
-            continue;
-        }
         const manyColumns = await getTableColumns(client, joinMany.from);
         const foreignSnake = convertFieldToSnakeCase(joinMany.foreignField);
         const currentOpIndex = operations.indexOf(joinMany);
         const localRef = resolveLocalRef(joinMany.localField, mainTableName, operations, currentOpIndex);
         const subAlias = `_sub_${joinMany.as}`;
         const objParts = manyColumns.map(c => `'${c.replace(/'/g, "''")}', ${subAlias}."${c}"`).join(', ');
-        const isArrayRef = joinMany.localField.includes('.') &&
-            operations.slice(0, currentOpIndex).some(op => op instanceof LeftJoinMany && op.as === joinMany.localField.split('.')[0]);
+        const priorOps = operations.slice(0, currentOpIndex);
+        const referencedLeftJoinMany = joinMany.localField.includes('.')
+            ? priorOps.find((op) => op instanceof LeftJoinMany && op.as === joinMany.localField.split('.')[0])
+            : null;
         let whereClause;
-        if (isArrayRef) {
-            whereClause = `${subAlias}."${foreignSnake}" IN ${localRef}`;
+        if (referencedLeftJoinMany) {
+            const [prevAlias, fieldName] = joinMany.localField.split('.');
+            const prevFieldSnake = convertFieldToSnakeCase(fieldName);
+            const prevLocalRef = resolveLocalRef(referencedLeftJoinMany.localField, mainTableName, operations, operations.indexOf(referencedLeftJoinMany));
+            const prevForeignSnake = convertFieldToSnakeCase(referencedLeftJoinMany.foreignField);
+            whereClause = `${subAlias}."${foreignSnake}" IN (SELECT "${prevFieldSnake}" FROM "${referencedLeftJoinMany.from}" WHERE "${referencedLeftJoinMany.from}"."${prevForeignSnake}" = ${prevLocalRef})`;
         }
         else {
             whereClause = `${subAlias}."${foreignSnake}" = ${localRef}`;

package/dist/databases/postgres/utils/transform-join-results.js

@@ -28,15 +28,23 @@ function getJoinAliasesAndParents(operations) {
     return { aliases, parentByAlias };
 }
 const PREFIX_SEP = '__';
-function setJoinValue(joinData, alias, value, parentByAlias) {
+function setJoinValue(joinData, alias, value, parentByAlias, operations) {
     const parent = parentByAlias.get(alias) ?? null;
     if (parent) {
-        let parentObj = joinData[parent];
-        if (parentObj == null || typeof parentObj !== 'object' || Array.isArray(parentObj)) {
-            parentObj = {};
-            joinData[parent] = parentObj;
+        const parentValue = joinData[parent];
+        const parentOp = operations.find(op => (op instanceof LeftJoinMany || op instanceof LeftJoin || op instanceof InnerJoin) && op.as === parent);
+        const isParentArray = parentOp instanceof LeftJoinMany;
+        if (isParentArray && Array.isArray(parentValue)) {
+            joinData[alias] = value;
+        }
+        else {
+            let parentObj = parentValue;
+            if (parentObj == null || typeof parentObj !== 'object' || Array.isArray(parentObj)) {
+                parentObj = {};
+                joinData[parent] = parentObj;
+            }
+            parentObj[alias] = value;
         }
-        parentObj[alias] = value;
     }
     else {
         joinData[alias] = value;
@@ -87,7 +95,7 @@ export function transformJoinResults(rows, operations) {
             const value = flatJoinValues[alias];
             if (value === undefined)
                 continue;
-            setJoinValue(joinData, alias, value, parentByAlias);
+            setJoinValue(joinData, alias, value, parentByAlias, operations);
         }
         if (Object.keys(joinData).length > 0) {
             transformed._joinData = joinData;

package/package.json

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