pqb 0.35.6 → 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;