Skip to content

fix: correct message for functions in use-baseline rule #297

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

Merged
merged 1 commit into from
Oct 21, 2025
Merged

fix: correct message for functions in use-baseline rule #297

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
17 changes: 16 additions & 1 deletion src/data/baseline-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ export const mediaConditions = new Map([
["horizontal-viewport-segments", "0:"],
["vertical-viewport-segments", "0:"],
]);
export const types = new Map([
export const functions = new Map([
["abs", "5:2025"],
["sign", "5:2025"],
["anchor", "0:"],
Expand Down Expand Up @@ -1597,6 +1597,21 @@ export const propertyValues = new Map([
["fixed", "0:"],
]),
],
[
"filter",
new Map([
["blur", "10:2016"],
["brightness", "10:2016"],
["contrast", "10:2016"],
["drop-shadow", "10:2016"],
["grayscale", "10:2016"],
["hue-rotate", "10:2016"],
["invert", "10:2016"],
["opacity", "10:2016"],
["saturate", "10:2016"],
["sepia", "10:2016"],
]),
],
["align-content", new Map([["normal", "10:2015"]])],
[
"flex-basis",
Expand Down
14 changes: 7 additions & 7 deletions src/rules/use-baseline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
propertyValues,
atRules,
mediaConditions,
types,
functions,
selectors,
} from "../data/baseline-data.js";
import { namedColors } from "../data/colors.js";
Expand All @@ -26,7 +26,7 @@ import { namedColors } from "../data/colors.js";
/**
* @import { CSSRuleDefinition } from "../types.js"
* @import { Identifier, FunctionNodePlain } from "@eslint/css-tree"
* @typedef {"notBaselineProperty" | "notBaselinePropertyValue" | "notBaselineAtRule" | "notBaselineType" | "notBaselineMediaCondition" | "notBaselineSelector"} UseBaselineMessageIds
* @typedef {"notBaselineProperty" | "notBaselinePropertyValue" | "notBaselineAtRule" | "notBaselineFunction" | "notBaselineMediaCondition" | "notBaselineSelector"} UseBaselineMessageIds
* @typedef {[{
* available?: "widely" | "newly" | number,
* allowAtRules?: string[],
Expand Down Expand Up @@ -475,8 +475,8 @@ export default {
"Value '{{value}}' of property '{{property}}' is not a {{availability}} available baseline feature.",
notBaselineAtRule:
"At-rule '@{{atRule}}' is not a {{availability}} available baseline feature.",
notBaselineType:
"Type '{{type}}' is not a {{availability}} available baseline feature.",
notBaselineFunction:
"Function '{{function}}' is not a {{availability}} available baseline feature.",
notBaselineMediaCondition:
"Media condition '{{condition}}' is not a {{availability}} available baseline feature.",
notBaselineSelector:
Expand Down Expand Up @@ -537,7 +537,7 @@ export default {
* @returns {void}
**/
function checkPropertyValueFunction(child) {
const featureStatus = types.get(child.name);
const featureStatus = functions.get(child.name);

// if we don't know of any possible property values, just skip it
if (featureStatus === undefined) {
Expand All @@ -547,9 +547,9 @@ export default {
if (!baselineAvailability.isSupported(featureStatus)) {
context.report({
loc: child.loc,
messageId: "notBaselineType",
messageId: "notBaselineFunction",
data: {
type: child.name,
function: child.name,
availability: String(baselineAvailability.availability),
},
});
Expand Down
12 changes: 6 additions & 6 deletions tests/rules/use-baseline.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,9 @@ ruleTester.run("use-baseline", rule, {
code: "@supports (accent-color: auto) { a { accent-color: abs(20% - 10px); } }",
errors: [
{
messageId: "notBaselineType",
messageId: "notBaselineFunction",
data: {
type: "abs",
function: "abs",
availability: "widely",
},
line: 1,
Expand Down Expand Up @@ -340,9 +340,9 @@ ruleTester.run("use-baseline", rule, {
code: "a { width: abs(20% - 100px); }",
errors: [
{
messageId: "notBaselineType",
messageId: "notBaselineFunction",
data: {
type: "abs",
function: "abs",
availability: "widely",
},
line: 1,
Expand All @@ -356,9 +356,9 @@ ruleTester.run("use-baseline", rule, {
code: "a { color: color-mix(in hsl, hsl(200 50 80), coral 80%); }",
errors: [
{
messageId: "notBaselineType",
messageId: "notBaselineFunction",
data: {
type: "color-mix",
function: "color-mix",
availability: "widely",
},
line: 1,
Expand Down
10 changes: 5 additions & 5 deletions tools/generate-baseline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function extractCSSFeatures(features) {
const propertyValues = {};
const atRules = {};
const mediaConditions = {};
const types = {};
const functions = {};
const selectors = {};

for (const [key, featureId] of Object.entries(features)) {
Expand Down Expand Up @@ -152,13 +152,13 @@ function extractCSSFeatures(features) {
continue;
}

// types
// functions
if ((match = cssTypePattern.exec(key)) !== null) {
const type = match.groups.type;
if (!(`${type}()` in mdnData.css.functions)) {
continue;
}
types[type] = mapFeatureStatus(status);
functions[type] = mapFeatureStatus(status);
continue;
}

Expand All @@ -174,7 +174,7 @@ function extractCSSFeatures(features) {
propertyValues,
atRules,
mediaConditions,
types,
functions,
selectors,
};
}
Expand Down Expand Up @@ -210,7 +210,7 @@ export const BASELINE_FALSE = ${BASELINE_FALSE};
export const properties = new Map(${JSON.stringify(Object.entries(cssFeatures.properties), null, "\t")});
export const atRules = new Map(${JSON.stringify(Object.entries(cssFeatures.atRules), null, "\t")});
export const mediaConditions = new Map(${JSON.stringify(Object.entries(cssFeatures.mediaConditions), null, "\t")});
export const types = new Map(${JSON.stringify(Object.entries(cssFeatures.types), null, "\t")});
export const functions = new Map(${JSON.stringify(Object.entries(cssFeatures.functions), null, "\t")});
Copy link
Member

@nzakas nzakas Oct 14, 2025

Choose a reason for hiding this comment

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

I don't think this is the correct approach here. Let's keep types as-is and just add functions.

Copy link
Contributor Author

@thecalamiity thecalamiity Oct 14, 2025

Choose a reason for hiding this comment

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

The "types" here are actually just functions. We're filtering the css.types.* entries through mdnData.css.functions to extract only the ones that represent actual CSS functions.

css/tools/generate-baseline.js

Lines 158 to 160 in c6c5b9d

if (!(`${type}()` in mdnData.css.functions)) {
continue;
}

Copy link
Member

@nzakas nzakas Oct 21, 2025

Choose a reason for hiding this comment

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

Ah gotcha, thanks for explaining. 👍

export const selectors = new Map(${JSON.stringify(Object.entries(cssFeatures.selectors), null, "\t")});
export const propertyValues = new Map([${Object.entries(
cssFeatures.propertyValues,
Expand Down