pqb 0.18.34 → 0.19.1

package/dist/index.js

@@ -1074,7 +1074,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs, not) => {
     const res = data(qb);
     const expr = res instanceof orchidCore.Expression ? res : res.q.expr;
     if (!(res instanceof orchidCore.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 {
@@ -1308,7 +1308,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);
@@ -1436,8 +1436,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);
@@ -2431,16 +2431,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) => {
@@ -5816,8 +5818,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;
@@ -5888,7 +5890,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
     if (typeof value === "function") {
       value = resolveSubQueryCallback(q, value);
       if (!orchidCore.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") {
@@ -9325,6 +9327,63 @@ const noneMethods = {
   catch: () => new Promise(orchidCore.noop)
 };
 
+class ScopeMethods {
+  /**
+   * See {@link ScopeMethods}
+   *
+   * Use the `scope` method to apply a pre-defined scope.
+   *
+   * ```ts
+   * // use the `active` scope that is defined in the table:
+   * await db.some.scope('active');
+   * ```
+   *
+   * @param scope - name of the scope to apply
+   */
+  scope(scope) {
+    var _a;
+    const q = this.clone();
+    if (!((_a = q.q.scopes) == null ? void 0 : _a[scope])) {
+      const s = this.internal.scopes[scope];
+      if (s.and)
+        pushQueryArray(q, "and", s.and);
+      if (s.or)
+        pushQueryArray(q, "or", s.or);
+      setQueryObjectValue(q, "scopes", scope, s);
+    }
+    return q;
+  }
+  /**
+   * See {@link ScopeMethods}
+   *
+   * Remove conditions that were added by the scope from the query.
+   *
+   * ```ts
+   * // SomeTable has a default scope, ignore it for this query:
+   * await db.some.unScope('default');
+   * ```
+   *
+   * @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 (or) {
+        data.or = data.or.filter((x) => !or.includes(x));
+      }
+      delete q.q.scopes[scope];
+    }
+    return q;
+  }
+}
+
 class ColumnRefExpression extends orchidCore.Expression {
   constructor(_type, name) {
     super();
@@ -9961,7 +10020,8 @@ orchidCore.applyMixins(QueryMethods, [
   MergeQueryMethods,
   RawSqlMethods,
   CopyMethods,
-  TransformMethods
+  TransformMethods,
+  ScopeMethods
 ]);
 
 var __defProp = Object.defineProperty;
@@ -10004,10 +10064,12 @@ class Db {
     this.shape = shape;
     this.columnTypes = columnTypes2;
     var _a, _b;
-    const tableData = getTableData();
     const self = this;
+    const scopes = options.scopes ? {} : orchidCore.emptyObject;
+    const tableData = getTableData();
     this.internal = __spreadProps(__spreadValues({}, tableData), {
-      transactionStorage
+      transactionStorage,
+      scopes
     });
     this.baseQuery = this;
     const logger = options.logger || console;
@@ -10110,6 +10172,21 @@ class Db {
         super(self, message);
       }
     };
+    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;
+      }
+      if (scopes.default) {
+        Object.assign(this.q, scopes.default);
+        this.q.scopes = { default: scopes.default };
+      }
+    }
   }
   [node_util.inspect.custom]() {
     return `QueryObject<${this.table}>`;
@@ -10258,21 +10335,19 @@ const createDb = (_a) => {
     commonOptions
   );
   qb.queryBuilder = qb;
-  const db = Object.assign(
-    (table, shape, options2) => {
-      return new Db(
-        adapter,
-        qb,
-        table,
-        typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options2 == null ? void 0 : options2.language) : shape,
-        ct,
-        transactionStorage,
-        __spreadValues(__spreadValues({}, commonOptions), options2)
-      );
-    },
+  const tableConstructor = (table, shape, options2) => new Db(
+    adapter,
     qb,
-    { adapter, close: () => adapter.close() }
+    table,
+    typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options2 == null ? void 0 : options2.language) : shape,
+    ct,
+    transactionStorage,
+    __spreadValues(__spreadValues({}, commonOptions), options2)
   );
+  const db = Object.assign(tableConstructor, qb, {
+    adapter,
+    close: () => adapter.close()
+  });
   for (const name of Object.getOwnPropertyNames(Db.prototype)) {
     db[name] = Db.prototype[name];
   }