@loomcore/api 0.1.114 → 0.1.116

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

@@ -1,5 +1,6 @@
 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("_")) {
@@ -8,15 +9,14 @@ function convertFieldToSnakeCase(field) {
     return toSnakeCase(field);
 }
 export function buildJoinClauses(operations, mainTableName) {
-    let joinClauses = [];
+    const joinClauses = [];
     for (const operation of operations) {
-        if (operation instanceof LeftJoin || operation instanceof InnerJoin) {
-            const localRef = convertFieldToSnakeCase(operation.localField);
-            const foreignSnake = convertFieldToSnakeCase(operation.foreignField);
+        if (operation instanceof LeftJoin || operation instanceof InnerJoin || operation instanceof LeftJoinMany) {
             const joinType = operation instanceof InnerJoin ? "INNER JOIN" : "LEFT JOIN";
-            const joinTable = `"${operation.from}" AS "${operation.as}"`;
-            const leftSide = mainTableName ? `"${mainTableName}"."${localRef}"` : localRef;
-            joinClauses.push(`${joinType} ${joinTable} ON ${leftSide} = ${operation.as}."${foreignSnake}"`);
+            const localColumn = convertFieldToSnakeCase(operation.localField);
+            const foreignColumn = convertFieldToSnakeCase(operation.foreignField);
+            const leftSide = mainTableName ? `"${mainTableName}"."${localColumn}"` : `"${localColumn}"`;
+            joinClauses.push(`${joinType} "${operation.from}" AS "${operation.as}" ON ${leftSide} = ${operation.as}."${foreignColumn}"`);
         }
     }
     return joinClauses.join(' ');

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

@@ -1,6 +1,7 @@
 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 { buildAs } from './build-things.util.js';
 async function getTableColumns(client, tableName) {
     const result = await client.query(`
             SELECT column_name
@@ -29,10 +30,10 @@ export async function buildSelectClause(client, mainTableName, operations) {
     const mainTableColumns = await getTableColumns(client, mainTableName);
     const mainSelects = mainTableColumns.map(col => `"${mainTableName}"."${col}" AS "${col}"`);
     const joinSelects = [];
-    for (const join of [...leftJoinOperations, ...leftJoinManyOperations, ...innerJoinOperations]) {
+    for (const join of [...leftJoinOperations, ...innerJoinOperations, ...leftJoinManyOperations]) {
         const joinColumns = await getTableColumns(client, join.from);
         for (const col of joinColumns) {
-            joinSelects.push(`${join.as}."${col}" AS "${join.as}__${col}"`);
+            joinSelects.push(`${join.as}."${col}" AS "${buildAs(col, join)}"`);
         }
     }
     const allSelects = [...mainSelects, ...joinSelects];

package/dist/databases/postgres/utils/build-things.util.d.ts

@@ -0,0 +1,2 @@
+import { Operation } from "../../operations/index.js";
+export declare function buildAs(columnName: string, operation: Operation): string;

package/dist/databases/postgres/utils/build-things.util.js

@@ -0,0 +1,3 @@
+export function buildAs(columnName, operation) {
+    return `${operation.as}__${columnName}`;
+}

package/package.json

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