@loomcore/api 0.1.110 → 0.1.112

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

@@ -1,36 +1,13 @@
 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, operations, currentIndex) {
-    if (!localField.includes('.')) {
-        const snake = convertFieldToSnakeCase(localField);
-        return `"${mainTableName}"."${snake}"`;
-    }
-    const [alias, field] = localField.split('.');
-    const snake = convertFieldToSnakeCase(field);
-    const priorOps = operations.slice(0, currentIndex);
-    const leftJoinMany = priorOps.find((op) => op instanceof LeftJoinMany && op.as === alias);
-    if (leftJoinMany) {
-        const castType = field === '_id' || snake === '_id' ? '::int' : '::text';
-        const elemAlias = `_elem_${alias}`;
-        return `(SELECT (${elemAlias}->>'${snake}')${castType} FROM jsonb_array_elements("${alias}") AS ${elemAlias})`;
-    }
-    return `${alias}."${snake}"`;
-}
 async function getTableColumns(client, tableName) {
-    const result = await client.query(`
-            SELECT column_name
-            FROM information_schema.columns
-            WHERE table_schema = current_schema()
-              AND table_name = $1
-            ORDER BY ordinal_position
+    const result = await client.query(`
+            SELECT column_name
+            FROM information_schema.columns
+            WHERE table_schema = current_schema()
+              AND table_name = $1
+            ORDER BY ordinal_position
         `, [tableName]);
     return result.rows.map(row => row.column_name);
 }
@@ -52,55 +29,12 @@ export async function buildSelectClause(client, mainTableName, mainTableAlias, o
     const mainTableColumns = await getTableColumns(client, mainTableName);
     const mainSelects = mainTableColumns.map(col => `"${mainTableName}"."${col}" AS "${col}"`);
     const joinSelects = [];
-    for (const join of [...leftJoinOperations, ...innerJoinOperations]) {
+    for (const join of [...leftJoinOperations, ...leftJoinManyOperations, ...innerJoinOperations]) {
         const joinColumns = await getTableColumns(client, join.from);
         for (const col of joinColumns) {
             joinSelects.push(`${join.as}."${col}" AS "${join.as}__${col}"`);
         }
     }
-    for (let i = 0; i < leftJoinManyOperations.length; i++) {
-        const joinMany = leftJoinManyOperations[i];
-        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 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 (referencedLeftJoinMany) {
-            const [prevAlias, fieldName] = joinMany.localField.split('.');
-            const prevFieldSnake = convertFieldToSnakeCase(fieldName);
-            const buildNestedInQuery = (refOp, extractField) => {
-                const extractFieldSnake = convertFieldToSnakeCase(extractField);
-                const refForeignSnake = convertFieldToSnakeCase(refOp.foreignField);
-                if (!refOp.localField.includes('.')) {
-                    const refLocalSnake = convertFieldToSnakeCase(refOp.localField);
-                    return `(SELECT "${extractFieldSnake}" FROM "${refOp.from}" WHERE "${refOp.from}"."${refForeignSnake}" = "${mainTableName}"."${refLocalSnake}")`;
-                }
-                const [parentAlias, parentField] = refOp.localField.split('.');
-                const parentOpIndex = operations.indexOf(refOp);
-                const parentOp = operations.slice(0, parentOpIndex).find((op) => op instanceof LeftJoinMany && op.as === parentAlias);
-                if (parentOp) {
-                    const parentFieldSnake = convertFieldToSnakeCase(parentField);
-                    const nestedQuery = buildNestedInQuery(parentOp, parentFieldSnake);
-                    return `(SELECT "${extractFieldSnake}" FROM "${refOp.from}" WHERE "${refOp.from}"."${refForeignSnake}" IN ${nestedQuery})`;
-                }
-                const parentFieldSnake = convertFieldToSnakeCase(parentField);
-                return `(SELECT "${extractFieldSnake}" FROM "${refOp.from}" WHERE "${refOp.from}"."${refForeignSnake}" = ${parentAlias}."${parentFieldSnake}")`;
-            };
-            const nestedQuery = buildNestedInQuery(referencedLeftJoinMany, prevFieldSnake);
-            whereClause = `${subAlias}."${foreignSnake}" IN ${nestedQuery}`;
-        }
-        else {
-            whereClause = `${subAlias}."${foreignSnake}" = ${localRef}`;
-        }
-        const subquery = `(SELECT COALESCE(jsonb_agg(jsonb_build_object(${objParts})), '[]'::jsonb) FROM "${joinMany.from}" AS ${subAlias} WHERE ${whereClause})`;
-        joinSelects.push(`${subquery} AS "${joinMany.as}"`);
-    }
     const allSelects = [...mainSelects, ...joinSelects];
     return allSelects.join(', ');
 }

package/dist/databases/postgres/utils/does-table-exist.util.js

@@ -1,8 +1,8 @@
 export async function doesTableExist(client, tableName) {
-    const result = await client.query(`
-        SELECT EXISTS (
-            SELECT 1 FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = $1
-        )
+    const result = await client.query(`
+        SELECT EXISTS (
+            SELECT 1 FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = $1
+        )
     `, [tableName]);
     return result.rows[0].exists;
 }

package/dist/databases/postgres/utils/transform-join-results.d.ts

@@ -1,2 +1,2 @@
 import { Operation } from '../../operations/operation.js';
-export declare function transformJoinResults<T>(rows: Record<string, unknown>[], operations: Operation[]): T[];
+export declare function transformJoinResults<T>(rows: any[], operations: Operation[]): T[];

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

@@ -1,6 +1,30 @@
 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';
+function findNestedObject(obj, alias, path = []) {
+    if (obj[alias] !== undefined && obj[alias] !== null) {
+        return { obj: obj[alias], path: [...path, alias] };
+    }
+    for (const key in obj) {
+        if (obj[key] && typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
+            const found = findNestedObject(obj[key], alias, [...path, key]);
+            if (found !== null) {
+                return found;
+            }
+        }
+        else if (Array.isArray(obj[key])) {
+            for (const item of obj[key]) {
+                if (item && typeof item === 'object') {
+                    const found = findNestedObject(item, alias, [...path, key]);
+                    if (found !== null) {
+                        return found;
+                    }
+                }
+            }
+        }
+    }
+    return null;
+}
 function parseJsonValue(value) {
     if (value === null || value === undefined) {
         return null;
@@ -15,88 +39,90 @@ function parseJsonValue(value) {
     }
     return value;
 }
-function getJoinAliasesAndParents(operations) {
-    const aliases = new Set();
-    const parentByAlias = new Map();
-    for (const op of operations) {
-        if (op instanceof LeftJoin || op instanceof InnerJoin || op instanceof LeftJoinMany) {
-            aliases.add(op.as);
-            const parent = op.localField.includes('.') ? op.localField.split('.')[0] : null;
-            parentByAlias.set(op.as, parent);
-        }
-    }
-    return { aliases, parentByAlias };
-}
-const PREFIX_SEP = '__';
-function setJoinValue(joinData, alias, value, parentByAlias, operations) {
-    const parent = parentByAlias.get(alias) ?? null;
-    if (parent) {
-        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;
-        }
-    }
-    else {
-        joinData[alias] = value;
-    }
-}
 export function transformJoinResults(rows, operations) {
-    const { aliases: joinAliases, parentByAlias } = getJoinAliasesAndParents(operations);
-    if (joinAliases.size === 0) {
+    const leftJoinOperations = operations.filter(op => op instanceof LeftJoin);
+    const innerJoinOperations = operations.filter(op => op instanceof InnerJoin);
+    const leftJoinManyOperations = operations.filter(op => op instanceof LeftJoinMany);
+    const allJoinOperations = [...leftJoinOperations, ...innerJoinOperations, ...leftJoinManyOperations];
+    if (allJoinOperations.length === 0) {
         return rows;
     }
-    return rows.map((row) => {
+    const allJoinAliases = allJoinOperations.map(j => j.as);
+    return rows.map(row => {
         const transformed = {};
-        const flatJoinValues = {};
-        const prefixedByAlias = {};
+        const joinData = {};
         for (const key of Object.keys(row)) {
-            if (joinAliases.has(key)) {
-                flatJoinValues[key] = parseJsonValue(row[key]);
+            const hasJoinPrefix = allJoinOperations.some(join => key.startsWith(`${join.as}__`));
+            const isJoinAlias = allJoinAliases.includes(key);
+            if (!hasJoinPrefix && !isJoinAlias) {
+                transformed[key] = row[key];
             }
-            else if (key.includes(PREFIX_SEP)) {
-                const i = key.indexOf(PREFIX_SEP);
-                const alias = key.slice(0, i);
-                const column = key.slice(i + PREFIX_SEP.length);
-                if (joinAliases.has(alias)) {
-                    if (!prefixedByAlias[alias])
-                        prefixedByAlias[alias] = {};
-                    prefixedByAlias[alias][column] = row[key];
+        }
+        for (const operation of operations) {
+            if (operation instanceof LeftJoin || operation instanceof InnerJoin) {
+                const prefix = `${operation.as}__`;
+                const joinedData = {};
+                let hasAnyData = false;
+                for (const key of Object.keys(row)) {
+                    if (key.startsWith(prefix)) {
+                        const columnName = key.substring(prefix.length);
+                        const value = row[key];
+                        joinedData[columnName] = value;
+                        if (value !== null && value !== undefined) {
+                            hasAnyData = true;
+                        }
+                    }
+                }
+                if (operation.localField.includes('.')) {
+                    const [tableAlias] = operation.localField.split('.');
+                    const relatedJoin = allJoinOperations.find(j => j.as === tableAlias);
+                    let targetObject = null;
+                    if (relatedJoin && joinData[relatedJoin.as]) {
+                        targetObject = joinData[relatedJoin.as];
+                    }
+                    else {
+                        const found = findNestedObject(joinData, tableAlias);
+                        if (found) {
+                            targetObject = found.obj;
+                        }
+                    }
+                    if (targetObject) {
+                        targetObject[operation.as] = hasAnyData ? joinedData : null;
+                    }
+                    else {
+                        joinData[operation.as] = hasAnyData ? joinedData : null;
+                    }
                 }
                 else {
-                    transformed[key] = row[key];
+                    joinData[operation.as] = hasAnyData ? joinedData : null;
                 }
             }
-            else {
-                transformed[key] = row[key];
-            }
-        }
-        for (const alias of Object.keys(prefixedByAlias)) {
-            const obj = prefixedByAlias[alias];
-            const hasAny = Object.values(obj).some(v => v !== null && v !== undefined);
-            if (!(alias in flatJoinValues)) {
-                flatJoinValues[alias] = hasAny ? obj : null;
+            else if (operation instanceof LeftJoinMany) {
+                const jsonValue = parseJsonValue(row[operation.as]);
+                let parsedValue = Array.isArray(jsonValue) ? jsonValue : (jsonValue ? [jsonValue] : []);
+                if (operation.localField.includes('.')) {
+                    const [tableAlias] = operation.localField.split('.');
+                    const relatedJoin = allJoinOperations.find(j => j.as === tableAlias);
+                    const relatedJoinMany = leftJoinManyOperations.find(j => j.as === tableAlias);
+                    let targetObject = null;
+                    if (relatedJoin && joinData[relatedJoin.as]) {
+                        targetObject = joinData[relatedJoin.as];
+                    }
+                    else if (relatedJoinMany && joinData[relatedJoinMany.as]) {
+                        targetObject = joinData[relatedJoinMany.as];
+                    }
+                    if (targetObject) {
+                        targetObject[operation.as] = parsedValue;
+                    }
+                    else {
+                        joinData[operation.as] = parsedValue;
+                    }
+                }
+                else {
+                    joinData[operation.as] = parsedValue;
+                }
             }
         }
-        const joinData = {};
-        for (const op of operations) {
-            if (!(op instanceof LeftJoin || op instanceof InnerJoin || op instanceof LeftJoinMany))
-                continue;
-            const alias = op.as;
-            const value = flatJoinValues[alias];
-            if (value === undefined)
-                continue;
-            setJoinValue(joinData, alias, value, parentByAlias, operations);
-        }
         if (Object.keys(joinData).length > 0) {
             transformed._joinData = joinData;
         }

package/package.json

@@ -1,92 +1,92 @@
-{
-  "name": "@loomcore/api",
-  "version": "0.1.110",
-  "private": false,
-  "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "tsc": "tsc --project tsconfig.prod.json",
-    "build": "npm-run-all -s clean tsc",
-    "add": "git add .",
-    "commit": "git commit -m \"Updates\"",
-    "patch": "npm version patch",
-    "push": "git push",
-    "publishMe": "npm publish --access public",
-    "pub": "npm-run-all -s add commit patch build push publishMe",
-    "update-lib-versions": "npx --yes npm-check-updates -u -f @loomcore/common",
-    "install-updated-libs": "npm i @loomcore/common",
-    "update-libs": "npm-run-all -s update-lib-versions install-updated-libs",
-    "typecheck": "tsc",
-    "test": "npm-run-all -s test:postgres test:mongodb",
-    "test:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run",
-    "test:postgres:real": "cross-env NODE_ENV=test TEST_DATABASE=postgres USE_REAL_POSTGRES=true vitest run",
-    "test:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run",
-    "test:ci": "npm-run-all -s test:ci:postgres test:ci:mongodb",
-    "test:ci:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --reporter=json --outputFile=test-results-postgres.json",
-    "test:ci:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --reporter=json --outputFile=test-results-mongodb.json",
-    "test:watch": "cross-env NODE_ENV=test vitest",
-    "coverage": "npm-run-all -s coverage:postgres coverage:mongodb",
-    "coverage:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --coverage",
-    "coverage:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --coverage",
-    "test:db:start": "docker-compose -f docker-compose.test.yml up -d",
-    "test:db:stop": "docker-compose -f docker-compose.test.yml down",
-    "test:db:logs": "docker-compose -f docker-compose.test.yml logs -f"
-  },
-  "author": "Tim Hardy",
-  "license": "Apache 2.0",
-  "main": "dist/index.js",
-  "type": "module",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist/**/*"
-  ],
-  "exports": {
-    "./__tests__": "./dist/__tests__/index.js",
-    "./config": "./dist/config/index.js",
-    "./controllers": "./dist/controllers/index.js",
-    "./databases": "./dist/databases/index.js",
-    "./errors": "./dist/errors/index.js",
-    "./middleware": "./dist/middleware/index.js",
-    "./models": "./dist/models/index.js",
-    "./services": "./dist/services/index.js",
-    "./utils": "./dist/utils/index.js"
-  },
-  "dependencies": {
-    "jsonwebtoken": "^9.0.2",
-    "node-mailjet": "^6.0.8",
-    "qs": "^6.15.0"
-  },
-  "peerDependencies": {
-    "@loomcore/common": "^0.0.51",
-    "@sinclair/typebox": "0.34.33",
-    "cookie-parser": "^1.4.6",
-    "cors": "^2.8.5",
-    "express": "^5.1.0",
-    "lodash": "^4.17.21",
-    "moment": "^2.30.1",
-    "mongodb": "^6.16.0",
-    "pg": "^8.15.6",
-    "rxjs": "^7.8.0",
-    "umzug": "^3.8.2"
-  },
-  "devDependencies": {
-    "@types/cookie-parser": "^1.4.7",
-    "@types/cors": "^2.8.18",
-    "@types/express": "^5.0.1",
-    "@types/jsonwebtoken": "^9.0.9",
-    "@types/lodash": "^4.17.13",
-    "@types/pg": "^8.15.6",
-    "@types/qs": "^6.14.0",
-    "@types/supertest": "^6.0.3",
-    "@vitest/coverage-v8": "^3.0.9",
-    "cross-env": "^7.0.3",
-    "mongodb-memory-server": "^9.3.0",
-    "npm-run-all": "^4.1.5",
-    "pg-mem": "^3.0.12",
-    "rxjs": "^7.8.0",
-    "supertest": "^7.1.0",
-    "typescript": "^5.8.3",
-    "vite": "^6.2.5",
-    "vitest": "^3.0.9"
-  }
-}
+{
+  "name": "@loomcore/api",
+  "version": "0.1.112",
+  "private": false,
+  "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
+  "scripts": {
+    "clean": "rm -rf dist",
+    "tsc": "tsc --project tsconfig.prod.json",
+    "build": "npm-run-all -s clean tsc",
+    "add": "git add .",
+    "commit": "git commit -m \"Updates\"",
+    "patch": "npm version patch",
+    "push": "git push",
+    "publishMe": "npm publish --access public",
+    "pub": "npm-run-all -s add commit patch build push publishMe",
+    "update-lib-versions": "npx --yes npm-check-updates -u -f @loomcore/common",
+    "install-updated-libs": "npm i @loomcore/common",
+    "update-libs": "npm-run-all -s update-lib-versions install-updated-libs",
+    "typecheck": "tsc",
+    "test": "npm-run-all -s test:postgres test:mongodb",
+    "test:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run",
+    "test:postgres:real": "cross-env NODE_ENV=test TEST_DATABASE=postgres USE_REAL_POSTGRES=true vitest run",
+    "test:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run",
+    "test:ci": "npm-run-all -s test:ci:postgres test:ci:mongodb",
+    "test:ci:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --reporter=json --outputFile=test-results-postgres.json",
+    "test:ci:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --reporter=json --outputFile=test-results-mongodb.json",
+    "test:watch": "cross-env NODE_ENV=test vitest",
+    "coverage": "npm-run-all -s coverage:postgres coverage:mongodb",
+    "coverage:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --coverage",
+    "coverage:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --coverage",
+    "test:db:start": "docker-compose -f docker-compose.test.yml up -d",
+    "test:db:stop": "docker-compose -f docker-compose.test.yml down",
+    "test:db:logs": "docker-compose -f docker-compose.test.yml logs -f"
+  },
+  "author": "Tim Hardy",
+  "license": "Apache 2.0",
+  "main": "dist/index.js",
+  "type": "module",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*"
+  ],
+  "exports": {
+    "./__tests__": "./dist/__tests__/index.js",
+    "./config": "./dist/config/index.js",
+    "./controllers": "./dist/controllers/index.js",
+    "./databases": "./dist/databases/index.js",
+    "./errors": "./dist/errors/index.js",
+    "./middleware": "./dist/middleware/index.js",
+    "./models": "./dist/models/index.js",
+    "./services": "./dist/services/index.js",
+    "./utils": "./dist/utils/index.js"
+  },
+  "dependencies": {
+    "jsonwebtoken": "^9.0.2",
+    "node-mailjet": "^6.0.8",
+    "qs": "^6.15.0"
+  },
+  "peerDependencies": {
+    "@loomcore/common": "^0.0.52",
+    "@sinclair/typebox": "0.34.33",
+    "cookie-parser": "^1.4.6",
+    "cors": "^2.8.5",
+    "express": "^5.1.0",
+    "lodash": "^4.17.21",
+    "moment": "^2.30.1",
+    "mongodb": "^6.16.0",
+    "pg": "^8.15.6",
+    "rxjs": "^7.8.0",
+    "umzug": "^3.8.2"
+  },
+  "devDependencies": {
+    "@types/cookie-parser": "^1.4.7",
+    "@types/cors": "^2.8.18",
+    "@types/express": "^5.0.1",
+    "@types/jsonwebtoken": "^9.0.9",
+    "@types/lodash": "^4.17.13",
+    "@types/pg": "^8.15.6",
+    "@types/qs": "^6.14.0",
+    "@types/supertest": "^6.0.3",
+    "@vitest/coverage-v8": "^3.0.9",
+    "cross-env": "^7.0.3",
+    "mongodb-memory-server": "^9.3.0",
+    "npm-run-all": "^4.1.5",
+    "pg-mem": "^3.0.12",
+    "rxjs": "^7.8.0",
+    "supertest": "^7.1.0",
+    "typescript": "^5.8.3",
+    "vite": "^6.2.5",
+    "vitest": "^3.0.9"
+  }
+}