postcss-extract : fix

Author: romainmenke

plugins/postcss-extract/.tape.mjs

@@ -7,23 +7,34 @@ postcssTape(plugin)({
 		message: "Can extract custom props from root",
 		options: {
 			queries: {
-				'custom-props-in-root': 'rule[selector*=":ROOT" i] decl[variable]'
+				'custom-props-in-root': 'rule[selector*=":ROOT" i] decl[variable]',
+				'not-variable': 'decl:not([variable])'
 			},
 			results: function(results) {
 				assert.deepStrictEqual(
-					results,
-					{
-						'custom-props-in-root': [
-							{ type: 'decl', prop: '--foo', value: '1', variable: true },
-							{
-								type: 'decl',
-								prop: '--bar',
-								value: 'calc(1px * 100)',
-								variable: true
-							},
-							{ type: 'decl', prop: '--baz', value: '"a value"', variable: true }
-						]
-					}
+					results['custom-props-in-root'],
+					[
+						{ type: 'decl', prop: '--foo', value: '1', variable: true },
+						{
+							type: 'decl',
+							prop: '--bar',
+							value: 'calc(1px * 100)',
+							variable: true
+						},
+						{ type: 'decl', prop: '--baz', value: '"a value"', variable: true }
+					]
+				)
+
+				assert.deepStrictEqual(
+					results['not-variable'],
+					[
+						{
+							type: 'decl',
+							prop: 'not-a-variable',
+							value: '1',
+							variable: false
+						}
+					]
 				)
 			}
 		}

plugins/postcss-extract/src/select-nodes.ts

@@ -100,6 +100,7 @@ function buildQuery(selector: selectorParser.Selector) {
 						break;
 					default:
 						currentCondition = {
+							next: currentCondition,
 							run: (): NodeList => {
 								return [];
 							},
@@ -120,6 +121,7 @@ function buildQuery(selector: selectorParser.Selector) {
 				switch (selectorPart.value) {
 					case ':not': {
 						currentCondition = {
+							next: currentCondition,
 							run: (list: NodeList): NodeList => {
 								const notQueries = selectorPart.nodes.map((notSelectorPart) => {
 									return buildQuery(notSelectorPart);
@@ -138,6 +140,7 @@ function buildQuery(selector: selectorParser.Selector) {
 					}
 					default:
 						currentCondition = {
+							next: currentCondition,
 							run: (): NodeList => {
 								return [];
 							},
@@ -186,6 +189,7 @@ function buildQuery(selector: selectorParser.Selector) {
 			}
 			default:
 				currentCondition = {
+					next: currentCondition,
 					run: (): NodeList => {
 						return [];
 					},