@atscript/moost-db 0.1.83 → 0.1.85

package/dist/index.cjs

@@ -1510,7 +1510,8 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 			fields,
 			type: this.getSerializedType(),
 			actions: this.buildActions(),
-			crud: this.buildCrud()
+			crud: this.buildCrud(),
+			versionColumn: this.readable.versionColumn
 		};
 	}
 	buildCrud() {
@@ -1561,6 +1562,29 @@ registerAsDbReadableController(AsDbReadableController);
 //#endregion
 //#region src/as-db.controller.ts
 var _ref$2, _ref2$1;
+/**
+* Strips the version field from a write body and lifts it to `$cas`, in place.
+* Returns `true` iff a `$cas` predicate was actually attached — callers use
+* this to gate the 404/409 disambiguation `findOne`.
+*
+* Per §6.2 of VERSION_PROPOSAL.md, the moost-db controller treats `version` in
+* a write body as a `$cas` directive rather than a SET. No-op (returns `false`)
+* when:
+* - the payload isn't an object (rejected downstream by the SDK validator),
+* - the version field is absent (presence-based opt-out → last-write-wins),
+* - the value is not a finite number (the SDK will reject loudly via
+*   `$cas` validation — we don't shadow that with a controller-local 400).
+*/
+function liftVersionToCas(payload, versionColumn) {
+	if (payload === null || typeof payload !== "object") return false;
+	const obj = payload;
+	if (!(versionColumn in obj)) return false;
+	const versionValue = obj[versionColumn];
+	if (typeof versionValue !== "number" || !Number.isFinite(versionValue)) return false;
+	delete obj[versionColumn];
+	obj.$cas = { [versionColumn]: versionValue };
+	return true;
+}
 let AsDbController = class AsDbController extends AsDbReadableController {
 	/** Reference to the underlying table (typed for write access). */
 	get table() {
@@ -1607,29 +1631,66 @@ let AsDbController = class AsDbController extends AsDbReadableController {
 	}
 	/**
 	* **PUT /** — fully replaces one or many records matched by primary key.
+	*
+	* When the table opts into OCC (`@db.column.version`), a top-level `version`
+	* field in the body is auto-lifted to `$cas` (§6.2 of VERSION_PROPOSAL.md).
+	* On `matchedCount === 0` for a CAS-protected write, this disambiguates
+	* 404 (row gone) vs 409 (version mismatch) via a single `findOne`.
 	*/
 	async replace(payload) {
+		const versionColumn = this.table.versionColumn;
 		if (Array.isArray(payload)) {
 			const data = await this.onWrite("replaceMany", payload);
 			if (data === void 0) return new _moostjs_event_http.HttpError(500, "Not saved");
+			if (versionColumn !== void 0) for (const item of data) liftVersionToCas(item, versionColumn);
 			return await this.table.bulkReplace(data);
 		}
 		const data = await this.onWrite("replace", payload);
 		if (data === void 0) return new _moostjs_event_http.HttpError(500, "Not saved");
-		return await this.table.replaceOne(data);
+		const hadCasLift = versionColumn !== void 0 && liftVersionToCas(data, versionColumn);
+		const result = await this.table.replaceOne(data);
+		if (hadCasLift && result.matchedCount === 0) return await this._disambiguateMismatch(data, versionColumn);
+		return result;
 	}
 	/**
 	* **PATCH /** — partially updates one or many records matched by primary key.
+	*
+	* Same OCC semantics as {@link replace} (§6.2 / §6.3).
 	*/
 	async update(payload) {
+		const versionColumn = this.table.versionColumn;
 		if (Array.isArray(payload)) {
 			const data = await this.onWrite("updateMany", payload);
 			if (data === void 0) return new _moostjs_event_http.HttpError(500, "Not saved");
+			if (versionColumn !== void 0) for (const item of data) liftVersionToCas(item, versionColumn);
 			return await this.table.bulkUpdate(data);
 		}
 		const data = await this.onWrite("update", payload);
 		if (data === void 0) return new _moostjs_event_http.HttpError(500, "Not saved");
-		return await this.table.updateOne(data);
+		const hadCasLift = versionColumn !== void 0 && liftVersionToCas(data, versionColumn);
+		const result = await this.table.updateOne(data);
+		if (hadCasLift && result.matchedCount === 0) return await this._disambiguateMismatch(data, versionColumn);
+		return result;
+	}
+	/**
+	* Disambiguates a `matchedCount === 0` result on a CAS-protected write:
+	* returns 404 when the row is genuinely missing, 409 with
+	* `{ error: "version_mismatch", currentVersion: N }` when it's present
+	* but the supplied version is stale (§6.3).
+	*/
+	async _disambiguateMismatch(data, versionColumn) {
+		const filter = this.table.resolveIdFilter(data);
+		const row = filter ? await this.table.findOne({
+			filter,
+			controls: {}
+		}) : null;
+		if (row === null) return new _moostjs_event_http.HttpError(404);
+		return new _moostjs_event_http.HttpError(409, {
+			message: "version_mismatch",
+			statusCode: 409,
+			kind: "version_mismatch",
+			currentVersion: row[versionColumn]
+		});
 	}
 	/**
 	* **DELETE /:id** — removes a single record by primary key.

package/dist/index.d.cts

@@ -323,12 +323,26 @@ declare class AsDbController<T extends TAtscriptAnnotatedType = TAtscriptAnnotat
   insert(payload: unknown): Promise<unknown>;
   /**
    * **PUT /** — fully replaces one or many records matched by primary key.
+   *
+   * When the table opts into OCC (`@db.column.version`), a top-level `version`
+   * field in the body is auto-lifted to `$cas` (§6.2 of VERSION_PROPOSAL.md).
+   * On `matchedCount === 0` for a CAS-protected write, this disambiguates
+   * 404 (row gone) vs 409 (version mismatch) via a single `findOne`.
    */
   replace(payload: unknown): Promise<unknown>;
   /**
    * **PATCH /** — partially updates one or many records matched by primary key.
+   *
+   * Same OCC semantics as {@link replace} (§6.2 / §6.3).
    */
   update(payload: unknown): Promise<unknown>;
+  /**
+   * Disambiguates a `matchedCount === 0` result on a CAS-protected write:
+   * returns 404 when the row is genuinely missing, 409 with
+   * `{ error: "version_mismatch", currentVersion: N }` when it's present
+   * but the supplied version is stale (§6.3).
+   */
+  protected _disambiguateMismatch(data: unknown, versionColumn: string): Promise<HttpError>;
   /**
    * **DELETE /:id** — removes a single record by primary key.
    */

package/dist/index.d.mts

@@ -323,12 +323,26 @@ declare class AsDbController<T extends TAtscriptAnnotatedType = TAtscriptAnnotat
   insert(payload: unknown): Promise<unknown>;
   /**
    * **PUT /** — fully replaces one or many records matched by primary key.
+   *
+   * When the table opts into OCC (`@db.column.version`), a top-level `version`
+   * field in the body is auto-lifted to `$cas` (§6.2 of VERSION_PROPOSAL.md).
+   * On `matchedCount === 0` for a CAS-protected write, this disambiguates
+   * 404 (row gone) vs 409 (version mismatch) via a single `findOne`.
    */
   replace(payload: unknown): Promise<unknown>;
   /**
    * **PATCH /** — partially updates one or many records matched by primary key.
+   *
+   * Same OCC semantics as {@link replace} (§6.2 / §6.3).
    */
   update(payload: unknown): Promise<unknown>;
+  /**
+   * Disambiguates a `matchedCount === 0` result on a CAS-protected write:
+   * returns 404 when the row is genuinely missing, 409 with
+   * `{ error: "version_mismatch", currentVersion: N }` when it's present
+   * but the supplied version is stale (§6.3).
+   */
+  protected _disambiguateMismatch(data: unknown, versionColumn: string): Promise<HttpError>;
   /**
    * **DELETE /:id** — removes a single record by primary key.
    */

package/dist/index.mjs

@@ -1509,7 +1509,8 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 			fields,
 			type: this.getSerializedType(),
 			actions: this.buildActions(),
-			crud: this.buildCrud()
+			crud: this.buildCrud(),
+			versionColumn: this.readable.versionColumn
 		};
 	}
 	buildCrud() {
@@ -1560,6 +1561,29 @@ registerAsDbReadableController(AsDbReadableController);
 //#endregion
 //#region src/as-db.controller.ts
 var _ref$2, _ref2$1;
+/**
+* Strips the version field from a write body and lifts it to `$cas`, in place.
+* Returns `true` iff a `$cas` predicate was actually attached — callers use
+* this to gate the 404/409 disambiguation `findOne`.
+*
+* Per §6.2 of VERSION_PROPOSAL.md, the moost-db controller treats `version` in
+* a write body as a `$cas` directive rather than a SET. No-op (returns `false`)
+* when:
+* - the payload isn't an object (rejected downstream by the SDK validator),
+* - the version field is absent (presence-based opt-out → last-write-wins),
+* - the value is not a finite number (the SDK will reject loudly via
+*   `$cas` validation — we don't shadow that with a controller-local 400).
+*/
+function liftVersionToCas(payload, versionColumn) {
+	if (payload === null || typeof payload !== "object") return false;
+	const obj = payload;
+	if (!(versionColumn in obj)) return false;
+	const versionValue = obj[versionColumn];
+	if (typeof versionValue !== "number" || !Number.isFinite(versionValue)) return false;
+	delete obj[versionColumn];
+	obj.$cas = { [versionColumn]: versionValue };
+	return true;
+}
 let AsDbController = class AsDbController extends AsDbReadableController {
 	/** Reference to the underlying table (typed for write access). */
 	get table() {
@@ -1606,29 +1630,66 @@ let AsDbController = class AsDbController extends AsDbReadableController {
 	}
 	/**
 	* **PUT /** — fully replaces one or many records matched by primary key.
+	*
+	* When the table opts into OCC (`@db.column.version`), a top-level `version`
+	* field in the body is auto-lifted to `$cas` (§6.2 of VERSION_PROPOSAL.md).
+	* On `matchedCount === 0` for a CAS-protected write, this disambiguates
+	* 404 (row gone) vs 409 (version mismatch) via a single `findOne`.
 	*/
 	async replace(payload) {
+		const versionColumn = this.table.versionColumn;
 		if (Array.isArray(payload)) {
 			const data = await this.onWrite("replaceMany", payload);
 			if (data === void 0) return new HttpError(500, "Not saved");
+			if (versionColumn !== void 0) for (const item of data) liftVersionToCas(item, versionColumn);
 			return await this.table.bulkReplace(data);
 		}
 		const data = await this.onWrite("replace", payload);
 		if (data === void 0) return new HttpError(500, "Not saved");
-		return await this.table.replaceOne(data);
+		const hadCasLift = versionColumn !== void 0 && liftVersionToCas(data, versionColumn);
+		const result = await this.table.replaceOne(data);
+		if (hadCasLift && result.matchedCount === 0) return await this._disambiguateMismatch(data, versionColumn);
+		return result;
 	}
 	/**
 	* **PATCH /** — partially updates one or many records matched by primary key.
+	*
+	* Same OCC semantics as {@link replace} (§6.2 / §6.3).
 	*/
 	async update(payload) {
+		const versionColumn = this.table.versionColumn;
 		if (Array.isArray(payload)) {
 			const data = await this.onWrite("updateMany", payload);
 			if (data === void 0) return new HttpError(500, "Not saved");
+			if (versionColumn !== void 0) for (const item of data) liftVersionToCas(item, versionColumn);
 			return await this.table.bulkUpdate(data);
 		}
 		const data = await this.onWrite("update", payload);
 		if (data === void 0) return new HttpError(500, "Not saved");
-		return await this.table.updateOne(data);
+		const hadCasLift = versionColumn !== void 0 && liftVersionToCas(data, versionColumn);
+		const result = await this.table.updateOne(data);
+		if (hadCasLift && result.matchedCount === 0) return await this._disambiguateMismatch(data, versionColumn);
+		return result;
+	}
+	/**
+	* Disambiguates a `matchedCount === 0` result on a CAS-protected write:
+	* returns 404 when the row is genuinely missing, 409 with
+	* `{ error: "version_mismatch", currentVersion: N }` when it's present
+	* but the supplied version is stale (§6.3).
+	*/
+	async _disambiguateMismatch(data, versionColumn) {
+		const filter = this.table.resolveIdFilter(data);
+		const row = filter ? await this.table.findOne({
+			filter,
+			controls: {}
+		}) : null;
+		if (row === null) return new HttpError(404);
+		return new HttpError(409, {
+			message: "version_mismatch",
+			statusCode: 409,
+			kind: "version_mismatch",
+			currentVersion: row[versionColumn]
+		});
 	}
 	/**
 	* **DELETE /:id** — removes a single record by primary key.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-db",
-  "version": "0.1.83",
+  "version": "0.1.85",
   "description": "Generic database controller for Moost with Atscript.",
   "keywords": [
     "annotations",
@@ -58,7 +58,7 @@
     "@wooksjs/event-core": "^0.7.13",
     "@wooksjs/http-body": "^0.7.13",
     "moost": "^0.6.15",
-    "@atscript/db": "^0.1.83"
+    "@atscript/db": "^0.1.85"
   },
   "scripts": {
     "postinstall": "asc -f dts",