Merge branch 'main' into feat-primsa-param

Nico Lazarus · Nico Lazarus · commit fe2204e45164 · 2022-09-12T17:24:05.000+02:00
diff --git a/dist/utils.js b/dist/utils.js
@@ -111,10 +111,13 @@ const buildWhereAndInclude = (query, whitelist, idField) => {
     let include = {};
     Object.keys(query).forEach((k) => {
         const value = query[k];
-        if (k === idField) {
+        if (value === null) {
+            where[k] = null;
+        }
+        else if (k === idField) {
             where[k] = (0, exports.mergeFiltersWithSameKey)(where, k, (0, exports.buildIdField)(value, whitelist));
         }
-        if (k === '$or' && Array.isArray(value)) {
+        else if (k === '$or' && Array.isArray(value)) {
             where.OR = value.map((v) => (0, exports.buildWhereAndInclude)(v, whitelist, idField).where);
         }
         else if (k === '$and' && Array.isArray(value)) {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@triggercode/feathers-prisma",
   "description": "A Feathers service adapter for Prisma ORM.",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "homepage": "https://github.com/triggercode/feathers-prisma",
   "main": "dist/",
   "types": "dist/",
diff --git a/src/utils.ts b/src/utils.ts
@@ -122,9 +122,11 @@ export const buildWhereAndInclude = (query: QueryParam, whitelist: string[], idF
   let include: Record<string, any> = {};
   Object.keys(query).forEach((k: string | '$or' | '$and') => {
     const value: any = query[k];
-    if (k === idField) {
+    if (value === null) {
+      where[k] = null;
+    } else if (k === idField) {
       where[k] = mergeFiltersWithSameKey(where, k, buildIdField(value, whitelist));
-    } if (k === '$or' && Array.isArray(value)) {
+    } else if (k === '$or' && Array.isArray(value)) {
       where.OR = value.map((v) => buildWhereAndInclude(v, whitelist, idField).where);
     } else if (k === '$and' && Array.isArray(value)) {
       value.forEach((v) => {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@triggercode/feathers-prisma",`
`3`	`3`	`"description": "A Feathers service adapter for Prisma ORM.",`
`4`		`- "version": "0.7.3",`
	`4`	`+ "version": "0.7.4",`
`5`	`5`	`"homepage": "https://github.com/triggercode/feathers-prisma",`
`6`	`6`	`"main": "dist/",`
`7`	`7`	`"types": "dist/",`