pqb 0.18.33 → 0.19.0

package/dist/index.mjs

@@ -1072,7 +1072,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs, not) => {
     const res = data(qb);
     const expr = res instanceof Expression ? res : res.q.expr;
     if (!(res instanceof Expression) && res.q.expr) {
-      const q = "relationConfig" in res ? res.relationConfig.joinQuery(table, res) : res.clone();
+      const q = "relationConfig" in res ? res.relationConfig.joinQuery(res, table) : res.clone();
       q.q.select = [expr];
       ands.push(`${prefix}(${makeSQL(q, ctx).text})`);
     } else {
@@ -1306,7 +1306,7 @@ const processJoinItem = (ctx, table, query, item, quotedAs) => {
   if (typeof first === "string") {
     if (first in table.relations) {
       const { query: toQuery, joinQuery } = table.relations[first].relationConfig;
-      const jq = joinQuery(table, toQuery);
+      const jq = joinQuery(toQuery, table);
       const { q: j } = jq;
       const tableName = typeof j.from === "string" ? j.from : jq.table;
       target = quoteSchemaAndTable(j.schema, tableName);
@@ -1434,8 +1434,8 @@ const processArgs = (args, ctx, table, query, first, joinAs, joinShape, quotedAs
             base = base.as(q.q.as);
           }
           const { q: query2 } = first.joinQueryAfterCallback(
-            table,
-            base
+            base,
+            table
           );
           if (query2.and) {
             pushQueryArray(q, "and", query2.and);
@@ -2429,16 +2429,18 @@ const makeRegexToFindInSql = (value) => {
   return new RegExp(`${value}(?=(?:[^']*'[^']*')*[^']*$)`, "g");
 };
 const resolveSubQueryCallback = (q, cb) => {
-  const { isSubQuery } = q.q;
+  const { isSubQuery, relChain } = q.q;
   q.q.isSubQuery = true;
+  q.q.relChain = void 0;
   const result = cb(q);
   q.q.isSubQuery = isSubQuery;
+  q.q.relChain = relChain;
   return result;
 };
 const joinSubQuery = (q, sub) => {
   if (!("relationConfig" in sub))
     return sub;
-  return sub.relationConfig.joinQuery(q, sub);
+  return sub.relationConfig.joinQuery(sub, q);
 };
 
 const pushQueryArray = (q, key, value) => {
@@ -5814,8 +5816,8 @@ const _joinLateral = (q, type, arg, cb, as) => {
   let result = cb(query);
   if (relation) {
     result = relation.relationConfig.joinQuery(
-      q,
-      result
+      result,
+      q
     );
   }
   const joinKey = as || result.q.as || result.table;
@@ -5886,7 +5888,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
     if (typeof value === "function") {
       value = resolveSubQueryCallback(q, value);
       if (!isExpression(value) && value.joinQuery) {
-        value = value.joinQuery(q, value);
+        value = value.joinQuery(value, q);
         let query;
         const returnType = value.q.returnType;
         if (!returnType || returnType === "all") {
@@ -6183,7 +6185,7 @@ class QueryGet {
    * It will throw `NotFoundError` when not found.
    *
    * ```ts
-   * import { NumberColumn } from 'pqb';
+   * import { NumberColumn } from 'orchid-orm';
    *
    * const firstName: string = await db.table.get('name');
    *
@@ -7467,7 +7469,7 @@ class JsonModifiers extends QueryBase {
    * Selects a value from JSON data using a JSON path.
    *
    * ```ts
-   * import { columnTypes } from 'pqb';
+   * import { columnTypes } from 'orchid-orm';
    *
    * db.table.jsonPathQuery(
    *   columnTypes.text(3, 100), // type of the value
@@ -8054,7 +8056,7 @@ class With {
    * Add Common Table Expression (CTE) to the query.
    *
    * ```ts
-   * import { columnTypes } from 'pqb';
+   * import { columnTypes } from 'orchid-orm';
    * import { NumberColumn } from './number';
    *
    * // .with optionally accepts such options:
@@ -8559,7 +8561,7 @@ class Update {
    * To make sure that at least one row was updated use `updateOrThrow`:
    *
    * ```ts
-   * import { NotFoundError } from 'pqb';
+   * import { NotFoundError } from 'orchid-orm';
    *
    * try {
    *   // updatedCount is guaranteed to be greater than 0
@@ -9895,6 +9897,20 @@ class QueryMethods {
    * await selectFollowing(db.user.select('id', 'name'), currentUser);
    * ```
    *
+   * To get the result type of query helper, use `QueryHelperResult` type:
+   *
+   * ```ts
+   * import { QueryHelperResult } from 'orchid-orm';
+   *
+   * const selectHelper = db.table.makeHelper((q) => q.select('id', 'name'));
+   *
+   * // This type is identical to `db.table.select('id', 'name')`
+   * type SelectQuery = QueryHelperResult<typeof selectHelper>;
+   *
+   * // Await to get result, the type is `{ id: number, name: string }[]`
+   * type Result = Awaited<QueryHelperResult<typeof selectHelper>>;
+   * ```
+   *
    * @param fn - helper function
    */
   makeHelper(fn) {