@atscript/db-mongo 0.1.154 → 0.1.155

package/dist/index.cjs

@@ -162,11 +162,14 @@ var CollectionPatcher = class {
 		this.currentSetStage = { $set: { [key]: val } };
 		this.updatePipeline.push(this.currentSetStage);
 	}
-	/** Set a leaf, lifting an `$inc`/`$mul` field op into an aggregation expression if present. */
-	_setLeaf(key, value) {
+	/**
+	* Set a leaf, lifting an `$inc`/`$mul` field op into an aggregation expression if present.
+	* `type`: the field's type, when known.
+	*/
+	_setLeaf(key, value, type) {
 		const fieldOp = (0, _atscript_db.getDbFieldOp)(value);
 		if (fieldOp) this._set(key, this._fieldOpExpr(key, fieldOp.op, fieldOp.value));
-		else if (containsAggregationExpr(value)) this._set(key, { $literal: value });
+		else if (containsAggregationExpr(value) || replacesWhole(value, type)) this._set(key, { $literal: value });
 		else this._set(key, value);
 	}
 	/**
@@ -187,7 +190,7 @@ var CollectionPatcher = class {
 			if (isObjectValue && topLevelArray && !flatType?.metadata?.has("db.json")) this.parseArrayPatch(key, value, flatType);
 			else if (isObjectValue && flatType?.metadata?.get("db.patch.strategy") === "merge") this.flattenPayload(value, key);
 			else if (isObjectValue && flatType?.type.kind === "object" && !flatType.metadata?.has("db.json")) this._flattenReplaceObject(value, key, flatType);
-			else if (key !== "_id") this._setLeaf(key, value);
+			else if (key !== "_id") this._setLeaf(key, value, flatType);
 		}
 		return this.updatePipeline;
 	}
@@ -213,7 +216,7 @@ var CollectionPatcher = class {
 				else this._flattenReplaceObject(childValue, childKey, propType);
 				continue;
 			}
-			this._setLeaf(childKey, childValue);
+			this._setLeaf(childKey, childValue, propType);
 		}
 	}
 	/**
@@ -361,6 +364,16 @@ var CollectionPatcher = class {
 		else this._set(key, { $setDifference: [{ $ifNull: [`$${key}`, []] }, input] });
 	}
 };
+/**
+* Whether a plain-object patch value replaces the stored object instead of
+* merging into it: a `@db.json` object, or a union of objects / `T | null`
+* whose member may switch (since 0.1.155). A field the patcher cannot type
+* (e.g. under a `@db.column` name) keeps the merge.
+*/
+function replacesWhole(value, type) {
+	if (!type || !(0, _atscript_db.isPlainObject)(value)) return false;
+	return type.metadata?.has("db.json") || type.type.kind === "union";
+}
 //#endregion
 //#region src/lib/mongo-types.ts
 const INDEX_PREFIX = "atscript__";
@@ -1624,6 +1637,30 @@ async function hasRowsImpl(host, tableName) {
 		...host._getSessionOpts()
 	}) !== null;
 }
+/**
+* Documents `fields` cannot identify (see `BaseDbAdapter.countKeyViolations`):
+* those missing one of them or holding `null`, plus every document sharing
+* its values with another — one `$facet` aggregation.
+*/
+async function countKeyViolationsImpl(host, fields, tableName) {
+	const key = Object.fromEntries(fields.map((f, i) => [`k${i}`, `$${f}`]));
+	const [result] = await host.db.collection(tableName ?? host.resolveTableName(false)).aggregate([{ $facet: {
+		nulls: [{ $match: { $or: fields.map((f) => ({ [f]: null })) } }, { $count: "n" }],
+		dups: [
+			{ $match: { $and: fields.map((f) => ({ [f]: { $ne: null } })) } },
+			{ $group: {
+				_id: key,
+				n: { $sum: 1 }
+			} },
+			{ $match: { n: { $gt: 1 } } },
+			{ $group: {
+				_id: null,
+				n: { $sum: "$n" }
+			} }
+		]
+	} }], host._getSessionOpts()).toArray();
+	return (result?.nulls[0]?.n ?? 0) + (result?.dups[0]?.n ?? 0);
+}
 /** Kind of the object stored under `name` (`listCollections` reports views as `"view"`). */
 async function getObjectKindImpl(host, name) {
 	const type = (await host.db.listCollections({ name }, { nameOnly: true }).toArray())[0]?.type;
@@ -2154,6 +2191,8 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	_hasExplicitId = false;
 	/** Unique fields accumulated during onFieldScanned, returned via getMetadataOverrides. */
 	_pendingUniqueFields = [];
+	/** {@link _patcherFlatMap}'s memo. */
+	_patcherFlatMapMemo;
 	constructor(db, client, options = {}) {
 		super();
 		this.db = db;
@@ -2439,11 +2478,32 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	/** Returns the context object used by CollectionPatcher. */
 	getPatcherContext() {
 		return {
-			flatMap: this._table.flatMap,
+			flatMap: this._patcherFlatMap(),
 			prepareId: (id) => this.prepareIdFromIdType(id),
 			createValidator: (opts) => this._table.createValidator(opts)
 		};
 	}
+	/**
+	* The table's flat map keyed by document path: a patch reaches the patcher
+	* with `@db.column` names already applied (`translatePatchKeys`), so a
+	* renamed union / `@db.json` field is found — and replaced, not merged —
+	* under its stored name. Derived fields are left out (they map to their
+	* source's path). Built once per flat map.
+	*/
+	_patcherFlatMap() {
+		const src = this._table.flatMap;
+		let memo = this._patcherFlatMapMemo;
+		if (memo?.src !== src) {
+			const meta = this._table.getMetadata();
+			const map = /* @__PURE__ */ new Map();
+			for (const [path, type] of src) if (!meta.derivedFields.has(path)) map.set(meta.documentPath(path), type);
+			memo = this._patcherFlatMapMemo = {
+				src,
+				map
+			};
+		}
+		return memo.map;
+	}
 	async nativePatch(filter, patch, ops, expectedVersion, opts) {
 		const mongoFilter = await this._buildCasFilter(filter, expectedVersion, "nativePatch");
 		if (!mongoFilter) return {
@@ -2487,7 +2547,7 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	onFieldScanned(field, _type, metadata) {
 		if (field === "_id") this._hasExplicitId = true;
-		if (field !== "_id" && metadata.has("meta.id")) this._pendingUniqueFields.push(field);
+		if (field !== "_id" && !field.includes(".") && metadata.has("meta.id")) this._pendingUniqueFields.push(field);
 		for (const index of metadata.get("db.mongo.search.text") || []) this._pendingSearchFields.push({
 			indexName: index.indexName,
 			field,
@@ -3101,10 +3161,14 @@ var MongoAdapter = class MongoAdapter extends _atscript_db.BaseDbAdapter {
 	async getObjectKind(name) {
 		return getObjectKindImpl(this, name);
 	}
+	async countKeyViolations(fields, tableName) {
+		return countKeyViolationsImpl(this, fields, tableName);
+	}
 	/**
 	* No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
-	* an index change that `syncIndexes` reconciles. Schema sync refuses the
-	* change on a populated collection for cross-adapter consistency.
+	* an index change that `syncIndexes` reconciles. Like on the other adapters,
+	* schema sync refuses it on a populated collection whose documents do not
+	* satisfy the new key.
 	*/
 	async rebuildPrimaryKey(_change) {}
 	async syncIndexes() {

package/dist/index.d.cts

@@ -74,7 +74,10 @@ declare class CollectionPatcher {
    * @private
    */
   private _set;
-  /** Set a leaf, lifting an `$inc`/`$mul` field op into an aggregation expression if present. */
+  /**
+   * Set a leaf, lifting an `$inc`/`$mul` field op into an aggregation expression if present.
+   * `type`: the field's type, when known.
+   */
   private _setLeaf;
   /**
    * Recursively walk through the patch *payload* and convert it into `$set`/…
@@ -301,6 +304,8 @@ declare class MongoAdapter extends BaseDbAdapter {
   protected _hasExplicitId: boolean;
   /** Unique fields accumulated during onFieldScanned, returned via getMetadataOverrides. */
   private _pendingUniqueFields;
+  /** {@link _patcherFlatMap}'s memo. */
+  private _patcherFlatMapMemo?;
   constructor(db: Db, client?: MongoClient | undefined, options?: TMongoAdapterOptions);
   private get _client();
   /** Every adapter over this client (or database handle) shares one session (since 0.1.128). */
@@ -435,6 +440,14 @@ declare class MongoAdapter extends BaseDbAdapter {
   loadRelations(rows: Array<Record<string, unknown>>, withRelations: WithRelation[], relations: ReadonlyMap<string, TDbRelation>, foreignKeys: ReadonlyMap<string, TDbForeignKey>, tableResolver?: TTableResolver): Promise<void>;
   /** Returns the context object used by CollectionPatcher. */
   getPatcherContext(): TCollectionPatcherContext;
+  /**
+   * The table's flat map keyed by document path: a patch reaches the patcher
+   * with `@db.column` names already applied (`translatePatchKeys`), so a
+   * renamed union / `@db.json` field is found — and replaced, not merged —
+   * under its stored name. Derived fields are left out (they map to their
+   * source's path). Built once per flat map.
+   */
+  private _patcherFlatMap;
   nativePatch(filter: FilterExpr, patch: unknown, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   onBeforeFlatten(_type: unknown): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
@@ -574,10 +587,12 @@ declare class MongoAdapter extends BaseDbAdapter {
   ensureTable(): Promise<void>;
   hasRows(tableName?: string): Promise<boolean>;
   getObjectKind(name: string): Promise<TDbObjectKind | undefined>;
+  countKeyViolations(fields: readonly string[], tableName?: string): Promise<number>;
   /**
    * No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
-   * an index change that `syncIndexes` reconciles. Schema sync refuses the
-   * change on a populated collection for cross-adapter consistency.
+   * an index change that `syncIndexes` reconciles. Like on the other adapters,
+   * schema sync refuses it on a populated collection whose documents do not
+   * satisfy the new key.
    */
   rebuildPrimaryKey(_change: TPrimaryKeyChange): Promise<void>;
   syncIndexes(): Promise<void>;

package/dist/index.d.mts

@@ -74,7 +74,10 @@ declare class CollectionPatcher {
    * @private
    */
   private _set;
-  /** Set a leaf, lifting an `$inc`/`$mul` field op into an aggregation expression if present. */
+  /**
+   * Set a leaf, lifting an `$inc`/`$mul` field op into an aggregation expression if present.
+   * `type`: the field's type, when known.
+   */
   private _setLeaf;
   /**
    * Recursively walk through the patch *payload* and convert it into `$set`/…
@@ -301,6 +304,8 @@ declare class MongoAdapter extends BaseDbAdapter {
   protected _hasExplicitId: boolean;
   /** Unique fields accumulated during onFieldScanned, returned via getMetadataOverrides. */
   private _pendingUniqueFields;
+  /** {@link _patcherFlatMap}'s memo. */
+  private _patcherFlatMapMemo?;
   constructor(db: Db, client?: MongoClient | undefined, options?: TMongoAdapterOptions);
   private get _client();
   /** Every adapter over this client (or database handle) shares one session (since 0.1.128). */
@@ -435,6 +440,14 @@ declare class MongoAdapter extends BaseDbAdapter {
   loadRelations(rows: Array<Record<string, unknown>>, withRelations: WithRelation[], relations: ReadonlyMap<string, TDbRelation>, foreignKeys: ReadonlyMap<string, TDbForeignKey>, tableResolver?: TTableResolver): Promise<void>;
   /** Returns the context object used by CollectionPatcher. */
   getPatcherContext(): TCollectionPatcherContext;
+  /**
+   * The table's flat map keyed by document path: a patch reaches the patcher
+   * with `@db.column` names already applied (`translatePatchKeys`), so a
+   * renamed union / `@db.json` field is found — and replaced, not merged —
+   * under its stored name. Derived fields are left out (they map to their
+   * source's path). Built once per flat map.
+   */
+  private _patcherFlatMap;
   nativePatch(filter: FilterExpr, patch: unknown, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   onBeforeFlatten(_type: unknown): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
@@ -574,10 +587,12 @@ declare class MongoAdapter extends BaseDbAdapter {
   ensureTable(): Promise<void>;
   hasRows(tableName?: string): Promise<boolean>;
   getObjectKind(name: string): Promise<TDbObjectKind | undefined>;
+  countKeyViolations(fields: readonly string[], tableName?: string): Promise<number>;
   /**
    * No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
-   * an index change that `syncIndexes` reconciles. Schema sync refuses the
-   * change on a populated collection for cross-adapter consistency.
+   * an index change that `syncIndexes` reconciles. Like on the other adapters,
+   * schema sync refuses it on a populated collection whose documents do not
+   * satisfy the new key.
    */
   rebuildPrimaryKey(_change: TPrimaryKeyChange): Promise<void>;
   syncIndexes(): Promise<void>;

package/dist/index.mjs

@@ -161,11 +161,14 @@ var CollectionPatcher = class {
 		this.currentSetStage = { $set: { [key]: val } };
 		this.updatePipeline.push(this.currentSetStage);
 	}
-	/** Set a leaf, lifting an `$inc`/`$mul` field op into an aggregation expression if present. */
-	_setLeaf(key, value) {
+	/**
+	* Set a leaf, lifting an `$inc`/`$mul` field op into an aggregation expression if present.
+	* `type`: the field's type, when known.
+	*/
+	_setLeaf(key, value, type) {
 		const fieldOp = getDbFieldOp(value);
 		if (fieldOp) this._set(key, this._fieldOpExpr(key, fieldOp.op, fieldOp.value));
-		else if (containsAggregationExpr(value)) this._set(key, { $literal: value });
+		else if (containsAggregationExpr(value) || replacesWhole(value, type)) this._set(key, { $literal: value });
 		else this._set(key, value);
 	}
 	/**
@@ -186,7 +189,7 @@ var CollectionPatcher = class {
 			if (isObjectValue && topLevelArray && !flatType?.metadata?.has("db.json")) this.parseArrayPatch(key, value, flatType);
 			else if (isObjectValue && flatType?.metadata?.get("db.patch.strategy") === "merge") this.flattenPayload(value, key);
 			else if (isObjectValue && flatType?.type.kind === "object" && !flatType.metadata?.has("db.json")) this._flattenReplaceObject(value, key, flatType);
-			else if (key !== "_id") this._setLeaf(key, value);
+			else if (key !== "_id") this._setLeaf(key, value, flatType);
 		}
 		return this.updatePipeline;
 	}
@@ -212,7 +215,7 @@ var CollectionPatcher = class {
 				else this._flattenReplaceObject(childValue, childKey, propType);
 				continue;
 			}
-			this._setLeaf(childKey, childValue);
+			this._setLeaf(childKey, childValue, propType);
 		}
 	}
 	/**
@@ -360,6 +363,16 @@ var CollectionPatcher = class {
 		else this._set(key, { $setDifference: [{ $ifNull: [`$${key}`, []] }, input] });
 	}
 };
+/**
+* Whether a plain-object patch value replaces the stored object instead of
+* merging into it: a `@db.json` object, or a union of objects / `T | null`
+* whose member may switch (since 0.1.155). A field the patcher cannot type
+* (e.g. under a `@db.column` name) keeps the merge.
+*/
+function replacesWhole(value, type) {
+	if (!type || !isPlainObject(value)) return false;
+	return type.metadata?.has("db.json") || type.type.kind === "union";
+}
 //#endregion
 //#region src/lib/mongo-types.ts
 const INDEX_PREFIX = "atscript__";
@@ -1623,6 +1636,30 @@ async function hasRowsImpl(host, tableName) {
 		...host._getSessionOpts()
 	}) !== null;
 }
+/**
+* Documents `fields` cannot identify (see `BaseDbAdapter.countKeyViolations`):
+* those missing one of them or holding `null`, plus every document sharing
+* its values with another — one `$facet` aggregation.
+*/
+async function countKeyViolationsImpl(host, fields, tableName) {
+	const key = Object.fromEntries(fields.map((f, i) => [`k${i}`, `$${f}`]));
+	const [result] = await host.db.collection(tableName ?? host.resolveTableName(false)).aggregate([{ $facet: {
+		nulls: [{ $match: { $or: fields.map((f) => ({ [f]: null })) } }, { $count: "n" }],
+		dups: [
+			{ $match: { $and: fields.map((f) => ({ [f]: { $ne: null } })) } },
+			{ $group: {
+				_id: key,
+				n: { $sum: 1 }
+			} },
+			{ $match: { n: { $gt: 1 } } },
+			{ $group: {
+				_id: null,
+				n: { $sum: "$n" }
+			} }
+		]
+	} }], host._getSessionOpts()).toArray();
+	return (result?.nulls[0]?.n ?? 0) + (result?.dups[0]?.n ?? 0);
+}
 /** Kind of the object stored under `name` (`listCollections` reports views as `"view"`). */
 async function getObjectKindImpl(host, name) {
 	const type = (await host.db.listCollections({ name }, { nameOnly: true }).toArray())[0]?.type;
@@ -2153,6 +2190,8 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	_hasExplicitId = false;
 	/** Unique fields accumulated during onFieldScanned, returned via getMetadataOverrides. */
 	_pendingUniqueFields = [];
+	/** {@link _patcherFlatMap}'s memo. */
+	_patcherFlatMapMemo;
 	constructor(db, client, options = {}) {
 		super();
 		this.db = db;
@@ -2438,11 +2477,32 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	/** Returns the context object used by CollectionPatcher. */
 	getPatcherContext() {
 		return {
-			flatMap: this._table.flatMap,
+			flatMap: this._patcherFlatMap(),
 			prepareId: (id) => this.prepareIdFromIdType(id),
 			createValidator: (opts) => this._table.createValidator(opts)
 		};
 	}
+	/**
+	* The table's flat map keyed by document path: a patch reaches the patcher
+	* with `@db.column` names already applied (`translatePatchKeys`), so a
+	* renamed union / `@db.json` field is found — and replaced, not merged —
+	* under its stored name. Derived fields are left out (they map to their
+	* source's path). Built once per flat map.
+	*/
+	_patcherFlatMap() {
+		const src = this._table.flatMap;
+		let memo = this._patcherFlatMapMemo;
+		if (memo?.src !== src) {
+			const meta = this._table.getMetadata();
+			const map = /* @__PURE__ */ new Map();
+			for (const [path, type] of src) if (!meta.derivedFields.has(path)) map.set(meta.documentPath(path), type);
+			memo = this._patcherFlatMapMemo = {
+				src,
+				map
+			};
+		}
+		return memo.map;
+	}
 	async nativePatch(filter, patch, ops, expectedVersion, opts) {
 		const mongoFilter = await this._buildCasFilter(filter, expectedVersion, "nativePatch");
 		if (!mongoFilter) return {
@@ -2486,7 +2546,7 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	}
 	onFieldScanned(field, _type, metadata) {
 		if (field === "_id") this._hasExplicitId = true;
-		if (field !== "_id" && metadata.has("meta.id")) this._pendingUniqueFields.push(field);
+		if (field !== "_id" && !field.includes(".") && metadata.has("meta.id")) this._pendingUniqueFields.push(field);
 		for (const index of metadata.get("db.mongo.search.text") || []) this._pendingSearchFields.push({
 			indexName: index.indexName,
 			field,
@@ -3100,10 +3160,14 @@ var MongoAdapter = class MongoAdapter extends BaseDbAdapter {
 	async getObjectKind(name) {
 		return getObjectKindImpl(this, name);
 	}
+	async countKeyViolations(fields, tableName) {
+		return countKeyViolationsImpl(this, fields, tableName);
+	}
 	/**
 	* No physical primary key on MongoDB (`_id` is fixed): a `@meta.id` move is
-	* an index change that `syncIndexes` reconciles. Schema sync refuses the
-	* change on a populated collection for cross-adapter consistency.
+	* an index change that `syncIndexes` reconciles. Like on the other adapters,
+	* schema sync refuses it on a populated collection whose documents do not
+	* satisfy the new key.
 	*/
 	async rebuildPrimaryKey(_change) {}
 	async syncIndexes() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mongo",
-  "version": "0.1.154",
+  "version": "0.1.155",
   "description": "Mongodb plugin for atscript.",
   "keywords": [
     "atscript",
@@ -46,19 +46,19 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.103",
-    "@atscript/typescript": "^0.1.103",
+    "@atscript/core": "^0.1.105",
+    "@atscript/typescript": "^0.1.105",
     "@uniqu/core": "^0.1.15",
     "mongodb": "^6.17.0",
     "mongodb-memory-server-core": "^10.0.0",
-    "unplugin-atscript": "^0.1.103"
+    "unplugin-atscript": "^0.1.105"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.103",
-    "@atscript/typescript": "^0.1.103",
+    "@atscript/core": "^0.1.105",
+    "@atscript/typescript": "^0.1.105",
     "@uniqu/core": "^0.1.15",
     "mongodb": "^6.17.0",
-    "@atscript/db": "^0.1.154"
+    "@atscript/db": "^0.1.155"
   },
   "scripts": {
     "postinstall": "asc -f dts",