Merge pull request #221 from gucong3000/sync_stylelint_api

Supports all stylelint options.

Author: Masaaki Morishita

.eslintrc.json

@@ -8,7 +8,7 @@
     "no-console": 0,
     "space-before-function-paren": [2, "always"],
     "semi": [2, "never"],
-    "eqeqeq": [2, "always"],
+    "eqeqeq": [2, "allow-null"],
     "block-spacing": [2, "always"]
   }
 }

CHANGELOG.md

@@ -1,3 +1,33 @@
+## Head
+
+- Fixed [Same issue in stylelint #218](https://github.com/stylelint/stylelint/issues/1881) use `stylelint` to load configuration file.
+- Fixed: `--config` option to CLI. same as [stylelint CLI](https://github.com/stylelint/stylelint/blob/master/src/cli.js#L44)
+- Added: `--config-basedir` option to CLI. same as [stylelint CLI](https://github.com/stylelint/stylelint/blob/master/src/cli.js#L57)
+- Fixed: `config` option to Node.js API. same as [stylelint API](http://stylelint.io/user-guide/node-api/#config)
+- Added: `configBasedir` option to Node.js API. same as [stylelint API](http://stylelint.io/user-guide/node-api/#configbasedir)
+- Added: `configFile` option to Node.js API. same as [stylelint API](http://stylelint.io/user-guide/node-api/#configfile)
+- Added: When `stylelint` configuration file not found, it will extends from `editorconfig`: 
+  - [indentation](http://stylelint.io/user-guide/rules/indentation/)
+  - [no-missing-end-of-source-newline](http://stylelint.io/user-guide/rules/no-missing-end-of-source-newline/)
+  - [no-eol-whitespace](http://stylelint.io/user-guide/rules/no-eol-whitespace/)
+- Fixed: rules that value is an array, can work properly:
+  - [at-rule-semicolon-newline-after](http://stylelint.io/user-guide/rules/at-rule-semicolon-newline-after/)
+  - [block-closing-brace-newline-after](http://stylelint.io/user-guide/rules/block-closing-brace-newline-after/)
+  - [block-opening-brace-newline-before](http://stylelint.io/user-guide/rules/block-opening-brace-newline-before/)
+  - [block-opening-brace-space-before](http://stylelint.io/user-guide/rules/block-opening-brace-space-before/)
+  - [declaration-colon-space-after](http://stylelint.io/user-guide/rules/declaration-colon-space-after/)
+  - [declaration-colon-space-before](http://stylelint.io/user-guide/rules/declaration-colon-space-before/)
+  - [length-zero-no-unit](http://stylelint.io/user-guide/rules/length-zero-no-unit/)
+  - [number-leading-zero](http://stylelint.io/user-guide/rules/number-leading-zero/)
+  - [number-no-trailing-zeros](http://stylelint.io/user-guide/rules/number-no-trailing-zeros/)
+  - [selector-combinator-space-after](http://stylelint.io/user-guide/rules/selector-combinator-space-after/)
+  - [selector-combinator-space-before](http://stylelint.io/user-guide/rules/selector-combinator-space-before/)
+  - [selector-list-comma-newline-after](http://stylelint.io/user-guide/rules/selector-list-comma-newline-after/)
+  - [selector-list-comma-newline-before](http://stylelint.io/user-guide/rules/selector-list-comma-newline-before/)
+  - [selector-list-comma-space-after](http://stylelint.io/user-guide/rules/selector-list-comma-space-after/)
+  - [selector-list-comma-space-before](http://stylelint.io/user-guide/rules/selector-list-comma-space-before/)
+  - [shorthand-property-no-redundant-values](http://stylelint.io/user-guide/rules/shorthand-property-no-redundant-values/)
+
 ## v4.3.1
 
 - Fixed [#208](https://github.com/morishitter/stylefmt/issues/208)

README.md

@@ -281,11 +281,12 @@ Usage: stylefmt [options] input-file [output-file]
 
 Options:
 
-  -d, --diff        output diff against original file
-  -R, --recursive   format files recursively
-  -c, --config      path to a specific configuration file (JSON, YAML, or CommonJS)
-  -V, --versions    output the version number
-  -h, --help        output usage information
+  -d, --diff             output diff against original file
+  -R, --recursive        format files recursively
+  -c, --config           path to a specific configuration file (JSON, YAML, or CommonJS)
+  -b, --config-basedir   path to the directory that relative paths defining "extends"
+  -V, --versions         output the version number
+  -h, --help             output usage information
 ```
 
 stylefmt can also read a file from stdin if there are no input-fle as argument in CLI.

bin/cli.js

@@ -19,6 +19,7 @@ var argv = minimist(process.argv.slice(2), {
     d: 'diff',
     l: 'list',
     R: 'recursive',
+    b: 'config-basedir',
     c: 'config'
   }
 })
@@ -37,32 +38,42 @@ if (argv.h) {
   console.log('')
   console.log('Options:')
   console.log('')
-  console.log('  -d, --diff        output diff against original file')
-  console.log('  -l, --list        format list of space seperated files in place')
-  console.log('  -R, --recursive   format files recursively')
-  console.log('  -c, --config      path to a specific configuration file (JSON, YAML, or CommonJS)')
-  console.log('  -v, --version     output the version number')
-  console.log('  -h, --help        output usage information')
+  console.log('  -d, --diff             output diff against original file')
+  console.log('  -l, --list             format list of space seperated files in place')
+  console.log('  -R, --recursive        format files recursively')
+  console.log('  -c, --config           path to a specific configuration file (JSON, YAML, or CommonJS)')
+  console.log('  -b, --config-basedir   path to the directory that relative paths defining "extends"')
+  console.log('  -v, --version          output the version number')
+  console.log('  -h, --help             output usage information')
   process.exit()
 }
 
 
-var options ={}
+var options = {}
 if (argv.c) {
-  options.config = argv.c
+  options.configFile = argv.c
+}
+
+if (argv.b) {
+  options.configBasedir = (path.isAbsolute(argv.b))
+    ? argv.b
+    : path.resolve(process.cwd(), argv.b)
 }
 
 if (argv.l) {
   var files = [argv.l].concat(argv._)
   processMultipleFiles(files)
 } else if (argv._[0]) {
-  var input = argv._[0]
+  var input = path.resolve(process.cwd(), argv._[0])
   var output = argv._[1] || argv._[0]
 
   var css = fs.readFileSync(input, 'utf-8')
 
   postcss([stylefmt(options)])
-    .process(css, { syntax: scss })
+    .process(css, {
+      from: input,
+      syntax: scss
+    })
     .then(function (result) {
       var formatted = result.css
       if (argv.d) {
@@ -105,7 +116,10 @@ function processMultipleFiles (files) {
     var css = fs.readFileSync(fullPath, 'utf-8')
 
     postcss([stylefmt(options)])
-      .process(css, { syntax: scss })
+      .process(css, {
+        from: fullPath,
+        syntax: scss
+      })
       .then(function (result) {
         var formatted = result.css
         if (css !== formatted) {

index.js

@@ -9,10 +9,9 @@ const formatSassVariables = require('./lib/formatSassVariables')
 
 
 const stylefmt = postcss.plugin('stylefmt', function (options) {
-  options = options || {}
-
+  var paramer = params(options)
   return function (root) {
-    return params(options).then(function (params) {
+    return paramer(root).then(function (params) {
       formatComments(root, params)
       formatAtRules(root, params)
       formatOrder(root, params)

lib/formatAtRules.js

@@ -207,7 +207,7 @@ function blockOpeningBraceNewlineBefore (atrule, opts) {
   if (isIgnoreRule(opts.stylelint, atrule)) {
     return atrule.raws.between
   }
-  switch (opts.stylelint['block-opening-brace-newline-before']) {
+  switch (getProperty(opts.stylelint, 'block-opening-brace-newline-before')) {
     case 'always':
       return '\n' + opts.indentation
     case 'always-single-line':

lib/formatDecls.js

@@ -1,5 +1,6 @@
 var formatValues = require('./formatValues')
 var hasDecls = require('./hasDecls')
+var getProperty =  require('./util').getProperty
 
 function formatDecls (rule, indent, indentWidth, stylelint) {
 
@@ -31,11 +32,11 @@ function formatDecls (rule, indent, indentWidth, stylelint) {
       }
       decl.raws.before = declBefore
 
-      if (stylelint && stylelint['declaration-colon-space-before']) {
+      if (getProperty(stylelint, 'declaration-colon-space-before')) {
         decl.raws.between = declarationColonSpaceBefore(stylelint, decl.raws.between)
       }
 
-      if (stylelint && stylelint['declaration-colon-space-after']) {
+      if (getProperty(stylelint, 'declaration-colon-space-after')) {
         decl.raws.between = declarationColonSpaceAfter(stylelint, decl.raws.between)
       }
 
@@ -47,7 +48,7 @@ function formatDecls (rule, indent, indentWidth, stylelint) {
 }
 
 function declarationColonSpaceBefore (stylelint, between) {
-  switch (stylelint['declaration-colon-space-before']) {
+  switch (getProperty(stylelint, 'declaration-colon-space-before')) {
     case 'always':
       return ' ' + between
     default:
@@ -56,7 +57,7 @@ function declarationColonSpaceBefore (stylelint, between) {
 }
 
 function declarationColonSpaceAfter (stylelint, between) {
-  switch (stylelint['declaration-colon-space-after']) {
+  switch (getProperty(stylelint, 'declaration-colon-space-after')) {
     case 'never':
       return between.trim()
     default:

lib/formatRules.js

@@ -1,6 +1,7 @@
 var formatSelectors = require('./formatSelectors')
 var formatDecls = require('./formatDecls')
 var getIndent = require('./getIndent')
+var getProperty =  require('./util').getProperty
 
 function formatRules (root, params) {
   var stylelint = params.stylelint
@@ -75,24 +76,20 @@ function setRuleRawsConfig (rule, opts) {
   rule.raws.before = opts.ruleBefore
   rule.raws.afterName = ' '
   setPropertyForAtRuleSemicolonNewlineAfter(rule.raws, opts)
-  if (opts.stylelint['block-closing-brace-newline-after']) {
+  if (getProperty(opts.stylelint, 'block-closing-brace-newline-after')) {
     setPropertyForBlockClosingBraceNewlineAfter(rule.raws, opts)
   } else {
     setPropertyForAtRuleSemicolonNewlineAfter(rule.raws, opts)
   }
-  if (opts.stylelint['block-opening-brace-newline-before']) {
+  if (getProperty(opts.stylelint, 'block-opening-brace-newline-before')) {
     rule.raws.between = blockOpeningBraceNewlineBefore(rule, opts)
   } else {
     rule.raws.between = blockOpeningBraceSpaceBefore(rule, opts)
   }
 }
 
 function setPropertyForAtRuleSemicolonNewlineAfter (raws, opts) {
-  var ruleValue = opts.stylelint['at-rule-semicolon-newline-after']
-  if (typeof ruleValue === 'object') {
-      ruleValue = ruleValue[0]
-  }
-  switch (ruleValue) {
+  switch (getProperty(opts.stylelint, 'at-rule-semicolon-newline-after')) {
     default:
       raws.after = '\n' + opts.indentation
       raws.semicolon = true
@@ -102,11 +99,7 @@ function setPropertyForAtRuleSemicolonNewlineAfter (raws, opts) {
 
 function setPropertyForBlockClosingBraceNewlineAfter (raws, opts) {
   raws.semicolon = true
-  var ruleValue = opts.stylelint['block-closing-brace-newline-after']
-  if (typeof ruleValue === 'object') {
-      ruleValue = ruleValue[0]
-  }
-  switch (ruleValue) {
+  switch (getProperty(opts.stylelint, 'block-closing-brace-newline-after')) {
     case 'never-multi-line':
       raws.before = ''
       break
@@ -120,7 +113,7 @@ function blockOpeningBraceSpaceBefore (rule, opts) {
   if (isIgnoreRule(opts.stylelint, rule)) {
     return rule.raws.between
   }
-  switch (opts.stylelint['block-opening-brace-space-before']) {
+  switch (getProperty(opts.stylelint, 'block-opening-brace-space-before')) {
     case 'never':
       return ''
     case 'always-single-line':
@@ -152,7 +145,7 @@ function blockOpeningBraceNewlineBefore (rule, opts) {
   if (isIgnoreRule(opts.stylelint, rule)) {
     return rule.raws.between
   }
-  switch (opts.stylelint['block-opening-brace-newline-before']) {
+  switch (getProperty(opts.stylelint, 'block-opening-brace-newline-before')) {
     case 'always':
       return '\n' + opts.indentation
     case 'always-single-line':

lib/formatSelectors.js

@@ -1,3 +1,4 @@
+var getProperty =  require('./util').getProperty
 function formatSelectors (rule, indentation, stylelint) {
   var tmp = []
   var isSingleLine = false
@@ -24,7 +25,7 @@ function formatSelectors (rule, indentation, stylelint) {
   var separator = selectorListCommaSpaceBefore(stylelint, isSingleLine, indentation)
                     + selectorListCommaNewlineBefore(stylelint, isSingleLine, indentation)
                     + ','
-  if (stylelint['selector-list-comma-space-after']) {
+  if (getProperty(stylelint, 'selector-list-comma-space-after')) {
     separator += selectorListCommaSpaceAfter(stylelint, isSingleLine)
   } else {
     separator += selectorListCommaNewlineAfter(stylelint, isSingleLine)
@@ -43,7 +44,7 @@ function formatSelectors (rule, indentation, stylelint) {
 }
 
 function selectorCombinatorSpaceBefore (stylelint, selector) {
-  switch (stylelint['selector-combinator-space-before']) {
+  switch (getProperty(stylelint, 'selector-combinator-space-before')) {
     case 'never':
       return selector.replace(/\s+(?=[+~>])/g, "")
     default:
@@ -52,7 +53,7 @@ function selectorCombinatorSpaceBefore (stylelint, selector) {
 }
 
 function selectorCombinatorSpaceAfter (stylelint, selector) {
-  switch (stylelint['selector-combinator-space-after']) {
+  switch (getProperty(stylelint, 'selector-combinator-space-after')) {
     case 'never':
       return selector.replace(/([+~>])\s*/g, "$1")
     default:
@@ -61,7 +62,7 @@ function selectorCombinatorSpaceAfter (stylelint, selector) {
 }
 
 function selectorListCommaNewlineBefore (stylelint, isSingleLine, indentation) {
-  switch (stylelint['selector-list-comma-newline-before']) {
+  switch (getProperty(stylelint, 'selector-list-comma-newline-before')) {
     case 'always':
       return '\n' + indentation
     case 'always-multi-line':
@@ -75,7 +76,7 @@ function selectorListCommaNewlineBefore (stylelint, isSingleLine, indentation) {
 }
 
 function selectorListCommaNewlineAfter (stylelint, isSingleLine) {
-  switch (stylelint['selector-list-comma-newline-after']) {
+  switch (getProperty(stylelint, 'selector-list-comma-newline-after')) {
     case 'always-multi-line':
       if (isSingleLine) {
         return '\n'
@@ -89,7 +90,7 @@ function selectorListCommaNewlineAfter (stylelint, isSingleLine) {
 }
 
 function selectorListCommaSpaceBefore (stylelint, isSingleLine, indentation) {
-  switch (stylelint['selector-list-comma-space-before']) {
+  switch (getProperty(stylelint, 'selector-list-comma-space-before')) {
     case 'always':
       return ' '
     case 'always-single-line':
@@ -108,7 +109,7 @@ function selectorListCommaSpaceBefore (stylelint, isSingleLine, indentation) {
 }
 
 function selectorListCommaSpaceAfter (stylelint, isSingleLine) {
-  switch (stylelint['selector-list-comma-space-after']) {
+  switch (getProperty(stylelint, 'selector-list-comma-space-after')) {
     case 'never':
       return ''
     case 'always-single-line':

lib/formatShorthand.js

@@ -1,4 +1,5 @@
 var valueParser = require('postcss-value-parser')
+var getProperty =  require('./util').getProperty
 
 var ignoredCharacters = ["+", "-", "*", "/", "(", ")", "$", "@", "--", "var("]
 
@@ -70,7 +71,7 @@ function isShorthandableProperty (prop) {
 
 
 function formatShorthand (decl, stylelint) {
-  if (stylelint && stylelint['shorthand-property-no-redundant-values'] === true) {
+  if (getProperty(stylelint, 'shorthand-property-no-redundant-values') === true) {
     if (
       hasIgnoredCharacters(decl.value)
       || isIgnoredShorthandProperty(decl.prop)

lib/formatValues.js

@@ -2,6 +2,7 @@ var formatTransforms = require('./formatTransforms')
 var formatColors = require('./formatColors')
 var formatZeros = require('./formatZeros')
 var formatShorthand = require('./formatShorthand')
+var getProperty =  require('./util').getProperty
 
 function formatvalues (decl, stylelint) {
   var isDataUrl = /data:.+\/(.+);base64,(.*)/.test(decl.value)
@@ -17,12 +18,13 @@ function formatvalues (decl, stylelint) {
     decl.value = decl.value.trim().replace(/\s+/g, ' ')
   }
 
-  if (stylelint && stylelint['string-quotes']) {
-    if (stylelint['string-quotes'] === 'double') {
+  switch (getProperty(stylelint, 'string-quotes')) {
+    case 'double':
       decl.value = decl.value.replace(/'/g, '"')
-    } else if (stylelint['string-quotes'] === 'single') {
+      break
+    case 'single':
       decl.value = decl.value.replace(/"/g, '\'')
-    }
+      break
   }
 
   if (decl.prop === 'content') {

lib/formatZeros.js

@@ -1,19 +1,21 @@
 var zeroWithUnitRegex = /^0[\.0]*(?:px|r?em|ex|ch|vh|vw|cm|mm|in|pt|pc|vmin|vmax)/g
+var getProperty =  require('./util').getProperty
 
 function formatZeros (value, stylelint) {
-  if (stylelint && stylelint['length-zero-no-unit'] === true) {
+  if (getProperty(stylelint, 'length-zero-no-unit') === true) {
     value = value.replace(zeroWithUnitRegex, '0')
   }
 
-  if (stylelint && stylelint['number-leading-zero']) {
-    if (stylelint['number-leading-zero'] === 'always') {
+  switch (getProperty(stylelint, 'number-leading-zero')) {
+    case 'always':
       value = value.replace(/(\D|^)(\.\d+)/g, '$10$2')
-    } else if (stylelint['number-leading-zero'] === 'never') {
+      break
+    case 'never':
       value = value.replace(/(\D|^)(0)(\.\d+)/g, '$1$3')
-    }
+      break
   }
 
-  if (stylelint && stylelint['number-no-trailing-zeros'] === true) {
+  if (getProperty(stylelint, 'number-no-trailing-zeros') === true) {
     value = value.replace(/(\d+)(\.[0-9]*[1-9]+)(0+)/g, '$1$2')
     value = value.replace(/(\d+)(\.0+)(?=\D|$)/g, '$1')
   }