msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

feat: remove checks for appropriate field types

Browse Source
pull/8520/head
Christoph Rüßler 3 years ago
parent db072c3adc
commit c0b9cc1a33
3 changed files with 16 additions and 124 deletions
Show Stats Download Patch File Download Diff File

87
src/compiler/compile/utils/a11y.ts
Unescape View File

@ -287,89 +287,6 @@ const autofill_contact_field_name_tokens = new Set([
'impp'
]);
const control_group_text_types = new Set(['hidden', 'text', 'search']);
const control_group_multiline_types = new Set(['hidden']);
const control_group_password_types = new Set(['hidden', 'text', 'search', 'password']);
const control_group_url_types = new Set(['hidden', 'text', 'search', 'url']);
const control_group_username_types = new Set(['hidden', 'text', 'search', 'email']);
const control_group_telephone_types = new Set(['hidden', 'text', 'search', 'tel']);
const control_group_numeric_types = new Set(['hidden', 'text', 'search', 'number']);
const control_group_month_types = new Set(['hidden', 'text', 'search', 'month']);
const control_group_date_types = new Set(['hidden', 'text', 'search', 'date']);
const appropriate_types_for_field_names = new Map([
['name', control_group_text_types],
['honorific-prefix', control_group_text_types],
['given-name', control_group_text_types],
['additional-name', control_group_text_types],
['family-name', control_group_text_types],
['honorific-suffix', control_group_text_types],
['nickname', control_group_text_types],
['organization-title', control_group_text_types],
['username', control_group_username_types],
['new-password', control_group_password_types],
['current-password', control_group_password_types],
['one-time-code', control_group_password_types],
['organization', control_group_text_types],
['street-address', control_group_multiline_types],
['address-line1', control_group_text_types],
['address-line2', control_group_text_types],
['address-line3', control_group_text_types],
['address-level4', control_group_text_types],
['address-level3', control_group_text_types],
['address-level2', control_group_text_types],
['address-level1', control_group_text_types],
['country', control_group_text_types],
['country-name', control_group_text_types],
['postal-code', control_group_text_types],
['cc-name', control_group_text_types],
['cc-given-name', control_group_text_types],
['cc-additional-name', control_group_text_types],
['cc-family-name', control_group_text_types],
['cc-number', control_group_text_types],
['cc-exp', control_group_month_types],
['cc-exp-month', control_group_numeric_types],
['cc-exp-year', control_group_numeric_types],
['cc-csc', control_group_text_types],
['cc-type', control_group_text_types],
['transaction-currency', control_group_text_types],
['transaction-amount', control_group_numeric_types],
['language', control_group_text_types],
['bday', control_group_date_types],
['bday-day', control_group_numeric_types],
['bday-month', control_group_numeric_types],
['bday-year', control_group_numeric_types],
['sex', control_group_text_types],
['url', control_group_url_types],
['photo', control_group_url_types],
['tel', control_group_telephone_types],
['tel-country-code', control_group_text_types],
['tel-national', control_group_text_types],
['tel-area-code', control_group_text_types],
['tel-local', control_group_text_types],
['tel-local-prefix', control_group_text_types],
['tel-local-suffix', control_group_text_types],
['tel-extension', control_group_text_types],
['email', control_group_username_types],
['impp', control_group_url_types]
]);
function is_appropriate_type_for_field_name(type: string, field_name: string) {
if (autofill_field_name_tokens.has(field_name)) {
return appropriate_types_for_field_names.get(field_name)?.has(type);
}
return false;
}
function is_appropriate_type_for_contact_field_name(type: string, field_name: string) {
if (autofill_contact_field_name_tokens.has(field_name)) {
return appropriate_types_for_field_names.get(field_name)?.has(type);
}
return false;
}
export function is_valid_autocomplete(type: null | true | string, autocomplete: null | true | string) {
if (typeof autocomplete !== 'string' || typeof type !== 'string') {
return false;
@ -395,14 +312,14 @@ export function is_valid_autocomplete(type: null | true | string, autocomplete:
tokens.shift();
}
if (is_appropriate_type_for_field_name(normalized_type, tokens[0])) {
if (autofill_field_name_tokens.has(tokens[0])) {
tokens.shift();
} else {
if (contact_type_tokens.has(tokens[0])) {
tokens.shift();
}
if (is_appropriate_type_for_contact_field_name(normalized_type, tokens[0])) {
if (autofill_contact_field_name_tokens.has(tokens[0])) {
tokens.shift();
} else {
return false;

5
test/validator/samples/a11y-autocomplete-valid/input.svelte
Unescape View File

@ -9,6 +9,8 @@
<input type="text" autocomplete="section-somewhere shipping work email webauthn" />
<input type="text" autocomplete="SECTION-SOMEWHERE SHIPPING WORK EMAIL WEBAUTHN" />
<input type="TEXT" autocomplete="ON" />
<input type="email" autocomplete="url" />
<input type="text" autocomplete="section-blue shipping street-address" />
<!-- INVALID -->
<input type="text" autocomplete />
@ -16,7 +18,4 @@
<input type="hidden" autocomplete="on" />
<input type="text" autocomplete="" />
<input type="text" autocomplete="incorrect" />
<input type="email" autocomplete="url" />
<!-- `street-address` is only valid for Control Group "Multiline" -->
<input type="text" autocomplete="section-blue shipping street-address" />
<input type="text" autocomplete="webauthn" />

48
test/validator/samples/a11y-autocomplete-valid/warnings.json
Unescape View File

@ -3,24 +3,24 @@
"code": "a11y-autocomplete-valid",
"end": {
"column": 31,
"line": 14
"line": 16
},
"message": "A11y: The value 'true' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
"start": {
"column": 19,
"line": 14
"line": 16
}
},
{
"code": "a11y-autocomplete-valid",
"end": {
"column": 39,
"line": 15
"line": 17
},
"message": "A11y: The value 'off' is not supported by the attribute 'autocomplete' on element <input type=\"hidden\">",
"start": {
"column": 21,
"line": 15
"line": 17
}
},
{
@ -28,11 +28,11 @@
"message": "A11y: The value 'on' is not supported by the attribute 'autocomplete' on element <input type=\"hidden\">",
"end": {
"column": 38,
"line": 16
"line": 18
},
"start": {
"column": 21,
"line": 16
"line": 18
}
},
{
@ -40,59 +40,35 @@
"message": "A11y: The value '' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
"end": {
"column": 34,
"line": 17
"line": 19
},
"start": {
"column": 19,
"line": 17
"line": 19
}
},
{
"code": "a11y-autocomplete-valid",
"end": {
"column": 43,
"line": 18
"line": 20
},
"message": "A11y: The value 'incorrect' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
"start": {
"column": 19,
"line": 18
}
},
{
"code": "a11y-autocomplete-valid",
"end": {
"column": 38,
"line": 19
},
"message": "A11y: The value 'url' is not supported by the attribute 'autocomplete' on element <input type=\"email\">",
"start": {
"column": 20,
"line": 19
}
},
{
"code": "a11y-autocomplete-valid",
"end": {
"column": 70,
"line": 21
},
"message": "A11y: The value 'section-blue shipping street-address' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
"start": {
"column": 19,
"line": 21
"line": 20
}
},
{
"code": "a11y-autocomplete-valid",
"end": {
"column": 42,
"line": 22
"line": 21
},
"message": "A11y: The value 'webauthn' is not supported by the attribute 'autocomplete' on element <input type=\"text\">",
"start": {
"column": 19,
"line": 22
"line": 21
}
}
]

Write Preview
Loading…
Cancel
Save