wabe-postgres 0.5.2 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wabe-postgres",
-	"version": "0.5.2",
+	"version": "0.5.3",
 	"description": "PostgreSQL adapter for Wabe (official)",
 	"keywords": [
 		"adapter",
@@ -28,7 +28,7 @@
 		"@types/pg": "8.11.11",
 		"get-port": "7.1.0",
 		"uuid": "13.0.0",
-		"wabe": "0.6.11",
+		"wabe": "0.6.12",
 		"wabe-postgres-launcher": "0.5.0"
 	}
 }

package/src/index.test.ts

@@ -393,6 +393,74 @@ describe('Postgres adapter', () => {
 		expect(res2.length).toBe(1)
 	})
 
+	it('should correctly exclude documents with notContains on array of objects (ACL notContains fix)', async () => {
+		await postgresAdapter.createObject({
+			className: 'Test',
+			data: {
+				object: { array: [{ string: 'user1' }] },
+			},
+			context,
+		})
+
+		await postgresAdapter.createObject({
+			className: 'Test',
+			data: {
+				object: { array: [{ string: 'user2' }] },
+			},
+			context,
+		})
+
+		const res = await postgresAdapter.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 postgresAdapter.createObject({
+			className: 'Test',
+			data: {
+				object: { array: [{ string: 'user1' }] },
+			},
+			context,
+		})
+
+		await postgresAdapter.createObject({
+			className: 'Test',
+			data: {
+				object: { array: [{ string: 'user2' }] },
+			},
+			context,
+		})
+
+		const res = await postgresAdapter.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 create class', async () => {
 		const client = await postgresAdapter.pool.connect()
 

package/src/index.ts

@@ -52,6 +52,19 @@ const getSQLColumnCreateTableFromType = <T extends WabeTypes>(type: TypeField<T>
 	}
 }
 
+/** Resolve where operators (e.g. { string: { equalTo: 'user1' } }) to plain values for JSON. */
+const resolveWhereToPlain = (obj: unknown): unknown => {
+	if (!obj || typeof obj !== 'object' || Array.isArray(obj)) return obj
+	return Object.fromEntries(
+		Object.entries(obj).map(([key, value]) => [
+			key,
+			value && typeof value === 'object' && !Array.isArray(value) && 'equalTo' in value
+				? (value as { equalTo: unknown }).equalTo
+				: resolveWhereToPlain(value),
+		]),
+	)
+}
+
 export const buildPostgresOrderQuery = <
 	T extends WabeTypes,
 	K extends keyof T['types'],
@@ -207,10 +220,11 @@ export const buildPostgresWhereQueryAndValues = <T extends WabeTypes, K extends
 			if (value?.notContains) {
 				// Simple access on json field because contains is use for array or object column
 				acc.conditions.push(`NOT (${simpleFullKey}  @> $${acc.paramIndex})`)
+				const toJson = (v: unknown) => (Array.isArray(v) ? JSON.stringify(v) : JSON.stringify([v]))
 				acc.values.push(
-					Array.isArray(value.notContains)
-						? JSON.stringify(value.notContains)
-						: JSON.stringify([value.notContains]),
+					typeof value.notContains === 'object' && !Array.isArray(value.notContains)
+						? toJson(resolveWhereToPlain(value.notContains))
+						: toJson(value.notContains),
 				)
 				acc.paramIndex++
 				return acc