Merge pull request #7 from jonathanong/support-regex-for-exclude

Add support for regex in exclude rules #5

Author: valentin-radulescu-hs

index.js

@@ -13,11 +13,21 @@ module.exports = function (options) {
       }
 
       rule.selectors = rule.selectors.map(function (selector) {
-        if (options.exclude && ~options.exclude.indexOf(selector)) {
+        if (options.exclude && excludeSelector(selector, options.exclude)) {
           return selector
         }
         return prefix + selector
       })
     })
   }
 }
+
+function excludeSelector(selector, excludeArr) {
+  return excludeArr.some(function(excludeRule) {
+    if (excludeRule instanceof RegExp) {
+      return excludeRule.test(selector)
+    } else {
+      return selector === excludeRule
+    }
+  });
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "postcss-prefix-selector",
   "description": "Prefix all CSS rules with a selector",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "author": "Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)",
   "license": "MIT",
   "repository": "jonathanong/postcss-prefix-selector",

test/fixtures/exclude-selectors.css

@@ -0,0 +1,24 @@
+body {
+  margin: 0;
+  padding: 0;
+}
+
+.a, .b {
+  color: red;
+}
+
+.a *:not(.b) {
+  text-transform: uppercase;
+}
+
+.c {
+  font-size: 10px;
+}
+
+.class-a {
+  color: coral;
+}
+
+.class-b {
+  color: deepskyblue;
+}

test/fixtures/exclude-selectors.expected.css

@@ -0,0 +1,24 @@
+body {
+  margin: 0;
+  padding: 0;
+}
+
+.hello .a, .hello .b {
+  color: red;
+}
+
+.a *:not(.b) {
+  text-transform: uppercase;
+}
+
+.hello .c {
+  font-size: 10px;
+}
+
+.class-a {
+  color: coral;
+}
+
+.class-b {
+  color: deepskyblue;
+}

test/fixtures/group-selectors.css

@@ -0,0 +1,3 @@
+.a, .b {
+  color: coral;
+}

test/fixtures/group-selectors.expected.css

@@ -0,0 +1,3 @@
+.hello .a, .hello .b {
+  color: coral;
+}

test/fixtures/keyframes.css

@@ -0,0 +1,17 @@
+.a {
+  color: coral;
+  animation: glow 1s linear infinite alternate;
+}
+
+.b {
+  color: deepskyblue;
+}
+
+@keyframes glow {
+  from {
+    color: coral;
+  }
+  to {
+    color: red;
+  }
+}

test/fixtures/keyframes.expected.css

@@ -0,0 +1,17 @@
+.hello .a {
+  color: coral;
+  animation: glow 1s linear infinite alternate;
+}
+
+.hello .b {
+  color: deepskyblue;
+}
+
+@keyframes glow {
+  from {
+    color: coral;
+  }
+  to {
+    color: red;
+  }
+}

test/fixtures/single-selector.css

@@ -0,0 +1,7 @@
+.a {
+  color: coral;
+}
+
+.b {
+  color: deepskyblue;
+}

test/fixtures/single-selector.expected.css

@@ -0,0 +1,7 @@
+.hello .a {
+  color: coral;
+}
+
+.hello .b {
+  color: deepskyblue;
+}

test/test.js

@@ -1,45 +1,51 @@
 
 var postcss = require('postcss')
 var assert = require('assert')
+var fs = require('fs')
 
 var prefix = require('..')
 
 it('should prefix a selector', function () {
   var out = postcss().use(prefix({
     prefix: '.hello '
-  })).process('.a {}\n .b {}').css
+  })).process(getFixtureContents('single-selector.css')).css
 
-  assert(~out.indexOf('.hello .a'))
-  assert(~out.indexOf('.hello .b'))
+  var expected = getFixtureContents('single-selector.expected.css')
+
+  assert.equal(out, expected)
 })
 
 it('should prefix a group of selectors', function () {
   var out = postcss().use(prefix({
     prefix: '.hello '
-  })).process('.a, .b {}').css
+  })).process(getFixtureContents('group-selectors.css')).css
+
+  var expected = getFixtureContents('group-selectors.expected.css')
 
-  assert(~out.indexOf('.hello .a'))
-  assert(~out.indexOf('.hello .b'))
+  assert.equal(out, expected)
 })
 
 it('should avoid prefixing excluded selectors', function () {
   var out = postcss().use(prefix({
     prefix: '.hello ',
-    exclude: ['body', '.a *:not(.b)']
-  })).process('.a, .b {}\n body {}\n .a *:not(.b) {}\n .c {}').css
-
-  assert(~out.indexOf('.hello .a'))
-  assert(~out.indexOf('.hello .b'))
-  assert(~out.indexOf('.hello .c'))
-  assert(!~out.indexOf('.hello body'))
-  assert(!~out.indexOf('.hello .a *:not(.b)'))
+    exclude: ['body', '.a *:not(.b)', /class-/]
+  })).process(getFixtureContents('exclude-selectors.css')).css
+
+  var expected = getFixtureContents('exclude-selectors.expected.css')
+
+  assert.equal(out, expected)
 })
 
 it('should skip @keyframes selectors', function () {
   var out = postcss().use(prefix({
     prefix: '.hello '
-  })).process('@keyframes anim {from {} to {}}').css
+  })).process(getFixtureContents('keyframes.css')).css
+
+  var expected = getFixtureContents('keyframes.expected.css')
 
-  assert(!~out.indexOf('.hello from'))
-  assert(!~out.indexOf('.hello to'))
+  assert.equal(out, expected)
 })
+
+function getFixtureContents(name) {
+  return fs.readFileSync('test/fixtures/' + name, 'utf8').trim()
+}