pqb 0.44.0 → 0.45.0

package/dist/index.mjs

@@ -3385,6 +3385,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] = {
@@ -5263,7 +5268,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);
@@ -5292,7 +5297,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}` });
       }
@@ -5312,10 +5317,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 });
     }
@@ -6658,16 +6662,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;
@@ -6802,11 +6805,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];
@@ -6831,29 +6831,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);
-      }
-    }
   }
 };
 
@@ -6894,7 +6871,7 @@ const _chain = (fromQuery, toQuery, rel) => {
 
 const getClonedQueryData = (query) => {
   const cloned = { ...query };
-  delete cloned[toSQLCacheKey];
+  delete cloned.sqlCache;
   cloneQuery(cloned);
   return cloned;
 };
@@ -9072,21 +9049,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);
@@ -11002,7 +10980,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) {
@@ -12167,52 +12145,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.
    *
@@ -12274,6 +12206,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.
@@ -12911,5 +12902,5 @@ function copyTableData(query, arg) {
   return q;
 }
 
-export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _afterCommitError, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL, toSQLCacheKey };
+export { Adapter, AfterCommitError, AggregateMethods, ArrayColumn, AsMethods, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Clear, ColumnRefExpression, ColumnType, ComputedColumn, Create, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, Delete, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, ExpressionMethods, FnExpression, For, FromMethods, Having, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, Join, JsonMethods, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MergeQueryMethods, MoneyColumn, MoreThanOneRowError, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, OnConflictQueryBuilder, OnMethods, Operators, OrExpression, OrchidOrmError, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryError, QueryGet, QueryHooks, QueryLog, QueryMethods, QueryUpsertOrCreate, RawSQL, RealColumn, RefExpression, SearchMethods, Select, SerialColumn, SmallIntColumn, SmallSerialColumn, SqlMethod, StringColumn, TextBaseColumn, TextColumn, Then, TimeColumn, TimestampColumn, TimestampTZColumn, Transaction, TransactionAdapter, TransformMethods, TsQueryColumn, TsVectorColumn, UUIDColumn, UnhandledTypeError, Union, UnknownColumn, Update, VarCharColumn, VirtualColumn, Where, WithMethods, XMLColumn, _afterCommitError, _clone, _getSelectableColumn, _initQueryBuilder, _queryAfterSaveCommit, _queryAll, _queryAs, _queryChangeCounter, _queryCreate, _queryCreateFrom, _queryCreateMany, _queryCreateManyFrom, _queryCreateManyRaw, _queryCreateRaw, _queryDefaults, _queryDelete, _queryExec, _queryFindBy, _queryFindByOptional, _queryGet, _queryGetOptional, _queryHookAfterCreate, _queryHookAfterCreateCommit, _queryHookAfterDelete, _queryHookAfterDeleteCommit, _queryHookAfterQuery, _queryHookAfterSave, _queryHookAfterUpdate, _queryHookAfterUpdateCommit, _queryHookBeforeCreate, _queryHookBeforeDelete, _queryHookBeforeQuery, _queryHookBeforeSave, _queryHookBeforeUpdate, _queryInsert, _queryInsertFrom, _queryInsertMany, _queryInsertManyFrom, _queryInsertManyRaw, _queryInsertRaw, _queryJoinOn, _queryJoinOnJsonPathEquals, _queryJoinOrOn, _queryOr, _queryOrNot, _queryResolveAlias, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUnion, _queryUpdate, _queryUpdateOrThrow, _queryUpdateRaw, _queryWhere, _queryWhereExists, _queryWhereIn, _queryWhereNot, _queryWhereNotOneOf, _queryWhereNotSql, _queryWhereOneOf, _queryWhereSql, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, checkIfASimpleQuery, cloneQuery, cloneQueryBaseUnscoped, columnCheckToCode, columnCode, columnExcludesToCode, columnForeignKeysToCode, columnIndexesToCode, columnsShapeToCode, commitSql$1 as commitSql, constraintInnerToCode, constraintToCode, copyTableData, countSelect, createDb, defaultSchemaConfig, escapeForLog, escapeForMigration, escapeString, excludeInnerToCode, excludeToCode, extendQuery, filterResult, foreignKeyArgumentToCode, getClonedQueryData, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, instantiateColumn, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, makeSQL, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArray, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValue, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValue, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
 //# sourceMappingURL=index.mjs.map