pqb 0.61.12 → 0.61.13

package/dist/index.d.ts

@@ -9331,13 +9331,13 @@ interface JoinedParsers {
 type QueryBeforeHook = (query: Query) => void | Promise<void>;
 type QueryBeforeActionHook = (utils: QueryHookUtils<PickQueryInputType>) => void | Promise<void>;
 type QueryAfterHook<Data = unknown> = (data: Data, query: Query) => unknown | Promise<unknown>;
-interface QueryDataScopes {
+type QueryDataScopes = {
     [K: string]: QueryScopeData;
-}
-interface QueryScopeData {
+};
+type QueryScopeData = (q: Query) => {
     and?: WhereItem[];
     or?: WhereItem[][];
-}
+};
 type QueryDataFromItem = string | SubQueryForSql | Expression;
 interface QueryDataJoinTo extends PickQueryTable, PickQueryQ {
 }

package/dist/index.js

@@ -9555,8 +9555,9 @@ const whereToSql = (ctx, table, query, quotedAs, parens) => {
     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 scopeResult = scope(table.baseQuery);
+      data.and = scopeResult.and;
+      data.or = scopeResult.or;
       const scopeSql = andOrToSql(ctx, table, data, quotedAs, true);
       if (scopeSql) sql = sql ? sql + " AND " + scopeSql : scopeSql;
     }
@@ -14765,9 +14766,7 @@ function enableSoftDelete(query, table, shape, softDelete, scopes) {
       `Table ${table} is missing ${column} column which is required for soft delete`
     );
   }
-  const scope = {
-    and: [{ [column]: null }]
-  };
+  const scope = () => ({ and: [{ [column]: null }] });
   scopes.deleted = scope;
   const { q } = query;
   setObjectValueImmutable(q, "scopes", "nonDeleted", scope);
@@ -15836,10 +15835,10 @@ class Db extends QueryMethods {
     };
     if (options.scopes) {
       for (const key in options.scopes) {
-        const q = options.scopes[key](this).q;
-        scopes[key] = {
-          and: q.and,
-          or: q.or
+        const scopeFn = options.scopes[key];
+        scopes[key] = (q) => {
+          const result = scopeFn(q);
+          return { and: result.q.and, or: result.q.or };
         };
       }
       if (scopes.default) {