@punks/backend-entity-manager 0.0.320 → 0.0.321

package/dist/cjs/types/integrations/repository/typeorm/queryClauseBuilder.d.ts

@@ -7,4 +7,5 @@ export declare class QueryClauseBuilder {
     numericFilter(filter: NumericFilter): FindOperator<number>;
     dateFilter(filter: DateFilter): FindOperator<Date>;
     boolFilter(filter: BooleanFilter): FindOperator<boolean>;
+    private buildInClause;
 }

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 import { Log, csvParse, excelParse, excelBuild, csvBuild, isNullOrUndefined, addTime, newUuid as newUuid$1, buildObject, toDict, sort, byField, toArrayDict, toItemsDict, ensureTailingSlash, ensureStartSlash, removeUndefinedProps, sleep } from '@punks/backend-core';
-import { MoreThanOrEqual, In, Equal, Not, IsNull, And, MoreThan, LessThanOrEqual, LessThan, ILike, Repository } from 'typeorm';
+import { MoreThanOrEqual, Equal, Not, IsNull, And, MoreThan, LessThanOrEqual, LessThan, ILike, In, Or, Repository } from 'typeorm';
 import { applyDecorators, Injectable, SetMetadata, createParamDecorator, Global, Module, Scope, Inject, Logger, StreamableFile, HttpException, HttpStatus } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { AsyncLocalStorage } from 'async_hooks';
@@ -2954,7 +2954,7 @@ class QueryClauseBuilder {
     enumFilter(filter) {
         const clauses = [];
         if (!isNullOrUndefined(filter?.in)) {
-            clauses.push(In(filter.in));
+            clauses.push(this.buildInClause(filter.in));
         }
         if (!isNullOrUndefined(filter?.eq)) {
             clauses.push(Equal(filter.eq));
@@ -2963,7 +2963,7 @@ class QueryClauseBuilder {
             clauses.push(Not(Equal(filter.ne)));
         }
         if (!isNullOrUndefined(filter?.notIn)) {
-            clauses.push(Not(In(filter.notIn)));
+            clauses.push(Not(this.buildInClause(filter.notIn)));
         }
         if (filter?.isNull === true) {
             clauses.push(IsNull());
@@ -2976,7 +2976,7 @@ class QueryClauseBuilder {
     idFilter(filter) {
         const clauses = [];
         if (!isNullOrUndefined(filter?.in)) {
-            clauses.push(In(filter.in));
+            clauses.push(this.buildInClause(filter.in));
         }
         if (!isNullOrUndefined(filter?.eq)) {
             clauses.push(Equal(filter.eq));
@@ -2985,7 +2985,7 @@ class QueryClauseBuilder {
             clauses.push(Not(Equal(filter.ne)));
         }
         if (!isNullOrUndefined(filter?.notIn)) {
-            clauses.push(Not(In(filter.notIn)));
+            clauses.push(Not(this.buildInClause(filter.notIn)));
         }
         if (filter?.isNull === true) {
             clauses.push(IsNull());
@@ -3010,7 +3010,7 @@ class QueryClauseBuilder {
             clauses.push(LessThan(filter.lt));
         }
         if (!isNullOrUndefined(filter?.in)) {
-            clauses.push(In(filter.in));
+            clauses.push(this.buildInClause(filter.in));
         }
         if (!isNullOrUndefined(filter?.eq)) {
             clauses.push(Equal(filter.eq));
@@ -3028,7 +3028,7 @@ class QueryClauseBuilder {
             clauses.push(Not(ILike(filter.ine)));
         }
         if (!isNullOrUndefined(filter?.notIn)) {
-            clauses.push(Not(In(filter.notIn)));
+            clauses.push(Not(this.buildInClause(filter.notIn)));
         }
         if (!isNullOrUndefined(filter?.notLike)) {
             clauses.push(Not(ILike(filter.notLike.replaceAll("*", "%"))));
@@ -3056,10 +3056,10 @@ class QueryClauseBuilder {
             clauses.push(LessThan(filter.lt));
         }
         if (!isNullOrUndefined(filter?.in)) {
-            clauses.push(In(filter.in ?? []));
+            clauses.push(this.buildInClause(filter.in ?? []));
         }
         if (!isNullOrUndefined(filter?.notIn)) {
-            clauses.push(Not(In(filter.notIn)));
+            clauses.push(Not(this.buildInClause(filter.notIn)));
         }
         if (!isNullOrUndefined(filter?.eq)) {
             clauses.push(Equal(filter.eq));
@@ -3109,13 +3109,20 @@ class QueryClauseBuilder {
             clauses.push(Not(IsNull()));
         }
         if (!isNullOrUndefined(filter?.in)) {
-            clauses.push(In(filter.in ?? []));
+            clauses.push(this.buildInClause(filter.in ?? []));
         }
         if (!isNullOrUndefined(filter?.notIn)) {
-            clauses.push(Not(In(filter.notIn)));
+            clauses.push(Not(this.buildInClause(filter.notIn)));
         }
         return And(...clauses);
     }
+    buildInClause(values) {
+        const containsNulls = values.some((v) => isNullOrUndefined(v));
+        if (!containsNulls) {
+            return In(values);
+        }
+        return Or(In(values.filter((v) => !isNullOrUndefined(v))), IsNull());
+    }
 }
 
 class PermissionsChecker {