Implemented VAT validation support for english (en-GB) locale - #1463

Merged
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support
Nov 29, 2020
Merged

Implemented VAT validation support for english (en-GB) locale#1463
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support

Conversation

@CodingNagger

Copy link
Copy Markdown
Contributor

I introduced the isVAT method based on a feature request spotted in #852. However, it feels like to big a piece to take all at once so I picked a locale which I need that validation for which is "en-GB".

I purposefully excluded generated files as these seem to contain changes that are not currently checked in the main master branch so that this PR only contains my changes.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@codecov

codecovBot commented Oct 5, 2020

Copy link
Copy Markdown

Codecov Report

Merging #1463 (2686095) into master (c5a1a22) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1463 +/- ##
=======================================
Coverage 99.92% 99.92% =======================================
Files 96 98 +2 Lines 1275 1340 +65 =======================================
+ Hits 1274 1339 +65 
Misses 1 1 
Impacted FilesCoverage Δ
src/index.js100.00% <100.00%> (ø)
src/lib/isVAT.js100.00% <100.00%> (ø)
src/lib/alpha.js100.00% <0.00%> (ø)
src/lib/isFQDN.js100.00% <0.00%> (ø)
src/lib/isAlpha.js100.00% <0.00%> (ø)
src/lib/isEmail.js100.00% <0.00%> (ø)
src/lib/isPostalCode.js100.00% <0.00%> (ø)
src/lib/isMobilePhone.js100.00% <0.00%> (ø)
src/lib/isPassportNumber.js100.00% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5a1a22...2686095. Read the comment docs.

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contrib! 🎉 Just 2 comment from me:

  1. Don't know if we could just go with country codes only for territorial stuff like VAT, so should this be GB or UK? Just the way we've done for others like Passport...
  2. see below.

Comment threadsrc/lib/isVAT.js Outdated
/^GB\d{3} \d{4} ([0-8][0-9]|9[0-6])$/,
/^GB\d{9} \d{3}$/,
/^GBGD[0-4][0-9]{2}$/,
/^GBHA[5-9][0-9]{2}$/,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to make this one-line regex instead, to save on the matching loop later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that works

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the country codes, I'm cool going for ISO 3166-1 alpha-2 which would be GB for the UK.

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

ping @profnandaa

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contrib! 🎉

Being a new feature, will request some extra pair of eyes from @ezkemboi@tux-tn@rubiin

@profnandaa

Copy link
Copy Markdown
Member

ping @ezkemboi@tux-tn

@rubiin

Copy link
Copy Markdown
Member

looks good to merge

@ezkemboiezkemboi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@profnandaa

Copy link
Copy Markdown
Member

@CodingNagger -- qq, BTW, is VAT for GB different from that of UK?

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

Hey @profnandaa GB is the ISO 3166-1 alpha-2 notation for the UK.

@profnandaa

Copy link
Copy Markdown
Member

Ok, thanks!

Comment threadREADME.md Outdated
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, disallow_auth: false }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please list the supported country codes so far in the README.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@profnandaaprofnandaa added 🧹 needs-update For PRs that need to be updated before landing and removed 🍿 discussion labels Nov 19, 2020
@profnandaa

Copy link
Copy Markdown
Member

I think that should be it, just that minor README fix and we should be good to go.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧹 needs-updateFor PRs that need to be updated before landing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@CodingNagger@profnandaa@rubiin@ezkemboi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Implemented VAT validation support for english (en-GB) locale - #1463

Merged
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support
Nov 29, 2020
Merged

Implemented VAT validation support for english (en-GB) locale#1463
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support

Conversation

@CodingNagger

Copy link
Copy Markdown
Contributor

I introduced the isVAT method based on a feature request spotted in #852. However, it feels like to big a piece to take all at once so I picked a locale which I need that validation for which is "en-GB".

I purposefully excluded generated files as these seem to contain changes that are not currently checked in the main master branch so that this PR only contains my changes.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@codecov

codecovBot commented Oct 5, 2020

Copy link
Copy Markdown

Codecov Report

Merging #1463 (2686095) into master (c5a1a22) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1463 +/- ##
=======================================
Coverage 99.92% 99.92% =======================================
Files 96 98 +2 Lines 1275 1340 +65 =======================================
+ Hits 1274 1339 +65 
Misses 1 1 
Impacted FilesCoverage Δ
src/index.js100.00% <100.00%> (ø)
src/lib/isVAT.js100.00% <100.00%> (ø)
src/lib/alpha.js100.00% <0.00%> (ø)
src/lib/isFQDN.js100.00% <0.00%> (ø)
src/lib/isAlpha.js100.00% <0.00%> (ø)
src/lib/isEmail.js100.00% <0.00%> (ø)
src/lib/isPostalCode.js100.00% <0.00%> (ø)
src/lib/isMobilePhone.js100.00% <0.00%> (ø)
src/lib/isPassportNumber.js100.00% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5a1a22...2686095. Read the comment docs.

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contrib! 🎉 Just 2 comment from me:

  1. Don't know if we could just go with country codes only for territorial stuff like VAT, so should this be GB or UK? Just the way we've done for others like Passport...
  2. see below.

Comment threadsrc/lib/isVAT.js Outdated
/^GB\d{3} \d{4} ([0-8][0-9]|9[0-6])$/,
/^GB\d{9} \d{3}$/,
/^GBGD[0-4][0-9]{2}$/,
/^GBHA[5-9][0-9]{2}$/,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to make this one-line regex instead, to save on the matching loop later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that works

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the country codes, I'm cool going for ISO 3166-1 alpha-2 which would be GB for the UK.

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

ping @profnandaa

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contrib! 🎉

Being a new feature, will request some extra pair of eyes from @ezkemboi@tux-tn@rubiin

@profnandaa

Copy link
Copy Markdown
Member

ping @ezkemboi@tux-tn

@rubiin

Copy link
Copy Markdown
Member

looks good to merge

@ezkemboiezkemboi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@profnandaa

Copy link
Copy Markdown
Member

@CodingNagger -- qq, BTW, is VAT for GB different from that of UK?

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

Hey @profnandaa GB is the ISO 3166-1 alpha-2 notation for the UK.

@profnandaa

Copy link
Copy Markdown
Member

Ok, thanks!

Comment threadREADME.md Outdated
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, disallow_auth: false }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please list the supported country codes so far in the README.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@profnandaaprofnandaa added 🧹 needs-update For PRs that need to be updated before landing and removed 🍿 discussion labels Nov 19, 2020
@profnandaa

Copy link
Copy Markdown
Member

I think that should be it, just that minor README fix and we should be good to go.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧹 needs-updateFor PRs that need to be updated before landing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@CodingNagger@profnandaa@rubiin@ezkemboi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Implemented VAT validation support for english (en-GB) locale - #1463

Merged
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support
Nov 29, 2020
Merged

Implemented VAT validation support for english (en-GB) locale#1463
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support

Conversation

@CodingNagger

Copy link
Copy Markdown
Contributor

I introduced the isVAT method based on a feature request spotted in #852. However, it feels like to big a piece to take all at once so I picked a locale which I need that validation for which is "en-GB".

I purposefully excluded generated files as these seem to contain changes that are not currently checked in the main master branch so that this PR only contains my changes.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@codecov

codecovBot commented Oct 5, 2020

Copy link
Copy Markdown

Codecov Report

Merging #1463 (2686095) into master (c5a1a22) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1463 +/- ##
=======================================
Coverage 99.92% 99.92% =======================================
Files 96 98 +2 Lines 1275 1340 +65 =======================================
+ Hits 1274 1339 +65 
Misses 1 1 
Impacted FilesCoverage Δ
src/index.js100.00% <100.00%> (ø)
src/lib/isVAT.js100.00% <100.00%> (ø)
src/lib/alpha.js100.00% <0.00%> (ø)
src/lib/isFQDN.js100.00% <0.00%> (ø)
src/lib/isAlpha.js100.00% <0.00%> (ø)
src/lib/isEmail.js100.00% <0.00%> (ø)
src/lib/isPostalCode.js100.00% <0.00%> (ø)
src/lib/isMobilePhone.js100.00% <0.00%> (ø)
src/lib/isPassportNumber.js100.00% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5a1a22...2686095. Read the comment docs.

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contrib! 🎉 Just 2 comment from me:

  1. Don't know if we could just go with country codes only for territorial stuff like VAT, so should this be GB or UK? Just the way we've done for others like Passport...
  2. see below.

Comment threadsrc/lib/isVAT.js Outdated
/^GB\d{3} \d{4} ([0-8][0-9]|9[0-6])$/,
/^GB\d{9} \d{3}$/,
/^GBGD[0-4][0-9]{2}$/,
/^GBHA[5-9][0-9]{2}$/,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to make this one-line regex instead, to save on the matching loop later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that works

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the country codes, I'm cool going for ISO 3166-1 alpha-2 which would be GB for the UK.

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

ping @profnandaa

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contrib! 🎉

Being a new feature, will request some extra pair of eyes from @ezkemboi@tux-tn@rubiin

@profnandaa

Copy link
Copy Markdown
Member

ping @ezkemboi@tux-tn

@rubiin

Copy link
Copy Markdown
Member

looks good to merge

@ezkemboiezkemboi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@profnandaa

Copy link
Copy Markdown
Member

@CodingNagger -- qq, BTW, is VAT for GB different from that of UK?

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

Hey @profnandaa GB is the ISO 3166-1 alpha-2 notation for the UK.

@profnandaa

Copy link
Copy Markdown
Member

Ok, thanks!

Comment threadREADME.md Outdated
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, disallow_auth: false }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please list the supported country codes so far in the README.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@profnandaaprofnandaa added 🧹 needs-update For PRs that need to be updated before landing and removed 🍿 discussion labels Nov 19, 2020
@profnandaa

Copy link
Copy Markdown
Member

I think that should be it, just that minor README fix and we should be good to go.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧹 needs-updateFor PRs that need to be updated before landing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@CodingNagger@profnandaa@rubiin@ezkemboi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Implemented VAT validation support for english (en-GB) locale - #1463

Merged
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support
Nov 29, 2020
Merged

Implemented VAT validation support for english (en-GB) locale#1463
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support

Conversation

@CodingNagger

Copy link
Copy Markdown
Contributor

I introduced the isVAT method based on a feature request spotted in #852. However, it feels like to big a piece to take all at once so I picked a locale which I need that validation for which is "en-GB".

I purposefully excluded generated files as these seem to contain changes that are not currently checked in the main master branch so that this PR only contains my changes.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@codecov

codecovBot commented Oct 5, 2020

Copy link
Copy Markdown

Codecov Report

Merging #1463 (2686095) into master (c5a1a22) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1463 +/- ##
=======================================
Coverage 99.92% 99.92% =======================================
Files 96 98 +2 Lines 1275 1340 +65 =======================================
+ Hits 1274 1339 +65 
Misses 1 1 
Impacted FilesCoverage Δ
src/index.js100.00% <100.00%> (ø)
src/lib/isVAT.js100.00% <100.00%> (ø)
src/lib/alpha.js100.00% <0.00%> (ø)
src/lib/isFQDN.js100.00% <0.00%> (ø)
src/lib/isAlpha.js100.00% <0.00%> (ø)
src/lib/isEmail.js100.00% <0.00%> (ø)
src/lib/isPostalCode.js100.00% <0.00%> (ø)
src/lib/isMobilePhone.js100.00% <0.00%> (ø)
src/lib/isPassportNumber.js100.00% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5a1a22...2686095. Read the comment docs.

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contrib! 🎉 Just 2 comment from me:

  1. Don't know if we could just go with country codes only for territorial stuff like VAT, so should this be GB or UK? Just the way we've done for others like Passport...
  2. see below.

Comment threadsrc/lib/isVAT.js Outdated
/^GB\d{3} \d{4} ([0-8][0-9]|9[0-6])$/,
/^GB\d{9} \d{3}$/,
/^GBGD[0-4][0-9]{2}$/,
/^GBHA[5-9][0-9]{2}$/,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to make this one-line regex instead, to save on the matching loop later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that works

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the country codes, I'm cool going for ISO 3166-1 alpha-2 which would be GB for the UK.

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

ping @profnandaa

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contrib! 🎉

Being a new feature, will request some extra pair of eyes from @ezkemboi@tux-tn@rubiin

@profnandaa

Copy link
Copy Markdown
Member

ping @ezkemboi@tux-tn

@rubiin

Copy link
Copy Markdown
Member

looks good to merge

@ezkemboiezkemboi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@profnandaa

Copy link
Copy Markdown
Member

@CodingNagger -- qq, BTW, is VAT for GB different from that of UK?

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

Hey @profnandaa GB is the ISO 3166-1 alpha-2 notation for the UK.

@profnandaa

Copy link
Copy Markdown
Member

Ok, thanks!

Comment threadREADME.md Outdated
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, disallow_auth: false }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please list the supported country codes so far in the README.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@profnandaaprofnandaa added 🧹 needs-update For PRs that need to be updated before landing and removed 🍿 discussion labels Nov 19, 2020
@profnandaa

Copy link
Copy Markdown
Member

I think that should be it, just that minor README fix and we should be good to go.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧹 needs-updateFor PRs that need to be updated before landing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@CodingNagger@profnandaa@rubiin@ezkemboi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Implemented VAT validation support for english (en-GB) locale - #1463

Merged
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support
Nov 29, 2020
Merged

Implemented VAT validation support for english (en-GB) locale#1463
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support

Conversation

@CodingNagger

Copy link
Copy Markdown
Contributor

I introduced the isVAT method based on a feature request spotted in #852. However, it feels like to big a piece to take all at once so I picked a locale which I need that validation for which is "en-GB".

I purposefully excluded generated files as these seem to contain changes that are not currently checked in the main master branch so that this PR only contains my changes.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@codecov

codecovBot commented Oct 5, 2020

Copy link
Copy Markdown

Codecov Report

Merging #1463 (2686095) into master (c5a1a22) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1463 +/- ##
=======================================
Coverage 99.92% 99.92% =======================================
Files 96 98 +2 Lines 1275 1340 +65 =======================================
+ Hits 1274 1339 +65 
Misses 1 1 
Impacted FilesCoverage Δ
src/index.js100.00% <100.00%> (ø)
src/lib/isVAT.js100.00% <100.00%> (ø)
src/lib/alpha.js100.00% <0.00%> (ø)
src/lib/isFQDN.js100.00% <0.00%> (ø)
src/lib/isAlpha.js100.00% <0.00%> (ø)
src/lib/isEmail.js100.00% <0.00%> (ø)
src/lib/isPostalCode.js100.00% <0.00%> (ø)
src/lib/isMobilePhone.js100.00% <0.00%> (ø)
src/lib/isPassportNumber.js100.00% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5a1a22...2686095. Read the comment docs.

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contrib! 🎉 Just 2 comment from me:

  1. Don't know if we could just go with country codes only for territorial stuff like VAT, so should this be GB or UK? Just the way we've done for others like Passport...
  2. see below.

Comment threadsrc/lib/isVAT.js Outdated
/^GB\d{3} \d{4} ([0-8][0-9]|9[0-6])$/,
/^GB\d{9} \d{3}$/,
/^GBGD[0-4][0-9]{2}$/,
/^GBHA[5-9][0-9]{2}$/,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to make this one-line regex instead, to save on the matching loop later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that works

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the country codes, I'm cool going for ISO 3166-1 alpha-2 which would be GB for the UK.

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

ping @profnandaa

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contrib! 🎉

Being a new feature, will request some extra pair of eyes from @ezkemboi@tux-tn@rubiin

@profnandaa

Copy link
Copy Markdown
Member

ping @ezkemboi@tux-tn

@rubiin

Copy link
Copy Markdown
Member

looks good to merge

@ezkemboiezkemboi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@profnandaa

Copy link
Copy Markdown
Member

@CodingNagger -- qq, BTW, is VAT for GB different from that of UK?

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

Hey @profnandaa GB is the ISO 3166-1 alpha-2 notation for the UK.

@profnandaa

Copy link
Copy Markdown
Member

Ok, thanks!

Comment threadREADME.md Outdated
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, disallow_auth: false }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please list the supported country codes so far in the README.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@profnandaaprofnandaa added 🧹 needs-update For PRs that need to be updated before landing and removed 🍿 discussion labels Nov 19, 2020
@profnandaa

Copy link
Copy Markdown
Member

I think that should be it, just that minor README fix and we should be good to go.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧹 needs-updateFor PRs that need to be updated before landing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@CodingNagger@profnandaa@rubiin@ezkemboi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Implemented VAT validation support for english (en-GB) locale - #1463

Merged
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support
Nov 29, 2020
Merged

Implemented VAT validation support for english (en-GB) locale#1463
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support

Conversation

@CodingNagger

Copy link
Copy Markdown
Contributor

I introduced the isVAT method based on a feature request spotted in #852. However, it feels like to big a piece to take all at once so I picked a locale which I need that validation for which is "en-GB".

I purposefully excluded generated files as these seem to contain changes that are not currently checked in the main master branch so that this PR only contains my changes.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@codecov

codecovBot commented Oct 5, 2020

Copy link
Copy Markdown

Codecov Report

Merging #1463 (2686095) into master (c5a1a22) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1463 +/- ##
=======================================
Coverage 99.92% 99.92% =======================================
Files 96 98 +2 Lines 1275 1340 +65 =======================================
+ Hits 1274 1339 +65 
Misses 1 1 
Impacted FilesCoverage Δ
src/index.js100.00% <100.00%> (ø)
src/lib/isVAT.js100.00% <100.00%> (ø)
src/lib/alpha.js100.00% <0.00%> (ø)
src/lib/isFQDN.js100.00% <0.00%> (ø)
src/lib/isAlpha.js100.00% <0.00%> (ø)
src/lib/isEmail.js100.00% <0.00%> (ø)
src/lib/isPostalCode.js100.00% <0.00%> (ø)
src/lib/isMobilePhone.js100.00% <0.00%> (ø)
src/lib/isPassportNumber.js100.00% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5a1a22...2686095. Read the comment docs.

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contrib! 🎉 Just 2 comment from me:

  1. Don't know if we could just go with country codes only for territorial stuff like VAT, so should this be GB or UK? Just the way we've done for others like Passport...
  2. see below.

Comment threadsrc/lib/isVAT.js Outdated
/^GB\d{3} \d{4} ([0-8][0-9]|9[0-6])$/,
/^GB\d{9} \d{3}$/,
/^GBGD[0-4][0-9]{2}$/,
/^GBHA[5-9][0-9]{2}$/,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to make this one-line regex instead, to save on the matching loop later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that works

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the country codes, I'm cool going for ISO 3166-1 alpha-2 which would be GB for the UK.

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

ping @profnandaa

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contrib! 🎉

Being a new feature, will request some extra pair of eyes from @ezkemboi@tux-tn@rubiin

@profnandaa

Copy link
Copy Markdown
Member

ping @ezkemboi@tux-tn

@rubiin

Copy link
Copy Markdown
Member

looks good to merge

@ezkemboiezkemboi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@profnandaa

Copy link
Copy Markdown
Member

@CodingNagger -- qq, BTW, is VAT for GB different from that of UK?

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

Hey @profnandaa GB is the ISO 3166-1 alpha-2 notation for the UK.

@profnandaa

Copy link
Copy Markdown
Member

Ok, thanks!

Comment threadREADME.md Outdated
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, disallow_auth: false }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please list the supported country codes so far in the README.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@profnandaaprofnandaa added 🧹 needs-update For PRs that need to be updated before landing and removed 🍿 discussion labels Nov 19, 2020
@profnandaa

Copy link
Copy Markdown
Member

I think that should be it, just that minor README fix and we should be good to go.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧹 needs-updateFor PRs that need to be updated before landing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@CodingNagger@profnandaa@rubiin@ezkemboi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Implemented VAT validation support for english (en-GB) locale - #1463

Merged
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support
Nov 29, 2020
Merged

Implemented VAT validation support for english (en-GB) locale#1463
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support

Conversation

@CodingNagger

Copy link
Copy Markdown
Contributor

I introduced the isVAT method based on a feature request spotted in #852. However, it feels like to big a piece to take all at once so I picked a locale which I need that validation for which is "en-GB".

I purposefully excluded generated files as these seem to contain changes that are not currently checked in the main master branch so that this PR only contains my changes.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@codecov

codecovBot commented Oct 5, 2020

Copy link
Copy Markdown

Codecov Report

Merging #1463 (2686095) into master (c5a1a22) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1463 +/- ##
=======================================
Coverage 99.92% 99.92% =======================================
Files 96 98 +2 Lines 1275 1340 +65 =======================================
+ Hits 1274 1339 +65 
Misses 1 1 
Impacted FilesCoverage Δ
src/index.js100.00% <100.00%> (ø)
src/lib/isVAT.js100.00% <100.00%> (ø)
src/lib/alpha.js100.00% <0.00%> (ø)
src/lib/isFQDN.js100.00% <0.00%> (ø)
src/lib/isAlpha.js100.00% <0.00%> (ø)
src/lib/isEmail.js100.00% <0.00%> (ø)
src/lib/isPostalCode.js100.00% <0.00%> (ø)
src/lib/isMobilePhone.js100.00% <0.00%> (ø)
src/lib/isPassportNumber.js100.00% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5a1a22...2686095. Read the comment docs.

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contrib! 🎉 Just 2 comment from me:

  1. Don't know if we could just go with country codes only for territorial stuff like VAT, so should this be GB or UK? Just the way we've done for others like Passport...
  2. see below.

Comment threadsrc/lib/isVAT.js Outdated
/^GB\d{3} \d{4} ([0-8][0-9]|9[0-6])$/,
/^GB\d{9} \d{3}$/,
/^GBGD[0-4][0-9]{2}$/,
/^GBHA[5-9][0-9]{2}$/,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to make this one-line regex instead, to save on the matching loop later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that works

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the country codes, I'm cool going for ISO 3166-1 alpha-2 which would be GB for the UK.

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

ping @profnandaa

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contrib! 🎉

Being a new feature, will request some extra pair of eyes from @ezkemboi@tux-tn@rubiin

@profnandaa

Copy link
Copy Markdown
Member

ping @ezkemboi@tux-tn

@rubiin

Copy link
Copy Markdown
Member

looks good to merge

@ezkemboiezkemboi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@profnandaa

Copy link
Copy Markdown
Member

@CodingNagger -- qq, BTW, is VAT for GB different from that of UK?

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

Hey @profnandaa GB is the ISO 3166-1 alpha-2 notation for the UK.

@profnandaa

Copy link
Copy Markdown
Member

Ok, thanks!

Comment threadREADME.md Outdated
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, disallow_auth: false }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please list the supported country codes so far in the README.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@profnandaaprofnandaa added 🧹 needs-update For PRs that need to be updated before landing and removed 🍿 discussion labels Nov 19, 2020
@profnandaa

Copy link
Copy Markdown
Member

I think that should be it, just that minor README fix and we should be good to go.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧹 needs-updateFor PRs that need to be updated before landing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@CodingNagger@profnandaa@rubiin@ezkemboi
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Implemented VAT validation support for english (en-GB) locale - #1463

Merged
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support
Nov 29, 2020
Merged

Implemented VAT validation support for english (en-GB) locale#1463
profnandaa merged 5 commits into
validatorjs:masterfrom
CodingNagger:feature/enGB-vat-support

Conversation

@CodingNagger

Copy link
Copy Markdown
Contributor

I introduced the isVAT method based on a feature request spotted in #852. However, it feels like to big a piece to take all at once so I picked a locale which I need that validation for which is "en-GB".

I purposefully excluded generated files as these seem to contain changes that are not currently checked in the main master branch so that this PR only contains my changes.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@codecov

codecovBot commented Oct 5, 2020

Copy link
Copy Markdown

Codecov Report

Merging #1463 (2686095) into master (c5a1a22) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@ Coverage Diff @@## master #1463 +/- ##
=======================================
Coverage 99.92% 99.92% =======================================
Files 96 98 +2 Lines 1275 1340 +65 =======================================
+ Hits 1274 1339 +65 
Misses 1 1 
Impacted FilesCoverage Δ
src/index.js100.00% <100.00%> (ø)
src/lib/isVAT.js100.00% <100.00%> (ø)
src/lib/alpha.js100.00% <0.00%> (ø)
src/lib/isFQDN.js100.00% <0.00%> (ø)
src/lib/isAlpha.js100.00% <0.00%> (ø)
src/lib/isEmail.js100.00% <0.00%> (ø)
src/lib/isPostalCode.js100.00% <0.00%> (ø)
src/lib/isMobilePhone.js100.00% <0.00%> (ø)
src/lib/isPassportNumber.js100.00% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c5a1a22...2686095. Read the comment docs.

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contrib! 🎉 Just 2 comment from me:

  1. Don't know if we could just go with country codes only for territorial stuff like VAT, so should this be GB or UK? Just the way we've done for others like Passport...
  2. see below.

Comment threadsrc/lib/isVAT.js Outdated
/^GB\d{3} \d{4} ([0-8][0-9]|9[0-6])$/,
/^GB\d{9} \d{3}$/,
/^GBGD[0-4][0-9]{2}$/,
/^GBHA[5-9][0-9]{2}$/,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible to make this one-line regex instead, to save on the matching loop later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep that works

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the country codes, I'm cool going for ISO 3166-1 alpha-2 which would be GB for the UK.

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

ping @profnandaa

@profnandaaprofnandaa left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for your contrib! 🎉

Being a new feature, will request some extra pair of eyes from @ezkemboi@tux-tn@rubiin

@profnandaa

Copy link
Copy Markdown
Member

ping @ezkemboi@tux-tn

@rubiin

Copy link
Copy Markdown
Member

looks good to merge

@ezkemboiezkemboi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@profnandaa

Copy link
Copy Markdown
Member

@CodingNagger -- qq, BTW, is VAT for GB different from that of UK?

@CodingNagger

Copy link
Copy Markdown
ContributorAuthor

Hey @profnandaa GB is the ISO 3166-1 alpha-2 notation for the UK.

@profnandaa

Copy link
Copy Markdown
Member

Ok, thanks!

Comment threadREADME.md Outdated
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, disallow_auth: false }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please list the supported country codes so far in the README.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@profnandaaprofnandaa added 🧹 needs-update For PRs that need to be updated before landing and removed 🍿 discussion labels Nov 19, 2020
@profnandaa

Copy link
Copy Markdown
Member

I think that should be it, just that minor README fix and we should be good to go.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🧹 needs-updateFor PRs that need to be updated before landing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@CodingNagger@profnandaa@rubiin@ezkemboi