rado 0.4.5 → 0.4.7

package/dist/driver/d1.d.ts

@@ -13,7 +13,10 @@ export declare class D1Driver extends Driver.Async {
     executeQuery(query: QueryData, stmt?: Driver.Async.PreparedStatement, params?: any[] | undefined): Promise<unknown>;
     prepareStatement(stmt: Statement): Driver.Async.PreparedStatement;
     schemaInstructions(tableName: string): Promise<SchemaInstructions | undefined>;
-    isolate(): [connection: Driver.Async, release: () => Promise<void>];
+    isolate(): Promise<[
+        connection: Driver.Async,
+        release: () => Promise<void>
+    ]>;
     close(): Promise<void>;
 }
 export declare function connect(db: D1Database, options?: DriverOptions): D1Driver;

package/dist/driver/d1.js

@@ -48,12 +48,14 @@ class D1Driver extends Driver.Async {
     const indexData = await this.indexData(tableName);
     return SqliteSchema.createInstructions(columnData, indexData);
   }
-  isolate() {
+  async isolate() {
+    const currentLock = this.lock;
     const connection = new D1Driver(this.db);
     let release, trigger = new Promise((resolve) => {
       release = async () => resolve();
     });
-    this.lock = Promise.resolve(this.lock).then(() => trigger);
+    this.lock = Promise.resolve(currentLock).then(() => trigger);
+    await currentLock;
     return [connection, release];
   }
   async close() {

package/dist/driver/sqlite3.d.ts

@@ -13,7 +13,10 @@ export declare class Sqlite3Driver extends Driver.Async {
     executeQuery(query: QueryData, stmt?: Driver.Async.PreparedStatement, params?: any[] | undefined): Promise<unknown>;
     prepareStatement(stmt: Statement): Driver.Async.PreparedStatement;
     schemaInstructions(tableName: string): Promise<SchemaInstructions | undefined>;
-    isolate(): [connection: Driver.Async, release: () => Promise<void>];
+    isolate(): Promise<[
+        connection: Driver.Async,
+        release: () => Promise<void>
+    ]>;
     close(): Promise<void>;
 }
 export declare function connect(db: Database, options?: DriverOptions): Sqlite3Driver;

package/dist/driver/sqlite3.js

@@ -101,12 +101,14 @@ class Sqlite3Driver extends Driver.Async {
     const indexData = await this.indexData(tableName);
     return SqliteSchema.createInstructions(columnData, indexData);
   }
-  isolate() {
+  async isolate() {
+    const currentLock = this.lock;
     const connection = new Sqlite3Driver(this.db);
     let release, trigger = new Promise((resolve) => {
       release = async () => resolve();
     });
-    this.lock = Promise.resolve(this.lock).then(() => trigger);
+    this.lock = Promise.resolve(currentLock).then(() => trigger);
+    await currentLock;
     return [connection, release];
   }
   async close() {

package/dist/lib/Driver.d.ts

@@ -59,7 +59,10 @@ declare abstract class AsyncDriver extends DriverBase {
     transactionId: number;
     constructor(formatter: Formatter, options?: DriverOptions);
     abstract close(): Promise<void>;
-    abstract isolate(): [connection: AsyncDriver, release: () => Promise<void>];
+    abstract isolate(): Promise<[
+        connection: AsyncDriver,
+        release: () => Promise<void>
+    ]>;
     abstract prepareStatement(stmt: Statement, discardAfter: boolean): AsyncPreparedStatement;
     abstract schemaInstructions(tableName: string): Promise<SchemaInstructions | undefined>;
     createStatement(stmt: Statement, discardAfter: boolean): AsyncPreparedStatement;
@@ -78,7 +81,10 @@ declare class SyncWrapper extends AsyncDriver {
     executeQuery(query: QueryData, stmt?: AsyncPreparedStatement, params?: Array<any>): Promise<unknown>;
     prepareStatement(stmt: Statement, discardAfter: boolean): AsyncPreparedStatement;
     schemaInstructions(tableName: string): Promise<SchemaInstructions | undefined>;
-    isolate(): [connection: AsyncDriver, release: () => Promise<void>];
+    isolate(): Promise<[
+        connection: AsyncDriver,
+        release: () => Promise<void>
+    ]>;
 }
 interface AsyncPreparedStatement {
     run(params: Array<any>): Promise<{

package/dist/lib/Driver.js

@@ -307,8 +307,8 @@ class AsyncDriver extends DriverBase {
     }
   }
   async transaction(run) {
+    const [connection, release] = await this.isolate();
     const id = `t${this.transactionId++}`;
-    const [connection, release] = this.isolate();
     await connection.executeQuery(
       new QueryData.Transaction({ op: QueryData.TransactionOperation.Begin, id })
     );
@@ -377,12 +377,14 @@ class SyncWrapper extends AsyncDriver {
   async schemaInstructions(tableName) {
     return this.sync.schemaInstructions(tableName);
   }
-  isolate() {
+  async isolate() {
+    const currentLock = this.lock;
     const connection = new SyncWrapper(this.sync);
     let release, trigger = new Promise((resolve) => {
       release = async () => resolve();
     });
-    this.lock = Promise.resolve(this.lock).then(() => trigger);
+    this.lock = Promise.resolve(currentLock).then(() => trigger);
+    await currentLock;
     return [connection, release];
   }
 }

package/dist/sqlite/SqliteFormatter.js

@@ -49,6 +49,7 @@ class SqliteFormatter extends Formatter {
         stmt.raw(" MATCH ");
         this.formatExprValue(ctx, query);
         return stmt;
+      case "bm25":
       case "highlight":
       case "snippet":
         stmt.identifier(expr.method);

package/dist/sqlite/SqliteFunctions.d.ts

@@ -13,6 +13,8 @@ export type SqliteFunctions = {
     exists(cursor: Query<any>): Expr<boolean>;
     /** Use the match operator for the FTS5 module */
     match(table: Table<any>, searchTerm: EV<string>): Expr<boolean>;
+    /** Returns a real value reflecting the accuracy of the current match */
+    bm25(table: Table<any>, ...weights: Array<EV<number>>): Expr<number>;
     /** The highlight() function returns a copy of the text from a specified column of the current row with extra markup text inserted to mark the start and end of phrase matches. */
     highlight(table: Table<any>, index: EV<number>, insertBefore: EV<string>, insertAfter: EV<string>): Expr<string>;
     /** The snippet() function is similar to highlight(), except that instead of returning entire column values, it automatically selects and extracts a short fragment of document text to process and return. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",