@atscript/db-mongo 0.1.148 → 0.1.150

package/dist/agg.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_mongo_accumulator = require("./mongo-accumulator-BKMdRf3s.cjs");
+const require_mongo_accumulator = require("./mongo-accumulator-BQBMx4GC.cjs");
 let _atscript_db = require("@atscript/db");
 let _atscript_db_agg = require("@atscript/db/agg");
 let _uniqu_core = require("@uniqu/core");

package/dist/agg.mjs

@@ -1,4 +1,4 @@
-import { d as orNull, i as buildMongoFilter, l as exprToMongo, n as distinctCountExpr, s as mongoFilterStages, t as buildAccumulator, u as notNullExpr } from "./mongo-accumulator-BvJNCVoc.mjs";
+import { d as orNull, i as buildMongoFilter, l as exprToMongo, n as distinctCountExpr, s as mongoFilterStages, t as buildAccumulator, u as notNullExpr } from "./mongo-accumulator-DYhg8usT.mjs";
 import { evaluateExpr } from "@atscript/db";
 import { resolveAlias } from "@atscript/db/agg";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_mongo_accumulator = require("./mongo-accumulator-BKMdRf3s.cjs");
+const require_mongo_accumulator = require("./mongo-accumulator-BQBMx4GC.cjs");
 let _atscript_db = require("@atscript/db");
 let mongodb = require("mongodb");
 let _atscript_db_agg = require("@atscript/db/agg");
@@ -908,10 +908,24 @@ function buildSearchStage(host, text, indexName, controls) {
 	const index = host.getMongoSearchIndex(indexName);
 	if (!index) return;
 	if (index.type === "vector") throw new Error("Vector indexes cannot be used with text search. Use vectorSearch() instead.");
-	if (index.type === "text") return {
-		stage: { $match: { $text: { $search: text } } },
-		classicText: true
-	};
+	if (index.type === "text") {
+		const n = (0, _atscript_db.searchTermInteger)(text);
+		const keys = n === void 0 ? [] : host.getNumericSearchKeys(index);
+		const hasText = Object.keys(index.fields).length > 0;
+		const equalities = keys.map((key) => ({ [key]: {
+			$eq: n,
+			$type: "number"
+		} }));
+		if (!hasText) return {
+			stage: { $match: equalities.length === 0 ? { _id: { $in: [] } } : equalities.length === 1 ? equalities[0] : { $or: equalities } },
+			classicText: false
+		};
+		const textMatch = { $text: { $search: text } };
+		return {
+			stage: { $match: equalities.length > 0 ? { $or: [textMatch, ...equalities] } : textMatch },
+			classicText: true
+		};
+	}
 	const searchIndex = index;
 	const fuzzy = resolveSearchFuzzy(searchIndex, controls);
 	const strategy = searchIndex.strategy ?? "compound";
@@ -949,6 +963,11 @@ function buildSearchStage(host, text, indexName, controls) {
 		for (const path of paths.autocompleteOutside) clauses.push(autocompleteOp(path));
 		for (const group of paths.arrayGroups) for (const leaf of group.autocompleteLeaves) clauses.push(embeddedAutocompleteClause(group.chain, leaf));
 	}
+	const n = (0, _atscript_db.searchTermInteger)(text);
+	if (n !== void 0) for (const path of host.getNumericSearchKeys(index)) clauses.push({ equals: {
+		path,
+		value: n
+	} });
 	let body;
 	if (clauses.length <= 1) body = clauses[0] ?? textClause();
 	else body = { compound: {
@@ -1517,7 +1536,9 @@ async function syncIndexesImpl(host) {
 		let mongoType;
 		if (index.type === "fulltext") {
 			mongoType = "text";
-			for (const f of index.fields) {
+			const textFields = index.fields.filter((f) => !f.integer);
+			if (textFields.length === 0) continue;
+			for (const f of textFields) {
 				fields[f.name] = "text";
 				weights[f.name] = f.weight ?? 1;
 			}
@@ -2113,13 +2134,13 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 			createValidator: (opts) => this._table.createValidator(opts)
 		};
 	}
-	async nativePatch(filter, patch, ops, expectedVersion) {
+	async nativePatch(filter, patch, ops, expectedVersion, opts) {
 		const mongoFilter = await this._buildCasFilter(filter, expectedVersion, "nativePatch");
 		if (!mongoFilter) return {
 			matchedCount: 0,
 			modifiedCount: 0
 		};
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts, expectedVersion);
 		const effectiveOps = versionColumn !== void 0 ? {
 			...ops,
 			inc: {
@@ -2227,6 +2248,18 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		for (const field of this._pendingUniqueFields) this._addMongoIndexField("unique", "__pk", meta.documentPath(field));
 		for (const pending of this._pendingSearchFields) this._addFieldToSearchIndex("search_text", pending.indexName, pending.field, pending.mappings);
 		this._pendingSearchFields = [];
+		const textBearing = [...this._table.indexes.values()].filter((i) => i.type === "fulltext" && i.fields.some((f) => !f.integer));
+		if (textBearing.length > 1) throw new Error(`MongoDB allows one text index per collection: "${this._table.tableName}" declares ${textBearing.length} @db.index.fulltext names with text fields (${textBearing.map((i) => `"${i.name}"`).join(", ")}). Merge them into one name; integer-only fulltext indexes may be declared separately.`);
+		for (const fulltext of this._table.indexes.values()) {
+			if (fulltext.type !== "fulltext" || !fulltext.fields.some((f) => f.integer)) continue;
+			const logical = this._indexLogicalPaths(fulltext);
+			for (const index of this._mongoIndexes.values()) {
+				if (index.type !== "search_text") continue;
+				fulltext.fields.forEach((f, i) => {
+					if (f.integer) this._addFieldToSearchIndex("search_text", index.name, logical[i], [{ type: "number" }]);
+				});
+			}
+		}
 		for (const [key, value] of this._vectorFilters.entries()) {
 			const index = this._mongoIndexes.get(key);
 			if (index && index.type === "vector") index.definition.fields?.push({
@@ -2250,13 +2283,19 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 			this._table.flatMap;
 			this._searchIndexesMap = /* @__PURE__ */ new Map();
 			let defaultIndex;
-			for (const index of this._table.indexes.values()) if (index.type === "fulltext" && !defaultIndex) defaultIndex = {
-				key: index.key,
-				name: index.name,
-				type: "text",
-				fields: Object.fromEntries(index.fields.map((f) => [f.name, "text"])),
-				weights: Object.fromEntries(index.fields.filter((f) => f.weight).map((f) => [f.name, f.weight]))
-			};
+			const fulltexts = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+			const defaultFulltext = (0, _atscript_db.defaultFulltextIndex)(fulltexts);
+			for (const index of fulltexts) {
+				const converted = {
+					key: index.key,
+					name: index.name,
+					type: "text",
+					fields: Object.fromEntries(index.fields.filter((f) => !f.integer).map((f) => [f.name, "text"])),
+					weights: Object.fromEntries(index.fields.filter((f) => f.weight && !f.integer).map((f) => [f.name, f.weight]))
+				};
+				if (index === defaultFulltext) defaultIndex = converted;
+				else if (!this._searchIndexesMap.has(index.name)) this._searchIndexesMap.set(index.name, converted);
+			}
 			for (const index of this._mongoIndexes.values()) switch (index.type) {
 				case "text":
 					if (!defaultIndex) defaultIndex = index;
@@ -2277,6 +2316,27 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		}
 		return this._searchIndexesMap;
 	}
+	/**
+	* Stored paths of the integer members matched by exact number next to a
+	* text search on `index` (since 0.1.150). A classic text index contributes
+	* the integer members of its own `@db.index.fulltext` (per index, as on the
+	* SQL adapters); an Atlas index the integer members it maps (every fulltext
+	* integer member is mapped, so they are in its reported `paths`).
+	*/
+	getNumericSearchKeys(index) {
+		this._table.flatMap;
+		const keys = /* @__PURE__ */ new Set();
+		if (index.type === "text") {
+			const source = this._table.indexes.get(index.key);
+			if (source?.type === "fulltext") {
+				for (const f of source.fields) if (f.integer) keys.add(f.name);
+			}
+		} else for (const fulltext of this._table.indexes.values()) {
+			if (fulltext.type !== "fulltext") continue;
+			for (const f of fulltext.fields) if (f.integer) keys.add(f.name);
+		}
+		return [...keys];
+	}
 	/** Returns a specific MongoDB search index by name. */
 	getMongoSearchIndex(name = DEFAULT_INDEX_NAME) {
 		return this.getMongoSearchIndexes().get(name);
@@ -2620,13 +2680,13 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 			...this._getSessionOpts()
 		});
 	}
-	async updateOne(filter, data, ops, expectedVersion) {
+	async updateOne(filter, data, ops, expectedVersion, opts) {
 		const mongoFilter = await this._buildCasFilter(filter, expectedVersion, "updateOne");
 		if (!mongoFilter) return {
 			matchedCount: 0,
 			modifiedCount: 0
 		};
-		const updateDoc = buildMongoUpdateDoc(data, ops, this._table.versionColumnPhysical);
+		const updateDoc = buildMongoUpdateDoc(data, ops, this._versionColumnFor(opts, expectedVersion));
 		this._log("updateOne", mongoFilter, updateDoc);
 		return this._wrapUpdate(() => this.collection.updateOne(mongoFilter, updateDoc, this._getSessionOpts()));
 	}
@@ -2653,9 +2713,8 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		this._log("deleteOne", mongoFilter);
 		return { deletedCount: (await this.collection.deleteOne(mongoFilter, this._getSessionOpts())).deletedCount };
 	}
-	async updateMany(filter, data, ops) {
-		const versionColumn = this._table.versionColumnPhysical;
-		const updateDoc = buildMongoUpdateDoc(data, ops, versionColumn);
+	async updateMany(filter, data, ops, opts) {
+		const updateDoc = buildMongoUpdateDoc(data, ops, this._versionColumnFor(opts));
 		return this._updateMatching(filter, (mongoFilter) => {
 			this._log("updateMany", mongoFilter, updateDoc);
 			return this._wrapUpdate(() => this.collection.updateMany(mongoFilter, updateDoc, this._getSessionOpts()));

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { a as buildMongoFilter, c as mongoFilterStages, i as TMongoFilterPlan, l as planStages, n as TMongoFieldCollation, o as buildMongoQuery, r as TMongoFilterOptions, s as collationOfAdapter, t as REL_FILTER_TEMP_PREFIX } from "./mongo-filter-CGd9ryOD.cjs";
-import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbCollation, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TViewCapability, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
+import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbCollation, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateOptions, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TViewCapability, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
 import { AggregateOptions, AggregationCursor, ClientSession, Collection, Db, Document, Filter, MongoClient, ObjectId, UpdateFilter, UpdateOptions } from "mongodb";
 import { TAtscriptAnnotatedType, TMetadataMap, TValidatorOptions, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
 import { AggregateFn, BucketUnit } from "@uniqu/core";
@@ -402,13 +402,21 @@ declare class MongoAdapter extends BaseDbAdapter {
   loadRelations(rows: Array<Record<string, unknown>>, withRelations: WithRelation[], relations: ReadonlyMap<string, TDbRelation>, foreignKeys: ReadonlyMap<string, TDbForeignKey>, tableResolver?: TTableResolver): Promise<void>;
   /** Returns the context object used by CollectionPatcher. */
   getPatcherContext(): TCollectionPatcherContext;
-  nativePatch(filter: FilterExpr, patch: unknown, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
+  nativePatch(filter: FilterExpr, patch: unknown, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   onBeforeFlatten(_type: unknown): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
   getMetadataOverrides(meta: TableMetadata): TMetadataOverrides;
   onAfterFlatten(): void;
   /** Returns MongoDB-specific search index map (internal). */
   getMongoSearchIndexes(): Map<string, TMongoIndex>;
+  /**
+   * Stored paths of the integer members matched by exact number next to a
+   * text search on `index` (since 0.1.150). A classic text index contributes
+   * the integer members of its own `@db.index.fulltext` (per index, as on the
+   * SQL adapters); an Atlas index the integer members it maps (every fulltext
+   * integer member is mapped, so they are in its reported `paths`).
+   */
+  getNumericSearchKeys(index: TMongoIndex): readonly string[];
   /** Returns a specific MongoDB search index by name. */
   getMongoSearchIndex(name?: string): TMongoIndex | undefined;
   /** Returns the default similarity threshold for a vector index (from @db.search.vector.threshold). */
@@ -515,10 +523,10 @@ declare class MongoAdapter extends BaseDbAdapter {
   findOne(query: DbQuery): Promise<Record<string, unknown> | null>;
   findMany(query: DbQuery): Promise<Array<Record<string, unknown>>>;
   count(query: DbQuery): Promise<number>;
-  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
-  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
+  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;
   clearCollectionCache(): void;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { a as buildMongoFilter, c as mongoFilterStages, i as TMongoFilterPlan, l as planStages, n as TMongoFieldCollation, o as buildMongoQuery, r as TMongoFilterOptions, s as collationOfAdapter, t as REL_FILTER_TEMP_PREFIX } from "./mongo-filter-CGd9ryOD.mjs";
-import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbCollation, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TViewCapability, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
+import { BaseDbAdapter, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbCollation, TDbDeleteResult, TDbFieldMeta, TDbForeignKey, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbRelation, TDbUpdateOptions, TDbUpdateResult, TExistingTableOption, TFieldOps, TMetadataOverrides, TPrimaryKeyChange, TSearchIndexInfo, TSyncColumnResult, TTableResolver, TViewCapability, TableMetadata, WithRelation, getKeyProps } from "@atscript/db";
 import { AggregateOptions, AggregationCursor, ClientSession, Collection, Db, Document, Filter, MongoClient, ObjectId, UpdateFilter, UpdateOptions } from "mongodb";
 import { AggregateFn, BucketUnit } from "@uniqu/core";
 import { TAtscriptAnnotatedType, TMetadataMap, TValidatorOptions, TValidatorPlugin, Validator } from "@atscript/typescript/utils";
@@ -402,13 +402,21 @@ declare class MongoAdapter extends BaseDbAdapter {
   loadRelations(rows: Array<Record<string, unknown>>, withRelations: WithRelation[], relations: ReadonlyMap<string, TDbRelation>, foreignKeys: ReadonlyMap<string, TDbForeignKey>, tableResolver?: TTableResolver): Promise<void>;
   /** Returns the context object used by CollectionPatcher. */
   getPatcherContext(): TCollectionPatcherContext;
-  nativePatch(filter: FilterExpr, patch: unknown, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
+  nativePatch(filter: FilterExpr, patch: unknown, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   onBeforeFlatten(_type: unknown): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
   getMetadataOverrides(meta: TableMetadata): TMetadataOverrides;
   onAfterFlatten(): void;
   /** Returns MongoDB-specific search index map (internal). */
   getMongoSearchIndexes(): Map<string, TMongoIndex>;
+  /**
+   * Stored paths of the integer members matched by exact number next to a
+   * text search on `index` (since 0.1.150). A classic text index contributes
+   * the integer members of its own `@db.index.fulltext` (per index, as on the
+   * SQL adapters); an Atlas index the integer members it maps (every fulltext
+   * integer member is mapped, so they are in its reported `paths`).
+   */
+  getNumericSearchKeys(index: TMongoIndex): readonly string[];
   /** Returns a specific MongoDB search index by name. */
   getMongoSearchIndex(name?: string): TMongoIndex | undefined;
   /** Returns the default similarity threshold for a vector index (from @db.search.vector.threshold). */
@@ -515,10 +523,10 @@ declare class MongoAdapter extends BaseDbAdapter {
   findOne(query: DbQuery): Promise<Record<string, unknown> | null>;
   findMany(query: DbQuery): Promise<Array<Record<string, unknown>>>;
   count(query: DbQuery): Promise<number>;
-  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
-  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
+  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;
   clearCollectionCache(): void;

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { a as buildMongoQuery, c as planStages, d as orNull, f as queryNodeToExpr, i as buildMongoFilter, l as exprToMongo, n as distinctCountExpr, o as collationOfAdapter, p as correlate, r as REL_FILTER_TEMP_PREFIX, s as mongoFilterStages, t as buildAccumulator } from "./mongo-accumulator-BvJNCVoc.mjs";
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, andFilters, bucketTimeZoneUnavailable, computeInsights, containsRelationFilter, createFailureCollector, geoIndexNotFoundMessage, getDbFieldOp, getKeyProps, getPath, isAtscriptDbView, isFieldRef, relationStaticFilter, resolveDesignType, searchIndexNotFoundMessage, tableNameOf, translateQueryTree, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
+import { a as buildMongoQuery, c as planStages, d as orNull, f as queryNodeToExpr, i as buildMongoFilter, l as exprToMongo, n as distinctCountExpr, o as collationOfAdapter, p as correlate, r as REL_FILTER_TEMP_PREFIX, s as mongoFilterStages, t as buildAccumulator } from "./mongo-accumulator-DYhg8usT.mjs";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, andFilters, bucketTimeZoneUnavailable, computeInsights, containsRelationFilter, createFailureCollector, defaultFulltextIndex, geoIndexNotFoundMessage, getDbFieldOp, getKeyProps, getPath, isAtscriptDbView, isFieldRef, relationStaticFilter, resolveDesignType, searchIndexNotFoundMessage, searchTermInteger, tableNameOf, translateQueryTree, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
 import { MongoBulkWriteError, MongoClient, MongoServerError, ObjectId } from "mongodb";
 import { resolveAggregateSearch } from "@atscript/db/agg";
 //#region src/lib/path-utils.ts
@@ -907,10 +907,24 @@ function buildSearchStage(host, text, indexName, controls) {
 	const index = host.getMongoSearchIndex(indexName);
 	if (!index) return;
 	if (index.type === "vector") throw new Error("Vector indexes cannot be used with text search. Use vectorSearch() instead.");
-	if (index.type === "text") return {
-		stage: { $match: { $text: { $search: text } } },
-		classicText: true
-	};
+	if (index.type === "text") {
+		const n = searchTermInteger(text);
+		const keys = n === void 0 ? [] : host.getNumericSearchKeys(index);
+		const hasText = Object.keys(index.fields).length > 0;
+		const equalities = keys.map((key) => ({ [key]: {
+			$eq: n,
+			$type: "number"
+		} }));
+		if (!hasText) return {
+			stage: { $match: equalities.length === 0 ? { _id: { $in: [] } } : equalities.length === 1 ? equalities[0] : { $or: equalities } },
+			classicText: false
+		};
+		const textMatch = { $text: { $search: text } };
+		return {
+			stage: { $match: equalities.length > 0 ? { $or: [textMatch, ...equalities] } : textMatch },
+			classicText: true
+		};
+	}
 	const searchIndex = index;
 	const fuzzy = resolveSearchFuzzy(searchIndex, controls);
 	const strategy = searchIndex.strategy ?? "compound";
@@ -948,6 +962,11 @@ function buildSearchStage(host, text, indexName, controls) {
 		for (const path of paths.autocompleteOutside) clauses.push(autocompleteOp(path));
 		for (const group of paths.arrayGroups) for (const leaf of group.autocompleteLeaves) clauses.push(embeddedAutocompleteClause(group.chain, leaf));
 	}
+	const n = searchTermInteger(text);
+	if (n !== void 0) for (const path of host.getNumericSearchKeys(index)) clauses.push({ equals: {
+		path,
+		value: n
+	} });
 	let body;
 	if (clauses.length <= 1) body = clauses[0] ?? textClause();
 	else body = { compound: {
@@ -1516,7 +1535,9 @@ async function syncIndexesImpl(host) {
 		let mongoType;
 		if (index.type === "fulltext") {
 			mongoType = "text";
-			for (const f of index.fields) {
+			const textFields = index.fields.filter((f) => !f.integer);
+			if (textFields.length === 0) continue;
+			for (const f of textFields) {
 				fields[f.name] = "text";
 				weights[f.name] = f.weight ?? 1;
 			}
@@ -2112,13 +2133,13 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 			createValidator: (opts) => this._table.createValidator(opts)
 		};
 	}
-	async nativePatch(filter, patch, ops, expectedVersion) {
+	async nativePatch(filter, patch, ops, expectedVersion, opts) {
 		const mongoFilter = await this._buildCasFilter(filter, expectedVersion, "nativePatch");
 		if (!mongoFilter) return {
 			matchedCount: 0,
 			modifiedCount: 0
 		};
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts, expectedVersion);
 		const effectiveOps = versionColumn !== void 0 ? {
 			...ops,
 			inc: {
@@ -2226,6 +2247,18 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		for (const field of this._pendingUniqueFields) this._addMongoIndexField("unique", "__pk", meta.documentPath(field));
 		for (const pending of this._pendingSearchFields) this._addFieldToSearchIndex("search_text", pending.indexName, pending.field, pending.mappings);
 		this._pendingSearchFields = [];
+		const textBearing = [...this._table.indexes.values()].filter((i) => i.type === "fulltext" && i.fields.some((f) => !f.integer));
+		if (textBearing.length > 1) throw new Error(`MongoDB allows one text index per collection: "${this._table.tableName}" declares ${textBearing.length} @db.index.fulltext names with text fields (${textBearing.map((i) => `"${i.name}"`).join(", ")}). Merge them into one name; integer-only fulltext indexes may be declared separately.`);
+		for (const fulltext of this._table.indexes.values()) {
+			if (fulltext.type !== "fulltext" || !fulltext.fields.some((f) => f.integer)) continue;
+			const logical = this._indexLogicalPaths(fulltext);
+			for (const index of this._mongoIndexes.values()) {
+				if (index.type !== "search_text") continue;
+				fulltext.fields.forEach((f, i) => {
+					if (f.integer) this._addFieldToSearchIndex("search_text", index.name, logical[i], [{ type: "number" }]);
+				});
+			}
+		}
 		for (const [key, value] of this._vectorFilters.entries()) {
 			const index = this._mongoIndexes.get(key);
 			if (index && index.type === "vector") index.definition.fields?.push({
@@ -2249,13 +2282,19 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 			this._table.flatMap;
 			this._searchIndexesMap = /* @__PURE__ */ new Map();
 			let defaultIndex;
-			for (const index of this._table.indexes.values()) if (index.type === "fulltext" && !defaultIndex) defaultIndex = {
-				key: index.key,
-				name: index.name,
-				type: "text",
-				fields: Object.fromEntries(index.fields.map((f) => [f.name, "text"])),
-				weights: Object.fromEntries(index.fields.filter((f) => f.weight).map((f) => [f.name, f.weight]))
-			};
+			const fulltexts = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+			const defaultFulltext = defaultFulltextIndex(fulltexts);
+			for (const index of fulltexts) {
+				const converted = {
+					key: index.key,
+					name: index.name,
+					type: "text",
+					fields: Object.fromEntries(index.fields.filter((f) => !f.integer).map((f) => [f.name, "text"])),
+					weights: Object.fromEntries(index.fields.filter((f) => f.weight && !f.integer).map((f) => [f.name, f.weight]))
+				};
+				if (index === defaultFulltext) defaultIndex = converted;
+				else if (!this._searchIndexesMap.has(index.name)) this._searchIndexesMap.set(index.name, converted);
+			}
 			for (const index of this._mongoIndexes.values()) switch (index.type) {
 				case "text":
 					if (!defaultIndex) defaultIndex = index;
@@ -2276,6 +2315,27 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		}
 		return this._searchIndexesMap;
 	}
+	/**
+	* Stored paths of the integer members matched by exact number next to a
+	* text search on `index` (since 0.1.150). A classic text index contributes
+	* the integer members of its own `@db.index.fulltext` (per index, as on the
+	* SQL adapters); an Atlas index the integer members it maps (every fulltext
+	* integer member is mapped, so they are in its reported `paths`).
+	*/
+	getNumericSearchKeys(index) {
+		this._table.flatMap;
+		const keys = /* @__PURE__ */ new Set();
+		if (index.type === "text") {
+			const source = this._table.indexes.get(index.key);
+			if (source?.type === "fulltext") {
+				for (const f of source.fields) if (f.integer) keys.add(f.name);
+			}
+		} else for (const fulltext of this._table.indexes.values()) {
+			if (fulltext.type !== "fulltext") continue;
+			for (const f of fulltext.fields) if (f.integer) keys.add(f.name);
+		}
+		return [...keys];
+	}
 	/** Returns a specific MongoDB search index by name. */
 	getMongoSearchIndex(name = DEFAULT_INDEX_NAME) {
 		return this.getMongoSearchIndexes().get(name);
@@ -2619,13 +2679,13 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 			...this._getSessionOpts()
 		});
 	}
-	async updateOne(filter, data, ops, expectedVersion) {
+	async updateOne(filter, data, ops, expectedVersion, opts) {
 		const mongoFilter = await this._buildCasFilter(filter, expectedVersion, "updateOne");
 		if (!mongoFilter) return {
 			matchedCount: 0,
 			modifiedCount: 0
 		};
-		const updateDoc = buildMongoUpdateDoc(data, ops, this._table.versionColumnPhysical);
+		const updateDoc = buildMongoUpdateDoc(data, ops, this._versionColumnFor(opts, expectedVersion));
 		this._log("updateOne", mongoFilter, updateDoc);
 		return this._wrapUpdate(() => this.collection.updateOne(mongoFilter, updateDoc, this._getSessionOpts()));
 	}
@@ -2652,9 +2712,8 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		this._log("deleteOne", mongoFilter);
 		return { deletedCount: (await this.collection.deleteOne(mongoFilter, this._getSessionOpts())).deletedCount };
 	}
-	async updateMany(filter, data, ops) {
-		const versionColumn = this._table.versionColumnPhysical;
-		const updateDoc = buildMongoUpdateDoc(data, ops, versionColumn);
+	async updateMany(filter, data, ops, opts) {
+		const updateDoc = buildMongoUpdateDoc(data, ops, this._versionColumnFor(opts));
 		return this._updateMatching(filter, (mongoFilter) => {
 			this._log("updateMany", mongoFilter, updateDoc);
 			return this._wrapUpdate(() => this.collection.updateMany(mongoFilter, updateDoc, this._getSessionOpts()));

package/dist/{mongo-accumulator-BKMdRf3s.cjs → mongo-accumulator-BQBMx4GC.cjs}

@@ -195,6 +195,20 @@ const mongoVisitor = {
 				$options: flags
 			} } : { [field]: { $regex: pattern } };
 		}
+		if (op === _atscript_db.INTEGER_REGEX_OP) {
+			const { pattern, flags } = parseRegexString(value);
+			const options = flags.replace(/[^imsx]/g, "");
+			return { $expr: { $regexMatch: {
+				input: { $toString: { $convert: {
+					input: `$${field}`,
+					to: "long",
+					onError: null,
+					onNull: null
+				} } },
+				regex: pattern,
+				...options ? { options } : {}
+			} } };
+		}
 		if (op === "$geoWithin") {
 			const { center, radius } = value;
 			return { [field]: { $geoWithin: { $centerSphere: [center, radius / EARTH_RADIUS_M] } } };
@@ -262,6 +276,7 @@ function exactNocase(value) {
 /** Operators whose result never depends on a string collation. */
 const COLLATION_FREE_OPS = new Set([
 	"$regex",
+	_atscript_db.INTEGER_REGEX_OP,
 	"$exists",
 	"$geoWithin"
 ]);

package/dist/{mongo-accumulator-BvJNCVoc.mjs → mongo-accumulator-DYhg8usT.mjs}

@@ -1,4 +1,4 @@
-import { DbError, andFilters, containsRelationFilter, isFieldRef, isResolvedRelationFilter, walkFilter } from "@atscript/db";
+import { DbError, INTEGER_REGEX_OP, andFilters, containsRelationFilter, isFieldRef, isResolvedRelationFilter, walkFilter } from "@atscript/db";
 import { BSONRegExp } from "mongodb";
 import { assertAggregateFn } from "@atscript/db/agg";
 //#region src/lib/lookup-join.ts
@@ -195,6 +195,20 @@ const mongoVisitor = {
 				$options: flags
 			} } : { [field]: { $regex: pattern } };
 		}
+		if (op === INTEGER_REGEX_OP) {
+			const { pattern, flags } = parseRegexString(value);
+			const options = flags.replace(/[^imsx]/g, "");
+			return { $expr: { $regexMatch: {
+				input: { $toString: { $convert: {
+					input: `$${field}`,
+					to: "long",
+					onError: null,
+					onNull: null
+				} } },
+				regex: pattern,
+				...options ? { options } : {}
+			} } };
+		}
 		if (op === "$geoWithin") {
 			const { center, radius } = value;
 			return { [field]: { $geoWithin: { $centerSphere: [center, radius / EARTH_RADIUS_M] } } };
@@ -262,6 +276,7 @@ function exactNocase(value) {
 /** Operators whose result never depends on a string collation. */
 const COLLATION_FREE_OPS = new Set([
 	"$regex",
+	INTEGER_REGEX_OP,
 	"$exists",
 	"$geoWithin"
 ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mongo",
-  "version": "0.1.148",
+  "version": "0.1.150",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -46,19 +46,19 @@
     "access": "public"
   },
   "devDependencies": {
-    "@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",
     "mongodb": "^6.17.0",
     "mongodb-memory-server-core": "^10.0.0",
-    "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",
     "mongodb": "^6.17.0",
-    "@atscript/db": "^0.1.148"
+    "@atscript/db": "^0.1.150"
   },
   "scripts": {
     "postinstall": "asc -f dts",