@punks/backend-entity-manager 0.0.236 → 0.0.238

package/dist/cjs/types/abstractions/searchParameters.d.ts

@@ -17,6 +17,7 @@ export interface ITraverseFilters {
 export interface ISearchOptions {
     includeFacets?: boolean;
     includeChildrenMap?: boolean;
+    facetsFilters?: ISearchFilters;
 }
 export interface ISearchRequestPaging<TCursor> {
     cursor?: TCursor;

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

@@ -6,6 +6,7 @@ export type NumericFilter = {
     lt?: number;
     lte?: number;
     isNull?: boolean;
+    notIn?: number[];
 };
 export type StringFilter = {
     gt?: string;
@@ -40,6 +41,8 @@ export type BooleanFilter = {
     eq?: boolean;
     ne?: boolean;
     isNull?: boolean;
+    in?: boolean[];
+    notIn?: boolean[];
 };
 export type DateFilter = {
     in?: Date[];

package/dist/cjs/types/platforms/nest/__test__/server/entities/foos/foo.types.d.ts

@@ -16,6 +16,7 @@ export declare class FooQueryPaging implements ISearchRequestPaging<FooCursor> {
 }
 export declare class FooSearchOptions implements ISearchOptions {
     includeFacets?: boolean;
+    facetsFilters?: FooSearchFilters;
 }
 export declare class FooSearchParameters implements IEntitySearchParameters<FooEntity, FooSorting, FooCursor> {
     filters?: FooSearchFilters;

package/dist/esm/index.js

@@ -1,5 +1,5 @@
 import { Log, csvParse, excelParse, excelBuild, csvBuild, isNullOrUndefined, addTime, newUuid as newUuid$1, buildObject, sort, byField, toDict, ensureTailingSlash, ensureStartSlash, removeUndefinedProps } from '@punks/backend-core';
-import { MoreThanOrEqual, In, Equal, Not, IsNull, And, MoreThan, LessThanOrEqual, LessThan, ILike, Like } from 'typeorm';
+import { MoreThanOrEqual, In, Equal, Not, IsNull, And, MoreThan, LessThanOrEqual, LessThan, ILike } from 'typeorm';
 import { applyDecorators, Injectable, SetMetadata, createParamDecorator, Global, Module, Scope, Logger, StreamableFile, HttpException, HttpStatus } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { AsyncLocalStorage } from 'async_hooks';
@@ -2918,7 +2918,7 @@ class QueryClauseBuilder {
             clauses.push(ILike(filter.eq));
         }
         if (!isNullOrUndefined(filter?.like)) {
-            clauses.push(Like(filter.like.replaceAll("*", "%")));
+            clauses.push(ILike(filter.like.replaceAll("*", "%")));
         }
         if (!isNullOrUndefined(filter?.ne)) {
             clauses.push(Not(Equal(filter.ne)));
@@ -2930,7 +2930,7 @@ class QueryClauseBuilder {
             clauses.push(Not(In(filter.notIn)));
         }
         if (!isNullOrUndefined(filter?.notLike)) {
-            clauses.push(Not(Like(filter.notLike.replaceAll("*", "%"))));
+            clauses.push(Not(ILike(filter.notLike.replaceAll("*", "%"))));
         }
         if (filter?.isNull === true) {
             clauses.push(IsNull());
@@ -2954,6 +2954,15 @@ class QueryClauseBuilder {
         if (!isNullOrUndefined(filter?.lt)) {
             clauses.push(LessThan(filter.lt));
         }
+        if (!isNullOrUndefined(filter?.in)) {
+            clauses.push(In(filter.in ?? []));
+        }
+        if (!isNullOrUndefined(filter?.notIn)) {
+            clauses.push(Not(In(filter.notIn)));
+        }
+        if (!isNullOrUndefined(filter?.eq)) {
+            clauses.push(Equal(filter.eq));
+        }
         if (filter?.isNull === true) {
             clauses.push(IsNull());
         }
@@ -2998,6 +3007,12 @@ class QueryClauseBuilder {
         if (filter?.isNull === false) {
             clauses.push(Not(IsNull()));
         }
+        if (!isNullOrUndefined(filter?.in)) {
+            clauses.push(In(filter.in ?? []));
+        }
+        if (!isNullOrUndefined(filter?.notIn)) {
+            clauses.push(Not(In(filter.notIn)));
+        }
         return And(...clauses);
     }
 }
@@ -3083,7 +3098,11 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
         const queryResults = await this.countQueryResults(request, context);
         const results = await this.findPagedQueryResults(request, context);
         const facets = request.options?.includeFacets
-            ? await this.calculateFacets(request, context)
+            ? // todo: refactor avoiding to manipulate the request object
+                await this.calculateFacets({
+                    ...request,
+                    filters: request.options.facetsFilters,
+                }, context)
             : undefined;
         const childrenMap = request.options?.includeChildrenMap
             ? await this.calculateChildrenMap(results)