Fixed: plugin is correctly exposed for normal commonjs environments (!babel) (1.2.1)

Close #5

Author: MoOx

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.2.1 - 2015-07-14
+
+- Fixed: plugin is correctly exposed for normal commonjs environments (!babel)
+([#5](https://github.com/postcss/postcss-selector-matches/issues/5))
+
 # 1.2.0 - 2015-07-14
 
 - Fixed: indentation adjustment doesn't contain useless new lines

package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-selector-matches",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "PostCSS plugin to transform :matches() W3C CSS pseudo class to more compatible CSS selectors",
   "keywords": [
     "postcss",

src/index.js

@@ -1,90 +1,18 @@
 import postcss from "postcss"
-import list from "postcss/lib/list"
-
-import balancedMatch from "balanced-match"
-
-const pseudoClass = ":matches"
-
-function explodeSelector(selector, options) {
-  if (selector && selector.indexOf(pseudoClass) > -1) {
-    let newSelectors = []
-    const preWhitespaceMatches = selector.match(/^\s+/)
-    const preWhitespace = preWhitespaceMatches
-      ? preWhitespaceMatches[0]
-      : ""
-    const selectorPart = list.comma(selector)
-    selectorPart.forEach(part => {
-      const position = part.indexOf(pseudoClass)
-      const pre = part.slice(0, position)
-      const body = part.slice(position)
-      const matches = balancedMatch("(", ")", body)
-
-      const bodySelectors = matches && matches.body ?
-        list
-          .comma(matches.body)
-          .reduce((acc, s) => [
-            ...acc,
-            ...explodeSelector(s, options),
-          ], [])
-        : [body]
-
-      const postSelectors = matches && matches.post
-        ? explodeSelector(matches.post, options)
-        : []
-
-      let newParts
-      if (postSelectors.length === 0) {
-        newParts = bodySelectors.map((s) => preWhitespace + pre + s)
-      }
-      else {
-        newParts = []
-        postSelectors.forEach(postS => {
-          bodySelectors.forEach(s => {
-            newParts.push(pre + s + postS)
-          })
-        })
-      }
-      newSelectors = [
-        ...newSelectors,
-        ...newParts,
-      ]
-    })
-
-    return newSelectors
-  }
-  return [selector]
-}
-
-function replaceRuleSelector(rule, options) {
-  const indentation = rule.before
-    ? rule.before.split("\n").pop()
-    : ""
-  return (
-    explodeSelector(rule.selector, options)
-      .join("," + (options.lineBreak ? "\n" + indentation : " "))
-  )
-
-}
+import replaceRuleSelector from "./replaceRuleSelector"
 
 function explodeSelectors(options = {}) {
   return (css) => {
     css.eachRule(rule => {
-      if (rule.selector && rule.selector.indexOf(pseudoClass) > -1) {
+      if (rule.selector && rule.selector.indexOf(":matches") > -1) {
         rule.selector = replaceRuleSelector(rule, options)
       }
     })
   }
 
 }
 
-const plugin = postcss.plugin(
+export default postcss.plugin(
   "postcss-selector-matches",
   explodeSelectors
 )
-
-// expose for postcss-custom-selectors
-export {replaceRuleSelector}
-// old school fallback
-plugin.replaceRuleSelector = replaceRuleSelector
-
-export default plugin

src/replaceRuleSelector.js

@@ -0,0 +1,65 @@
+import list from "postcss/lib/list"
+
+import balancedMatch from "balanced-match"
+
+const pseudoClass = ":matches"
+
+function explodeSelector(selector, options) {
+  if (selector && selector.indexOf(pseudoClass) > -1) {
+    let newSelectors = []
+    const preWhitespaceMatches = selector.match(/^\s+/)
+    const preWhitespace = preWhitespaceMatches
+      ? preWhitespaceMatches[0]
+      : ""
+    const selectorPart = list.comma(selector)
+    selectorPart.forEach(part => {
+      const position = part.indexOf(pseudoClass)
+      const pre = part.slice(0, position)
+      const body = part.slice(position)
+      const matches = balancedMatch("(", ")", body)
+
+      const bodySelectors = matches && matches.body ?
+        list
+          .comma(matches.body)
+          .reduce((acc, s) => [
+            ...acc,
+            ...explodeSelector(s, options),
+          ], [])
+        : [body]
+
+      const postSelectors = matches && matches.post
+        ? explodeSelector(matches.post, options)
+        : []
+
+      let newParts
+      if (postSelectors.length === 0) {
+        newParts = bodySelectors.map((s) => preWhitespace + pre + s)
+      }
+      else {
+        newParts = []
+        postSelectors.forEach(postS => {
+          bodySelectors.forEach(s => {
+            newParts.push(pre + s + postS)
+          })
+        })
+      }
+      newSelectors = [
+        ...newSelectors,
+        ...newParts,
+      ]
+    })
+
+    return newSelectors
+  }
+  return [selector]
+}
+
+export default function replaceRuleSelector(rule, options) {
+  const indentation = rule.before
+    ? rule.before.split("\n").pop()
+    : ""
+  return (
+    explodeSelector(rule.selector, options)
+      .join("," + (options.lineBreak ? "\n" + indentation : " "))
+  )
+}

test/index.js

@@ -1,16 +1,16 @@
 import tape from "tape"
 
 import postcss from "postcss"
-import plugin, {replaceRuleSelector} from "../src"
+import plugin from "../src"
+import replaceRuleSelector from "../src/replaceRuleSelector"
 
 function transform(css, options = {}) {
   return postcss(plugin(options)).process(css).css
 }
 
 tape("postcss-selector-matches", t => {
   t.ok(
-    typeof replaceRuleSelector === "function" &&
-      typeof plugin.replaceRuleSelector === "function",
+    typeof replaceRuleSelector === "function",
     "expose 'replaceRuleSelector' function (for postcss-custom-selectors)"
   )