ponder 0.16.9 → 0.17.0

package/src/bin/utils/exit.ts

@@ -11,10 +11,7 @@ export const createExit = ({
   common,
   options,
 }: {
-  common: Pick<
-    Common,
-    "logger" | "telemetry" | "shutdown" | "buildShutdown" | "apiShutdown"
-  >;
+  common: Pick<Common, "logger" | "shutdown" | "buildShutdown" | "apiShutdown">;
   options: Options;
 }) => {
   let isShuttingDown = false;
@@ -34,11 +31,6 @@ export const createExit = ({
       msg: "Started shutdown sequence",
     });
 
-    common.telemetry.record({
-      name: "lifecycle:session_end",
-      properties: { duration_seconds: process.uptime() },
-    });
-
     await Promise.all([
       common.shutdown.kill(),
       common.apiShutdown.kill(),

package/src/build/config.ts

@@ -1,3 +1,16 @@
+import {
+  type Abi,
+  type AbiEvent,
+  type AbiFunction,
+  type Address,
+  BlockNotFoundError,
+  type Hex,
+  hexToNumber,
+  type LogTopic,
+  numberToHex,
+  toEventSelector,
+  toFunctionSelector,
+} from "viem";
 import type { Factory } from "@/config/address.js";
 import type { Config } from "@/config/index.js";
 import type { Common } from "@/internal/common.js";
@@ -19,7 +32,7 @@ import type {
   TransferFilter,
 } from "@/internal/types.js";
 import { eth_getBlockByNumber } from "@/rpc/actions.js";
-import { type Rpc, createRpc } from "@/rpc/index.js";
+import { createRpc, type Rpc } from "@/rpc/index.js";
 import {
   defaultBlockFilterInclude,
   defaultLogFilterInclude,
@@ -33,19 +46,6 @@ import { hyperliquidEvm, chains as viemChains } from "@/utils/chains.js";
 import { dedupe } from "@/utils/dedupe.js";
 import { getFinalityBlockCount } from "@/utils/finality.js";
 import { toLowerCase } from "@/utils/lowercase.js";
-import {
-  type Abi,
-  type AbiEvent,
-  type AbiFunction,
-  type Address,
-  BlockNotFoundError,
-  type Hex,
-  type LogTopic,
-  hexToNumber,
-  numberToHex,
-  toEventSelector,
-  toFunctionSelector,
-} from "viem";
 import { buildLogFactory } from "./factory.js";
 
 const flattenSources = <
@@ -966,7 +966,10 @@ export async function buildIndexingFunctions({
 export function buildConfig({
   common,
   config,
-}: { common: Common; config: Config }): {
+}: {
+  common: Common;
+  config: Config;
+}): {
   chains: Chain[];
   rpcs: Rpc[];
   logs: ({ level: "warn" | "info" | "debug"; msg: string } & Record<
@@ -1123,7 +1126,10 @@ export async function safeBuildIndexingFunctions({
 export function safeBuildConfig({
   common,
   config,
-}: { common: Common; config: Config }) {
+}: {
+  common: Common;
+  config: Config;
+}) {
   try {
     const result = buildConfig({ common, config });
 

package/src/build/factory.ts

@@ -1,13 +1,13 @@
+import { type Address, toEventSelector } from "viem";
 import type { Factory as FactoryConfig } from "@/config/address.js";
 import type { LogFactory } from "@/internal/types.js";
 import { dedupe } from "@/utils/dedupe.js";
 import { toLowerCase } from "@/utils/lowercase.js";
 import {
-  type TupleAbiParameter,
   getBytesConsumedByParam,
   getNestedParamOffset,
+  type TupleAbiParameter,
 } from "@/utils/offset.js";
-import { type Address, toEventSelector } from "viem";
 
 export function buildLogFactory({
   chainId,

package/src/build/index.ts

@@ -1,6 +1,18 @@
 import { createHash } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
+import { drizzle as drizzleNodePostgres } from "drizzle-orm/node-postgres";
+import { drizzle as drizzlePglite } from "drizzle-orm/pglite";
+import { glob } from "glob";
+import { Hono } from "hono";
+import superjson from "superjson";
+import { hexToNumber } from "viem";
+import { createServer } from "vite";
+import { ViteNodeRunner } from "vite-node/client";
+import { ViteNodeServer } from "vite-node/server";
+import { installSourcemapsSupport } from "vite-node/source-map";
+import { normalizeModuleId, toFilePath } from "vite-node/utils";
+import viteTsconfigPathsPlugin from "vite-tsconfig-paths";
 import type { CliOptions } from "@/bin/ponder.js";
 import type { Config } from "@/config/index.js";
 import type { Database } from "@/database/index.js";
@@ -26,18 +38,6 @@ import { createPglite } from "@/utils/pglite.js";
 import { getNextAvailablePort } from "@/utils/port.js";
 import type { Result } from "@/utils/result.js";
 import { startClock } from "@/utils/timer.js";
-import { drizzle as drizzleNodePostgres } from "drizzle-orm/node-postgres";
-import { drizzle as drizzlePglite } from "drizzle-orm/pglite";
-import { glob } from "glob";
-import { Hono } from "hono";
-import superjson from "superjson";
-import { hexToNumber } from "viem";
-import { createServer } from "vite";
-import { ViteNodeRunner } from "vite-node/client";
-import { ViteNodeServer } from "vite-node/server";
-import { installSourcemapsSupport } from "vite-node/source-map";
-import { normalizeModuleId, toFilePath } from "vite-node/utils";
-import viteTsconfigPathsPlugin from "vite-tsconfig-paths";
 import { safeBuildConfig, safeBuildIndexingFunctions } from "./config.js";
 import { vitePluginPonder } from "./plugin.js";
 import { safeBuildPre } from "./pre.js";
@@ -112,7 +112,9 @@ export const createBuild = async ({
     .replace(/\\/g, "/")
     // Escape special characters in the path.
     .replace(escapeRegex, "\\$&");
-  const indexingRegex = new RegExp(`^${escapedIndexingDir}/.*\\.(ts|js)$`);
+  const indexingRegex = new RegExp(
+    `^${escapedIndexingDir}/(?!.*\\.(test|spec)\\.).*\\.(ts|js)$`,
+  );
 
   const indexingPattern = path
     .join(common.options.indexingDir, "**/*.{js,mjs,ts,mts}")
@@ -122,6 +124,10 @@ export const createBuild = async ({
     .join(common.options.apiDir, "**/*.{js,mjs,ts,mts}")
     .replace(/\\/g, "/");
 
+  const testFilePattern = path
+    .join(common.options.indexingDir, "**/*.{test,spec}.{js,mjs,ts,mts}")
+    .replace(/\\/g, "/");
+
   const viteLogger = {
     warnedMessages: new Set<string>(),
     loggedErrors: new WeakSet<Error>(),
@@ -175,7 +181,9 @@ export const createBuild = async ({
 
   const executeFile = async ({
     file,
-  }: { file: string }): Promise<
+  }: {
+    file: string;
+  }): Promise<
     { status: "success"; exports: any } | { status: "error"; error: Error }
   > => {
     try {
@@ -190,7 +198,9 @@ export const createBuild = async ({
 
   const executeFileWithTimeout = async ({
     file,
-  }: { file: string }): Promise<
+  }: {
+    file: string;
+  }): Promise<
     { status: "success"; exports: any } | { status: "error"; error: Error }
   > => {
     let timeoutId: ReturnType<typeof setTimeout>;
@@ -277,7 +287,7 @@ export const createBuild = async ({
     },
     async executeIndexingFunctions(): Promise<IndexingResult> {
       const files = glob.sync(indexingPattern, {
-        ignore: apiPattern,
+        ignore: [apiPattern, testFilePattern],
       });
 
       for (const file of files) {
@@ -300,7 +310,7 @@ export const createBuild = async ({
         try {
           const contents = fs.readFileSync(file, "utf-8");
           hash.update(contents);
-        } catch (e) {
+        } catch (_e) {
           common.logger.warn({
             msg: "Unable to read file",
             file,
@@ -655,7 +665,7 @@ export const createBuild = async ({
           ]);
           viteNodeRunner.moduleCache.invalidateDepTree(
             glob.sync(indexingPattern, {
-              ignore: apiPattern,
+              ignore: [apiPattern, testFilePattern],
             }),
           );
           viteNodeRunner.moduleCache.invalidateDepTree(glob.sync(apiPattern));
@@ -691,7 +701,7 @@ export const createBuild = async ({
                 rpc_chain_id: hexToNumber(chainId),
               });
             }
-          } catch (e) {
+          } catch (_e) {
             const error = new RetryableError("Failed to connect to JSON-RPC");
             error.stack = undefined;
             return { status: "error", error } as const;

package/src/build/plugin.ts

@@ -1,5 +1,5 @@
-import type { Common } from "@/internal/common.js";
 import type { Plugin } from "vite";
+import type { Common } from "@/internal/common.js";
 
 const virtualModule = () => `export const ponder = {
   fns: [],

package/src/build/pre.ts

@@ -30,7 +30,7 @@ export function buildPre({
 
   if (config.database?.kind) {
     if (config.database.kind === "postgres") {
-      let connectionString: string | undefined = undefined;
+      let connectionString: string | undefined;
 
       if (config.database.connectionString) {
         connectionString = config.database.connectionString;
@@ -64,7 +64,7 @@ export function buildPre({
       databaseConfig = { kind: "pglite", options: { dataDir: pgliteDir } };
     }
   } else {
-    let connectionString: string | undefined = undefined;
+    let connectionString: string | undefined;
     if (process.env.DATABASE_PRIVATE_URL) {
       connectionString = process.env.DATABASE_PRIVATE_URL;
     } else if (process.env.DATABASE_URL) {

package/src/build/schema.ts

@@ -1,20 +1,13 @@
 import {
-  PONDER_CHECKPOINT_TABLE_NAME,
-  PONDER_META_TABLE_NAME,
-} from "@/database/index.js";
-import { getPrimaryKeyColumns } from "@/drizzle/index.js";
-import { getSql } from "@/drizzle/kit/index.js";
-import { MAX_DATABASE_OBJECT_NAME_LENGTH } from "@/drizzle/onchain.js";
-import { BuildError } from "@/internal/errors.js";
-import type { PreBuild, Schema } from "@/internal/types.js";
-import {
-  SQL,
   getTableColumns,
   getTableName,
   getViewName,
   is,
+  SQL,
 } from "drizzle-orm";
 import {
+  getTableConfig,
+  getViewConfig,
   PgBigSerial53,
   PgBigSerial64,
   PgColumn,
@@ -23,14 +16,24 @@ import {
   PgSmallSerial,
   PgTable,
   PgView,
-  getTableConfig,
-  getViewConfig,
 } from "drizzle-orm/pg-core";
+import {
+  PONDER_CHECKPOINT_TABLE_NAME,
+  PONDER_META_TABLE_NAME,
+} from "@/database/index.js";
+import { getPrimaryKeyColumns } from "@/drizzle/index.js";
+import { getSql } from "@/drizzle/kit/index.js";
+import { MAX_DATABASE_OBJECT_NAME_LENGTH } from "@/drizzle/onchain.js";
+import { BuildError } from "@/internal/errors.js";
+import type { PreBuild, Schema } from "@/internal/types.js";
 
 export const buildSchema = ({
   schema,
   preBuild,
-}: { schema: Schema; preBuild: Pick<PreBuild, "ordering"> }) => {
+}: {
+  schema: Schema;
+  preBuild: Pick<PreBuild, "ordering">;
+}) => {
   const statements = getSql(schema);
 
   const tableNames = new Set<string>();
@@ -331,7 +334,10 @@ export const buildSchema = ({
 export const safeBuildSchema = ({
   schema,
   preBuild,
-}: { schema: Schema; preBuild: Pick<PreBuild, "ordering"> }) => {
+}: {
+  schema: Schema;
+  preBuild: Pick<PreBuild, "ordering">;
+}) => {
   try {
     const result = buildSchema({ schema, preBuild });
 

package/src/build/stacktrace.ts

@@ -34,8 +34,8 @@ export function parseViteNodeError(file: string, error: Error): ViteNodeError {
       .split("\n")
       .slice(1)
       .map((message) => {
-        let location: string | undefined = undefined;
-        let detail: string | undefined = undefined;
+        let location: string | undefined;
+        let detail: string | undefined;
         if (message.includes(": ERROR: ")) {
           // /path/to/file.ts:11:9: ERROR: Expected ")" but found ";"
           const s = message.split(": ERROR: ");
@@ -98,7 +98,7 @@ export function parseViteNodeError(file: string, error: Error): ViteNodeError {
   if (resolvedError.stack) {
     const userStackFrames = parseStackTrace(resolvedError.stack);
 
-    let codeFrame: string | undefined = undefined;
+    let codeFrame: string | undefined;
     for (const { file, lineNumber, column } of userStackFrames) {
       if (file !== null && lineNumber !== null) {
         try {
@@ -109,7 +109,7 @@ export function parseViteNodeError(file: string, error: Error): ViteNodeError {
             { highlightCode: true },
           );
           break;
-        } catch (err) {
+        } catch (_err) {
           // No-op.
         }
       }
@@ -131,7 +131,7 @@ export function parseViteNodeError(file: string, error: Error): ViteNodeError {
   // This can throw with "Cannot set property message of [object Object] which has only a getter"
   try {
     resolvedError.message = `Error while ${verb} ${file}: ${resolvedError.message}`;
-  } catch (e) {}
+  } catch (_e) {}
 
   return resolvedError;
 }

package/src/client/index.ts

@@ -1,27 +1,15 @@
-import type { PonderApp6 } from "@/database/index.js";
-import { getLiveQueryChannelName } from "@/drizzle/onchain.js";
-import type { Schema } from "@/internal/types.js";
-import type { ReadonlyDrizzle } from "@/types/db.js";
-import {
-  type PromiseWithResolvers,
-  promiseWithResolvers,
-} from "@/utils/promiseWithResolvers.js";
 import {
-  getSQLQueryRelations,
-  validateAllowableSQLQuery,
-} from "@/utils/sql-parse.js";
-import {
-  type QueryWithTypings,
   getTableName,
   getViewName,
   isTable,
   isView,
+  type QueryWithTypings,
 } from "drizzle-orm";
 import {
+  getViewConfig,
   type PgDialect,
   type PgSession,
   type PgView,
-  getViewConfig,
   pgSchema,
   pgTable,
 } from "drizzle-orm/pg-core";
@@ -29,6 +17,18 @@ import { createMiddleware } from "hono/factory";
 import { streamSSE } from "hono/streaming";
 import type * as pg from "pg";
 import superjson from "superjson";
+import type { PonderApp6 } from "@/database/index.js";
+import { getLiveQueryChannelName } from "@/drizzle/onchain.js";
+import type { Schema } from "@/internal/types.js";
+import type { ReadonlyDrizzle } from "@/types/db.js";
+import {
+  type PromiseWithResolvers,
+  promiseWithResolvers,
+} from "@/utils/promiseWithResolvers.js";
+import {
+  getSQLQueryRelations,
+  validateAllowableSQLQuery,
+} from "@/utils/sql-parse.js";
 
 type QueryString = string;
 type QueryResult = unknown;
@@ -75,7 +75,10 @@ const getPonderMetaTable = (schema?: string) => {
 export const client = ({
   db,
   schema,
-}: { db: ReadonlyDrizzle<Schema>; schema: Schema }) => {
+}: {
+  db: ReadonlyDrizzle<Schema>;
+  schema: Schema;
+}) => {
   if (
     globalThis.PONDER_COMMON === undefined ||
     globalThis.PONDER_DATABASE === undefined ||
@@ -95,9 +98,9 @@ export const client = ({
   // Note: Add system tables to the live query registry.
   tableNames.add("_ponder_checkpoint");
 
-  // @ts-ignore
+  // @ts-expect-error
   const session: PgSession = db._.session;
-  // @ts-ignore
+  // @ts-expect-error
   const dialect: PgDialect = session.dialect;
   const driver = globalThis.PONDER_DATABASE.driver;
 
@@ -236,7 +239,7 @@ export const client = ({
       let hasRegisteredShutdown = false;
 
       while (globalThis.PONDER_COMMON.apiShutdown.isKilled === false) {
-        // biome-ignore lint/suspicious/noAsyncPromiseExecutor: <explanation>
+        // biome-ignore lint/suspicious/noAsyncPromiseExecutor: This Promise intentionally wraps async connect/retry flow.
         await new Promise<void>(async (resolve) => {
           try {
             client = await driver.admin.connect();
@@ -487,7 +490,7 @@ export const client = ({
 
       let resultHash = crypto
         .createHash("MD5")
-        // @ts-ignore
+        // @ts-expect-error
         .update(JSON.stringify(result.rows))
         .digest("hex")
         .slice(0, 10);
@@ -529,7 +532,7 @@ export const client = ({
 
             const _resultHash = crypto
               .createHash("MD5")
-              // @ts-ignore
+              // @ts-expect-error
               .update(JSON.stringify(result.rows))
               .digest("hex")
               .slice(0, 10);
@@ -537,7 +540,6 @@ export const client = ({
             if (_resultHash === resultHash) continue;
             resultHash = _resultHash;
 
-            // @ts-ignore
             await stream.writeSSE({ data: JSON.stringify(result) });
           } catch {
             stream.abort();

package/src/config/address.ts

@@ -1,5 +1,5 @@
-import type { LogFactory } from "@/internal/types.js";
 import type { AbiEvent, AbiParameter } from "viem";
+import type { LogFactory } from "@/internal/types.js";
 
 // Note: Currently limit the depth to 1 level.
 type ParameterNames<T extends AbiParameter> = T extends {

package/src/config/index.ts

@@ -1,8 +1,8 @@
 import type { ConnectionOptions } from "node:tls";
-import type { Prettify } from "@/types/utils.js";
 import type { Abi } from "abitype";
 import type { PoolConfig } from "pg";
 import type { Narrow, Transport } from "viem";
+import type { Prettify } from "@/types/utils.js";
 import type { AddressConfig } from "./address.js";
 import type { GetEventFilter } from "./eventFilter.js";
 

package/src/database/actions.ts

@@ -1,3 +1,16 @@
+import {
+  and,
+  eq,
+  getTableColumns,
+  getTableName,
+  getViewName,
+  lte,
+  type SQL,
+  sql,
+  type Table,
+  type View,
+} from "drizzle-orm";
+import { getTableConfig } from "drizzle-orm/pg-core";
 import { getPrimaryKeyColumns } from "@/drizzle/index.js";
 import { getColumnCasing, getReorgTable } from "@/drizzle/kit/index.js";
 import {
@@ -20,24 +33,11 @@ import type {
   PreBuild,
   SchemaBuild,
 } from "@/internal/types.js";
-import { MAX_CHECKPOINT_STRING, decodeCheckpoint } from "@/utils/checkpoint.js";
-import {
-  type SQL,
-  type Table,
-  type View,
-  and,
-  eq,
-  getTableColumns,
-  getTableName,
-  getViewName,
-  lte,
-  sql,
-} from "drizzle-orm";
-import { getTableConfig } from "drizzle-orm/pg-core";
+import { decodeCheckpoint, MAX_CHECKPOINT_STRING } from "@/utils/checkpoint.js";
 import {
+  getPonderCheckpointTable,
   PONDER_CHECKPOINT_TABLE_NAME,
   PONDER_META_TABLE_NAME,
-  getPonderCheckpointTable,
 } from "./index.js";
 import type { QB } from "./queryBuilder.js";
 
@@ -404,7 +404,7 @@ WITH reverted1 AS (
 ), ${getRevertSql({ table })};`),
         );
 
-        // @ts-ignore
+        // @ts-expect-error
         counts.push(result.rows[0]!.count);
       }
 
@@ -447,7 +447,6 @@ AND checkpoint > '${checkpoint}'`,
   .join(" UNION ALL ")}) AS all_mins;`),
         )
         .then((result) => {
-          // @ts-ignore
           return result.rows[0]?.operation_id as string | null;
         });
 
@@ -474,7 +473,7 @@ WITH reverted1 AS (
 ), ${getRevertSql({ table })};`),
         );
 
-        // @ts-ignore
+        // @ts-expect-error
         counts.push(result.rows[0]!.count);
       }
 
@@ -525,7 +524,7 @@ WITH reverted1 AS (
 ), ${getRevertSql({ table })};`),
         );
 
-        // @ts-ignore
+        // @ts-expect-error
         counts.push(result.rows[0]!.count);
       }
 
@@ -647,7 +646,6 @@ WHERE checkpoint > (
   .join(" UNION ALL ")}) AS all_mins;`),
         )
         .then((result) => {
-          // @ts-ignore
           return result.rows[0]?.operation_id as string | null;
         });
 

package/src/database/index.ts

@@ -1,3 +1,19 @@
+import type { PGlite } from "@electric-sql/pglite";
+import {
+  eq,
+  getTableName,
+  getViewName,
+  isTable,
+  isView,
+  sql,
+} from "drizzle-orm";
+import { drizzle as drizzleNodePg } from "drizzle-orm/node-postgres";
+import { pgSchema, pgTable } from "drizzle-orm/pg-core";
+import { drizzle as drizzlePglite } from "drizzle-orm/pglite";
+import { Kysely, Migrator, PostgresDialect, WithSchemaPlugin } from "kysely";
+import type { Pool } from "pg";
+import prometheus from "prom-client";
+import { hexToBigInt } from "viem";
 import {
   getLiveQueryNotifyProcedureName,
   getLiveQueryProcedureName,
@@ -26,29 +42,13 @@ import { createPool, createReadonlyPool } from "@/utils/pg.js";
 import { createPglite, createPgliteKyselyDialect } from "@/utils/pglite.js";
 import { startClock } from "@/utils/timer.js";
 import { wait } from "@/utils/wait.js";
-import type { PGlite } from "@electric-sql/pglite";
-import {
-  eq,
-  getTableName,
-  getViewName,
-  isTable,
-  isView,
-  sql,
-} from "drizzle-orm";
-import { drizzle as drizzleNodePg } from "drizzle-orm/node-postgres";
-import { pgSchema, pgTable } from "drizzle-orm/pg-core";
-import { drizzle as drizzlePglite } from "drizzle-orm/pglite";
-import { Kysely, Migrator, PostgresDialect, WithSchemaPlugin } from "kysely";
-import type { Pool } from "pg";
-import prometheus from "prom-client";
-import { hexToBigInt } from "viem";
 import {
   crashRecovery,
   createLiveQueryProcedures,
   dropLiveQueryTriggers,
   dropTriggers,
 } from "./actions.js";
-import { type QB, createQB, parseDbError } from "./queryBuilder.js";
+import { createQB, parseDbError, type QB } from "./queryBuilder.js";
 
 export type Database = {
   driver: PostgresDriver | PGliteDriver;

package/src/database/queryBuilder.ts

@@ -1,7 +1,16 @@
 import crypto from "node:crypto";
+import { PGlite } from "@electric-sql/pglite";
+import type { ExtractTablesWithRelations } from "drizzle-orm";
+import type {
+  PgDatabase,
+  PgQueryResultHKT,
+  PgTransaction,
+  PgTransactionConfig,
+} from "drizzle-orm/pg-core";
+import type pg from "pg";
 import type { Common } from "@/internal/common.js";
-import { BaseError } from "@/internal/errors.js";
 import {
+  BaseError,
   BigIntSerializationError,
   CheckConstraintError,
   DbConnectionError,
@@ -15,15 +24,6 @@ import type { Schema } from "@/internal/types.js";
 import type { Drizzle } from "@/types/db.js";
 import { startClock } from "@/utils/timer.js";
 import { wait } from "@/utils/wait.js";
-import { PGlite } from "@electric-sql/pglite";
-import type { ExtractTablesWithRelations } from "drizzle-orm";
-import type {
-  PgDatabase,
-  PgQueryResultHKT,
-  PgTransaction,
-  PgTransactionConfig,
-} from "drizzle-orm/pg-core";
-import type pg from "pg";
 
 const RETRY_COUNT = 9;
 const BASE_DURATION = 125;
@@ -293,7 +293,7 @@ export const createQB = <
   // Add QB methods to the transaction object
   const addQBMethods = (db: PgDatabase<PgQueryResultHKT, TSchema>) => {
     const _transaction = db.transaction.bind(db);
-    // @ts-ignore
+    // @ts-expect-error
     db.transaction = async (...args) => {
       if (typeof args[0] === "function") {
         const [callback, config, transactionContext] = args as unknown as [
@@ -324,7 +324,6 @@ export const createQB = <
               Object.assign(tx, { $client: tx.session.client });
 
               // Note: `tx.wrap` should not retry errors, because the transaction will be aborted
-              // @ts-ignore
               (tx as unknown as QB<TSchema, TClient>).wrap = (...args) => {
                 if (typeof args[0] === "function") {
                   const [query, context] = args as [
@@ -405,7 +404,6 @@ export const createQB = <
               Object.assign(tx, { $client: tx.session.client });
 
               // Note: `tx.wrap` should not retry errors, because the transaction will be aborted
-              // @ts-ignore
               (tx as unknown as QB<TSchema, TClient>).wrap = (...args) => {
                 if (typeof args[0] === "function") {
                   const [query, context] = args as [
@@ -464,7 +462,7 @@ export const createQB = <
   if (dialect === "postgres") {
     addQBMethods(db);
   } else {
-    // @ts-ignore
+    // @ts-expect-error
     db.transaction = async (...args) => {
       if (typeof args[0] === "function") {
         const [callback, context] = args as [