pqb 0.30.1 → 0.30.2

package/dist/index.mjs

@@ -2019,7 +2019,7 @@ const processAnds = (and, ctx, table, query, quotedAs, parens) => {
   return parens && ands.length > 1 ? `(${sql})` : sql;
 };
 const processWhere = (ands, ctx, table, query, data, quotedAs) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   if (typeof data === "function") {
     const qb = Object.create(table);
     qb.q = getClonedQueryData(query);
@@ -2181,7 +2181,8 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
             column = quotedAs === quoted ? query.shape[name] : (_b = (_a = query.joinedShapes) == null ? void 0 : _a[table2]) == null ? void 0 : _b[name];
             quotedColumn = simpleColumnToSQL(ctx, name, column, quoted);
           } else {
-            quotedColumn = void 0;
+            column = (_d = (_c = query.joinedShapes) == null ? void 0 : _c[key]) == null ? void 0 : _d.value;
+            quotedColumn = `"${key}".r`;
           }
           if (!column || !quotedColumn) {
             throw new Error(`Unknown column ${key} provided to condition`);
@@ -3454,6 +3455,8 @@ const getShapeFromSelect = (q, isSubQuery) => {
             }
           }
         }
+      } else if (isExpression(item)) {
+        result.value = item.result.value;
       }
     }
   }
@@ -7188,15 +7191,14 @@ class Join {
    *   profile: (q) => q.profile,
    * });
    *
-   * // select posts with counts of comments, order by comments count
+   * // select posts with counts of comments, filter and order by comments count
    * // result type is Array<Post & { commentsCount: number }>
    * await db.post
    *   .select('*', {
    *     commentsCount: (q) => q.comments.count(),
    *   })
-   *   .order({
-   *     commentsCount: 'DESC',
-   *   });
+   *   .where({ commentsCount: { gt: 10 } })
+   *   .order({ commentsCount: 'DESC' });
    *
    * // select authors with array of their book titles
    * // result type is Array<Author & { books: string[] }>
@@ -11064,6 +11066,34 @@ class QueryMethods {
     }
     return new RefExpression(column, q.q, arg);
   }
+  /**
+   * Narrows a part of the query output type.
+   * Use with caution, type-safety isn't guaranteed with it.
+   * This is similar so using `as` keyword from TypeScript, except that it applies only to a part of the result.
+   *
+   * The syntax `()<{ ... }>()` is enforced by internal limitations.
+   *
+   * ```ts
+   * const rows = db.table
+   *   // filter out records where the `nullableColumn` is null
+   *   .where({ nullableColumn: { not: null } });
+   *   // narrows only a specified column, the rest of result is unchanged
+   *   .narrowType()<{ nullableColumn: string }>()
+   *
+   * // the column had type `string | null`, now it is `string`
+   * rows[0].nullableColumn
+   *
+   * // imagine that table has a enum column kind with variants 'first' | 'second'
+   * // and a boolean `approved`
+   * db.table
+   *   .where({ kind: 'first', approved: true })
+   *   // after applying such `where`, it's safe to narrow the type to receive the literal values
+   *   .narrowType()<{ kind: 'first', approved: true }>();
+   * ```
+   */
+  narrowType() {
+    return () => this;
+  }
 }
 applyMixins(QueryMethods, [
   QueryBase,