rado 0.4.2 → 0.4.4

package/README.md

@@ -222,7 +222,7 @@ const PostTags = table({
 ## Connections
 
 Currently supported SQLite drivers:
-`better-sqlite3`, `sql.js`, `sqlite3`, `bun:sqlite`
+`better-sqlite3`, `sql.js`, `sqlite3`, `bun:sqlite`, `@sqlite.org/sqlite-wasm`
 
 Pass an instance of the database to the `connect` function to get started:
 

package/dist/driver/@sqlite.org/sqlite-wasm.d.ts

@@ -0,0 +1,17 @@
+import { SchemaInstructions } from '../../define/Schema.js';
+import { Driver, DriverOptions } from '../../lib/Driver.js';
+import { Statement } from '../../lib/Statement.js';
+import { SqliteSchema } from '../../sqlite/SqliteSchema.js';
+type DatabaseApi = any;
+export declare class SqliteWasmDriver extends Driver.Sync {
+    db: DatabaseApi;
+    tableData?: (tableName: string) => Array<SqliteSchema.Column>;
+    indexData?: (tableName: string) => Array<SqliteSchema.Index>;
+    constructor(db: DatabaseApi, options?: DriverOptions);
+    close(): void;
+    prepareStatement(stmt: Statement, discardAfter: boolean): Driver.Sync.PreparedStatement;
+    schemaInstructions(tableName: string): SchemaInstructions | undefined;
+    export(): Uint8Array;
+}
+export declare function connect(db: DatabaseApi, options?: DriverOptions): SqliteWasmDriver;
+export {};

package/dist/driver/@sqlite.org/sqlite-wasm.js

@@ -0,0 +1,80 @@
+import { Driver } from "../../lib/Driver.js";
+import { SqliteFormatter } from "../../sqlite/SqliteFormatter.js";
+import { SqliteSchema } from "../../sqlite/SqliteSchema.js";
+class PreparedStatement {
+  constructor(db, stmt, discardAfter) {
+    this.db = db;
+    this.stmt = stmt;
+    this.discardAfter = discardAfter;
+  }
+  *iterate(params) {
+    if (params.length > 0)
+      this.stmt.bind(params);
+    while (this.stmt.step())
+      yield this.stmt.get({});
+    if (this.discardAfter)
+      this.stmt.finalize();
+    else
+      this.stmt.reset();
+  }
+  all(params) {
+    return Array.from(this.iterate(params));
+  }
+  run(params) {
+    if (params.length > 0)
+      this.stmt.bind(params);
+    this.stmt.step();
+    if (this.discardAfter)
+      this.stmt.finalize();
+    else
+      this.stmt.reset();
+    return { rowsAffected: this.db.changes() };
+  }
+  get(params) {
+    return this.all(params)[0];
+  }
+  execute(params) {
+    if (params.length > 0)
+      this.stmt.bind(params);
+    this.stmt.step();
+    if (this.discardAfter)
+      this.stmt.finalize();
+    else
+      this.stmt.reset();
+  }
+}
+class SqliteWasmDriver extends Driver.Sync {
+  constructor(db, options) {
+    super(new SqliteFormatter(), options);
+    this.db = db;
+  }
+  tableData;
+  indexData;
+  close() {
+    this.db.close();
+  }
+  prepareStatement(stmt, discardAfter) {
+    return new PreparedStatement(
+      this.db,
+      this.db.prepare(stmt.sql),
+      discardAfter
+    );
+  }
+  schemaInstructions(tableName) {
+    this.tableData = this.tableData || (this.tableData = this.prepare(SqliteSchema.tableData));
+    this.indexData = this.indexData || (this.indexData = this.prepare(SqliteSchema.indexData));
+    const columnData = this.tableData(tableName);
+    const indexData = this.indexData(tableName);
+    return SqliteSchema.createInstructions(columnData, indexData);
+  }
+  export() {
+    throw new Error("Not implemented");
+  }
+}
+function connect(db, options) {
+  return new SqliteWasmDriver(db, options);
+}
+export {
+  SqliteWasmDriver,
+  connect
+};

package/dist/driver/sql.js.js

@@ -13,6 +13,8 @@ class PreparedStatement {
       yield this.stmt.getAsObject();
     if (this.discardAfter)
       this.stmt.free();
+    else
+      this.stmt.reset();
   }
   all(params) {
     return Array.from(this.iterate(params));
@@ -21,6 +23,8 @@ class PreparedStatement {
     this.stmt.run(params);
     if (this.discardAfter)
       this.stmt.free();
+    else
+      this.stmt.reset();
     return { rowsAffected: this.db.getRowsModified() };
   }
   get(params) {
@@ -30,6 +34,8 @@ class PreparedStatement {
     this.stmt.run(params);
     if (this.discardAfter)
       this.stmt.free();
+    else
+      this.stmt.reset();
   }
 }
 class SqlJsDriver extends Driver.Sync {

package/dist/lib/Driver.d.ts

@@ -68,7 +68,7 @@ declare abstract class AsyncDriver extends DriverBase {
     migrateSchema(...tables: Array<Table<any>>): Promise<unknown>;
     executeQuery(query: QueryData, stmt?: AsyncPreparedStatement, params?: Array<any>): Promise<unknown>;
     iterate<T>(cursor: Select<T>): AsyncIterable<T>;
-    transaction<T>(run: (query: AsyncDriver) => T): Promise<T>;
+    transaction<T>(run: (query: AsyncDriver) => Promise<T>): Promise<T>;
 }
 declare class SyncWrapper extends AsyncDriver {
     private sync;

package/dist/lib/Formatter.js

@@ -713,7 +713,7 @@ class Formatter {
             }
             stmt.identifier(field);
             if (asBoolean)
-              stmt.add(`, 'true', 'false'))`);
+              stmt.raw(`, 'true', 'false'))`);
             if (asJson)
               stmt.closeParenthesis();
             if (jsonColumn && !asJson)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -48,6 +48,7 @@
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230628.0",
+    "@sqlite.org/sqlite-wasm": "^3.42.0-build4",
     "@types/better-sqlite3": "^5.4.1",
     "@types/glob": "^8.0.0",
     "@types/sql.js": "^1.4.2",