@punks/backend-entity-manager 0.0.197 → 0.0.199

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

@@ -1,3 +1,4 @@
+import { IAuthUser } from "../platforms";
 export interface IAuthenticationUserRole {
     uid: string;
 }
@@ -20,7 +21,13 @@ export interface IAuthenticationContext<TUserContextData> {
 export interface IAuthenticationContextProvider<TUserContext> {
     getContext(): Promise<IAuthenticationContext<TUserContext>>;
 }
-export interface IAuthenticationMiddleware<TAuthenticationContext, TOutput> {
-    processContext(context: IAuthenticationContext<TAuthenticationContext>): Promise<TOutput>;
+export interface IAuthenticationData {
+    user: IAuthUser;
+    roles: IAuthenticationUserRole[];
+    permissions: IAuthenticationUserPermission[];
+    organizationalUnits: IAuthenticationOrganizationalUnit[];
+}
+export interface IAuthenticationMiddleware<TAuthenticationData extends IAuthenticationData, TOutput> {
+    processContext(data: TAuthenticationData): Promise<TOutput>;
     getPriority(): number;
 }

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

@@ -0,0 +1,2 @@
+import { FindOptionsWhere } from "typeorm";
+export declare const mergeWhereClauses: <TEntity>(where1: FindOptionsWhere<TEntity>, where2: FindOptionsWhere<TEntity>) => FindOptionsWhere<TEntity>;

package/dist/cjs/types/providers/services.d.ts

@@ -88,8 +88,8 @@ export declare class EntitiesServiceLocator {
     registerCacheInstance<TCacheInstance extends ICacheInstance>(name: string, instance: TCacheInstance): this;
     resolveBucketProviders<TBucketProvider extends IFileProvider>(): TBucketProvider[];
     registerBucketProvider<TBucketProvider extends IBucketProvider>(name: string, instance: TBucketProvider): this;
-    resolveAuthenticationMiddlewares<TAuthenticationMiddleware extends IAuthenticationMiddleware<unknown, unknown>>(): TAuthenticationMiddleware[];
-    registerAuthenticationMiddleware<TAuthenticationMiddleware extends IAuthenticationMiddleware<unknown, unknown>>(name: string, instance: TAuthenticationMiddleware): this;
+    resolveAuthenticationMiddlewares<TAuthenticationMiddleware extends IAuthenticationMiddleware<any, unknown>>(): TAuthenticationMiddleware[];
+    registerAuthenticationMiddleware<TAuthenticationMiddleware extends IAuthenticationMiddleware<any, unknown>>(name: string, instance: TAuthenticationMiddleware): this;
     resolveFileProvider<TFileProvider extends IFileProvider>(providerId: string): TFileProvider;
     registerFileProvider<TFileProvider extends IFileProvider>(name: string, instance: TFileProvider): this;
     resolveFilesReferenceRepositoryProviders<TFilesReferenceRepo extends IFilesReferenceRepository>(): TFilesReferenceRepo;

package/dist/esm/index.js

@@ -2836,6 +2836,35 @@ class PermissionsChecker {
     }
 }
 
+const mergeWhereClauses = (where1, where2) => {
+    const mergedWhere = {};
+    for (const key in where1) {
+        if (where1.hasOwnProperty(key)) {
+            mergedWhere[key] = where1[key];
+        }
+    }
+    for (const key in where2) {
+        if (where2.hasOwnProperty(key)) {
+            if (mergedWhere.hasOwnProperty(key)) {
+                if (typeof where2[key] === "object" &&
+                    typeof mergedWhere[key] === "object") {
+                    mergedWhere[key] = {
+                        ...mergedWhere[key],
+                        ...where2[key],
+                    };
+                }
+                else {
+                    mergedWhere[key] = where2[key];
+                }
+            }
+            else {
+                mergedWhere[key] = where2[key];
+            }
+        }
+    }
+    return mergedWhere;
+};
+
 class TypeOrmQueryBuilder extends QueryBuilderBase {
     constructor(services) {
         super();
@@ -3018,22 +3047,13 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
             return result;
         }
         if (!Array.isArray(a) && !Array.isArray(b)) {
-            return {
-                ...a,
-                ...b,
-            };
+            return mergeWhereClauses(a, b);
         }
         if (Array.isArray(a) && !Array.isArray(b)) {
-            return a.map((x) => ({
-                ...x,
-                ...b,
-            }));
+            return a.map((x) => mergeWhereClauses(x, b));
         }
         if (!Array.isArray(a) && Array.isArray(b)) {
-            return b.map((x) => ({
-                ...a,
-                ...x,
-            }));
+            return b.map((x) => mergeWhereClauses(a, x));
         }
         return {
             ...a,