relq 1.0.81 → 1.0.83

package/dist/cjs/core/helpers/ConnectedInsertBuilder.cjs

@@ -36,10 +36,13 @@ class ConnectedInsertBuilder {
         });
         this.builder.setColumnTypeResolver((column) => {
             const columnDef = tableColumns[column];
-            if (!columnDef || !columnDef.$type) {
+            if (!columnDef) {
                 return undefined;
             }
             const type = columnDef.$type;
+            if (typeof type !== 'string') {
+                return undefined;
+            }
             const isArray = columnDef.$array === true;
             const baseType = type.replace(/\[\]$/, '').toLowerCase();
             return { type: baseType, isArray };

package/dist/cjs/core/helpers/ConnectedSelectBuilder.cjs

@@ -41,6 +41,52 @@ class ConnectedSelectBuilder {
             return column;
         });
     }
+    transformJoinResults(rows) {
+        const joins = this.builder.getStructuredJoins();
+        if (joins.length === 0) {
+            return rows;
+        }
+        const internal = this.relq[methods_1.INTERNAL];
+        return rows.map(row => {
+            if (!row || typeof row !== 'object')
+                return row;
+            const transformed = { ...row };
+            for (const join of joins) {
+                const alias = join.alias;
+                const nestedData = transformed[alias];
+                if (nestedData === null || nestedData === undefined) {
+                    continue;
+                }
+                const joinedTableDef = internal.getTableDef(join.schemaKey || alias) || internal.getTableDef(join.table);
+                if (!joinedTableDef) {
+                    continue;
+                }
+                const tableColumns = joinedTableDef.$columns || joinedTableDef;
+                const dbToProp = new Map();
+                for (const [propName, colDef] of Object.entries(tableColumns)) {
+                    const dbColName = colDef?.$columnName ?? propName;
+                    dbToProp.set(dbColName, propName);
+                }
+                if (Array.isArray(nestedData)) {
+                    transformed[alias] = nestedData.map((item) => this.transformNestedObject(item, dbToProp));
+                }
+                else {
+                    transformed[alias] = this.transformNestedObject(nestedData, dbToProp);
+                }
+            }
+            return transformed;
+        });
+    }
+    transformNestedObject(obj, dbToProp) {
+        if (!obj || typeof obj !== 'object')
+            return obj;
+        const result = {};
+        for (const [key, value] of Object.entries(obj)) {
+            const propName = dbToProp.get(key) ?? key;
+            result[propName] = value;
+        }
+        return result;
+    }
     where(callback) {
         this.builder.where(callback);
         return this;
@@ -158,19 +204,21 @@ class ConnectedSelectBuilder {
     async all(withMetadata, _asRequired) {
         const sql = this.builder.toString();
         const result = await this.relq[methods_1.INTERNAL].executeSelect(sql, this.tableName);
+        const transformedData = this.transformJoinResults(result.data);
         if (withMetadata) {
-            return result;
+            return { data: transformedData, metadata: result.metadata };
         }
-        return result.data;
+        return transformedData;
     }
     async get(withMetadata, _asRequired) {
         this.builder.limit(1);
         const sql = this.builder.toString();
         const result = await this.relq[methods_1.INTERNAL].executeSelectOne(sql, this.tableName);
+        const transformedData = result.data ? this.transformJoinResults([result.data])[0] : null;
         if (withMetadata) {
-            return result;
+            return { data: transformedData, metadata: result.metadata };
         }
-        return result.data;
+        return transformedData;
     }
     async value(column) {
         this.builder.limit(1);

package/dist/cjs/core/helpers/ConnectedUpdateBuilder.cjs

@@ -35,10 +35,13 @@ class ConnectedUpdateBuilder {
         });
         this.builder.setColumnTypeResolver((column) => {
             const columnDef = tableColumns[column];
-            if (!columnDef || !columnDef.$type) {
+            if (!columnDef) {
                 return undefined;
             }
             const type = columnDef.$type;
+            if (typeof type !== 'string') {
+                return undefined;
+            }
             const isArray = columnDef.$array === true;
             const baseType = type.replace(/\[\]$/, '').toLowerCase();
             return { type: baseType, isArray };

package/dist/cjs/core/helpers/select-joins.cjs

@@ -54,6 +54,7 @@ function executeTypeSafeJoin(ctx, joinType, tableOrAlias, callback) {
         type: joinType,
         table: rightTableName,
         alias: rightAlias,
+        schemaKey: rightTableKey,
         onClause: conditionInternals.toSQL() || undefined,
         usingColumns: conditionInternals.getUsingColumns() || undefined,
         selectColumns
@@ -89,6 +90,7 @@ function executeTypeSafeJoinMany(ctx, joinType, tableOrAlias, callback) {
         type: lateralJoinType,
         table: rightTableName,
         alias: rightAlias,
+        schemaKey: rightTableKey,
         lateralSubquery: lateralSQL
     };
     ctx.builder.addStructuredJoin(joinClause);

package/dist/cjs/insert/insert-builder.cjs

@@ -184,34 +184,29 @@ class InsertBuilder {
         const placeholderTypes = [];
         for (const colName of originalColumns) {
             const value = row[colName];
-            if (Array.isArray(value)) {
+            if (Array.isArray(value) || (value !== null && typeof value === 'object' && !(value instanceof Date))) {
                 const typeInfo = this.columnTypeResolver?.(colName);
                 if (typeInfo) {
-                    if (typeInfo.isArray) {
-                        processedValues.push(this.formatPostgresArray(value, typeInfo.type));
-                    }
-                    else if (typeInfo.type === 'jsonb' || typeInfo.type === 'json') {
-                        processedValues.push(this.formatJsonbValue(value));
+                    if (Array.isArray(value)) {
+                        if (typeInfo.isArray) {
+                            processedValues.push(this.formatPostgresArray(value, typeInfo.type));
+                        }
+                        else if (typeInfo.type === 'jsonb' || typeInfo.type === 'json') {
+                            processedValues.push(this.formatJsonbValue(value));
+                        }
+                        else {
+                            processedValues.push(this.formatJsonbValue(value));
+                        }
                     }
                     else {
-                        processedValues.push(this.formatPostgresArray(value));
+                        processedValues.push(this.formatJsonbValue(value));
                     }
                 }
                 else {
-                    const hasObjects = value.length > 0 && typeof value[0] === 'object' && value[0] !== null;
-                    if (hasObjects) {
-                        processedValues.push(this.formatJsonbValue(value));
-                    }
-                    else {
-                        processedValues.push(this.formatPostgresArray(value));
-                    }
+                    processedValues.push(this.formatJsonbValue(value));
                 }
                 placeholderTypes.push('%s');
             }
-            else if (value !== null && typeof value === 'object' && !(value instanceof Date)) {
-                processedValues.push(this.formatJsonbValue(value));
-                placeholderTypes.push('%s');
-            }
             else {
                 processedValues.push(value);
                 placeholderTypes.push('%L');

package/dist/cjs/update/update-builder.cjs

@@ -172,12 +172,11 @@ class UpdateBuilder {
             else if (typeInfo.type === 'jsonb' || typeInfo.type === 'json') {
                 return this.formatJsonbValue(value);
             }
+            else {
+                return this.formatJsonbValue(value);
+            }
         }
-        const hasObjects = value.length > 0 && typeof value[0] === 'object' && value[0] !== null;
-        if (hasObjects) {
-            return this.formatJsonbValue(value);
-        }
-        return this.formatPostgresArray(value);
+        return this.formatJsonbValue(value);
     }
     toString() {
         const processedPairs = Object.entries(this.updateData).map(([col, val]) => {

package/dist/esm/core/helpers/ConnectedInsertBuilder.js

@@ -33,10 +33,13 @@ export class ConnectedInsertBuilder {
         });
         this.builder.setColumnTypeResolver((column) => {
             const columnDef = tableColumns[column];
-            if (!columnDef || !columnDef.$type) {
+            if (!columnDef) {
                 return undefined;
             }
             const type = columnDef.$type;
+            if (typeof type !== 'string') {
+                return undefined;
+            }
             const isArray = columnDef.$array === true;
             const baseType = type.replace(/\[\]$/, '').toLowerCase();
             return { type: baseType, isArray };

package/dist/esm/core/helpers/ConnectedSelectBuilder.js

@@ -38,6 +38,52 @@ export class ConnectedSelectBuilder {
             return column;
         });
     }
+    transformJoinResults(rows) {
+        const joins = this.builder.getStructuredJoins();
+        if (joins.length === 0) {
+            return rows;
+        }
+        const internal = this.relq[INTERNAL];
+        return rows.map(row => {
+            if (!row || typeof row !== 'object')
+                return row;
+            const transformed = { ...row };
+            for (const join of joins) {
+                const alias = join.alias;
+                const nestedData = transformed[alias];
+                if (nestedData === null || nestedData === undefined) {
+                    continue;
+                }
+                const joinedTableDef = internal.getTableDef(join.schemaKey || alias) || internal.getTableDef(join.table);
+                if (!joinedTableDef) {
+                    continue;
+                }
+                const tableColumns = joinedTableDef.$columns || joinedTableDef;
+                const dbToProp = new Map();
+                for (const [propName, colDef] of Object.entries(tableColumns)) {
+                    const dbColName = colDef?.$columnName ?? propName;
+                    dbToProp.set(dbColName, propName);
+                }
+                if (Array.isArray(nestedData)) {
+                    transformed[alias] = nestedData.map((item) => this.transformNestedObject(item, dbToProp));
+                }
+                else {
+                    transformed[alias] = this.transformNestedObject(nestedData, dbToProp);
+                }
+            }
+            return transformed;
+        });
+    }
+    transformNestedObject(obj, dbToProp) {
+        if (!obj || typeof obj !== 'object')
+            return obj;
+        const result = {};
+        for (const [key, value] of Object.entries(obj)) {
+            const propName = dbToProp.get(key) ?? key;
+            result[propName] = value;
+        }
+        return result;
+    }
     where(callback) {
         this.builder.where(callback);
         return this;
@@ -155,19 +201,21 @@ export class ConnectedSelectBuilder {
     async all(withMetadata, _asRequired) {
         const sql = this.builder.toString();
         const result = await this.relq[INTERNAL].executeSelect(sql, this.tableName);
+        const transformedData = this.transformJoinResults(result.data);
         if (withMetadata) {
-            return result;
+            return { data: transformedData, metadata: result.metadata };
         }
-        return result.data;
+        return transformedData;
     }
     async get(withMetadata, _asRequired) {
         this.builder.limit(1);
         const sql = this.builder.toString();
         const result = await this.relq[INTERNAL].executeSelectOne(sql, this.tableName);
+        const transformedData = result.data ? this.transformJoinResults([result.data])[0] : null;
         if (withMetadata) {
-            return result;
+            return { data: transformedData, metadata: result.metadata };
         }
-        return result.data;
+        return transformedData;
     }
     async value(column) {
         this.builder.limit(1);

package/dist/esm/core/helpers/ConnectedUpdateBuilder.js

@@ -32,10 +32,13 @@ export class ConnectedUpdateBuilder {
         });
         this.builder.setColumnTypeResolver((column) => {
             const columnDef = tableColumns[column];
-            if (!columnDef || !columnDef.$type) {
+            if (!columnDef) {
                 return undefined;
             }
             const type = columnDef.$type;
+            if (typeof type !== 'string') {
+                return undefined;
+            }
             const isArray = columnDef.$array === true;
             const baseType = type.replace(/\[\]$/, '').toLowerCase();
             return { type: baseType, isArray };

package/dist/esm/core/helpers/select-joins.js

@@ -50,6 +50,7 @@ export function executeTypeSafeJoin(ctx, joinType, tableOrAlias, callback) {
         type: joinType,
         table: rightTableName,
         alias: rightAlias,
+        schemaKey: rightTableKey,
         onClause: conditionInternals.toSQL() || undefined,
         usingColumns: conditionInternals.getUsingColumns() || undefined,
         selectColumns
@@ -85,6 +86,7 @@ export function executeTypeSafeJoinMany(ctx, joinType, tableOrAlias, callback) {
         type: lateralJoinType,
         table: rightTableName,
         alias: rightAlias,
+        schemaKey: rightTableKey,
         lateralSubquery: lateralSQL
     };
     ctx.builder.addStructuredJoin(joinClause);

package/dist/esm/insert/insert-builder.js

@@ -178,34 +178,29 @@ export class InsertBuilder {
         const placeholderTypes = [];
         for (const colName of originalColumns) {
             const value = row[colName];
-            if (Array.isArray(value)) {
+            if (Array.isArray(value) || (value !== null && typeof value === 'object' && !(value instanceof Date))) {
                 const typeInfo = this.columnTypeResolver?.(colName);
                 if (typeInfo) {
-                    if (typeInfo.isArray) {
-                        processedValues.push(this.formatPostgresArray(value, typeInfo.type));
-                    }
-                    else if (typeInfo.type === 'jsonb' || typeInfo.type === 'json') {
-                        processedValues.push(this.formatJsonbValue(value));
+                    if (Array.isArray(value)) {
+                        if (typeInfo.isArray) {
+                            processedValues.push(this.formatPostgresArray(value, typeInfo.type));
+                        }
+                        else if (typeInfo.type === 'jsonb' || typeInfo.type === 'json') {
+                            processedValues.push(this.formatJsonbValue(value));
+                        }
+                        else {
+                            processedValues.push(this.formatJsonbValue(value));
+                        }
                     }
                     else {
-                        processedValues.push(this.formatPostgresArray(value));
+                        processedValues.push(this.formatJsonbValue(value));
                     }
                 }
                 else {
-                    const hasObjects = value.length > 0 && typeof value[0] === 'object' && value[0] !== null;
-                    if (hasObjects) {
-                        processedValues.push(this.formatJsonbValue(value));
-                    }
-                    else {
-                        processedValues.push(this.formatPostgresArray(value));
-                    }
+                    processedValues.push(this.formatJsonbValue(value));
                 }
                 placeholderTypes.push('%s');
             }
-            else if (value !== null && typeof value === 'object' && !(value instanceof Date)) {
-                processedValues.push(this.formatJsonbValue(value));
-                placeholderTypes.push('%s');
-            }
             else {
                 processedValues.push(value);
                 placeholderTypes.push('%L');

package/dist/esm/update/update-builder.js

@@ -166,12 +166,11 @@ export class UpdateBuilder {
             else if (typeInfo.type === 'jsonb' || typeInfo.type === 'json') {
                 return this.formatJsonbValue(value);
             }
+            else {
+                return this.formatJsonbValue(value);
+            }
         }
-        const hasObjects = value.length > 0 && typeof value[0] === 'object' && value[0] !== null;
-        if (hasObjects) {
-            return this.formatJsonbValue(value);
-        }
-        return this.formatPostgresArray(value);
+        return this.formatJsonbValue(value);
     }
     toString() {
         const processedPairs = Object.entries(this.updateData).map(([col, val]) => {

package/dist/index.d.ts

@@ -2037,6 +2037,8 @@ export interface JoinClause {
 	table: string;
 	/** Alias for the table (may be same as table) */
 	alias: string;
+	/** Schema key (for looking up table definition) - may differ from table/alias */
+	schemaKey?: string;
 	/** ON clause SQL (without "ON" keyword) */
 	onClause?: string;
 	/** USING columns (alternative to ON) */
@@ -2501,8 +2503,8 @@ export declare class UpdateBuilder {
 	 */
 	private formatJsonbValue;
 	/**
-	 * Format an array value using schema type info if available.
-	 * Falls back to heuristics if no schema info.
+	 * Format an array value using schema type info.
+	 * Schema is required for proper handling - defaults to JSONB if no schema.
 	 */
 	private formatArrayValueWithType;
 	toString(): string;
@@ -8731,6 +8733,17 @@ declare class ConnectedSelectBuilder<TSchema = any, TTable = any, TColumns exten
 	 * @internal
 	 */
 	private setupColumnResolver;
+	/**
+	 * Transform nested join results from DB column names to schema property names.
+	 * Uses schema metadata to resolve column names for each joined table.
+	 * @internal
+	 */
+	private transformJoinResults;
+	/**
+	 * Transform a single nested object using the column mapping.
+	 * @internal
+	 */
+	private transformNestedObject;
 	where(callback: (q: TypedConditionBuilder<TTable>) => TypedConditionBuilder<TTable>): this;
 	orderBy(column: ColumnName<TTable>, direction?: "ASC" | "DESC"): this;
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relq",
-  "version": "1.0.81",
+  "version": "1.0.83",
   "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
   "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
   "license": "MIT",