@atscript/moost-db 0.1.36 → 0.1.38

package/dist/index.cjs

@@ -26,7 +26,7 @@ const __atscript_typescript_utils = __toESM(require("@atscript/typescript/utils"
 const __moostjs_event_http = __toESM(require("@moostjs/event-http"));
 const moost = __toESM(require("moost"));
 const __uniqu_url = __toESM(require("@uniqu/url"));
-const __atscript_utils_db = __toESM(require("@atscript/utils-db"));
+const __atscript_db = __toESM(require("@atscript/db"));
 
 //#region packages/moost-db/src/decorators.ts
 const READABLE_DEF = "__atscript_db_readable_def";
@@ -44,7 +44,7 @@ function transformValidationError(error, reply) {
 		statusCode: 400,
 		errors: error.errors
 	}));
-else if (error instanceof __atscript_utils_db.DbError) {
+else if (error instanceof __atscript_db.DbError) {
 		const statusCode = dbErrorCodeToStatus[error.code] ?? 400;
 		reply(new __moostjs_event_http.HttpError(statusCode, {
 			message: error.message,
@@ -140,7 +140,7 @@ _define_property$1(SelectControlDto, "__is_atscript_annotated_type", true);
 _define_property$1(SelectControlDto, "type", {});
 _define_property$1(SelectControlDto, "metadata", new Map());
 _define_property$1(SelectControlDto, "id", "SelectControlDto");
-(0, __atscript_typescript_utils.defineAnnotatedType)("object", QueryControlsDto).prop("$skip", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$limit", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$count", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("boolean").tags("boolean").optional().$type).prop("$sort", (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SortControlDto).optional().$type).prop("$select", (0, __atscript_typescript_utils.defineAnnotatedType)("union").item((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SelectControlDto).$type).item((0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").$type).$type).optional().$type).prop("$search", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$index", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$with", (0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithRelationDto).$type).optional().$type);
+(0, __atscript_typescript_utils.defineAnnotatedType)("object", QueryControlsDto).prop("$skip", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$limit", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$count", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("boolean").tags("boolean").optional().$type).prop("$sort", (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SortControlDto).optional().$type).prop("$select", (0, __atscript_typescript_utils.defineAnnotatedType)("union").item((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SelectControlDto).$type).item((0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").$type).$type).optional().$type).prop("$search", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$index", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$vector", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$threshold", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$with", (0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithRelationDto).$type).optional().$type);
 (0, __atscript_typescript_utils.defineAnnotatedType)("object", PagesControlsDto).prop("$page", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").annotate("expect.pattern", {
 	pattern: "^\\d+$",
 	flags: "u",
@@ -149,7 +149,7 @@ _define_property$1(SelectControlDto, "id", "SelectControlDto");
 	pattern: "^\\d+$",
 	flags: "u",
 	message: "Expected positive number"
-}, true).optional().$type).prop("$sort", (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SortControlDto).optional().$type).prop("$select", (0, __atscript_typescript_utils.defineAnnotatedType)("union").item((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SelectControlDto).$type).item((0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").$type).$type).optional().$type).prop("$search", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$index", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$with", (0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithRelationDto).$type).optional().$type);
+}, true).optional().$type).prop("$sort", (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SortControlDto).optional().$type).prop("$select", (0, __atscript_typescript_utils.defineAnnotatedType)("union").item((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SelectControlDto).$type).item((0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").$type).$type).optional().$type).prop("$search", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$index", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$vector", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$threshold", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").optional().$type).prop("$with", (0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithRelationDto).$type).optional().$type);
 (0, __atscript_typescript_utils.defineAnnotatedType)("object", GetOneControlsDto).prop("$select", (0, __atscript_typescript_utils.defineAnnotatedType)("union").item((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SelectControlDto).$type).item((0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").$type).$type).optional().$type).prop("$with", (0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithRelationDto).$type).optional().$type);
 (0, __atscript_typescript_utils.defineAnnotatedType)("object", WithRelationDto).prop("name", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").$type).prop("filter", (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithFilterDto).optional().$type).prop("controls", (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithRelationControlsDto).optional().$type).prop("insights", (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithFilterDto).optional().$type);
 (0, __atscript_typescript_utils.defineAnnotatedType)("object", WithRelationControlsDto).prop("$skip", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$limit", (0, __atscript_typescript_utils.defineAnnotatedType)().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$sort", (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SortControlDto).optional().$type).prop("$select", (0, __atscript_typescript_utils.defineAnnotatedType)("union").item((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(SelectControlDto).$type).item((0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().designType("string").tags("string").$type).$type).optional().$type).prop("$with", (0, __atscript_typescript_utils.defineAnnotatedType)("array").of((0, __atscript_typescript_utils.defineAnnotatedType)().refTo(WithRelationDto).$type).optional().$type);
@@ -205,7 +205,10 @@ var AsDbReadableController = class {
 		return undefined;
 	}
 	validateInsights(insights) {
-		for (const key of insights.keys()) if (!this.readable.flatMap.has(key)) return `Unknown field "${key}"`;
+		for (const [key] of insights) {
+			if (key === "*") continue;
+			if (!this.readable.flatMap.has(key)) return `Unknown field "${key}"`;
+		}
 		return undefined;
 	}
 	validateParsed(parsed, type) {
@@ -230,6 +233,13 @@ var AsDbReadableController = class {
 		return undefined;
 	}
 	/**
+	* Compute an embedding vector from a search term.
+	* Override in subclass to integrate with your embedding provider (OpenAI, etc.).
+	* Called when `$vector` is present in query controls.
+	*/ computeEmbedding(_search, _fieldName) {
+		throw new __moostjs_event_http.HttpError(501, "Vector search requires computeEmbedding() to be implemented");
+	}
+	/**
 	* Transform filter before querying. Override to add tenant filtering, etc.
 	*/ transformFilter(filter) {
 		return filter;
@@ -284,9 +294,23 @@ var AsDbReadableController = class {
 	* **GET /query** — returns an array of records or a count.
 	*/ async query(url) {
 		const parsed = this.parseQueryString(url);
+		const controls = parsed.controls;
+		const groupBy = controls.$groupBy;
+		if (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 filter$1 = this.transformFilter(parsed.filter);
+			return this.readable.aggregate({
+				filter: filter$1,
+				controls,
+				insights: parsed.insights
+			});
+		}
 		const error = this.validateParsed(parsed, "query");
 		if (error) return error;
-		const controls = parsed.controls;
 		const filter = this.transformFilter(parsed.filter);
 		const select = this.transformProjection(controls.$select);
 		if (controls.$count) return this.readable.count({
@@ -298,22 +322,24 @@ var AsDbReadableController = class {
 		});
 		const searchTerm = controls.$search;
 		const indexName = controls.$index;
-		if (searchTerm && this.readable.isSearchable()) return this.readable.search(searchTerm, {
+		const vectorField = controls.$vector;
+		const threshold = controls.$threshold ? Number(controls.$threshold) : undefined;
+		const queryObj = {
 			filter,
 			controls: {
 				...controls,
 				$select: select,
-				$limit: controls.$limit || 1e3
+				$limit: controls.$limit || 1e3,
+				$threshold: threshold
 			}
-		}, indexName);
-		return this.readable.findMany({
-			filter,
-			controls: {
-				...controls,
-				$select: select,
-				$limit: controls.$limit || 1e3
-			}
-		});
+		};
+		if (vectorField !== undefined && searchTerm) {
+			const vector = await this.computeEmbedding(searchTerm, vectorField || undefined);
+			if (vectorField) return this.readable.vectorSearch(vectorField, vector, queryObj);
+			return this.readable.vectorSearch(vector, queryObj);
+		}
+		if (searchTerm && this.readable.isSearchable()) return this.readable.search(searchTerm, queryObj, indexName);
+		return this.readable.findMany(queryObj);
 	}
 	/**
 	* **GET /pages** — returns paginated records with metadata.
@@ -329,17 +355,24 @@ var AsDbReadableController = class {
 		const select = this.transformProjection(controls.$select);
 		const searchTerm = controls.$search;
 		const indexName = controls.$index;
+		const vectorField = controls.$vector;
+		const threshold = controls.$threshold ? Number(controls.$threshold) : undefined;
 		const query = {
 			filter,
 			controls: {
 				...controls,
 				$select: select,
 				$skip: skip,
-				$limit: size
+				$limit: size,
+				$threshold: threshold
 			}
 		};
 		let result;
-		if (searchTerm && this.readable.isSearchable()) result = await this.readable.searchWithCount(searchTerm, query, indexName);
+		if (vectorField !== undefined && searchTerm) {
+			const vector = await this.computeEmbedding(searchTerm, vectorField || undefined);
+			if (vectorField) result = await this.readable.vectorSearchWithCount(vectorField, vector, query);
+else result = await this.readable.vectorSearchWithCount(vector, query);
+		} else if (searchTerm && this.readable.isSearchable()) result = await this.readable.searchWithCount(searchTerm, query, indexName);
 else result = await this.readable.findManyWithCount(query);
 		return {
 			data: result.data,
@@ -382,6 +415,7 @@ else result = await this.readable.findManyWithCount(query);
 	*/ meta() {
 		return {
 			searchable: this.readable.isSearchable(),
+			vectorSearchable: this.readable.isVectorSearchable(),
 			searchIndexes: this._searchIndexes,
 			type: this._serializedType
 		};

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import * as _atscript_typescript_serialize from '@atscript/typescript/serialize';
-import * as _atscript_utils_db from '@atscript/utils-db';
-import { AtscriptDbReadable, Uniquery, FilterExpr, UniqueryControls, AtscriptDbTable } from '@atscript/utils-db';
-import * as _uniqu_url from '@uniqu/url';
+import * as _atscript_typescript_utils from '@atscript/typescript/utils';
 import { TAtscriptAnnotatedType, TAtscriptDataType, Validator } from '@atscript/typescript/utils';
+import * as _atscript_db from '@atscript/db';
+import { AtscriptDbReadable, Uniquery, FilterExpr, UniqueryControls, AtscriptDbTable } from '@atscript/db';
+import * as _uniqu_url from '@uniqu/url';
 import { HttpError } from '@moostjs/event-http';
 import * as moost from 'moost';
 import { TConsoleBase, Moost } from 'moost';
@@ -37,6 +37,12 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
     protected validateControls(controls: Record<string, unknown>, type: 'query' | 'pages' | 'getOne'): string | undefined;
     protected validateInsights(insights: Map<string, unknown>): string | undefined;
     protected validateParsed(parsed: Uniquery, type: 'query' | 'pages' | 'getOne'): HttpError | undefined;
+    /**
+     * Compute an embedding vector from a search term.
+     * Override in subclass to integrate with your embedding provider (OpenAI, etc.).
+     * Called when `$vector` is present in query controls.
+     */
+    protected computeEmbedding(_search: string, _fieldName?: string): Promise<number[]>;
     /**
      * Transform filter before querying. Override to add tenant filtering, etc.
      */
@@ -80,8 +86,9 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
      */
     meta(): {
         searchable: boolean;
-        searchIndexes: _atscript_utils_db.TSearchIndexInfo[];
-        type: _atscript_typescript_serialize.TSerializedAnnotatedType;
+        vectorSearchable: boolean;
+        searchIndexes: _atscript_db.TSearchIndexInfo[];
+        type: _atscript_typescript_utils.TSerializedAnnotatedType;
     };
 }
 

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { ValidatorError, defineAnnotatedType, serializeAnnotatedType, throwFeatu
 import { Body, Delete, Get, HttpError, Patch, Post, Put, Query, Url } from "@moostjs/event-http";
 import { ApplyDecorators, Controller, Inherit, Inject, Intercept, Moost, Param, Provide, TInterceptorPriority, defineInterceptor } from "moost";
 import { parseUrl } from "@uniqu/url";
-import { DbError } from "@atscript/utils-db";
+import { DbError } from "@atscript/db";
 
 //#region packages/moost-db/src/decorators.ts
 const READABLE_DEF = "__atscript_db_readable_def";
@@ -116,7 +116,7 @@ _define_property$1(SelectControlDto, "__is_atscript_annotated_type", true);
 _define_property$1(SelectControlDto, "type", {});
 _define_property$1(SelectControlDto, "metadata", new Map());
 _define_property$1(SelectControlDto, "id", "SelectControlDto");
-defineAnnotatedType("object", QueryControlsDto).prop("$skip", defineAnnotatedType().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$limit", defineAnnotatedType().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$count", defineAnnotatedType().designType("boolean").tags("boolean").optional().$type).prop("$sort", defineAnnotatedType().refTo(SortControlDto).optional().$type).prop("$select", defineAnnotatedType("union").item(defineAnnotatedType().refTo(SelectControlDto).$type).item(defineAnnotatedType("array").of(defineAnnotatedType().designType("string").tags("string").$type).$type).optional().$type).prop("$search", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$index", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$with", defineAnnotatedType("array").of(defineAnnotatedType().refTo(WithRelationDto).$type).optional().$type);
+defineAnnotatedType("object", QueryControlsDto).prop("$skip", defineAnnotatedType().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$limit", defineAnnotatedType().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$count", defineAnnotatedType().designType("boolean").tags("boolean").optional().$type).prop("$sort", defineAnnotatedType().refTo(SortControlDto).optional().$type).prop("$select", defineAnnotatedType("union").item(defineAnnotatedType().refTo(SelectControlDto).$type).item(defineAnnotatedType("array").of(defineAnnotatedType().designType("string").tags("string").$type).$type).optional().$type).prop("$search", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$index", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$vector", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$threshold", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$with", defineAnnotatedType("array").of(defineAnnotatedType().refTo(WithRelationDto).$type).optional().$type);
 defineAnnotatedType("object", PagesControlsDto).prop("$page", defineAnnotatedType().designType("string").tags("string").annotate("expect.pattern", {
 	pattern: "^\\d+$",
 	flags: "u",
@@ -125,7 +125,7 @@ defineAnnotatedType("object", PagesControlsDto).prop("$page", defineAnnotatedTyp
 	pattern: "^\\d+$",
 	flags: "u",
 	message: "Expected positive number"
-}, true).optional().$type).prop("$sort", defineAnnotatedType().refTo(SortControlDto).optional().$type).prop("$select", defineAnnotatedType("union").item(defineAnnotatedType().refTo(SelectControlDto).$type).item(defineAnnotatedType("array").of(defineAnnotatedType().designType("string").tags("string").$type).$type).optional().$type).prop("$search", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$index", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$with", defineAnnotatedType("array").of(defineAnnotatedType().refTo(WithRelationDto).$type).optional().$type);
+}, true).optional().$type).prop("$sort", defineAnnotatedType().refTo(SortControlDto).optional().$type).prop("$select", defineAnnotatedType("union").item(defineAnnotatedType().refTo(SelectControlDto).$type).item(defineAnnotatedType("array").of(defineAnnotatedType().designType("string").tags("string").$type).$type).optional().$type).prop("$search", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$index", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$vector", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$threshold", defineAnnotatedType().designType("string").tags("string").optional().$type).prop("$with", defineAnnotatedType("array").of(defineAnnotatedType().refTo(WithRelationDto).$type).optional().$type);
 defineAnnotatedType("object", GetOneControlsDto).prop("$select", defineAnnotatedType("union").item(defineAnnotatedType().refTo(SelectControlDto).$type).item(defineAnnotatedType("array").of(defineAnnotatedType().designType("string").tags("string").$type).$type).optional().$type).prop("$with", defineAnnotatedType("array").of(defineAnnotatedType().refTo(WithRelationDto).$type).optional().$type);
 defineAnnotatedType("object", WithRelationDto).prop("name", defineAnnotatedType().designType("string").tags("string").$type).prop("filter", defineAnnotatedType().refTo(WithFilterDto).optional().$type).prop("controls", defineAnnotatedType().refTo(WithRelationControlsDto).optional().$type).prop("insights", defineAnnotatedType().refTo(WithFilterDto).optional().$type);
 defineAnnotatedType("object", WithRelationControlsDto).prop("$skip", defineAnnotatedType().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$limit", defineAnnotatedType().designType("number").tags("positive", "int", "number").annotate("expect.int", true).annotate("expect.min", { minValue: 0 }).optional().$type).prop("$sort", defineAnnotatedType().refTo(SortControlDto).optional().$type).prop("$select", defineAnnotatedType("union").item(defineAnnotatedType().refTo(SelectControlDto).$type).item(defineAnnotatedType("array").of(defineAnnotatedType().designType("string").tags("string").$type).$type).optional().$type).prop("$with", defineAnnotatedType("array").of(defineAnnotatedType().refTo(WithRelationDto).$type).optional().$type);
@@ -181,7 +181,10 @@ var AsDbReadableController = class {
 		return undefined;
 	}
 	validateInsights(insights) {
-		for (const key of insights.keys()) if (!this.readable.flatMap.has(key)) return `Unknown field "${key}"`;
+		for (const [key] of insights) {
+			if (key === "*") continue;
+			if (!this.readable.flatMap.has(key)) return `Unknown field "${key}"`;
+		}
 		return undefined;
 	}
 	validateParsed(parsed, type) {
@@ -206,6 +209,13 @@ var AsDbReadableController = class {
 		return undefined;
 	}
 	/**
+	* Compute an embedding vector from a search term.
+	* Override in subclass to integrate with your embedding provider (OpenAI, etc.).
+	* Called when `$vector` is present in query controls.
+	*/ computeEmbedding(_search, _fieldName) {
+		throw new HttpError(501, "Vector search requires computeEmbedding() to be implemented");
+	}
+	/**
 	* Transform filter before querying. Override to add tenant filtering, etc.
 	*/ transformFilter(filter) {
 		return filter;
@@ -260,9 +270,23 @@ var AsDbReadableController = class {
 	* **GET /query** — returns an array of records or a count.
 	*/ async query(url) {
 		const parsed = this.parseQueryString(url);
+		const controls = parsed.controls;
+		const groupBy = controls.$groupBy;
+		if (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 filter$1 = this.transformFilter(parsed.filter);
+			return this.readable.aggregate({
+				filter: filter$1,
+				controls,
+				insights: parsed.insights
+			});
+		}
 		const error = this.validateParsed(parsed, "query");
 		if (error) return error;
-		const controls = parsed.controls;
 		const filter = this.transformFilter(parsed.filter);
 		const select = this.transformProjection(controls.$select);
 		if (controls.$count) return this.readable.count({
@@ -274,22 +298,24 @@ var AsDbReadableController = class {
 		});
 		const searchTerm = controls.$search;
 		const indexName = controls.$index;
-		if (searchTerm && this.readable.isSearchable()) return this.readable.search(searchTerm, {
+		const vectorField = controls.$vector;
+		const threshold = controls.$threshold ? Number(controls.$threshold) : undefined;
+		const queryObj = {
 			filter,
 			controls: {
 				...controls,
 				$select: select,
-				$limit: controls.$limit || 1e3
+				$limit: controls.$limit || 1e3,
+				$threshold: threshold
 			}
-		}, indexName);
-		return this.readable.findMany({
-			filter,
-			controls: {
-				...controls,
-				$select: select,
-				$limit: controls.$limit || 1e3
-			}
-		});
+		};
+		if (vectorField !== undefined && searchTerm) {
+			const vector = await this.computeEmbedding(searchTerm, vectorField || undefined);
+			if (vectorField) return this.readable.vectorSearch(vectorField, vector, queryObj);
+			return this.readable.vectorSearch(vector, queryObj);
+		}
+		if (searchTerm && this.readable.isSearchable()) return this.readable.search(searchTerm, queryObj, indexName);
+		return this.readable.findMany(queryObj);
 	}
 	/**
 	* **GET /pages** — returns paginated records with metadata.
@@ -305,17 +331,24 @@ var AsDbReadableController = class {
 		const select = this.transformProjection(controls.$select);
 		const searchTerm = controls.$search;
 		const indexName = controls.$index;
+		const vectorField = controls.$vector;
+		const threshold = controls.$threshold ? Number(controls.$threshold) : undefined;
 		const query = {
 			filter,
 			controls: {
 				...controls,
 				$select: select,
 				$skip: skip,
-				$limit: size
+				$limit: size,
+				$threshold: threshold
 			}
 		};
 		let result;
-		if (searchTerm && this.readable.isSearchable()) result = await this.readable.searchWithCount(searchTerm, query, indexName);
+		if (vectorField !== undefined && searchTerm) {
+			const vector = await this.computeEmbedding(searchTerm, vectorField || undefined);
+			if (vectorField) result = await this.readable.vectorSearchWithCount(vectorField, vector, query);
+else result = await this.readable.vectorSearchWithCount(vector, query);
+		} else if (searchTerm && this.readable.isSearchable()) result = await this.readable.searchWithCount(searchTerm, query, indexName);
 else result = await this.readable.findManyWithCount(query);
 		return {
 			data: result.data,
@@ -358,6 +391,7 @@ else result = await this.readable.findManyWithCount(query);
 	*/ meta() {
 		return {
 			searchable: this.readable.isSearchable(),
+			vectorSearchable: this.readable.isVectorSearchable(),
 			searchIndexes: this._searchIndexes,
 			type: this._serializedType
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-db",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Generic database controller for Moost with Atscript.",
   "keywords": [
     "annotations",
@@ -35,20 +35,20 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@uniqu/url": "^0.0.6"
+    "@uniqu/url": "^0.1.2"
   },
   "devDependencies": {
     "@moostjs/event-http": "^0.6.2",
     "moost": "^0.6.2",
     "vitest": "3.2.4",
-    "@atscript/core": "^0.1.36"
+    "@atscript/core": "^0.1.38"
   },
   "peerDependencies": {
     "@moostjs/event-http": "^0.6.2",
     "moost": "^0.6.2",
-    "@uniqu/core": "^0.0.6",
-    "@atscript/utils-db": "^0.1.36",
-    "@atscript/typescript": "^0.1.36"
+    "@uniqu/core": "^0.1.2",
+    "@atscript/db": "^0.1.38",
+    "@atscript/typescript": "^0.1.38"
   },
   "scripts": {
     "pub": "pnpm publish --access public",