@atscript/db-sqlite 0.1.150 → 0.1.152

package/dist/index.cjs

@@ -6,6 +6,18 @@ let _atscript_db_sql_tools = require("@atscript/db-sql-tools");
 let _uniqu_core = require("@uniqu/core");
 let node_async_hooks = require("node:async_hooks");
 //#region src/better-sqlite3-driver.ts
+const DEFAULT_STATEMENT_CACHE_SIZE = 256;
+/** SQL longer than this is prepared per call (long `$in` lists, multi-row inserts). */
+const MAX_CACHED_SQL_LENGTH = 8192;
+/** Schema introspection (`PRAGMA …`) is never cached: it is cold, and a pragma may bake schema state in at prepare time. */
+const PRAGMA_RE = /^\s*pragma\b/i;
+/** Transaction-control statements `exec` runs through a statement prepared once. */
+const TX_CONTROL_SQL = new Set([
+	"BEGIN",
+	"BEGIN IMMEDIATE",
+	"COMMIT",
+	"ROLLBACK"
+]);
 /**
 * {@link TSqliteDriver} implementation backed by `better-sqlite3`.
 *
@@ -43,8 +55,12 @@ let node_async_hooks = require("node:async_hooks");
 var BetterSqlite3Driver = class {
 	db;
 	hasVectorExt = false;
+	/** LRU of prepared statements by SQL text (Map insertion order = recency). */
+	_stmts = /* @__PURE__ */ new Map();
+	_maxStmts;
 	constructor(pathOrDb, options) {
-		const { vector, loadExtensions, ...nativeOptions } = options ?? {};
+		const { vector, loadExtensions, statementCacheSize, ...nativeOptions } = options ?? {};
+		this._maxStmts = Math.max(0, statementCacheSize ?? DEFAULT_STATEMENT_CACHE_SIZE);
 		const req = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 		if (typeof pathOrDb === "string") {
 			const Database = req("better-sqlite3");
@@ -56,8 +72,28 @@ var BetterSqlite3Driver = class {
 			this.hasVectorExt = true;
 		}
 	}
-	run(sql, params) {
+	/**
+	* The prepared statement for `sql` — reused from the LRU cache when present.
+	* A cached statement stays valid across schema changes: SQLite re-prepares
+	* it transparently on its next step (and `exec` — the DDL path — clears the
+	* cache anyway).
+	*/
+	_prepare(sql) {
+		const cached = this._stmts.get(sql);
+		if (cached !== void 0) {
+			this._stmts.delete(sql);
+			this._stmts.set(sql, cached);
+			return cached;
+		}
 		const stmt = this.db.prepare(sql);
+		if (this._maxStmts > 0 && sql.length <= MAX_CACHED_SQL_LENGTH && !PRAGMA_RE.test(sql)) {
+			this._stmts.set(sql, stmt);
+			if (this._stmts.size > this._maxStmts) this._stmts.delete(this._stmts.keys().next().value);
+		}
+		return stmt;
+	}
+	run(sql, params) {
+		const stmt = this._prepare(sql);
 		const result = params ? stmt.run(...params) : stmt.run();
 		return {
 			changes: result.changes,
@@ -65,21 +101,27 @@ var BetterSqlite3Driver = class {
 		};
 	}
 	all(sql, params) {
-		const stmt = this.db.prepare(sql);
+		const stmt = this._prepare(sql);
 		return params ? stmt.all(...params) : stmt.all();
 	}
 	get(sql, params) {
-		const stmt = this.db.prepare(sql);
+		const stmt = this._prepare(sql);
 		return (params ? stmt.get(...params) : stmt.get()) ?? null;
 	}
 	exec(sql) {
+		if (TX_CONTROL_SQL.has(sql)) {
+			this._prepare(sql).run();
+			return;
+		}
 		this.db.exec(sql);
+		this._stmts.clear();
 	}
 	registerFunction(name, fn, opts) {
 		this.db.function(name, { deterministic: opts?.deterministic ?? false }, fn);
 	}
 	/** Idempotent: closing an already closed database is a no-op. */
 	close() {
+		this._stmts.clear();
 		if (!this.db.open) return;
 		this.db.close();
 	}
@@ -330,16 +372,6 @@ function haversineDistanceExpr(quotedCol, point) {
 	};
 }
 /**
-* Builds an INSERT statement.
-*
-* @param table - Table name.
-* @param data - Column→value map.
-* @returns `{ sql, params }` ready for `driver.run()`.
-*/
-function buildInsert(table, data) {
-	return (0, _atscript_db_sql_tools.buildInsert)(sqliteDialect, table, data);
-}
-/**
 * Builds a SELECT statement with optional sort, limit, offset, projection.
 */
 function buildSelect(table, where, controls) {
@@ -765,6 +797,8 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	viewCapabilities() {
 		return _atscript_db.ALL_VIEW_CAPABILITIES;
 	}
+	/** INSERT text per column signature (rows of one table share a handful of shapes). */
+	_insertSql = new _atscript_db_sql_tools.InsertSqlCache(sqliteDialect);
 	/** Whether the SQLite connection has the sqlite-vec extension loaded. */
 	_supportsVector;
 	/** Whether SQLite math functions (radians/asin/...) are available — geo search. */
@@ -963,20 +997,31 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		}
 	}
 	async insertOne(data) {
-		const { sql, params } = buildInsert(this.resolveTableName(), data);
+		const { sql, params } = this._insertSql.build(this.resolveTableName(), data);
 		this._log(sql, params);
 		const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
 		return { insertedId: this._resolveInsertedId(data, result.lastInsertRowid) };
 	}
 	async insertMany(data) {
+		if (data.length === 1) {
+			const { insertedId } = await this.insertOne(data[0]);
+			return {
+				insertedCount: 1,
+				insertedIds: [insertedId]
+			};
+		}
 		return this.withTransaction(async () => {
-			const ids = [];
-			for (const row of data) {
-				const { sql, params } = buildInsert(this.resolveTableName(), row);
-				this._log(sql, params);
-				const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
-				ids.push(this._resolveInsertedId(row, result.lastInsertRowid));
-			}
+			const tableName = this.resolveTableName();
+			const ids = await this._stmt(() => {
+				const out = [];
+				for (const row of data) {
+					const { sql, params } = this._insertSql.build(tableName, row);
+					this._log(sql, params);
+					const result = this._wrapConstraintError(() => this.driver.run(sql, params));
+					out.push(this._resolveInsertedId(row, result.lastInsertRowid));
+				}
+				return out;
+			});
 			return {
 				insertedCount: ids.length,
 				insertedIds: ids
@@ -996,7 +1041,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 			const slots = [];
 			const tableName = this.resolveTableName();
 			for (const row of data) {
-				const built = buildInsert(tableName, row);
+				const built = this._insertSql.build(tableName, row);
 				const sql = `${built.sql} ON CONFLICT DO NOTHING`;
 				const params = built.params;
 				this._log(sql, params);
@@ -1032,6 +1077,24 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(sql, params);
 		return (0, _atscript_db_sql_tools.stripPartitionRowNumber)(await this._stmt(() => this.driver.all(sql, params)));
 	}
+	/**
+	* Page + total in one synchronous segment: the filter's WHERE is built once
+	* for both statements, and both read the same snapshot. A subclass that
+	* overrides `findMany` / `count` keeps the base behaviour (both through them).
+	*/
+	async findManyWithCount(query) {
+		if (this.findMany !== SqliteAdapter.prototype.findMany || this.count !== SqliteAdapter.prototype.count) return super.findManyWithCount(query);
+		const where = buildWhere(query.filter);
+		const tableName = this.resolveTableName();
+		const { sql, params } = buildSelect(tableName, where, query.controls);
+		const countSql = `SELECT COUNT(*) as cnt FROM "${esc(tableName)}" WHERE ${where.sql}`;
+		this._log(sql, params);
+		this._log(countSql, where.params);
+		return this._stmt(() => ({
+			data: this.driver.all(sql, params),
+			count: this.driver.get(countSql, where.params)?.cnt ?? 0
+		}));
+	}
 	async count(query) {
 		const where = buildWhere(query.filter);
 		const sql = `SELECT COUNT(*) as cnt FROM "${esc(this.resolveTableName())}" WHERE ${where.sql}`;

package/dist/index.d.cts

@@ -75,6 +75,13 @@ interface TBetterSqlite3DriverOptions extends Record<string, unknown> {
   vector?: boolean;
   /** Absolute paths to SQLite loadable extensions, passed to `Database.loadExtension`. */
   loadExtensions?: string[];
+  /**
+   * Max prepared statements kept per connection (least-recently-used evicted).
+   * `run` / `all` / `get` reuse the statement prepared for the same SQL text
+   * instead of preparing it on every call. Default: 256; `0` disables the cache.
+   * @since 0.1.151
+   */
+  statementCacheSize?: number;
 }
 /**
  * {@link TSqliteDriver} implementation backed by `better-sqlite3`.
@@ -113,7 +120,17 @@ interface TBetterSqlite3DriverOptions extends Record<string, unknown> {
 declare class BetterSqlite3Driver implements TSqliteDriver {
   private db;
   readonly hasVectorExt: boolean;
+  /** LRU of prepared statements by SQL text (Map insertion order = recency). */
+  private readonly _stmts;
+  private readonly _maxStmts;
   constructor(pathOrDb: string | import("better-sqlite3").Database, options?: TBetterSqlite3DriverOptions);
+  /**
+   * The prepared statement for `sql` — reused from the LRU cache when present.
+   * A cached statement stays valid across schema changes: SQLite re-prepares
+   * it transparently on its next step (and `exec` — the DDL path — clears the
+   * cache anyway).
+   */
+  private _prepare;
   run(sql: string, params?: unknown[]): TSqliteRunResult;
   all<T = Record<string, unknown>>(sql: string, params?: unknown[]): T[];
   get<T = Record<string, unknown>>(sql: string, params?: unknown[]): T | null;
@@ -274,6 +291,8 @@ declare class SqliteAdapter extends BaseDbAdapter {
   supportsAggregateExpressions(): boolean;
   /** Computed view columns and first-row joins. */
   viewCapabilities(): ReadonlySet<TViewCapability>;
+  /** INSERT text per column signature (rows of one table share a handful of shapes). */
+  private readonly _insertSql;
   /** Whether the SQLite connection has the sqlite-vec extension loaded. */
   private _supportsVector;
   /** Whether SQLite math functions (radians/asin/...) are available — geo search. */
@@ -355,6 +374,15 @@ declare class SqliteAdapter extends BaseDbAdapter {
    * window over `partitionBy` (the generic `$with` loader's per-parent page).
    */
   findManyPerPartition(query: DbQuery, partitionBy: readonly string[]): Promise<Array<Record<string, unknown>>>;
+  /**
+   * Page + total in one synchronous segment: the filter's WHERE is built once
+   * for both statements, and both read the same snapshot. A subclass that
+   * overrides `findMany` / `count` keeps the base behaviour (both through them).
+   */
+  findManyWithCount(query: DbQuery): Promise<{
+    data: Array<Record<string, unknown>>;
+    count: number;
+  }>;
   count(query: DbQuery): Promise<number>;
   aggregate(query: DbQuery): Promise<Array<Record<string, unknown>>>;
   updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;

package/dist/index.d.mts

@@ -75,6 +75,13 @@ interface TBetterSqlite3DriverOptions extends Record<string, unknown> {
   vector?: boolean;
   /** Absolute paths to SQLite loadable extensions, passed to `Database.loadExtension`. */
   loadExtensions?: string[];
+  /**
+   * Max prepared statements kept per connection (least-recently-used evicted).
+   * `run` / `all` / `get` reuse the statement prepared for the same SQL text
+   * instead of preparing it on every call. Default: 256; `0` disables the cache.
+   * @since 0.1.151
+   */
+  statementCacheSize?: number;
 }
 /**
  * {@link TSqliteDriver} implementation backed by `better-sqlite3`.
@@ -113,7 +120,17 @@ interface TBetterSqlite3DriverOptions extends Record<string, unknown> {
 declare class BetterSqlite3Driver implements TSqliteDriver {
   private db;
   readonly hasVectorExt: boolean;
+  /** LRU of prepared statements by SQL text (Map insertion order = recency). */
+  private readonly _stmts;
+  private readonly _maxStmts;
   constructor(pathOrDb: string | import("better-sqlite3").Database, options?: TBetterSqlite3DriverOptions);
+  /**
+   * The prepared statement for `sql` — reused from the LRU cache when present.
+   * A cached statement stays valid across schema changes: SQLite re-prepares
+   * it transparently on its next step (and `exec` — the DDL path — clears the
+   * cache anyway).
+   */
+  private _prepare;
   run(sql: string, params?: unknown[]): TSqliteRunResult;
   all<T = Record<string, unknown>>(sql: string, params?: unknown[]): T[];
   get<T = Record<string, unknown>>(sql: string, params?: unknown[]): T | null;
@@ -274,6 +291,8 @@ declare class SqliteAdapter extends BaseDbAdapter {
   supportsAggregateExpressions(): boolean;
   /** Computed view columns and first-row joins. */
   viewCapabilities(): ReadonlySet<TViewCapability>;
+  /** INSERT text per column signature (rows of one table share a handful of shapes). */
+  private readonly _insertSql;
   /** Whether the SQLite connection has the sqlite-vec extension loaded. */
   private _supportsVector;
   /** Whether SQLite math functions (radians/asin/...) are available — geo search. */
@@ -355,6 +374,15 @@ declare class SqliteAdapter extends BaseDbAdapter {
    * window over `partitionBy` (the generic `$with` loader's per-parent page).
    */
   findManyPerPartition(query: DbQuery, partitionBy: readonly string[]): Promise<Array<Record<string, unknown>>>;
+  /**
+   * Page + total in one synchronous segment: the filter's WHERE is built once
+   * for both statements, and both read the same snapshot. A subclass that
+   * overrides `findMany` / `count` keeps the base behaviour (both through them).
+   */
+  findManyWithCount(query: DbQuery): Promise<{
+    data: Array<Record<string, unknown>>;
+    count: number;
+  }>;
   count(query: DbQuery): Promise<number>;
   aggregate(query: DbQuery): Promise<Array<Record<string, unknown>>>;
   updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;

package/dist/index.mjs

@@ -1,10 +1,22 @@
 import { createRequire } from "node:module";
 import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, defaultFulltextIndex, describeFulltext, fkColumns, searchIndexNotFoundMessage, searchTermInteger, splitFulltextFields, vectorIndexNotFoundMessage } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { EMPTY_AND, SEARCH_SOURCE_ALIAS, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, geoWindowFromControls, jsonDollarPath, orFragment, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, stripPartitionRowNumber, toSqlValue } from "@atscript/db-sql-tools";
+import { EMPTY_AND, InsertSqlCache, SEARCH_SOURCE_ALIAS, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, geoWindowFromControls, jsonDollarPath, orFragment, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, stripPartitionRowNumber, toSqlValue } from "@atscript/db-sql-tools";
 import { bucketer } from "@uniqu/core";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/better-sqlite3-driver.ts
+const DEFAULT_STATEMENT_CACHE_SIZE = 256;
+/** SQL longer than this is prepared per call (long `$in` lists, multi-row inserts). */
+const MAX_CACHED_SQL_LENGTH = 8192;
+/** Schema introspection (`PRAGMA …`) is never cached: it is cold, and a pragma may bake schema state in at prepare time. */
+const PRAGMA_RE = /^\s*pragma\b/i;
+/** Transaction-control statements `exec` runs through a statement prepared once. */
+const TX_CONTROL_SQL = new Set([
+	"BEGIN",
+	"BEGIN IMMEDIATE",
+	"COMMIT",
+	"ROLLBACK"
+]);
 /**
 * {@link TSqliteDriver} implementation backed by `better-sqlite3`.
 *
@@ -42,8 +54,12 @@ import { AsyncLocalStorage } from "node:async_hooks";
 var BetterSqlite3Driver = class {
 	db;
 	hasVectorExt = false;
+	/** LRU of prepared statements by SQL text (Map insertion order = recency). */
+	_stmts = /* @__PURE__ */ new Map();
+	_maxStmts;
 	constructor(pathOrDb, options) {
-		const { vector, loadExtensions, ...nativeOptions } = options ?? {};
+		const { vector, loadExtensions, statementCacheSize, ...nativeOptions } = options ?? {};
+		this._maxStmts = Math.max(0, statementCacheSize ?? DEFAULT_STATEMENT_CACHE_SIZE);
 		const req = createRequire(import.meta.url);
 		if (typeof pathOrDb === "string") {
 			const Database = req("better-sqlite3");
@@ -55,8 +71,28 @@ var BetterSqlite3Driver = class {
 			this.hasVectorExt = true;
 		}
 	}
-	run(sql, params) {
+	/**
+	* The prepared statement for `sql` — reused from the LRU cache when present.
+	* A cached statement stays valid across schema changes: SQLite re-prepares
+	* it transparently on its next step (and `exec` — the DDL path — clears the
+	* cache anyway).
+	*/
+	_prepare(sql) {
+		const cached = this._stmts.get(sql);
+		if (cached !== void 0) {
+			this._stmts.delete(sql);
+			this._stmts.set(sql, cached);
+			return cached;
+		}
 		const stmt = this.db.prepare(sql);
+		if (this._maxStmts > 0 && sql.length <= MAX_CACHED_SQL_LENGTH && !PRAGMA_RE.test(sql)) {
+			this._stmts.set(sql, stmt);
+			if (this._stmts.size > this._maxStmts) this._stmts.delete(this._stmts.keys().next().value);
+		}
+		return stmt;
+	}
+	run(sql, params) {
+		const stmt = this._prepare(sql);
 		const result = params ? stmt.run(...params) : stmt.run();
 		return {
 			changes: result.changes,
@@ -64,21 +100,27 @@ var BetterSqlite3Driver = class {
 		};
 	}
 	all(sql, params) {
-		const stmt = this.db.prepare(sql);
+		const stmt = this._prepare(sql);
 		return params ? stmt.all(...params) : stmt.all();
 	}
 	get(sql, params) {
-		const stmt = this.db.prepare(sql);
+		const stmt = this._prepare(sql);
 		return (params ? stmt.get(...params) : stmt.get()) ?? null;
 	}
 	exec(sql) {
+		if (TX_CONTROL_SQL.has(sql)) {
+			this._prepare(sql).run();
+			return;
+		}
 		this.db.exec(sql);
+		this._stmts.clear();
 	}
 	registerFunction(name, fn, opts) {
 		this.db.function(name, { deterministic: opts?.deterministic ?? false }, fn);
 	}
 	/** Idempotent: closing an already closed database is a no-op. */
 	close() {
+		this._stmts.clear();
 		if (!this.db.open) return;
 		this.db.close();
 	}
@@ -329,16 +371,6 @@ function haversineDistanceExpr(quotedCol, point) {
 	};
 }
 /**
-* Builds an INSERT statement.
-*
-* @param table - Table name.
-* @param data - Column→value map.
-* @returns `{ sql, params }` ready for `driver.run()`.
-*/
-function buildInsert$1(table, data) {
-	return buildInsert(sqliteDialect, table, data);
-}
-/**
 * Builds a SELECT statement with optional sort, limit, offset, projection.
 */
 function buildSelect$1(table, where, controls) {
@@ -764,6 +796,8 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	viewCapabilities() {
 		return ALL_VIEW_CAPABILITIES;
 	}
+	/** INSERT text per column signature (rows of one table share a handful of shapes). */
+	_insertSql = new InsertSqlCache(sqliteDialect);
 	/** Whether the SQLite connection has the sqlite-vec extension loaded. */
 	_supportsVector;
 	/** Whether SQLite math functions (radians/asin/...) are available — geo search. */
@@ -962,20 +996,31 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		}
 	}
 	async insertOne(data) {
-		const { sql, params } = buildInsert$1(this.resolveTableName(), data);
+		const { sql, params } = this._insertSql.build(this.resolveTableName(), data);
 		this._log(sql, params);
 		const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
 		return { insertedId: this._resolveInsertedId(data, result.lastInsertRowid) };
 	}
 	async insertMany(data) {
+		if (data.length === 1) {
+			const { insertedId } = await this.insertOne(data[0]);
+			return {
+				insertedCount: 1,
+				insertedIds: [insertedId]
+			};
+		}
 		return this.withTransaction(async () => {
-			const ids = [];
-			for (const row of data) {
-				const { sql, params } = buildInsert$1(this.resolveTableName(), row);
-				this._log(sql, params);
-				const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
-				ids.push(this._resolveInsertedId(row, result.lastInsertRowid));
-			}
+			const tableName = this.resolveTableName();
+			const ids = await this._stmt(() => {
+				const out = [];
+				for (const row of data) {
+					const { sql, params } = this._insertSql.build(tableName, row);
+					this._log(sql, params);
+					const result = this._wrapConstraintError(() => this.driver.run(sql, params));
+					out.push(this._resolveInsertedId(row, result.lastInsertRowid));
+				}
+				return out;
+			});
 			return {
 				insertedCount: ids.length,
 				insertedIds: ids
@@ -995,7 +1040,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 			const slots = [];
 			const tableName = this.resolveTableName();
 			for (const row of data) {
-				const built = buildInsert$1(tableName, row);
+				const built = this._insertSql.build(tableName, row);
 				const sql = `${built.sql} ON CONFLICT DO NOTHING`;
 				const params = built.params;
 				this._log(sql, params);
@@ -1031,6 +1076,24 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		this._log(sql, params);
 		return stripPartitionRowNumber(await this._stmt(() => this.driver.all(sql, params)));
 	}
+	/**
+	* Page + total in one synchronous segment: the filter's WHERE is built once
+	* for both statements, and both read the same snapshot. A subclass that
+	* overrides `findMany` / `count` keeps the base behaviour (both through them).
+	*/
+	async findManyWithCount(query) {
+		if (this.findMany !== SqliteAdapter.prototype.findMany || this.count !== SqliteAdapter.prototype.count) return super.findManyWithCount(query);
+		const where = buildWhere(query.filter);
+		const tableName = this.resolveTableName();
+		const { sql, params } = buildSelect$1(tableName, where, query.controls);
+		const countSql = `SELECT COUNT(*) as cnt FROM "${esc(tableName)}" WHERE ${where.sql}`;
+		this._log(sql, params);
+		this._log(countSql, where.params);
+		return this._stmt(() => ({
+			data: this.driver.all(sql, params),
+			count: this.driver.get(countSql, where.params)?.cnt ?? 0
+		}));
+	}
 	async count(query) {
 		const where = buildWhere(query.filter);
 		const sql = `SELECT COUNT(*) as cnt FROM "${esc(this.resolveTableName())}" WHERE ${where.sql}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-sqlite",
-  "version": "0.1.150",
+  "version": "0.1.152",
   "description": "SQLite adapter for @atscript/db with swappable driver support.",
   "keywords": [
     "atscript",
@@ -36,21 +36,21 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.101",
-    "@atscript/typescript": "^0.1.101",
+    "@atscript/core": "^0.1.102",
+    "@atscript/typescript": "^0.1.102",
     "@types/better-sqlite3": "^7.6.13",
-    "@uniqu/core": "^0.1.13",
+    "@uniqu/core": "^0.1.14",
     "better-sqlite3": "^12.6.2",
     "sqlite-vec": "^0.1.9",
-    "unplugin-atscript": "^0.1.101"
+    "unplugin-atscript": "^0.1.102"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.101",
-    "@atscript/typescript": "^0.1.101",
-    "@uniqu/core": "^0.1.13",
+    "@atscript/core": "^0.1.102",
+    "@atscript/typescript": "^0.1.102",
+    "@uniqu/core": "^0.1.14",
     "better-sqlite3": ">=11.0.0",
-    "@atscript/db": "^0.1.150",
-    "@atscript/db-sql-tools": "^0.1.150"
+    "@atscript/db": "^0.1.152",
+    "@atscript/db-sql-tools": "^0.1.152"
   },
   "peerDependenciesMeta": {
     "better-sqlite3": {