From a45064696db677853212b7f0fafbdc11d43c4750 Mon Sep 17 00:00:00 2001
From: Joren Broekema <joren.broekema@ing.com>
Date: Thu, 3 Dec 2020 18:24:37 +0100
Subject: [PATCH] chore: allow array for IsNotCountryIBAN

---
 packages/input-iban/README.md               |  8 +++---
 packages/input-iban/src/validators.js       | 28 ++++++++++++++-----
 packages/input-iban/test/validators.test.js | 17 +++++++++++-
 packages/input-iban/translations/bg.js      |  4 +--
 packages/input-iban/translations/cs.js      |  4 +--
 packages/input-iban/translations/de.js      |  4 +--
 packages/input-iban/translations/en.js      | 30 ++++++++++-----------
 packages/input-iban/translations/es.js      |  4 +--
 packages/input-iban/translations/fr.js      |  4 +--
 packages/input-iban/translations/hu.js      |  4 +--
 packages/input-iban/translations/it.js      |  4 +--
 packages/input-iban/translations/nl.js      |  4 +--
 packages/input-iban/translations/pl.js      |  4 +--
 packages/input-iban/translations/ro.js      |  4 +--
 packages/input-iban/translations/ru.js      |  4 +--
 packages/input-iban/translations/sk.js      |  4 +--
 packages/input-iban/translations/uk.js      |  4 +--
 packages/input-iban/translations/zh.js      |  4 +--
 18 files changed, 85 insertions(+), 54 deletions(-)

diff --git a/packages/input-iban/README.md b/packages/input-iban/README.md
index 286aadbc3..d4a5db9be 100644
--- a/packages/input-iban/README.md
+++ b/packages/input-iban/README.md
@@ -8,7 +8,7 @@ Its purpose is to provide a way for users to fill in an IBAN (International Bank
 ```js script
 import { html } from 'lit-html';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
-import { IsCountryIBAN } from './src/validators.js';
+import { IsCountryIBAN, IsNotCountryIBAN } from './src/validators.js';
 
 import './lion-input-iban.js';
 
@@ -98,11 +98,13 @@ To get the default feedback message for this default validator, use `loadDefault
 
 In the example below, we show how to use an additional validator that blocks IBANs from certain countries.
 
+You can pass a single string value, or an array of strings.
+
 ```js preview-story
 export const blacklistedCountry = () => html`
   <lion-input-iban
-    .modelValue=${'RO89RZBR6997372848645577'}
-    .validators=${([new IsNotCountryIBAN('RO')], [new IsNotCountryIBAN('ES')])}
+    .modelValue=${'DE89370400440532013000'}
+    .validators=${[new IsNotCountryIBAN(['RO', 'NL'])]}
     name="iban"
     label="IBAN"
   ></lion-input-iban>
diff --git a/packages/input-iban/src/validators.js b/packages/input-iban/src/validators.js
index 8593472f1..41d0d4c2b 100644
--- a/packages/input-iban/src/validators.js
+++ b/packages/input-iban/src/validators.js
@@ -124,7 +124,7 @@ export class IsCountryIBAN extends IsIBAN {
   }
 
   /**
-   * @param {?} [value]
+   * @param {string} value
    * @returns {Boolean}
    */
   execute(value) {
@@ -160,18 +160,25 @@ export class IsNotCountryIBAN extends IsIBAN {
   }
 
   /**
-   * @param {?} [value]
+   * @param {string} value
    * @returns {Boolean}
    */
   execute(value) {
+    let isInvalid = false;
     const notIBAN = super.execute(value);
-    if (value.slice(0, 2) === this.param) {
-      return true;
+
+    if (typeof this.param === 'string') {
+      if (value.slice(0, 2) === this.param) {
+        isInvalid = true;
+      }
+    } else if (Array.isArray(this.param)) {
+      isInvalid = this.param.some(country => value.slice(0, 2) === country);
     }
+
     if (notIBAN) {
-      return true;
+      isInvalid = true;
     }
-    return false;
+    return isInvalid;
   }
 
   /**
@@ -186,6 +193,13 @@ export class IsNotCountryIBAN extends IsIBAN {
    */
   static async getMessage(data) {
     await loadTranslations();
-    return localize.msg('lion-validate+iban:error.IsNotCountryIBAN', data);
+    const _data = {
+      ...data,
+      userSuppliedCountryCode:
+        typeof data?.modelValue === 'string'
+          ? data?.modelValue.slice(0, 2)
+          : data?.modelValue.viewValue.slice(0, 2),
+    };
+    return localize.msg('lion-validate+iban:error.IsNotCountryIBAN', _data);
   }
 }
diff --git a/packages/input-iban/test/validators.test.js b/packages/input-iban/test/validators.test.js
index 0b20d5ce5..2c6e6e07e 100644
--- a/packages/input-iban/test/validators.test.js
+++ b/packages/input-iban/test/validators.test.js
@@ -9,6 +9,7 @@ describe('IBAN validation', () => {
     const validator = new IsIBAN();
     expect(validator.execute('NL17INGB0002822608')).to.be.false;
     expect(validator.execute('DE89370400440532013000')).to.be.false;
+    expect(validator.execute('foo')).to.be.true;
   });
 
   it('provides IsCountryIBAN to limit IBANs from specific countries', () => {
@@ -17,7 +18,7 @@ describe('IBAN validation', () => {
     expect(nlValidator.execute('NL17INGB0002822608')).to.be.false;
     expect(deValidator.execute('DE89370400440532013000')).to.be.false;
     expect(nlValidator.execute('DE89370400440532013000')).to.be.true;
-    expect(nlValidator.execute('foo')).to.be.true;
+    expect(deValidator.execute('NL17INGB0002822608')).to.be.true;
   });
 
   it('provides IsNotCountryIBAN to prevent IBANs from specific countries', () => {
@@ -28,4 +29,18 @@ describe('IBAN validation', () => {
     expect(nlValidator.execute('DE89370400440532013000')).to.be.false;
     expect(deValidator.execute('NL17INGB0002822608')).to.be.false;
   });
+
+  it('accepts an array for IsNotCountryIBAN to prevent IBANs from multiple countries', () => {
+    const nlValidator = new IsNotCountryIBAN(['NL', 'FR']);
+    const deValidator = new IsNotCountryIBAN(['DE', 'SK']);
+    expect(nlValidator.execute('NL17INGB0002822608')).to.be.true;
+    expect(nlValidator.execute('FR1420041010050500013M02606')).to.be.true;
+    expect(nlValidator.execute('DE89370400440532013000')).to.be.false;
+    expect(nlValidator.execute('SK3112000000198742637541')).to.be.false;
+
+    expect(deValidator.execute('NL17INGB0002822608')).to.be.false;
+    expect(deValidator.execute('FR1420041010050500013M02606')).to.be.false;
+    expect(deValidator.execute('DE89370400440532013000')).to.be.true;
+    expect(deValidator.execute('SK3112000000198742637541')).to.be.true;
+  });
 });
diff --git a/packages/input-iban/translations/bg.js b/packages/input-iban/translations/bg.js
index 6fbd20db9..e4ac23695 100644
--- a/packages/input-iban/translations/bg.js
+++ b/packages/input-iban/translations/bg.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} {fieldName}.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Австрийски}\n' +
       'BE {Белгийски}\n' +
       'CZ {Чешки}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Нидерландски}\n' +
       'PL {Полски}\n' +
       'RO {Румънски}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} не е позволено.',
   },
 };
diff --git a/packages/input-iban/translations/cs.js b/packages/input-iban/translations/cs.js
index 56ce59f19..440785373 100644
--- a/packages/input-iban/translations/cs.js
+++ b/packages/input-iban/translations/cs.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} {fieldName}.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Rakušan}\n' +
       'BE {Belgičan}\n' +
       'CZ {Čech}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Holanďan}\n' +
       'PL {Polák}\n' +
       'RO {Rumun}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} není povoleno.',
   },
 };
diff --git a/packages/input-iban/translations/de.js b/packages/input-iban/translations/de.js
index c8a49f079..3b3e60e05 100644
--- a/packages/input-iban/translations/de.js
+++ b/packages/input-iban/translations/de.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} {fieldName} ein.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Österreichisch}\n' +
       'BE {Belgisch}\n' +
       'CZ {Tschechisch}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Niederländisch}\n' +
       'PL {Polnisch}\n' +
       'RO {Rumänisch}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} ist nicht erlaubt.',
   },
 };
diff --git a/packages/input-iban/translations/en.js b/packages/input-iban/translations/en.js
index 4515a0a78..f02792778 100644
--- a/packages/input-iban/translations/en.js
+++ b/packages/input-iban/translations/en.js
@@ -16,20 +16,20 @@ export default {
       'RO {Romanian}\n' +
       'other {{params}}\n' +
       '} {fieldName}.',
+    IsNotCountryIBAN:
+      '{userSuppliedCountryCode, select,\n' +
+      'AT {Austrian}\n' +
+      'BE {Belgian}\n' +
+      'CZ {Czech}\n' +
+      'DE {German}\n' +
+      'ES {Spanish}\n' +
+      'FR {French}\n' +
+      'HU {Hungarian}\n' +
+      'IT {Italian}\n' +
+      'NL {Dutch}\n' +
+      'PL {Polish}\n' +
+      'RO {Romanian}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
+      '} {fieldName} is not allowed.',
   },
-  IsNotCountryIBAN:
-    '{params, select,\n' +
-    'AT {Austrian}\n' +
-    'BE {Belgian}\n' +
-    'CZ {Czech}\n' +
-    'DE {German}\n' +
-    'ES {Spanish}\n' +
-    'FR {French}\n' +
-    'HU {Hungarian}\n' +
-    'IT {Italian}\n' +
-    'NL {Dutch}\n' +
-    'PL {Polish}\n' +
-    'RO {Romanian}\n' +
-    'other {{params}}\n' +
-    '} {fieldName} is not allowed.',
 };
diff --git a/packages/input-iban/translations/es.js b/packages/input-iban/translations/es.js
index 2d236c789..cfd2fef8c 100644
--- a/packages/input-iban/translations/es.js
+++ b/packages/input-iban/translations/es.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '}.',
     IsNotCountryIBAN:
-      '{fieldName} {params, select,\n' +
+      '{fieldName} {userSuppliedCountryCode, select,\n' +
       'AT {Austriaco}\n' +
       'BE {Belga}\n' +
       'CZ {Checo}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Neerlandés}\n' +
       'PL {Polaco}\n' +
       'RO {Rumano}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} no se permite.',
   },
 };
diff --git a/packages/input-iban/translations/fr.js b/packages/input-iban/translations/fr.js
index 94c212dd8..87bc00c4d 100644
--- a/packages/input-iban/translations/fr.js
+++ b/packages/input-iban/translations/fr.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} valide.',
     IsNotCountryIBAN:
-      '{fieldName} {params, select,\n' +
+      '{fieldName} {userSuppliedCountryCode, select,\n' +
       'AT {autrichien}\n' +
       'BE {belge}\n' +
       'CZ {tchèque}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {néerlandais}\n' +
       'PL {polonais}\n' +
       'RO {roumain}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       "} n'est pas autorisé.",
   },
 };
diff --git a/packages/input-iban/translations/hu.js b/packages/input-iban/translations/hu.js
index f9c46e527..1fd205995 100644
--- a/packages/input-iban/translations/hu.js
+++ b/packages/input-iban/translations/hu.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} {fieldName} értéket.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Osztrák}\n' +
       'BE {Belga}\n' +
       'CZ {Cseh}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Holland}\n' +
       'PL {Lengyel}\n' +
       'RO {Román}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} nem engedélyezett.',
   },
 };
diff --git a/packages/input-iban/translations/it.js b/packages/input-iban/translations/it.js
index aebd7518e..b87a32711 100644
--- a/packages/input-iban/translations/it.js
+++ b/packages/input-iban/translations/it.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '}.',
     IsNotCountryIBAN:
-      '{fieldName} {params, select,\n' +
+      '{fieldName} {userSuppliedCountryCode, select,\n' +
       'AT {Austriaco}\n' +
       'BE {Belga}\n' +
       'CZ {Ceco}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Olandese}\n' +
       'PL {Polacco}\n' +
       'RO {Rumeno}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} non è permesso.',
   },
 };
diff --git a/packages/input-iban/translations/nl.js b/packages/input-iban/translations/nl.js
index bcfabe1a6..edd102eba 100644
--- a/packages/input-iban/translations/nl.js
+++ b/packages/input-iban/translations/nl.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} {fieldName} in.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Oostenrijkse}\n' +
       'BE {Belgische}\n' +
       'CZ {Tsjechische}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Nederlandse}\n' +
       'PL {Poolse}\n' +
       'RO {Roemeense}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} is niet toegestaan.',
   },
 };
diff --git a/packages/input-iban/translations/pl.js b/packages/input-iban/translations/pl.js
index ce3be3864..303269a59 100644
--- a/packages/input-iban/translations/pl.js
+++ b/packages/input-iban/translations/pl.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} {fieldName}.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Austriacki}\n' +
       'BE {Belgijski}\n' +
       'CZ {Czeski}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Holenderski}\n' +
       'PL {Polski}\n' +
       'RO {Rumuński}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} nie jest dozwolone.',
   },
 };
diff --git a/packages/input-iban/translations/ro.js b/packages/input-iban/translations/ro.js
index 8c94daf78..bec11d061 100644
--- a/packages/input-iban/translations/ro.js
+++ b/packages/input-iban/translations/ro.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} valid(ă).',
     IsNotCountryIBAN:
-      '{fieldName} {params, select,\n' +
+      '{fieldName} {userSuppliedCountryCode, select,\n' +
       'AT {austriac}\n' +
       'BE {belgian}\n' +
       'CZ {ceh}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {olandez}\n' +
       'PL {polonez}\n' +
       'RO {românesc}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} nu este permis.',
   },
 };
diff --git a/packages/input-iban/translations/ru.js b/packages/input-iban/translations/ru.js
index d89476063..5986d9f57 100644
--- a/packages/input-iban/translations/ru.js
+++ b/packages/input-iban/translations/ru.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} {fieldName}.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Австрийский}\n' +
       'BE {Бельгийский}\n' +
       'CZ {Чешский}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Нидерландский}\n' +
       'PL {Польский}\n' +
       'RO {Румынский}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} не допускается.',
   },
 };
diff --git a/packages/input-iban/translations/sk.js b/packages/input-iban/translations/sk.js
index 9e5e7ca4c..f568fecbe 100644
--- a/packages/input-iban/translations/sk.js
+++ b/packages/input-iban/translations/sk.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} kód {fieldName}.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Rakúsky}\n' +
       'BE {Belgický}\n' +
       'CZ {Český}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Holandský}\n' +
       'PL {Poľský}\n' +
       'RO {Rumunský}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} nie je povolené.',
   },
 };
diff --git a/packages/input-iban/translations/uk.js b/packages/input-iban/translations/uk.js
index 583d6d2a5..2842bc3a7 100644
--- a/packages/input-iban/translations/uk.js
+++ b/packages/input-iban/translations/uk.js
@@ -17,7 +17,7 @@ export default {
       'other {{params}}\n' +
       '} {fieldName}.',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {Австрійський}\n' +
       'BE {Бельгійський}\n' +
       'CZ {Чеський}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {Голландський}\n' +
       'PL {Польський}\n' +
       'RO {Румунська}\n' +
-      'other {{params}}\n' +
+      'other {{userSuppliedCountryCode}}\n' +
       '} {fieldName} не дозволено.',
   },
 };
diff --git a/packages/input-iban/translations/zh.js b/packages/input-iban/translations/zh.js
index f39bdee38..1d6a1e76e 100644
--- a/packages/input-iban/translations/zh.js
+++ b/packages/input-iban/translations/zh.js
@@ -17,7 +17,7 @@ export default {
       '另一个 {{params}}\n' +
       '} {fieldName}。',
     IsNotCountryIBAN:
-      '{params, select,\n' +
+      '{userSuppliedCountryCode, select,\n' +
       'AT {奥}\n' +
       'BE {比利时的}\n' +
       'CZ {捷克}\n' +
@@ -29,7 +29,7 @@ export default {
       'NL {荷兰人}\n' +
       'PL {抛光}\n' +
       'RO {罗马尼亚}\n' +
-      '另一个 {{params}}\n' +
+      '另一个 {{userSuppliedCountryCode}}\n' +
       '} {fieldName} 不允許。',
   },
 };