From 6a00c4a53ed3224b16e56bc89c4d16e4f38f05a2 Mon Sep 17 00:00:00 2001
From: xbinaryx <xbinaryx68@gmail.com>
Date: Wed, 8 Oct 2025 10:11:41 +0300
Subject: [PATCH 1/2] fix: handle missing declaration state in
 `no-invalid-properties`

---
 src/rules/no-invalid-properties.js        | 12 ++++-
 tests/rules/no-invalid-properties.test.js | 55 +++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/rules/no-invalid-properties.js b/src/rules/no-invalid-properties.js
index 6360df0..3239638 100644
--- a/src/rules/no-invalid-properties.js
+++ b/src/rules/no-invalid-properties.js
@@ -343,11 +343,18 @@ export default {
 			},
 
 			Function() {
-				declStack.at(-1).functionPartsStack.push([]);
+				const state = declStack.at(-1);
+				if (!state) {
+					return;
+				}
+				state.functionPartsStack.push([]);
 			},
 
 			"Function > *:not(Function)"(node) {
 				const state = declStack.at(-1);
+				if (!state) {
+					return;
+				}
 				const parts = state.functionPartsStack.at(-1);
 				const text = sourceCode.getText(node).trim();
 				parts.push(text);
@@ -356,6 +363,9 @@ export default {
 
 			"Function:exit"(node) {
 				const state = declStack.at(-1);
+				if (!state) {
+					return;
+				}
 				if (state.skipValidation) {
 					return;
 				}
diff --git a/tests/rules/no-invalid-properties.test.js b/tests/rules/no-invalid-properties.test.js
index a8a3b00..5850db3 100644
--- a/tests/rules/no-invalid-properties.test.js
+++ b/tests/rules/no-invalid-properties.test.js
@@ -164,6 +164,12 @@ ruleTester.run("no-invalid-properties", rule, {
 			code: ":root { --a: var(--c); --b: var(--a); }\na { color: var(--b); }",
 			options: [{ allowUnknownVariables: true }],
 		},
+		"@supports (color: color(display-p3 1 1 1)) { a { --my-color: oklch(73.5% 0.1192 254.8); } }",
+		"@supports not (color: color(display-p3 1 1 1)) { a { --my-color: rgb(31 120 50); } }",
+		"@supports selector(:is(a)) { a { color: red; } }",
+		"@media (color-gamut: srgb) { a { --my-color: #f4ae8a; } }",
+		"@supports (color: color(display-p3 1 1 1)) { @media (color-gamut: p3) { a { --c: oklch(50% 0.1 120); } } }",
+		"@import 'x.css' layer(theme);",
 
 		/*
 		 * CSSTree doesn't currently support custom functions properly, so leaving
@@ -427,6 +433,21 @@ ruleTester.run("no-invalid-properties", rule, {
 				},
 			],
 		},
+		{
+			code: "@supports (color: color(display-p3 1 1 1)) { a { color: var(--my-color); } }",
+			errors: [
+				{
+					messageId: "unknownVar",
+					data: {
+						var: "--my-color",
+					},
+					line: 1,
+					column: 61,
+					endLine: 1,
+					endColumn: 71,
+				},
+			],
+		},
 		{
 			code: "a { color: var(--MY-COLOR, var(--FALLBACK-COLOR)); }",
 			errors: [
@@ -566,6 +587,23 @@ ruleTester.run("no-invalid-properties", rule, {
 				},
 			],
 		},
+		{
+			code: ":root { --color: foo }\n@supports (color: color(display-p3 1 1 1)) { a { color: var(--color); } }",
+			errors: [
+				{
+					messageId: "invalidPropertyValue",
+					data: {
+						property: "color",
+						value: "foo",
+						expected: "<color>",
+					},
+					line: 2,
+					column: 57,
+					endLine: 2,
+					endColumn: 69,
+				},
+			],
+		},
 		{
 			code: "a { colorr: var(--my-color); }",
 			options: [{ allowUnknownVariables: true }],
@@ -1103,6 +1141,23 @@ ruleTester.run("no-invalid-properties", rule, {
 				},
 			],
 		},
+		{
+			code: "@supports (color: color(display-p3 1 1 1)) { a { color: foo } }",
+			errors: [
+				{
+					messageId: "invalidPropertyValue",
+					data: {
+						property: "color",
+						value: "foo",
+						expected: "<color>",
+					},
+					line: 1,
+					column: 57,
+					endLine: 1,
+					endColumn: 60,
+				},
+			],
+		},
 		{
 			code: "a { padding: calc(var(--padding-top, 1px) + 1px) 2px calc(var(--padding-bottom) + 1px); }",
 			errors: [

From d308bd138dd1fcb6ffdd0f358a6d0308250a5212 Mon Sep 17 00:00:00 2001
From: xbinaryx <xbinaryx68@gmail.com>
Date: Thu, 9 Oct 2025 14:48:47 +0300
Subject: [PATCH 2/2] combine state checks into a single condition

---
 src/rules/no-invalid-properties.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/rules/no-invalid-properties.js b/src/rules/no-invalid-properties.js
index 3239638..fcc97c6 100644
--- a/src/rules/no-invalid-properties.js
+++ b/src/rules/no-invalid-properties.js
@@ -363,10 +363,7 @@ export default {
 
 			"Function:exit"(node) {
 				const state = declStack.at(-1);
-				if (!state) {
-					return;
-				}
-				if (state.skipValidation) {
+				if (!state || state.skipValidation) {
 					return;
 				}