Add prettier-eslint and fix formatting

Author: RyanZim

index.js

@@ -1,21 +1,13 @@
 module.exports = function(parentMedia, childMedia) {
-  if (!parentMedia.length && childMedia.length) {
-    return childMedia
-  }
-  if (parentMedia.length && !childMedia.length) {
-    return parentMedia
-  }
-  if (!parentMedia.length && !childMedia.length) {
-    return []
-  }
+  if (!parentMedia.length && childMedia.length) return childMedia
+  if (parentMedia.length && !childMedia.length) return parentMedia
+  if (!parentMedia.length && !childMedia.length) return []
 
   var media = []
 
   parentMedia.forEach(function(parentItem) {
     childMedia.forEach(function(childItem) {
-      if (parentItem !== childItem) {
-        media.push(parentItem + " and " + childItem)
-      }
+      if (parentItem !== childItem) media.push(parentItem + " and " + childItem)
     })
   })
 

lib/join-media.js

@@ -7,9 +7,7 @@ var stringify = valueParser.stringify
 function split(params, start) {
   var list = []
   var last = params.reduce(function(item, node, index) {
-    if (index < start) {
-      return ""
-    }
+    if (index < start) return ""
     if (node.type === "div" && node.value === ",") {
       list.push(item)
       return ""
@@ -27,12 +25,8 @@ module.exports = function(result, styles) {
   styles.each(function(node) {
     var stmt
     if (node.type === "atrule") {
-      if (node.name === "import") {
-        stmt = parseImport(result, node)
-      }
-      else if (node.name === "media") {
-        stmt = parseMedia(result, node)
-      }
+      if (node.name === "import") stmt = parseImport(result, node)
+      else if (node.name === "media") stmt = parseMedia(result, node)
     }
 
     if (stmt) {
@@ -45,10 +39,7 @@ module.exports = function(result, styles) {
         nodes = []
       }
       statements.push(stmt)
-    }
-    else {
-      nodes.push(node)
-    }
+    } else nodes.push(node)
   })
 
   if (nodes.length) {
@@ -74,27 +65,23 @@ function parseMedia(result, atRule) {
 function parseImport(result, atRule) {
   var prev = getPrev(atRule)
   if (prev) {
-    do  {
+    do {
       if (
         prev.type !== "atrule" ||
-        prev.name !== "import" &&
-        prev.name !== "charset"
+        (prev.name !== "import" && prev.name !== "charset")
       ) {
         return result.warn(
           "@import must precede all other statements (besides @charset)",
           { node: atRule }
         )
-      }
-      else {
-        prev = getPrev(prev)
-      }
+      } else prev = getPrev(prev)
     } while (prev)
   }
 
   if (atRule.nodes) {
     return result.warn(
       "It looks like you didn't end your @import statement correctly. " +
-      "Child nodes are attached to it.",
+        "Child nodes are attached to it.",
       { node: atRule }
     )
   }
@@ -106,6 +93,7 @@ function parseImport(result, atRule) {
     media: [],
   }
 
+  // prettier-ignore
   if (
     !params.length ||
     (
@@ -119,26 +107,18 @@ function parseImport(result, atRule) {
       !params[0].nodes[0].value
     )
   ) {
-    return result.warn(
-      "Unable to find uri in '" + atRule.toString() + "'",
-      { node: atRule }
-    )
+    return result.warn("Unable to find uri in '" + atRule.toString() + "'", {
+      node: atRule,
+    })
   }
 
-  if (params[0].type === "string") {
-    stmt.uri = params[0].value
-  }
-  else {
-    stmt.uri = params[0].nodes[0].value
-  }
+  if (params[0].type === "string") stmt.uri = params[0].value
+  else stmt.uri = params[0].nodes[0].value
   stmt.fullUri = stringify(params[0])
 
   if (params.length > 2) {
     if (params[1].type !== "space") {
-      return result.warn(
-        "Invalid import media statement",
-        { node: atRule }
-      )
+      return result.warn("Invalid import media statement", { node: atRule })
     }
     stmt.media = split(params, 2)
   }

lib/parse-statements.js

@@ -7,12 +7,7 @@ var postcss = require("postcss")
 // placeholder tooling
 var sugarss
 
-module.exports = function processContent(
-  result,
-  content,
-  filename,
-  options
-) {
+module.exports = function processContent(result, content, filename, options) {
   var plugins = options.plugins
   var ext = path.extname(filename)
 
@@ -23,12 +18,11 @@ module.exports = function processContent(
     if (!sugarss) {
       try {
         sugarss = require("sugarss")
-      }
-      catch (e) {
+      } catch (e) {
         // Ignore
       }
     }
-    if (sugarss) return runPostcss(content, filename, plugins, [ sugarss ])
+    if (sugarss) return runPostcss(content, filename, plugins, [sugarss])
   }
 
   // Syntax support:
@@ -44,23 +38,18 @@ module.exports = function processContent(
   return runPostcss(content, filename, plugins, parserList)
 }
 
-function runPostcss(
-  content,
-  filename,
-  plugins,
-  parsers,
-  index
-) {
+function runPostcss(content, filename, plugins, parsers, index) {
   if (!index) index = 0
-  return postcss(plugins).process(content, {
-    from: filename,
-    parser: parsers[index],
-  })
-  .catch(function(err) {
-    // If there's an error, try the next parser
-    index++
-    // If there are no parsers left, throw it
-    if (index === parsers.length) throw err
-    return runPostcss(content, filename, plugins, parsers, index)
-  })
+  return postcss(plugins)
+    .process(content, {
+      from: filename,
+      parser: parsers[index],
+    })
+    .catch(function(err) {
+      // If there's an error, try the next parser
+      index++
+      // If there are no parsers left, throw it
+      if (index === parsers.length) throw err
+      return runPostcss(content, filename, plugins, parsers, index)
+    })
 }

lib/process-content.js

@@ -1,10 +1,7 @@
 // external tooling
 var resolve = require("resolve")
 
-var moduleDirectories = [
-  "web_modules",
-  "node_modules",
-]
+var moduleDirectories = ["web_modules", "node_modules"]
 
 function resolveModule(id, opts) {
   return new Promise(function(res, rej) {
@@ -24,32 +21,28 @@ module.exports = function(id, base, options) {
     basedir: base,
     moduleDirectory: moduleDirectories.concat(options.addModulesDirectories),
     paths: paths,
-    extensions: [ ".css" ],
+    extensions: [".css"],
     packageFilter: function processPackage(pkg) {
-      if (pkg.style) {
-        pkg.main = pkg.style
-      }
-      else if (!pkg.main || !/\.css$/.test(pkg.main)) {
-        pkg.main = "index.css"
-      }
+      if (pkg.style) pkg.main = pkg.style
+      else if (!pkg.main || !/\.css$/.test(pkg.main)) pkg.main = "index.css"
       return pkg
     },
   }
 
   return resolveModule("./" + id, resolveOpts)
-  .catch(function() {
-    return resolveModule(id, resolveOpts)
-  })
-  .catch(function() {
-    if (paths.indexOf(base) === -1) {
-      paths.unshift(base)
-    }
+    .catch(function() {
+      return resolveModule(id, resolveOpts)
+    })
+    .catch(function() {
+      if (paths.indexOf(base) === -1) paths.unshift(base)
 
-    throw new Error([
-      "Failed to find '" + id + "'",
-      "in [ ",
-      "    " + paths.join(",\n        "),
-      "]",
-    ].join("\n    "))
-  })
+      throw new Error(
+        [
+          "Failed to find '" + id + "'",
+          "in [ ",
+          "    " + paths.join(",\n        "),
+          "]",
+        ].join("\n    ")
+      )
+    })
 }

lib/resolve-id.js

@@ -31,10 +31,11 @@
     "eslint-plugin-import": "^2.2.0",
     "npmpub": "^3.0.1",
     "postcss-scss": "^1.0.0",
+    "prettier-eslint-cli": "^3.4.3",
     "sugarss": "^1.0.0"
   },
   "scripts": {
-    "lint": "eslint --fix .",
+    "lint": "prettier-eslint \"**/*.js\" --write --prettier.semi false --prettier.trailing-comma es5",
     "pretest": "npm run lint",
     "test": "ava",
     "release": "npmpub"

package.json

@@ -13,9 +13,7 @@ import atImport from ".."
 
 test.serial("should accept file", t => {
   return compareFixtures(t, "custom-resolve-file", {
-    resolve: () => {
-      return path.resolve("test/fixtures/imports/custom-resolve-1.css")
-    },
+    resolve: () => path.resolve("test/fixtures/imports/custom-resolve-1.css"),
   })
 })
 
@@ -53,22 +51,23 @@ test.serial("should accept promised array of files", t => {
   })
 })
 
-test(
-  "should apply default resolver when custom doesn't return an absolute path",
-  function(t) {
-    return postcss()
-    .use(atImport({
-      resolve: path => {
-        return path.replace("foo", "imports/bar")
-      },
-      load: p => {
-        t.is(p, path.resolve("test/fixtures/imports", "bar.css"))
-        return "/* comment */"
-      },
-    }))
-    .process(`@import "foo.css";`, { from: "test/fixtures/custom-resolve-file" })
+test("should apply default resolver when custom doesn't return an absolute path", function(
+  t
+) {
+  return postcss()
+    .use(
+      atImport({
+        resolve: path => path.replace("foo", "imports/bar"),
+        load: p => {
+          t.is(p, path.resolve("test/fixtures/imports", "bar.css"))
+          return "/* comment */"
+        },
+      })
+    )
+    .process(`@import "foo.css";`, {
+      from: "test/fixtures/custom-resolve-file",
+    })
     .then(result => {
       t.is(result.css, "/* comment */")
     })
-  }
-)
+})

test/custom-resolve.js

@@ -8,25 +8,19 @@ import compareFixtures from "./helpers/compare-fixtures"
 import compareFixturesExt from "./helpers/compare-fixtures-ext"
 
 test("should process custom syntax", t => {
-  return compareFixtures(t, "scss-syntax", null, {
-    syntax: scss,
-  })
+  return compareFixtures(t, "scss-syntax", null, { syntax: scss })
 })
 
 test("should process custom syntax by parser", t => {
-  return compareFixtures(t, "scss-parser", null, {
-    parser: scss,
-  })
+  return compareFixtures(t, "scss-parser", null, { parser: scss })
 })
 
 test(".css importing .sss should work", t => {
   return compareFixtures(t, "import-sss")
 })
 
 test(".sss importing .sss should work", t => {
-  return compareFixturesExt(t, "sugar", ".sss", null, {
-    parser: sugarss,
-  })
+  return compareFixturesExt(t, "sugar", ".sss", null, { parser: sugarss })
 })
 
 test(".sss importing .css should work", t => {

test/custom-syntax-parser.js

@@ -23,14 +23,12 @@ module.exports = function(t, name, ext, opts, postcssOpts, warnings) {
       // handy thing: checkout actual in the *.actual.css file
       fs.writeFile("test/fixtures/" + name + ".actual.css", actual)
       t.is(actual, expected)
-      if (!warnings) {
-        warnings = []
-      }
+      if (!warnings) warnings = []
       result.warnings().forEach(function(warning, index) {
         t.is(
           warning.text,
           warnings[index],
-          "unexpected warning: \"" + warning.text + "\""
+          'unexpected warning: "' + warning.text + '"'
         )
       })
     })

test/helpers/compare-fixtures-ext.js

@@ -22,14 +22,12 @@ module.exports = function(t, name, opts, postcssOpts, warnings) {
       // handy thing: checkout actual in the *.actual.css file
       fs.writeFile("test/fixtures/" + name + ".actual.css", actual)
       t.is(actual, expected)
-      if (!warnings) {
-        warnings = []
-      }
+      if (!warnings) warnings = []
       result.warnings().forEach(function(warning, index) {
         t.is(
           warning.text,
           warnings[index],
-          "unexpected warning: \"" + warning.text + "\""
+          'unexpected warning: "' + warning.text + '"'
         )
       })
     })