Address review comments

stylelint · Jan 9, 2023 · 221dbaa · 221dbaa
1 parent 2686145
commit 221dbaa
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 50 deletions.
diff --git a/lib/rules/function-no-unknown/__tests__/index.js b/lib/rules/function-no-unknown/__tests__/index.js
@@ -70,22 +70,6 @@ testRule({
 	],
 });
 
-testRule({
-	skip: true,
-	ruleName,
-	config: true,
-	customSyntax: 'postcss-styled-syntax',
-
-	accept: [
-		{
-			code: 'const buttonFontSize = css`font-size: ${({ size }) => (size === "small") ? "0.8em" : "1em"};`;',
-		},
-		{
-			code: 'const buttonFontSize = css`border-radius: ${`calc(${token.radiusBase} + 2px)`};`;',
-		},
-	],
-});
-
 testRule({
 	ruleName,
 	config: [true, { ignoreFunctions: ['theme', '/^foo-/', /^bar$/i] }],

diff --git a/lib/utils/__tests__/isStandardSyntaxFunction.test.js b/lib/utils/__tests__/isStandardSyntaxFunction.test.js
@@ -1,66 +1,51 @@
 'use strict';
 
 const isStandardSyntaxFunction = require('../isStandardSyntaxFunction');
-const postcss = require('postcss');
 const valueParser = require('postcss-value-parser');
 
 describe('isStandardSyntaxFunction', () => {
 	it('calc', () => {
-		expect(isStandardSyntaxFunction(func('a { prop: calc(a + b) }'))).toBe(true);
+		expect(isStandardSyntaxFunction(getFunction('calc(a + b)'))).toBe(true);
 	});
 
 	it('url', () => {
-		expect(isStandardSyntaxFunction(func("a { prop: url('x.css') }"))).toBe(true);
+		expect(isStandardSyntaxFunction(getFunction("url('x.css')"))).toBe(true);
 	});
 
 	it('scss list', () => {
-		expect(isStandardSyntaxFunction(func('a { $list: (list) }'))).toBe(false);
+		// as in $list: (list)
+		expect(isStandardSyntaxFunction(getFunction('(list)'))).toBe(false);
 	});
 
 	it('scss map', () => {
-		expect(isStandardSyntaxFunction(func('a { $map: (key: value) }'))).toBe(false);
+		// as in $map: (key: value)
+		expect(isStandardSyntaxFunction(getFunction('(key: value)'))).toBe(false);
 	});
 
-	it('scss function in custom prop', () => {
-		expect(isStandardSyntaxFunction(func('a { --primary-color: #{darken(#fff, 0.2)} }'))).toBe(
-			false,
-		);
+	it('scss function in scss interpolation', () => {
+		expect(isStandardSyntaxFunction(getFunction('#{darken(#fff, 0.2)}'))).toBe(false);
 	});
 
 	it('CSS-in-JS interpolation', () => {
-		const functions = [];
-
-		valueParser('${({ size }) => (size === "small") ? "0.8em" : "1em"}').walk((valueNode) => {
-			if (valueNode.type === 'function') {
-				functions.push(valueNode);
-			}
-		});
-
-		expect(isStandardSyntaxFunction(functions[0])).toBe(false);
+		expect(
+			isStandardSyntaxFunction(
+				getFunction('${({ size }) => (size === "small") ? "0.8em" : "1em"}'),
+			),
+		).toBe(false);
 	});
 
 	it('CSS-in-JS syntax', () => {
-		const functions = [];
-
-		valueParser('`calc(${token.radiusBase} + 2px)`').walk((valueNode) => {
-			if (valueNode.type === 'function') {
-				functions.push(valueNode);
-			}
-		});
-
-		expect(isStandardSyntaxFunction(functions[0])).toBe(false);
+		expect(isStandardSyntaxFunction(getFunction('`calc(${token.radiusBase} + 2px)`'))).toBe(false);
 	});
 });
 
-function func(css) {
+function getFunction(declValue) {
 	const functions = [];
 
-	postcss.parse(css).walkDecls((decl) => {
-		valueParser(decl.value).walk((valueNode) => {
-			if (valueNode.type === 'function') {
-				functions.push(valueNode);
-			}
-		});
+	valueParser(declValue).walk((valueNode) => {
+		if (valueNode.type === 'function') {
+			functions.push(valueNode);
+		}
 	});
 
 	return functions[0];