@tursodatabase/database-common 0.6.0-pre.3 → 0.6.0-pre.31

package/dist/compat.d.ts

@@ -1,4 +1,4 @@
-import { NativeDatabase, NativeStatement } from "./types.js";
+import { NativeDatabase, NativeStatement, QueryOptions } from "./types.js";
 /**
  * Database represents a connection that can prepare and execute SQL statements.
  */
@@ -19,6 +19,7 @@ declare class Database {
      * @param {boolean} [opts.readonly=false] - Open the database in read-only mode.
      * @param {boolean} [opts.fileMustExist=false] - If true, throws if database file does not exist.
      * @param {number} [opts.timeout=0] - Timeout duration in milliseconds for database operations. Defaults to 0 (no timeout).
+     * @param {number} [opts.defaultQueryTimeout=0] - Default maximum query execution time in milliseconds before interruption.
      */
     constructor(db: NativeDatabase);
     /**
@@ -47,7 +48,7 @@ declare class Database {
      *
      * @param {string} sql - The string containing SQL statements to execute
      */
-    exec(sql: any): void;
+    exec(sql: any, queryOptions?: QueryOptions): void;
     /**
      * Interrupts the database connection.
      */

package/dist/compat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../compat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAgC,MAAM,YAAY,CAAC;AAyB3F;;GAEG;AACH,cAAM,QAAQ;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IAEvB,OAAO,CAAC,EAAE,CAAiB;IAC3B,OAAO,CAAC,cAAc,CAAkB;IAExC;;;;;;;;;OASG;gBACS,EAAE,EAAE,cAAc;IAa9B;;;;OAIG;IACH,OAAO,CAAC,GAAG,KAAA;IAeX;;;;OAIG;IACH,WAAW,CAAC,EAAE,KAAA;IAmCd,MAAM,CAAC,MAAM,KAAA,EAAE,OAAO,KAAA;IAoBtB,MAAM,CAAC,QAAQ,KAAA,EAAE,OAAO,KAAA;IAIxB,SAAS,CAAC,OAAO,KAAA;IAIjB,QAAQ,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,EAAE,EAAE,KAAA;IAI1B,SAAS,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA;IAIvB,KAAK,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA;IAInB,aAAa,CAAC,IAAI,KAAA;IAIlB,wBAAwB;IAIxB;;;;;OAKG;IACH,IAAI,CAAC,GAAG,KAAA;IAyBR;;OAEG;IACH,SAAS;IAIT;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,KAAA;IAI1B;;OAEG;IACH,KAAK;CAGN;AAED;;GAEG;AACH,cAAM,SAAS;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,EAAE,EAAE,cAAc,CAAC;gBAEP,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,cAAc;IAKrD;;;;OAIG;IACH,GAAG,CAAC,GAAG,KAAA;IAKP;;;;OAIG;IACH,KAAK,CAAC,SAAS,KAAA;IAKf;;;;OAIG;IACH,YAAY,CAAC,MAAM,KAAA;IAKnB;;;;OAIG;IACH,OAAO;IAIP,IAAI,MAAM,SAET;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,QAAQ,mBAEX;IAED;;OAEG;IACH,GAAG,CAAC,GAAG,cAAc,OAAA;;;;IA0BrB;;;;OAIG;IACH,GAAG,CAAC,GAAG,cAAc,OAAA;IAoBrB;;;;OAIG;IACF,OAAO,CAAC,GAAG,cAAc,OAAA;IAmB1B;;;;OAIG;IACH,GAAG,CAAC,GAAG,cAAc,OAAA;IAoBrB;;OAEG;IACH,SAAS;IAKT;;;;;OAKG;IACH,IAAI,CAAC,GAAG,cAAc,OAAA;IAStB,KAAK;CAGN;AAED,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../compat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAgC,MAAM,YAAY,CAAC;AAoDzG;;GAEG;AACH,cAAM,QAAQ;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IAEvB,OAAO,CAAC,EAAE,CAAiB;IAC3B,OAAO,CAAC,cAAc,CAAkB;IAExC;;;;;;;;;;OAUG;gBACS,EAAE,EAAE,cAAc;IAa9B;;;;OAIG;IACH,OAAO,CAAC,GAAG,KAAA;IAeX;;;;OAIG;IACH,WAAW,CAAC,EAAE,KAAA;IAmCd,MAAM,CAAC,MAAM,KAAA,EAAE,OAAO,KAAA;IAoBtB,MAAM,CAAC,QAAQ,KAAA,EAAE,OAAO,KAAA;IAIxB,SAAS,CAAC,OAAO,KAAA;IAIjB,QAAQ,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,EAAE,EAAE,KAAA;IAI1B,SAAS,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA;IAIvB,KAAK,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA;IAInB,aAAa,CAAC,IAAI,KAAA;IAIlB,wBAAwB;IAIxB;;;;;OAKG;IACH,IAAI,CAAC,GAAG,KAAA,EAAE,YAAY,CAAC,EAAE,YAAY;IAyBrC;;OAEG;IACH,SAAS;IAIT;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,KAAA;IAI1B;;OAEG;IACH,KAAK;CAGN;AAED;;GAEG;AACH,cAAM,SAAS;IACb,IAAI,EAAE,eAAe,CAAC;IACtB,EAAE,EAAE,cAAc,CAAC;gBAEP,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,cAAc;IAKrD;;;;OAIG;IACH,GAAG,CAAC,GAAG,KAAA;IAKP;;;;OAIG;IACH,KAAK,CAAC,SAAS,KAAA;IAKf;;;;OAIG;IACH,YAAY,CAAC,MAAM,KAAA;IAKnB;;;;OAIG;IACH,OAAO;IAIP,IAAI,MAAM,SAET;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,QAAQ,mBAEX;IAED;;OAEG;IACH,GAAG,CAAC,GAAG,cAAc,OAAA;;;;IA4BrB;;;;OAIG;IACH,GAAG,CAAC,GAAG,cAAc,OAAA;IAsBrB;;;;OAIG;IACF,OAAO,CAAC,GAAG,cAAc,OAAA;IAqB1B;;;;OAIG;IACH,GAAG,CAAC,GAAG,cAAc,OAAA;IAsBrB;;OAEG;IACH,SAAS;IAKT;;;;;OAKG;IACH,IAAI,CAAC,GAAG,cAAc,OAAA;IAStB,KAAK;CAGN;AAED,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA"}

package/dist/compat.js

@@ -16,6 +16,30 @@ function createErrorByName(name, message) {
     }
     return new ErrorConstructor(message);
 }
+function isQueryOptions(value) {
+    return value != null
+        && typeof value === "object"
+        && !Array.isArray(value)
+        && Object.prototype.hasOwnProperty.call(value, "queryTimeout");
+}
+function splitBindParameters(bindParameters) {
+    if (bindParameters.length === 0) {
+        return { params: undefined, queryOptions: undefined };
+    }
+    if (bindParameters.length > 1 && isQueryOptions(bindParameters[bindParameters.length - 1])) {
+        return {
+            params: bindParameters.length === 2 ? bindParameters[0] : bindParameters.slice(0, -1),
+            queryOptions: bindParameters[bindParameters.length - 1],
+        };
+    }
+    return { params: bindParameters.length === 1 ? bindParameters[0] : bindParameters, queryOptions: undefined };
+}
+function toBindArgs(params) {
+    if (params === undefined) {
+        return [];
+    }
+    return [params];
+}
 /**
  * Database represents a connection that can prepare and execute SQL statements.
  */
@@ -36,6 +60,7 @@ class Database {
      * @param {boolean} [opts.readonly=false] - Open the database in read-only mode.
      * @param {boolean} [opts.fileMustExist=false] - If true, throws if database file does not exist.
      * @param {number} [opts.timeout=0] - Timeout duration in milliseconds for database operations. Defaults to 0 (no timeout).
+     * @param {number} [opts.defaultQueryTimeout=0] - Default maximum query execution time in milliseconds before interruption.
      */
     constructor(db) {
         this.db = db;
@@ -150,11 +175,11 @@ class Database {
      *
      * @param {string} sql - The string containing SQL statements to execute
      */
-    exec(sql) {
+    exec(sql, queryOptions) {
         if (!this.open) {
             throw new TypeError("The database connection is not open");
         }
-        const exec = this.db.executor(sql);
+        const exec = this.db.executor(sql, queryOptions);
         try {
             while (true) {
                 const stepResult = exec.stepSync();
@@ -255,8 +280,10 @@ class Statement {
      */
     run(...bindParameters) {
         const totalChangesBefore = this.db.totalChanges();
+        const { params, queryOptions } = splitBindParameters(bindParameters);
         this.stmt.reset();
-        bindParams(this.stmt, bindParameters);
+        this.stmt.setQueryTimeout(queryOptions);
+        bindParams(this.stmt, toBindArgs(params));
         for (;;) {
             const stepResult = this.stmt.stepSync();
             if (stepResult === STEP_IO) {
@@ -281,8 +308,10 @@ class Statement {
      * @param bindParameters - The bind parameters for executing the statement.
      */
     get(...bindParameters) {
+        const { params, queryOptions } = splitBindParameters(bindParameters);
         this.stmt.reset();
-        bindParams(this.stmt, bindParameters);
+        this.stmt.setQueryTimeout(queryOptions);
+        bindParams(this.stmt, toBindArgs(params));
         let row = undefined;
         for (;;) {
             const stepResult = this.stmt.stepSync();
@@ -305,8 +334,10 @@ class Statement {
      * @param bindParameters - The bind parameters for executing the statement.
      */
     *iterate(...bindParameters) {
+        const { params, queryOptions } = splitBindParameters(bindParameters);
         this.stmt.reset();
-        bindParams(this.stmt, bindParameters);
+        this.stmt.setQueryTimeout(queryOptions);
+        bindParams(this.stmt, toBindArgs(params));
         while (true) {
             const stepResult = this.stmt.stepSync();
             if (stepResult === STEP_IO) {
@@ -327,8 +358,10 @@ class Statement {
      * @param bindParameters - The bind parameters for executing the statement.
      */
     all(...bindParameters) {
+        const { params, queryOptions } = splitBindParameters(bindParameters);
         this.stmt.reset();
-        bindParams(this.stmt, bindParameters);
+        this.stmt.setQueryTimeout(queryOptions);
+        bindParams(this.stmt, toBindArgs(params));
         const rows = [];
         for (;;) {
             const stepResult = this.stmt.stepSync();

package/dist/promise.d.ts

@@ -1,5 +1,5 @@
 import { AsyncLock } from "./async-lock.js";
-import { NativeDatabase, NativeStatement } from "./types.js";
+import { NativeDatabase, NativeStatement, QueryOptions } from "./types.js";
 /**
  * Database represents a connection that can prepare and execute SQL statements.
  */
@@ -24,13 +24,44 @@ declare class Database {
      *
      * @param {string} sql - The SQL statement string to prepare.
      */
-    prepare(sql: any): Statement;
+    prepare(sql: string): Promise<Statement>;
     /**
      * Returns a function that executes the given function in a transaction.
      *
      * @param {function} fn - The function to wrap in a transaction.
      */
     transaction(fn: (...any: any[]) => Promise<any>): (...bindParameters: any[]) => Promise<any>;
+    /**
+     * Prepares the SQL and executes it as `Statement.run`, returning the run info.
+     *
+     * @param {string} sql - The SQL statement string.
+     * @param {...any} bindParameters - Bind parameters, optionally followed by a query options object.
+     */
+    run(sql: any, ...bindParameters: any[]): Promise<{
+        changes: number;
+        lastInsertRowid: number;
+    }>;
+    /**
+     * Prepares the SQL and executes it as `Statement.get`, returning the first row.
+     *
+     * @param {string} sql - The SQL statement string.
+     * @param {...any} bindParameters - Bind parameters, optionally followed by a query options object.
+     */
+    get(sql: any, ...bindParameters: any[]): Promise<any>;
+    /**
+     * Prepares the SQL and executes it as `Statement.all`, returning all rows.
+     *
+     * @param {string} sql - The SQL statement string.
+     * @param {...any} bindParameters - Bind parameters, optionally followed by a query options object.
+     */
+    all(sql: any, ...bindParameters: any[]): Promise<any[]>;
+    /**
+     * Prepares the SQL and executes it as `Statement.iterate`, yielding each row.
+     *
+     * @param {string} sql - The SQL statement string.
+     * @param {...any} bindParameters - Bind parameters, optionally followed by a query options object.
+     */
+    iterate(sql: any, ...bindParameters: any[]): AsyncGenerator<any, void, unknown>;
     pragma(source: any, options: any): Promise<any[]>;
     backup(filename: any, options: any): void;
     serialize(options: any): void;
@@ -45,7 +76,7 @@ declare class Database {
      *
      * @param {string} sql - The string containing SQL statements to execute
      */
-    exec(sql: any): Promise<void>;
+    exec(sql: any, queryOptions?: QueryOptions): Promise<void>;
     /**
      * Interrupts the database connection.
      */

package/dist/promise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promise.d.ts","sourceRoot":"","sources":["../promise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,cAAc,EAAE,eAAe,EAA8C,MAAM,YAAY,CAAC;AAyBzG;;GAEG;AACH,cAAM,QAAQ;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,aAAa,EAAE,OAAO,CAAC;IAEvB,OAAO,CAAC,EAAE,CAAiB;IAC3B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,cAAc,CAAkB;IACxC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;gBAEzB,EAAE,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAa5D;;OAEG;IACG,OAAO;IAMb;;;;OAIG;IACH,OAAO,CAAC,GAAG,KAAA;IAqBX;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,OAAA,KAAK,OAAO,CAAC,GAAG,CAAC;IAmClC,MAAM,CAAC,MAAM,KAAA,EAAE,OAAO,KAAA;IAoB5B,MAAM,CAAC,QAAQ,KAAA,EAAE,OAAO,KAAA;IAIxB,SAAS,CAAC,OAAO,KAAA;IAIjB,QAAQ,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,EAAE,EAAE,KAAA;IAI1B,SAAS,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA;IAIvB,KAAK,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA;IAInB,aAAa,CAAC,IAAI,KAAA;IAIlB,wBAAwB;IAIxB;;;;;OAKG;IACG,IAAI,CAAC,GAAG,KAAA;IA2Bd;;OAEG;IACH,SAAS;IAIT;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,KAAA;IAI1B;;OAEG;IACG,KAAK;IAIL,EAAE;CAMT;AAED,UAAU,SAAS,CAAC,CAAC;IACnB,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,OAAE;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,IAAI,CAAC,CAAC;CACX;AAED,iBAAS,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAgC5D;AAED,iBAAS,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAM7C;AAED;;GAEG;AACH,cAAM,SAAS;IACb,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,EAAE,CAAiB;IAC3B,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,MAAM,CAAsB;gBAExB,IAAI,EAAE,SAAS,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAOlH;;;;OAIG;IACH,GAAG,CAAC,GAAG,KAAA;IAKP;;;;OAIG;IACH,KAAK,CAAC,SAAS,KAAA;IAKf;;;;OAIG;IACH,YAAY,CAAC,MAAM,KAAA;IAKnB;;;;OAIG;IACH,OAAO;IAIP,IAAI,MAAM,SAET;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,QAAQ,mBAEX;IAED;;OAEG;IACG,GAAG,CAAC,GAAG,cAAc,OAAA;;;;IAiC3B;;;;OAIG;IACG,GAAG,CAAC,GAAG,cAAc,OAAA;IA6B3B;;;;OAIG;IACI,OAAO,CAAC,GAAG,cAAc,OAAA;IA0BhC;;;;OAIG;IACG,GAAG,CAAC,GAAG,cAAc,OAAA;IA6BrB,EAAE;IAIR;;OAEG;IACH,SAAS;IAKT;;;;;OAKG;IACH,IAAI,CAAC,GAAG,cAAc,OAAA;IAStB,KAAK;CAUN;AAED,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"promise.d.ts","sourceRoot":"","sources":["../promise.ts"],"names":[],"mappings":"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"}

package/dist/promise.js

@@ -17,6 +17,30 @@ function createErrorByName(name, message) {
     }
     return new ErrorConstructor(message);
 }
+function isQueryOptions(value) {
+    return value != null
+        && typeof value === "object"
+        && !Array.isArray(value)
+        && Object.prototype.hasOwnProperty.call(value, "queryTimeout");
+}
+function splitBindParameters(bindParameters) {
+    if (bindParameters.length === 0) {
+        return { params: undefined, queryOptions: undefined };
+    }
+    if (bindParameters.length > 1 && isQueryOptions(bindParameters[bindParameters.length - 1])) {
+        return {
+            params: bindParameters.length === 2 ? bindParameters[0] : bindParameters.slice(0, -1),
+            queryOptions: bindParameters[bindParameters.length - 1],
+        };
+    }
+    return { params: bindParameters.length === 1 ? bindParameters[0] : bindParameters, queryOptions: undefined };
+}
+function toBindArgs(params) {
+    if (params === undefined) {
+        return [];
+    }
+    return [params];
+}
 /**
  * Database represents a connection that can prepare and execute SQL statements.
  */
@@ -118,6 +142,66 @@ class Database {
         Object.defineProperties(properties.exclusive.value, properties);
         return properties.default.value;
     }
+    /**
+     * Prepares the SQL and executes it as `Statement.run`, returning the run info.
+     *
+     * @param {string} sql - The SQL statement string.
+     * @param {...any} bindParameters - Bind parameters, optionally followed by a query options object.
+     */
+    async run(sql, ...bindParameters) {
+        const stmt = await this.prepare(sql);
+        try {
+            return await stmt.run(...bindParameters);
+        }
+        finally {
+            await stmt.close();
+        }
+    }
+    /**
+     * Prepares the SQL and executes it as `Statement.get`, returning the first row.
+     *
+     * @param {string} sql - The SQL statement string.
+     * @param {...any} bindParameters - Bind parameters, optionally followed by a query options object.
+     */
+    async get(sql, ...bindParameters) {
+        const stmt = await this.prepare(sql);
+        try {
+            return await stmt.get(...bindParameters);
+        }
+        finally {
+            await stmt.close();
+        }
+    }
+    /**
+     * Prepares the SQL and executes it as `Statement.all`, returning all rows.
+     *
+     * @param {string} sql - The SQL statement string.
+     * @param {...any} bindParameters - Bind parameters, optionally followed by a query options object.
+     */
+    async all(sql, ...bindParameters) {
+        const stmt = await this.prepare(sql);
+        try {
+            return await stmt.all(...bindParameters);
+        }
+        finally {
+            await stmt.close();
+        }
+    }
+    /**
+     * Prepares the SQL and executes it as `Statement.iterate`, yielding each row.
+     *
+     * @param {string} sql - The SQL statement string.
+     * @param {...any} bindParameters - Bind parameters, optionally followed by a query options object.
+     */
+    async *iterate(sql, ...bindParameters) {
+        const stmt = await this.prepare(sql);
+        try {
+            yield* stmt.iterate(...bindParameters);
+        }
+        finally {
+            await stmt.close();
+        }
+    }
     async pragma(source, options) {
         if (options == null)
             options = {};
@@ -126,7 +210,7 @@ class Database {
         if (typeof options !== "object")
             throw new TypeError("Expected second argument to be an options object");
         const pragma = `PRAGMA ${source}`;
-        const stmt = this.prepare(pragma);
+        const stmt = await this.prepare(pragma);
         try {
             const results = await stmt.all();
             return results;
@@ -162,12 +246,12 @@ class Database {
      *
      * @param {string} sql - The string containing SQL statements to execute
      */
-    async exec(sql) {
+    async exec(sql, queryOptions) {
         if (!this.open) {
             throw new TypeError("The database connection is not open");
         }
         await this.execLock.acquire();
-        const exec = this.db.executor(sql);
+        const exec = this.db.executor(sql, queryOptions);
         try {
             while (true) {
                 const stepResult = exec.stepSync();
@@ -319,7 +403,9 @@ class Statement {
      */
     async run(...bindParameters) {
         let stmt = await this.stmt.resolve();
-        bindParams(stmt, bindParameters);
+        const { params, queryOptions } = splitBindParameters(bindParameters);
+        stmt.setQueryTimeout(queryOptions);
+        bindParams(stmt, toBindArgs(params));
         const totalChangesBefore = this.db.totalChanges();
         await this.execLock.acquire();
         try {
@@ -353,7 +439,9 @@ class Statement {
      */
     async get(...bindParameters) {
         let stmt = await this.stmt.resolve();
-        bindParams(stmt, bindParameters);
+        const { params, queryOptions } = splitBindParameters(bindParameters);
+        stmt.setQueryTimeout(queryOptions);
+        bindParams(stmt, toBindArgs(params));
         await this.execLock.acquire();
         let row = undefined;
         try {
@@ -385,7 +473,9 @@ class Statement {
      */
     async *iterate(...bindParameters) {
         let stmt = await this.stmt.resolve();
-        bindParams(stmt, bindParameters);
+        const { params, queryOptions } = splitBindParameters(bindParameters);
+        stmt.setQueryTimeout(queryOptions);
+        bindParams(stmt, toBindArgs(params));
         await this.execLock.acquire();
         try {
             while (true) {
@@ -414,7 +504,9 @@ class Statement {
      */
     async all(...bindParameters) {
         let stmt = await this.stmt.resolve();
-        bindParams(stmt, bindParameters);
+        const { params, queryOptions } = splitBindParameters(bindParameters);
+        stmt.setQueryTimeout(queryOptions);
+        bindParams(stmt, toBindArgs(params));
         const rows = [];
         await this.execLock.acquire();
         try {

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-export type ExperimentalFeature = 'views' | 'strict' | 'encryption' | 'index_method' | 'autovacuum' | 'triggers' | 'attach';
+export type ExperimentalFeature = 'views' | 'strict' | 'encryption' | 'index_method' | 'autovacuum' | 'vacuum' | 'triggers' | 'attach' | 'multiprocess_wal' | 'without_rowid';
 /** Supported encryption ciphers for local database encryption. */
 export type EncryptionCipher = 'aes128gcm' | 'aes256gcm' | 'aegis256' | 'aegis256x2' | 'aegis128l' | 'aegis128x2' | 'aegis128x4';
 /** Encryption configuration for local encryption. */
@@ -11,12 +11,18 @@ export interface DatabaseOpts {
     readonly?: boolean;
     fileMustExist?: boolean;
     timeout?: number;
+    /** Default maximum query execution time in milliseconds before interruption. */
+    defaultQueryTimeout?: number;
     tracing?: 'info' | 'debug' | 'trace';
     /** Experimental features to enable */
     experimental?: ExperimentalFeature[];
     /** Optional local encryption configuration */
     encryption?: EncryptionOpts;
 }
+export interface QueryOptions {
+    /** Per-query timeout in milliseconds. Overrides defaultQueryTimeout for this call. */
+    queryTimeout?: number;
+}
 export interface NativeDatabase {
     memory: boolean;
     path: string;
@@ -28,7 +34,7 @@ export interface NativeDatabase {
     ioLoopSync(): any;
     ioLoopAsync(): Promise<void>;
     prepare(sql: string): NativeStatement;
-    executor(sql: string): NativeExecutor;
+    executor(sql: string, queryOptions?: QueryOptions): NativeExecutor;
     defaultSafeIntegers(toggle: boolean): any;
     totalChanges(): number;
     changes(): number;
@@ -40,13 +46,17 @@ export declare const STEP_DONE = 2;
 export declare const STEP_IO = 3;
 export interface TableColumn {
     name: string;
-    type: string;
+    type: string | null;
+    column: null;
+    table: null;
+    database: null;
 }
 export interface NativeExecutor {
     stepSync(): number;
     reset(): any;
 }
 export interface NativeStatement {
+    setQueryTimeout(queryOptions?: QueryOptions): void;
     stepAsync(): Promise<number>;
     stepSync(): number;
     pluck(pluckMode: boolean): any;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,GAAG,cAAc,GAAG,YAAY,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE5H,kEAAkE;AAClE,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,WAAW,GAAG,YAAY,GAAG,YAAY,CAAA;AAEhI,qDAAqD;AACrD,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,gBAAgB,CAAA;IACxB,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;IACpC,sCAAsC;IACtC,YAAY,CAAC,EAAE,mBAAmB,EAAE,CAAA;IACpC,8CAA8C;IAC9C,UAAU,CAAC,EAAE,cAAc,CAAA;CAC9B;AAED,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,KAAI,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC;IAElC,WAAW,QAAG;IACd,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B,UAAU,QAAG;IACb,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;IAEtC,mBAAmB,CAAC,MAAM,EAAE,OAAO,OAAE;IACrC,YAAY,IAAI,MAAM,CAAC;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,eAAe,IAAI,MAAM,CAAC;IAC1B,KAAK,QAAG;CACX;AAID,eAAO,MAAM,QAAQ,IAAI,CAAC;AAC1B,eAAO,MAAM,SAAS,IAAI,CAAC;AAC3B,eAAO,MAAM,OAAO,IAAI,CAAC;AAEzB,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,IAAI,MAAM,CAAC;IACnB,KAAK,QAAG;CACX;AACD,MAAM,WAAW,eAAe;IAC5B,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,IAAI,MAAM,CAAC;IAEnB,KAAK,CAAC,SAAS,EAAE,OAAO,OAAE;IAC1B,YAAY,CAAC,MAAM,EAAE,OAAO,OAAE;IAC9B,GAAG,CAAC,MAAM,EAAE,OAAO,OAAE;IACrB,OAAO,IAAI,WAAW,EAAE,CAAC;IACzB,GAAG,IAAI,GAAG,CAAC;IACX,KAAK,QAAG;IACR,QAAQ,QAAG;CACd"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,GAAG,cAAc,GAAG,YAAY,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAE9K,kEAAkE;AAClE,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,WAAW,GAAG,YAAY,GAAG,YAAY,CAAA;AAEhI,qDAAqD;AACrD,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,gBAAgB,CAAA;IACxB,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,gFAAgF;IAChF,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;IACpC,sCAAsC;IACtC,YAAY,CAAC,EAAE,mBAAmB,EAAE,CAAA;IACpC,8CAA8C;IAC9C,UAAU,CAAC,EAAE,cAAc,CAAA;CAC9B;AAED,MAAM,WAAW,YAAY;IACzB,sFAAsF;IACtF,YAAY,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,KAAI,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC;IAElC,WAAW,QAAG;IACd,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B,UAAU,QAAG;IACb,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;IACtC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY,GAAG,cAAc,CAAC;IAEnE,mBAAmB,CAAC,MAAM,EAAE,OAAO,OAAE;IACrC,YAAY,IAAI,MAAM,CAAC;IACvB,OAAO,IAAI,MAAM,CAAC;IAClB,eAAe,IAAI,MAAM,CAAC;IAC1B,KAAK,QAAG;CACX;AAID,eAAO,MAAM,QAAQ,IAAI,CAAC;AAC1B,eAAO,MAAM,SAAS,IAAI,CAAC;AAC3B,eAAO,MAAM,OAAO,IAAI,CAAC;AAEzB,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,IAAI,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;IACZ,QAAQ,EAAE,IAAI,CAAA;CACjB;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,IAAI,MAAM,CAAC;IACnB,KAAK,QAAG;CACX;AACD,MAAM,WAAW,eAAe;IAC5B,eAAe,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACnD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,IAAI,MAAM,CAAC;IAEnB,KAAK,CAAC,SAAS,EAAE,OAAO,OAAE;IAC1B,YAAY,CAAC,MAAM,EAAE,OAAO,OAAE;IAC9B,GAAG,CAAC,MAAM,EAAE,OAAO,OAAE;IACrB,OAAO,IAAI,WAAW,EAAE,CAAC;IACzB,GAAG,IAAI,GAAG,CAAC;IACX,KAAK,QAAG;IACR,QAAQ,QAAG;CACd"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tursodatabase/database-common",
-  "version": "0.6.0-pre.3",
+  "version": "0.6.0-pre.31",
   "repository": {
     "type": "git",
     "url": "https://github.com/tursodatabase/turso"