postcss 8.4.24 → 8.4.25

package/lib/stringifier.js

@@ -1,17 +1,17 @@
 'use strict'
 
 const DEFAULT_RAW = {
-  colon: ': ',
-  indent: '    ',
-  beforeDecl: '\n',
-  beforeRule: '\n',
-  beforeOpen: ' ',
+  after: '\n',
   beforeClose: '\n',
   beforeComment: '\n',
-  after: '\n',
-  emptyBody: '',
+  beforeDecl: '\n',
+  beforeOpen: ' ',
+  beforeRule: '\n',
+  colon: ': ',
   commentLeft: ' ',
   commentRight: ' ',
+  emptyBody: '',
+  indent: '    ',
   semicolon: false
 }
 
@@ -24,54 +24,6 @@ class Stringifier {
     this.builder = builder
   }
 
-  stringify(node, semicolon) {
-    /* c8 ignore start */
-    if (!this[node.type]) {
-      throw new Error(
-        'Unknown AST node type ' +
-          node.type +
-          '. ' +
-          'Maybe you need to change PostCSS stringifier.'
-      )
-    }
-    /* c8 ignore stop */
-    this[node.type](node, semicolon)
-  }
-
-  document(node) {
-    this.body(node)
-  }
-
-  root(node) {
-    this.body(node)
-    if (node.raws.after) this.builder(node.raws.after)
-  }
-
-  comment(node) {
-    let left = this.raw(node, 'left', 'commentLeft')
-    let right = this.raw(node, 'right', 'commentRight')
-    this.builder('/*' + left + node.text + right + '*/', node)
-  }
-
-  decl(node, semicolon) {
-    let between = this.raw(node, 'between', 'colon')
-    let string = node.prop + between + this.rawValue(node, 'value')
-
-    if (node.important) {
-      string += node.raws.important || ' !important'
-    }
-
-    if (semicolon) string += ';'
-    this.builder(string, node)
-  }
-
-  rule(node) {
-    this.block(node, this.rawValue(node, 'selector'))
-    if (node.raws.ownSemicolon) {
-      this.builder(node.raws.ownSemicolon, node, 'end')
-    }
-  }
-
   atrule(node, semicolon) {
     let name = '@' + node.name
     let params = node.params ? this.rawValue(node, 'params') : ''
@@ -90,20 +42,33 @@ class Stringifier {
     }
   }
 
-  body(node) {
-    let last = node.nodes.length - 1
-    while (last > 0) {
-      if (node.nodes[last].type !== 'comment') break
-      last -= 1
+  beforeAfter(node, detect) {
+    let value
+    if (node.type === 'decl') {
+      value = this.raw(node, null, 'beforeDecl')
+    } else if (node.type === 'comment') {
+      value = this.raw(node, null, 'beforeComment')
+    } else if (detect === 'before') {
+      value = this.raw(node, null, 'beforeRule')
+    } else {
+      value = this.raw(node, null, 'beforeClose')
     }
 
-    let semicolon = this.raw(node, 'semicolon')
-    for (let i = 0; i < node.nodes.length; i++) {
-      let child = node.nodes[i]
-      let before = this.raw(child, 'before')
-      if (before) this.builder(before)
-      this.stringify(child, last !== i || semicolon)
+    let buf = node.parent
+    let depth = 0
+    while (buf && buf.type !== 'root') {
+      depth += 1
+      buf = buf.parent
     }
+
+    if (value.includes('\n')) {
+      let indent = this.raw(node, null, 'indent')
+      if (indent.length) {
+        for (let step = 0; step < depth; step++) value += indent
+      }
+    }
+
+    return value
   }
 
   block(node, start) {
@@ -122,6 +87,44 @@ class Stringifier {
     this.builder('}', node, 'end')
   }
 
+  body(node) {
+    let last = node.nodes.length - 1
+    while (last > 0) {
+      if (node.nodes[last].type !== 'comment') break
+      last -= 1
+    }
+
+    let semicolon = this.raw(node, 'semicolon')
+    for (let i = 0; i < node.nodes.length; i++) {
+      let child = node.nodes[i]
+      let before = this.raw(child, 'before')
+      if (before) this.builder(before)
+      this.stringify(child, last !== i || semicolon)
+    }
+  }
+
+  comment(node) {
+    let left = this.raw(node, 'left', 'commentLeft')
+    let right = this.raw(node, 'right', 'commentRight')
+    this.builder('/*' + left + node.text + right + '*/', node)
+  }
+
+  decl(node, semicolon) {
+    let between = this.raw(node, 'between', 'colon')
+    let string = node.prop + between + this.rawValue(node, 'value')
+
+    if (node.important) {
+      string += node.raws.important || ' !important'
+    }
+
+    if (semicolon) string += ';'
+    this.builder(string, node)
+  }
+
+  document(node) {
+    this.body(node)
+  }
+
   raw(node, own, detect) {
     let value
     if (!detect) detect = own
@@ -176,42 +179,20 @@ class Stringifier {
     return value
   }
 
-  rawSemicolon(root) {
-    let value
-    root.walk(i => {
-      if (i.nodes && i.nodes.length && i.last.type === 'decl') {
-        value = i.raws.semicolon
-        if (typeof value !== 'undefined') return false
-      }
-    })
-    return value
-  }
-
-  rawEmptyBody(root) {
-    let value
-    root.walk(i => {
-      if (i.nodes && i.nodes.length === 0) {
-        value = i.raws.after
-        if (typeof value !== 'undefined') return false
-      }
-    })
-    return value
-  }
-
-  rawIndent(root) {
-    if (root.raws.indent) return root.raws.indent
+  rawBeforeClose(root) {
     let value
     root.walk(i => {
-      let p = i.parent
-      if (p && p !== root && p.parent && p.parent === root) {
-        if (typeof i.raws.before !== 'undefined') {
-          let parts = i.raws.before.split('\n')
-          value = parts[parts.length - 1]
-          value = value.replace(/\S/g, '')
+      if (i.nodes && i.nodes.length > 0) {
+        if (typeof i.raws.after !== 'undefined') {
+          value = i.raws.after
+          if (value.includes('\n')) {
+            value = value.replace(/[^\n]+$/, '')
+          }
           return false
         }
       }
     })
+    if (value) value = value.replace(/\S/g, '')
     return value
   }
 
@@ -253,6 +234,17 @@ class Stringifier {
     return value
   }
 
+  rawBeforeOpen(root) {
+    let value
+    root.walk(i => {
+      if (i.type !== 'decl') {
+        value = i.raws.between
+        if (typeof value !== 'undefined') return false
+      }
+    })
+    return value
+  }
+
   rawBeforeRule(root) {
     let value
     root.walk(i => {
@@ -270,71 +262,53 @@ class Stringifier {
     return value
   }
 
-  rawBeforeClose(root) {
+  rawColon(root) {
     let value
-    root.walk(i => {
-      if (i.nodes && i.nodes.length > 0) {
-        if (typeof i.raws.after !== 'undefined') {
-          value = i.raws.after
-          if (value.includes('\n')) {
-            value = value.replace(/[^\n]+$/, '')
-          }
-          return false
-        }
+    root.walkDecls(i => {
+      if (typeof i.raws.between !== 'undefined') {
+        value = i.raws.between.replace(/[^\s:]/g, '')
+        return false
       }
     })
-    if (value) value = value.replace(/\S/g, '')
     return value
   }
 
-  rawBeforeOpen(root) {
+  rawEmptyBody(root) {
     let value
     root.walk(i => {
-      if (i.type !== 'decl') {
-        value = i.raws.between
+      if (i.nodes && i.nodes.length === 0) {
+        value = i.raws.after
         if (typeof value !== 'undefined') return false
       }
     })
     return value
   }
 
-  rawColon(root) {
+  rawIndent(root) {
+    if (root.raws.indent) return root.raws.indent
     let value
-    root.walkDecls(i => {
-      if (typeof i.raws.between !== 'undefined') {
-        value = i.raws.between.replace(/[^\s:]/g, '')
-        return false
+    root.walk(i => {
+      let p = i.parent
+      if (p && p !== root && p.parent && p.parent === root) {
+        if (typeof i.raws.before !== 'undefined') {
+          let parts = i.raws.before.split('\n')
+          value = parts[parts.length - 1]
+          value = value.replace(/\S/g, '')
+          return false
+        }
       }
     })
     return value
   }
 
-  beforeAfter(node, detect) {
+  rawSemicolon(root) {
     let value
-    if (node.type === 'decl') {
-      value = this.raw(node, null, 'beforeDecl')
-    } else if (node.type === 'comment') {
-      value = this.raw(node, null, 'beforeComment')
-    } else if (detect === 'before') {
-      value = this.raw(node, null, 'beforeRule')
-    } else {
-      value = this.raw(node, null, 'beforeClose')
-    }
-
-    let buf = node.parent
-    let depth = 0
-    while (buf && buf.type !== 'root') {
-      depth += 1
-      buf = buf.parent
-    }
-
-    if (value.includes('\n')) {
-      let indent = this.raw(node, null, 'indent')
-      if (indent.length) {
-        for (let step = 0; step < depth; step++) value += indent
+    root.walk(i => {
+      if (i.nodes && i.nodes.length && i.last.type === 'decl') {
+        value = i.raws.semicolon
+        if (typeof value !== 'undefined') return false
       }
-    }
-
+    })
     return value
   }
 
@@ -347,6 +321,32 @@ class Stringifier {
 
     return value
   }
+
+  root(node) {
+    this.body(node)
+    if (node.raws.after) this.builder(node.raws.after)
+  }
+
+  rule(node) {
+    this.block(node, this.rawValue(node, 'selector'))
+    if (node.raws.ownSemicolon) {
+      this.builder(node.raws.ownSemicolon, node, 'end')
+    }
+  }
+
+  stringify(node, semicolon) {
+    /* c8 ignore start */
+    if (!this[node.type]) {
+      throw new Error(
+        'Unknown AST node type ' +
+          node.type +
+          '. ' +
+          'Maybe you need to change PostCSS stringifier.'
+      )
+    }
+    /* c8 ignore stop */
+    this[node.type](node, semicolon)
+  }
 }
 
 module.exports = Stringifier

package/lib/terminal-highlight.js

@@ -11,21 +11,21 @@ function registerInput(dependant) {
 }
 
 const HIGHLIGHT_THEME = {
-  'brackets': pico.cyan,
-  'at-word': pico.cyan,
-  'comment': pico.gray,
-  'string': pico.green,
-  'class': pico.yellow,
-  'hash': pico.magenta,
-  'call': pico.cyan,
+  ';': pico.yellow,
+  ':': pico.yellow,
   '(': pico.cyan,
   ')': pico.cyan,
-  '{': pico.yellow,
-  '}': pico.yellow,
   '[': pico.yellow,
   ']': pico.yellow,
-  ':': pico.yellow,
-  ';': pico.yellow
+  '{': pico.yellow,
+  '}': pico.yellow,
+  'at-word': pico.cyan,
+  'brackets': pico.cyan,
+  'call': pico.cyan,
+  'class': pico.yellow,
+  'comment': pico.gray,
+  'hash': pico.magenta,
+  'string': pico.green
 }
 
 function getTokenType([type, value], processor) {

package/lib/tokenize.js

@@ -259,8 +259,8 @@ module.exports = function tokenizer(input, options = {}) {
 
   return {
     back,
-    nextToken,
     endOfFile,
+    nextToken,
     position
   }
 }

package/lib/warning.d.ts

@@ -4,14 +4,14 @@ import Node from './node.js'
 declare namespace Warning {
   export interface WarningOptions {
     /**
-     * CSS node that caused the warning.
+     * End position, exclusive, in CSS node string that caused the warning.
      */
-    node?: Node
+    end?: RangePosition
 
     /**
-     * Word in CSS source that caused the warning.
+     * End index, exclusive, in CSS node string that caused the warning.
      */
-    word?: string
+    endIndex?: number
 
     /**
      * Start index, inclusive, in CSS node string that caused the warning.
@@ -19,25 +19,25 @@ declare namespace Warning {
     index?: number
 
     /**
-     * End index, exclusive, in CSS node string that caused the warning.
+     * CSS node that caused the warning.
      */
-    endIndex?: number
+    node?: Node
 
     /**
-     * Start position, inclusive, in CSS node string that caused the warning.
+     * Name of the plugin that created this warning. `Result#warn` fills
+     * this property automatically.
      */
-    start?: RangePosition
+    plugin?: string
 
     /**
-     * End position, exclusive, in CSS node string that caused the warning.
+     * Start position, inclusive, in CSS node string that caused the warning.
      */
-    end?: RangePosition
+    start?: RangePosition
 
     /**
-     * Name of the plugin that created this warning. `Result#warn` fills
-     * this property automatically.
+     * Word in CSS source that caused the warning.
      */
-    plugin?: string
+    word?: string
   }
 
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -55,38 +55,31 @@ declare namespace Warning {
  */
 declare class Warning_ {
   /**
-   * Type to filter warnings from `Result#messages`.
-   * Always equal to `"warning"`.
-   */
-  type: 'warning'
-
-  /**
-   * The warning message.
+   * Column for inclusive start position in the input file with this warning’s source.
    *
    * ```js
-   * warning.text //=> 'Try to avoid !important'
+   * warning.column //=> 6
    * ```
    */
-  text: string
+  column: number
 
   /**
-   * The name of the plugin that created this warning.
-   * When you call `Node#warn` it will fill this property automatically.
+   * Column for exclusive end position in the input file with this warning’s source.
    *
    * ```js
-   * warning.plugin //=> 'postcss-important'
+   * warning.endColumn //=> 4
    * ```
    */
-  plugin: string
+  endColumn?: number
 
   /**
-   * Contains the CSS node that caused the warning.
+   * Line for exclusive end position in the input file with this warning’s source.
    *
    * ```js
-   * warning.node.toString() //=> 'color: white !important'
+   * warning.endLine //=> 6
    * ```
    */
-  node: Node
+  endLine?: number
 
   /**
    * Line for inclusive start position in the input file with this warning’s source.
@@ -98,31 +91,38 @@ declare class Warning_ {
   line: number
 
   /**
-   * Column for inclusive start position in the input file with this warning’s source.
+   * Contains the CSS node that caused the warning.
    *
    * ```js
-   * warning.column //=> 6
+   * warning.node.toString() //=> 'color: white !important'
    * ```
    */
-  column: number
+  node: Node
 
   /**
-   * Line for exclusive end position in the input file with this warning’s source.
+   * The name of the plugin that created this warning.
+   * When you call `Node#warn` it will fill this property automatically.
    *
    * ```js
-   * warning.endLine //=> 6
+   * warning.plugin //=> 'postcss-important'
    * ```
    */
-  endLine?: number
+  plugin: string
 
   /**
-   * Column for exclusive end position in the input file with this warning’s source.
+   * The warning message.
    *
    * ```js
-   * warning.endColumn //=> 4
+   * warning.text //=> 'Try to avoid !important'
    * ```
    */
-  endColumn?: number
+  text: string
+
+  /**
+   * Type to filter warnings from `Result#messages`.
+   * Always equal to `"warning"`.
+   */
+  type: 'warning'
 
   /**
    * @param text Warning message.

package/lib/warning.js

@@ -19,8 +19,8 @@ class Warning {
   toString() {
     if (this.node) {
       return this.node.error(this.text, {
-        plugin: this.plugin,
         index: this.index,
+        plugin: this.plugin,
         word: this.word
       }).message
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.4.24",
+  "version": "8.4.25",
   "description": "Tool for transforming styles with JS plugins",
   "engines": {
     "node": "^10 || ^12 || >=14"