pqb 0.51.6 → 0.52.0

package/dist/index.mjs

@@ -2862,14 +2862,25 @@ class AfterCommitError extends OrchidOrmError {
     this.hookResults = hookResults;
   }
 }
-const _afterCommitError = (result, hookResults, catchAfterCommitError) => {
-  const err = new AfterCommitError(result, hookResults);
-  if (catchAfterCommitError) {
-    catchAfterCommitError(err);
-  } else {
-    throw err;
+const _runAfterCommitHooks = async (result, promises, getHookNames, catchAfterCommitErrors) => {
+  const hookResults = await Promise.allSettled(promises);
+  if (hookResults.some((result2) => result2.status === "rejected")) {
+    const hookNames = getHookNames();
+    for (const [i, r] of hookResults.entries()) {
+      r.name = hookNames[i];
+    }
+    const err = new AfterCommitError(result, hookResults);
+    if (!catchAfterCommitErrors) throw err;
+    for (const fn of catchAfterCommitErrors) {
+      try {
+        fn(err);
+      } catch {
+      }
+    }
   }
 };
+const isInUserTransaction = (trx) => !!(trx && // when inside test transactions, compare transaction counts to ensure there is a user transaction.
+(!trx.testTransactionCount || trx.transactionId >= trx.testTransactionCount));
 class Transaction {
   async transaction(cbOrOptions, cb) {
     let options;
@@ -2912,10 +2923,7 @@ class Transaction {
         throw err;
       });
       if (log) log.afterQuery(commitSql$1, logData);
-      await runAfterCommit(
-        trx.afterCommit,
-        result
-      );
+      runAfterCommit(trx.afterCommit, result);
       return result;
     } else {
       try {
@@ -2940,7 +2948,7 @@ class Transaction {
         if (transactionId === trx.testTransactionCount) {
           const { afterCommit } = trx;
           trx.afterCommit = void 0;
-          await runAfterCommit(afterCommit, result);
+          runAfterCommit(afterCommit, result);
         }
         return result;
       } finally {
@@ -2975,42 +2983,95 @@ class Transaction {
   }
   isInTransaction() {
     const trx = this.internal.transactionStorage.getStore();
-    return !!(trx && (!trx.testTransactionCount || trx.transactionId >= trx.testTransactionCount));
+    return isInUserTransaction(trx);
   }
-}
-const runAfterCommit = async (afterCommit, result) => {
-  if (afterCommit) {
-    const promises = [];
-    let catchAfterCommitError;
-    for (let i = 0, len = afterCommit.length; i < len; i += 3) {
-      const result2 = afterCommit[i];
-      const q = afterCommit[i + 1];
-      if (q.q.catchAfterCommitError) {
-        catchAfterCommitError = q.q.catchAfterCommitError;
-      }
-      for (const fn of afterCommit[i + 2]) {
-        try {
-          promises.push(fn(result2, q));
-        } catch (err) {
-          promises.push(Promise.reject(err));
+  /**
+   * Schedules a hook to run after the outermost transaction commits:
+   *
+   * ```ts
+   * await db.$transaction(async () => {
+   *   await db.table.create(data)
+   *   await db.table.where({ ...conditions }).update({ key: 'value' })
+   *
+   *   db.$afterCommit(() => { // can be sync or async
+   *     console.log('after commit')
+   *   })
+   * })
+   * ```
+   *
+   * If used outside the transaction, the hook will be executed almost immediately, on the next microtask:
+   *
+   * ```ts
+   * db.$afterCommit(async () => { // can be sync or async
+   *   console.log('after commit')
+   * })
+   * ```
+   *
+   * If the callback has no `try/catch` and throws an error,
+   * this will cause `uncaughtException` if the callback is sync and `unhandledRejection` if it is async.
+   */
+  afterCommit(hook) {
+    const trx = this.internal.transactionStorage.getStore();
+    if (isInUserTransaction(trx)) {
+      (trx.afterCommit ?? (trx.afterCommit = [])).push(hook);
+    } else {
+      queueMicrotask(hook);
+    }
+  }
+}
+const runAfterCommit = (afterCommit, result) => {
+  queueMicrotask(async () => {
+    if (afterCommit) {
+      const promises = [];
+      let catchAfterCommitErrors;
+      for (let i = 0, len = afterCommit.length; i < len; ) {
+        const first = afterCommit[i];
+        if (typeof first === "function") {
+          try {
+            promises.push(first());
+          } catch (err) {
+            promises.push(Promise.reject(err));
+          }
+          i++;
+        } else {
+          const q = afterCommit[i + 1];
+          if (q.q.catchAfterCommitErrors) {
+            (catchAfterCommitErrors ?? (catchAfterCommitErrors = [])).push(...q.q.catchAfterCommitErrors);
+          }
+          for (const fn of afterCommit[i + 2]) {
+            try {
+              promises.push(fn(first, q));
+            } catch (err) {
+              promises.push(Promise.reject(err));
+            }
+          }
+          i += 3;
         }
       }
-    }
-    const hookResults = await Promise.allSettled(promises);
-    if (hookResults.some((result2) => result2.status === "rejected")) {
-      const resultsWithNames = [];
-      let r = 0;
-      for (let i = 0, len = afterCommit.length; i < len; i += 3) {
-        for (const fn of afterCommit[i + 2]) {
-          resultsWithNames.push({
-            ...hookResults[r++],
-            name: fn.name
-          });
+      const getHookNames = () => {
+        const hookNames = [];
+        for (let i = 0, len = afterCommit.length; i < len; ) {
+          const first = afterCommit[i];
+          if (typeof first === "function") {
+            hookNames.push(first.name);
+            i++;
+          } else {
+            for (const fn of afterCommit[i + 2]) {
+              hookNames.push(fn.name);
+            }
+            i += 3;
+          }
         }
-      }
-      _afterCommitError(result, resultsWithNames, catchAfterCommitError);
+        return hookNames;
+      };
+      await _runAfterCommitHooks(
+        result,
+        promises,
+        getHookNames,
+        catchAfterCommitErrors
+      );
     }
-  }
+  });
 };
 
 const applyBatchTransforms = (q, batches) => {
@@ -3428,35 +3489,32 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
           );
         }
         if (afterCommitHooks) {
-          if (trx && // when inside test transactions, push to a transaction only unless it's the outer user transaction.
-          (!trx.testTransactionCount || trx.transactionId + 1 > trx.testTransactionCount)) {
+          if (isInUserTransaction(trx)) {
             (trx.afterCommit ?? (trx.afterCommit = [])).push(
               result,
               q,
               afterCommitHooks
             );
           } else {
-            const promises = [];
-            for (const fn of afterCommitHooks) {
-              try {
-                promises.push(
-                  fn(result, q)
-                );
-              } catch (err) {
-                promises.push(Promise.reject(err));
+            const localResult = result;
+            queueMicrotask(async () => {
+              const promises = [];
+              for (const fn of afterCommitHooks) {
+                try {
+                  promises.push(
+                    fn(localResult, q)
+                  );
+                } catch (err) {
+                  promises.push(Promise.reject(err));
+                }
               }
-            }
-            const hookResults = await Promise.allSettled(promises);
-            if (hookResults.some((result2) => result2.status === "rejected")) {
-              _afterCommitError(
-                result,
-                hookResults.map((result2, i) => ({
-                  ...result2,
-                  name: afterCommitHooks[i].name
-                })),
-                q.q.catchAfterCommitError
+              await _runAfterCommitHooks(
+                localResult,
+                promises,
+                () => afterCommitHooks.map((h) => h.name),
+                q.q.catchAfterCommitErrors
               );
-            }
+            });
           }
         }
       } else if (query.after) {
@@ -9504,7 +9562,9 @@ class QueryHooks {
    *   })
    *   .catchAfterCommitError((err) => {
    *     // err is instance of AfterCommitError (see below)
-   *   });
+   *   })
+   *   // can be added multiple times, all catchers will be executed
+   *   .catchAfterCommitError((err) => {});
    *
    * // result is available even if an after commit hook has failed
    * result.id;
@@ -9512,7 +9572,7 @@ class QueryHooks {
    */
   catchAfterCommitError(fn) {
     const q = _clone(this);
-    q.q.catchAfterCommitError = fn;
+    pushQueryValueImmutable(q, "catchAfterCommitErrors", fn);
     return q;
   }
 }
@@ -13191,5 +13251,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, assignDbDataToColumn, checkIfASimpleQuery, 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, getColumnBaseType, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, isDefaultTimeStamp, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
+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, _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, _runAfterCommitHooks, addColumnParserToQuery, addParserForRawExpression, addParserForSelectItem, addQueryOn, anyShape, applyComputedColumns, assignDbDataToColumn, checkIfASimpleQuery, 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, getColumnBaseType, getColumnInfo, getColumnTypes, getFullColumnTable, getPrimaryKeys, getQueryAs, getShapeFromSelect, getSqlText, handleResult, identityToCode, indexInnerToCode, indexToCode, isDefaultTimeStamp, isInUserTransaction, isQueryReturnsAll, isSelectingCount, joinSubQuery, logParamToLogObject, makeColumnTypes, makeColumnsByType, makeFnExpression, makeRegexToFindInSql, parseRecord, parseTableData, parseTableDataInput, postgisTypmodToSql, primaryKeyInnerToCode, processComputedBatches, processComputedResult, processSelectArg, pushLimitSQL, pushQueryArrayImmutable, pushQueryOn, pushQueryOnForOuter, pushQueryOrOn, pushQueryValueImmutable, pushTableDataCode, queryFrom, queryFromSql, queryJson, queryMethodByReturnType, queryTypeWithLimitOne, queryWrap, raw, referencesArgsToCode, resolveSubQueryCallbackV2, rollbackSql$1 as rollbackSql, saveSearchAlias, setColumnDefaultParse, setColumnEncode, setColumnParse, setColumnParseNull, setParserForSelectedString, setQueryObjectValueImmutable, setQueryOperators, simplifyColumnDefault, sqlFn, sqlQueryArgsToExpression, tableDataMethods, templateLiteralToSQL, testTransaction, throwIfJoinLateral, throwIfNoWhere, toSQL };
 //# sourceMappingURL=index.mjs.map