-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'validatorjs:master' into fix-isPort
- Loading branch information
Showing
7 changed files
with
330 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,111 @@ | ||
| import assertString from './util/assertString'; | ||
|
|
||
| const localeReg = /^[A-Za-z]{2,4}([_-]([A-Za-z]{4}|[\d]{3}))?([_-]([A-Za-z]{2}|[\d]{3}))?$/; | ||
| /* | ||
| = 3ALPHA ; selected ISO 639 codes | ||
| *2("-" 3ALPHA) ; permanently reserved | ||
| */ | ||
| const extlang = '([A-Za-z]{3}(-[A-Za-z]{3}){0,2})'; | ||
|
|
||
| /* | ||
| = 2*3ALPHA ; shortest ISO 639 code | ||
| ["-" extlang] ; sometimes followed by | ||
| ; extended language subtags | ||
| / 4ALPHA ; or reserved for future use | ||
| / 5*8ALPHA ; or registered language subtag | ||
| */ | ||
| const language = `(([a-zA-Z]{2,3}(-${extlang})?)|([a-zA-Z]{5,8}))`; | ||
|
|
||
| /* | ||
| = 4ALPHA ; ISO 15924 code | ||
| */ | ||
| const script = '([A-Za-z]{4})'; | ||
|
|
||
| /* | ||
| = 2ALPHA ; ISO 3166-1 code | ||
| / 3DIGIT ; UN M.49 code | ||
| */ | ||
| const region = '([A-Za-z]{2}|\\d{3})'; | ||
|
|
||
| /* | ||
| = 5*8alphanum ; registered variants | ||
| / (DIGIT 3alphanum) | ||
| */ | ||
| const variant = '([A-Za-z0-9]{5,8}|(\\d[A-Z-a-z0-9]{3}))'; | ||
|
|
||
| /* | ||
| = DIGIT ; 0 - 9 | ||
| / %x41-57 ; A - W | ||
| / %x59-5A ; Y - Z | ||
| / %x61-77 ; a - w | ||
| / %x79-7A ; y - z | ||
| */ | ||
| const singleton = '(\\d|[A-W]|[Y-Z]|[a-w]|[y-z])'; | ||
|
|
||
| /* | ||
| = singleton 1*("-" (2*8alphanum)) | ||
| ; Single alphanumerics | ||
| ; "x" reserved for private use | ||
| */ | ||
| const extension = `(${singleton}(-[A-Za-z0-9]{2,8})+)`; | ||
|
|
||
| /* | ||
| = "x" 1*("-" (1*8alphanum)) | ||
| */ | ||
| const privateuse = '(x(-[A-Za-z0-9]{1,8})+)'; | ||
|
|
||
| // irregular tags do not match the 'langtag' production and would not | ||
| // otherwise be considered 'well-formed'. These tags are all valid, but | ||
| // most are deprecated in favor of more modern subtags or subtag combination | ||
|
|
||
| const irregular = '((en-GB-oed)|(i-ami)|(i-bnn)|(i-default)|(i-enochian)|' + | ||
| '(i-hak)|(i-klingon)|(i-lux)|(i-mingo)|(i-navajo)|(i-pwn)|(i-tao)|' + | ||
| '(i-tay)|(i-tsu)|(sgn-BE-FR)|(sgn-BE-NL)|(sgn-CH-DE))'; | ||
|
|
||
| // regular tags match the 'langtag' production, but their subtags are not | ||
| // extended language or variant subtags: their meaning is defined by | ||
| // their registration and all of these are deprecated in favor of a more | ||
| // modern subtag or sequence of subtags | ||
|
|
||
| const regular = '((art-lojban)|(cel-gaulish)|(no-bok)|(no-nyn)|(zh-guoyu)|' + | ||
| '(zh-hakka)|(zh-min)|(zh-min-nan)|(zh-xiang))'; | ||
|
|
||
| /* | ||
| = irregular ; non-redundant tags registered | ||
| / regular ; during the RFC 3066 era | ||
| */ | ||
| const grandfathered = `(${irregular}|${regular})`; | ||
|
|
||
| /* | ||
| RFC 5646 defines delimitation of subtags via a hyphen: | ||
| "Subtag" refers to a specific section of a tag, delimited by a | ||
| hyphen, such as the subtags 'zh', 'Hant', and 'CN' in the tag "zh- | ||
| Hant-CN". Examples of subtags in this document are enclosed in | ||
| single quotes ('Hant') | ||
| However, we need to add "_" to maintain the existing behaviour. | ||
| */ | ||
| const delimiter = '(-|_)'; | ||
|
|
||
| /* | ||
| = language | ||
| ["-" script] | ||
| ["-" region] | ||
| *("-" variant) | ||
| *("-" extension) | ||
| ["-" privateuse] | ||
| */ | ||
| const langtag = `${language}(${delimiter}${script})?(${delimiter}${region})?(${delimiter}${variant})*(${delimiter}${extension})*(${delimiter}${privateuse})?`; | ||
|
|
||
| /* | ||
| Regex implementation based on BCP RFC 5646 | ||
| Tags for Identifying Languages | ||
| https://www.rfc-editor.org/rfc/rfc5646.html | ||
| */ | ||
| const languageTagRegex = new RegExp(`(^${privateuse}$)|(^${grandfathered}$)|(^${langtag}$)`); | ||
|
|
||
| export default function isLocale(str) { | ||
| assertString(str); | ||
| if (str === 'en_US_POSIX' || str === 'ca_ES_VALENCIA') { | ||
| return true; | ||
| } | ||
| return localeReg.test(str); | ||
| return languageTagRegex.test(str); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import trim from './trim'; | ||
| import isEmail from './isEmail'; | ||
| import assertString from './util/assertString'; | ||
|
|
||
| function parseMailtoQueryString(queryString) { | ||
| const allowedParams = new Set(['subject', 'body', 'cc', 'bcc']), | ||
| query = { cc: '', bcc: '' }; | ||
| let isParseFailed = false; | ||
|
|
||
| const queryParams = queryString.split('&'); | ||
|
|
||
| if (queryParams.length > 4) { | ||
| return false; | ||
| } | ||
|
|
||
| for (const q of queryParams) { | ||
| const [key, value] = q.split('='); | ||
|
|
||
| // checked for invalid and duplicated query params | ||
| if (key && !allowedParams.has(key)) { | ||
| isParseFailed = true; | ||
| break; | ||
| } | ||
|
|
||
| if (value && (key === 'cc' || key === 'bcc')) { | ||
| query[key] = value; | ||
| } | ||
|
|
||
| if (key) { | ||
| allowedParams.delete(key); | ||
| } | ||
| } | ||
|
|
||
| return isParseFailed ? false : query; | ||
| } | ||
|
|
||
| export default function isMailtoURI(url, options) { | ||
| assertString(url); | ||
|
|
||
| if (url.indexOf('mailto:') !== 0) { | ||
| return false; | ||
| } | ||
|
|
||
| const [to = '', queryString = ''] = url.replace('mailto:', '').split('?'); | ||
|
|
||
| if (!to && !queryString) { | ||
| return true; | ||
| } | ||
|
|
||
| const query = parseMailtoQueryString(queryString); | ||
|
|
||
| if (!query) { | ||
| return false; | ||
| } | ||
|
|
||
| return `${to},${query.cc},${query.bcc}` | ||
| .split(',') | ||
| .every((email) => { | ||
| email = trim(email, ' '); | ||
|
|
||
| if (email) { | ||
| return isEmail(email, options); | ||
| } | ||
|
|
||
| return true; | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.