merge: Array operations

docker/docker-compose.yml

@@ -0,0 +1,9 @@
+
+services:
+  mongodb:
+    image: mongo:7
+    environment:
+      - MONGODB_INITDB_ROOT_USERNAME=user
+      - MONGODB_INITDB_ROOT_PASSWORD=password
+    ports:
+      - "27017:27017"

driver-sync/src/main/kotlin/NativeMongoCollection.kt

@@ -9,7 +9,7 @@ import com.mongodb.kotlin.client.FindIterable
 import fr.qsh.ktmongo.dsl.LowLevelApi
 import fr.qsh.ktmongo.dsl.expr.FilterExpression
 import fr.qsh.ktmongo.dsl.expr.UpdateExpression
-import fr.qsh.ktmongo.dsl.expr.common.CompoundExpression
+import fr.qsh.ktmongo.dsl.expr.common.AbstractCompoundExpression
 import org.bson.BsonDocument
 import org.bson.BsonDocumentWriter
 import com.mongodb.kotlin.client.MongoCollection as OfficialMongoCollection
@@ -22,7 +22,7 @@ class NativeMongoCollection<Document : Any>(
 	fun asOfficialMongoCollection() = unsafe
 
 	@OptIn(LowLevelApi::class)
-	private fun CompoundExpression.toBsonDocument(): BsonDocument {
+	private fun AbstractCompoundExpression.toBsonDocument(): BsonDocument {
 		val bson = BsonDocument()
 
 		BsonDocumentWriter(bson).use { writer ->
@@ -32,6 +32,19 @@ class NativeMongoCollection<Document : Any>(
 		return bson
 	}
 
+	@OptIn(LowLevelApi::class)
+	private fun AbstractCompoundExpression.toNestedBsonDocument(): BsonDocument {
+		val bson = BsonDocument()
+
+		BsonDocumentWriter(bson).use { writer ->
+			writer.writeStartDocument()
+			this.writeTo(writer)
+			writer.writeEndDocument()
+		}
+
+		return bson
+	}
+
 	// region Find
 
 	override fun find(): FindIterable<Document> =
@@ -94,7 +107,7 @@ class NativeMongoCollection<Document : Any>(
 
 		val updateBson = UpdateExpression<Document>(unsafe.codecRegistry)
 			.apply(update)
-			.toBsonDocument()
+			.toNestedBsonDocument()
 
 		return when (val session = getCurrentSession()) {
 			null -> unsafe.updateOne(filterBson, updateBson, options)
@@ -113,7 +126,7 @@ class NativeMongoCollection<Document : Any>(
 
 		val updateBson = UpdateExpression<Document>(unsafe.codecRegistry)
 			.apply(update)
-			.toBsonDocument()
+			.toNestedBsonDocument()
 
 		return when (val session = getCurrentSession()) {
 			null -> unsafe.updateMany(filterBson, updateBson, options)
@@ -132,7 +145,7 @@ class NativeMongoCollection<Document : Any>(
 
 		val updateBson = UpdateExpression<Document>(unsafe.codecRegistry)
 			.apply(update)
-			.toBsonDocument()
+			.toNestedBsonDocument()
 
 		return when (val session = getCurrentSession()) {
 			null -> unsafe.findOneAndUpdate(filterBson, updateBson, options)

dsl/README.md

@@ -4,7 +4,9 @@
 
 ### Filter
 
+- [`$all`][fr.qsh.ktmongo.dsl.expr.FilterExpression.containsAll]
 - [`$and`][fr.qsh.ktmongo.dsl.expr.FilterExpression.and]
+- [`$elemMatch`][fr.qsh.ktmongo.dsl.expr.FilterExpression.anyObject]
 - [`$eq`][fr.qsh.ktmongo.dsl.expr.FilterExpression.eq]
 - [`$exists`][fr.qsh.ktmongo.dsl.expr.FilterExpression.exists]
 - [`$gt`][fr.qsh.ktmongo.dsl.expr.FilterExpression.gt]

dsl/src/main/kotlin/DocumentWriter.kt

@@ -54,5 +54,11 @@ internal inline fun BsonWriter.writeArray(name: String, block: () -> Unit) {
 internal fun <T> BsonWriter.writeObject(value: T, codec: CodecRegistry) {
 	@Suppress("UNCHECKED_CAST") // Kotlin doesn't smart-cast here, but should, this is safe
 	(codec.get(value!!::class.java) as Encoder<T>)
-		.encode(this, value, EncoderContext.builder().build())
+		.encode(
+			this,
+			value,
+			EncoderContext.builder()
+				.isEncodingCollectibleDocument(true)
+				.build()
+		)
 }