pqb 0.31.3 → 0.31.5

package/dist/index.d.ts

@@ -455,7 +455,7 @@ interface CommonQueryData {
      * Is needed to remove these operators from query object when changing the query type, see {@link setQueryOperators}.
      */
     operators?: BaseOperators;
-    scopes: {
+    scopes?: {
         [K: string]: QueryScopeData;
     };
     all?: true;

package/dist/index.js

@@ -1776,35 +1776,68 @@ function simpleExistingColumnToSQL(ctx, key, column, quotedAs) {
   return data.computed ? data.computed.toSQL(ctx, quotedAs) : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
 }
 const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
-  var _a, _b, _c, _d, _e;
+  var _a;
   const index = column.indexOf(".");
   if (index !== -1) {
-    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 columnWithDotToSql(
+      ctx,
+      data,
+      shape,
+      column,
+      index,
+      quotedAs,
+      select
+    );
+  }
+  if (!select && ((_a = data.joinedShapes) == null ? void 0 : _a[column])) {
+    return `"${column}".r`;
+  }
+  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
+};
+const maybeSelectedColumnToSql = (ctx, data, column, quotedAs) => {
+  var _a;
+  const index = column.indexOf(".");
+  if (index !== -1) {
+    return columnWithDotToSql(ctx, data, data.shape, column, index, quotedAs);
+  } else {
+    if ((_a = data.joinedShapes) == null ? void 0 : _a[column]) {
+      return `"${column}".r`;
+    }
+    if (data.select) {
+      for (const s of data.select) {
+        if (typeof s === "object" && "selectAs" in s) {
+          if (column in s.selectAs) {
+            return simpleColumnToSQL(ctx, column, data.shape[column]);
+          }
+        }
       }
-      return column;
     }
-    const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
-    const quoted = `"${table}"`;
-    const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
-    if (col) {
-      if (col.data.name) {
-        return `"${tableName}"."${col.data.name}"`;
-      }
-      if (col.data.computed) {
-        return `${col.data.computed.toSQL(ctx, quoted)}`;
-      }
-      return `"${tableName}"."${key}"`;
+    return simpleColumnToSQL(ctx, column, data.shape[column], quotedAs);
+  }
+};
+const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) => {
+  var _a, _b, _c, _d;
+  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 `"${tableName}"."${key}"`;
+    return column;
   }
-  if (!select && ((_e = data.joinedShapes) == null ? void 0 : _e[column])) {
-    return `"${column}".r`;
+  const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+  const quoted = `"${table}"`;
+  const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
+  if (col) {
+    if (col.data.name) {
+      return `"${tableName}"."${col.data.name}"`;
+    }
+    if (col.data.computed) {
+      return `${col.data.computed.toSQL(ctx, quoted)}`;
+    }
+    return `"${tableName}"."${key}"`;
   }
-  return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
+  return `"${tableName}"."${key}"`;
 };
 const columnToSqlWithAs = (ctx, data, column, quotedAs, select) => {
   var _a, _b, _c, _d;
@@ -1939,7 +1972,7 @@ const setQueryObjectValue = (q, object, key, value) => {
   return q;
 };
 const throwIfNoWhere = (q, method) => {
-  if (!q.q.or && !q.q.and && !q.q.all) {
+  if (!q.q.or && !q.q.and && !q.q.scopes && !q.q.all) {
     throw new OrchidOrmInternalError(
       q,
       `Dangerous ${method} without conditions`
@@ -1996,6 +2029,22 @@ const pushWhereToSql = (sql, ctx, table, query, quotedAs, parens) => {
   }
 };
 const whereToSql = (ctx, table, query, quotedAs, parens) => {
+  if (query.scopes) {
+    let sql = andOrToSql(ctx, table, query, quotedAs, true);
+    const data = Object.create(query);
+    for (const key in query.scopes) {
+      const scope = query.scopes[key];
+      data.and = scope.and;
+      data.or = scope.or;
+      const scopeSql = andOrToSql(ctx, table, data, quotedAs, true);
+      if (scopeSql)
+        sql = sql ? sql + " AND " + scopeSql : scopeSql;
+    }
+    return sql;
+  }
+  return andOrToSql(ctx, table, query, quotedAs, parens);
+};
+const andOrToSql = (ctx, table, query, quotedAs, parens) => {
   var _a;
   let sql;
   if (query.or) {
@@ -2018,42 +2067,21 @@ const processAnds = (and, ctx, table, query, quotedAs, parens) => {
 };
 const processWhere = (ands, ctx, table, query, data, quotedAs) => {
   var _a, _b, _c, _d;
-  if (typeof data === "function") {
-    const qb = Object.create(table);
-    qb.q = getClonedQueryData(query);
-    qb.q.and = qb.q.or = void 0;
-    qb.q.isSubQuery = true;
-    const res = resolveSubQueryCallback(qb, data);
-    if (orchidCore.isExpression(res)) {
-      ands.push(`(${res.toSQL(ctx, quotedAs)})`);
-    } else {
-      if (res.q.expr) {
-        const q = joinSubQuery(table, res);
-        q.q.select = [res.q.expr];
-        ands.push(`(${makeSQL(q, ctx).text})`);
-      } else {
-        pushWhereToSql(
-          ands,
-          ctx,
-          res,
-          res.q,
-          quotedAs,
-          true
-        );
-      }
-    }
-    return;
-  }
   if ("prototype" in data || "baseQuery" in data) {
     const query2 = data;
-    const sql = whereToSql(
-      ctx,
-      query2,
-      query2.q,
-      query2.table && `"${query2.table}"`
-    );
-    if (sql) {
-      ands.push(`(${sql})`);
+    if (query2.q.expr) {
+      const q = joinSubQuery(table, query2);
+      q.q.select = [query2.q.expr];
+      ands.push(`(${makeSQL(q, ctx).text})`);
+    } else {
+      pushWhereToSql(
+        ands,
+        ctx,
+        query2,
+        query2.q,
+        query2.table && `"${query2.table}"`,
+        true
+      );
     }
     return;
   }
@@ -2071,7 +2099,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     } else if (key === "OR") {
       const arr = value.map(orchidCore.toArray);
       ands.push(
-        arr.map((and) => processAnds(and, ctx, table, query, quotedAs)).join(" OR ")
+        `(${arr.map((and) => processAnds(and, ctx, table, query, quotedAs)).join(" OR ")})`
       );
     } else if (key === "NOT") {
       const arr = orchidCore.toArray(value);
@@ -2555,6 +2583,9 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery) => {
       if (query.or) {
         pushQueryArray(q, "or", query.or);
       }
+      if (query.scopes) {
+        q.q.scopes = __spreadValues$c(__spreadValues$c({}, q.q.scopes), query.scopes);
+      }
     }
     const joinedShapes = __spreadProps$4(__spreadValues$c({}, joinTo.q.joinedShapes), {
       [joinTo.q.as || joinTo.table]: joinTo.shape
@@ -3793,8 +3824,7 @@ function queryWrap(self, query, as = "t") {
 }
 function cloneQueryBaseUnscoped(query) {
   const q = query.baseQuery.clone();
-  q.q.or = q.q.and = void 0;
-  q.q.scopes = orchidCore.emptyObject;
+  q.q.or = q.q.and = q.q.scopes = void 0;
   return q;
 }
 
@@ -4039,7 +4069,7 @@ const addOrder = (ctx, data, column, quotedAs, dir) => {
     const order = dir || (!search.order || search.order === true ? orchidCore.emptyObject : search.order);
     return `${order.coverDensity ? "ts_rank_cd" : "ts_rank"}(${order.weights ? `${orchidCore.addValue(ctx.values, `{${order.weights}}`)}, ` : ""}${search.vectorSQL}, "${column}"${order.normalization !== void 0 ? `, ${orchidCore.addValue(ctx.values, order.normalization)}` : ""}) ${order.dir || "DESC"}`;
   }
-  return `${columnToSql(ctx, data, data.shape, column, quotedAs)} ${dir || "ASC"}`;
+  return `${maybeSelectedColumnToSql(ctx, data, column, quotedAs)} ${dir || "ASC"}`;
 };
 
 const windowToSql = (ctx, data, window, quotedAs) => {
@@ -4094,7 +4124,7 @@ const pushWithSql = (ctx, items) => {
 
 const checkIfASimpleQuery = (q) => {
   var _a, _b;
-  if (q.q.returnType && q.q.returnType !== "all" || q.internal.columnsForSelectAll || ((_a = q.q.and) == null ? void 0 : _a.length) || ((_b = q.q.or) == null ? void 0 : _b.length))
+  if (q.q.returnType && q.q.returnType !== "all" || q.internal.columnsForSelectAll || ((_a = q.q.and) == null ? void 0 : _a.length) || ((_b = q.q.or) == null ? void 0 : _b.length) || q.q.scopes)
     return false;
   const keys = Object.keys(q.q);
   return !keys.some((key) => queryKeysOfNotSimpleQuery.includes(key));
@@ -4581,7 +4611,7 @@ const pushDeleteSql = (ctx, table, query, quotedAs) => {
   }
   pushWhereStatementSql(ctx, table, query, quotedAs);
   if (conditions) {
-    if (((_c = query.and) == null ? void 0 : _c.length) || ((_d = query.or) == null ? void 0 : _d.length)) {
+    if (((_c = query.and) == null ? void 0 : _c.length) || ((_d = query.or) == null ? void 0 : _d.length) || query.scopes) {
       ctx.sql.push("AND", conditions);
     } else {
       ctx.sql.push("WHERE", conditions);
@@ -4784,12 +4814,12 @@ const makeSQL = (table, options) => {
         quotedAs
       );
     }
-    if (query.and || query.or) {
+    if (query.and || query.or || query.scopes) {
       pushWhereStatementSql(ctx, table, query, quotedAs);
     }
     if (query.group) {
       const group = query.group.map(
-        (item) => orchidCore.isExpression(item) ? item.toSQL(ctx, quotedAs) : columnToSql(ctx, table.q, table.q.shape, item, quotedAs)
+        (item) => orchidCore.isExpression(item) ? item.toSQL(ctx, quotedAs) : maybeSelectedColumnToSql(ctx, table.q, item, quotedAs)
       );
       sql.push(`GROUP BY ${group.join(", ")}`);
     }
@@ -6206,6 +6236,7 @@ const insert = (self, {
   const { q } = self;
   delete q.and;
   delete q.or;
+  delete q.scopes;
   q.type = "insert";
   q.columns = columns;
   q.values = values;
@@ -8565,7 +8596,20 @@ class WithMethods {
   }
 }
 
+const resolveCallbacksInArgs = (q, args) => {
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (typeof arg === "function") {
+      const qb = Object.create(q);
+      qb.q = getClonedQueryData(q.q);
+      qb.q.and = qb.q.or = qb.q.scopes = void 0;
+      qb.q.isSubQuery = true;
+      args[i] = resolveSubQueryCallback(qb, arg);
+    }
+  }
+};
 const _queryWhere = (q, args) => {
+  resolveCallbacksInArgs(q, args);
   return pushQueryArray(
     q,
     "and",
@@ -8580,6 +8624,7 @@ const _queryWhereSql = (q, args) => {
   );
 };
 const _queryWhereNot = (q, args) => {
+  resolveCallbacksInArgs(q, args);
   return pushQueryValue(q, "and", {
     NOT: args
   });
@@ -8590,6 +8635,7 @@ const _queryWhereNotSql = (q, args) => {
   });
 };
 const _queryOr = (q, args) => {
+  resolveCallbacksInArgs(q, args);
   return pushQueryArray(
     q,
     "or",
@@ -8597,10 +8643,13 @@ const _queryOr = (q, args) => {
   );
 };
 const _queryOrNot = (q, args) => {
+  resolveCallbacksInArgs(q, args);
   return pushQueryArray(
     q,
     "or",
-    args.map((item) => [{ NOT: item }])
+    args.map((item) => {
+      return [{ NOT: item }];
+    })
   );
 };
 const _queryWhereIn = (q, and, arg, values, not) => {
@@ -10422,10 +10471,8 @@ class ScopeMethods {
     const q = this.clone();
     if (!((_a = q.q.scopes) == null ? void 0 : _a[scope])) {
       const s = q.internal.scopes[scope];
-      if (s.and)
-        pushQueryArray(q, "and", s.and);
-      if (s.or)
-        pushQueryArray(q, "or", s.or);
+      if (!s)
+        throw new Error(`Scope ${scope} is not defined`);
       setQueryObjectValue(q, "scopes", scope, s);
     }
     return q;
@@ -10443,23 +10490,13 @@ class ScopeMethods {
    * @param scope - name of the scope to remove from the query
    */
   unscope(scope) {
-    var _a;
     const q = this.clone();
-    const data = q.q;
-    const s = (_a = q.q.scopes) == null ? void 0 : _a[scope];
-    if (s) {
-      const { and, or } = s;
-      if (and) {
-        data.and = data.and.filter((x) => !and.includes(x));
-        if (!data.and.length)
-          delete data.and;
-      }
-      if (or) {
-        data.or = data.or.filter((x) => !or.includes(x));
-        if (!data.or.length)
-          delete data.or;
-      }
+    if (q.q.scopes) {
       delete q.q.scopes[scope];
+      for (const _ in q.q.scopes) {
+        return q;
+      }
+      delete q.q.scopes;
     }
     return q;
   }
@@ -10477,7 +10514,6 @@ function enableSoftDelete(q, table, shape, softDelete, scopes) {
     and: [{ [column]: null }]
   };
   scopes.deleted = scope;
-  pushQueryValue(q, "and", scope.and[0]);
   ((_b = (_a = q.q).scopes) != null ? _b : _a.scopes = {}).nonDeleted = scope;
   const _del = _softDelete(column);
   q.baseQuery.delete = function() {
@@ -11642,15 +11678,12 @@ class Db {
     if (options.scopes) {
       for (const key in options.scopes) {
         const q = options.scopes[key](this).q;
-        const s = {};
-        if (q.and)
-          s.and = q.and;
-        if (q.or)
-          s.or = q.or;
-        scopes[key] = s;
+        scopes[key] = {
+          and: q.and,
+          or: q.or
+        };
       }
       if (scopes.default) {
-        Object.assign(this.q, scopes.default);
         this.q.scopes = { default: scopes.default };
       }
     }