Merge pull request #15 from gucong3000/support_stylelint

support for `stylelint`

Author: gucong3000

.npmignore

@@ -11,6 +11,7 @@
 .stylelintrc*
 .travis.yml
 .vscode
+.nyc_output
 appveyor.yml
 coverage
 gulpfile.js

lib/clearAtRule.js

@@ -26,10 +26,10 @@ function clearAtRule (atRule) {
 			return;
 		}
 
-		if (atRule.name === name && !atRuleFixedParams) {
-			unprefixed = atRule;
-		} else {
+		if (atRule.name[0] === '-' || atRuleFixedParams) {
 			prefixedAtRule.push(atRule);
+		} else {
+			unprefixed = atRule;
 		}
 	});
 

lib/clearDecl.js

@@ -1,31 +1,22 @@
 'use strict';
 const postcss = require('postcss');
 const unprefixDecl = require('./unprefix').decl;
-const rePrefix = require('./util').rePrefix;
+const util = require('./util');
 function walkDecl (decl) {
-	if (rePrefix.test(decl.prop) || /(^|,|\s)-\w+-.+/i.test(decl.value)) {
+	if (util.rePrefix.test(decl.prop) || /(^|,|\s)-\w+-.+/i.test(decl.value)) {
 		clearDecl(decl);
 	}
 }
 
 function clearDecl (decl) {
 	const rule = decl.parent;
 	const prop = postcss.vendor.unprefixed(decl.prop);
-	const prefixedDecls = [];
 	let unprefixed;
 	let lastUnprefixed;
 
-	rule.walkDecls(new RegExp('^-\\w+-' + prop + '$', 'i'), function (decl) {
-		if (decl.parent !== rule) {
-			return;
-		}
-		prefixedDecls.push(decl);
-	});
+	const prefixedDecls = util.getDecls(rule, new RegExp('^-\\w+-' + prop + '$', 'i'));
 
-	rule.walkDecls(unprefixDecl(decl).prop || prop, function (decl) {
-		if (decl.parent !== rule) {
-			return;
-		}
+	util.getDecls(rule, unprefixDecl(decl).prop || prop).forEach(function (decl) {
 		lastUnprefixed = unprefixDecl(decl);
 		if (lastUnprefixed.value) {
 			prefixedDecls.push(decl);

lib/clearRule.js

@@ -1,37 +1,22 @@
 'use strict';
-const PSEUDO_MAP = {
-	'input-placeholder': '::placeholder',
-	'placeholder': '::placeholder',
-	'full-screen': ':fullscreen',
-};
-
-function unprefixSelector (selector) {
-	let fixed;
-	selector = selector.replace(/(\:+)-\w+-(\w+(-\w+)*)/g, function (s, colon, pseudo) {
-		fixed = true;
-		pseudo = pseudo.toLowerCase();
-		return PSEUDO_MAP[pseudo] || (colon + pseudo);
-	});
-	if (fixed) {
-		return selector;
-	}
-}
+const unprefixSelector = require('./unprefixSelector');
 
 function clearRule (rule) {
-	const parent = rule.parent;
-	const selector = unprefixSelector(rule.selector);
-	if (!selector) {
+	let selector = unprefixSelector(rule.selector);
+	if (!selector.fixed) {
 		return;
 	}
 	const prefixedDecls = [];
 	let unprefixed;
+	selector = selector.toString();
+	const parent = rule.parent;
 	parent.walkRules(function (rule) {
 		if (rule.parent !== parent) {
 			return;
 		}
 		if (rule.selector === selector) {
 			unprefixed = rule;
-		} else if (unprefixSelector(rule.selector) === selector) {
+		} else if (unprefixSelector(rule.selector).toString() === selector) {
 			prefixedDecls.push(rule);
 		}
 	});

lib/unprefix.js

@@ -249,10 +249,10 @@ function unprefix (decl) {
 function unprefixDecl (decl) {
 	const result = unprefix (decl);
 	result.replace = function () {
-		if (result.prop) {
+		if (result.prop && decl.prop.toLowerCase() !== result.prop) {
 			decl.prop = result.prop;
 		}
-		if (result.value) {
+		if (result.value && decl.value.toLowerCase() !== result.value) {
 			decl.value = result.value;
 		}
 	};

lib/unprefixParam.js

@@ -45,9 +45,9 @@ function unprefixMedia (params) {
 		if (!param) {
 			return true;
 		}
-		const prop = /^(?:-\w+-)?(\w+-)?device-pixel-ratio$/i.exec(param[1]);
+		const prop = /^(?:-\w+-)?((?:\w+-)*?)device-pixel-ratio$/i.exec(param[1]);
 		if (prop) {
-			const key = (prop[1] ? prop[1].toLowerCase() : '') + 'resolution';
+			const key = prop[1].toLowerCase() + 'resolution';
 			if (!rule[key]) {
 				rule[key] = null;
 			}

lib/unprefixSelector.js

@@ -0,0 +1,33 @@
+'use strict';
+const util = require('./util');
+const removeExtraSelector = util.removeExtra(/(.+?)(?:\s*,\s*\1)+/gm);
+const PSEUDO_MAP = {
+	'input-placeholder': '::placeholder',
+	'placeholder': '::placeholder',
+	'full-screen': ':fullscreen',
+};
+
+const parser = require('postcss-selector-parser');
+function unprefixSelector (selector) {
+	let fixed;
+	selector = parser(function unprefixSelector (selectors) {
+		selectors.walk(function (selector) {
+			const value = /^(\:+)-\w+-(\w+(-\w+)*)$/.exec(selector.value);
+			if (!value) {
+				return;
+			}
+			fixed = true;
+			const pseudo = value[2].toLowerCase();
+			selector.value = PSEUDO_MAP[pseudo] || (value[1] + pseudo);
+		});
+	}).process(selector);
+
+	return {
+		fixed: fixed,
+		toString: function () {
+			return removeExtraSelector(selector.result);
+		},
+	};
+}
+
+module.exports = unprefixSelector;

lib/util.js

@@ -69,6 +69,10 @@ function getDecls (parent, prop) {
 	if (!parent) {
 		return result;
 	}
+
+	if (typeof prop === 'string') {
+		prop = new RegExp('^' + prop + '$', 'i');
+	}
 	parent.walkDecls(prop, function (decl) {
 		if (decl.parent !== parent) {
 			return;

package.json

@@ -22,6 +22,7 @@
     "nyc": "^10.3.2",
     "postcss-less": "^0.16.1",
     "postcss-reporter": "^3.0.0",
+    "postcss-selector-parser": "^2.2.3",
     "stylelint": "^7.10.1"
   },
   "homepage": "https://github.com/gucong3000/postcss-unprefix#readme",
@@ -62,5 +63,5 @@
     "pretest": "eslint .",
     "test": "mocha --no-timeouts"
   },
-  "version": "2.0.0"
+  "version": "2.0.1"
 }

test/fixtures/selectors.css

@@ -41,3 +41,11 @@ p::-moz-selection {
 	color: white;
 	background: black;
 }
+
+input:-moz-placeholder, input::placeholder {
+	color: pink;
+}
+
+a[data-foo=":-webkit-full-screen"] {
+
+}