@atscript/db-mongo 0.1.40 → 0.1.42

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://atscript.dev/logo.svg" alt="Atscript" width="120" />
+  <img src="https://db.atscript.dev/logo.svg" alt="Atscript" width="120" />
 </p>
 
 <h1 align="center">@atscript/db-mongo</h1>

package/dist/index.cjs

@@ -51,8 +51,8 @@ var CollectionPatcher = class {
 	preparePatch() {
 		this.filterObj = { _id: this.collection.prepareId(this.payload._id) };
 		this.flattenPayload(this.payload);
-		if (this.ops?.inc) for (const key in this.ops.inc) this._set(key, { $add: [`$${key}`, this.ops.inc[key]] });
-		if (this.ops?.mul) for (const key in this.ops.mul) this._set(key, { $multiply: [`$${key}`, this.ops.mul[key]] });
+		if (this.ops?.inc) for (const key in this.ops.inc) this._set(key, this._fieldOpExpr(key, "inc", this.ops.inc[key]));
+		if (this.ops?.mul) for (const key in this.ops.mul) this._set(key, this._fieldOpExpr(key, "mul", this.ops.mul[key]));
 		const updateFilter = this.updatePipeline;
 		return {
 			toArgs: () => [
@@ -65,6 +65,10 @@ var CollectionPatcher = class {
 			updateOptions: this.optionsObj
 		};
 	}
+	/** Builds a MongoDB aggregation expression for an $inc or $mul field op. */
+	_fieldOpExpr(key, op, value) {
+		return op === "inc" ? { $add: [`$${key}`, value] } : { $multiply: [`$${key}`, value] };
+	}
 	/**
 	* Helper – lazily create `$set` section and assign *key* → *value*.
 	*
@@ -96,7 +100,11 @@ var CollectionPatcher = class {
 			const topLevelArray = flatType?.metadata?.get("db.__topLevelArray");
 			if (typeof value === "object" && !Array.isArray(value) && topLevelArray && !flatType?.metadata?.has("db.json")) this.parseArrayPatch(key, value, flatType);
 			else if (typeof value === "object" && flatType?.metadata?.get("db.patch.strategy") === "merge") this.flattenPayload(value, key);
-			else if (key !== "_id") this._set(key, value);
+			else if (key !== "_id") {
+				const fieldOp = (0, _atscript_db.getDbFieldOp)(value);
+				if (fieldOp) this._set(key, this._fieldOpExpr(key, fieldOp.op, fieldOp.value));
+				else this._set(key, value);
+			}
 		}
 		return this.updatePipeline;
 	}
@@ -1301,7 +1309,8 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 			removePrimaryKeys: meta.originalMetaIdFields.filter((f) => f !== "_id"),
 			addUniqueFields: uniqueFields.length > 0 ? uniqueFields : void 0
 		};
-		uniqueFields.push("_id");
+		const effectiveUnique = uniqueFields.filter((f) => meta.primaryKeys.length <= 1 || !meta.primaryKeys.includes(f));
+		effectiveUnique.push("_id");
 		return {
 			injectFields: [{
 				path: "_id",
@@ -1315,7 +1324,7 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 					metadata: /* @__PURE__ */ new Map()
 				}
 			}],
-			addUniqueFields: uniqueFields
+			addUniqueFields: effectiveUnique
 		};
 	}
 	onAfterFlatten() {

package/dist/index.d.cts

@@ -62,6 +62,8 @@ declare class CollectionPatcher {
     updateFilter: Document[];
     updateOptions: UpdateOptions;
   };
+  /** Builds a MongoDB aggregation expression for an $inc or $mul field op. */
+  private _fieldOpExpr;
   /**
    * Helper – lazily create `$set` section and assign *key* → *value*.
    *

package/dist/index.d.mts

@@ -62,6 +62,8 @@ declare class CollectionPatcher {
     updateFilter: Document[];
     updateOptions: UpdateOptions;
   };
+  /** Builds a MongoDB aggregation expression for an $inc or $mul field op. */
+  private _fieldOpExpr;
   /**
    * Helper – lazily create `$set` section and assign *key* → *value*.
    *

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as buildMongoFilter } from "./mongo-filter-CcQO-sEh.mjs";
-import { AtscriptDbView, BaseDbAdapter, DbError, DbSpace, computeInsights, getKeyProps } from "@atscript/db";
+import { AtscriptDbView, BaseDbAdapter, DbError, DbSpace, computeInsights, getDbFieldOp, getKeyProps } from "@atscript/db";
 import { MongoClient, MongoServerError, ObjectId } from "mongodb";
 //#region src/lib/collection-patcher.ts
 /**
@@ -50,8 +50,8 @@ var CollectionPatcher = class {
 	preparePatch() {
 		this.filterObj = { _id: this.collection.prepareId(this.payload._id) };
 		this.flattenPayload(this.payload);
-		if (this.ops?.inc) for (const key in this.ops.inc) this._set(key, { $add: [`$${key}`, this.ops.inc[key]] });
-		if (this.ops?.mul) for (const key in this.ops.mul) this._set(key, { $multiply: [`$${key}`, this.ops.mul[key]] });
+		if (this.ops?.inc) for (const key in this.ops.inc) this._set(key, this._fieldOpExpr(key, "inc", this.ops.inc[key]));
+		if (this.ops?.mul) for (const key in this.ops.mul) this._set(key, this._fieldOpExpr(key, "mul", this.ops.mul[key]));
 		const updateFilter = this.updatePipeline;
 		return {
 			toArgs: () => [
@@ -64,6 +64,10 @@ var CollectionPatcher = class {
 			updateOptions: this.optionsObj
 		};
 	}
+	/** Builds a MongoDB aggregation expression for an $inc or $mul field op. */
+	_fieldOpExpr(key, op, value) {
+		return op === "inc" ? { $add: [`$${key}`, value] } : { $multiply: [`$${key}`, value] };
+	}
 	/**
 	* Helper – lazily create `$set` section and assign *key* → *value*.
 	*
@@ -95,7 +99,11 @@ var CollectionPatcher = class {
 			const topLevelArray = flatType?.metadata?.get("db.__topLevelArray");
 			if (typeof value === "object" && !Array.isArray(value) && topLevelArray && !flatType?.metadata?.has("db.json")) this.parseArrayPatch(key, value, flatType);
 			else if (typeof value === "object" && flatType?.metadata?.get("db.patch.strategy") === "merge") this.flattenPayload(value, key);
-			else if (key !== "_id") this._set(key, value);
+			else if (key !== "_id") {
+				const fieldOp = getDbFieldOp(value);
+				if (fieldOp) this._set(key, this._fieldOpExpr(key, fieldOp.op, fieldOp.value));
+				else this._set(key, value);
+			}
 		}
 		return this.updatePipeline;
 	}
@@ -1300,7 +1308,8 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 			removePrimaryKeys: meta.originalMetaIdFields.filter((f) => f !== "_id"),
 			addUniqueFields: uniqueFields.length > 0 ? uniqueFields : void 0
 		};
-		uniqueFields.push("_id");
+		const effectiveUnique = uniqueFields.filter((f) => meta.primaryKeys.length <= 1 || !meta.primaryKeys.includes(f));
+		effectiveUnique.push("_id");
 		return {
 			injectFields: [{
 				path: "_id",
@@ -1314,7 +1323,7 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 					metadata: /* @__PURE__ */ new Map()
 				}
 			}],
-			addUniqueFields: uniqueFields
+			addUniqueFields: effectiveUnique
 		};
 	}
 	onAfterFlatten() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mongo",
-  "version": "0.1.40",
+  "version": "0.1.42",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -51,16 +51,16 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.39",
-    "@atscript/typescript": "^0.1.39",
+    "@atscript/core": "^0.1.41",
+    "@atscript/typescript": "^0.1.41",
     "mongodb": "^6.17.0",
-    "unplugin-atscript": "^0.1.39"
+    "unplugin-atscript": "^0.1.41"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.39",
-    "@atscript/typescript": "^0.1.39",
+    "@atscript/core": "^0.1.41",
+    "@atscript/typescript": "^0.1.41",
     "mongodb": "^6.17.0",
-    "@atscript/db": "^0.1.40"
+    "@atscript/db": "^0.1.42"
   },
   "scripts": {
     "postinstall": "asc -f dts",