Fixed: Nested/mixed selectors now works correctly

This commit include a refactoring based on postcss-selector-matches and
add the ability to limit the transformation to :matches() usage.
Also in this commit:

- add eslint
- rewrite using babel (es6/7)
- fixtures files removed in favor of es6 template string
- should also fix some weird “undefined” warnings

Close #19

.babelrc

@@ -0,0 +1,3 @@
+{
+  "stage": 0
+}

.eslintignore

@@ -0,0 +1 @@
+.gitignore

.eslintrc

@@ -0,0 +1,37 @@
+---
+# babel support more syntax stuff than eslint for now
+parser: babel-eslint
+
+ecmaFeatures:
+  modules: true
+
+env:
+  es6: true
+  browser: true
+  node: true
+
+rules:
+  indent: [2, 2] # 2 spaces indentation
+  max-len: [2, 80, 4]
+  quotes: [2, "double"]
+  semi: [2, "never"]
+  no-multiple-empty-lines: [2, {"max": 1}]
+
+  brace-style: [2, "stroustrup"]
+  comma-dangle: [2, "always-multiline"]
+  comma-style: [2, "last"]
+  computed-property-spacing: [2, "never"]
+  dot-location: [2, "property"]
+
+  one-var: [2, "never"]
+  #no-var: [2]
+  prefer-const: [2]
+  no-bitwise: [2]
+
+  object-shorthand: [2, "methods"]
+  space-after-keywords: [2, "always"]
+  space-before-blocks: [2, "always"]
+  space-before-function-paren: [2, "never"]
+  space-in-brackets: [2, "never"]
+  space-in-parens: [2, "never"]
+  spaced-line-comment: [2, "always"]

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
-node_modules
-test/fixtures/*/actual.css
 *.sublime-workspace
 
+node_modules
+test/fixtures/*/actual.css
+dist

CHANGELOG.md

@@ -1,4 +1,11 @@
-# 2.2.0 - 2015-06-30 (By @MoOx)
+# 2.3.0 - 2015-07-14
+
+* Fixed: Nested/mixed selectors now works correctly
+([#19](https://github.com/postcss/postcss-custom-selectors/issues/19))
+* Added: `transformMatches` option to limit transformation to :matches()
+replacements.
+
+# 2.2.0 - 2015-06-30
 
 * Fixed: No more useless warnings for undefined non custom selectors
 ([#22](https://github.com/postcss/postcss-custom-selectors/issues/22))

README.md

@@ -1,9 +1,9 @@
-# PostCSS Custom Selectors 
+# PostCSS Custom Selectors
 
-[![Build Status](https://travis-ci.org/postcss/postcss-custom-selectors.svg?branch=master)](https://travis-ci.org/postcss/postcss-custom-selectors) 
-[![NPM Downloads](https://img.shields.io/npm/dm/postcss-custom-selectors.svg?style=flat)](https://www.npmjs.com/package/postcss-custom-selectors) 
-[![NPM Version](http://img.shields.io/npm/v/postcss-custom-selectors.svg?style=flat)](https://www.npmjs.com/package/postcss-custom-selectors) 
-[![License](https://img.shields.io/npm/l/postcss-custom-selectors.svg?style=flat)](http://opensource.org/licenses/MIT) 
+[![Build Status](https://travis-ci.org/postcss/postcss-custom-selectors.svg?branch=master)](https://travis-ci.org/postcss/postcss-custom-selectors)
+[![NPM Downloads](https://img.shields.io/npm/dm/postcss-custom-selectors.svg?style=flat)](https://www.npmjs.com/package/postcss-custom-selectors)
+[![NPM Version](http://img.shields.io/npm/v/postcss-custom-selectors.svg?style=flat)](https://www.npmjs.com/package/postcss-custom-selectors)
+[![License](https://img.shields.io/npm/l/postcss-custom-selectors.svg?style=flat)](http://opensource.org/licenses/MIT)
 
 > [PostCSS](https://github.com/postcss/postcss) plugin to transform  [W3C CSS Extensions(Custom Selectors)](http://dev.w3.org/csswg/css-extensions/#custom-selectors)  to more compatible CSS.
 
@@ -13,12 +13,12 @@
 
 ## Installation
 
-    $ npm install postcss-custom-selectors
+```console
+$ npm install postcss-custom-selectors
+```
 
 ## Quick Start
 
-Example 1:
-
 ```js
 // dependencies
 var fs = require('fs')
@@ -33,7 +33,7 @@ var output = postcss()
   .use(selector())
   .process(css)
   .css
-  
+
 console.log('\n====>Output CSS:\n', output)  
 ```
 
@@ -50,7 +50,7 @@ input.css：
 ```css
 @custom-selector :--heading h1, h2, h3, h4, h5, h6;
 
-article :--heading + p { 
+article :--heading + p {
   margin-top: 0;
 }
 ```
@@ -63,25 +63,22 @@ article h2 + p,
 article h3 + p,
 article h4 + p,
 article h5 + p,
-article h6 + p { 
+article h6 + p {
   margin-top: 0;
 }
 ```
 
 ## CSS syntax
 
-    @custom-selector = @custom-selector :<extension-name> <selector>;
-
+```css
+@custom-selector = @custom-selector :<extension-name> <selector>;
+```
 
 ## How to use
 
-The custom selector is a pseudo-class, so we must use the `:--` to defined it.
-
-For example to simulate [:any-link](http://dev.w3.org/csswg/selectors/#the-any-link-pseudo) selector：
-
-Example 2:
+The custom selector is a pseudo-class, so you must use `:--` to define it.
 
-input.css:
+For example to simulate [:any-link](http://dev.w3.org/csswg/selectors/#the-any-link-pseudo) selector:
 
 ```css
 @custom-selector :--any-link :link, :visited;
@@ -100,35 +97,100 @@ a:visited {
 }
 ```
 
-### Multiple selectors
+## Options
 
-`@custom-selector` it **doesn’t support** call multiple custom selector in the same selector, e.g.
+### `lineBreak`
 
-Example 3:
+_(default: `true`)_
+
+Set whether  multiple selector wrap.The default is turning on to be a newline.
+
+Close the line breaks.
+
+```js
+var options = {
+  lineBreak: false
+}
+
+var output = postcss(selector(options))
+  .process(css)
+  .css
+```
+
+With the first example, the output will be:
 
 ```css
-@custom-selector :--heading h1, h2, h3, h4, h5, h6;
-@custom-selector :--any-link :link, :visited;
+article h1 + p, article h2 + p, article h3 + p, article h4 + p, article h5 + p, article h6 + p {
+  margin-top: 0;
+}
+```
+
+### `extensions`
+
+_(default: `{}`)_
+
+This option allows you to customize an object to set the `<extension-name>` (selector alias) and `<selector>`, these definitions will cover the same alias of `@custom-selector` in CSS.
+
+```js
+var options = {
+  extensions: {
+    ':--any' : 'section, article, aside, nav'
+  }
+}
+
+var output = postcss(selector(options))
+  .process(css)
+  .css;
+```
+
+input.css
+
+```css
+@custom-selector :--any .foo, .bar; /* No effect */
+:--any h1 {
+  margin-top: 16px;
+}
+```
+
+output:
+
+```css
+/* No effect */
+section h1,
+article h1,
+aside h1,
+nav h1 {
+  margin-top: 16px;
+}
+```
+
+### `transformMatches`
+
+_(default: `true`)_
 
-.demo :--heading, a:--any-link { 
-  font-size: 32px;
+Allows you to limit transformation to `:matches()` usage
+If set to false:
+
+input
+
+```css
+@custom-selector :--foo .bar, .baz;
+.foo:--foo {
+  margin-top: 16px;
 }
 ```
 
-This will throw an error CSS code.
+output
 
 ```css
-.demo h1,
-.demo h2,
-.demo h3,
-.demo h4,
-.demo h5,
-.demo h6,:link,
-:visited  { 
-  font-size: 32px;
+.foo:matches(.bar, .baz) {
+  margin-top: 16px;
 }
 ```
 
+
+## Usage
+
 ### Node Watch
 
 Dependence [chokidar](https://github.com/paulmillr/chokidar) module.
@@ -205,72 +267,6 @@ gulp.task('default', function () {
 gulp.watch('src/*.css', ['default']);
 ```
 
-
-
-### Options
-
-#### 1. **`lineBreak`**(default: `true`)
-
-Set whether  multiple selector wrap.The default is turning on to be a newline.
-
-Close the line breaks.
-
-```js
-var options = {
-  lineBreak: false
-}
-
-var output = postcss(selector(options))
-  .process(css)
-  .css
-```
-
-In the 'Example 1' `input.css` will output:
-
-```css
-article h1 + p, article h2 + p, article h3 + p, article h4 + p, article h5 + p, article h6 + p {
-  margin-top: 0;
-}
-```
-
-#### 2. **`extensions`** (default: `{}`)
-
-This option allows you to customize an object to set the `<extension-name>` (selector alias) and `<selector>`, these definitions will cover the same alias of `@custom-selector` in CSS.
-
-```js
-var options = {
-  extensions: {
-    ':--any' : 'section, article, aside, nav'
-  }
-}
-
-var output = postcss(selector(options))
-  .process(css)
-  .css;
-```
-
-input.css
-
-```css
-@custom-selector :--any .foo, .bar; /* No effect */
-:--any h1 {
-  margin-top: 16px;
-}
-```
-
-output:
-
-```css
-/* No effect */
-section h1,
-article h1,
-aside h1,
-nav h1 {
-  margin-top: 16px;
-}
-```
-
-
 ## Contributing
 
 * Install the relevant dependent module.