De-static-ify D1 Statement class, and update README.md

Due to a limitation of `esbuild`, private static members are lowered:
https://github.com/evanw/esbuild/blob/35c263fc4c3d35d7304713ee7a06dda9700da919/internal/js_parser/js_parser_lower.go#L1729-L1755

Author: mrbbot

packages/d1/README.md

@@ -8,23 +8,14 @@ fun, full-featured, fully-local simulator for Cloudflare Workers. See
 
 ```js
 import { BetaDatabase } from "@miniflare/d1";
-import { MemoryStorage } from "@miniflare/storage-memory";
-const db = new BetaDatabase(new MemoryStorage());
+import { createSQLiteDB } from "@miniflare/shared";
+const db = new BetaDatabase(createSQLiteDB(":memory:"));
 
-// BetaDatabase only supports .fetch(), once D1 is out of beta the full API will be available here:
-await db.fetch("/execute", {
-  method: "POST",
-  body: JSON.stringify({
-    sql: `CREATE TABLE my_table (cid INTEGER PRIMARY KEY, name TEXT NOT NULL);`,
-  }),
-});
-const response = await db.fetch("/query", {
-  method: "POST",
-  body: JSON.stringify({
-    sql: `SELECT * FROM sqlite_schema`,
-  }),
-});
-console.log(await response.json());
+await db.exec(
+  `CREATE TABLE my_table (cid INTEGER PRIMARY KEY, name TEXT NOT NULL);`
+);
+const response = await db.prepare(`SELECT * FROM sqlite_schema`).all();
+console.log(await response);
 /*
 {
   "success": true,

packages/d1/src/database.ts

@@ -3,7 +3,7 @@ import type { SqliteDB } from "@miniflare/shared";
 import { Statement } from "./statement";
 
 export class BetaDatabase {
-  #db: SqliteDB;
+  readonly #db: SqliteDB;
 
   constructor(db: SqliteDB) {
     this.#db = db;

packages/d1/src/statement.ts

@@ -35,7 +35,7 @@ export class Statement {
     return new Statement(this.#db, this.#query, params);
   }
 
-  private prepareAndBind() {
+  #prepareAndBind() {
     const prepared = this.#db.prepare(this.#query);
     if (this.#bindings === undefined) return prepared;
     try {
@@ -55,9 +55,9 @@ export class Statement {
 
   async all() {
     const start = performance.now();
-    const statementWithBindings = this.prepareAndBind();
+    const statementWithBindings = this.#prepareAndBind();
     try {
-      const results = Statement.#all(statementWithBindings);
+      const results = this.#all(statementWithBindings);
       return {
         results,
         duration: performance.now() - start,
@@ -71,7 +71,7 @@ export class Statement {
     }
   }
 
-  static #all(statementWithBindings: SqliteStatement) {
+  #all(statementWithBindings: SqliteStatement) {
     try {
       return statementWithBindings.all();
     } catch (e: unknown) {
@@ -82,33 +82,31 @@ export class Statement {
           (e as Error).message
         )
       ) {
-        return Statement.#run(statementWithBindings);
+        return this.#run(statementWithBindings);
       }
       throw e;
     }
   }
 
   async first(col?: string) {
-    const statementWithBindings = this.prepareAndBind();
+    const statementWithBindings = this.#prepareAndBind();
     try {
-      const data = Statement.#first(statementWithBindings);
+      const data = this.#first(statementWithBindings);
       return typeof col === "string" ? data[col] : data;
     } catch (e) {
       throw errorWithCause("D1_FIRST_ERROR", e);
     }
   }
 
-  static #first(statementWithBindings: SqliteStatement) {
+  #first(statementWithBindings: SqliteStatement) {
     return statementWithBindings.get();
   }
 
   async run() {
     const start = performance.now();
-    const statementWithBindings = this.prepareAndBind();
+    const statementWithBindings = this.#prepareAndBind();
     try {
-      const { changes, lastInsertRowid } = Statement.#run(
-        statementWithBindings
-      );
+      const { changes, lastInsertRowid } = this.#run(statementWithBindings);
       return {
         results: null,
         duration: performance.now() - start,
@@ -122,16 +120,16 @@ export class Statement {
     }
   }
 
-  static #run(statementWithBindings: SqliteStatement) {
+  #run(statementWithBindings: SqliteStatement) {
     return statementWithBindings.run();
   }
 
   async raw() {
-    const statementWithBindings = this.prepareAndBind();
-    return Statement.#raw(statementWithBindings);
+    const statementWithBindings = this.#prepareAndBind();
+    return this.#raw(statementWithBindings);
   }
 
-  static #raw(statementWithBindings: SqliteStatement) {
+  #raw(statementWithBindings: SqliteStatement) {
     return statementWithBindings.raw() as any;
   }
 }