@atscript/db-sqlite 0.1.148 → 0.1.150

package/dist/index.cjs

@@ -281,6 +281,7 @@ const sqliteDialect = {
 			params: [likePattern]
 		};
 	},
+	integerText: (expr) => `CAST(CAST(${expr} AS INTEGER) AS TEXT)`,
 	geoWithin(quotedCol, circle) {
 		const dist = haversineDistanceExpr(quotedCol, circle.center);
 		return {
@@ -687,6 +688,42 @@ function getSqliteTxGate(driver) {
 	return gate;
 }
 //#endregion
+//#region src/fts-term.ts
+const BAREWORD = /^[\p{L}\p{N}_]+$/u;
+const KEYWORD = /^(?:AND|OR|NOT|NEAR)$/i;
+/**
+* Turns a user's `$search` text into a safe FTS5 MATCH expression (since
+* 0.1.150). FTS5 reads the raw text as a query language — `-2946`, `a AND`,
+* `title:x`, `(`, a stray `"` — and throws a syntax error on most of it.
+* Every term is therefore quoted (plain words are already safe barewords)
+* so no user text can raise one:
+*
+* - a `"quoted phrase"` stays a phrase (words in order);
+* - a bare word stays a word, and a trailing `*` keeps its prefix meaning
+*   (`quok*` finds `quokka`);
+* - words are AND-ed, as before;
+* - everything else — `AND` / `OR` / `NOT`, `-`, `+`, `^`, `NEAR(…)`,
+*   `column:`, parentheses — is plain text (the tokenizer drops punctuation).
+*
+* Quoted strings never contain a `"`: an inner `"` is doubled (FTS5 escape).
+*/
+function quoteFtsTerm(text) {
+	const parts = [];
+	for (const match of text.matchAll(/"([^"]*)"|(\S+)/g)) {
+		const phrase = match[1];
+		if (phrase !== void 0) {
+			if (phrase.trim()) parts.push(`"${phrase.replace(/"/g, "\"\"")}"`);
+			continue;
+		}
+		const word = match[2];
+		const core = word.replace(/\*+$/, "");
+		if (!core) continue;
+		const quoted = BAREWORD.test(core) && !KEYWORD.test(core) ? core : `"${core.replace(/"/g, "\"\"")}"`;
+		parts.push(core.length < word.length ? `${quoted}*` : quoted);
+	}
+	return parts.length > 0 ? parts.join(" ") : "\"\"";
+}
+//#endregion
 //#region src/sqlite-adapter.ts
 /**
 * SQLite adapter for {@link AtscriptDbTable}.
@@ -1004,7 +1041,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	async aggregate(query) {
 		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);
+		const where = search ? andWhere(this._buildSearchPredicate(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);
@@ -1014,10 +1051,10 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(sql, params);
 		return this._stmt(() => this.driver.all(sql, params));
 	}
-	async updateOne(filter, data, ops, expectedVersion) {
+	async updateOne(filter, data, ops, expectedVersion, opts) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts, expectedVersion);
 		const { sql, params } = buildUpdate(tableName, data, {
 			sql: `rowid = (SELECT rowid FROM "${esc(tableName)}" WHERE ${where.sql} LIMIT 1)`,
 			params: where.params
@@ -1029,9 +1066,9 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 			modifiedCount: result.changes
 		};
 	}
-	async updateMany(filter, data, ops) {
+	async updateMany(filter, data, ops, opts) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts);
 		const { sql, params } = buildUpdate(this.resolveTableName(), data, where, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
@@ -1376,12 +1413,14 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	getSearchIndexes() {
 		const indexes = [];
-		for (const idx of this._getFulltextIndexes()) indexes.push({
+		const ftAll = this._getFulltextIndexes();
+		const ftDefault = (0, _atscript_db.defaultFulltextIndex)(ftAll);
+		for (const idx of ftAll) indexes.push({
 			name: idx.name,
-			description: `FTS5 index (${idx.fields.map((f) => f.name).join(", ")})`,
+			description: (0, _atscript_db.describeFulltext)(idx, (names) => `FTS5 index (${names})`),
 			type: "text",
 			fields: this._indexLogicalPaths(idx),
-			isDefault: indexes.length === 0
+			isDefault: idx === ftDefault
 		});
 		let firstVector = true;
 		for (const [field, vec] of this._vectorFields) {
@@ -1398,6 +1437,12 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async search(text, query, indexName) {
 		if (!text.trim()) return [];
+		const plan = this._searchPlan(text, indexName);
+		if (!plan.join) {
+			const { sql, params } = buildSelect(this.resolveTableName(), andWhere(plan.predicate, buildWhere(query.filter)), query.controls);
+			this._log(sql, params);
+			return this._stmt(() => this.driver.all(sql, params));
+		}
 		const base = this._buildFtsBase(text, query.filter, indexName);
 		const controls = query.controls || {};
 		let cols = "t.*";
@@ -1427,12 +1472,22 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 			count: 0
 		};
 		const data = await this.search(text, query, indexName);
-		const base = this._buildFtsBase(text, query.filter, indexName);
-		const countSql = `SELECT COUNT(*) as cnt ${base.fromWhere}`;
-		this._log(countSql, base.params);
+		const plan = this._searchPlan(text, indexName);
+		let countSql;
+		let countParams;
+		if (plan.join) {
+			const base = this._buildFtsBase(text, query.filter, indexName);
+			countSql = `SELECT COUNT(*) as cnt ${base.fromWhere}`;
+			countParams = base.params;
+		} else {
+			const where = andWhere(plan.predicate, buildWhere(query.filter));
+			countSql = `SELECT COUNT(*) as cnt FROM "${esc(this.resolveTableName())}" WHERE ${where.sql}`;
+			countParams = where.params;
+		}
+		this._log(countSql, countParams);
 		return {
 			data,
-			count: (await this._stmt(() => this.driver.get(countSql, base.params)))?.cnt ?? 0
+			count: (await this._stmt(() => this.driver.get(countSql, countParams)))?.cnt ?? 0
 		};
 	}
 	/** Builds FTS table name from index name: `<table>__fts__<indexName>`. */
@@ -1454,26 +1509,51 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 			if (!found) throw new Error((0, _atscript_db.searchIndexNotFoundMessage)(indexName));
 			return found;
 		}
-		return ftIndexes[0];
+		return (0, _atscript_db.defaultFulltextIndex)(ftIndexes);
 	}
 	/**
-	* The FTS5 match restated as a standalone WHERE fragment:
-	* `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`.
+	* The search restated as a standalone WHERE fragment: the FTS5 match
+	* `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`
+	* OR exact equality on each integer member when the whole term is a whole
+	* number (since 0.1.150).
 	*
 	* 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.
+	* SQLite's multi-index OR optimization serves each arm from its own index
+	* (the FTS5 rowid lookup and the member's btree).
 	*
 	* 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))}"`;
+	_buildSearchPredicate(text, indexName) {
+		return this._searchPlan(text, indexName).predicate;
+	}
+	/**
+	* How a search runs: the standalone predicate, and whether the leaf path
+	* may keep its FTS5 JOIN form (text members and no numeric branch — zero
+	* behavior change for text-only searches).
+	*/
+	_searchPlan(text, indexName) {
+		const index = this._resolveFtsIndex(indexName);
+		const { text: textFields, integer: integerFields } = (0, _atscript_db.splitFulltextFields)(index);
+		const n = integerFields.length > 0 ? (0, _atscript_db.searchTermInteger)(text) : void 0;
+		const parts = [];
+		const params = [];
+		if (textFields.length > 0) {
+			const quoted = `"${esc(this._ftsTableName(index.name))}"`;
+			parts.push(`rowid IN (SELECT rowid FROM ${quoted} WHERE ${quoted} MATCH ?)`);
+			params.push(quoteFtsTerm(text));
+		}
+		if (n !== void 0) for (const f of integerFields) {
+			parts.push(`"${esc(f.name)}" = ?`);
+			params.push(n);
+		}
 		return {
-			sql: `rowid IN (SELECT rowid FROM ${quoted} WHERE ${quoted} MATCH ?)`,
-			params: [text]
+			predicate: (0, _atscript_db_sql_tools.orFragment)(parts, params),
+			join: textFields.length > 0 && n === void 0
 		};
 	}
 	/**
@@ -1488,7 +1568,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		let fromWhere = `FROM "${esc(tableName)}" AS t`;
 		fromWhere += ` JOIN "${esc(ftsTable)}" AS fts ON t.rowid = fts.rowid`;
 		fromWhere += ` WHERE fts."${esc(ftsTable)}" MATCH ?`;
-		const params = [text];
+		const params = [quoteFtsTerm(text)];
 		if (where.sql !== "1=1") {
 			fromWhere += ` AND (${where.sql})`;
 			params.push(...where.params);
@@ -1502,7 +1582,7 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 	* Creates/drops FTS5 virtual tables and sync triggers to match desired fulltext indexes.
 	*/
 	_syncFtsIndexes(tableName) {
-		const ftIndexes = this._getFulltextIndexes();
+		const ftIndexes = this._getFulltextIndexes().filter((idx) => (0, _atscript_db.splitFulltextFields)(idx).text.length > 0);
 		const desiredFtsTables = new Set(ftIndexes.map((idx) => this._ftsTableName(idx.name)));
 		const existingFts = this.driver.all(`SELECT name, sql FROM sqlite_master WHERE type='table' AND name LIKE ?`, [`${tableName}__fts__%`]).filter((r) => r.sql.startsWith("CREATE VIRTUAL TABLE")).map((r) => r.name);
 		for (const name of existingFts) if (!desiredFtsTables.has(name)) this._dropFtsTable(name);
@@ -1510,16 +1590,27 @@ var SqliteAdapter = class SqliteAdapter extends _atscript_db.BaseDbAdapter {
 		for (const index of ftIndexes) {
 			const ftsTable = this._ftsTableName(index.name);
 			if (!existingSet.has(ftsTable)) this._createFtsTable(tableName, ftsTable, index);
+			else if (!this._ftsColumnsMatch(ftsTable, index)) {
+				this._dropFtsTable(ftsTable);
+				this._createFtsTable(tableName, ftsTable, index);
+			}
 		}
 	}
+	/** Whether an existing FTS5 table has exactly the index's text columns, in order. */
+	_ftsColumnsMatch(ftsTable, index) {
+		const live = this.driver.all(`PRAGMA table_info("${esc(ftsTable)}")`).map((c) => c.name);
+		const desired = (0, _atscript_db.splitFulltextFields)(index).text.map((f) => f.name);
+		return live.length === desired.length && live.every((name, i) => name === desired[i]);
+	}
 	/** Creates an FTS5 virtual table with sync triggers and rebuilds the index. */
 	_createFtsTable(tableName, ftsTable, index) {
-		const fieldList = index.fields.map((f) => `"${esc(f.name)}"`).join(", ");
+		const fields = (0, _atscript_db.splitFulltextFields)(index).text;
+		const fieldList = fields.map((f) => `"${esc(f.name)}"`).join(", ");
 		const createSql = `CREATE VIRTUAL TABLE IF NOT EXISTS "${esc(ftsTable)}" USING fts5(${fieldList}, content='${tableName.replace(/'/g, "''")}', content_rowid='rowid')`;
 		this._log(createSql);
 		this.driver.exec(createSql);
-		const newFields = index.fields.map((f) => `new."${esc(f.name)}"`).join(", ");
-		const oldFields = index.fields.map((f) => `old."${esc(f.name)}"`).join(", ");
+		const newFields = fields.map((f) => `new."${esc(f.name)}"`).join(", ");
+		const oldFields = fields.map((f) => `old."${esc(f.name)}"`).join(", ");
 		const ef = esc(ftsTable);
 		const aiSql = `CREATE TRIGGER IF NOT EXISTS "${esc(ftsTable + "__ai")}" AFTER INSERT ON "${esc(tableName)}" BEGIN INSERT INTO "${ef}"(rowid, ${fieldList}) VALUES (new.rowid, ${newFields}); END`;
 		this._log(aiSql);

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TGenericLogger, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TGenericLogger, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TMetadataMap } from "@atscript/typescript/utils";
 import { FilterExpr as FilterExpr$1 } from "@uniqu/core";
 import { TFilterVisitorOptions, TSqlFragment, TSqlFragment as TSqlFragment$1 } from "@atscript/db-sql-tools";
@@ -357,8 +357,8 @@ declare class SqliteAdapter extends BaseDbAdapter {
   findManyPerPartition(query: DbQuery, partitionBy: readonly string[]): Promise<Array<Record<string, unknown>>>;
   count(query: DbQuery): Promise<number>;
   aggregate(query: DbQuery): Promise<Array<Record<string, unknown>>>;
-  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
-  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
+  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
@@ -425,19 +425,29 @@ declare class SqliteAdapter extends BaseDbAdapter {
   /** 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 search restated as a standalone WHERE fragment: the FTS5 match
+   * `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`
+   * OR exact equality on each integer member when the whole term is a whole
+   * number (since 0.1.150).
    *
    * 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.
+   * SQLite's multi-index OR optimization serves each arm from its own index
+   * (the FTS5 rowid lookup and the member's btree).
    *
    * Index resolution goes through {@link _resolveFtsIndex}, as the leaf path
    * does, so a named `$index` and its "not found" error behave identically.
    */
-  private _buildFtsMatchWhere;
+  private _buildSearchPredicate;
+  /**
+   * How a search runs: the standalone predicate, and whether the leaf path
+   * may keep its FTS5 JOIN form (text members and no numeric branch — zero
+   * behavior change for text-only searches).
+   */
+  private _searchPlan;
   /**
    * 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.
@@ -447,6 +457,8 @@ declare class SqliteAdapter extends BaseDbAdapter {
    * Creates/drops FTS5 virtual tables and sync triggers to match desired fulltext indexes.
    */
   private _syncFtsIndexes;
+  /** Whether an existing FTS5 table has exactly the index's text columns, in order. */
+  private _ftsColumnsMatch;
   /** Creates an FTS5 virtual table with sync triggers and rebuilds the index. */
   private _createFtsTable;
   /** Drops an FTS5 virtual table and its sync triggers. */

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TGenericLogger, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TGenericLogger, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TFilterVisitorOptions, TSqlFragment, TSqlFragment as TSqlFragment$1 } from "@atscript/db-sql-tools";
 import { FilterExpr as FilterExpr$1 } from "@uniqu/core";
 import { TMetadataMap } from "@atscript/typescript/utils";
@@ -357,8 +357,8 @@ declare class SqliteAdapter extends BaseDbAdapter {
   findManyPerPartition(query: DbQuery, partitionBy: readonly string[]): Promise<Array<Record<string, unknown>>>;
   count(query: DbQuery): Promise<number>;
   aggregate(query: DbQuery): Promise<Array<Record<string, unknown>>>;
-  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
-  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
+  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
@@ -425,19 +425,29 @@ declare class SqliteAdapter extends BaseDbAdapter {
   /** 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 search restated as a standalone WHERE fragment: the FTS5 match
+   * `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`
+   * OR exact equality on each integer member when the whole term is a whole
+   * number (since 0.1.150).
    *
    * 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.
+   * SQLite's multi-index OR optimization serves each arm from its own index
+   * (the FTS5 rowid lookup and the member's btree).
    *
    * Index resolution goes through {@link _resolveFtsIndex}, as the leaf path
    * does, so a named `$index` and its "not found" error behave identically.
    */
-  private _buildFtsMatchWhere;
+  private _buildSearchPredicate;
+  /**
+   * How a search runs: the standalone predicate, and whether the leaf path
+   * may keep its FTS5 JOIN form (text members and no numeric branch — zero
+   * behavior change for text-only searches).
+   */
+  private _searchPlan;
   /**
    * 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.
@@ -447,6 +457,8 @@ declare class SqliteAdapter extends BaseDbAdapter {
    * Creates/drops FTS5 virtual tables and sync triggers to match desired fulltext indexes.
    */
   private _syncFtsIndexes;
+  /** Whether an existing FTS5 table has exactly the index's text columns, in order. */
+  private _ftsColumnsMatch;
   /** Creates an FTS5 virtual table with sync triggers and rebuilds the index. */
   private _createFtsTable;
   /** Drops an FTS5 virtual table and its sync triggers. */

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, fkColumns, searchIndexNotFoundMessage, vectorIndexNotFoundMessage } from "@atscript/db";
+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, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, stripPartitionRowNumber, toSqlValue } from "@atscript/db-sql-tools";
+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 { bucketer } from "@uniqu/core";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/better-sqlite3-driver.ts
@@ -280,6 +280,7 @@ const sqliteDialect = {
 			params: [likePattern]
 		};
 	},
+	integerText: (expr) => `CAST(CAST(${expr} AS INTEGER) AS TEXT)`,
 	geoWithin(quotedCol, circle) {
 		const dist = haversineDistanceExpr(quotedCol, circle.center);
 		return {
@@ -686,6 +687,42 @@ function getSqliteTxGate(driver) {
 	return gate;
 }
 //#endregion
+//#region src/fts-term.ts
+const BAREWORD = /^[\p{L}\p{N}_]+$/u;
+const KEYWORD = /^(?:AND|OR|NOT|NEAR)$/i;
+/**
+* Turns a user's `$search` text into a safe FTS5 MATCH expression (since
+* 0.1.150). FTS5 reads the raw text as a query language — `-2946`, `a AND`,
+* `title:x`, `(`, a stray `"` — and throws a syntax error on most of it.
+* Every term is therefore quoted (plain words are already safe barewords)
+* so no user text can raise one:
+*
+* - a `"quoted phrase"` stays a phrase (words in order);
+* - a bare word stays a word, and a trailing `*` keeps its prefix meaning
+*   (`quok*` finds `quokka`);
+* - words are AND-ed, as before;
+* - everything else — `AND` / `OR` / `NOT`, `-`, `+`, `^`, `NEAR(…)`,
+*   `column:`, parentheses — is plain text (the tokenizer drops punctuation).
+*
+* Quoted strings never contain a `"`: an inner `"` is doubled (FTS5 escape).
+*/
+function quoteFtsTerm(text) {
+	const parts = [];
+	for (const match of text.matchAll(/"([^"]*)"|(\S+)/g)) {
+		const phrase = match[1];
+		if (phrase !== void 0) {
+			if (phrase.trim()) parts.push(`"${phrase.replace(/"/g, "\"\"")}"`);
+			continue;
+		}
+		const word = match[2];
+		const core = word.replace(/\*+$/, "");
+		if (!core) continue;
+		const quoted = BAREWORD.test(core) && !KEYWORD.test(core) ? core : `"${core.replace(/"/g, "\"\"")}"`;
+		parts.push(core.length < word.length ? `${quoted}*` : quoted);
+	}
+	return parts.length > 0 ? parts.join(" ") : "\"\"";
+}
+//#endregion
 //#region src/sqlite-adapter.ts
 /**
 * SQLite adapter for {@link AtscriptDbTable}.
@@ -1003,7 +1040,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	async aggregate(query) {
 		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);
+		const where = search ? andWhere(this._buildSearchPredicate(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);
@@ -1013,10 +1050,10 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		this._log(sql, params);
 		return this._stmt(() => this.driver.all(sql, params));
 	}
-	async updateOne(filter, data, ops, expectedVersion) {
+	async updateOne(filter, data, ops, expectedVersion, opts) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts, expectedVersion);
 		const { sql, params } = buildUpdate$1(tableName, data, {
 			sql: `rowid = (SELECT rowid FROM "${esc(tableName)}" WHERE ${where.sql} LIMIT 1)`,
 			params: where.params
@@ -1028,9 +1065,9 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 			modifiedCount: result.changes
 		};
 	}
-	async updateMany(filter, data, ops) {
+	async updateMany(filter, data, ops, opts) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts);
 		const { sql, params } = buildUpdate$1(this.resolveTableName(), data, where, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._stmt(() => this._wrapConstraintError(() => this.driver.run(sql, params)));
@@ -1375,12 +1412,14 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	}
 	getSearchIndexes() {
 		const indexes = [];
-		for (const idx of this._getFulltextIndexes()) indexes.push({
+		const ftAll = this._getFulltextIndexes();
+		const ftDefault = defaultFulltextIndex(ftAll);
+		for (const idx of ftAll) indexes.push({
 			name: idx.name,
-			description: `FTS5 index (${idx.fields.map((f) => f.name).join(", ")})`,
+			description: describeFulltext(idx, (names) => `FTS5 index (${names})`),
 			type: "text",
 			fields: this._indexLogicalPaths(idx),
-			isDefault: indexes.length === 0
+			isDefault: idx === ftDefault
 		});
 		let firstVector = true;
 		for (const [field, vec] of this._vectorFields) {
@@ -1397,6 +1436,12 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	}
 	async search(text, query, indexName) {
 		if (!text.trim()) return [];
+		const plan = this._searchPlan(text, indexName);
+		if (!plan.join) {
+			const { sql, params } = buildSelect$1(this.resolveTableName(), andWhere(plan.predicate, buildWhere(query.filter)), query.controls);
+			this._log(sql, params);
+			return this._stmt(() => this.driver.all(sql, params));
+		}
 		const base = this._buildFtsBase(text, query.filter, indexName);
 		const controls = query.controls || {};
 		let cols = "t.*";
@@ -1426,12 +1471,22 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 			count: 0
 		};
 		const data = await this.search(text, query, indexName);
-		const base = this._buildFtsBase(text, query.filter, indexName);
-		const countSql = `SELECT COUNT(*) as cnt ${base.fromWhere}`;
-		this._log(countSql, base.params);
+		const plan = this._searchPlan(text, indexName);
+		let countSql;
+		let countParams;
+		if (plan.join) {
+			const base = this._buildFtsBase(text, query.filter, indexName);
+			countSql = `SELECT COUNT(*) as cnt ${base.fromWhere}`;
+			countParams = base.params;
+		} else {
+			const where = andWhere(plan.predicate, buildWhere(query.filter));
+			countSql = `SELECT COUNT(*) as cnt FROM "${esc(this.resolveTableName())}" WHERE ${where.sql}`;
+			countParams = where.params;
+		}
+		this._log(countSql, countParams);
 		return {
 			data,
-			count: (await this._stmt(() => this.driver.get(countSql, base.params)))?.cnt ?? 0
+			count: (await this._stmt(() => this.driver.get(countSql, countParams)))?.cnt ?? 0
 		};
 	}
 	/** Builds FTS table name from index name: `<table>__fts__<indexName>`. */
@@ -1453,26 +1508,51 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 			if (!found) throw new Error(searchIndexNotFoundMessage(indexName));
 			return found;
 		}
-		return ftIndexes[0];
+		return defaultFulltextIndex(ftIndexes);
 	}
 	/**
-	* The FTS5 match restated as a standalone WHERE fragment:
-	* `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`.
+	* The search restated as a standalone WHERE fragment: the FTS5 match
+	* `rowid IN (SELECT rowid FROM "<table>__fts__<idx>" WHERE "<table>__fts__<idx>" MATCH ?)`
+	* OR exact equality on each integer member when the whole term is a whole
+	* number (since 0.1.150).
 	*
 	* 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.
+	* SQLite's multi-index OR optimization serves each arm from its own index
+	* (the FTS5 rowid lookup and the member's btree).
 	*
 	* 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))}"`;
+	_buildSearchPredicate(text, indexName) {
+		return this._searchPlan(text, indexName).predicate;
+	}
+	/**
+	* How a search runs: the standalone predicate, and whether the leaf path
+	* may keep its FTS5 JOIN form (text members and no numeric branch — zero
+	* behavior change for text-only searches).
+	*/
+	_searchPlan(text, indexName) {
+		const index = this._resolveFtsIndex(indexName);
+		const { text: textFields, integer: integerFields } = splitFulltextFields(index);
+		const n = integerFields.length > 0 ? searchTermInteger(text) : void 0;
+		const parts = [];
+		const params = [];
+		if (textFields.length > 0) {
+			const quoted = `"${esc(this._ftsTableName(index.name))}"`;
+			parts.push(`rowid IN (SELECT rowid FROM ${quoted} WHERE ${quoted} MATCH ?)`);
+			params.push(quoteFtsTerm(text));
+		}
+		if (n !== void 0) for (const f of integerFields) {
+			parts.push(`"${esc(f.name)}" = ?`);
+			params.push(n);
+		}
 		return {
-			sql: `rowid IN (SELECT rowid FROM ${quoted} WHERE ${quoted} MATCH ?)`,
-			params: [text]
+			predicate: orFragment(parts, params),
+			join: textFields.length > 0 && n === void 0
 		};
 	}
 	/**
@@ -1487,7 +1567,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		let fromWhere = `FROM "${esc(tableName)}" AS t`;
 		fromWhere += ` JOIN "${esc(ftsTable)}" AS fts ON t.rowid = fts.rowid`;
 		fromWhere += ` WHERE fts."${esc(ftsTable)}" MATCH ?`;
-		const params = [text];
+		const params = [quoteFtsTerm(text)];
 		if (where.sql !== "1=1") {
 			fromWhere += ` AND (${where.sql})`;
 			params.push(...where.params);
@@ -1501,7 +1581,7 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 	* Creates/drops FTS5 virtual tables and sync triggers to match desired fulltext indexes.
 	*/
 	_syncFtsIndexes(tableName) {
-		const ftIndexes = this._getFulltextIndexes();
+		const ftIndexes = this._getFulltextIndexes().filter((idx) => splitFulltextFields(idx).text.length > 0);
 		const desiredFtsTables = new Set(ftIndexes.map((idx) => this._ftsTableName(idx.name)));
 		const existingFts = this.driver.all(`SELECT name, sql FROM sqlite_master WHERE type='table' AND name LIKE ?`, [`${tableName}__fts__%`]).filter((r) => r.sql.startsWith("CREATE VIRTUAL TABLE")).map((r) => r.name);
 		for (const name of existingFts) if (!desiredFtsTables.has(name)) this._dropFtsTable(name);
@@ -1509,16 +1589,27 @@ var SqliteAdapter = class SqliteAdapter extends BaseDbAdapter {
 		for (const index of ftIndexes) {
 			const ftsTable = this._ftsTableName(index.name);
 			if (!existingSet.has(ftsTable)) this._createFtsTable(tableName, ftsTable, index);
+			else if (!this._ftsColumnsMatch(ftsTable, index)) {
+				this._dropFtsTable(ftsTable);
+				this._createFtsTable(tableName, ftsTable, index);
+			}
 		}
 	}
+	/** Whether an existing FTS5 table has exactly the index's text columns, in order. */
+	_ftsColumnsMatch(ftsTable, index) {
+		const live = this.driver.all(`PRAGMA table_info("${esc(ftsTable)}")`).map((c) => c.name);
+		const desired = splitFulltextFields(index).text.map((f) => f.name);
+		return live.length === desired.length && live.every((name, i) => name === desired[i]);
+	}
 	/** Creates an FTS5 virtual table with sync triggers and rebuilds the index. */
 	_createFtsTable(tableName, ftsTable, index) {
-		const fieldList = index.fields.map((f) => `"${esc(f.name)}"`).join(", ");
+		const fields = splitFulltextFields(index).text;
+		const fieldList = fields.map((f) => `"${esc(f.name)}"`).join(", ");
 		const createSql = `CREATE VIRTUAL TABLE IF NOT EXISTS "${esc(ftsTable)}" USING fts5(${fieldList}, content='${tableName.replace(/'/g, "''")}', content_rowid='rowid')`;
 		this._log(createSql);
 		this.driver.exec(createSql);
-		const newFields = index.fields.map((f) => `new."${esc(f.name)}"`).join(", ");
-		const oldFields = index.fields.map((f) => `old."${esc(f.name)}"`).join(", ");
+		const newFields = fields.map((f) => `new."${esc(f.name)}"`).join(", ");
+		const oldFields = fields.map((f) => `old."${esc(f.name)}"`).join(", ");
 		const ef = esc(ftsTable);
 		const aiSql = `CREATE TRIGGER IF NOT EXISTS "${esc(ftsTable + "__ai")}" AFTER INSERT ON "${esc(tableName)}" BEGIN INSERT INTO "${ef}"(rowid, ${fieldList}) VALUES (new.rowid, ${newFields}); END`;
 		this._log(aiSql);

package/package.json

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