wrap calls to selector parser in try/catch (#698)

romainmenke · web-flow · commit 0db993207b99 · 2022-11-10T18:40:58.000+01:00
* wrap calls to selector parser in try/catch

* Update plugins/css-blank-pseudo/src/index.ts
diff --git a/plugins/css-blank-pseudo/.tape.mjs b/plugins/css-blank-pseudo/.tape.mjs
@@ -30,6 +30,10 @@ postcssTape(plugin)({
 			disablePolyfillReadyClass: true
 		}
 	},
+	'invalid-selector': {
+		message: 'warns on invalid selectors',
+		warnings: 1
+	},
 	'examples/example': {
 		message: 'minimal example',
 	},
diff --git a/plugins/css-blank-pseudo/CHANGELOG.md b/plugins/css-blank-pseudo/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Unreleased (major)
 
 - Updated: Support for Node v14+ (major).
+- Fix: Do not throw when a selector is invalid, show a warning instead.
 
 ### 4.1.1 (August, 23, 2022)
 
diff --git a/plugins/css-blank-pseudo/src/index.ts b/plugins/css-blank-pseudo/src/index.ts
@@ -48,9 +48,9 @@ const creator: PluginCreator<pluginOptions> = (opts?: pluginOptions) => {
 
 				try {
 					selectorAST = parser().astSync(selector);
-				} catch (_) {
-					rule.warn(result, `Failed to parse selector : ${selector}`);
-					return selector;
+				} catch (err) {
+					rule.warn(result, `Failed to parse selector : "${selector}" with message: "${err.message}"`);
+					return [selector];
 				}
 
 				if (typeof selectorAST === 'undefined') {
diff --git a/plugins/css-blank-pseudo/test/invalid-selector.css b/plugins/css-blank-pseudo/test/invalid-selector.css
@@ -0,0 +1 @@
+foo : bar:blank {}
diff --git a/plugins/css-blank-pseudo/test/invalid-selector.expect.css b/plugins/css-blank-pseudo/test/invalid-selector.expect.css
@@ -0,0 +1 @@
+foo : bar:blank {}
diff --git a/plugins/css-has-pseudo/CHANGELOG.md b/plugins/css-has-pseudo/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Unreleased (major)
 
 - Updated: Support for Node v14+ (major).
+- Fix: Do not throw when a selector is invalid, show a warning instead.
 
 ### 4.0.1 (August 23, 2022)
 
diff --git a/plugins/css-has-pseudo/src/index.ts b/plugins/css-has-pseudo/src/index.ts
@@ -30,8 +30,8 @@ const creator: PluginCreator<{ preserve?: boolean, specificityMatchingName?: str
 				let selectorAST;
 				try {
 					selectorAST = parser().astSync(selector);
-				} catch (_) {
-					rule.warn(result, `Failed to parse selector : ${selector}`);
+				} catch (err) {
+					rule.warn(result, `Failed to parse selector : "${selector}" with message: "${err.message}"`);
 					return selector;
 				}
 
diff --git a/plugins/postcss-attribute-case-insensitive/.tape.mjs b/plugins/postcss-attribute-case-insensitive/.tape.mjs
@@ -5,6 +5,10 @@ postcssTape(plugin)({
 	basic: {
 		message: "supports basic usage",
 	},
+	'invalid-selector': {
+		message: 'warns on invalid selectors',
+		warnings: 1
+	},
 	'examples/example': {
 		message: 'minimal example',
 	},
diff --git a/plugins/postcss-attribute-case-insensitive/CHANGELOG.md b/plugins/postcss-attribute-case-insensitive/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Unreleased (major)
 
 - Updated: Support for Node v14+ (major).
+- Fix: Do not throw when a selector is invalid, show a warning instead.
 
 ### 5.0.2 (July 8, 2022)
 
diff --git a/plugins/postcss-attribute-case-insensitive/src/index.ts b/plugins/postcss-attribute-case-insensitive/src/index.ts
@@ -1,5 +1,6 @@
 import type { PluginCreator } from 'postcss';
-import selectorParser, { Container } from 'postcss-selector-parser';
+import selectorParser from 'postcss-selector-parser';
+import type { Container } from 'postcss-selector-parser';
 
 function nodeIsInsensitiveAttribute(node) {
 	return node.type === 'attribute' && node.insensitive;
@@ -88,9 +89,18 @@ function transform(selectors) {
 const creator: PluginCreator<never> = () => {
 	return {
 		postcssPlugin: 'postcss-attribute-case-insensitive',
-		Rule(rule) {
+		Rule(rule, { result }) {
 			if (rule.selector.includes('i]')) {
-				const modifiedSelector = selectorParser(transform).processSync(rule.selector);
+
+				let modifiedSelector = rule.selector;
+
+				try {
+					modifiedSelector = selectorParser(transform).processSync(rule.selector);
+				} catch (err) {
+					rule.warn(result, `Failed to parse selector : "${rule.selector}" with message: "${err.message}"`);
+					return;
+				}
+
 				if (modifiedSelector === rule.selector) {
 					return;
 				}
diff --git a/plugins/postcss-attribute-case-insensitive/test/invalid-selector.css b/plugins/postcss-attribute-case-insensitive/test/invalid-selector.css
@@ -0,0 +1,3 @@
+[foo="a b" i] : bar {
+	order: 1;
+}
diff --git a/plugins/postcss-attribute-case-insensitive/test/invalid-selector.expect.css b/plugins/postcss-attribute-case-insensitive/test/invalid-selector.expect.css
@@ -0,0 +1,3 @@
+[foo="a b" i] : bar {
+	order: 1;
+}
diff --git a/plugins/postcss-cascade-layers/CHANGELOG.md b/plugins/postcss-cascade-layers/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Run `postcss-cascade-layers` early compared to other PostCSS plugins (breaking)
 - Updated: Support for Node v14+ (major).
+- Fix: Do not throw when a selector is invalid, show a warning instead.
 
 ### 1.1.1 (September 17, 2022)
 
diff --git a/plugins/postcss-cascade-layers/src/index.ts b/plugins/postcss-cascade-layers/src/index.ts
@@ -69,8 +69,12 @@ const creator: PluginCreator<pluginOptions> = (opts?: pluginOptions) => {
 			let highestASpecificity = 0;
 			root.walkRules((rule) => {
 				rule.selectors.forEach((selector) => {
-					const specificity = selectorSpecificity(selectorParser().astSync(selector));
-					highestASpecificity = Math.max(highestASpecificity, specificity.a + 1);
+					try {
+						const specificity = selectorSpecificity(selectorParser().astSync(selector));
+						highestASpecificity = Math.max(highestASpecificity, specificity.a + 1);
+					} catch (err) {
+						rule.warn(result, `Failed to parse selector : "${selector}" with message: "${err.message}"`);
+					}
 				});
 			});
 
@@ -93,7 +97,13 @@ const creator: PluginCreator<pluginOptions> = (opts?: pluginOptions) => {
 				}
 
 				rule.selectors = rule.selectors.map((selector) => {
-					return adjustSelectorSpecificity(selector, model.layerCount * highestASpecificity);
+					try {
+						return adjustSelectorSpecificity(selector, model.layerCount * highestASpecificity);
+					} catch (err) {
+						rule.warn(result, `Failed to parse selector : "${selector}" with message: "${err.message}"`);
+					}
+
+					return selector;
 				});
 			});
 
diff --git a/plugins/postcss-custom-selectors/.tape.mjs b/plugins/postcss-custom-selectors/.tape.mjs
@@ -14,6 +14,10 @@ postcssTape(plugin)({
 	'conditionals': {
 		message: 'handles conditional rules'
 	},
+	'invalid-selector': {
+		message: 'warns on invalid selectors',
+		warnings: 2
+	},
 	'examples/example': {
 		message: 'minimal example',
 	},
diff --git a/plugins/postcss-custom-selectors/CHANGELOG.md b/plugins/postcss-custom-selectors/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Removed: `exportTo` feature (breaking).
 - Fixed: follow the specification and use `:is()` in transformed selectors (breaking).
 - Added: Support for `@scope` and `@container` as parent rules of `@custom-selector`.
+- Fixed: Do not throw when a selector is invalid, show a warning instead.
 
 ```diff
 @custom-selector :--heading h1, h2, h3;
diff --git a/plugins/postcss-custom-selectors/src/custom-selectors-from-root.ts b/plugins/postcss-custom-selectors/src/custom-selectors-from-root.ts
@@ -1,10 +1,10 @@
-import type { ChildNode, Container, Document, Root as PostCSSRoot } from 'postcss';
+import type { ChildNode, Container, Document, Result, Root as PostCSSRoot } from 'postcss';
 import type { Root as SelectorRoot } from 'postcss-selector-parser';
 import parser from 'postcss-selector-parser';
 import { isProcessableCustomSelectorRule } from './is-processable-custom-selector-rule';
 
 // return custom selectors from the css root, conditionally removing them
-export default function getCustomSelectors(root: PostCSSRoot, opts: { preserve?: boolean }): Map<string, SelectorRoot> {
+export default function getCustomSelectors(root: PostCSSRoot, result: Result, opts: { preserve?: boolean }): Map<string, SelectorRoot> {
 	// initialize custom selectors
 	const customSelectors = new Map<string, SelectorRoot>();
 
@@ -13,24 +13,28 @@ export default function getCustomSelectors(root: PostCSSRoot, opts: { preserve?:
 			return;
 		}
 
-		const source = atRule.params.trim();
+		try {
+			const source = atRule.params.trim();
 
-		const selectorAST = parser().astSync(source);
-		const nameNode = selectorAST?.nodes?.[0]?.nodes?.[0];
-		if (!nameNode || nameNode.type !== 'pseudo' || !nameNode.value.startsWith(':--')) {
-			return;
-		}
+			const selectorAST = parser().astSync(source);
+			const nameNode = selectorAST?.nodes?.[0]?.nodes?.[0];
+			if (!nameNode || nameNode.type !== 'pseudo' || !nameNode.value.startsWith(':--')) {
+				return;
+			}
 
-		const name = nameNode.toString();
+			const name = nameNode.toString();
 
-		// re-parsing is important to obtain the correct AST shape
-		customSelectors.set(name, parser().astSync(source.slice(name.length).trim()));
+			// re-parsing is important to obtain the correct AST shape
+			customSelectors.set(name, parser().astSync(source.slice(name.length).trim()));
 
-		if (!opts.preserve) {
-			const parent = atRule.parent;
-			atRule.remove();
+			if (!opts.preserve) {
+				const parent = atRule.parent;
+				atRule.remove();
 
-			removeEmptyAncestorBlocks(parent);
+				removeEmptyAncestorBlocks(parent);
+			}
+		} catch (err) {
+			atRule.warn(result, `Failed to parse custom selector : "${atRule.params}" with message: "${err.message}"`);
 		}
 	});
 
diff --git a/plugins/postcss-custom-selectors/src/index.ts b/plugins/postcss-custom-selectors/src/index.ts
@@ -25,15 +25,15 @@ const creator: PluginCreator<PluginOptions> = (opts?: PluginOptions) => {
 			let customSelectors = new Map();
 
 			return {
-				Once: (root) => {
-					customSelectors = getCustomSelectors(root, { preserve: preserve });
+				Once: (root, { result }) => {
+					customSelectors = getCustomSelectors(root, result, { preserve: preserve });
 				},
-				Rule: (rule) => {
+				Rule: (rule, { result }) => {
 					if (!rule.selector.includes(':--')) {
 						return;
 					}
 
-					transformRule(rule, customSelectors, { preserve: preserve });
+					transformRule(rule, result, customSelectors, { preserve: preserve });
 				},
 			};
 		},
diff --git a/plugins/postcss-custom-selectors/src/transform-rule.ts b/plugins/postcss-custom-selectors/src/transform-rule.ts
@@ -1,28 +1,36 @@
+import { Result, Rule } from 'postcss';
 import type { Root, Selector } from 'postcss-selector-parser';
 import parser from 'postcss-selector-parser';
 
 // transform custom pseudo selectors with custom selectors
-export default (rule, customSelectors: Map<string, Root>, opts: { preserve?: boolean }) => {
-	const selector = parser(selectors => {
-		selectors.walkPseudos((pseudo) => {
-			if (!customSelectors.has(pseudo.value)) {
-				return;
-			}
-
-			const isWrapper = parser.pseudo({
-				value: ':is',
-				nodes: [],
-			});
+export default (rule: Rule, result: Result, customSelectors: Map<string, Root>, opts: { preserve?: boolean }) => {
+	let selector = rule.selector;
 
-			const base = customSelectors.get(pseudo.value);
-			base.each((node) => {
-				isWrapper.append(node.clone({}) as Selector);
-			});
+	try {
+		selector = parser(selectors => {
+			selectors.walkPseudos((pseudo) => {
+				if (!customSelectors.has(pseudo.value)) {
+					return;
+				}
+
+				const isWrapper = parser.pseudo({
+					value: ':is',
+					nodes: [],
+				});
+
+				const base = customSelectors.get(pseudo.value);
+				base.each((node) => {
+					isWrapper.append(node.clone({}) as Selector);
+				});
 
-			pseudo.replaceWith(isWrapper);
+				pseudo.replaceWith(isWrapper);
 
-		});
-	}).processSync(rule.selector);
+			});
+		}).processSync(rule.selector);
+	} catch (err) {
+		rule.warn(result, `Failed to parse selector : "${selector}" with message: "${err.message}"`);
+		return;
+	}
 
 	if (selector === rule.selector) {
 		return;
diff --git a/plugins/postcss-custom-selectors/test/invalid-selector.css b/plugins/postcss-custom-selectors/test/invalid-selector.css
@@ -0,0 +1,11 @@
+@custom-selector :--foo foo : bar;
+
+:--foo {
+	order: 1;
+}
+
+@custom-selector :--bar bar;
+
+:--bar : foo {
+	order: 2;
+}
diff --git a/plugins/postcss-custom-selectors/test/invalid-selector.expect.css b/plugins/postcss-custom-selectors/test/invalid-selector.expect.css
@@ -0,0 +1,9 @@
+@custom-selector :--foo foo : bar;
+
+:--foo {
+	order: 1;
+}
+
+:--bar : foo {
+	order: 2;
+}
diff --git a/plugins/postcss-extract/CHANGELOG.md b/plugins/postcss-extract/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changes to PostCSS Extract
 
+### Unreleased (major)
+
+- Updated: Support for Node v14+ (major).
+- Fix: Do not throw when a selector is invalid, show a warning instead.
+
 ### 1.0.1 (October 4, 2022)
 
 - Fixing rule detection
diff --git a/plugins/postcss-extract/src/select-nodes.ts b/plugins/postcss-extract/src/select-nodes.ts
@@ -1,5 +1,5 @@
 import type { Node, Container } from 'postcss';
-import selectorParser from 'postcss-selector-parser';
+import type selectorParser from 'postcss-selector-parser';
 import type { NodeList } from './node-list';
 import { notPseudo } from './pseudos/not';
 import { adjacentSiblingCombinator } from './selector-engine/combinators/adjacent-sibling';
diff --git a/plugins/postcss-focus-visible/CHANGELOG.md b/plugins/postcss-focus-visible/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Unreleased (major)
 
 - Updated: Support for Node v14+ (major).
+- Fix: Do not throw when a selector is invalid, show a warning instead.
 
 ### 7.1.0 (July 30, 2022)
 
diff --git a/plugins/postcss-focus-visible/src/index.ts b/plugins/postcss-focus-visible/src/index.ts
@@ -36,8 +36,8 @@ const creator: PluginCreator<pluginOptions> = (opts?: pluginOptions) => {
 
 				try {
 					selectorAST = parser().astSync(selector);
-				} catch (_) {
-					rule.warn(result, `Failed to parse selector : ${selector}`);
+				} catch (err) {
+					rule.warn(result, `Failed to parse selector : "${selector}" with message: "${err.message}"`);
 					return selector;
 				}
 
diff --git a/plugins/postcss-focus-within/CHANGELOG.md b/plugins/postcss-focus-within/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Unreleased (major)
 
 - Updated: Support for Node v14+ (major).
+- Fix: Do not throw when a selector is invalid, show a warning instead.
 
 ### 6.1.1 (August 23, 2022)
 
diff --git a/plugins/postcss-focus-within/src/index.ts b/plugins/postcss-focus-within/src/index.ts
@@ -48,8 +48,8 @@ const creator: PluginCreator<pluginOptions> = (opts?: pluginOptions) => {
 
 				try {
 					selectorAST = parser().astSync(selector);
-				} catch (_) {
-					rule.warn(result, `Failed to parse selector : ${selector}`);
+				} catch (err) {
+					rule.warn(result, `Failed to parse selector : "${selector}" with message: "${err.message}"`);
 					return selector;
 				}
 
diff --git a/plugins/postcss-nesting/.tape.mjs b/plugins/postcss-nesting/.tape.mjs
@@ -82,6 +82,10 @@ postcssTape(plugin)({
 			noIsPseudoSelector: true,
 		},
 	},
+	'invalid-selector': {
+		message: 'warns on invalid selectors',
+		warnings: 4
+	},
 	'media': {
 		message: 'supports nested @media',
 	},
diff --git a/plugins/postcss-nesting/CHANGELOG.md b/plugins/postcss-nesting/CHANGELOG.md
@@ -1,8 +1,11 @@
 # Changes to PostCSS Nesting
 
+⚠️ We will most likely not finish this release and switch over to the plugin being worked on in the experimental track.
+
 ### Unreleased (major)
 
 - Updated: Support for Node v14+ (major).
+- Fix: Do not throw when a selector is invalid, show a warning instead.
 
 ### 10.2.0 (September 14, 2022)
 
diff --git a/plugins/postcss-nesting/src/index.ts b/plugins/postcss-nesting/src/index.ts
diff --git a/plugins/postcss-nesting/src/lib/atrule-within-rule.ts b/plugins/postcss-nesting/src/lib/atrule-within-rule.ts
diff --git a/plugins/postcss-nesting/src/lib/nest-rule-within-rule.ts b/plugins/postcss-nesting/src/lib/nest-rule-within-rule.ts
diff --git a/plugins/postcss-nesting/src/lib/rule-within-rule.ts b/plugins/postcss-nesting/src/lib/rule-within-rule.ts
diff --git a/plugins/postcss-nesting/src/lib/walk-func.ts b/plugins/postcss-nesting/src/lib/walk-func.ts
diff --git a/plugins/postcss-nesting/src/lib/walk.ts b/plugins/postcss-nesting/src/lib/walk.ts
diff --git a/plugins/postcss-nesting/test/invalid-selector.css b/plugins/postcss-nesting/test/invalid-selector.css
diff --git a/plugins/postcss-nesting/test/invalid-selector.expect.css b/plugins/postcss-nesting/test/invalid-selector.expect.css
diff --git a/plugins/postcss-pseudo-class-any-link/CHANGELOG.md b/plugins/postcss-pseudo-class-any-link/CHANGELOG.md
diff --git a/plugins/postcss-pseudo-class-any-link/src/replace-any-link.js b/plugins/postcss-pseudo-class-any-link/src/replace-any-link.js
diff --git a/plugins/postcss-scope-pseudo-class/CHANGELOG.md b/plugins/postcss-scope-pseudo-class/CHANGELOG.md
diff --git a/plugins/postcss-scope-pseudo-class/src/index.ts b/plugins/postcss-scope-pseudo-class/src/index.ts
diff --git a/plugins/postcss-selector-not/CHANGELOG.md b/plugins/postcss-selector-not/CHANGELOG.md
diff --git a/plugins/postcss-selector-not/src/index.ts b/plugins/postcss-selector-not/src/index.ts
