@atscript/moost-db 0.1.76 → 0.1.78

package/dist/index.cjs

@@ -652,6 +652,7 @@ let AsReadableController = class AsReadableController {
 		return this._getOneControlsValidator;
 	}
 	validateControls(controls, type) {
+		if (type === "query" && controls.$groupBy !== void 0) return;
 		const v = type === "query" ? this.queryControlsValidator : type === "pages" ? this.pagesControlsValidator : this.getOneControlsValidator;
 		if (!v.validate(controls, true)) return v.errors[0]?.message || "Invalid controls";
 	}
@@ -1327,12 +1328,13 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 		const parsed = this.parseQueryString(url);
 		const controls = parsed.controls;
 		this._coerceActionsControl(controls);
-		if (controls.$groupBy?.length) {
-			if (controls.$with?.length) return new _moostjs_event_http.HttpError(400, "Cannot combine $with and $groupBy in the same query");
-			if (parsed.insights) {
-				const insightsError = this.validateInsights(parsed.insights);
-				if (insightsError) return new _moostjs_event_http.HttpError(400, insightsError);
-			}
+		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");
+		const error = this.validateParsed(parsed, "query");
+		if (error) return error;
+		const gateError = this.checkGates(parsed.filter, controls, this._gates);
+		if (gateError) return gateError;
+		if (groupBy?.length) {
 			const filter = await this.transformFilter(parsed.filter);
 			return this.readable.aggregate({
 				filter,
@@ -1340,10 +1342,6 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 				insights: parsed.insights
 			});
 		}
-		const error = this.validateParsed(parsed, "query");
-		if (error) return error;
-		const gateError = this.checkGates(parsed.filter, controls, this._gates);
-		if (gateError) return gateError;
 		const [filter, rawSelect] = await Promise.all([this.transformFilter(parsed.filter), this.transformProjection(controls.$select)]);
 		if (controls.$count) return this.readable.count({
 			filter,

package/dist/index.d.cts

@@ -506,7 +506,7 @@ declare const TABLE_DEF = "__atscript_db_readable_def";
  * export class UsersController extends AsDbController<typeof UserModel> {}
  * ```
  */
-declare const TableController: (table: AtscriptDbTable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
+declare const TableController: <Table extends AtscriptDbTable<any, any, any, any, any, any, any>>(table: Table, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 /**
  * Combines the boilerplate needed to turn an {@link AsDbReadableController}
  * subclass into a fully wired HTTP controller for a given `@db.view` or `@db.table` model.
@@ -520,7 +520,7 @@ declare const TableController: (table: AtscriptDbTable, prefix?: string) => Meth
  * export class ActiveTasksController extends AsDbReadableController<typeof ActiveTasks> {}
  * ```
  */
-declare const ReadableController: (readable: AtscriptDbReadable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
+declare const ReadableController: <Readable extends AtscriptDbReadable<any, any, any, any, any, any, any>>(readable: Readable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 /**
  * Alias for {@link ReadableController} — use with view-backed controllers.
  *
@@ -530,7 +530,7 @@ declare const ReadableController: (readable: AtscriptDbReadable, prefix?: string
  * export class ActiveTasksController extends AsDbReadableController<typeof ActiveTasks> {}
  * ```
  */
-declare const ViewController: (readable: AtscriptDbReadable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
+declare const ViewController: <Readable extends AtscriptDbReadable<any, any, any, any, any, any, any>>(readable: Readable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 //#endregion
 //#region src/validation-interceptor.d.ts
 declare const validationErrorTransform: () => _$moost.TInterceptorDef;

package/dist/index.d.mts

@@ -506,7 +506,7 @@ declare const TABLE_DEF = "__atscript_db_readable_def";
  * export class UsersController extends AsDbController<typeof UserModel> {}
  * ```
  */
-declare const TableController: (table: AtscriptDbTable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
+declare const TableController: <Table extends AtscriptDbTable<any, any, any, any, any, any, any>>(table: Table, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 /**
  * Combines the boilerplate needed to turn an {@link AsDbReadableController}
  * subclass into a fully wired HTTP controller for a given `@db.view` or `@db.table` model.
@@ -520,7 +520,7 @@ declare const TableController: (table: AtscriptDbTable, prefix?: string) => Meth
  * export class ActiveTasksController extends AsDbReadableController<typeof ActiveTasks> {}
  * ```
  */
-declare const ReadableController: (readable: AtscriptDbReadable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
+declare const ReadableController: <Readable extends AtscriptDbReadable<any, any, any, any, any, any, any>>(readable: Readable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 /**
  * Alias for {@link ReadableController} — use with view-backed controllers.
  *
@@ -530,7 +530,7 @@ declare const ReadableController: (readable: AtscriptDbReadable, prefix?: string
  * export class ActiveTasksController extends AsDbReadableController<typeof ActiveTasks> {}
  * ```
  */
-declare const ViewController: (readable: AtscriptDbReadable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
+declare const ViewController: <Readable extends AtscriptDbReadable<any, any, any, any, any, any, any>>(readable: Readable, prefix?: string) => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 //#endregion
 //#region src/validation-interceptor.d.ts
 declare const validationErrorTransform: () => _$moost.TInterceptorDef;

package/dist/index.mjs

@@ -651,6 +651,7 @@ let AsReadableController = class AsReadableController {
 		return this._getOneControlsValidator;
 	}
 	validateControls(controls, type) {
+		if (type === "query" && controls.$groupBy !== void 0) return;
 		const v = type === "query" ? this.queryControlsValidator : type === "pages" ? this.pagesControlsValidator : this.getOneControlsValidator;
 		if (!v.validate(controls, true)) return v.errors[0]?.message || "Invalid controls";
 	}
@@ -1326,12 +1327,13 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 		const parsed = this.parseQueryString(url);
 		const controls = parsed.controls;
 		this._coerceActionsControl(controls);
-		if (controls.$groupBy?.length) {
-			if (controls.$with?.length) return new HttpError(400, "Cannot combine $with and $groupBy in the same query");
-			if (parsed.insights) {
-				const insightsError = this.validateInsights(parsed.insights);
-				if (insightsError) return new HttpError(400, insightsError);
-			}
+		const groupBy = controls.$groupBy;
+		if (groupBy?.length && controls.$with?.length) return new HttpError(400, "Cannot combine $with and $groupBy in the same query");
+		const error = this.validateParsed(parsed, "query");
+		if (error) return error;
+		const gateError = this.checkGates(parsed.filter, controls, this._gates);
+		if (gateError) return gateError;
+		if (groupBy?.length) {
 			const filter = await this.transformFilter(parsed.filter);
 			return this.readable.aggregate({
 				filter,
@@ -1339,10 +1341,6 @@ let AsDbReadableController = class AsDbReadableController extends AsReadableCont
 				insights: parsed.insights
 			});
 		}
-		const error = this.validateParsed(parsed, "query");
-		if (error) return error;
-		const gateError = this.checkGates(parsed.filter, controls, this._gates);
-		if (gateError) return gateError;
 		const [filter, rawSelect] = await Promise.all([this.transformFilter(parsed.filter), this.transformProjection(controls.$select)]);
 		if (controls.$count) return this.readable.count({
 			filter,

package/package.json

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