fix: remove using of includes to support IE (#2540)

Co-authored-by: Rik Smale <[email protected]>

Author: WikiRik

src/lib/isBoolean.js

@@ -1,4 +1,5 @@
 import assertString from './util/assertString';
+import includes from './util/includesArray';
 
 const defaultOptions = { loose: false };
 const strictBooleans = ['true', 'false', '1', '0'];
@@ -8,8 +9,8 @@ export default function isBoolean(str, options = defaultOptions) {
   assertString(str);
 
   if (options.loose) {
-    return looseBooleans.includes(str.toLowerCase());
+    return includes(looseBooleans, str.toLowerCase());
   }
 
-  return strictBooleans.includes(str);
+  return includes(strictBooleans, str);
 }

src/lib/isDecimal.js

@@ -1,6 +1,6 @@
 import merge from './util/merge';
 import assertString from './util/assertString';
-import includes from './util/includes';
+import includes from './util/includesArray';
 import { decimal } from './alpha';
 
 function decimalRegExp(options) {

src/lib/isIBAN.js

@@ -1,4 +1,5 @@
 import assertString from './util/assertString';
+import includes from './util/includesArray';
 
 /**
  * List of country codes with
@@ -131,15 +132,15 @@ function hasValidIbanFormat(str, options) {
       return false;
     }
 
-    const isoCountryCodeInWhiteList = options.whitelist.includes(isoCountryCode);
+    const isoCountryCodeInWhiteList = includes(options.whitelist, isoCountryCode);
 
     if (!isoCountryCodeInWhiteList) {
       return false;
     }
   }
 
   if (options.blacklist) {
-    const isoCountryCodeInBlackList = options.blacklist.includes(isoCountryCode);
+    const isoCountryCodeInBlackList = includes(options.blacklist, isoCountryCode);
 
     if (isoCountryCodeInBlackList) {
       return false;

src/lib/isIdentityCard.js

@@ -1,4 +1,5 @@
 import assertString from './util/assertString';
+import includes from './util/includesArray';
 import isInt from './isInt';
 
 const validators = {
@@ -277,7 +278,7 @@ const validators = {
 
     const parityBit = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'];
 
-    const checkAddressCode = addressCode => provincesAndCities.includes(addressCode);
+    const checkAddressCode = addressCode => includes(provincesAndCities, addressCode);
 
     const checkBirthDayCode = (birDayCode) => {
       const yyyy = parseInt(birDayCode.substring(0, 4), 10);

src/lib/isJSON.js

@@ -1,4 +1,5 @@
 import assertString from './util/assertString';
+import includes from './util/includesArray';
 import merge from './util/merge';
 
 const default_json_options = {
@@ -15,7 +16,7 @@ export default function isJSON(str, options) {
     }
 
     const obj = JSON.parse(str);
-    return primitives.includes(obj) || (!!obj && typeof obj === 'object');
+    return includes(primitives, obj) || (!!obj && typeof obj === 'object');
   } catch (e) { /* ignore */ }
   return false;
 }

src/lib/isLatLong.js

@@ -1,5 +1,6 @@
 import assertString from './util/assertString';
 import merge from './util/merge';
+import includes from './util/includesString';
 
 const lat = /^\(?[+-]?(90(\.0+)?|[1-8]?\d(\.\d+)?)$/;
 const long = /^\s?[+-]?(180(\.0+)?|1[0-7]\d(\.\d+)?|\d{1,2}(\.\d+)?)\)?$/;
@@ -15,7 +16,7 @@ export default function isLatLong(str, options) {
   assertString(str);
   options = merge(options, defaultLatLongOptions);
 
-  if (!str.includes(',')) return false;
+  if (!includes(str, ',')) return false;
   const pair = str.split(',');
   if ((pair[0].startsWith('(') && !pair[1].endsWith(')'))
     || (pair[1].endsWith(')') && !pair[0].startsWith('('))) return false;

src/lib/isURL.js

@@ -1,5 +1,6 @@
 import assertString from './util/assertString';
 import checkHost from './util/checkHost';
+import includes from './util/includesString';
 
 import isFQDN from './isFQDN';
 import isIP from './isIP';
@@ -53,11 +54,11 @@ export default function isURL(url, options) {
     return false;
   }
 
-  if (!options.allow_fragments && url.includes('#')) {
+  if (!options.allow_fragments && includes(url, '#')) {
     return false;
   }
 
-  if (!options.allow_query_components && (url.includes('?') || url.includes('&'))) {
+  if (!options.allow_query_components && (includes(url, '?') || includes(url, '&'))) {
     return false;
   }
 

src/lib/util/includes.js renamed to src/lib/util/includesArray.js

@@ -0,0 +1,3 @@
+const includes = (str, val) => str.indexOf(val) !== -1;
+
+export default includes;