merge into 'if'

generalpiston · Apr 18, 2024 · c22b2d7 · c22b2d7
1 parent 359b0ca
commit c22b2d7
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/entity.ts b/src/entity.ts
@@ -14,11 +14,8 @@ export function encrypt<T extends ObjectLiteral>(entity: any): any {
     let { propertyName, mode, target } = columnMetadata;
     let options: ExtendedColumnOptions = columnMetadata.options;
     let encrypt = options.encrypt;
-    if (encrypt?.encryptionPredicate && !encrypt?.encryptionPredicate(entity)) {
-      continue;
-    }
     if (
-      encrypt &&
+      encrypt && !(encrypt?.encryptionPredicate && !encrypt?.encryptionPredicate(entity)) &&
       mode === 'regular' &&
       (encrypt.looseMatching || entity.constructor === target)
     ) {
@@ -45,12 +42,9 @@ export function decrypt<T extends ObjectLiteral>(entity: any): any {
     let { propertyName, mode, target } = columnMetadata;
     let options: ExtendedColumnOptions = columnMetadata.options;
     let encrypt = options.encrypt;
-    if (encrypt?.encryptionPredicate && !encrypt?.encryptionPredicate(entity)) {
-      continue;
-    }
     if (
-      encrypt &&
-      mode === 'regular' &&
+      encrypt && !(encrypt?.encryptionPredicate && !encrypt?.encryptionPredicate(entity)) &&
+      mode === "regular" &&
       (encrypt.looseMatching || entity.constructor === target)
     ) {
       if (entity[propertyName]) {