@loomcore/api 0.1.101 → 0.1.103

package/dist/databases/migrations/migration-runner.d.ts

@@ -12,7 +12,7 @@ export declare class MigrationRunner {
     private getMigrator;
     private loadFileMigrations;
     private wipeDatabase;
-    run(command?: 'up' | 'down' | 'reset', target?: string): Promise<void>;
+    run(command?: 'up' | 'down' | 'reset' | 'create', target?: string): Promise<void>;
     private closeConnection;
     create(name: string): Promise<void>;
 }

package/dist/databases/migrations/migration-runner.js

@@ -183,6 +183,13 @@ export class MigrationRunner {
     }
     async run(command = 'up', target) {
         try {
+            if (command === 'create') {
+                if (!target) {
+                    throw new Error('Migration name is required for create. Example: npm run migrate create add-users-table');
+                }
+                await this.create(target);
+                return;
+            }
             if (command === 'reset') {
                 if (!this.dbMigrationConfig) {
                     throw new Error('Reset configuration not found');

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,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.1.101",
+  "version": "0.1.103",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {