@loomcore/api 0.1.102 → 0.1.104

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

@@ -8,22 +8,28 @@ function convertFieldToSnakeCase(field) {
     }
     return toSnakeCase(field);
 }
-function resolveLocalRef(localField, mainTableName) {
+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';
+        return `(SELECT jsonb_array_elements("${alias}")->>'${snake}'${castType})`;
+    }
     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);
 }
@@ -51,17 +57,28 @@ export async function buildSelectClause(client, mainTableName, mainTableAlias, o
             joinSelects.push(`${join.as}."${col}" AS "${join.as}__${col}"`);
         }
     }
-    for (const joinMany of leftJoinManyOperations) {
+    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 localRef = resolveLocalRef(joinMany.localField, mainTableName);
+        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 subquery = `(SELECT COALESCE(jsonb_agg(jsonb_build_object(${objParts})), '[]'::jsonb) FROM "${joinMany.from}" AS ${subAlias} WHERE ${subAlias}."${foreignSnake}" = ${localRef})`;
+        const isArrayRef = joinMany.localField.includes('.') &&
+            operations.slice(0, currentOpIndex).some(op => op instanceof LeftJoinMany && op.as === joinMany.localField.split('.')[0]);
+        let whereClause;
+        if (isArrayRef) {
+            whereClause = `${subAlias}."${foreignSnake}" IN ${localRef}`;
+        }
+        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];

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.js

@@ -15,28 +15,45 @@ function parseJsonValue(value) {
     }
     return value;
 }
-function getJoinAliases(operations) {
+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;
+    return { aliases, parentByAlias };
 }
 const PREFIX_SEP = '__';
+function setJoinValue(joinData, alias, value, parentByAlias) {
+    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;
+        }
+        parentObj[alias] = value;
+    }
+    else {
+        joinData[alias] = value;
+    }
+}
 export function transformJoinResults(rows, operations) {
-    const joinAliases = getJoinAliases(operations);
+    const { aliases: joinAliases, parentByAlias } = getJoinAliasesAndParents(operations);
     if (joinAliases.size === 0) {
         return rows;
     }
     return rows.map((row) => {
         const transformed = {};
-        const joinData = {};
+        const flatJoinValues = {};
         const prefixedByAlias = {};
         for (const key of Object.keys(row)) {
             if (joinAliases.has(key)) {
-                joinData[key] = parseJsonValue(row[key]);
+                flatJoinValues[key] = parseJsonValue(row[key]);
             }
             else if (key.includes(PREFIX_SEP)) {
                 const i = key.indexOf(PREFIX_SEP);
@@ -58,10 +75,20 @@ export function transformJoinResults(rows, operations) {
         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 joinData)) {
-                joinData[alias] = hasAny ? obj : null;
+            if (!(alias in flatJoinValues)) {
+                flatJoinValues[alias] = hasAny ? obj : null;
             }
         }
+        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);
+        }
         if (Object.keys(joinData).length > 0) {
             transformed._joinData = joinData;
         }

package/package.json

@@ -1,92 +1,92 @@
-{
-  "name": "@loomcore/api",
-  "version": "0.1.102",
-  "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.104",
+  "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"
+  }
+}