refactor: remove kysely

package.json

@@ -25,7 +25,6 @@
   },
   "dependencies": {
     "@hiogawa/tiny-sql": "^0.0.3",
-    "kysely": "^0.26.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

src/db/d1-api.ts

@@ -28,7 +28,7 @@ export function createD1Api(options: D1ApiConfig): D1Database {
 
     // TODO: we might not need "/dump" and "/execute" ? (actually "/execute" is currently 404 Not Found...)
     if (url !== "/query") {
-      throw new Error("D1API_ERROR", {
+      throw new Error("UNOFFICIAL_D1_API_ERROR", {
         cause: `unsupported endpoint '${url}'`,
       });
     }
@@ -50,7 +50,7 @@ export function createD1Api(options: D1ApiConfig): D1Database {
     const resJson = await res.json();
     const parsed = Z_QUERY_RESPONSE.parse(resJson);
     if (!parsed.success) {
-      throw new Error("D1API_ERROR", { cause: resJson });
+      throw new Error("UNOFFICIAL_D1_API_ERROR", { cause: resJson });
     }
 
     const dummyRes = {

src/db/repl.ts

@@ -1,20 +1,16 @@
-import { sql } from "kysely";
-import { db, initializeDb } from ".";
 import { setWorkerEnvDev } from "../utils/worker-env-dev";
+import { sql } from "./sql";
 
 // usage:
 // pnpm repl
-// > await sql`SELECT 1 + 1`.execute(db)
-// > await sql`PRAGMA table_list`.execute(db)
-// > await db.selectFrom("counter").selectAll().execute()
+// > await sql`SELECT 1 + 1`.all()
+// > await sql`PRAGMA table_list`.all()
 
 async function main() {
   console.log("* setting up globals...");
   await setWorkerEnvDev();
-  await initializeDb();
   Object.assign(globalThis, {
     sql,
-    db,
   });
 }
 

src/db/sql.ts

@@ -0,0 +1,35 @@
+import { tinyassert } from "@hiogawa/utils";
+import { env } from "../utils/worker-env";
+
+//
+// quick and dirty raw query buider
+//
+
+type D1Primitive = number | string | null;
+
+export function sql<T = Record<string, D1Primitive>>(
+  strings: TemplateStringsArray,
+  ...values: D1Primitive[]
+) {
+  const query = strings.raw.join("?");
+  const stmt = env.db.prepare(query).bind(...values);
+  const self = {
+    all: async (): Promise<T[]> => {
+      const result = await stmt.all();
+      tinyassert(result.success, result.error);
+      return (result.results ?? []) as T[];
+    },
+    first: async (): Promise<T | undefined> => {
+      const rows = await self.all();
+      return rows[0];
+    },
+    firstOrThrow: async (): Promise<T> => {
+      const row = await self.first();
+      if (typeof row === "undefined") {
+        throw new Error("sql.firstOrThrow", { cause: { query, values } });
+      }
+      return row;
+    },
+  };
+  return self;
+}

src/rpc/server.ts

@@ -1,10 +1,8 @@
 import type { RequestHandler } from "@hattip/compose";
 import { type TinyRpcRoutes, createTinyRpcHandler } from "@hiogawa/tiny-rpc";
 import { zodFn } from "@hiogawa/tiny-rpc/dist/zod";
-import { tinyassert } from "@hiogawa/utils";
-import { sql } from "kysely";
 import { z } from "zod";
-import { db } from "../db";
+import { sql } from "../db/sql";
 import { env } from "../utils/worker-env";
 
 export type RpcRoutes = typeof rpcRoutes;
@@ -48,57 +46,16 @@ const counterD1 = {
   id: 1,
 
   async get() {
-    // it's simple enough to get away with raw query
-    // but use kysely just for the sake of testing src/db/d1-api.ts
-
-    // d1 raw query
-    sqlD1<{ value: number }>`SELECT value from counter where id = ${this.id}`;
-
-    // kysely raw query
-    sql`SELECT value from counter where id = ${this.id}`;
-
-    // kysely query builder
-    const row = await db
-      .selectFrom("counter")
-      .select("value")
-      .where("id", "=", this.id)
-      .executeTakeFirstOrThrow();
+    const row = await sql<{
+      value: number;
+    }>`SELECT value from counter where id = ${this.id}`.firstOrThrow();
     return row.value;
   },
 
   async update(delta: number) {
-    // d1 raw query
-    sqlD1`UPDATE Counter SET value = value + ${delta} WHERE id = ${this.id} RETURNING value`;
-
-    // kysely raw query
-    sql`UPDATE Counter SET value = value + ${delta} WHERE id = ${this.id} RETURNING value`;
-
-    // kysely query builder
-    const row = await db
-      .updateTable("counter")
-      .set({ value: sql`value + ${delta}` })
-      .where("id", "=", this.id)
-      .returning("value")
-      .executeTakeFirstOrThrow();
+    const row = await sql<{
+      value: number;
+    }>`UPDATE counter SET value = value + ${delta} WHERE id = ${this.id} RETURNING value`.firstOrThrow();
     return row.value;
   },
 };
-
-//
-// simple raw query without kysely
-//
-
-type D1Primitive = number | string | null;
-
-function sqlD1<T = Record<string, D1Primitive>>(
-  strings: TemplateStringsArray,
-  ...values: D1Primitive[]
-): () => Promise<T[]> {
-  const query = strings.raw.join("?");
-  const stmt = env.db.prepare(query).bind(...values);
-  return async () => {
-    const result = await stmt.all();
-    tinyassert(result.success, result.error);
-    return (result.results ?? []) as T[];
-  };
-}

src/server/index.ts

@@ -2,7 +2,6 @@ import { type RequestHandler, compose } from "@hattip/compose";
 import { once } from "@hiogawa/utils";
 import { loggerMiddleware } from "@hiogawa/utils-experimental";
 import { importIndexHtml } from "@hiogawa/vite-import-index-html/dist/runtime";
-import { initializeDb } from "../db";
 import { rpcHandler } from "../rpc/server";
 import { initializeEnv } from "../utils/worker-env";
 import { runSSR } from "./ssr";
@@ -32,7 +31,6 @@ function htmlHandler(): RequestHandler {
 function bootstrapHander(): RequestHandler {
   return once(async () => {
     await initializeEnv();
-    await initializeDb();
   });
 }