pqb 0.43.5 → 0.45.0

package/dist/index.js

@@ -2127,14 +2127,13 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
       } else {
         const item = value;
         const joinAs = `"${getJoinItemSource(item.joinFrom)}"`;
-        const { on } = item;
         const q = item.useOuterAliases ? {
           joinedShapes: query.joinedShapes,
           aliases: query.outerAliases,
           shape: query.shape
         } : query;
         ands.push(
-          `${onColumnToSql(ctx, q, joinAs, on[0])} ${on.length === 2 ? "=" : on[1]} ${onColumnToSql(ctx, q, joinAs, on.length === 3 ? on[2] : on[1])}`
+          `${onColumnToSql(ctx, q, joinAs, item.from)} ${item.op || "="} ${onColumnToSql(ctx, q, joinAs, item.to)}`
         );
       }
     } else if (key === "IN") {
@@ -2611,7 +2610,7 @@ const resolveCallbacksInArgs = (q, args) => {
       qb.q.and = qb.q.or = qb.q.scopes = void 0;
       qb.q.subQuery = 1;
       qb.q.outerAliases = qb.q.aliases;
-      args[i] = resolveSubQueryCallback(qb, arg);
+      args[i] = resolveSubQueryCallbackV2(qb, arg);
     }
   }
 };
@@ -3388,6 +3387,11 @@ const pushQueryValue = (q, key, value) => {
   );
   return q;
 };
+const pushQueryValueImmutable = (q, key, value) => {
+  const arr = q.q[key];
+  q.q[key] = arr ? [...arr, value] : [value];
+  return q;
+};
 const setQueryObjectValue = (q, object, key, value) => {
   if (!q.q[object])
     q.q[object] = {
@@ -3608,9 +3612,7 @@ const addAllShapesAndParsers = (query, joinKey, shape, parsers, batchParsers, co
     computeds
   );
 };
-const _joinLateral = (self, type, arg, cb, as) => {
-  var _a, _b, _c;
-  const q = self;
+const _joinLateralProcessArg = (q, arg, cb) => {
   let relation;
   if (typeof arg === "string") {
     relation = q.relations[arg];
@@ -3632,29 +3634,36 @@ const _joinLateral = (self, type, arg, cb, as) => {
       }
     }
   }
-  const query = arg;
-  query.q.joinTo = q;
-  const joinedAs = getQueryAs(q);
-  ((_a = query.q).joinedShapes ?? (_a.joinedShapes = {}))[joinedAs] = q.q.shape;
-  let result = resolveSubQueryCallback(query, cb);
+  let result = resolveSubQueryCallbackV2(
+    arg,
+    cb
+  );
   if (relation) {
     result = relation.relationConfig.joinQuery(
       result,
       q
     );
   }
-  const joinKey = as || result.q.as || result.table;
+  return result;
+};
+const _joinLateral = (self, type, arg, as) => {
+  var _a, _b, _c;
+  const q = self;
+  arg.q.joinTo = q;
+  const joinedAs = getQueryAs(q);
+  ((_a = arg.q).joinedShapes ?? (_a.joinedShapes = {}))[joinedAs] = q.q.shape;
+  const joinKey = as || arg.q.as || arg.table;
   if (joinKey) {
-    const shape = getShapeFromSelect(result, true);
+    const shape = getShapeFromSelect(arg, true);
     setQueryObjectValue(q, "joinedShapes", joinKey, shape);
-    setQueryObjectValue(q, "joinedParsers", joinKey, result.q.parsers);
-    if (result.q.batchParsers) {
-      ((_b = q.q).joinedBatchParsers ?? (_b.joinedBatchParsers = {}))[joinKey] = result.q.batchParsers;
+    setQueryObjectValue(q, "joinedParsers", joinKey, arg.q.parsers);
+    if (arg.q.batchParsers) {
+      ((_b = q.q).joinedBatchParsers ?? (_b.joinedBatchParsers = {}))[joinKey] = arg.q.batchParsers;
     }
   }
-  as || (as = getQueryAs(result));
-  ((_c = q.q).joinedComputeds ?? (_c.joinedComputeds = {}))[as] = result.q.computeds;
-  return pushQueryValue(q, "join", [type, result, as]);
+  as || (as = getQueryAs(arg));
+  ((_c = q.q).joinedComputeds ?? (_c.joinedComputeds = {}))[as] = arg.q.computeds;
+  return pushQueryValue(q, "join", [type, arg, as]);
 };
 
 class EnumColumn extends ColumnType {
@@ -5203,7 +5212,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
     let value = arg[key];
     let joinQuery;
     if (typeof value === "function") {
-      value = resolveSubQueryCallback(q, value);
+      value = resolveSubQueryCallbackV2(q, value);
       if (isQueryNone(value)) {
         if (value.q.innerJoinLateral) {
           return false;
@@ -5245,7 +5254,6 @@ const processSelectArg = (q, as, arg, columnAs) => {
           q,
           value.q.innerJoinLateral ? "JOIN" : "LEFT JOIN",
           query,
-          (q2) => q2,
           key
         );
       }
@@ -5262,7 +5270,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
   return { selectAs };
 };
 const setParserForSelectedString = (q, arg, as, columnAs) => {
-  var _a, _b;
+  var _a;
   const index = arg.indexOf(".");
   if (index !== -1) {
     const table = getFullColumnTable(q, arg, index, as);
@@ -5291,7 +5299,7 @@ const setParserForSelectedString = (q, arg, as, columnAs) => {
     const computeds = q.q.joinedComputeds?.[table];
     if (computeds?.[column]) {
       const computed = computeds[column];
-      const map = (_b = q.q).hookSelect ?? (_b.hookSelect = /* @__PURE__ */ new Map());
+      const map = q.q.hookSelect = new Map(q.q.hookSelect);
       for (const column2 of computed.deps) {
         map.set(column2, { select: `${table}.${column2}` });
       }
@@ -5311,10 +5319,9 @@ const setParserForSelectedString = (q, arg, as, columnAs) => {
   }
 };
 const handleComputed = (q, computeds, column) => {
-  var _a;
   if (computeds?.[column]) {
     const computed = computeds[column];
-    const map = (_a = q.q).hookSelect ?? (_a.hookSelect = /* @__PURE__ */ new Map());
+    const map = q.q.hookSelect = new Map(q.q.hookSelect);
     for (const column2 of computed.deps) {
       map.set(column2, { select: column2 });
     }
@@ -6657,16 +6664,15 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
   pushWhereStatementSql(ctx, table, query, quotedAs);
 };
 
-const toSQLCacheKey = Symbol("toSQLCache");
 const toSQL = (table, options) => {
-  if (table.q[toSQLCacheKey] && !options?.clearCache) {
-    const cached = table.q[toSQLCacheKey];
+  if (table.q.sqlCache && !options?.clearCache) {
+    const cached = table.q.sqlCache;
     if (options?.values && "values" in cached && cached.values && options.values !== cached.values) {
       options.values.push(...cached.values);
     }
     return cached;
   }
-  return table.q[toSQLCacheKey] = makeSQL(table, options);
+  return table.q.sqlCache = makeSQL(table, options);
 };
 const makeSQL = (table, options) => {
   const query = table.q;
@@ -6801,11 +6807,8 @@ function pushLimitSQL(sql, values, q) {
 const cloneQuery = (q) => {
   if (q.with) q.with = q.with.slice(0);
   if (q.select) q.select = q.select.slice(0);
-  if (q.hookSelect) q.hookSelect = new Map(q.hookSelect);
   if (q.and) q.and = q.and.slice(0);
   if (q.or) q.or = q.or.slice(0);
-  if (q.before) q.before = q.before.slice(0);
-  if (q.after) q.after = q.after.slice(0);
   if (q.joinedShapes) q.joinedShapes = { ...q.joinedShapes };
   if (q.joinedComputeds) q.joinedComputeds = { ...q.joinedComputeds };
   if (q.batchParsers) q.batchParsers = [...q.batchParsers];
@@ -6830,29 +6833,6 @@ const cloneQuery = (q) => {
     q.values = Array.isArray(q.values) ? q.values.slice(0) : q.values;
     if (q.using) q.using = q.using.slice(0);
     if (q.join) q.join = q.join.slice(0);
-    if (q.beforeCreate) q.beforeCreate = q.beforeCreate.slice(0);
-    if (q.afterCreate) {
-      q.afterCreate = q.afterCreate.slice(0);
-      if (q.afterCreateSelect) {
-        q.afterCreateSelect = new Set(q.afterCreateSelect);
-      }
-    }
-  } else if (q.type === "update") {
-    if (q.beforeUpdate) q.beforeUpdate = q.beforeUpdate.slice(0);
-    if (q.afterUpdate) {
-      q.afterUpdate = q.afterUpdate.slice(0);
-      if (q.afterUpdateSelect) {
-        q.afterUpdateSelect = new Set(q.afterUpdateSelect);
-      }
-    }
-  } else if (q.type === "delete") {
-    if (q.beforeDelete) q.beforeDelete = q.beforeDelete.slice(0);
-    if (q.afterDelete) {
-      q.afterDelete = q.afterDelete.slice(0);
-      if (q.afterDeleteSelect) {
-        q.afterDeleteSelect = new Set(q.afterDeleteSelect);
-      }
-    }
   }
 };
 
@@ -6893,7 +6873,7 @@ const _chain = (fromQuery, toQuery, rel) => {
 
 const getClonedQueryData = (query) => {
   const cloned = { ...query };
-  delete cloned[toSQLCacheKey];
+  delete cloned.sqlCache;
   cloneQuery(cloned);
   return cloned;
 };
@@ -6903,13 +6883,13 @@ const getQueryAs = (q) => {
 const makeRegexToFindInSql = (value) => {
   return new RegExp(`${value}(?=(?:[^']*'[^']*')*[^']*$)`, "g");
 };
-const resolveSubQueryCallback = (q, cb) => {
-  let arg;
+const resolveSubQueryCallbackV2 = (q, cb) => {
+  let base;
   if (q.table) {
-    if (!q.internal.callbackArg) {
-      const base = Object.create(q.baseQuery);
+    base = q.internal.callbackArg;
+    if (!base) {
+      base = Object.create(q.baseQuery);
       base.baseQuery = base;
-      q.internal.callbackArg = base;
       const { relations } = q;
       for (const key in relations) {
         Object.defineProperty(base, key, {
@@ -6919,21 +6899,17 @@ const resolveSubQueryCallback = (q, cb) => {
           }
         });
       }
+      q.internal.callbackArg = base;
     }
-    arg = Object.create(q.internal.callbackArg);
-    arg.q = q.q;
   } else {
-    arg = q;
-  }
-  const { subQuery, relChain, outerAliases } = q.q;
-  q.q.subQuery = 1;
-  q.q.relChain = void 0;
-  q.q.outerAliases = q.q.aliases;
-  const result = cb(arg);
-  q.q.subQuery = subQuery;
-  q.q.relChain = relChain;
-  q.q.outerAliases = outerAliases;
-  return result;
+    base = q;
+  }
+  const arg = Object.create(base);
+  arg.q = getClonedQueryData(q.q);
+  arg.q.subQuery = 1;
+  arg.q.relChain = void 0;
+  arg.q.outerAliases = q.q.aliases;
+  return cb(arg);
 };
 const joinSubQuery = (q, sub) => {
   if (!("relationConfig" in sub)) return sub;
@@ -8149,7 +8125,7 @@ const processCreateItem = (q, item, rowIndex, ctx, encoders) => {
       );
     } else {
       if (typeof item[key] === "function") {
-        item[key] = resolveSubQueryCallback(
+        item[key] = resolveSubQueryCallbackV2(
           q,
           item[key]
         );
@@ -9075,21 +9051,22 @@ class Having {
   }
 }
 
-const before = (q, key, cb) => pushQueryValue(q, `before${key}`, cb);
-const after = (q, key, select, cb, commit) => {
-  var _a, _b;
-  pushQueryValue(q, `after${key}${commit ? "Commit" : ""}`, cb);
-  const set = (_a = q.q)[_b = `after${key}Select`] ?? (_a[_b] = /* @__PURE__ */ new Set());
+const before = (q, key, cb) => pushQueryValueImmutable(q, `before${key}`, cb);
+const after = (query, key, select, cb, commit) => {
+  const q = query;
+  pushQueryValueImmutable(q, `after${key}${commit ? "Commit" : ""}`, cb);
+  const prop = `after${key}Select`;
+  const set = q.q[prop] = new Set(q.q[prop]);
   for (const column of select) {
     set.add(column);
   }
-  return q;
+  return query;
 };
 const _queryHookBeforeQuery = (q, cb) => {
-  return pushQueryValue(q, "before", cb);
+  return pushQueryValueImmutable(q, "before", cb);
 };
 const _queryHookAfterQuery = (q, cb) => {
-  return pushQueryValue(q, "after", cb);
+  return pushQueryValueImmutable(q, "after", cb);
 };
 const _queryHookBeforeCreate = (q, cb) => {
   return before(q, "Create", cb);
@@ -9905,11 +9882,11 @@ class Join {
    * @param cb - {@link JoinLateralCallback}
    */
   joinLateral(arg, cb) {
+    const q = _clone(this);
     return _joinLateral(
-      _clone(this),
+      q,
       "JOIN",
-      arg,
-      cb
+      _joinLateralProcessArg(q, arg, cb)
     );
   }
   /**
@@ -9928,28 +9905,32 @@ class Join {
    * @param cb - {@link JoinLateralCallback}
    */
   leftJoinLateral(arg, cb) {
+    const q = _clone(this);
     return _joinLateral(
       _clone(this),
       "LEFT JOIN",
-      arg,
-      cb
+      _joinLateralProcessArg(q, arg, cb)
     );
   }
 }
 const makeOnItem = (joinTo, joinFrom, args) => ({
   ON: {
-    joinTo,
     joinFrom,
-    on: args
+    from: args[0],
+    joinTo,
+    to: args.length === 2 ? args[1] : args[2],
+    op: args.length === 2 ? void 0 : args[1]
   }
 });
 const pushQueryOnForOuter = (q, joinFrom, joinTo, ...on) => {
   return pushQueryValue(q, "and", {
     ON: {
-      joinTo: joinFrom,
       joinFrom: joinTo,
+      from: on[0],
+      joinTo: joinFrom,
+      to: on.length === 2 ? on[1] : on[2],
       useOuterAliases: true,
-      on
+      op: on.length === 2 ? void 0 : on[1]
     }
   });
 };
@@ -10367,11 +10348,11 @@ const _queryUpdate = (query, arg) => {
     } else {
       let value = set[key];
       if (typeof value === "function") {
-        value = resolveSubQueryCallback(
+        value = resolveSubQueryCallbackV2(
           query.baseQuery,
           value
         );
-        if (value instanceof Db && value.q.type) {
+        if (value instanceof Db && value.q.type && value.q.subQuery) {
           throw new OrchidOrmInternalError(
             value,
             `Only selecting queries are allowed inside callback of update, ${value.q.type} is given instead.`
@@ -10493,7 +10474,7 @@ class Update {
    *
    *   // use query that returns a single value
    *   // returning multiple values will result in Postgres error
-   *   column3: db.otherTable.get('someColumn'),
+   *   column3: () => db.otherTable.get('someColumn'),
    *
    *   // select a single value from a related record
    *   fromRelation: (q) => q.relatedTable.get('someColumn'),
@@ -10510,16 +10491,16 @@ class Update {
    * ```ts
    * await db.table.where({ ...conditions }).update({
    *   // `column` will be set to a value of the `otherColumn` of the created record.
-   *   column: db.otherTable.get('otherColumn').create({ ...data }),
+   *   column: () => db.otherTable.get('otherColumn').create({ ...data }),
    *
    *   // `column2` will be set to a value of the `otherColumn` of the updated record.
-   *   column2: db.otherTable
+   *   column2: () => db.otherTable
    *     .get('otherColumn')
    *     .findBy({ ...conditions })
    *     .update({ key: 'value' }),
    *
    *   // `column3` will be set to a value of the `otherColumn` of the deleted record.
-   *   column3: db.otherTable
+   *   column3: () => db.otherTable
    *     .get('otherColumn')
    *     .findBy({ ...conditions })
    *     .delete(),
@@ -11001,7 +10982,7 @@ function orCreate(query, data, updateData, mergeData) {
   q.handleResult = (q2, t, r, s) => {
     return created ? result : handleResult(q2, t, r, s);
   };
-  q.hookSelect ?? (q.hookSelect = /* @__PURE__ */ new Map());
+  q.hookSelect = new Map(q.hookSelect);
   q.patchResult = async (q2, hookSelect, queryResult) => {
     var _a, _b;
     if (queryResult.rowCount === 0) {
@@ -12166,52 +12147,6 @@ class QueryMethods {
   none() {
     return _queryNone(this);
   }
-  /**
-   * `modify` allows modifying the query with your function:
-   *
-   * ```ts
-   * const doSomethingWithQuery = (q: typeof db.table) => {
-   *   // can use all query methods
-   *   return q.select('name').where({ active: true }).order({ createdAt: 'DESC' });
-   * };
-   *
-   * const record = await db.table.select('id').modify(doSomethingWithQuery).find(1);
-   *
-   * record.id; // id was selected before `modify`
-   * record.name; // name was selected by the function
-   * ```
-   *
-   * It's possible to apply different `select`s inside the function, and then the result type will be a union of all possibilities:
-   *
-   * Use this sparingly as it complicates dealing with the result.
-   *
-   * ```ts
-   * const doSomethingWithQuery = (q: typeof db.table) => {
-   *   if (Math.random() > 0.5) {
-   *     return q.select('one');
-   *   } else {
-   *     return q.select('two');
-   *   }
-   * };
-   *
-   * const record = await db.table.modify(doSomethingWithQuery).find(1);
-   *
-   * // TS error: we don't know for sure if the `one` was selected.
-   * record.one;
-   *
-   * // use `in` operator to disambiguate the result type
-   * if ('one' in record) {
-   *   record.one;
-   * } else {
-   *   record.two;
-   * }
-   * ```
-   *
-   * @param fn - function to modify the query with. The result type will be merged with the main query as if the `merge` method was used.
-   */
-  modify(fn) {
-    return fn(this);
-  }
   /**
    * Use `makeHelper` to make a query helper - a function where you can modify the query, and reuse this function across different places.
    *
@@ -12273,6 +12208,65 @@ class QueryMethods {
       return fn(q, ...args);
     };
   }
+  /**
+   * `modify` allows modifying the query with helpers defined with {@link makeHelper}:
+   *
+   * ```ts
+   * const helper = db.table.makeHelper((q) => {
+   *   // all query methods are available
+   *   return q.select('name').where({ active: true }).order({ createdAt: 'DESC' });
+   * });
+   *
+   * const record = await db.table.select('id').modify(helper).find(1);
+   *
+   * record.id; // id was selected before `modify`
+   * record.name; // name was selected by the function
+   * ```
+   *
+   * When the helper result isn't certain, it will result in a union of all possibilities.
+   * Use this sparingly as it complicates dealing with the result.
+   *
+   * ```ts
+   * const helper = db.table((q) => {
+   *   if (Math.random() > 0.5) {
+   *     return q.select('one');
+   *   } else {
+   *     return q.select('two');
+   *   }
+   * });
+   *
+   * const record = await db.table.modify(helper).find(1);
+   *
+   * // TS error: we don't know for sure if the `one` was selected.
+   * record.one;
+   *
+   * // use `in` operator to disambiguate the result type
+   * if ('one' in record) {
+   *   record.one;
+   * } else {
+   *   record.two;
+   * }
+   * ```
+   *
+   * You can define and pass parameters:
+   *
+   * ```ts
+   * const helper = db.table.makeHelper((q, select: 'id' | 'name') => {
+   *   return q.select(select);
+   * });
+   *
+   * const record = await db.table.modify(helper, 'id').find(1);
+   * // record has type { id: number } | { name: string }
+   * if ('id' in record) {
+   *   record.id;
+   * }
+   * ```
+   *
+   * @param fn - function to modify the query with. The result type will be merged with the main query as if the `merge` method was used.
+   */
+  modify(fn, ...args) {
+    return fn(this, ...args);
+  }
   /**
    * Narrows a part of the query output type.
    * Use with caution, type-safety isn't guaranteed with it.
@@ -13142,6 +13136,7 @@ exports.pushQueryOn = pushQueryOn;
 exports.pushQueryOnForOuter = pushQueryOnForOuter;
 exports.pushQueryOrOn = pushQueryOrOn;
 exports.pushQueryValue = pushQueryValue;
+exports.pushQueryValueImmutable = pushQueryValueImmutable;
 exports.pushTableDataCode = pushTableDataCode;
 exports.queryFrom = queryFrom;
 exports.queryFromSql = queryFromSql;
@@ -13151,7 +13146,7 @@ exports.queryTypeWithLimitOne = queryTypeWithLimitOne;
 exports.queryWrap = queryWrap;
 exports.raw = raw;
 exports.referencesArgsToCode = referencesArgsToCode;
-exports.resolveSubQueryCallback = resolveSubQueryCallback;
+exports.resolveSubQueryCallbackV2 = resolveSubQueryCallbackV2;
 exports.rollbackSql = rollbackSql$1;
 exports.saveSearchAlias = saveSearchAlias;
 exports.setColumnDefaultParse = setColumnDefaultParse;
@@ -13170,5 +13165,4 @@ exports.testTransaction = testTransaction;
 exports.throwIfJoinLateral = throwIfJoinLateral;
 exports.throwIfNoWhere = throwIfNoWhere;
 exports.toSQL = toSQL;
-exports.toSQLCacheKey = toSQLCacheKey;
 //# sourceMappingURL=index.js.map