@atscript/db-sqlite 0.1.142 → 0.1.144

package/dist/index.cjs

@@ -1319,13 +1319,21 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		for (const idx of this._getFulltextIndexes()) indexes.push({
 			name: idx.name,
 			description: `FTS5 index (${idx.fields.map((f) => f.name).join(", ")})`,
-			type: "text"
-		});
-		for (const [field, vec] of this._vectorFields) indexes.push({
-			name: vec.indexName,
-			description: `vec0 index on ${field} (${vec.dimensions}, ${vec.similarity})`,
-			type: "vector"
+			type: "text",
+			fields: this._indexLogicalPaths(idx),
+			isDefault: indexes.length === 0
 		});
+		let firstVector = true;
+		for (const [field, vec] of this._vectorFields) {
+			indexes.push({
+				name: vec.indexName,
+				description: `vec0 index on ${field} (${vec.dimensions}, ${vec.similarity})`,
+				type: "vector",
+				fields: [field],
+				isDefault: firstVector
+			});
+			firstVector = false;
+		}
 		return indexes;
 	}
 	async search(text, query, indexName) {
@@ -1380,10 +1388,10 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	/** Resolves a fulltext index by name, or returns the first available. */
 	_resolveFtsIndex(indexName) {
 		const ftIndexes = this._getFulltextIndexes();
-		if (ftIndexes.length === 0) throw new Error("No search index available");
+		if (ftIndexes.length === 0) throw new Error((0, _atscript_db.searchIndexNotFoundMessage)());
 		if (indexName) {
 			const found = ftIndexes.find((idx) => idx.name === indexName);
-			if (!found) throw new Error(`Search index "${indexName}" not found`);
+			if (!found) throw new Error((0, _atscript_db.searchIndexNotFoundMessage)(indexName));
 			return found;
 		}
 		return ftIndexes[0];
@@ -1494,23 +1502,18 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	async vectorSearchWithCount(vector, query, indexName) {
 		if (!this._detectVectorSupport()) throw new Error("Vector search requires the sqlite-vec extension. Construct BetterSqlite3Driver with { vector: true }.");
 		const base = this._buildVectorSearchBase(vector, query, indexName);
-		const countSql = `SELECT COUNT(*) AS cnt ${base.fromWhere}`;
+		const count = (0, _atscript_db_sql_tools.buildVectorSearchCount)(sqliteDialect, base.source, base);
 		return this._stmt(() => {
 			const data = this._runVectorSearch(base);
-			this._log(countSql, base.params);
+			this._log(count.sql, count.params);
 			return {
 				data,
-				count: this.driver.get(countSql, base.params)?.cnt ?? 0
+				count: this.driver.get(count.sql, count.params)?.cnt ?? 0
 			};
 		});
 	}
 	_runVectorSearch(base) {
-		let sql = `SELECT * ${base.fromWhere} ORDER BY _distance ASC LIMIT ?`;
-		const params = [...base.params, base.limit];
-		if (base.skip > 0) {
-			sql += ` OFFSET ?`;
-			params.push(base.skip);
-		}
+		const { sql, params } = (0, _atscript_db_sql_tools.buildVectorSearchSelect)(sqliteDialect, base.source, base);
 		this._log(sql, params);
 		return this.driver.all(sql, params);
 	}
@@ -1522,7 +1525,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 				entry = [f, v];
 				break;
 			}
-			if (!entry) throw new Error(`Vector index "${indexName}" not found`);
+			if (!entry) throw new Error((0, _atscript_db.vectorIndexNotFoundMessage)(indexName));
 		} else {
 			const first = this._vectorFields.entries().next();
 			if (first.done) throw new Error("No vector fields defined");
@@ -1568,9 +1571,10 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		};
 	}
 	/**
-	* Builds the shared FROM+WHERE fragment for vec0 KNN queries (without ORDER/LIMIT).
-	* Both `vectorSearch` and `vectorSearchWithCount` reuse this — the former appends
-	* ORDER BY + LIMIT/OFFSET, the latter wraps it in a COUNT(*).
+	* Builds the shared parts of a vec0 KNN query: the row source (the vec0
+	* index joined to the table), the threshold, the residual filter and the
+	* page. `vectorSearch` pages it (`buildVectorSearchSelect`),
+	* `vectorSearchWithCount` also counts it (`buildVectorSearchCount`).
 	*/
 	_buildVectorSearchBase(vector, query, indexName) {
 		const { vec, partitionPhysicalNames } = this._resolveVectorIndex(indexName);
@@ -1580,35 +1584,29 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		const limit = controls.$limit ?? 20;
 		const skip = controls.$skip ?? 0;
 		const threshold = this._resolveVectorThreshold(controls, vec.indexName);
-		const { partition, residual } = this._splitVectorFilter(query.filter, partitionPhysicalNames);
-		const residualWhere = buildPrefixedWhere("_vs", residual);
-		const hasResidual = residualWhere.sql !== "1=1";
+		const split = this._splitVectorFilter(query.filter, partitionPhysicalNames);
+		const residual = buildPrefixedWhere("_v", split.residual);
+		const hasResidual = residual.sql !== "1=1";
 		const hasThreshold = threshold !== void 0;
 		const k = (limit + skip) * (hasResidual || hasThreshold ? SqliteAdapter._RESIDUAL_OVERFETCH : 1);
 		const tableName = this.resolveTableName();
 		const vecTable = this._vecTableName(vec.indexName);
 		const innerWhereParts = ["v.embedding MATCH ?", "v.k = ?"];
 		const params = [vecBuf, k];
-		for (const p of partition) {
+		for (const p of split.partition) {
 			innerWhereParts.push(`v."${esc(p.name)}" = ?`);
 			params.push(p.value);
 		}
-		let fromWhere = `FROM (${`SELECT t.*, v.distance AS _distance FROM "${esc(vecTable)}" v JOIN "${esc(tableName)}" t ON t.rowid = v.rowid WHERE ${innerWhereParts.join(" AND ")}`}) _vs`;
-		const outerWhereParts = [];
-		if (hasThreshold) {
-			outerWhereParts.push(`_distance <= ?`);
-			params.push(thresholdToVecDistance(threshold, vec.similarity));
-		}
-		if (hasResidual) {
-			outerWhereParts.push(`(${residualWhere.sql})`);
-			params.push(...residualWhere.params);
-		}
-		if (outerWhereParts.length > 0) fromWhere += ` WHERE ${outerWhereParts.join(" AND ")}`;
 		return {
-			fromWhere,
-			params,
+			source: {
+				sql: `SELECT t.*, v.distance AS _distance FROM "${esc(vecTable)}" v JOIN "${esc(tableName)}" t ON t.rowid = v.rowid WHERE ${innerWhereParts.join(" AND ")}`,
+				params
+			},
 			limit,
-			skip
+			skip,
+			maxDistance: hasThreshold ? thresholdToVecDistance(threshold, vec.similarity) : void 0,
+			residual,
+			select: query.controls?.$select
 		};
 	}
 	/**
@@ -1667,10 +1665,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		};
 	}
 	_buildGeoSearchSelect(ctx) {
-		return (0, _atscript_db_sql_tools.buildGeoSearchSelect)(sqliteDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, {
-			$limit: ctx.controls.$limit,
-			$skip: ctx.controls.$skip
-		});
+		return (0, _atscript_db_sql_tools.buildGeoSearchSelect)(sqliteDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, ctx.controls);
 	}
 	/** Builds vec0 shadow table name from index name: `<table>__vec__<indexName>`. */
 	_vecTableName(indexName) {

package/dist/index.d.cts

@@ -448,9 +448,10 @@ declare class SqliteAdapter extends BaseDbAdapter {
    */
   private _splitVectorFilter;
   /**
-   * Builds the shared FROM+WHERE fragment for vec0 KNN queries (without ORDER/LIMIT).
-   * Both `vectorSearch` and `vectorSearchWithCount` reuse this — the former appends
-   * ORDER BY + LIMIT/OFFSET, the latter wraps it in a COUNT(*).
+   * Builds the shared parts of a vec0 KNN query: the row source (the vec0
+   * index joined to the table), the threshold, the residual filter and the
+   * page. `vectorSearch` pages it (`buildVectorSearchSelect`),
+   * `vectorSearchWithCount` also counts it (`buildVectorSearchCount`).
    */
   private _buildVectorSearchBase;
   /**

package/dist/index.d.mts

@@ -448,9 +448,10 @@ declare class SqliteAdapter extends BaseDbAdapter {
    */
   private _splitVectorFilter;
   /**
-   * Builds the shared FROM+WHERE fragment for vec0 KNN queries (without ORDER/LIMIT).
-   * Both `vectorSearch` and `vectorSearchWithCount` reuse this — the former appends
-   * ORDER BY + LIMIT/OFFSET, the latter wraps it in a COUNT(*).
+   * Builds the shared parts of a vec0 KNN query: the row source (the vec0
+   * index joined to the table), the threshold, the residual filter and the
+   * page. `vectorSearch` pages it (`buildVectorSearchSelect`),
+   * `vectorSearchWithCount` also counts it (`buildVectorSearchCount`).
    */
   private _buildVectorSearchBase;
   /**

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, searchIndexNotFoundMessage, vectorIndexNotFoundMessage } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { EMPTY_AND, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, geoWindowFromControls, jsonDollarPath, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, toSqlValue } from "@atscript/db-sql-tools";
+import { EMPTY_AND, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, geoWindowFromControls, jsonDollarPath, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, toSqlValue } from "@atscript/db-sql-tools";
 import { bucketer } from "@uniqu/core";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/better-sqlite3-driver.ts
@@ -1318,13 +1318,21 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		for (const idx of this._getFulltextIndexes()) indexes.push({
 			name: idx.name,
 			description: `FTS5 index (${idx.fields.map((f) => f.name).join(", ")})`,
-			type: "text"
-		});
-		for (const [field, vec] of this._vectorFields) indexes.push({
-			name: vec.indexName,
-			description: `vec0 index on ${field} (${vec.dimensions}, ${vec.similarity})`,
-			type: "vector"
+			type: "text",
+			fields: this._indexLogicalPaths(idx),
+			isDefault: indexes.length === 0
 		});
+		let firstVector = true;
+		for (const [field, vec] of this._vectorFields) {
+			indexes.push({
+				name: vec.indexName,
+				description: `vec0 index on ${field} (${vec.dimensions}, ${vec.similarity})`,
+				type: "vector",
+				fields: [field],
+				isDefault: firstVector
+			});
+			firstVector = false;
+		}
 		return indexes;
 	}
 	async search(text, query, indexName) {
@@ -1379,10 +1387,10 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	/** Resolves a fulltext index by name, or returns the first available. */
 	_resolveFtsIndex(indexName) {
 		const ftIndexes = this._getFulltextIndexes();
-		if (ftIndexes.length === 0) throw new Error("No search index available");
+		if (ftIndexes.length === 0) throw new Error(searchIndexNotFoundMessage());
 		if (indexName) {
 			const found = ftIndexes.find((idx) => idx.name === indexName);
-			if (!found) throw new Error(`Search index "${indexName}" not found`);
+			if (!found) throw new Error(searchIndexNotFoundMessage(indexName));
 			return found;
 		}
 		return ftIndexes[0];
@@ -1493,23 +1501,18 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	async vectorSearchWithCount(vector, query, indexName) {
 		if (!this._detectVectorSupport()) throw new Error("Vector search requires the sqlite-vec extension. Construct BetterSqlite3Driver with { vector: true }.");
 		const base = this._buildVectorSearchBase(vector, query, indexName);
-		const countSql = `SELECT COUNT(*) AS cnt ${base.fromWhere}`;
+		const count = buildVectorSearchCount(sqliteDialect, base.source, base);
 		return this._stmt(() => {
 			const data = this._runVectorSearch(base);
-			this._log(countSql, base.params);
+			this._log(count.sql, count.params);
 			return {
 				data,
-				count: this.driver.get(countSql, base.params)?.cnt ?? 0
+				count: this.driver.get(count.sql, count.params)?.cnt ?? 0
 			};
 		});
 	}
 	_runVectorSearch(base) {
-		let sql = `SELECT * ${base.fromWhere} ORDER BY _distance ASC LIMIT ?`;
-		const params = [...base.params, base.limit];
-		if (base.skip > 0) {
-			sql += ` OFFSET ?`;
-			params.push(base.skip);
-		}
+		const { sql, params } = buildVectorSearchSelect(sqliteDialect, base.source, base);
 		this._log(sql, params);
 		return this.driver.all(sql, params);
 	}
@@ -1521,7 +1524,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 				entry = [f, v];
 				break;
 			}
-			if (!entry) throw new Error(`Vector index "${indexName}" not found`);
+			if (!entry) throw new Error(vectorIndexNotFoundMessage(indexName));
 		} else {
 			const first = this._vectorFields.entries().next();
 			if (first.done) throw new Error("No vector fields defined");
@@ -1567,9 +1570,10 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		};
 	}
 	/**
-	* Builds the shared FROM+WHERE fragment for vec0 KNN queries (without ORDER/LIMIT).
-	* Both `vectorSearch` and `vectorSearchWithCount` reuse this — the former appends
-	* ORDER BY + LIMIT/OFFSET, the latter wraps it in a COUNT(*).
+	* Builds the shared parts of a vec0 KNN query: the row source (the vec0
+	* index joined to the table), the threshold, the residual filter and the
+	* page. `vectorSearch` pages it (`buildVectorSearchSelect`),
+	* `vectorSearchWithCount` also counts it (`buildVectorSearchCount`).
 	*/
 	_buildVectorSearchBase(vector, query, indexName) {
 		const { vec, partitionPhysicalNames } = this._resolveVectorIndex(indexName);
@@ -1579,35 +1583,29 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		const limit = controls.$limit ?? 20;
 		const skip = controls.$skip ?? 0;
 		const threshold = this._resolveVectorThreshold(controls, vec.indexName);
-		const { partition, residual } = this._splitVectorFilter(query.filter, partitionPhysicalNames);
-		const residualWhere = buildPrefixedWhere("_vs", residual);
-		const hasResidual = residualWhere.sql !== "1=1";
+		const split = this._splitVectorFilter(query.filter, partitionPhysicalNames);
+		const residual = buildPrefixedWhere("_v", split.residual);
+		const hasResidual = residual.sql !== "1=1";
 		const hasThreshold = threshold !== void 0;
 		const k = (limit + skip) * (hasResidual || hasThreshold ? SqliteAdapter._RESIDUAL_OVERFETCH : 1);
 		const tableName = this.resolveTableName();
 		const vecTable = this._vecTableName(vec.indexName);
 		const innerWhereParts = ["v.embedding MATCH ?", "v.k = ?"];
 		const params = [vecBuf, k];
-		for (const p of partition) {
+		for (const p of split.partition) {
 			innerWhereParts.push(`v."${esc(p.name)}" = ?`);
 			params.push(p.value);
 		}
-		let fromWhere = `FROM (${`SELECT t.*, v.distance AS _distance FROM "${esc(vecTable)}" v JOIN "${esc(tableName)}" t ON t.rowid = v.rowid WHERE ${innerWhereParts.join(" AND ")}`}) _vs`;
-		const outerWhereParts = [];
-		if (hasThreshold) {
-			outerWhereParts.push(`_distance <= ?`);
-			params.push(thresholdToVecDistance(threshold, vec.similarity));
-		}
-		if (hasResidual) {
-			outerWhereParts.push(`(${residualWhere.sql})`);
-			params.push(...residualWhere.params);
-		}
-		if (outerWhereParts.length > 0) fromWhere += ` WHERE ${outerWhereParts.join(" AND ")}`;
 		return {
-			fromWhere,
-			params,
+			source: {
+				sql: `SELECT t.*, v.distance AS _distance FROM "${esc(vecTable)}" v JOIN "${esc(tableName)}" t ON t.rowid = v.rowid WHERE ${innerWhereParts.join(" AND ")}`,
+				params
+			},
 			limit,
-			skip
+			skip,
+			maxDistance: hasThreshold ? thresholdToVecDistance(threshold, vec.similarity) : void 0,
+			residual,
+			select: query.controls?.$select
 		};
 	}
 	/**
@@ -1666,10 +1664,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		};
 	}
 	_buildGeoSearchSelect(ctx) {
-		return buildGeoSearchSelect(sqliteDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, {
-			$limit: ctx.controls.$limit,
-			$skip: ctx.controls.$skip
-		});
+		return buildGeoSearchSelect(sqliteDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, ctx.controls);
 	}
 	/** Builds vec0 shadow table name from index name: `<table>__vec__<indexName>`. */
 	_vecTableName(indexName) {

package/package.json

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