@atscript/moost-db 0.1.128 → 0.1.130

package/dist/index.cjs

@@ -37,6 +37,7 @@ function badRequest(path, message, top = message) {
 //#region src/validation-interceptor.ts
 const dbErrorCodeToStatus = {
 	CONFLICT: 409,
+	CAS_MISMATCH: 409,
 	TX_WAIT_TIMEOUT: 503
 };
 function transformValidationError(error, reply) {
@@ -1816,6 +1817,32 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 		const fragment = { $or: this._searchFallbackFields.map((f) => ({ [f]: { $regex: rx } })) };
 		return filter && Object.keys(filter).length > 0 ? { $and: [filter, fragment] } : fragment;
 	}
+	/**
+	* The controls a grouped query hands to the adapter. `$search` has two
+	* implementations and exactly one layer may consume it:
+	*
+	* - **native text search** — the adapter applies the term before grouping, so
+	*   `$search` / `$index` ride through untouched.
+	* - **no native search** — the term is this layer's to deal with, so the
+	*   controls are dropped before dispatch; leaving them would make the core
+	*   reject a query it has no way to run.
+	*
+	* Note the second case is deliberately broader than `applySearchFallback`:
+	* that method only rewrites the term when `@db.column.searchable` fields
+	* exist, whereas this drops the controls whenever the source is not natively
+	* searchable. On a table with neither, the term is ignored — which is exactly
+	* what the LEAF path already does for the same table (`_resolveReadStrategy`
+	* falls through to `plain`). Rejecting here instead would make a grouped
+	* query 400 where the leaf list happily returns rows: a new divergence, in
+	* the same shape as the one this whole path exists to remove.
+	*/
+	_aggregateControls(controls) {
+		if (controls.$search === void 0 || this.readable.isSearchable()) return controls;
+		const rest = { ...controls };
+		delete rest.$search;
+		delete rest.$index;
+		return rest;
+	}
 	async _resolveReadStrategy(controls) {
 		const searchTerm = controls.$search;
 		const indexName = controls.$index;
@@ -1881,6 +1908,7 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 		this._coerceActionsControl(controls);
 		const groupBy = controls.$groupBy;
 		if (groupBy?.length && controls.$with?.length) return new _moostjs_event_http.HttpError(400, "Cannot combine $with and $groupBy in the same query");
+		if (groupBy?.length && controls.$vector !== void 0) return new _moostjs_event_http.HttpError(400, "Cannot combine $vector and $groupBy in the same query");
 		const error = this.validateParsed(parsed, "query");
 		if (error) return error;
 		if (groupBy?.length) {
@@ -1893,7 +1921,7 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 			const filter = this.applySearchFallback(await this.transformFilter(parsed.filter), controls);
 			return this.readable.aggregate({
 				filter,
-				controls,
+				controls: this._aggregateControls(controls),
 				insights: parsed.insights
 			});
 		}

package/dist/index.d.cts

@@ -393,6 +393,26 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
    * (native wins) and the request isn't a vector search (`$vector` consumes the term).
    */
   protected applySearchFallback(filter: FilterExpr | undefined, controls: Record<string, unknown>): FilterExpr | undefined;
+  /**
+   * The controls a grouped query hands to the adapter. `$search` has two
+   * implementations and exactly one layer may consume it:
+   *
+   * - **native text search** — the adapter applies the term before grouping, so
+   *   `$search` / `$index` ride through untouched.
+   * - **no native search** — the term is this layer's to deal with, so the
+   *   controls are dropped before dispatch; leaving them would make the core
+   *   reject a query it has no way to run.
+   *
+   * Note the second case is deliberately broader than `applySearchFallback`:
+   * that method only rewrites the term when `@db.column.searchable` fields
+   * exist, whereas this drops the controls whenever the source is not natively
+   * searchable. On a table with neither, the term is ignored — which is exactly
+   * what the LEAF path already does for the same table (`_resolveReadStrategy`
+   * falls through to `plain`). Rejecting here instead would make a grouped
+   * query 400 where the leaf list happily returns rows: a new divergence, in
+   * the same shape as the one this whole path exists to remove.
+   */
+  private _aggregateControls;
   private _resolveReadStrategy;
   /**
    * Shared `query` / `pages` pipeline: prepare actions augmentation + read

package/dist/index.d.mts

@@ -393,6 +393,26 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
    * (native wins) and the request isn't a vector search (`$vector` consumes the term).
    */
   protected applySearchFallback(filter: FilterExpr | undefined, controls: Record<string, unknown>): FilterExpr | undefined;
+  /**
+   * The controls a grouped query hands to the adapter. `$search` has two
+   * implementations and exactly one layer may consume it:
+   *
+   * - **native text search** — the adapter applies the term before grouping, so
+   *   `$search` / `$index` ride through untouched.
+   * - **no native search** — the term is this layer's to deal with, so the
+   *   controls are dropped before dispatch; leaving them would make the core
+   *   reject a query it has no way to run.
+   *
+   * Note the second case is deliberately broader than `applySearchFallback`:
+   * that method only rewrites the term when `@db.column.searchable` fields
+   * exist, whereas this drops the controls whenever the source is not natively
+   * searchable. On a table with neither, the term is ignored — which is exactly
+   * what the LEAF path already does for the same table (`_resolveReadStrategy`
+   * falls through to `plain`). Rejecting here instead would make a grouped
+   * query 400 where the leaf list happily returns rows: a new divergence, in
+   * the same shape as the one this whole path exists to remove.
+   */
+  private _aggregateControls;
   private _resolveReadStrategy;
   /**
    * Shared `query` / `pages` pipeline: prepare actions augmentation + read

package/dist/index.mjs

@@ -36,6 +36,7 @@ function badRequest(path, message, top = message) {
 //#region src/validation-interceptor.ts
 const dbErrorCodeToStatus = {
 	CONFLICT: 409,
+	CAS_MISMATCH: 409,
 	TX_WAIT_TIMEOUT: 503
 };
 function transformValidationError(error, reply) {
@@ -1815,6 +1816,32 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 		const fragment = { $or: this._searchFallbackFields.map((f) => ({ [f]: { $regex: rx } })) };
 		return filter && Object.keys(filter).length > 0 ? { $and: [filter, fragment] } : fragment;
 	}
+	/**
+	* The controls a grouped query hands to the adapter. `$search` has two
+	* implementations and exactly one layer may consume it:
+	*
+	* - **native text search** — the adapter applies the term before grouping, so
+	*   `$search` / `$index` ride through untouched.
+	* - **no native search** — the term is this layer's to deal with, so the
+	*   controls are dropped before dispatch; leaving them would make the core
+	*   reject a query it has no way to run.
+	*
+	* Note the second case is deliberately broader than `applySearchFallback`:
+	* that method only rewrites the term when `@db.column.searchable` fields
+	* exist, whereas this drops the controls whenever the source is not natively
+	* searchable. On a table with neither, the term is ignored — which is exactly
+	* what the LEAF path already does for the same table (`_resolveReadStrategy`
+	* falls through to `plain`). Rejecting here instead would make a grouped
+	* query 400 where the leaf list happily returns rows: a new divergence, in
+	* the same shape as the one this whole path exists to remove.
+	*/
+	_aggregateControls(controls) {
+		if (controls.$search === void 0 || this.readable.isSearchable()) return controls;
+		const rest = { ...controls };
+		delete rest.$search;
+		delete rest.$index;
+		return rest;
+	}
 	async _resolveReadStrategy(controls) {
 		const searchTerm = controls.$search;
 		const indexName = controls.$index;
@@ -1880,6 +1907,7 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 		this._coerceActionsControl(controls);
 		const groupBy = controls.$groupBy;
 		if (groupBy?.length && controls.$with?.length) return new HttpError(400, "Cannot combine $with and $groupBy in the same query");
+		if (groupBy?.length && controls.$vector !== void 0) return new HttpError(400, "Cannot combine $vector and $groupBy in the same query");
 		const error = this.validateParsed(parsed, "query");
 		if (error) return error;
 		if (groupBy?.length) {
@@ -1892,7 +1920,7 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 			const filter = this.applySearchFallback(await this.transformFilter(parsed.filter), controls);
 			return this.readable.aggregate({
 				filter,
-				controls,
+				controls: this._aggregateControls(controls),
 				insights: parsed.insights
 			});
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-db",
-  "version": "0.1.128",
+  "version": "0.1.130",
   "description": "Generic database controller for Moost with Atscript.",
   "keywords": [
     "annotations",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@uniqu/url": "^0.1.8",
-    "@atscript/db-memory": "^0.1.128"
+    "@atscript/db-memory": "^0.1.130"
   },
   "devDependencies": {
     "@atscript/core": "^0.1.92",
@@ -64,7 +64,7 @@
     "@wooksjs/event-core": "^0.7.23",
     "@wooksjs/http-body": "^0.7.23",
     "moost": "^0.6.37",
-    "@atscript/db": "^0.1.128"
+    "@atscript/db": "^0.1.130"
   },
   "scripts": {
     "postinstall": "asc -f dts",