@atscript/db-sqlite 0.1.128 → 0.1.130

package/dist/index.cjs

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let _atscript_db = require("@atscript/db");
 let node_module = require("node:module");
+let _atscript_db_agg = require("@atscript/db/agg");
 let _atscript_db_sql_tools = require("@atscript/db-sql-tools");
 let node_async_hooks = require("node:async_hooks");
 //#region src/better-sqlite3-driver.ts
@@ -807,8 +808,9 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		return (await this._stmt(() => this.driver.get(sql, where.params)))?.cnt ?? 0;
 	}
 	async aggregate(query) {
-		const where = buildWhere(query.filter);
 		const tableName = this.resolveTableName();
+		const search = (0, _atscript_db_agg.resolveAggregateSearch)(query.controls);
+		const where = search ? andWhere(this._buildFtsMatchWhere(search.text, search.indexName), buildWhere(query.filter)) : buildWhere(query.filter);
 		if (query.controls.$count) {
 			const { sql, params } = buildAggregateCount(tableName, where, query.controls);
 			this._log(sql, params);
@@ -1240,6 +1242,26 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		return ftIndexes[0];
 	}
 	/**
+	* The FTS5 match restated as a standalone WHERE fragment:
+	* `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`.
+	*
+	* The external-content FTS5 tables this adapter creates carry
+	* `content_rowid='rowid'`, so the virtual table's `rowid` IS the content
+	* table's rowid, and the unqualified `rowid` outside the subquery resolves
+	* against the aggregate's single FROM table. {@link _buildFtsBase} is the
+	* leaf path's JOIN form, which the unaliased aggregate builders cannot take.
+	*
+	* Index resolution goes through {@link _resolveFtsIndex}, as the leaf path
+	* does, so a named `$index` and its "not found" error behave identically.
+	*/
+	_buildFtsMatchWhere(text, indexName) {
+		const quoted = `"${esc(this._ftsTableName(this._resolveFtsIndex(indexName).name))}"`;
+		return {
+			sql: `rowid IN (SELECT rowid FROM ${quoted} WHERE ${quoted} MATCH ?)`,
+			params: [text]
+		};
+	}
+	/**
 	* Builds the shared FROM+JOIN+WHERE fragment for FTS5 queries.
 	* Both data and count queries reuse this to avoid duplicating index resolution and filter translation.
 	*/
@@ -1598,6 +1620,18 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		for (const name of this._listShadowTables(tableName, "vec")) this._dropVecTable(name);
 	}
 };
+/**
+* ANDs two WHERE fragments, keeping `left`'s params first so placeholder order
+* follows the rendered SQL. An empty `right` — what {@link buildWhere} returns
+* for no filter — is dropped rather than appended.
+*/
+function andWhere(left, right) {
+	if (right.sql === _atscript_db_sql_tools.EMPTY_AND.sql) return left;
+	return {
+		sql: `${left.sql} AND (${right.sql})`,
+		params: [...left.params, ...right.params]
+	};
+}
 /** Normalizes SQLite PRAGMA dflt_value to match serialized format.
 *  PRAGMA returns `'active'` (SQL-quoted), we store `active` (raw). */
 function normalizeSqliteDefault(value) {

package/dist/index.d.cts

@@ -366,6 +366,20 @@ declare class SqliteAdapter extends BaseDbAdapter {
   private _getFulltextIndexes;
   /** Resolves a fulltext index by name, or returns the first available. */
   private _resolveFtsIndex;
+  /**
+   * The FTS5 match restated as a standalone WHERE fragment:
+   * `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`.
+   *
+   * The external-content FTS5 tables this adapter creates carry
+   * `content_rowid='rowid'`, so the virtual table's `rowid` IS the content
+   * table's rowid, and the unqualified `rowid` outside the subquery resolves
+   * against the aggregate's single FROM table. {@link _buildFtsBase} is the
+   * leaf path's JOIN form, which the unaliased aggregate builders cannot take.
+   *
+   * Index resolution goes through {@link _resolveFtsIndex}, as the leaf path
+   * does, so a named `$index` and its "not found" error behave identically.
+   */
+  private _buildFtsMatchWhere;
   /**
    * Builds the shared FROM+JOIN+WHERE fragment for FTS5 queries.
    * Both data and count queries reuse this to avoid duplicating index resolution and filter translation.

package/dist/index.d.mts

@@ -366,6 +366,20 @@ declare class SqliteAdapter extends BaseDbAdapter {
   private _getFulltextIndexes;
   /** Resolves a fulltext index by name, or returns the first available. */
   private _resolveFtsIndex;
+  /**
+   * The FTS5 match restated as a standalone WHERE fragment:
+   * `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`.
+   *
+   * The external-content FTS5 tables this adapter creates carry
+   * `content_rowid='rowid'`, so the virtual table's `rowid` IS the content
+   * table's rowid, and the unqualified `rowid` outside the subquery resolves
+   * against the aggregate's single FROM table. {@link _buildFtsBase} is the
+   * leaf path's JOIN form, which the unaliased aggregate builders cannot take.
+   *
+   * Index resolution goes through {@link _resolveFtsIndex}, as the leaf path
+   * does, so a named `$index` and its "not found" error behave identically.
+   */
+  private _buildFtsMatchWhere;
   /**
    * Builds the shared FROM+JOIN+WHERE fragment for FTS5 queries.
    * Both data and count queries reuse this to avoid duplicating index resolution and filter translation.

package/dist/index.mjs

@@ -1,6 +1,7 @@
 import { createRequire } from "node:module";
 import { BaseDbAdapter, DbError, DbSpace } from "@atscript/db";
-import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, fillReplacePayload, geoWindowFromControls, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, toSqlValue } from "@atscript/db-sql-tools";
+import { resolveAggregateSearch } from "@atscript/db/agg";
+import { EMPTY_AND, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, fillReplacePayload, geoWindowFromControls, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, toSqlValue } from "@atscript/db-sql-tools";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/better-sqlite3-driver.ts
 /**
@@ -806,8 +807,9 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		return (await this._stmt(() => this.driver.get(sql, where.params)))?.cnt ?? 0;
 	}
 	async aggregate(query) {
-		const where = buildWhere(query.filter);
 		const tableName = this.resolveTableName();
+		const search = resolveAggregateSearch(query.controls);
+		const where = search ? andWhere(this._buildFtsMatchWhere(search.text, search.indexName), buildWhere(query.filter)) : buildWhere(query.filter);
 		if (query.controls.$count) {
 			const { sql, params } = buildAggregateCount$1(tableName, where, query.controls);
 			this._log(sql, params);
@@ -1239,6 +1241,26 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		return ftIndexes[0];
 	}
 	/**
+	* The FTS5 match restated as a standalone WHERE fragment:
+	* `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`.
+	*
+	* The external-content FTS5 tables this adapter creates carry
+	* `content_rowid='rowid'`, so the virtual table's `rowid` IS the content
+	* table's rowid, and the unqualified `rowid` outside the subquery resolves
+	* against the aggregate's single FROM table. {@link _buildFtsBase} is the
+	* leaf path's JOIN form, which the unaliased aggregate builders cannot take.
+	*
+	* Index resolution goes through {@link _resolveFtsIndex}, as the leaf path
+	* does, so a named `$index` and its "not found" error behave identically.
+	*/
+	_buildFtsMatchWhere(text, indexName) {
+		const quoted = `"${esc(this._ftsTableName(this._resolveFtsIndex(indexName).name))}"`;
+		return {
+			sql: `rowid IN (SELECT rowid FROM ${quoted} WHERE ${quoted} MATCH ?)`,
+			params: [text]
+		};
+	}
+	/**
 	* Builds the shared FROM+JOIN+WHERE fragment for FTS5 queries.
 	* Both data and count queries reuse this to avoid duplicating index resolution and filter translation.
 	*/
@@ -1597,6 +1619,18 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		for (const name of this._listShadowTables(tableName, "vec")) this._dropVecTable(name);
 	}
 };
+/**
+* ANDs two WHERE fragments, keeping `left`'s params first so placeholder order
+* follows the rendered SQL. An empty `right` — what {@link buildWhere} returns
+* for no filter — is dropped rather than appended.
+*/
+function andWhere(left, right) {
+	if (right.sql === EMPTY_AND.sql) return left;
+	return {
+		sql: `${left.sql} AND (${right.sql})`,
+		params: [...left.params, ...right.params]
+	};
+}
 /** Normalizes SQLite PRAGMA dflt_value to match serialized format.
 *  PRAGMA returns `'active'` (SQL-quoted), we store `active` (raw). */
 function normalizeSqliteDefault(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-sqlite",
-  "version": "0.1.128",
+  "version": "0.1.130",
   "description": "SQLite adapter for @atscript/db with swappable driver support.",
   "keywords": [
     "atscript",
@@ -49,8 +49,8 @@
     "@atscript/typescript": "^0.1.92",
     "@uniqu/core": "^0.1.8",
     "better-sqlite3": ">=11.0.0",
-    "@atscript/db": "^0.1.128",
-    "@atscript/db-sql-tools": "^0.1.128"
+    "@atscript/db": "^0.1.130",
+    "@atscript/db-sql-tools": "^0.1.130"
   },
   "peerDependenciesMeta": {
     "better-sqlite3": {