wabe-mongodb 0.5.3 → 0.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wabe-mongodb",
-	"version": "0.5.3",
+	"version": "0.5.4",
 	"description": "MongoDB adapter for Wabe (official)",
 	"keywords": [
 		"baas",
@@ -34,7 +34,7 @@
 	"devDependencies": {
 		"get-port": "7.1.0",
 		"uuid": "13.0.0",
-		"wabe": "0.6.11",
+		"wabe": "0.6.12",
 		"wabe-build": "0.5.0",
 		"wabe-mongodb-launcher": "0.5.2"
 	}

package/src/index.test.ts

@@ -384,6 +384,74 @@ describe('Mongo adapter', () => {
 		expect(res2.length).toBe(1)
 	})
 
+	it('should correctly exclude documents with notContains on array of objects (ACL notContains fix)', async () => {
+		await mongoAdapter.createObject({
+			className: 'Test',
+			data: {
+				object: { array: [{ string: 'user1' }] },
+			},
+			context,
+		})
+
+		await mongoAdapter.createObject({
+			className: 'Test',
+			data: {
+				object: { array: [{ string: 'user2' }] },
+			},
+			context,
+		})
+
+		const res = await mongoAdapter.getObjects({
+			className: 'Test',
+			context,
+			where: {
+				object: {
+					// @ts-expect-error
+					array: {
+						notContains: { string: 'user1' },
+					},
+				},
+			},
+		})
+
+		expect(res.length).toBe(1)
+		expect(res[0]?.object?.array).toEqual([{ string: 'user2' }])
+	})
+
+	it('should correctly filter with nested notContains and equalTo without recursion overwrite', async () => {
+		await mongoAdapter.createObject({
+			className: 'Test',
+			data: {
+				object: { array: [{ string: 'user1' }] },
+			},
+			context,
+		})
+
+		await mongoAdapter.createObject({
+			className: 'Test',
+			data: {
+				object: { array: [{ string: 'user2' }] },
+			},
+			context,
+		})
+
+		const res = await mongoAdapter.getObjects({
+			className: 'Test',
+			context,
+			where: {
+				object: {
+					// @ts-expect-error
+					array: {
+						notContains: { string: { equalTo: 'user1' } },
+					},
+				},
+			},
+		})
+
+		expect(res.length).toBe(1)
+		expect(res[0]?.object?.array).toEqual([{ string: 'user2' }])
+	})
+
 	it('should retry on connection error', async () => {
 		const spyMongoClientConnect = spyOn(mongoAdapter.client, 'connect').mockImplementationOnce(
 			() => {
@@ -1904,6 +1972,23 @@ describe('Mongo adapter', () => {
 		expect(where).toEqual({})
 	})
 
+	it('should build nested notContains with equalTo for MongoDB $elemMatch', () => {
+		const where = buildMongoWhereQuery({
+			data: {
+				// @ts-expect-error
+				array: {
+					notContains: { string: { equalTo: 'user1' } },
+				},
+			},
+		})
+
+		expect(where).toEqual({
+			'data.array': {
+				$not: { $elemMatch: { string: 'user1' } },
+			},
+		})
+	})
+
 	it('should request sub object in object', async () => {
 		await mongoAdapter.createObject({
 			className: 'User',

package/src/index.ts

@@ -19,6 +19,10 @@ import type {
 	SchemaInterface,
 } from 'wabe'
 
+/** Use built MongoDB query if non-empty, otherwise fallback to original (e.g. direct value { string: 'user1' }). */
+const builtOrOriginal = (built: Record<string, unknown>, original: unknown) =>
+	Object.keys(built).length ? built : original
+
 export const buildMongoOrderQuery = <
 	T extends WabeTypes,
 	K extends keyof T['types'],
@@ -63,8 +67,20 @@ export const buildMongoWhereQuery = <T extends WabeTypes, K extends keyof T['typ
 						: {
 								$all: Array.isArray(value.contains) ? value.contains : [value.contains],
 							}
-			if (value?.notContains || value?.notContains === null)
-				acc[keyToWrite] = { $ne: value.notContains }
+			if (value?.notContains || value?.notContains === null) {
+				acc[keyToWrite] =
+					typeof value.notContains === 'object' && !Array.isArray(value.notContains)
+						? {
+								$not: {
+									$elemMatch: builtOrOriginal(
+										buildMongoWhereQuery(value.notContains as WhereType<T, K>),
+										value.notContains,
+									),
+								},
+							}
+						: { $nin: Array.isArray(value.notContains) ? value.notContains : [value.notContains] }
+				return acc
+			}
 			if (value?.exists === true) acc[keyToWrite] = { $exists: true, $ne: null }
 			if (value?.exists === false) acc[keyToWrite] = { $eq: null }
 
@@ -151,6 +167,8 @@ export const buildMongoWhereQuery = <T extends WabeTypes, K extends keyof T['typ
 				return acc
 			}
 
+			if (acc[keyToWrite] !== undefined) return acc
+
 			if (typeof value === 'object') {
 				const where = buildMongoWhereQuery(value as WhereType<T, K>)
 				const entries = Object.entries(where)