@atscript/db-mongo 0.1.83 → 0.1.85

package/dist/index.cjs

@@ -1278,9 +1278,17 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 			createValidator: (opts) => this._table.createValidator(opts)
 		};
 	}
-	async nativePatch(filter, patch, ops) {
-		const mongoFilter = require_mongo_filter.buildMongoFilter(filter);
-		const { updateFilter, updateOptions } = new CollectionPatcher(this.getPatcherContext(), patch, ops).preparePatch();
+	async nativePatch(filter, patch, ops, expectedVersion) {
+		const mongoFilter = this._buildCasFilter(filter, expectedVersion, "nativePatch");
+		const versionColumn = this._table.versionColumn;
+		const effectiveOps = versionColumn !== void 0 ? {
+			...ops,
+			inc: {
+				...ops?.inc,
+				[versionColumn]: 1
+			}
+		} : ops;
+		const { updateFilter, updateOptions } = new CollectionPatcher(this.getPatcherContext(), patch, effectiveOps).preparePatch();
 		this._log("updateOne (patch)", mongoFilter, updateFilter);
 		const result = await this.collection.updateOne(mongoFilter, updateFilter, {
 			...updateOptions,
@@ -1477,6 +1485,18 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		}
 	}
 	/**
+	* Builds a Mongo filter for CAS-aware writes. Throws when `expectedVersion`
+	* is supplied for a non-versioned table — fail loud at the adapter boundary
+	* rather than silently dropping the CAS predicate.
+	*/
+	_buildCasFilter(filter, expectedVersion, op) {
+		const versionColumn = this._table.versionColumn;
+		if (expectedVersion !== void 0 && versionColumn === void 0) throw new Error(`${op}: expectedVersion requires versionColumn`);
+		const mongoFilter = require_mongo_filter.buildMongoFilter(filter);
+		if (expectedVersion !== void 0 && versionColumn !== void 0) mongoFilter[versionColumn] = expectedVersion;
+		return mongoFilter;
+	}
+	/**
 	* Wraps an async operation to catch MongoDB duplicate key errors
 	* (code 11000) and rethrow as structured `DbError`.
 	*/
@@ -1492,6 +1512,8 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		}
 	}
 	async insertOne(data) {
+		const versionColumn = this._table.versionColumn;
+		if (versionColumn !== void 0 && !(versionColumn in data)) data[versionColumn] = 0;
 		if (this._incrementFields.size > 0) {
 			const fields = this._fieldsNeedingIncrement(data);
 			if (fields.length > 0) {
@@ -1504,6 +1526,10 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		return { insertedId: this._resolveInsertedId(data, result.insertedId) };
 	}
 	async insertMany(data) {
+		const versionColumn = this._table.versionColumn;
+		if (versionColumn !== void 0) {
+			for (const item of data) if (!(versionColumn in item)) item[versionColumn] = 0;
+		}
 		if (this._incrementFields.size > 0) {
 			const allFields = /* @__PURE__ */ new Set();
 			for (const item of data) for (const f of this._fieldsNeedingIncrement(item)) allFields.add(f);
@@ -1544,9 +1570,9 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 			...this._getSessionOpts()
 		});
 	}
-	async updateOne(filter, data, ops) {
-		const mongoFilter = require_mongo_filter.buildMongoFilter(filter);
-		const updateDoc = buildMongoUpdateDoc(data, ops);
+	async updateOne(filter, data, ops, expectedVersion) {
+		const mongoFilter = this._buildCasFilter(filter, expectedVersion, "updateOne");
+		const updateDoc = buildMongoUpdateDoc(data, ops, this._table.versionColumn);
 		this._log("updateOne", mongoFilter, updateDoc);
 		const result = await this.collection.updateOne(mongoFilter, updateDoc, this._getSessionOpts());
 		return {
@@ -1554,10 +1580,18 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 			modifiedCount: result.modifiedCount
 		};
 	}
-	async replaceOne(filter, data) {
-		const mongoFilter = require_mongo_filter.buildMongoFilter(filter);
+	async replaceOne(filter, data, expectedVersion) {
+		const mongoFilter = this._buildCasFilter(filter, expectedVersion, "replaceOne");
+		const versionColumn = this._table.versionColumn;
 		this._log("replaceOne", mongoFilter, data);
-		const result = await this._wrapDuplicateKeyError(() => this.collection.replaceOne(mongoFilter, data, this._getSessionOpts()));
+		let result;
+		if (versionColumn !== void 0) {
+			const pipeline = [{ $replaceWith: {
+				...data,
+				[versionColumn]: { $add: [`$${versionColumn}`, 1] }
+			} }];
+			result = await this._wrapDuplicateKeyError(() => this.collection.updateOne(mongoFilter, pipeline, this._getSessionOpts()));
+		} else result = await this._wrapDuplicateKeyError(() => this.collection.replaceOne(mongoFilter, data, this._getSessionOpts()));
 		return {
 			matchedCount: result.matchedCount,
 			modifiedCount: result.modifiedCount
@@ -1569,8 +1603,9 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 		return { deletedCount: (await this.collection.deleteOne(mongoFilter, this._getSessionOpts())).deletedCount };
 	}
 	async updateMany(filter, data, ops) {
+		const versionColumn = this._table.versionColumn;
 		const mongoFilter = require_mongo_filter.buildMongoFilter(filter);
-		const updateDoc = buildMongoUpdateDoc(data, ops);
+		const updateDoc = buildMongoUpdateDoc(data, ops, versionColumn);
 		this._log("updateMany", mongoFilter, updateDoc);
 		const result = await this.collection.updateMany(mongoFilter, updateDoc, this._getSessionOpts());
 		return {
@@ -1580,8 +1615,9 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async replaceMany(filter, data) {
 		const mongoFilter = require_mongo_filter.buildMongoFilter(filter);
-		this._log("replaceMany", mongoFilter, { $set: data });
-		const result = await this.collection.updateMany(mongoFilter, { $set: data }, this._getSessionOpts());
+		const updateDoc = buildMongoUpdateDoc(data, void 0, this._table.versionColumn);
+		this._log("replaceMany", mongoFilter, updateDoc);
+		const result = await this.collection.updateMany(mongoFilter, updateDoc, this._getSessionOpts());
 		return {
 			matchedCount: result.matchedCount,
 			modifiedCount: result.modifiedCount
@@ -1781,9 +1817,11 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 /**
 * Builds a MongoDB update document from a data object that may contain
 * field ops (`{ $inc: N }`, `{ $dec: N }`, `{ $mul: N }`).
-* Regular fields go into `$set`, ops go into `$inc` / `$mul`.
+* Regular fields go into `$set`, ops go into `$inc` / `$mul`. When
+* `versionColumn` is supplied, an auto-bump (`$inc: { <col>: 1 }`) is merged
+* in so versioned tables increment monotonically on every successful update.
 */
-function buildMongoUpdateDoc(data, ops) {
+function buildMongoUpdateDoc(data, ops, versionColumn) {
 	const updateDoc = {};
 	let hasData = false;
 	for (const _ in data) {
@@ -1791,7 +1829,11 @@ function buildMongoUpdateDoc(data, ops) {
 		break;
 	}
 	if (hasData) updateDoc.$set = data;
-	if (ops?.inc) updateDoc.$inc = ops.inc;
+	if (ops?.inc || versionColumn !== void 0) {
+		const inc = { ...ops?.inc };
+		if (versionColumn !== void 0) inc[versionColumn] = 1;
+		updateDoc.$inc = inc;
+	}
 	if (ops?.mul) updateDoc.$mul = ops.mul;
 	return updateDoc;
 }

package/dist/index.d.cts

@@ -254,7 +254,7 @@ 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): Promise<TDbUpdateResult>;
+  nativePatch(filter: FilterExpr, patch: unknown, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
   onBeforeFlatten(_type: unknown): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
   getMetadataOverrides(meta: TableMetadata): TMetadataOverrides;
@@ -283,6 +283,12 @@ declare class MongoAdapter extends BaseDbAdapter {
   }>;
   collectionExists(): Promise<boolean>;
   ensureCollectionExists(): Promise<void>;
+  /**
+   * Builds a Mongo filter for CAS-aware writes. Throws when `expectedVersion`
+   * is supplied for a non-versioned table — fail loud at the adapter boundary
+   * rather than silently dropping the CAS predicate.
+   */
+  private _buildCasFilter;
   /**
    * Wraps an async operation to catch MongoDB duplicate key errors
    * (code 11000) and rethrow as structured `DbError`.
@@ -293,8 +299,8 @@ 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): Promise<TDbUpdateResult>;
-  replaceOne(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): 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>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;

package/dist/index.d.mts

@@ -254,7 +254,7 @@ 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): Promise<TDbUpdateResult>;
+  nativePatch(filter: FilterExpr, patch: unknown, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
   onBeforeFlatten(_type: unknown): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
   getMetadataOverrides(meta: TableMetadata): TMetadataOverrides;
@@ -283,6 +283,12 @@ declare class MongoAdapter extends BaseDbAdapter {
   }>;
   collectionExists(): Promise<boolean>;
   ensureCollectionExists(): Promise<void>;
+  /**
+   * Builds a Mongo filter for CAS-aware writes. Throws when `expectedVersion`
+   * is supplied for a non-versioned table — fail loud at the adapter boundary
+   * rather than silently dropping the CAS predicate.
+   */
+  private _buildCasFilter;
   /**
    * Wraps an async operation to catch MongoDB duplicate key errors
    * (code 11000) and rethrow as structured `DbError`.
@@ -293,8 +299,8 @@ 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): Promise<TDbUpdateResult>;
-  replaceOne(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): 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>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;

package/dist/index.mjs

@@ -1277,9 +1277,17 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 			createValidator: (opts) => this._table.createValidator(opts)
 		};
 	}
-	async nativePatch(filter, patch, ops) {
-		const mongoFilter = buildMongoFilter(filter);
-		const { updateFilter, updateOptions } = new CollectionPatcher(this.getPatcherContext(), patch, ops).preparePatch();
+	async nativePatch(filter, patch, ops, expectedVersion) {
+		const mongoFilter = this._buildCasFilter(filter, expectedVersion, "nativePatch");
+		const versionColumn = this._table.versionColumn;
+		const effectiveOps = versionColumn !== void 0 ? {
+			...ops,
+			inc: {
+				...ops?.inc,
+				[versionColumn]: 1
+			}
+		} : ops;
+		const { updateFilter, updateOptions } = new CollectionPatcher(this.getPatcherContext(), patch, effectiveOps).preparePatch();
 		this._log("updateOne (patch)", mongoFilter, updateFilter);
 		const result = await this.collection.updateOne(mongoFilter, updateFilter, {
 			...updateOptions,
@@ -1476,6 +1484,18 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		}
 	}
 	/**
+	* Builds a Mongo filter for CAS-aware writes. Throws when `expectedVersion`
+	* is supplied for a non-versioned table — fail loud at the adapter boundary
+	* rather than silently dropping the CAS predicate.
+	*/
+	_buildCasFilter(filter, expectedVersion, op) {
+		const versionColumn = this._table.versionColumn;
+		if (expectedVersion !== void 0 && versionColumn === void 0) throw new Error(`${op}: expectedVersion requires versionColumn`);
+		const mongoFilter = buildMongoFilter(filter);
+		if (expectedVersion !== void 0 && versionColumn !== void 0) mongoFilter[versionColumn] = expectedVersion;
+		return mongoFilter;
+	}
+	/**
 	* Wraps an async operation to catch MongoDB duplicate key errors
 	* (code 11000) and rethrow as structured `DbError`.
 	*/
@@ -1491,6 +1511,8 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		}
 	}
 	async insertOne(data) {
+		const versionColumn = this._table.versionColumn;
+		if (versionColumn !== void 0 && !(versionColumn in data)) data[versionColumn] = 0;
 		if (this._incrementFields.size > 0) {
 			const fields = this._fieldsNeedingIncrement(data);
 			if (fields.length > 0) {
@@ -1503,6 +1525,10 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		return { insertedId: this._resolveInsertedId(data, result.insertedId) };
 	}
 	async insertMany(data) {
+		const versionColumn = this._table.versionColumn;
+		if (versionColumn !== void 0) {
+			for (const item of data) if (!(versionColumn in item)) item[versionColumn] = 0;
+		}
 		if (this._incrementFields.size > 0) {
 			const allFields = /* @__PURE__ */ new Set();
 			for (const item of data) for (const f of this._fieldsNeedingIncrement(item)) allFields.add(f);
@@ -1543,9 +1569,9 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 			...this._getSessionOpts()
 		});
 	}
-	async updateOne(filter, data, ops) {
-		const mongoFilter = buildMongoFilter(filter);
-		const updateDoc = buildMongoUpdateDoc(data, ops);
+	async updateOne(filter, data, ops, expectedVersion) {
+		const mongoFilter = this._buildCasFilter(filter, expectedVersion, "updateOne");
+		const updateDoc = buildMongoUpdateDoc(data, ops, this._table.versionColumn);
 		this._log("updateOne", mongoFilter, updateDoc);
 		const result = await this.collection.updateOne(mongoFilter, updateDoc, this._getSessionOpts());
 		return {
@@ -1553,10 +1579,18 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 			modifiedCount: result.modifiedCount
 		};
 	}
-	async replaceOne(filter, data) {
-		const mongoFilter = buildMongoFilter(filter);
+	async replaceOne(filter, data, expectedVersion) {
+		const mongoFilter = this._buildCasFilter(filter, expectedVersion, "replaceOne");
+		const versionColumn = this._table.versionColumn;
 		this._log("replaceOne", mongoFilter, data);
-		const result = await this._wrapDuplicateKeyError(() => this.collection.replaceOne(mongoFilter, data, this._getSessionOpts()));
+		let result;
+		if (versionColumn !== void 0) {
+			const pipeline = [{ $replaceWith: {
+				...data,
+				[versionColumn]: { $add: [`$${versionColumn}`, 1] }
+			} }];
+			result = await this._wrapDuplicateKeyError(() => this.collection.updateOne(mongoFilter, pipeline, this._getSessionOpts()));
+		} else result = await this._wrapDuplicateKeyError(() => this.collection.replaceOne(mongoFilter, data, this._getSessionOpts()));
 		return {
 			matchedCount: result.matchedCount,
 			modifiedCount: result.modifiedCount
@@ -1568,8 +1602,9 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 		return { deletedCount: (await this.collection.deleteOne(mongoFilter, this._getSessionOpts())).deletedCount };
 	}
 	async updateMany(filter, data, ops) {
+		const versionColumn = this._table.versionColumn;
 		const mongoFilter = buildMongoFilter(filter);
-		const updateDoc = buildMongoUpdateDoc(data, ops);
+		const updateDoc = buildMongoUpdateDoc(data, ops, versionColumn);
 		this._log("updateMany", mongoFilter, updateDoc);
 		const result = await this.collection.updateMany(mongoFilter, updateDoc, this._getSessionOpts());
 		return {
@@ -1579,8 +1614,9 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	}
 	async replaceMany(filter, data) {
 		const mongoFilter = buildMongoFilter(filter);
-		this._log("replaceMany", mongoFilter, { $set: data });
-		const result = await this.collection.updateMany(mongoFilter, { $set: data }, this._getSessionOpts());
+		const updateDoc = buildMongoUpdateDoc(data, void 0, this._table.versionColumn);
+		this._log("replaceMany", mongoFilter, updateDoc);
+		const result = await this.collection.updateMany(mongoFilter, updateDoc, this._getSessionOpts());
 		return {
 			matchedCount: result.matchedCount,
 			modifiedCount: result.modifiedCount
@@ -1780,9 +1816,11 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 /**
 * Builds a MongoDB update document from a data object that may contain
 * field ops (`{ $inc: N }`, `{ $dec: N }`, `{ $mul: N }`).
-* Regular fields go into `$set`, ops go into `$inc` / `$mul`.
+* Regular fields go into `$set`, ops go into `$inc` / `$mul`. When
+* `versionColumn` is supplied, an auto-bump (`$inc: { <col>: 1 }`) is merged
+* in so versioned tables increment monotonically on every successful update.
 */
-function buildMongoUpdateDoc(data, ops) {
+function buildMongoUpdateDoc(data, ops, versionColumn) {
 	const updateDoc = {};
 	let hasData = false;
 	for (const _ in data) {
@@ -1790,7 +1828,11 @@ function buildMongoUpdateDoc(data, ops) {
 		break;
 	}
 	if (hasData) updateDoc.$set = data;
-	if (ops?.inc) updateDoc.$inc = ops.inc;
+	if (ops?.inc || versionColumn !== void 0) {
+		const inc = { ...ops?.inc };
+		if (versionColumn !== void 0) inc[versionColumn] = 1;
+		updateDoc.$inc = inc;
+	}
 	if (ops?.mul) updateDoc.$mul = ops.mul;
 	return updateDoc;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mongo",
-  "version": "0.1.83",
+  "version": "0.1.85",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -49,13 +49,14 @@
     "@atscript/core": "^0.1.59",
     "@atscript/typescript": "^0.1.59",
     "mongodb": "^6.17.0",
+    "mongodb-memory-server-core": "^10.0.0",
     "unplugin-atscript": "^0.1.59"
   },
   "peerDependencies": {
     "@atscript/core": "^0.1.59",
     "@atscript/typescript": "^0.1.59",
     "mongodb": "^6.17.0",
-    "@atscript/db": "^0.1.83"
+    "@atscript/db": "^0.1.85"
   },
   "scripts": {
     "postinstall": "asc -f dts",