chore: setup github actions (#1553)

* chore: prevent git from ignoring src/index.js file * chore: remove unused exclusion from nyc config * chore: replace travis-ci with github actions * chore: fix issue with github workflow config * chore: fix condition for coverage generation and sending * chore: treat node version as int * docs: replace travis with github actions badge * chore: add npm publish github action * chore: remove auto-generated files * chore: improve github actions styles * chore: use correct repo url to prevent unecessary redirect * chore: lint package.json file * chore: add new line at end of file * feat(isMobilePhone): update de-CH, add fr-CH, it-CH locales (#1554) * fix(isMobilePhone): update de-CH locale (#1549) feat(isMobilePhone): add fr-CH locale (#1549) feat(isMobilePhone): add it-CH locale (#1549) * fix(isMobilePhone): update de-CH, fr-CH and it-CH locale in validator.min.js(#1549) * fix(isMobilePhone): update fr-CH and it-CH locale aliases (#1549) Co-authored-by: Ashutosh Kumar <[email protected]> * feat(isLicensePlate): new validator 🎉 (#1495) * Added isLicensePlate check with german locale * de-LI (Liechtenstein) validator * Added albanian number plates * reversed changes in index.js * reversed changes in index.js * Refactored de-DE into one big regex, expanded tests fot de-DE * added pt-PT locale * Fixed coverage problem * feat(isLicensePlate): clean build * coverage is now 100% * Update README.md * Update README.md * fix(isTaxID): fix el-GR locale when checksum is 10 (#1529) Add correct tax identifier to demonstrate issue and fix. Thanks to: Panos Papadopoulos * feat(isMobileNumber): add support new telco numbers for VN locale (#1575) * Support new VN mobile phone 087 (https://didong.itelecom.vn/) * Add test for new telco number Co-authored-by: Kyle Dinh <[email protected]> * chore: set a fixed ubuntu version instead of relying on latest Co-authored-by: Ashutosh Kumar <[email protected]> Co-authored-by: Ashutosh Kumar <[email protected]> Co-authored-by: Michael Firlus <[email protected]> Co-authored-by: Diomidis Spinellis <[email protected]> Co-authored-by: Kyle Dinh <[email protected]> Co-authored-by: Kyle Dinh <[email protected]>
validatorjs · Feb 15, 2021 · 9debd5e · 9debd5e
1 parent 787df19
commit 9debd5e
Show file tree

Hide file tree

Showing 16 changed files with 522 additions and 5,103 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,32 @@
+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]
+    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
diff --git a/.github/workflows/npm-publish.yml b/.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}}
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,6 @@ package-lock.json
 yarn.lock
 /es
 /lib
+/index.js
 validator.js
 validator.min.js
-index.js
diff --git a/.nycrc b/.nycrc
@@ -5,9 +5,5 @@
   ],
   "include": [
     "src/**/*.js"
-  ],
-  "exclude": [
-    "validator.js",
-    "lib/**/*.js"
   ]
 }
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # validator.js
 
 [![NPM version][npm-image]][npm-url]
-[![Build Status](https://travis-ci.org/validatorjs/validator.js.svg?branch=master)](https://travis-ci.org/validatorjs/validator.js)
-[![codecov](https://codecov.io/gh/validatorjs/validator.js/branch/master/graph/badge.svg)](https://codecov.io/gh/validatorjs/validator.js)
+[![CI][ci-image]][ci-url]
+[![Coverage][codecov-image]][codecov-url]
 [![Downloads][downloads-image]][npm-url]
 [![Backers on Open Collective](https://opencollective.com/validatorjs/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/validatorjs/sponsors/badge.svg)](#sponsors)
@@ -131,6 +131,7 @@ Validator                               | Description
 **isJWT(str)**                         | check if the string is valid JWT token.
 **isLatLong(str [, options])**                      | check if the string is a valid latitude-longitude coordinate in the format `lat,long` or `lat, long`.<br/><br/>`options` is an object that defaults to `{ checkDMS: false }`. Pass `checkDMS` as `true` to validate DMS(degrees, minutes, and seconds) latitude-longitude format. 
 **isLength(str [, options])**              | check if the string's length falls in a range.<br/><br/>`options` is an object which defaults to `{min:0, max: undefined}`. Note: this function takes into account surrogate pairs.
+**isLicensePlate(str [, locale])**     | check if string matches the format of a country's license plate.<br/><br/>(locale is one of `['de-DE', 'de-LI', 'pt-PT', 'sq-AL']` or `any`)
 **isLocale(str)**                       | check if the string is a locale
 **isLowercase(str)**                    | check if the string is lowercase.
 **isMACAddress(str)**                   | check if the string is a MAC address.<br/><br/>`options` is an object which defaults to `{no_colons: false}`. If `no_colons` is true, the validator will allow MAC addresses without the colons. Also, it allows the use of hyphens, spaces or dots e.g  '01 02 03 04 05 ab', '01-02-03-04-05-ab' or '0102.0304.05ab'.
@@ -182,7 +183,7 @@ Sanitizer                              | Description
 
 ### XSS Sanitization
 
-XSS sanitization was removed from the library in [2d5d6999](https://github.com/chriso/validator.js/commit/2d5d6999541add350fb396ef02dc42ca3215049e).
+XSS sanitization was removed from the library in [2d5d6999](https://github.com/validatorjs/validator.js/commit/2d5d6999541add350fb396ef02dc42ca3215049e).
 
 For an alternative, have a look at Yahoo's [xss-filters library](https://github.com/yahoo/xss-filters) or at [DOMPurify](https://github.com/cure53/DOMPurify).
 
@@ -252,8 +253,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 [npm-url]: https://npmjs.org/package/validator
 [npm-image]: http://img.shields.io/npm/v/validator.svg
 
-[travis-url]: https://travis-ci.org/chriso/validator.js
-[travis-image]: http://img.shields.io/travis/chriso/validator.js.svg
+[codecov-url]: https://codecov.io/gh/validatorjs/validator.js
+[codecov-image]: https://codecov.io/gh/validatorjs/validator.js/branch/master/graph/badge.svg
+
+[ci-url]: https://github.com/validatorjs/validator.js/actions?query=workflow%3ACI
+[ci-image]: https://github.com/validatorjs/validator.js/workflows/CI/badge.svg?branch=master
 
 [amd]: http://requirejs.org/docs/whyamd.html
 [bower]: http://bower.io/

diff --git a/bower.json b/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 <[email protected]>"
   ],

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "String validation and sanitization",
   "version": "13.5.1",
   "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 <[email protected]>",
   "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",

diff --git a/src/index.js b/src/index.js
@@ -115,6 +115,7 @@ 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';
@@ -219,6 +220,7 @@ const validator = {
   isStrongPassword,
   isTaxID,
   isDate,
+  isLicensePlate,
   isVAT,
 };
 

diff --git a/src/lib/isLicensePlate.js b/src/lib/isLicensePlate.js
diff --git a/src/lib/isMobilePhone.js b/src/lib/isMobilePhone.js
@@ -27,7 +27,7 @@ const phones = {
   'da-DK': /^(\+?45)?\s?\d{2}\s?\d{2}\s?\d{2}\s?\d{2}$/,
   'de-DE': /^(\+49)?0?[1|3]([0|5][0-45-9]\d|6([23]|0\d?)|7([0-57-9]|6\d))\d{7}$/,
   'de-AT': /^(\+43|0)\d{1,4}\d{3,12}$/,
-  'de-CH': /^(\+41|0)(7[5-9])\d{1,7}$/,
+  'de-CH': /^(\+41|0)([1-9])\d{1,9}$/,
   'de-LU': /^(\+352)?((6\d1)\d{6})$/,
   'el-GR': /^(\+?30|0)?(69\d{8})$/,
   'en-AU': /^(\+?61|0)4\d{8}$/,
@@ -110,7 +110,7 @@ const phones = {
   'tr-TR': /^(\+?90|0)?5\d{9}$/,
   'uk-UA': /^(\+?38|8)?0\d{9}$/,
   'uz-UZ': /^(\+?998)?(6[125-79]|7[1-69]|88|9\d)\d{7}$/,
-  'vi-VN': /^(\+?84|0)((3([2-9]))|(5([2689]))|(7([0|6-9]))|(8([1-6|89]))|(9([0-9])))([0-9]{7})$/,
+  'vi-VN': /^(\+?84|0)((3([2-9]))|(5([2689]))|(7([0|6-9]))|(8([1-9]))|(9([0-9])))([0-9]{7})$/,
   'zh-CN': /^((\+|00)86)?1([3568][0-9]|4[579]|6[67]|7[01235678]|9[012356789])[0-9]{8}$/,
   'zh-TW': /^(\+?886\-?|0)?9\d{8}$/,
 };
@@ -123,6 +123,8 @@ phones['fr-BE'] = phones['nl-BE'];
 phones['zh-HK'] = phones['en-HK'];
 phones['zh-MO'] = phones['en-MO'];
 phones['ga-IE'] = phones['en-IE'];
+phones['fr-CH'] = phones['de-CH'];
+phones['it-CH'] = phones['fr-CH'];
 
 export default function isMobilePhone(str, locale, options) {
   assertString(str);

diff --git a/src/lib/isTaxID.js b/src/lib/isTaxID.js
@@ -280,7 +280,7 @@ function elGrCheck(tin) {
   for (let i = 0; i < 8; i++) {
     checksum += digits[i] * (2 ** (8 - i));
   }
-  return checksum % 11 === digits[8];
+  return ((checksum % 11) % 10) === digits[8];
 }
 
 /*