@atscript/mongo 0.1.32 → 0.1.33

package/dist/index.cjs

@@ -44,22 +44,6 @@ else obj[key] = value;
 	return obj;
 }
 var CollectionPatcher = class CollectionPatcher {
-	/**
-	* Extract a set of *key properties* (annotated with `@expect.array.key`) from an
-	* array‐of‐objects type definition. These keys uniquely identify an element
-	* inside the array and are later used for `$update`, `$remove` and `$upsert`.
-	*
-	* @param def Atscript array type
-	* @returns Set of property names marked as keys; empty set if none
-	*/ static getKeyProps(def) {
-		if (def.type.of.type.kind === "object") {
-			const objType = def.type.of.type;
-			const keyProps = new Set();
-			for (const [key, val] of objType.props.entries()) if (val.metadata.get("expect.array.key")) keyProps.add(key);
-			return keyProps;
-		}
-		return new Set();
-	}
 	/**
 	* Build a runtime *Validator* that understands the extended patch payload.
 	*
@@ -130,14 +114,12 @@ else t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(va
 	* @param val Value to be written
 	* @private
 	*/ _set(key, val) {
-		for (const pipe of this.updatePipeline) {
-			if (!pipe.$set) pipe.$set = {};
-			if (!pipe.$set[key]) {
-				pipe.$set[key] = val;
-				return;
-			}
+		if (this.currentSetStage && !(key in this.currentSetStage.$set)) {
+			this.currentSetStage.$set[key] = val;
+			return;
 		}
-		this.updatePipeline.push({ $set: { [key]: val } });
+		this.currentSetStage = { $set: { [key]: val } };
+		this.updatePipeline.push(this.currentSetStage);
 	}
 	/**
 	* Recursively walk through the patch *payload* and convert it into `$set`/…
@@ -152,8 +134,8 @@ else t.prop(key, (0, __atscript_typescript_utils.defineAnnotatedType)().refTo(va
 			const key = evalKey(_key);
 			const flatType = this.collection.flatMap.get(key);
 			const topLevelArray = flatType?.metadata?.get("db.mongo.__topLevelArray");
-			if (typeof value === "object" && topLevelArray) this.parseArrayPatch(key, value);
-else if (typeof value === "object" && this.collection.flatMap.get(key)?.metadata?.get("db.patch.strategy") === "merge") this.flattenPayload(value, key);
+			if (typeof value === "object" && topLevelArray) 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);
 		}
 		return this.updatePipeline;
@@ -165,19 +147,19 @@ else if (key !== "_id") this._set(key, value);
 	* @param key   Dotted path to the array field
 	* @param value Payload slice for that field
 	* @private
-	*/ parseArrayPatch(key, value) {
-		const flatType = this.collection.flatMap.get(key);
+	*/ parseArrayPatch(key, value, flatType) {
 		const toRemove = value.$remove;
 		const toReplace = value.$replace;
 		const toInsert = value.$insert;
 		const toUpsert = value.$upsert;
 		const toUpdate = value.$update;
-		const keyProps = flatType?.type.kind === "array" ? CollectionPatcher.getKeyProps(flatType) : new Set();
-		this._remove(key, toRemove, keyProps);
+		const keyProps = flatType.type.kind === "array" ? (0, __atscript_utils_db.getKeyProps)(flatType) : new Set();
+		const keys = keyProps.size > 0 ? [...keyProps] : [];
+		this._remove(key, toRemove, keys, flatType);
 		this._replace(key, toReplace);
-		this._insert(key, toInsert, keyProps);
-		this._upsert(key, toUpsert, keyProps);
-		this._update(key, toUpdate, keyProps);
+		this._insert(key, toInsert, keys, flatType);
+		this._upsert(key, toUpsert, keys, flatType);
+		this._update(key, toUpdate, keys, flatType);
 	}
 	/**
 	* Build an *aggregation‐expression* that checks equality by **all** keys in
@@ -190,7 +172,8 @@ else if (key !== "_id") this._set(key, value);
 	* @param left  Base token for *left* expression (e.g. `"$$el"`)
 	* @param right Base token for *right* expression (e.g. `"$$this"`)
 	*/ _keysEqual(keys, left, right) {
-		return keys.map((k) => ({ $eq: [`${left}.${k}`, `${right}.${k}`] })).reduce((acc, cur) => acc ? { $and: [acc, cur] } : cur);
+		const eqs = keys.map((k) => ({ $eq: [`${left}.${k}`, `${right}.${k}`] }));
+		return eqs.length === 1 ? eqs[0] : { $and: eqs };
 	}
 	/**
 	* `$replace` – overwrite the entire array with `input`.
@@ -205,20 +188,19 @@ else if (key !== "_id") this._set(key, value);
 	* `$insert`
 	* - plain append      → $concatArrays
 	* - unique / keyed    → delegate to _upsert (insert-or-update)
-	*/ _insert(key, input, keyProps) {
+	*/ _insert(key, input, keys, flatType) {
 		if (!input?.length) return;
-		const uniqueItems = this.collection.flatMap.get(key)?.metadata?.has("expect.array.uniqueItems");
-		if (uniqueItems || keyProps.size > 0) this._upsert(key, input, keyProps);
+		const uniqueItems = flatType.metadata?.has("expect.array.uniqueItems");
+		if (uniqueItems || keys.length > 0) this._upsert(key, input, keys, flatType);
 else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 	}
 	/**
 	* `$upsert`
 	* - keyed  → remove existing matching by key(s) then append candidate
 	* - unique → $setUnion (deep equality)
-	*/ _upsert(key, input, keyProps) {
+	*/ _upsert(key, input, keys, _flatType) {
 		if (!input?.length) return;
-		if (keyProps.size > 0) {
-			const keys = [...keyProps];
+		if (keys.length > 0) {
 			this._set(key, { $reduce: {
 				input,
 				initialValue: { $ifNull: [`$${key}`, []] },
@@ -242,11 +224,10 @@ else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 	* `$update`
 	* - keyed       → map array and merge / replace matching element(s)
 	* - non-keyed   → behave like `$addToSet` (insert only when not present)
-	*/ _update(key, input, keyProps) {
+	*/ _update(key, input, keys, flatType) {
 		if (!input?.length) return;
-		if (keyProps.size > 0) {
-			const mergeStrategy = this.collection.flatMap.get(key)?.metadata?.get("db.patch.strategy") === "merge";
-			const keys = [...keyProps];
+		if (keys.length > 0) {
+			const mergeStrategy = flatType.metadata?.get("db.patch.strategy") === "merge";
 			this._set(key, { $reduce: {
 				input,
 				initialValue: { $ifNull: [`$${key}`, []] },
@@ -266,23 +247,21 @@ else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 	* `$remove`
 	* - keyed     → filter out any element whose key set matches a payload item
 	* - non-keyed → deep equality remove (`$setDifference`)
-	*/ _remove(key, input, keyProps) {
+	*/ _remove(key, input, keys, _flatType) {
 		if (!input?.length) return;
-		if (keyProps.size > 0) {
-			const keys = [...keyProps];
-			this._set(key, { $let: {
-				vars: { rem: input },
-				in: { $filter: {
-					input: { $ifNull: [`$${key}`, []] },
-					as: "el",
-					cond: { $not: { $anyElementTrue: { $map: {
-						input: "$$rem",
-						as: "r",
-						in: this._keysEqual(keys, "$$el", "$$r")
-					} } } }
-				} }
-			} });
-		} else this._set(key, { $setDifference: [{ $ifNull: [`$${key}`, []] }, input] });
+		if (keys.length > 0) this._set(key, { $let: {
+			vars: { rem: input },
+			in: { $filter: {
+				input: { $ifNull: [`$${key}`, []] },
+				as: "el",
+				cond: { $not: { $anyElementTrue: { $map: {
+					input: "$$rem",
+					as: "r",
+					in: this._keysEqual(keys, "$$el", "$$r")
+				} } } }
+			} }
+		} });
+else this._set(key, { $setDifference: [{ $ifNull: [`$${key}`, []] }, input] });
 	}
 	constructor(collection, payload) {
 		_define_property$2(this, "collection", void 0);
@@ -292,14 +271,17 @@ else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 		* Filled only with the `_id` field right now.
 		*/ _define_property$2(this, "filterObj", void 0);
 		/** MongoDB *update* document being built. */ _define_property$2(this, "updatePipeline", void 0);
+		/** Current `$set` stage being populated. */ _define_property$2(this, "currentSetStage", void 0);
 		/** Additional *options* (mainly `arrayFilters`). */ _define_property$2(this, "optionsObj", void 0);
 		this.collection = collection;
 		this.payload = payload;
 		this.filterObj = {};
 		this.updatePipeline = [];
+		this.currentSetStage = null;
 		this.optionsObj = {};
 	}
 };
+_define_property$2(CollectionPatcher, "getKeyProps", __atscript_utils_db.getKeyProps);
 
 //#endregion
 //#region packages/mongo/src/lib/mongo-filter.ts

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { TAtscriptAnnotatedType, TValidatorOptions, Validator, TAtscriptTypeArray, TValidatorPlugin, TMetadataMap } from '@atscript/typescript/utils';
-import { AtscriptDbTable, BaseDbAdapter, FilterExpr, TDbUpdateResult, TSearchIndexInfo, DbQuery, TDbInsertResult, TDbInsertManyResult, TDbDeleteResult } from '@atscript/utils-db';
+import { TAtscriptAnnotatedType, TValidatorOptions, Validator, TValidatorPlugin, TMetadataMap } from '@atscript/typescript/utils';
+import { AtscriptDbTable, getKeyProps, BaseDbAdapter, FilterExpr, TDbUpdateResult, TSearchIndexInfo, DbQuery, TDbInsertResult, TDbInsertManyResult, TDbDeleteResult } from '@atscript/utils-db';
 import * as mongodb from 'mongodb';
 import { MongoClient, Filter, UpdateFilter, Document, UpdateOptions, Db, Collection, AggregationCursor, ObjectId } from 'mongodb';
 
@@ -60,15 +60,7 @@ declare class CollectionPatcher {
     private collection;
     private payload;
     constructor(collection: TCollectionPatcherContext, payload: any);
-    /**
-     * Extract a set of *key properties* (annotated with `@expect.array.key`) from an
-     * array‐of‐objects type definition. These keys uniquely identify an element
-     * inside the array and are later used for `$update`, `$remove` and `$upsert`.
-     *
-     * @param def Atscript array type
-     * @returns Set of property names marked as keys; empty set if none
-     */
-    static getKeyProps(def: TAtscriptAnnotatedType<TAtscriptTypeArray>): Set<string>;
+    static getKeyProps: typeof getKeyProps;
     /**
      * Build a runtime *Validator* that understands the extended patch payload.
      *
@@ -86,6 +78,8 @@ declare class CollectionPatcher {
     private filterObj;
     /** MongoDB *update* document being built. */
     private updatePipeline;
+    /** Current `$set` stage being populated. */
+    private currentSetStage;
     /** Additional *options* (mainly `arrayFilters`). */
     private optionsObj;
     /**

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { AtscriptDbTable, BaseDbAdapter, walkFilter } from "@atscript/utils-db";
+import { AtscriptDbTable, BaseDbAdapter, getKeyProps, walkFilter } from "@atscript/utils-db";
 import { MongoClient, ObjectId } from "mongodb";
 import { defineAnnotatedType, isAnnotatedTypeOfPrimitive } from "@atscript/typescript/utils";
 
@@ -20,22 +20,6 @@ else obj[key] = value;
 	return obj;
 }
 var CollectionPatcher = class CollectionPatcher {
-	/**
-	* Extract a set of *key properties* (annotated with `@expect.array.key`) from an
-	* array‐of‐objects type definition. These keys uniquely identify an element
-	* inside the array and are later used for `$update`, `$remove` and `$upsert`.
-	*
-	* @param def Atscript array type
-	* @returns Set of property names marked as keys; empty set if none
-	*/ static getKeyProps(def) {
-		if (def.type.of.type.kind === "object") {
-			const objType = def.type.of.type;
-			const keyProps = new Set();
-			for (const [key, val] of objType.props.entries()) if (val.metadata.get("expect.array.key")) keyProps.add(key);
-			return keyProps;
-		}
-		return new Set();
-	}
 	/**
 	* Build a runtime *Validator* that understands the extended patch payload.
 	*
@@ -106,14 +90,12 @@ else t.prop(key, defineAnnotatedType().refTo(val).copyMetadata(def.metadata).opt
 	* @param val Value to be written
 	* @private
 	*/ _set(key, val) {
-		for (const pipe of this.updatePipeline) {
-			if (!pipe.$set) pipe.$set = {};
-			if (!pipe.$set[key]) {
-				pipe.$set[key] = val;
-				return;
-			}
+		if (this.currentSetStage && !(key in this.currentSetStage.$set)) {
+			this.currentSetStage.$set[key] = val;
+			return;
 		}
-		this.updatePipeline.push({ $set: { [key]: val } });
+		this.currentSetStage = { $set: { [key]: val } };
+		this.updatePipeline.push(this.currentSetStage);
 	}
 	/**
 	* Recursively walk through the patch *payload* and convert it into `$set`/…
@@ -128,8 +110,8 @@ else t.prop(key, defineAnnotatedType().refTo(val).copyMetadata(def.metadata).opt
 			const key = evalKey(_key);
 			const flatType = this.collection.flatMap.get(key);
 			const topLevelArray = flatType?.metadata?.get("db.mongo.__topLevelArray");
-			if (typeof value === "object" && topLevelArray) this.parseArrayPatch(key, value);
-else if (typeof value === "object" && this.collection.flatMap.get(key)?.metadata?.get("db.patch.strategy") === "merge") this.flattenPayload(value, key);
+			if (typeof value === "object" && topLevelArray) 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);
 		}
 		return this.updatePipeline;
@@ -141,19 +123,19 @@ else if (key !== "_id") this._set(key, value);
 	* @param key   Dotted path to the array field
 	* @param value Payload slice for that field
 	* @private
-	*/ parseArrayPatch(key, value) {
-		const flatType = this.collection.flatMap.get(key);
+	*/ parseArrayPatch(key, value, flatType) {
 		const toRemove = value.$remove;
 		const toReplace = value.$replace;
 		const toInsert = value.$insert;
 		const toUpsert = value.$upsert;
 		const toUpdate = value.$update;
-		const keyProps = flatType?.type.kind === "array" ? CollectionPatcher.getKeyProps(flatType) : new Set();
-		this._remove(key, toRemove, keyProps);
+		const keyProps = flatType.type.kind === "array" ? getKeyProps(flatType) : new Set();
+		const keys = keyProps.size > 0 ? [...keyProps] : [];
+		this._remove(key, toRemove, keys, flatType);
 		this._replace(key, toReplace);
-		this._insert(key, toInsert, keyProps);
-		this._upsert(key, toUpsert, keyProps);
-		this._update(key, toUpdate, keyProps);
+		this._insert(key, toInsert, keys, flatType);
+		this._upsert(key, toUpsert, keys, flatType);
+		this._update(key, toUpdate, keys, flatType);
 	}
 	/**
 	* Build an *aggregation‐expression* that checks equality by **all** keys in
@@ -166,7 +148,8 @@ else if (key !== "_id") this._set(key, value);
 	* @param left  Base token for *left* expression (e.g. `"$$el"`)
 	* @param right Base token for *right* expression (e.g. `"$$this"`)
 	*/ _keysEqual(keys, left, right) {
-		return keys.map((k) => ({ $eq: [`${left}.${k}`, `${right}.${k}`] })).reduce((acc, cur) => acc ? { $and: [acc, cur] } : cur);
+		const eqs = keys.map((k) => ({ $eq: [`${left}.${k}`, `${right}.${k}`] }));
+		return eqs.length === 1 ? eqs[0] : { $and: eqs };
 	}
 	/**
 	* `$replace` – overwrite the entire array with `input`.
@@ -181,20 +164,19 @@ else if (key !== "_id") this._set(key, value);
 	* `$insert`
 	* - plain append      → $concatArrays
 	* - unique / keyed    → delegate to _upsert (insert-or-update)
-	*/ _insert(key, input, keyProps) {
+	*/ _insert(key, input, keys, flatType) {
 		if (!input?.length) return;
-		const uniqueItems = this.collection.flatMap.get(key)?.metadata?.has("expect.array.uniqueItems");
-		if (uniqueItems || keyProps.size > 0) this._upsert(key, input, keyProps);
+		const uniqueItems = flatType.metadata?.has("expect.array.uniqueItems");
+		if (uniqueItems || keys.length > 0) this._upsert(key, input, keys, flatType);
 else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 	}
 	/**
 	* `$upsert`
 	* - keyed  → remove existing matching by key(s) then append candidate
 	* - unique → $setUnion (deep equality)
-	*/ _upsert(key, input, keyProps) {
+	*/ _upsert(key, input, keys, _flatType) {
 		if (!input?.length) return;
-		if (keyProps.size > 0) {
-			const keys = [...keyProps];
+		if (keys.length > 0) {
 			this._set(key, { $reduce: {
 				input,
 				initialValue: { $ifNull: [`$${key}`, []] },
@@ -218,11 +200,10 @@ else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 	* `$update`
 	* - keyed       → map array and merge / replace matching element(s)
 	* - non-keyed   → behave like `$addToSet` (insert only when not present)
-	*/ _update(key, input, keyProps) {
+	*/ _update(key, input, keys, flatType) {
 		if (!input?.length) return;
-		if (keyProps.size > 0) {
-			const mergeStrategy = this.collection.flatMap.get(key)?.metadata?.get("db.patch.strategy") === "merge";
-			const keys = [...keyProps];
+		if (keys.length > 0) {
+			const mergeStrategy = flatType.metadata?.get("db.patch.strategy") === "merge";
 			this._set(key, { $reduce: {
 				input,
 				initialValue: { $ifNull: [`$${key}`, []] },
@@ -242,23 +223,21 @@ else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 	* `$remove`
 	* - keyed     → filter out any element whose key set matches a payload item
 	* - non-keyed → deep equality remove (`$setDifference`)
-	*/ _remove(key, input, keyProps) {
+	*/ _remove(key, input, keys, _flatType) {
 		if (!input?.length) return;
-		if (keyProps.size > 0) {
-			const keys = [...keyProps];
-			this._set(key, { $let: {
-				vars: { rem: input },
-				in: { $filter: {
-					input: { $ifNull: [`$${key}`, []] },
-					as: "el",
-					cond: { $not: { $anyElementTrue: { $map: {
-						input: "$$rem",
-						as: "r",
-						in: this._keysEqual(keys, "$$el", "$$r")
-					} } } }
-				} }
-			} });
-		} else this._set(key, { $setDifference: [{ $ifNull: [`$${key}`, []] }, input] });
+		if (keys.length > 0) this._set(key, { $let: {
+			vars: { rem: input },
+			in: { $filter: {
+				input: { $ifNull: [`$${key}`, []] },
+				as: "el",
+				cond: { $not: { $anyElementTrue: { $map: {
+					input: "$$rem",
+					as: "r",
+					in: this._keysEqual(keys, "$$el", "$$r")
+				} } } }
+			} }
+		} });
+else this._set(key, { $setDifference: [{ $ifNull: [`$${key}`, []] }, input] });
 	}
 	constructor(collection, payload) {
 		_define_property$2(this, "collection", void 0);
@@ -268,14 +247,17 @@ else this._set(key, { $concatArrays: [{ $ifNull: [`$${key}`, []] }, input] });
 		* Filled only with the `_id` field right now.
 		*/ _define_property$2(this, "filterObj", void 0);
 		/** MongoDB *update* document being built. */ _define_property$2(this, "updatePipeline", void 0);
+		/** Current `$set` stage being populated. */ _define_property$2(this, "currentSetStage", void 0);
 		/** Additional *options* (mainly `arrayFilters`). */ _define_property$2(this, "optionsObj", void 0);
 		this.collection = collection;
 		this.payload = payload;
 		this.filterObj = {};
 		this.updatePipeline = [];
+		this.currentSetStage = null;
 		this.optionsObj = {};
 	}
 };
+_define_property$2(CollectionPatcher, "getKeyProps", getKeyProps);
 
 //#endregion
 //#region packages/mongo/src/lib/mongo-filter.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/mongo",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -57,9 +57,9 @@
   },
   "peerDependencies": {
     "mongodb": "^6.17.0",
-    "@atscript/core": "^0.1.32",
-    "@atscript/utils-db": "^0.1.32",
-    "@atscript/typescript": "^0.1.32"
+    "@atscript/core": "^0.1.33",
+    "@atscript/utils-db": "^0.1.33",
+    "@atscript/typescript": "^0.1.33"
   },
   "build": [
     {},