pqb 0.35.5 → 0.35.7

package/dist/index.d.ts

@@ -5057,9 +5057,14 @@ type SelectArgs<T extends SelectSelf> = ('*' | keyof T['meta']['selectable'])[];
 interface SelectAsArg<T extends SelectSelf> {
     [K: string]: keyof T['meta']['selectable'] | Expression | ((q: {
         [K in keyof T]: K extends keyof T['relations'] ? T[K] extends (...args: any[]) => any ? ReturnType<T[K]> : never : T[K];
-    }) => (QueryBase & {
-        returnType: Exclude<QueryReturnType, 'rows'>;
-    }) | Expression);
+    }) => unknown);
+}
+type SelectAsFnReturnType = {
+    result: QueryColumns;
+    returnType: Exclude<QueryReturnType, 'rows'>;
+} | Expression;
+interface SelectAsCheckReturnTypes {
+    [K: string]: PropertyKey | Expression | ((q: never) => SelectAsFnReturnType);
 }
 type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
     [K in keyof T]: K extends 'result' ? ('*' extends Columns[number] ? {
@@ -5072,7 +5077,7 @@ type SelectResult<T extends SelectSelf, Columns extends PropertyKey[]> = {
         [K in Columns[number] as T['meta']['selectable'][K]['as']]: T['meta']['selectable'][K]['column'];
     }) & (T['meta']['hasSelect'] extends true ? Omit<T['result'], Columns[number]> : unknown)>> : T[K];
 } & QueryMetaHasSelect;
-type SelectResultObj<T extends SelectSelf, Obj> = {
+type SelectResultObj<T extends SelectSelf, Obj> = Obj extends SelectAsCheckReturnTypes ? {
     [K in keyof T]: K extends 'meta' ? T['meta'] & {
         hasSelect: true;
         selectable: SelectAsSelectable<Obj>;
@@ -5081,7 +5086,9 @@ type SelectResultObj<T extends SelectSelf, Obj> = {
     } : K extends 'then' ? QueryThen<GetQueryResult<T, {
         [K in T['meta']['hasSelect'] extends true ? keyof Obj | keyof T['result'] : keyof Obj]: K extends keyof Obj ? SelectAsValueResult<T, Obj[K]> : K extends keyof T['result'] ? T['result'][K] : never;
     }>> : T[K];
-};
+} : `Invalid return type of ${{
+    [K in keyof Obj]: Obj[K] extends (...args: any[]) => any ? ReturnType<Obj[K]> extends SelectAsFnReturnType ? never : K : never;
+}[keyof Obj] & string}`;
 type SelectResultColumnsAndObj<T extends SelectSelf, Columns extends PropertyKey[], Obj> = {
     [K in keyof T]: K extends 'meta' ? T['meta'] & {
         hasSelect: true;

package/dist/index.js

@@ -1850,10 +1850,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   const table = column.slice(0, index);
   const key = column.slice(index + 1);
   if (key === "*") {
-    if ((_a = data.joinedShapes) == null ? void 0 : _a[table]) {
-      return select ? `row_to_json("${table}".*)` : `"${table}".r`;
-    }
-    return column;
+    return ((_a = data.joinedShapes) == null ? void 0 : _a[table]) ? select ? `row_to_json("${table}".*)` : `"${table}".*` : column;
   }
   const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
   const quoted = `"${table}"`;
@@ -6331,7 +6328,7 @@ class FnExpression extends orchidCore.Expression {
     sql.push(
       this.args.map((arg) => {
         if (typeof arg === "string") {
-          return arg === "*" ? "*" : columnToSql(ctx, this.q, this.q.shape, arg, quotedAs, true);
+          return arg === "*" ? "*" : columnToSql(ctx, this.q, this.q.shape, arg, quotedAs);
         } else if (arg instanceof orchidCore.Expression) {
           return arg.toSQL(ctx, quotedAs);
         } else if ("pairs" in arg) {