@atscript/moost-db 0.1.35 → 0.1.36

package/dist/index.cjs

@@ -26,6 +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"));
 
 //#region packages/moost-db/src/decorators.ts
 const READABLE_DEF = "__atscript_db_readable_def";
@@ -36,12 +37,21 @@ const ViewController = ReadableController;
 
 //#endregion
 //#region packages/moost-db/src/validation-interceptor.ts
+const dbErrorCodeToStatus = { CONFLICT: 409 };
 function transformValidationError(error, reply) {
 	if (error instanceof __atscript_typescript_utils.ValidatorError) reply(new __moostjs_event_http.HttpError(400, {
 		message: error.message,
 		statusCode: 400,
 		errors: error.errors
 	}));
+else if (error instanceof __atscript_utils_db.DbError) {
+		const statusCode = dbErrorCodeToStatus[error.code] ?? 400;
+		reply(new __moostjs_event_http.HttpError(statusCode, {
+			message: error.message,
+			statusCode,
+			errors: error.errors
+		}));
+	}
 }
 const validationErrorTransform = () => (0, moost.defineInterceptor)({ error: transformValidationError }, moost.TInterceptorPriority.CATCH_ERROR);
 const UseValidationErrorTransform = () => (0, moost.Intercept)(validationErrorTransform());
@@ -205,6 +215,18 @@ var AsDbReadableController = class {
 			const insightsError = this.validateInsights(parsed.insights);
 			if (insightsError) return new __moostjs_event_http.HttpError(400, insightsError);
 		}
+		const withRelations = parsed.controls.$with;
+		if (withRelations?.length) {
+			const relations = this.readable.relations;
+			for (const rel of withRelations) if (!rel.name.includes(".") && !relations.has(rel.name)) return new __moostjs_event_http.HttpError(400, {
+				message: `Unknown relation "${rel.name}" in $with. Available relations: ${[...relations.keys()].join(", ") || "(none)"}`,
+				statusCode: 400,
+				errors: [{
+					path: "$with",
+					message: `Unknown relation "${rel.name}"`
+				}]
+			});
+		}
 		return undefined;
 	}
 	/**
@@ -227,6 +249,38 @@ var AsDbReadableController = class {
 		return item;
 	}
 	/**
+	* Extracts a composite identifier object from query params.
+	* Tries composite primary key first, then compound unique indexes.
+	*/ extractCompositeId(query) {
+		const pkFields = this.readable.primaryKeys;
+		if (pkFields.length > 1) {
+			const idObj = {};
+			let allPresent = true;
+			for (const field of pkFields) {
+				if (query[field] === undefined) {
+					allPresent = false;
+					break;
+				}
+				idObj[field] = query[field];
+			}
+			if (allPresent) return idObj;
+		}
+		for (const index of this.readable.indexes.values()) {
+			if (index.type !== "unique" || index.fields.length < 2) continue;
+			const idObj = {};
+			let allPresent = true;
+			for (const indexField of index.fields) {
+				if (query[indexField.name] === undefined) {
+					allPresent = false;
+					break;
+				}
+				idObj[indexField.name] = query[indexField.name];
+			}
+			if (allPresent) return idObj;
+		}
+		return new __moostjs_event_http.HttpError(400, "Query params do not match any composite primary key or compound unique index");
+	}
+	/**
 	* **GET /query** — returns an array of records or a count.
 	*/ async query(url) {
 		const parsed = this.parseQueryString(url);
@@ -310,6 +364,20 @@ else result = await this.readable.findManyWithCount(query);
 		return this.returnOne(this.readable.findById(id, { controls }));
 	}
 	/**
+	* **GET /one?field1=val1&field2=val2** — retrieves a single record by composite key
+	* (composite primary key or compound unique index).
+	*/ async getOneComposite(query, url) {
+		const idObj = this.extractCompositeId(query);
+		if (idObj instanceof __moostjs_event_http.HttpError) return idObj;
+		const parsed = this.parseQueryString(url);
+		const select = this.transformProjection(parsed.controls.$select);
+		const controls = {
+			...parsed.controls,
+			$select: select
+		};
+		return this.returnOne(this.readable.findById(idObj, { controls }));
+	}
+	/**
 	* **GET /meta** — returns table/view metadata for UI.
 	*/ meta() {
 		return {
@@ -364,6 +432,14 @@ _ts_decorate$1([
 	_ts_metadata$1("design:paramtypes", [String, String]),
 	_ts_metadata$1("design:returntype", Promise)
 ], AsDbReadableController.prototype, "getOne", null);
+_ts_decorate$1([
+	(0, __moostjs_event_http.Get)("one"),
+	_ts_param$1(0, (0, __moostjs_event_http.Query)()),
+	_ts_param$1(1, (0, __moostjs_event_http.Url)()),
+	_ts_metadata$1("design:type", Function),
+	_ts_metadata$1("design:paramtypes", [typeof Record === "undefined" ? Object : Record, String]),
+	_ts_metadata$1("design:returntype", Promise)
+], AsDbReadableController.prototype, "getOneComposite", null);
 _ts_decorate$1([
 	(0, __moostjs_event_http.Get)("meta"),
 	_ts_metadata$1("design:type", Function),
@@ -410,26 +486,35 @@ var AsDbController = class extends AsDbReadableController {
 	/**
 	* **POST /** — inserts one or many records.
 	*/ async insert(payload) {
-		const arr = Array.isArray(payload) ? payload : [payload];
-		if (arr.length === 1) {
-			const data$1 = await this.onWrite("insert", arr[0]);
+		if (Array.isArray(payload)) {
+			const data$1 = await this.onWrite("insertMany", payload);
 			if (data$1 === undefined) return new __moostjs_event_http.HttpError(500, "Not saved");
-			return await this.table.insertOne(data$1);
+			return await this.table.insertMany(data$1);
 		}
-		const data = await this.onWrite("insertMany", arr);
+		const data = await this.onWrite("insert", payload);
 		if (data === undefined) return new __moostjs_event_http.HttpError(500, "Not saved");
-		return await this.table.insertMany(data);
+		return await this.table.insertOne(data);
 	}
 	/**
-	* **PUT /** — fully replaces a record matched by primary key.
+	* **PUT /** — fully replaces one or many records matched by primary key.
 	*/ async replace(payload) {
+		if (Array.isArray(payload)) {
+			const data$1 = await this.onWrite("replaceMany", payload);
+			if (data$1 === undefined) return new __moostjs_event_http.HttpError(500, "Not saved");
+			return await this.table.bulkReplace(data$1);
+		}
 		const data = await this.onWrite("replace", payload);
 		if (data === undefined) return new __moostjs_event_http.HttpError(500, "Not saved");
 		return await this.table.replaceOne(data);
 	}
 	/**
-	* **PATCH /** — partially updates a record matched by primary key.
+	* **PATCH /** — partially updates one or many records matched by primary key.
 	*/ async update(payload) {
+		if (Array.isArray(payload)) {
+			const data$1 = await this.onWrite("updateMany", payload);
+			if (data$1 === undefined) return new __moostjs_event_http.HttpError(500, "Not saved");
+			return await this.table.bulkUpdate(data$1);
+		}
 		const data = await this.onWrite("update", payload);
 		if (data === undefined) return new __moostjs_event_http.HttpError(500, "Not saved");
 		return await this.table.updateOne(data);
@@ -443,6 +528,18 @@ var AsDbController = class extends AsDbReadableController {
 		if (result.deletedCount < 1) return new __moostjs_event_http.HttpError(404);
 		return result;
 	}
+	/**
+	* **DELETE /?field1=val1&field2=val2** — removes a record by composite key
+	* (composite primary key or compound unique index).
+	*/ async removeComposite(query) {
+		const idObj = this.extractCompositeId(query);
+		if (idObj instanceof __moostjs_event_http.HttpError) return idObj;
+		const resolvedId = await this.onRemove(idObj);
+		if (resolvedId === undefined) return new __moostjs_event_http.HttpError(500, "Not deleted");
+		const result = await this.table.deleteOne(resolvedId);
+		if (result.deletedCount < 1) return new __moostjs_event_http.HttpError(404);
+		return result;
+	}
 	constructor(table, app) {
 		super(table, app);
 	}
@@ -475,6 +572,13 @@ _ts_decorate([
 	_ts_metadata("design:paramtypes", [String]),
 	_ts_metadata("design:returntype", Promise)
 ], AsDbController.prototype, "remove", null);
+_ts_decorate([
+	(0, __moostjs_event_http.Delete)(""),
+	_ts_param(0, (0, __moostjs_event_http.Query)()),
+	_ts_metadata("design:type", Function),
+	_ts_metadata("design:paramtypes", [typeof Record === "undefined" ? Object : Record]),
+	_ts_metadata("design:returntype", Promise)
+], AsDbController.prototype, "removeComposite", null);
 AsDbController = _ts_decorate([
 	(0, moost.Inherit)(),
 	_ts_param(0, (0, moost.Inject)(TABLE_DEF)),

package/dist/index.d.ts

@@ -47,6 +47,11 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
     protected transformProjection(projection?: UniqueryControls['$select']): UniqueryControls['$select'] | undefined;
     protected parseQueryString(url: string): _uniqu_url.UrlQuery;
     protected returnOne(result: Promise<DataType | null>): Promise<DataType | HttpError>;
+    /**
+     * Extracts a composite identifier object from query params.
+     * Tries composite primary key first, then compound unique indexes.
+     */
+    protected extractCompositeId(query: Record<string, string>): Record<string, unknown> | HttpError;
     /**
      * **GET /query** — returns an array of records or a count.
      */
@@ -65,6 +70,11 @@ declare class AsDbReadableController<T extends TAtscriptAnnotatedType = TAtscrip
      * **GET /one/:id** — retrieves a single record by ID or unique property.
      */
     getOne(id: string, url: string): Promise<DataType | HttpError>;
+    /**
+     * **GET /one?field1=val1&field2=val2** — retrieves a single record by composite key
+     * (composite primary key or compound unique index).
+     */
+    getOneComposite(query: Record<string, string>, url: string): Promise<DataType | HttpError>;
     /**
      * **GET /meta** — returns table/view metadata for UI.
      */
@@ -92,7 +102,7 @@ declare class AsDbController<T extends TAtscriptAnnotatedType = TAtscriptAnnotat
     /**
      * Intercepts write operations. Return `undefined` to abort.
      */
-    protected onWrite(action: 'insert' | 'insertMany' | 'replace' | 'update', data: unknown): unknown | Promise<unknown | undefined>;
+    protected onWrite(action: 'insert' | 'insertMany' | 'replace' | 'replaceMany' | 'update' | 'updateMany', data: unknown): unknown | Promise<unknown | undefined>;
     /**
      * Intercepts delete operations. Return `undefined` to abort.
      */
@@ -102,17 +112,22 @@ declare class AsDbController<T extends TAtscriptAnnotatedType = TAtscriptAnnotat
      */
     insert(payload: unknown): Promise<HttpError | unknown>;
     /**
-     * **PUT /** — fully replaces a record matched by primary key.
+     * **PUT /** — fully replaces one or many records matched by primary key.
      */
     replace(payload: unknown): Promise<HttpError | unknown>;
     /**
-     * **PATCH /** — partially updates a record matched by primary key.
+     * **PATCH /** — partially updates one or many records matched by primary key.
      */
     update(payload: unknown): Promise<HttpError | unknown>;
     /**
      * **DELETE /:id** — removes a single record by primary key.
      */
     remove(id: string): Promise<HttpError | unknown>;
+    /**
+     * **DELETE /?field1=val1&field2=val2** — removes a record by composite key
+     * (composite primary key or compound unique index).
+     */
+    removeComposite(query: Record<string, string>): Promise<HttpError | unknown>;
 }
 
 /**

package/dist/index.mjs

@@ -1,7 +1,8 @@
 import { ValidatorError, defineAnnotatedType, serializeAnnotatedType, throwFeatureDisabled } from "@atscript/typescript/utils";
-import { Body, Delete, Get, HttpError, Patch, Post, Put, Url } from "@moostjs/event-http";
+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";
 
 //#region packages/moost-db/src/decorators.ts
 const READABLE_DEF = "__atscript_db_readable_def";
@@ -12,12 +13,21 @@ const ViewController = ReadableController;
 
 //#endregion
 //#region packages/moost-db/src/validation-interceptor.ts
+const dbErrorCodeToStatus = { CONFLICT: 409 };
 function transformValidationError(error, reply) {
 	if (error instanceof ValidatorError) reply(new HttpError(400, {
 		message: error.message,
 		statusCode: 400,
 		errors: error.errors
 	}));
+else if (error instanceof DbError) {
+		const statusCode = dbErrorCodeToStatus[error.code] ?? 400;
+		reply(new HttpError(statusCode, {
+			message: error.message,
+			statusCode,
+			errors: error.errors
+		}));
+	}
 }
 const validationErrorTransform = () => defineInterceptor({ error: transformValidationError }, TInterceptorPriority.CATCH_ERROR);
 const UseValidationErrorTransform = () => Intercept(validationErrorTransform());
@@ -181,6 +191,18 @@ var AsDbReadableController = class {
 			const insightsError = this.validateInsights(parsed.insights);
 			if (insightsError) return new HttpError(400, insightsError);
 		}
+		const withRelations = parsed.controls.$with;
+		if (withRelations?.length) {
+			const relations = this.readable.relations;
+			for (const rel of withRelations) if (!rel.name.includes(".") && !relations.has(rel.name)) return new HttpError(400, {
+				message: `Unknown relation "${rel.name}" in $with. Available relations: ${[...relations.keys()].join(", ") || "(none)"}`,
+				statusCode: 400,
+				errors: [{
+					path: "$with",
+					message: `Unknown relation "${rel.name}"`
+				}]
+			});
+		}
 		return undefined;
 	}
 	/**
@@ -203,6 +225,38 @@ var AsDbReadableController = class {
 		return item;
 	}
 	/**
+	* Extracts a composite identifier object from query params.
+	* Tries composite primary key first, then compound unique indexes.
+	*/ extractCompositeId(query) {
+		const pkFields = this.readable.primaryKeys;
+		if (pkFields.length > 1) {
+			const idObj = {};
+			let allPresent = true;
+			for (const field of pkFields) {
+				if (query[field] === undefined) {
+					allPresent = false;
+					break;
+				}
+				idObj[field] = query[field];
+			}
+			if (allPresent) return idObj;
+		}
+		for (const index of this.readable.indexes.values()) {
+			if (index.type !== "unique" || index.fields.length < 2) continue;
+			const idObj = {};
+			let allPresent = true;
+			for (const indexField of index.fields) {
+				if (query[indexField.name] === undefined) {
+					allPresent = false;
+					break;
+				}
+				idObj[indexField.name] = query[indexField.name];
+			}
+			if (allPresent) return idObj;
+		}
+		return new HttpError(400, "Query params do not match any composite primary key or compound unique index");
+	}
+	/**
 	* **GET /query** — returns an array of records or a count.
 	*/ async query(url) {
 		const parsed = this.parseQueryString(url);
@@ -286,6 +340,20 @@ else result = await this.readable.findManyWithCount(query);
 		return this.returnOne(this.readable.findById(id, { controls }));
 	}
 	/**
+	* **GET /one?field1=val1&field2=val2** — retrieves a single record by composite key
+	* (composite primary key or compound unique index).
+	*/ async getOneComposite(query, url) {
+		const idObj = this.extractCompositeId(query);
+		if (idObj instanceof HttpError) return idObj;
+		const parsed = this.parseQueryString(url);
+		const select = this.transformProjection(parsed.controls.$select);
+		const controls = {
+			...parsed.controls,
+			$select: select
+		};
+		return this.returnOne(this.readable.findById(idObj, { controls }));
+	}
+	/**
 	* **GET /meta** — returns table/view metadata for UI.
 	*/ meta() {
 		return {
@@ -340,6 +408,14 @@ _ts_decorate$1([
 	_ts_metadata$1("design:paramtypes", [String, String]),
 	_ts_metadata$1("design:returntype", Promise)
 ], AsDbReadableController.prototype, "getOne", null);
+_ts_decorate$1([
+	Get("one"),
+	_ts_param$1(0, Query()),
+	_ts_param$1(1, Url()),
+	_ts_metadata$1("design:type", Function),
+	_ts_metadata$1("design:paramtypes", [typeof Record === "undefined" ? Object : Record, String]),
+	_ts_metadata$1("design:returntype", Promise)
+], AsDbReadableController.prototype, "getOneComposite", null);
 _ts_decorate$1([
 	Get("meta"),
 	_ts_metadata$1("design:type", Function),
@@ -386,26 +462,35 @@ var AsDbController = class extends AsDbReadableController {
 	/**
 	* **POST /** — inserts one or many records.
 	*/ async insert(payload) {
-		const arr = Array.isArray(payload) ? payload : [payload];
-		if (arr.length === 1) {
-			const data$1 = await this.onWrite("insert", arr[0]);
+		if (Array.isArray(payload)) {
+			const data$1 = await this.onWrite("insertMany", payload);
 			if (data$1 === undefined) return new HttpError(500, "Not saved");
-			return await this.table.insertOne(data$1);
+			return await this.table.insertMany(data$1);
 		}
-		const data = await this.onWrite("insertMany", arr);
+		const data = await this.onWrite("insert", payload);
 		if (data === undefined) return new HttpError(500, "Not saved");
-		return await this.table.insertMany(data);
+		return await this.table.insertOne(data);
 	}
 	/**
-	* **PUT /** — fully replaces a record matched by primary key.
+	* **PUT /** — fully replaces one or many records matched by primary key.
 	*/ async replace(payload) {
+		if (Array.isArray(payload)) {
+			const data$1 = await this.onWrite("replaceMany", payload);
+			if (data$1 === undefined) return new HttpError(500, "Not saved");
+			return await this.table.bulkReplace(data$1);
+		}
 		const data = await this.onWrite("replace", payload);
 		if (data === undefined) return new HttpError(500, "Not saved");
 		return await this.table.replaceOne(data);
 	}
 	/**
-	* **PATCH /** — partially updates a record matched by primary key.
+	* **PATCH /** — partially updates one or many records matched by primary key.
 	*/ async update(payload) {
+		if (Array.isArray(payload)) {
+			const data$1 = await this.onWrite("updateMany", payload);
+			if (data$1 === undefined) return new HttpError(500, "Not saved");
+			return await this.table.bulkUpdate(data$1);
+		}
 		const data = await this.onWrite("update", payload);
 		if (data === undefined) return new HttpError(500, "Not saved");
 		return await this.table.updateOne(data);
@@ -419,6 +504,18 @@ var AsDbController = class extends AsDbReadableController {
 		if (result.deletedCount < 1) return new HttpError(404);
 		return result;
 	}
+	/**
+	* **DELETE /?field1=val1&field2=val2** — removes a record by composite key
+	* (composite primary key or compound unique index).
+	*/ async removeComposite(query) {
+		const idObj = this.extractCompositeId(query);
+		if (idObj instanceof HttpError) return idObj;
+		const resolvedId = await this.onRemove(idObj);
+		if (resolvedId === undefined) return new HttpError(500, "Not deleted");
+		const result = await this.table.deleteOne(resolvedId);
+		if (result.deletedCount < 1) return new HttpError(404);
+		return result;
+	}
 	constructor(table, app) {
 		super(table, app);
 	}
@@ -451,6 +548,13 @@ _ts_decorate([
 	_ts_metadata("design:paramtypes", [String]),
 	_ts_metadata("design:returntype", Promise)
 ], AsDbController.prototype, "remove", null);
+_ts_decorate([
+	Delete(""),
+	_ts_param(0, Query()),
+	_ts_metadata("design:type", Function),
+	_ts_metadata("design:paramtypes", [typeof Record === "undefined" ? Object : Record]),
+	_ts_metadata("design:returntype", Promise)
+], AsDbController.prototype, "removeComposite", null);
 AsDbController = _ts_decorate([
 	Inherit(),
 	_ts_param(0, Inject(TABLE_DEF)),

package/package.json

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