@punks/backend-entity-manager 0.0.165 → 0.0.167

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

@@ -29,7 +29,7 @@ export declare enum SortDirection {
 }
 export interface IFullTextQuery {
     term: string;
-    fields?: string[];
+    fields: string[];
 }
 export type ISearchQueryRelationsProperty<TProperty> = TProperty extends Promise<infer I> ? ISearchQueryRelationsProperty<NonNullable<I>> | boolean : TProperty extends Array<infer I> ? ISearchQueryRelationsProperty<NonNullable<I>> | boolean : TProperty extends string ? never : TProperty extends number ? never : TProperty extends boolean ? never : TProperty extends Function ? never : TProperty extends Buffer ? never : TProperty extends Date ? never : TProperty extends object ? ISearchQueryRelations<TProperty> | boolean : boolean;
 export type ISearchQueryRelations<TEntity> = {

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

@@ -35,6 +35,7 @@ export declare abstract class TypeOrmQueryBuilder<TEntity extends ObjectLiteral,
     protected countQueryResults(request: TEntitySearchParameters, context?: IAuthenticationContext<TUserContext>): Promise<number>;
     protected abstract buildSortingClause(request: TEntitySearchParameters): FindOptionsOrder<TEntity>;
     protected abstract buildWhereClause(request: TEntitySearchParameters): FindOptionsWhere<TEntity>[] | FindOptionsWhere<TEntity>;
+    protected buildTextSearchClause(request: TEntitySearchParameters): FindOptionsWhere<TEntity>[] | FindOptionsWhere<TEntity>;
     protected abstract buildContextFilter(context?: IAuthenticationContext<TUserContext>): FindOptionsWhere<TEntity>[] | FindOptionsWhere<TEntity>;
     protected abstract calculateFacets(request: TEntitySearchParameters, context?: IAuthenticationContext<TUserContext>): Promise<TFacets>;
     protected calculateFacet<TField extends keyof TEntity, TValue>(field: TField, request: TEntitySearchParameters, context: IAuthenticationContext<TUserContext> | undefined, relations?: FacetRelations): Promise<FacetType<TValue>>;
@@ -42,4 +43,8 @@ export declare abstract class TypeOrmQueryBuilder<TEntity extends ObjectLiteral,
     protected calculateNumericFieldFacets(field: keyof TEntity, request: TEntitySearchParameters, context: IAuthenticationContext<TUserContext> | undefined, relations?: FacetRelations): Promise<NumberFacetsType>;
     protected calculateBooleanFieldFacets(field: keyof TEntity, request: TEntitySearchParameters, context: IAuthenticationContext<TUserContext> | undefined, relations?: FacetRelations): Promise<BooleanFacetsType>;
     protected getRepository(): TypeOrmRepository<TEntity, unknown>;
+    private buildSearchRelations;
+    private buildWhere;
+    private mergeWhereClauses;
+    private mergeWheres;
 }

package/dist/cjs/types/platforms/nest/__test__/server/entities/appDirectories/appDirectory.types.d.ts

@@ -18,7 +18,7 @@ export declare class AppDirectorySearchOptions implements ISearchOptions {
 }
 export declare class AppDirectoryFullTextQuery implements IFullTextQuery {
     term: string;
-    fields?: string[];
+    fields: string[];
 }
 export declare class AppDirectorySearchParameters implements IEntitySearchParameters<AppDirectoryEntity, AppDirectorySorting, AppDirectoryCursor> {
     query?: AppDirectoryFullTextQuery;

package/dist/cjs/types/platforms/nest/__test__/server/entities/appEmailLogs/appEmailLog.types.d.ts

@@ -18,7 +18,7 @@ export declare class AppEmailLogSearchOptions implements ISearchOptions {
 }
 export declare class AppEmailLogFullTextQuery implements IFullTextQuery {
     term: string;
-    fields?: string[];
+    fields: string[];
 }
 export declare class AppEmailLogSearchParameters implements IEntitySearchParameters<AppEmailLogEntity, AppEmailLogSorting, AppEmailLogCursor> {
     query?: AppEmailLogFullTextQuery;

package/dist/cjs/types/platforms/nest/__test__/server/entities/appEntityVersions/appEntityVersion.types.d.ts

@@ -17,7 +17,7 @@ export declare class AppEntityVersionSearchOptions implements ISearchOptions {
 }
 export declare class AppEntityVersionFullTextQuery implements IFullTextQuery {
     term: string;
-    fields?: string[];
+    fields: string[];
 }
 export declare class AppEntityVersionSearchParameters implements IEntitySearchParameters<AppEntityVersionEntity, AppEntityVersionSorting, AppEntityVersionCursor> {
     query?: AppEntityVersionFullTextQuery;

package/dist/cjs/types/platforms/nest/__test__/server/entities/appFileReferences/appFileReference.types.d.ts

@@ -18,7 +18,7 @@ export declare class AppFileReferenceSearchOptions implements ISearchOptions {
 }
 export declare class AppFileReferenceFullTextQuery implements IFullTextQuery {
     term: string;
-    fields?: string[];
+    fields: string[];
 }
 export declare class AppFileReferenceSearchParameters implements IEntitySearchParameters<AppFileReferenceEntity, AppFileReferenceSorting, AppFileReferenceCursor> {
     query?: AppFileReferenceFullTextQuery;

package/dist/cjs/types/platforms/nest/__test__/server/entities/crmContacts/crmContact.types.d.ts

@@ -18,7 +18,7 @@ export declare class CrmContactSearchOptions implements ISearchOptions {
 }
 export declare class CrmContactFullTextQuery implements IFullTextQuery {
     term: string;
-    fields?: string[];
+    fields: string[];
 }
 export declare class CrmContactSearchParameters implements IEntitySearchParameters<CrmContactEntity, CrmContactSorting, CrmContactCursor> {
     query?: CrmContactFullTextQuery;

package/dist/esm/index.js

@@ -8,7 +8,7 @@ import { STATIC_CONTEXT } from '@nestjs/core/injector/constants';
 import { MetadataScanner } from '@nestjs/core/metadata-scanner';
 import { JwtService, JwtModule } from '@nestjs/jwt';
 import { EventEmitter2, EventEmitterModule } from '@nestjs/event-emitter';
-import { In, Equal, Not, And, MoreThanOrEqual, MoreThan, LessThanOrEqual, LessThan, Like } from 'typeorm';
+import { In, Equal, Not, And, MoreThanOrEqual, MoreThan, LessThanOrEqual, LessThan, Like, ILike } from 'typeorm';
 import { ListObjectsCommand, PutObjectCommand, GetObjectCommand, DeleteObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { SendEmailCommand, SESClient } from '@aws-sdk/client-ses';
@@ -624,7 +624,7 @@ class EntitiesDeleteCommand {
             return undefined;
         }
         const contextService = this.services.resolveAuthenticationContextProvider();
-        return await contextService.getContext();
+        return await contextService?.getContext();
     }
     async authorize() {
         const authorization = this.services.resolveAuthorizationMiddleware();
@@ -1714,7 +1714,7 @@ class EntitiesCountQuery {
             return undefined;
         }
         const contextService = this.services.resolveAuthenticationContextProvider();
-        return await contextService.getContext();
+        return await contextService?.getContext();
     }
     async authorizeSearch(context) {
         const authorization = this.services.resolveAuthorizationMiddleware();
@@ -1745,7 +1745,7 @@ class EntityExistsQuery {
             return undefined;
         }
         const contextService = this.services.resolveAuthenticationContextProvider();
-        return await contextService.getContext();
+        return await contextService?.getContext();
     }
     async authorizeSearch(context) {
         const authorization = this.services.resolveAuthorizationMiddleware();
@@ -1919,7 +1919,7 @@ class EntityVersionsSearchQuery {
             return undefined;
         }
         const contextService = this.services.resolveAuthenticationContextProvider();
-        return await contextService.getContext();
+        return await contextService?.getContext();
     }
     async authorizeSearch(context) {
         const authorization = this.services.resolveAuthorizationMiddleware();
@@ -22212,10 +22212,7 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
         const request = {
             filters,
         };
-        return await this.getRepository().deleteBy({
-            ...(context ? this.buildContextFilter(context) : {}),
-            ...this.buildWhereClause(request),
-        });
+        return await this.getRepository().deleteBy(this.buildWhere(request, context));
     }
     async find(request, context) {
         const results = await this.findPagedQueryResults({
@@ -22247,20 +22244,13 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
     }
     async getFieldDistinctValues(field, request, context) {
         return await this.getRepository().distinct(field, {
-            where: {
-                ...(context ? this.buildContextFilter(context) : {}),
-                ...this.buildWhereClause(request),
-            },
+            where: this.buildWhere(request, context),
         });
     }
     async findPagedQueryResults(request, context) {
         return await this.getRepository().find({
-            where: {
-                ...(context ? this.buildContextFilter(context) : {}),
-                ...this.buildWhereClause(request),
-            },
-            relations: request.relations ??
-                this.getRelationsToLoad(request, context, QueryBuilderOperation.Search),
+            where: this.buildWhere(request, context),
+            relations: this.buildSearchRelations(request, context),
             order: this.buildSortingClause(request),
             ...this.buildPagingParameters(request),
         });
@@ -22278,28 +22268,30 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
     }
     async countQueryResults(request, context) {
         return await this.getRepository().count({
-            where: {
-                ...(context ? this.buildContextFilter(context) : {}),
-                ...this.buildWhereClause(request),
-            },
+            where: this.buildWhere(request, context),
         });
     }
+    buildTextSearchClause(request) {
+        if (!request.query ||
+            !request.query.term ||
+            !request.query.fields?.length) {
+            return {};
+        }
+        return request.query.fields?.map((field) => ({
+            [field]: ILike(`%${request.query?.term}%`),
+        }));
+    }
     async calculateFacet(field, request, context, relations) {
-        const where = {
-            ...(context ? this.buildContextFilter(context) : {}),
-            ...this.buildWhereClause(request),
-        };
         let query = this.getRepository()
             .getInnerRepository()
             .createQueryBuilder("entity");
-        // .leftJoin("entity.contact", "contact")
         for (const relation of relations?.columns ?? []) {
             query = query.leftJoin(`entity.${relation}`, relation);
         }
         const results = await query
             .select(field, "value")
             .addSelect(`COUNT(${field})`, "count")
-            .where(where)
+            .where(this.buildWhere(request, context))
             .addGroupBy(field)
             .orderBy(field)
             .getRawMany();
@@ -22325,6 +22317,52 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
         }
         return this.repository;
     }
+    buildSearchRelations(request, context) {
+        return (request.relations ??
+            this.getRelationsToLoad(request, context, QueryBuilderOperation.Search));
+    }
+    buildWhere(request, context) {
+        return this.mergeWhereClauses(context ? this.buildContextFilter(context) : {}, this.buildWhereClause(request), this.buildTextSearchClause(request));
+    }
+    mergeWhereClauses(...clauses) {
+        return clauses.reduce((a, b) => this.mergeWheres(a, b));
+    }
+    mergeWheres(a, b) {
+        if (Array.isArray(a) && Array.isArray(b)) {
+            const result = [];
+            for (const x of a) {
+                for (const y of b) {
+                    result.push({
+                        ...x,
+                        ...y,
+                    });
+                }
+            }
+            return result;
+        }
+        if (!Array.isArray(a) && !Array.isArray(b)) {
+            return {
+                ...a,
+                ...b,
+            };
+        }
+        if (Array.isArray(a) && !Array.isArray(b)) {
+            return a.map((x) => ({
+                ...x,
+                ...b,
+            }));
+        }
+        if (!Array.isArray(a) && Array.isArray(b)) {
+            return b.map((x) => ({
+                ...a,
+                ...x,
+            }));
+        }
+        return {
+            ...a,
+            ...b,
+        };
+    }
 }
 
 class TypeOrmRepository {