pqb 0.2.9 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.2.9",
+  "version": "0.3.0",
   "description": "Postgres query builder",
   "homepage": "https://porm.netlify.app/guide/query-builder.html",
   "repository": {

package/src/queryMethods/select.test.ts

@@ -17,7 +17,7 @@ import {
   useTestDatabase,
 } from '../test-utils';
 import { raw } from '../common';
-import { DateColumn } from '../columnSchema';
+import { columnTypes, DateColumn } from '../columnSchema';
 import { addQueryOn } from './join';
 import { RelationQuery, relationQueryKey } from '../relations';
 
@@ -289,6 +289,21 @@ describe('selectMethods', () => {
           createdAt: now,
         });
       });
+
+      it('should have proper type for conditional sub queries', async () => {
+        const condition = true;
+
+        const query = User.select('id', {
+          hasProfile: condition
+            ? () => profileRelation.exists()
+            : raw(columnTypes.boolean(), 'true'),
+        });
+
+        assertType<
+          Awaited<typeof query>,
+          { id: number; hasProfile: boolean }[]
+        >();
+      });
     });
 
     describe('parse columns', () => {

package/src/queryMethods/select.ts

@@ -63,6 +63,12 @@ type SelectResult<
       ? SelectAsArgs[K]['__column']
       : SelectAsArgs[K] extends (q: T) => Query
       ? SelectSubQueryResult<ReturnType<SelectAsArgs[K]>>
+      : SelectAsArgs[K] extends ((q: T) => Query) | RawExpression
+      ?
+          | SelectSubQueryResult<
+              ReturnType<Exclude<SelectAsArgs[K], RawExpression>>
+            >
+          | Exclude<SelectAsArgs[K], (q: T) => Query>['__column']
       : never;
   }
 >;