@ponder/client 0.16.10 → 0.17.0

package/dist/index.d.ts

@@ -65,7 +65,7 @@ declare const compileQuery: (query: SQLWrapper) => QueryWithTypings;
  * ```
  */
 declare const createClient: <schema extends Schema>(baseUrl: string, params?: {
-    schema?: schema | undefined;
+    schema?: schema;
 }) => Client<schema>;
 
 declare const setDatabaseSchema: <T extends {

package/dist/index.js

@@ -1,11 +1,11 @@
 // src/index.ts
 import {
   Column,
-  SQL,
-  Table,
   is,
   isTable,
-  mapRelationalRow
+  mapRelationalRow,
+  SQL,
+  Table
 } from "drizzle-orm";
 import { isPgEnum } from "drizzle-orm/pg-core";
 import { PgCountBuilder } from "drizzle-orm/pg-core/query-builders/count";
@@ -16,49 +16,49 @@ import { TypedQueryBuilder } from "drizzle-orm/query-builders/query-builder";
 import { EventSource } from "eventsource";
 import superjson from "superjson";
 import {
-  sql,
+  and,
+  asc,
+  avg,
+  avgDistinct,
+  between,
+  count,
+  countDistinct,
+  desc,
   eq,
+  exists,
   gt,
   gte,
+  ilike,
+  inArray,
+  isNotNull,
+  isNull,
+  like,
   lt,
   lte,
+  max,
+  min,
   ne,
-  isNull,
-  isNotNull,
-  inArray,
-  notInArray,
-  exists,
-  notExists,
-  between,
+  not,
   notBetween,
-  like,
-  notLike,
-  ilike,
+  notExists,
   notIlike,
-  not,
-  asc,
-  desc,
-  and,
+  notInArray,
+  notLike,
   or,
-  count,
-  countDistinct,
-  avg,
-  avgDistinct,
-  sum,
-  sumDistinct,
-  max,
-  min,
   relations,
-  SQL as SQL2
+  SQL as SQL2,
+  sql,
+  sum,
+  sumDistinct
 } from "drizzle-orm";
 import {
   alias,
-  union,
-  unionAll,
+  except,
+  exceptAll,
   intersect,
   intersectAll,
-  except,
-  exceptAll
+  union,
+  unionAll
 } from "drizzle-orm/pg-core";
 var getUrl = (baseUrl, method, query) => {
   const url = new URL(baseUrl);
@@ -134,7 +134,7 @@ var createClient = (baseUrl, params = {}) => {
             const orderedFields = orderSelectedFields(fields);
             data = await drizzleShim._.session.prepareQuery(
               query,
-              // @ts-ignore
+              // @ts-expect-error
               orderedFields,
               void 0,
               false
@@ -149,11 +149,10 @@ var createClient = (baseUrl, params = {}) => {
               (rawRows, mapColumnValue) => {
                 const rows = rawRows.map(
                   (row) => mapRelationalRow(
-                    // @ts-ignore
+                    // @ts-expect-error
                     queryBuilder.schema,
-                    // @ts-ignore
+                    // @ts-expect-error
                     queryBuilder.tableConfig,
-                    // @ts-ignore
                     row,
                     selection,
                     mapColumnValue

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import {\n  type AnyColumn,\n  Column,\n  type QueryWithTypings,\n  SQL,\n  type SQLWrapper,\n  type SelectedFieldsOrdered,\n  Table,\n  is,\n  isTable,\n  mapRelationalRow,\n} from \"drizzle-orm\";\nimport { type PgDialect, isPgEnum } from \"drizzle-orm/pg-core\";\nimport { PgCountBuilder } from \"drizzle-orm/pg-core/query-builders/count\";\nimport { PgRelationalQuery } from \"drizzle-orm/pg-core/query-builders/query\";\nimport { PgRaw } from \"drizzle-orm/pg-core/query-builders/raw\";\nimport { type PgRemoteDatabase, drizzle } from \"drizzle-orm/pg-proxy\";\nimport { TypedQueryBuilder } from \"drizzle-orm/query-builders/query-builder\";\nimport { EventSource } from \"eventsource\";\nimport superjson from \"superjson\";\n\ntype Schema = { [name: string]: unknown };\n\ntype Prettify<T> = {\n  [K in keyof T]: T[K];\n} & {};\n\nexport type Status = {\n  [chainName: string]: {\n    id: number;\n    block: { number: number; timestamp: number };\n  };\n};\n\ntype ClientDb<schema extends Schema = Schema> = Prettify<\n  Omit<\n    PgRemoteDatabase<schema>,\n    | \"insert\"\n    | \"update\"\n    | \"delete\"\n    | \"transaction\"\n    | \"refreshMaterializedView\"\n    | \"_\"\n  >\n>;\n\nexport type Client<schema extends Schema = Schema> = {\n  /** Query the database. */\n  db: ClientDb<schema>;\n  /**\n   * Subscribe to live updates.\n   *\n   * @param queryFn - The query to subscribe to.\n   * @param onData - The callback to call with each new query result\n   * @param onError - The callback to call when an error occurs.\n   *\n   * @example\n   * ```ts\n   * import { createClient } from \"@ponder/client\";\n   * import * as schema from \"../ponder.schema\";\n   *\n   * const client = createClient(\"https://.../sql\", { schema });\n   *\n   * client.live(\n   *   (db) => db.select().from(schema.account),\n   *   (result) => console.log(result),\n   *   (error) => console.error(error),\n   * );\n   * ```\n   */\n  live: <result>(\n    queryFn: (db: ClientDb<schema>) => Promise<result>,\n    onData: (result: result) => void,\n    onError?: (error: Error) => void,\n  ) => {\n    unsubscribe: () => void;\n  };\n  /** Get the status of all chains. */\n  getStatus: () => Promise<Status>;\n};\n\nconst getUrl = (\n  baseUrl: string,\n  method: \"live\" | \"db\",\n  query?: QueryWithTypings,\n) => {\n  const url = new URL(baseUrl);\n  url.pathname = `${url.pathname}/${method}`;\n  if (query) {\n    url.searchParams.set(\"sql\", superjson.stringify(query));\n  }\n  return url;\n};\n\nconst noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {\n  casing: \"snake_case\",\n});\n\n// @ts-ignore\nconst dialect: PgDialect = noopDatabase.dialect;\n\nexport const compileQuery = (query: SQLWrapper) => {\n  return dialect.sqlToQuery(query.getSQL());\n};\n\n/**\n * Create a client for querying Ponder apps.\n *\n * @param baseUrl - The URL of the Ponder app.\n * @param schema - The schema of the Ponder app.\n *\n * @example\n * ```ts\n * import { createClient } from \"@ponder/client\";\n * import * as schema from \"../ponder.schema\";\n *\n * const client = createClient(\"https://.../sql\", { schema });\n * ```\n */\nexport const createClient = <schema extends Schema>(\n  baseUrl: string,\n  params: { schema?: schema } = {},\n): Client<schema> => {\n  const client: Client<schema> = {\n    db: drizzle(\n      async (sql, params, method, typings) => {\n        const builtQuery = { sql, params, typings };\n        const response = await fetch(getUrl(baseUrl, \"db\", builtQuery), {\n          method: \"GET\",\n        });\n\n        if (response.ok === false) {\n          const error = new Error(await response.text());\n          error.stack = undefined;\n          throw error;\n        }\n\n        const result = await response.json();\n\n        if (method === \"all\") {\n          return {\n            ...result,\n            rows: result.rows.map((row: object) => Object.values(row)),\n          };\n        }\n\n        return result;\n      },\n      { schema: params.schema, casing: \"snake_case\" },\n    ),\n    live: (queryFn, onData, onError) => {\n      const noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {\n        schema: params.schema,\n        casing: \"snake_case\",\n      });\n\n      const queryPromise = queryFn(noopDatabase);\n\n      if (\"getSQL\" in queryPromise === false) {\n        throw new Error(\n          '\"queryFn\" must return SQL. You may have to remove `.execute()` from your query.',\n        );\n      }\n      const queryBuilder = queryPromise as unknown as SQLWrapper;\n      const query = compileQuery(queryBuilder);\n\n      const sse = new EventSource(getUrl(baseUrl, \"live\", query));\n\n      const onDataListener = async (event: MessageEvent) => {\n        try {\n          // @ts-ignore\n          const result = JSON.parse(event.data);\n\n          const drizzleShim = drizzle(\n            (_, __, method) => {\n              if (method === \"all\") {\n                return Promise.resolve({\n                  ...result,\n                  rows: result.rows.map((row: object) => Object.values(row)),\n                });\n              }\n\n              return Promise.resolve(result);\n            },\n            { schema: params.schema },\n          );\n\n          let data: unknown;\n\n          if (queryBuilder instanceof TypedQueryBuilder) {\n            const fields = queryBuilder._.selectedFields as Record<\n              string,\n              unknown\n            >;\n            const orderedFields = orderSelectedFields(fields);\n\n            data = await drizzleShim._.session\n              .prepareQuery(\n                query,\n                // @ts-ignore\n                orderedFields,\n                undefined,\n                false,\n              )\n              .execute();\n          } else if (queryBuilder instanceof PgRelationalQuery) {\n            // @ts-ignore\n            const selection = queryBuilder._toSQL().query.selection;\n            data = await drizzleShim._.session\n              .prepareQuery(\n                query,\n                undefined,\n                undefined,\n                true,\n                (rawRows, mapColumnValue) => {\n                  const rows = rawRows.map((row) =>\n                    mapRelationalRow(\n                      // @ts-ignore\n                      queryBuilder.schema,\n                      // @ts-ignore\n                      queryBuilder.tableConfig,\n                      // @ts-ignore\n                      row,\n                      selection,\n                      mapColumnValue,\n                    ),\n                  );\n                  // @ts-ignore\n                  if (queryBuilder.mode === \"first\") {\n                    return rows[0];\n                  }\n                  return rows;\n                },\n              )\n              .execute();\n          } else if (queryBuilder instanceof PgRaw) {\n            data = await drizzleShim._.session\n              .prepareQuery(query, undefined, undefined, false)\n              .execute();\n          } else if (queryBuilder instanceof PgCountBuilder) {\n            data = await drizzleShim._.session.count(queryBuilder.getSQL());\n          } else {\n            throw new Error(\"Unsupported query builder\");\n          }\n\n          // @ts-ignore\n          onData(data);\n        } catch (error) {\n          onError?.(error as Error);\n        }\n      };\n\n      const onErrorListener = (_event: MessageEvent) => {\n        onError?.(new Error(\"server disconnected\"));\n      };\n\n      sse.addEventListener(\"message\", onDataListener);\n      sse.addEventListener(\"error\", onErrorListener);\n\n      return {\n        unsubscribe: () => {\n          sse.removeEventListener(\"message\", onDataListener);\n          sse.removeEventListener(\"error\", onErrorListener);\n          sse.close();\n        },\n      };\n    },\n    getStatus: async () => {\n      const response = await fetch(`${new URL(baseUrl).origin}/status`);\n\n      return response.json();\n    },\n  };\n\n  return client;\n};\n\nexport {\n  sql,\n  eq,\n  gt,\n  gte,\n  lt,\n  lte,\n  ne,\n  isNull,\n  isNotNull,\n  inArray,\n  notInArray,\n  exists,\n  notExists,\n  between,\n  notBetween,\n  like,\n  notLike,\n  ilike,\n  notIlike,\n  not,\n  asc,\n  desc,\n  and,\n  or,\n  count,\n  countDistinct,\n  avg,\n  avgDistinct,\n  sum,\n  sumDistinct,\n  max,\n  min,\n  relations,\n  SQL,\n} from \"drizzle-orm\";\n\nexport {\n  alias,\n  union,\n  unionAll,\n  intersect,\n  intersectAll,\n  except,\n  exceptAll,\n} from \"drizzle-orm/pg-core\";\n\nexport const setDatabaseSchema = <T extends { [name: string]: unknown }>(\n  schema: T,\n  schemaName: string,\n) => {\n  for (const table of Object.values(schema)) {\n    if (isTable(table)) {\n      // @ts-ignore\n      table[Table.Symbol.Schema] = schemaName;\n    } else if (isPgEnum(table)) {\n      // @ts-ignore\n      table.schema = schemaName;\n    }\n  }\n};\n\nfunction orderSelectedFields<TColumn extends AnyColumn>(\n  fields: Record<string, unknown>,\n  pathPrefix?: string[],\n): SelectedFieldsOrdered<TColumn> {\n  return Object.entries(fields).reduce<SelectedFieldsOrdered<AnyColumn>>(\n    (result, [name, field]) => {\n      if (typeof name !== \"string\") {\n        return result;\n      }\n\n      const newPath = pathPrefix ? [...pathPrefix, name] : [name];\n      if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased)) {\n        result.push({ path: newPath, field });\n      } else if (is(field, Table)) {\n        result.push(\n          // @ts-ignore\n          ...orderSelectedFields(field[Table.Symbol.Columns], newPath),\n        );\n      } else {\n        result.push(\n          ...orderSelectedFields(field as Record<string, unknown>, newPath),\n        );\n      }\n      return result;\n    },\n    [],\n  ) as SelectedFieldsOrdered<TColumn>;\n}\n"],"mappings":"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","names":["SQL","sql","params","noopDatabase"]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import {\n  type AnyColumn,\n  Column,\n  is,\n  isTable,\n  mapRelationalRow,\n  type QueryWithTypings,\n  type SelectedFieldsOrdered,\n  SQL,\n  type SQLWrapper,\n  Table,\n} from \"drizzle-orm\";\nimport { isPgEnum, type PgDialect } from \"drizzle-orm/pg-core\";\nimport { PgCountBuilder } from \"drizzle-orm/pg-core/query-builders/count\";\nimport { PgRelationalQuery } from \"drizzle-orm/pg-core/query-builders/query\";\nimport { PgRaw } from \"drizzle-orm/pg-core/query-builders/raw\";\nimport { drizzle, type PgRemoteDatabase } from \"drizzle-orm/pg-proxy\";\nimport { TypedQueryBuilder } from \"drizzle-orm/query-builders/query-builder\";\nimport { EventSource } from \"eventsource\";\nimport superjson from \"superjson\";\n\ntype Schema = { [name: string]: unknown };\n\ntype Prettify<T> = {\n  [K in keyof T]: T[K];\n} & {};\n\nexport type Status = {\n  [chainName: string]: {\n    id: number;\n    block: { number: number; timestamp: number };\n  };\n};\n\ntype ClientDb<schema extends Schema = Schema> = Prettify<\n  Omit<\n    PgRemoteDatabase<schema>,\n    | \"insert\"\n    | \"update\"\n    | \"delete\"\n    | \"transaction\"\n    | \"refreshMaterializedView\"\n    | \"_\"\n  >\n>;\n\nexport type Client<schema extends Schema = Schema> = {\n  /** Query the database. */\n  db: ClientDb<schema>;\n  /**\n   * Subscribe to live updates.\n   *\n   * @param queryFn - The query to subscribe to.\n   * @param onData - The callback to call with each new query result\n   * @param onError - The callback to call when an error occurs.\n   *\n   * @example\n   * ```ts\n   * import { createClient } from \"@ponder/client\";\n   * import * as schema from \"../ponder.schema\";\n   *\n   * const client = createClient(\"https://.../sql\", { schema });\n   *\n   * client.live(\n   *   (db) => db.select().from(schema.account),\n   *   (result) => console.log(result),\n   *   (error) => console.error(error),\n   * );\n   * ```\n   */\n  live: <result>(\n    queryFn: (db: ClientDb<schema>) => Promise<result>,\n    onData: (result: result) => void,\n    onError?: (error: Error) => void,\n  ) => {\n    unsubscribe: () => void;\n  };\n  /** Get the status of all chains. */\n  getStatus: () => Promise<Status>;\n};\n\nconst getUrl = (\n  baseUrl: string,\n  method: \"live\" | \"db\",\n  query?: QueryWithTypings,\n) => {\n  const url = new URL(baseUrl);\n  url.pathname = `${url.pathname}/${method}`;\n  if (query) {\n    url.searchParams.set(\"sql\", superjson.stringify(query));\n  }\n  return url;\n};\n\nconst noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {\n  casing: \"snake_case\",\n});\n\n// @ts-expect-error\nconst dialect: PgDialect = noopDatabase.dialect;\n\nexport const compileQuery = (query: SQLWrapper) => {\n  return dialect.sqlToQuery(query.getSQL());\n};\n\n/**\n * Create a client for querying Ponder apps.\n *\n * @param baseUrl - The URL of the Ponder app.\n * @param schema - The schema of the Ponder app.\n *\n * @example\n * ```ts\n * import { createClient } from \"@ponder/client\";\n * import * as schema from \"../ponder.schema\";\n *\n * const client = createClient(\"https://.../sql\", { schema });\n * ```\n */\nexport const createClient = <schema extends Schema>(\n  baseUrl: string,\n  params: { schema?: schema } = {},\n): Client<schema> => {\n  const client: Client<schema> = {\n    db: drizzle(\n      async (sql, params, method, typings) => {\n        const builtQuery = { sql, params, typings };\n        const response = await fetch(getUrl(baseUrl, \"db\", builtQuery), {\n          method: \"GET\",\n        });\n\n        if (response.ok === false) {\n          const error = new Error(await response.text());\n          error.stack = undefined;\n          throw error;\n        }\n\n        const result = await response.json();\n\n        if (method === \"all\") {\n          return {\n            ...result,\n            rows: result.rows.map((row: object) => Object.values(row)),\n          };\n        }\n\n        return result;\n      },\n      { schema: params.schema, casing: \"snake_case\" },\n    ),\n    live: (queryFn, onData, onError) => {\n      const noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {\n        schema: params.schema,\n        casing: \"snake_case\",\n      });\n\n      const queryPromise = queryFn(noopDatabase);\n\n      if (\"getSQL\" in queryPromise === false) {\n        throw new Error(\n          '\"queryFn\" must return SQL. You may have to remove `.execute()` from your query.',\n        );\n      }\n      const queryBuilder = queryPromise as unknown as SQLWrapper;\n      const query = compileQuery(queryBuilder);\n\n      const sse = new EventSource(getUrl(baseUrl, \"live\", query));\n\n      const onDataListener = async (event: MessageEvent) => {\n        try {\n          const result = JSON.parse(event.data);\n\n          const drizzleShim = drizzle(\n            (_, __, method) => {\n              if (method === \"all\") {\n                return Promise.resolve({\n                  ...result,\n                  rows: result.rows.map((row: object) => Object.values(row)),\n                });\n              }\n\n              return Promise.resolve(result);\n            },\n            { schema: params.schema },\n          );\n\n          let data: unknown;\n\n          if (queryBuilder instanceof TypedQueryBuilder) {\n            const fields = queryBuilder._.selectedFields as Record<\n              string,\n              unknown\n            >;\n            const orderedFields = orderSelectedFields(fields);\n\n            data = await drizzleShim._.session\n              .prepareQuery(\n                query,\n                // @ts-expect-error\n                orderedFields,\n                undefined,\n                false,\n              )\n              .execute();\n          } else if (queryBuilder instanceof PgRelationalQuery) {\n            // @ts-expect-error\n            const selection = queryBuilder._toSQL().query.selection;\n            data = await drizzleShim._.session\n              .prepareQuery(\n                query,\n                undefined,\n                undefined,\n                true,\n                (rawRows, mapColumnValue) => {\n                  const rows = rawRows.map((row) =>\n                    mapRelationalRow(\n                      // @ts-expect-error\n                      queryBuilder.schema,\n                      // @ts-expect-error\n                      queryBuilder.tableConfig,\n                      row,\n                      selection,\n                      mapColumnValue,\n                    ),\n                  );\n                  // @ts-expect-error\n                  if (queryBuilder.mode === \"first\") {\n                    return rows[0];\n                  }\n                  return rows;\n                },\n              )\n              .execute();\n          } else if (queryBuilder instanceof PgRaw) {\n            data = await drizzleShim._.session\n              .prepareQuery(query, undefined, undefined, false)\n              .execute();\n          } else if (queryBuilder instanceof PgCountBuilder) {\n            data = await drizzleShim._.session.count(queryBuilder.getSQL());\n          } else {\n            throw new Error(\"Unsupported query builder\");\n          }\n\n          // @ts-expect-error\n          onData(data);\n        } catch (error) {\n          onError?.(error as Error);\n        }\n      };\n\n      const onErrorListener = (_event: MessageEvent) => {\n        onError?.(new Error(\"server disconnected\"));\n      };\n\n      sse.addEventListener(\"message\", onDataListener);\n      sse.addEventListener(\"error\", onErrorListener);\n\n      return {\n        unsubscribe: () => {\n          sse.removeEventListener(\"message\", onDataListener);\n          sse.removeEventListener(\"error\", onErrorListener);\n          sse.close();\n        },\n      };\n    },\n    getStatus: async () => {\n      const response = await fetch(`${new URL(baseUrl).origin}/status`);\n\n      return response.json();\n    },\n  };\n\n  return client;\n};\n\nexport {\n  and,\n  asc,\n  avg,\n  avgDistinct,\n  between,\n  count,\n  countDistinct,\n  desc,\n  eq,\n  exists,\n  gt,\n  gte,\n  ilike,\n  inArray,\n  isNotNull,\n  isNull,\n  like,\n  lt,\n  lte,\n  max,\n  min,\n  ne,\n  not,\n  notBetween,\n  notExists,\n  notIlike,\n  notInArray,\n  notLike,\n  or,\n  relations,\n  SQL,\n  sql,\n  sum,\n  sumDistinct,\n} from \"drizzle-orm\";\n\nexport {\n  alias,\n  except,\n  exceptAll,\n  intersect,\n  intersectAll,\n  union,\n  unionAll,\n} from \"drizzle-orm/pg-core\";\n\nexport const setDatabaseSchema = <T extends { [name: string]: unknown }>(\n  schema: T,\n  schemaName: string,\n) => {\n  for (const table of Object.values(schema)) {\n    if (isTable(table)) {\n      // @ts-expect-error\n      table[Table.Symbol.Schema] = schemaName;\n    } else if (isPgEnum(table)) {\n      // @ts-expect-error\n      table.schema = schemaName;\n    }\n  }\n};\n\nfunction orderSelectedFields<TColumn extends AnyColumn>(\n  fields: Record<string, unknown>,\n  pathPrefix?: string[],\n): SelectedFieldsOrdered<TColumn> {\n  return Object.entries(fields).reduce<SelectedFieldsOrdered<AnyColumn>>(\n    (result, [name, field]) => {\n      if (typeof name !== \"string\") {\n        return result;\n      }\n\n      const newPath = pathPrefix ? [...pathPrefix, name] : [name];\n      if (is(field, Column) || is(field, SQL) || is(field, SQL.Aliased)) {\n        result.push({ path: newPath, field });\n      } else if (is(field, Table)) {\n        result.push(\n          // @ts-expect-error\n          ...orderSelectedFields(field[Table.Symbol.Columns], newPath),\n        );\n      } else {\n        result.push(\n          ...orderSelectedFields(field as Record<string, unknown>, newPath),\n        );\n      }\n      return result;\n    },\n    [],\n  ) as SelectedFieldsOrdered<TColumn>;\n}\n"],"mappings":"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","names":["SQL","sql","params","noopDatabase"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ponder/client",
-  "version": "0.16.10",
+  "version": "0.17.0",
   "description": "Client library for Ponder SQL over HTTP queries",
   "license": "MIT",
   "type": "module",
@@ -30,7 +30,7 @@
     }
   },
   "peerDependencies": {
-    "typescript": ">=5.0.4"
+    "typescript": ">=5.4.0"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/index.ts

@@ -1,20 +1,20 @@
 import {
   type AnyColumn,
   Column,
+  is,
+  isTable,
+  mapRelationalRow,
   type QueryWithTypings,
+  type SelectedFieldsOrdered,
   SQL,
   type SQLWrapper,
-  type SelectedFieldsOrdered,
   Table,
-  is,
-  isTable,
-  mapRelationalRow,
 } from "drizzle-orm";
-import { type PgDialect, isPgEnum } from "drizzle-orm/pg-core";
+import { isPgEnum, type PgDialect } from "drizzle-orm/pg-core";
 import { PgCountBuilder } from "drizzle-orm/pg-core/query-builders/count";
 import { PgRelationalQuery } from "drizzle-orm/pg-core/query-builders/query";
 import { PgRaw } from "drizzle-orm/pg-core/query-builders/raw";
-import { type PgRemoteDatabase, drizzle } from "drizzle-orm/pg-proxy";
+import { drizzle, type PgRemoteDatabase } from "drizzle-orm/pg-proxy";
 import { TypedQueryBuilder } from "drizzle-orm/query-builders/query-builder";
 import { EventSource } from "eventsource";
 import superjson from "superjson";
@@ -96,7 +96,7 @@ const noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {
   casing: "snake_case",
 });
 
-// @ts-ignore
+// @ts-expect-error
 const dialect: PgDialect = noopDatabase.dialect;
 
 export const compileQuery = (query: SQLWrapper) => {
@@ -168,7 +168,6 @@ export const createClient = <schema extends Schema>(
 
       const onDataListener = async (event: MessageEvent) => {
         try {
-          // @ts-ignore
           const result = JSON.parse(event.data);
 
           const drizzleShim = drizzle(
@@ -197,14 +196,14 @@ export const createClient = <schema extends Schema>(
             data = await drizzleShim._.session
               .prepareQuery(
                 query,
-                // @ts-ignore
+                // @ts-expect-error
                 orderedFields,
                 undefined,
                 false,
               )
               .execute();
           } else if (queryBuilder instanceof PgRelationalQuery) {
-            // @ts-ignore
+            // @ts-expect-error
             const selection = queryBuilder._toSQL().query.selection;
             data = await drizzleShim._.session
               .prepareQuery(
@@ -215,17 +214,16 @@ export const createClient = <schema extends Schema>(
                 (rawRows, mapColumnValue) => {
                   const rows = rawRows.map((row) =>
                     mapRelationalRow(
-                      // @ts-ignore
+                      // @ts-expect-error
                       queryBuilder.schema,
-                      // @ts-ignore
+                      // @ts-expect-error
                       queryBuilder.tableConfig,
-                      // @ts-ignore
                       row,
                       selection,
                       mapColumnValue,
                     ),
                   );
-                  // @ts-ignore
+                  // @ts-expect-error
                   if (queryBuilder.mode === "first") {
                     return rows[0];
                   }
@@ -243,7 +241,7 @@ export const createClient = <schema extends Schema>(
             throw new Error("Unsupported query builder");
           }
 
-          // @ts-ignore
+          // @ts-expect-error
           onData(data);
         } catch (error) {
           onError?.(error as Error);
@@ -276,50 +274,50 @@ export const createClient = <schema extends Schema>(
 };
 
 export {
-  sql,
+  and,
+  asc,
+  avg,
+  avgDistinct,
+  between,
+  count,
+  countDistinct,
+  desc,
   eq,
+  exists,
   gt,
   gte,
+  ilike,
+  inArray,
+  isNotNull,
+  isNull,
+  like,
   lt,
   lte,
+  max,
+  min,
   ne,
-  isNull,
-  isNotNull,
-  inArray,
-  notInArray,
-  exists,
-  notExists,
-  between,
+  not,
   notBetween,
-  like,
-  notLike,
-  ilike,
+  notExists,
   notIlike,
-  not,
-  asc,
-  desc,
-  and,
+  notInArray,
+  notLike,
   or,
-  count,
-  countDistinct,
-  avg,
-  avgDistinct,
-  sum,
-  sumDistinct,
-  max,
-  min,
   relations,
   SQL,
+  sql,
+  sum,
+  sumDistinct,
 } from "drizzle-orm";
 
 export {
   alias,
-  union,
-  unionAll,
-  intersect,
-  intersectAll,
   except,
   exceptAll,
+  intersect,
+  intersectAll,
+  union,
+  unionAll,
 } from "drizzle-orm/pg-core";
 
 export const setDatabaseSchema = <T extends { [name: string]: unknown }>(
@@ -328,10 +326,10 @@ export const setDatabaseSchema = <T extends { [name: string]: unknown }>(
 ) => {
   for (const table of Object.values(schema)) {
     if (isTable(table)) {
-      // @ts-ignore
+      // @ts-expect-error
       table[Table.Symbol.Schema] = schemaName;
     } else if (isPgEnum(table)) {
-      // @ts-ignore
+      // @ts-expect-error
       table.schema = schemaName;
     }
   }
@@ -352,7 +350,7 @@ function orderSelectedFields<TColumn extends AnyColumn>(
         result.push({ path: newPath, field });
       } else if (is(field, Table)) {
         result.push(
-          // @ts-ignore
+          // @ts-expect-error
           ...orderSelectedFields(field[Table.Symbol.Columns], newPath),
         );
       } else {