@loomcore/api 0.1.112 → 0.1.114

package/dist/databases/postgres/commands/postgres-batch-update.command.js

@@ -44,7 +44,7 @@ export async function batchUpdate(client, entities, operations, queryObject, plu
         queryObject.filters._id = { in: entityIds };
         const { whereClause, values } = buildWhereClause(queryObject, [], tablePrefix);
         const selectClause = hasJoins
-            ? await buildSelectClause(client, pluralResourceName, pluralResourceName, operations)
+            ? await buildSelectClause(client, pluralResourceName, operations)
             : '*';
         const selectQuery = `
             SELECT ${selectClause} FROM "${pluralResourceName}" ${joinClauses}

package/dist/databases/postgres/queries/postgres-get-all.query.js

@@ -8,7 +8,7 @@ export async function getAll(client, operations, pluralResourceName) {
     const joinClauses = buildJoinClauses(operations, pluralResourceName);
     const hasJoins = operations.some(op => op instanceof LeftJoin || op instanceof InnerJoin || op instanceof LeftJoinMany);
     const selectClause = hasJoins
-        ? await buildSelectClause(client, pluralResourceName, pluralResourceName, operations)
+        ? await buildSelectClause(client, pluralResourceName, operations)
         : '*';
     const query = `SELECT ${selectClause} FROM "${pluralResourceName}" ${joinClauses}`;
     const result = await client.query(query);

package/dist/databases/postgres/queries/postgres-get-by-id.query.js

@@ -12,7 +12,7 @@ export async function getById(client, operations, queryObject, id, pluralResourc
     const joinClauses = buildJoinClauses(operations, pluralResourceName);
     const hasJoins = operations.some(op => op instanceof LeftJoin || op instanceof InnerJoin || op instanceof LeftJoinMany);
     const selectClause = hasJoins
-        ? await buildSelectClause(client, pluralResourceName, pluralResourceName, operations)
+        ? await buildSelectClause(client, pluralResourceName, operations)
         : '*';
     queryObject.filters || (queryObject.filters = {});
     queryObject.filters._id = { eq: id };

package/dist/databases/postgres/queries/postgres-get.query.js

@@ -15,7 +15,7 @@ export async function get(client, operations, queryOptions, pluralResourceName)
     const paginationClause = buildPaginationClause(queryOptions);
     const hasJoins = operations.some(op => op instanceof LeftJoin || op instanceof InnerJoin || op instanceof LeftJoinMany);
     const selectClause = hasJoins
-        ? await buildSelectClause(client, pluralResourceName, pluralResourceName, operations)
+        ? await buildSelectClause(client, pluralResourceName, operations)
         : '*';
     const tablePrefix = hasJoins ? pluralResourceName : undefined;
     const { whereClause, values } = buildWhereClause(queryOptions, [], tablePrefix);

package/dist/databases/postgres/utils/build-join-clauses.d.ts

@@ -1,2 +1,2 @@
 import { Operation } from "../../operations/operation.js";
-export declare function buildJoinClauses(operations: Operation[], mainTableName: string): string;
+export declare function buildJoinClauses(operations: Operation[], mainTableName?: string): string;

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

@@ -7,24 +7,17 @@ function convertFieldToSnakeCase(field) {
     }
     return toSnakeCase(field);
 }
-function resolveLocalField(localField, mainTableName) {
-    if (!localField.includes(".")) {
-        const snake = convertFieldToSnakeCase(localField);
-        return `"${mainTableName}"."${snake}"`;
-    }
-    const [alias, field] = localField.split(".");
-    const snake = convertFieldToSnakeCase(field);
-    return `${alias}."${snake}"`;
-}
 export function buildJoinClauses(operations, mainTableName) {
-    let joinClause = "";
+    let joinClauses = [];
     for (const operation of operations) {
         if (operation instanceof LeftJoin || operation instanceof InnerJoin) {
-            const localRef = resolveLocalField(operation.localField, mainTableName);
+            const localRef = convertFieldToSnakeCase(operation.localField);
             const foreignSnake = convertFieldToSnakeCase(operation.foreignField);
             const joinType = operation instanceof InnerJoin ? "INNER JOIN" : "LEFT JOIN";
-            joinClause = `${joinClause} ${joinType} "${operation.from}" AS ${operation.as} ON ${localRef} = ${operation.as}."${foreignSnake}"`;
+            const joinTable = `"${operation.from}" AS "${operation.as}"`;
+            const leftSide = mainTableName ? `"${mainTableName}"."${localRef}"` : localRef;
+            joinClauses.push(`${joinType} ${joinTable} ON ${leftSide} = ${operation.as}."${foreignSnake}"`);
         }
     }
-    return joinClause;
+    return joinClauses.join(' ');
 }

package/dist/databases/postgres/utils/build-select-clause.d.ts

@@ -1,3 +1,3 @@
 import { Client } from 'pg';
 import { Operation } from '../../operations/operation.js';
-export declare function buildSelectClause(client: Client, mainTableName: string, mainTableAlias: string, operations: Operation[]): Promise<string>;
+export declare function buildSelectClause(client: Client, mainTableName: string, operations: Operation[]): Promise<string>;

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

@@ -22,7 +22,7 @@ function findEnrichmentTarget(operation, operations) {
     }
     return null;
 }
-export async function buildSelectClause(client, mainTableName, mainTableAlias, operations) {
+export async function buildSelectClause(client, mainTableName, operations) {
     const leftJoinOperations = operations.filter(op => op instanceof LeftJoin);
     const innerJoinOperations = operations.filter(op => op instanceof InnerJoin);
     const leftJoinManyOperations = operations.filter(op => op instanceof LeftJoinMany);

package/package.json

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