Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Gecko Bug 1857724] [css-properties-values-api] Invalid @property declarations should be dropped. #42500

Merged
merged 1 commit into from
Oct 13, 2023
Merged

[Gecko Bug 1857724] [css-properties-values-api] Invalid @property declarations should be dropped. #42500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 35 additions & 41 deletions css/css-properties-values-api/at-property-cssom.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
inherits: false;
}
@property --valid-whitespace {
syntax: " <color>+ ";
syntax: " <color># ";
inherits: false;
initial-value: red, blue;
}
Expand All @@ -38,10 +38,14 @@
syntax: "<color> | none";
initial-value: red;
}
@property --no-initial-value {
@property --no-initial-color-value {
syntax: "<color> | none";
inherits: false;
}
@property --no-initial-universal-value {
syntax: "*";
inherits: false;
}
@property --syntax-only {
syntax: "<color> | none";
}
Expand All @@ -52,7 +56,10 @@
initial-value: red;
}
/* U+0009 CHARACTER TABULATION */
@property --tab\9 tab { }
@property --tab\9 tab {
syntax: "*";
inherits: true;
}
</style>
<script>

Expand All @@ -66,6 +73,13 @@
return null;
}

function test_invalid(name) {
test(() => {
let rule = find_at_property_rule(name);
assert_true(!rule);
}, `Rule for ${name} is invalid`);
}

function test_css_text(name, expected) {
test(() => {
let rule = find_at_property_rule(name);
Expand Down Expand Up @@ -106,22 +120,26 @@
}, `Rule for ${name} returns expected value for CSSPropertyRule.initialValue`);
}

// Invalid @property rules.
test_invalid('--no-descriptors');
test_invalid('--no-syntax');
test_invalid('--no-inherits');
test_invalid('--no-initial-color-value');
test_invalid('--syntax-only', '@property --syntax-only { syntax: "<color> | none"; }');
test_invalid('--inherits-only', '@property --inherits-only { inherits: true; }');
test_invalid('--initial-value-only', '@property --initial-value-only { initial-value: red; }');

// CSSPropertyRule.cssText

test_css_text('--valid', '@property --valid { syntax: "<color> | none"; inherits: false; initial-value: red; }');
test_css_text('--valid-reverse', '@property --valid-reverse { syntax: "<length>"; inherits: true; initial-value: 0px; }');
test_css_text('--valid-universal', '@property --valid-universal { syntax: "*"; inherits: false; }');
test_css_text('--valid-whitespace', '@property --valid-whitespace { syntax: " <color>+ "; inherits: false; initial-value: red, blue; }');
test_css_text('--valid-whitespace', '@property --valid-whitespace { syntax: " <color># "; inherits: false; initial-value: red, blue; }');
test_css_text('--vALId', '@property --vALId { syntax: "<color> | none"; inherits: false; initial-value: red; }');

test_css_text('--no-descriptors', '@property --no-descriptors { }');
test_css_text('--no-syntax', '@property --no-syntax { inherits: false; initial-value: red; }');
test_css_text('--no-inherits', '@property --no-inherits { syntax: "<color> | none"; initial-value: red; }');
test_css_text('--no-initial-value', '@property --no-initial-value { syntax: "<color> | none"; inherits: false; }');
test_css_text('--syntax-only', '@property --syntax-only { syntax: "<color> | none"; }');
test_css_text('--inherits-only', '@property --inherits-only { inherits: true; }');
test_css_text('--initial-value-only', '@property --initial-value-only { initial-value: red; }');
test_css_text('--tab\ttab', '@property --tab\\9 tab { }');
test_css_text('--no-initial-universal-value', '@property --no-initial-universal-value { syntax: "*"; inherits: false; }');

test_css_text('--tab\ttab', '@property --tab\\9 tab { syntax: "*"; inherits: true; }');

// CSSRule.type

Expand All @@ -138,29 +156,17 @@
test_name('--valid-whitespace');
test_name('--vALId');

test_name('--no-descriptors');
test_name('--no-syntax');
test_name('--no-inherits');
test_name('--no-initial-value');
test_name('--syntax-only');
test_name('--inherits-only');
test_name('--initial-value-only');
test_name('--no-initial-universal-value');

// CSSPropertyRule.syntax

test_syntax('--valid', '<color> | none');
test_syntax('--valid-reverse', '<length>');
test_syntax('--valid-universal', '*');
test_syntax('--valid-whitespace', ' <color>+ ');
test_syntax('--valid-whitespace', ' <color># ');
test_syntax('--vALId', '<color> | none');

test_syntax('--no-descriptors', '');
test_syntax('--no-syntax', '');
test_syntax('--no-inherits', '<color> | none');
test_syntax('--no-initial-value', '<color> | none');
test_syntax('--syntax-only', '<color> | none');
test_syntax('--inherits-only', '');
test_syntax('--initial-value-only', '');
test_syntax('--no-initial-universal-value', '*');

// CSSPropertyRule.inherits

Expand All @@ -170,13 +176,7 @@
test_inherits('--valid-whitespace', false);
test_inherits('--vALId', false);

test_inherits('--no-descriptors', false);
test_inherits('--no-syntax', false);
test_inherits('--no-inherits', false);
test_inherits('--no-initial-value', false);
test_inherits('--syntax-only', false);
test_inherits('--inherits-only', true);
test_inherits('--initial-value-only', false);
test_inherits('--no-initial-universal-value', false);

// CSSPropertyRule.initialValue

Expand All @@ -186,12 +186,6 @@
test_initial_value('--valid-whitespace', 'red, blue');
test_initial_value('--vALId', 'red');

test_initial_value('--no-descriptors', null);
test_initial_value('--no-syntax', 'red');
test_initial_value('--no-inherits', 'red');
test_initial_value('--no-initial-value', null);
test_initial_value('--syntax-only', null);
test_initial_value('--inherits-only', null);
test_initial_value('--initial-value-only', 'red');
test_initial_value('--no-initial-universal-value', null);

</script>
121 changes: 97 additions & 24 deletions css/css-properties-values-api/at-property.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,66 @@
// Test that for the given descriptor (e.g. 'syntax'), the specified value
// will yield the expected_value when observed using CSSOM. If the expected_value
// is omitted, it is the same as the specified value.
function test_descriptor(descriptor, specified_value, expected_value) {
let camel = to_camel_case(descriptor);
if (typeof(expected_value) === 'undefined')
expected_value = specified_value;
test_with_at_property({ [camel]: specified_value }, (name, rule) => {
assert_equals(get_cssom_descriptor_value(rule, descriptor), expected_value);
}, `Attribute '${descriptor}' returns expected value for [${specified_value}]`);
function test_descriptor(descriptor, specified_value, expected_value, other_descriptors) {
// Try and build a valid @property form the specified descriptor.
let at_property = { [to_camel_case(descriptor)]: specified_value };

// If extra values are specified in other_descriptors, just use them.
if (typeof(other_descriptors) !== 'unspecified') {
for (let name in other_descriptors) {
if (other_descriptors.hasOwnProperty(name)) {
if (name == descriptor) {
throw `Unexpected ${name} in other_descriptors`;
}
at_property[to_camel_case(name)] = other_descriptors[name];
}
}
}

if (!('syntax' in at_property)) {
// The syntax descriptor is required. Use the universal one as a fallback.
// https://drafts.css-houdini.org/css-properties-values-api-1/#the-syntax-descriptor
at_property.syntax = '"*"';
}
if (!('inherits' in at_property)) {
// The inherits descriptor is required. Make it true as a fallback.
// https://drafts.css-houdini.org/css-properties-values-api-1/#inherits-descriptor
at_property.inherits = true;
}
if (!at_property.syntax.match(/^"\s*\*\s*"$/) &&
!('initialValue' in at_property)) {
// The initial-value is required for non-universal syntax.
// Pick a computationally independent value that follows specified syntax.
// https://drafts.css-houdini.org/css-properties-values-api-1/#the-syntax-descriptor
at_property.initialValue = (() => {
let first_syntax_component = specified_value
.replace(/^"(.*)"$/, '$1') // unquote
.replace(/[\s\uFEFF\xA0]+/g, ' ') // collapse whitespaces
.match(/^[^|\#\+]*/)[0] // pick first component
.trim();
switch (first_syntax_component) {
case '<color>': return 'blue';
case '<length>': return '42px';
default:
if (first_syntax_component.startsWith('<')) {
throw `Unsupported data type name '${first_syntax_component}'`;
}
return first_syntax_component; // <custom-ident>
}
})();
}

if (expected_value === null) {
test_with_at_property(at_property, (name, rule) => {
assert_true(!rule);
}, `Attribute '${descriptor}' makes the @property rule invalid for [${specified_value}]`);
} else {
if (typeof(expected_value) === 'undefined')
expected_value = specified_value;
test_with_at_property(at_property, (name, rule) => {
assert_equals(get_cssom_descriptor_value(rule, descriptor), expected_value);
}, `Attribute '${descriptor}' returns expected value for [${specified_value}]`);
}
}

// syntax
Expand All @@ -52,38 +105,58 @@
test_descriptor('syntax', `"${syntax}"`, syntax);
}

test_descriptor('syntax', 'red', '');
test_descriptor('syntax', 'rgb(255, 0, 0)', '');
test_descriptor('syntax', '<color>', '');
test_descriptor('syntax', 'foo | bar', '');
// syntax: <color> value
test_descriptor('syntax', '"red"', "red"); // treated as <custom-ident>.
test_descriptor('syntax', '"rgb(255, 0, 0)"', null);

// syntax: missing quotes
test_descriptor('syntax', '<color>', null);
test_descriptor('syntax', 'foo | bar', null);

// syntax: invalid <custom-ident>
// https://drafts.csswg.org/css-values-4/#custom-idents
for (const syntax of
["default",
"initial",
"inherit",
"unset",
"revert",
"revert-layer",
]) {
test_descriptor('syntax', `"${syntax}"`, null);
test_descriptor('syntax', `"${uppercase_first(syntax)}"`, null);
}

// syntax: pipe between components
test_descriptor('syntax', 'foo bar', '');
test_descriptor('syntax', 'Foo <length>', '');
test_descriptor('syntax', 'foo, bar', '');
test_descriptor('syntax', '<length> <percentage>', '');
test_descriptor('syntax', '"foo bar"', null, {'initial-value': 'foo bar'});
test_descriptor('syntax', '"Foo <length>"', null, {'initial-value': 'Foo 42px'});
test_descriptor('syntax', '"foo, bar"', null, {'initial-value': 'foo, bar'});
test_descriptor('syntax', '"<length> <percentage>"', null, {'initial-value': '42px 100%'});

// syntax: leaading bar
test_descriptor('syntax', '|<length>', '');
// syntax: leading bar
test_descriptor('syntax', '"|<length>"', null, {'initial-value': '42px'});

// initial-value
test_descriptor('initial-value', '10px');
test_descriptor('initial-value', 'rgb(1, 2, 3)');
test_descriptor('initial-value', 'red');
test_descriptor('initial-value', 'foo');
test_descriptor('initial-value', 'if(){}');
test_descriptor('initial-value', 'var(--x)');

// initial-value: not computationally independent
test_descriptor('initial-value', '3em', null, {'syntax': '"<length>"'});
test_descriptor('initial-value', 'var(--x)', null);

// inherits
test_descriptor('inherits', 'true', true);
test_descriptor('inherits', 'false', false);

test_descriptor('inherits', 'none', false);
test_descriptor('inherits', '0', false);
test_descriptor('inherits', '1', false);
test_descriptor('inherits', '"true"', false);
test_descriptor('inherits', '"false"', false);
test_descriptor('inherits', 'calc(0)', false);
test_descriptor('inherits', 'none', null);
test_descriptor('inherits', '0', null);
test_descriptor('inherits', '1', null);
test_descriptor('inherits', '"true"', null);
test_descriptor('inherits', '"false"', null);
test_descriptor('inherits', 'calc(0)', null);

test_with_style_node('@property foo { }', (node) => {
assert_equals(node.sheet.rules.length, 0);
Expand Down