[release staging] April 2021 Release (v13.6.0)

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+name: CI
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: [14, 12, 10, 8, 6]
+    name: Run tests on Node.js ${{ matrix.node-version }}
+    steps:
+    - name: Setup Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2-beta
+      with:
+        node-version: ${{ matrix.node-version }}
+        check-latest: true
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Install dependencies
+      run: npm install
+    - name: Run tests
+      run: npm test
+    - if: matrix.node-version == 14
+      name: Generate coverage file
+      run: npm run test:ci > coverage.lcov
+    - if: matrix.node-version == 14
+      name: Send coverage info to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        file: ./coverage.lcov

.github/workflows/npm-publish.yml

@@ -0,0 +1,24 @@
+name: NPM Publish
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Setup Node.js 14
+      uses: actions/setup-node@v2-beta
+      with:
+        node-version: 14
+        check-latest: true
+        registry-url: https://registry.npmjs.org/
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+    - name: Install Dependencies
+      run: npm install
+    - name: Run Tests
+      run: npm test
+    - name: Publish Package to NPM Registry
+      run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{secrets.NPM_SECRET}}

.gitignore

@@ -7,6 +7,6 @@ package-lock.json
 yarn.lock
 /es
 /lib
+/index.js
 validator.js
 validator.min.js
-index.js

.nycrc

@@ -5,9 +5,5 @@
   ],
   "include": [
     "src/**/*.js"
-  ],
-  "exclude": [
-    "validator.js",
-    "lib/**/*.js"
   ]
 }

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "validator-js",
   "main": "validator.js",
-  "homepage": "https://github.com/chriso/validator.js",
+  "homepage": "https://github.com/validatorjs/validator.js",
   "authors": [
     "Chris O'Hara <cohara87+gh@gmail.com>"
   ],

package.json

@@ -1,9 +1,9 @@
 {
   "name": "validator",
   "description": "String validation and sanitization",
-  "version": "13.5.0",
+  "version": "13.6.0",
   "sideEffects": false,
-  "homepage": "https://github.com/chriso/validator.js",
+  "homepage": "https://github.com/validatorjs/validator.js",
   "files": [
     "index.js",
     "es",
@@ -25,18 +25,15 @@
   ],
   "author": "Chris O'Hara <cohara87@gmail.com>",
   "contributors": [
-    {
-      "name": "Anthony Nandaa",
-      "url": "https://github.com/profnandaa"
-    }
+    "Anthony Nandaa (https://github.com/profnandaa)"
   ],
   "main": "index.js",
   "bugs": {
-    "url": "https://github.com/chriso/validator.js/issues"
+    "url": "https://github.com/validatorjs/validator.js/issues"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/chriso/validator.js.git"
+    "url": "git+https://github.com/validatorjs/validator.js.git"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
@@ -48,7 +45,7 @@
     "eslint": "^4.19.1",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-import": "^2.11.0",
-    "mocha": "^5.1.1",
+    "mocha": "^6.2.3",
     "nyc": "^14.1.0",
     "rimraf": "^3.0.0",
     "rollup": "^0.43.0",

src/index.js

@@ -115,11 +115,12 @@ import isWhitelisted from './lib/isWhitelisted';
 import normalizeEmail from './lib/normalizeEmail';
 
 import isSlug from './lib/isSlug';
+import isLicensePlate from './lib/isLicensePlate';
 import isStrongPassword from './lib/isStrongPassword';
 
 import isVAT from './lib/isVAT';
 
-const version = '13.5.0';
+const version = '13.6.0';
 
 const validator = {
   version,
@@ -219,6 +220,7 @@ const validator = {
   isStrongPassword,
   isTaxID,
   isDate,
+  isLicensePlate,
   isVAT,
 };
 

src/lib/isAlphanumeric.js

@@ -1,8 +1,22 @@
 import assertString from './util/assertString';
 import { alphanumeric } from './alpha';
 
-export default function isAlphanumeric(str, locale = 'en-US') {
-  assertString(str);
+export default function isAlphanumeric(_str, locale = 'en-US', options = {}) {
+  assertString(_str);
+
+  let str = _str;
+  const { ignore } = options;
+
+  if (ignore) {
+    if (ignore instanceof RegExp) {
+      str = str.replace(ignore, '');
+    } else if (typeof ignore === 'string') {
+      str = str.replace(new RegExp(`[${ignore.replace(/[-[\]{}()*+?.,\\^$|#\\s]/g, '\\$&')}]`, 'g'), ''); // escape regex for ignore
+    } else {
+      throw new Error('ignore should be instance of a String or RegExp');
+    }
+  }
+
   if (locale in alphanumeric) {
     return alphanumeric[locale].test(str);
   }

src/lib/isBIC.js

@@ -1,8 +1,17 @@
 import assertString from './util/assertString';
+import { CountryCodes } from './isISO31661Alpha2';
 
-const isBICReg = /^[A-z]{4}[A-z]{2}\w{2}(\w{3})?$/;
+// https://en.wikipedia.org/wiki/ISO_9362
+const isBICReg = /^[A-Za-z]{6}[A-Za-z0-9]{2}([A-Za-z0-9]{3})?$/;
 
 export default function isBIC(str) {
   assertString(str);
+
+  // toUpperCase() should be removed when a new major version goes out that changes
+  // the regex to [A-Z] (per the spec).
+  if (CountryCodes.indexOf(str.slice(4, 6).toUpperCase()) < 0) {
+    return false;
+  }
+
   return isBICReg.test(str);
 }

src/lib/isBtcAddress.js

@@ -1,9 +1,14 @@
 import assertString from './util/assertString';
 
 // supports Bech32 addresses
-const btc = /^(bc1|[13])[a-zA-HJ-NP-Z0-9]{25,39}$/;
+const bech32 = /^(bc1)[a-z0-9]{25,39}$/;
+const base58 = /^(1|3)[A-HJ-NP-Za-km-z1-9]{25,39}$/;
 
 export default function isBtcAddress(str) {
   assertString(str);
-  return btc.test(str);
+  // check for bech32
+  if (str.startsWith('bc1')) {
+    return bech32.test(str);
+  }
+  return base58.test(str);
 }

src/lib/isDataURI.js

@@ -22,9 +22,10 @@ export default function isDataURI(str) {
     return false;
   }
   for (let i = 0; i < attributes.length; i++) {
-    if (i === attributes.length - 1 && attributes[i].toLowerCase() === 'base64') {
-      // ok
-    } else if (!validAttribute.test(attributes[i])) {
+    if (
+      !(i === attributes.length - 1 && attributes[i].toLowerCase() === 'base64') &&
+      !validAttribute.test(attributes[i])
+    ) {
       return false;
     }
   }

src/lib/isEAN.js

@@ -3,20 +3,25 @@
  * the thirteen-digit EAN-13, while the
  * less commonly used 8-digit EAN-8 barcode was
  * introduced for use on small packages.
+ * Also EAN/UCC-14 is used for Grouping of individual
+ * trade items above unit level(Intermediate, Carton or Pallet).
+ * For more info about EAN-14 checkout: https://www.gtin.info/itf-14-barcodes/
  * EAN consists of:
  * GS1 prefix, manufacturer code, product code and check digit
  * Reference: https://en.wikipedia.org/wiki/International_Article_Number
+ * Reference: https://www.gtin.info/
  */
 
 import assertString from './util/assertString';
 
 /**
- * Define EAN Lenghts; 8 for EAN-8; 13 for EAN-13
- * and Regular Expression for valid EANs (EAN-8, EAN-13),
- * with exact numberic matching of 8 or 13 digits [0-9]
+ * Define EAN Lenghts; 8 for EAN-8; 13 for EAN-13; 14 for EAN-14
+ * and Regular Expression for valid EANs (EAN-8, EAN-13, EAN-14),
+ * with exact numberic matching of 8 or 13 or 14 digits [0-9]
  */
 const LENGTH_EAN_8 = 8;
-const validEanRegex = /^(\d{8}|\d{13})$/;
+const LENGTH_EAN_14 = 14;
+const validEanRegex = /^(\d{8}|\d{13}|\d{14})$/;
 
 
 /**
@@ -28,7 +33,7 @@ const validEanRegex = /^(\d{8}|\d{13})$/;
  * @return {number}
  */
 function getPositionWeightThroughLengthAndIndex(length, index) {
-  if (length === LENGTH_EAN_8) {
+  if (length === LENGTH_EAN_8 || length === LENGTH_EAN_14) {
     return (index % 2 === 0) ? 3 : 1;
   }
 
@@ -56,7 +61,7 @@ function calculateCheckDigit(ean) {
 
 /**
  * Check if string is valid EAN:
- * Matches EAN-8/EAN-13 regex
+ * Matches EAN-8/EAN-13/EAN-14 regex
  * Has valid check digit.
  *
  * @param {string} str

src/lib/isEmail.js

@@ -16,7 +16,7 @@ const default_email_options = {
 
 /* eslint-disable max-len */
 /* eslint-disable no-control-regex */
-const splitNameAddress = /^([^\x00-\x1F\x7F-\x9F\cX]+)<(.+)>$/i;
+const splitNameAddress = /^([^\x00-\x1F\x7F-\x9F\cX]+)</i;
 const emailUserPart = /^[a-z\d!#\$%&'\*\+\-\/=\?\^_`{\|}~]+$/i;
 const gmailUserPart = /^[a-z\d]+$/;
 const quotedEmailUser = /^([\s\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e]|(\\[\x01-\x09\x0b\x0c\x0d-\x7f]))*$/i;
@@ -31,9 +31,7 @@ const defaultMaxEmailLength = 254;
  * @param {String} display_name
  */
 function validateDisplayName(display_name) {
-  const trim_quotes = display_name.match(/^"(.+)"$/i);
-  const display_name_without_quotes = trim_quotes ? trim_quotes[1] : display_name;
-
+  const display_name_without_quotes = display_name.replace(/^"(.+)"$/, '$1');
   // display name with only spaces is not valid
   if (!display_name_without_quotes.trim()) {
     return false;
@@ -44,7 +42,7 @@ function validateDisplayName(display_name) {
   if (contains_illegal) {
     // if contains illegal characters,
     // must to be enclosed in double-quotes, otherwise it's not a valid display name
-    if (!trim_quotes) {
+    if (display_name_without_quotes === display_name) {
       return false;
     }
 
@@ -67,8 +65,12 @@ export default function isEmail(str, options) {
   if (options.require_display_name || options.allow_display_name) {
     const display_email = str.match(splitNameAddress);
     if (display_email) {
-      let display_name;
-      [, display_name, str] = display_email;
+      let display_name = display_email[1];
+
+      // Remove display name and angle brackets to get email address
+      // Can be done in the regex but will introduce a ReDOS (See  #1597 for more info)
+      str = str.replace(display_name, '').replace(/(^<|>$)/g, '');
+
       // sometimes need to trim the last space to get the display name
       // because there may be a space between display name and email address
       // eg. myname <address@gmail.com>

src/lib/isFQDN.js

@@ -17,39 +17,52 @@ export default function isFQDN(str, options) {
     str = str.substring(0, str.length - 1);
   }
   const parts = str.split('.');
-  for (let i = 0; i < parts.length; i++) {
-    if (parts[i].length > 63) {
+  const tld = parts[parts.length - 1];
+
+  if (options.require_tld) {
+    // disallow fqdns without tld
+    if (parts.length < 2) {
       return false;
     }
-  }
-  if (options.require_tld) {
-    const tld = parts.pop();
-    if (!parts.length || !/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
+
+    if (!/^([a-z\u00a1-\uffff]{2,}|xn[a-z0-9-]{2,})$/i.test(tld)) {
       return false;
     }
+
     // disallow spaces && special characers
     if (/[\s\u2002-\u200B\u202F\u205F\u3000\uFEFF\uDB40\uDC20\u00A9\uFFFD]/.test(tld)) {
       return false;
     }
   }
-  for (let part, i = 0; i < parts.length; i++) {
-    part = parts[i];
-    if (!options.allow_numeric_tld && i === parts.length - 1 && /^\d+$/.test(part)) {
-      return false; // reject numeric TLDs
+
+  // reject numeric TLDs
+  if (!options.allow_numeric_tld && /^\d+$/.test(tld)) {
+    return false;
+  }
+
+  return parts.every((part) => {
+    if (part.length > 63) {
+      return false;
     }
+
     if (!/^[a-z_\u00a1-\uffff0-9-]+$/i.test(part)) {
       return false;
     }
+
     // disallow full-width chars
     if (/[\uff01-\uff5e]/.test(part)) {
       return false;
     }
-    if (part[0] === '-' || part[part.length - 1] === '-') {
+
+    // disallow parts starting or ending with hyphen
+    if (/^-|-$/.test(part)) {
       return false;
     }
+
     if (!options.allow_underscores && /_/.test(part)) {
       return false;
     }
-  }
-  return true;
+
+    return true;
+  });
 }