ponder 0.9.0 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ponder",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "An open-source framework for crypto application backends",
   "license": "MIT",
   "type": "module",
@@ -62,7 +62,6 @@
     "http-terminator": "^3.2.0",
     "ink": "^4.4.1",
     "kysely": "^0.26.3",
-    "kysely-pglite": "^0.6.0",
     "pg": "^8.11.3",
     "pg-connection-string": "^2.6.2",
     "pg-query-emscripten": "5.1.0",
@@ -83,7 +82,6 @@
     "@types/glob": "^8.1.0",
     "@types/node": "^20.10.0",
     "@types/pg": "^8.10.9",
-    "@types/pg-copy-streams": "^1.2.5",
     "@types/react": "^18.2.38",
     "@viem/anvil": "^0.0.6",
     "@wagmi/cli": "^1.5.2",

package/src/build/index.ts

@@ -1,4 +1,4 @@
-import crypto from "node:crypto";
+import { createHash } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import type { CliOptions } from "@/bin/ponder.js";
@@ -180,8 +180,7 @@ export const createBuild = async ({
 
       const config = executeResult.exports.default as Config;
 
-      const contentHash = crypto
-        .createHash("sha256")
+      const contentHash = createHash("sha256")
         .update(serialize(config))
         .digest("hex");
 
@@ -213,16 +212,13 @@ export const createBuild = async ({
         status: "success",
         result: {
           schema,
-          contentHash: crypto
-            .createHash("sha256")
-            .update(contents)
-            .digest("hex"),
+          contentHash: createHash("sha256").update(contents).digest("hex"),
         },
       } as const;
     },
     async executeIndexingFunctions(): Promise<IndexingResult> {
       const files = glob.sync(indexingPattern, {
-        ignore: glob.sync(apiPattern),
+        ignore: apiPattern,
       });
       const executeResults = await Promise.all(
         files.map(async (file) => ({
@@ -248,7 +244,7 @@ export const createBuild = async ({
 
       // Note that we are only hashing the file contents, not the exports. This is
       // different from the config/schema, where we include the serializable object itself.
-      const hash = crypto.createHash("sha256");
+      const hash = createHash("sha256");
       for (const file of files) {
         try {
           const contents = fs.readFileSync(file, "utf-8");
@@ -424,8 +420,7 @@ export const createBuild = async ({
         common.logger[log.level]({ service: "build", msg: log.msg });
       }
 
-      const buildId = crypto
-        .createHash("sha256")
+      const buildId = createHash("sha256")
         .update(BUILD_ID_VERSION)
         .update(configResult.contentHash)
         .update(schemaResult.contentHash)
@@ -577,7 +572,7 @@ export const createBuild = async ({
           ]);
           viteNodeRunner.moduleCache.invalidateDepTree(
             glob.sync(indexingPattern, {
-              ignore: glob.sync(apiPattern),
+              ignore: apiPattern,
             }),
           );
           viteNodeRunner.moduleCache.invalidateDepTree(glob.sync(apiPattern));

package/src/database/index.ts

@@ -1,3 +1,4 @@
+import { randomUUID } from "node:crypto";
 import { getPrimaryKeyColumns, getTableNames } from "@/drizzle/index.js";
 import { getColumnCasing } from "@/drizzle/kit/index.js";
 import type { Common } from "@/internal/common.js";
@@ -23,7 +24,7 @@ import {
 } from "@/utils/checkpoint.js";
 import { formatEta } from "@/utils/format.js";
 import { createPool, createReadonlyPool } from "@/utils/pg.js";
-import { createPglite } from "@/utils/pglite.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";
@@ -39,7 +40,6 @@ import {
   WithSchemaPlugin,
   sql,
 } from "kysely";
-import { KyselyPGlite } from "kysely-pglite";
 import type { Pool, PoolClient } from "pg";
 import prometheus from "prom-client";
 
@@ -155,7 +155,7 @@ export const createDatabase = async ({
           : preBuild.databaseConfig.instance,
     };
 
-    const kyselyDialect = new KyselyPGlite(driver.instance).dialect;
+    const kyselyDialect = createPgliteKyselyDialect(driver.instance);
 
     await driver.instance.query(`CREATE SCHEMA IF NOT EXISTS "${namespace}"`);
     await driver.instance.query(`SET search_path TO "${namespace}"`);
@@ -449,7 +449,7 @@ export const createDatabase = async ({
       for (let i = 0; i <= RETRY_COUNT; i++) {
         const endClock = startClock();
 
-        const id = crypto.randomUUID().slice(0, 8);
+        const id = randomUUID().slice(0, 8);
         if (options.includeTraceLogs) {
           common.logger.trace({
             service: "database",

package/src/utils/pg.ts

@@ -2,6 +2,12 @@ import type { Logger } from "@/internal/logger.js";
 import pg, { type PoolConfig } from "pg";
 import { prettyPrint } from "./print.js";
 
+// The default parser for numeric[] (1231) seems to parse values as Number
+// or perhaps through JSON.parse(). Use the int8[] (1016) parser instead,
+// which properly returns an array of strings.
+const bigIntArrayParser = pg.types.getTypeParser(1016);
+pg.types.setTypeParser(1231, bigIntArrayParser);
+
 // Monkeypatch Pool.query to get more informative stack traces. I have no idea why this works.
 // https://stackoverflow.com/a/70601114
 const originalClientQuery = pg.Client.prototype.query;

package/src/utils/pglite.ts

@@ -1,6 +1,17 @@
 import { mkdirSync } from "node:fs";
 import type { Prettify } from "@/types/utils.js";
 import { type PGliteOptions as Options, PGlite } from "@electric-sql/pglite";
+import {
+  CompiledQuery,
+  type DatabaseConnection,
+  type Dialect,
+  type Kysely,
+  PostgresAdapter,
+  PostgresIntrospector,
+  PostgresQueryCompiler,
+  type QueryResult,
+  type TransactionSettings,
+} from "kysely";
 
 export type PGliteOptions = Prettify<Options & { dataDir: string }>;
 
@@ -16,3 +27,71 @@ export function createPglite(options: PGliteOptions) {
 
   return new PGlite(options);
 }
+
+// Adapted from dnlsandiego/kysely-pglite
+// https://github.com/dnlsandiego/kysely-pglite/blob/3891a0c4d9327a21bff26addf371784f0109260b/src/kysely-pglite.ts
+export function createPgliteKyselyDialect(instance: PGlite) {
+  return {
+    createAdapter: () => new PostgresAdapter(),
+    createDriver: () => new PGliteDriver(instance),
+    createIntrospector: (db: Kysely<any>) => new PostgresIntrospector(db),
+    createQueryCompiler: () => new PostgresQueryCompiler(),
+  } satisfies Dialect;
+}
+
+// Adapted from dnlsandiego/kysely-pglite
+// https://github.com/dnlsandiego/kysely-pglite/blob/3891a0c4d9327a21bff26addf371784f0109260b/src/pglite-driver.ts
+export class PGliteDriver {
+  #client: PGlite;
+
+  constructor(client: PGlite) {
+    this.#client = client;
+  }
+
+  async acquireConnection(): Promise<DatabaseConnection> {
+    return new PGliteConnection(this.#client);
+  }
+
+  async beginTransaction(
+    connection: DatabaseConnection,
+    _settings: TransactionSettings,
+  ): Promise<void> {
+    await connection.executeQuery(CompiledQuery.raw("BEGIN"));
+  }
+
+  async commitTransaction(connection: DatabaseConnection): Promise<void> {
+    await connection.executeQuery(CompiledQuery.raw("COMMIT"));
+  }
+
+  async rollbackTransaction(connection: DatabaseConnection): Promise<void> {
+    await connection.executeQuery(CompiledQuery.raw("ROLLBACK"));
+  }
+
+  async destroy(): Promise<void> {
+    await this.#client.close();
+  }
+
+  async init(): Promise<void> {}
+  async releaseConnection(_connection: DatabaseConnection): Promise<void> {}
+}
+
+class PGliteConnection implements DatabaseConnection {
+  #client: PGlite;
+
+  constructor(client: PGlite) {
+    this.#client = client;
+  }
+
+  async executeQuery<R>(
+    compiledQuery: CompiledQuery<any>,
+  ): Promise<QueryResult<R>> {
+    return await this.#client.query<R>(compiledQuery.sql, [
+      ...compiledQuery.parameters,
+    ]);
+  }
+
+  // biome-ignore lint/correctness/useYield: <explanation>
+  async *streamQuery(): AsyncGenerator<never, void, unknown> {
+    throw new Error("PGlite does not support streaming.");
+  }
+}