postcss 8.4.5 → 8.4.8

package/lib/no-work-result.js

@@ -78,9 +78,12 @@ class NoWorkResult {
       this.error = error
     }
 
-    this._root = root
-
-    return root
+    if (this.error) {
+      throw this.error
+    } else {
+      this._root = root
+      return root
+    }
   }
 
   get messages() {

package/lib/node.d.ts

@@ -3,7 +3,7 @@ import Comment, { CommentProps } from './comment.js'
 import { Stringifier, Syntax } from './postcss.js'
 import AtRule, { AtRuleProps } from './at-rule.js'
 import Rule, { RuleProps } from './rule.js'
-import { WarningOptions } from './warning.js'
+import Warning, { WarningOptions } from './warning.js'
 import CssSyntaxError from './css-syntax-error.js'
 import Result from './result.js'
 import Input from './input.js'
@@ -241,7 +241,7 @@ export default abstract class Node {
    *
    * @return Created warning object.
    */
-  warn(result: Result, text: string, opts?: WarningOptions): void
+  warn(result: Result, text: string, opts?: WarningOptions): Warning
 
   /**
    * Removes the node from its parent and cleans the parent properties

package/lib/parser.js

@@ -7,6 +7,19 @@ let AtRule = require('./at-rule')
 let Root = require('./root')
 let Rule = require('./rule')
 
+const SAFE_COMMENT_NEIGHBOR = {
+  empty: true,
+  space: true
+}
+
+function findLastWithPosition(tokens) {
+  for (let i = tokens.length - 1; i >= 0; i--) {
+    let token = tokens[i]
+    let pos = token[3] || token[2]
+    if (pos) return pos
+  }
+}
+
 class Parser {
   constructor(input) {
     this.input = input
@@ -139,10 +152,12 @@ class Parser {
     if (brackets.length > 0) this.unclosedBracket(bracket)
 
     if (end && colon) {
-      while (tokens.length) {
-        token = tokens[tokens.length - 1][0]
-        if (token !== 'space' && token !== 'comment') break
-        this.tokenizer.back(tokens.pop())
+      if (!customProperty) {
+        while (tokens.length) {
+          token = tokens[tokens.length - 1][0]
+          if (token !== 'space' && token !== 'comment') break
+          this.tokenizer.back(tokens.pop())
+        }
       }
       this.decl(tokens, customProperty)
     } else {
@@ -170,7 +185,10 @@ class Parser {
       this.semicolon = true
       tokens.pop()
     }
-    node.source.end = this.getPosition(last[3] || last[2])
+
+    node.source.end = this.getPosition(
+      last[3] || last[2] || findLastWithPosition(tokens)
+    )
 
     while (tokens[0][0] !== 'word') {
       if (tokens.length === 1) this.unknownWord(tokens)
@@ -208,7 +226,15 @@ class Parser {
       node.raws.before += node.prop[0]
       node.prop = node.prop.slice(1)
     }
-    let firstSpaces = this.spacesAndCommentsFromStart(tokens)
+
+    let firstSpaces = []
+    let next
+    while (tokens.length) {
+      next = tokens[0][0]
+      if (next !== 'space' && next !== 'comment') break
+      firstSpaces.push(tokens.shift())
+    }
+
     this.precheckMissedSemicolon(tokens)
 
     for (let i = tokens.length - 1; i >= 0; i--) {
@@ -242,12 +268,12 @@ class Parser {
     }
 
     let hasWord = tokens.some(i => i[0] !== 'space' && i[0] !== 'comment')
-    this.raw(node, 'value', tokens)
+
     if (hasWord) {
-      node.raws.between += firstSpaces
-    } else {
-      node.value = firstSpaces + node.value
+      node.raws.between += firstSpaces.map(i => i[1]).join('')
+      firstSpaces = []
     }
+    this.raw(node, 'value', firstSpaces.concat(tokens), customProperty)
 
     if (node.value.includes(':') && !customProperty) {
       this.checkMissedSemicolon(tokens)
@@ -395,38 +421,30 @@ class Parser {
     if (node.type !== 'comment') this.semicolon = false
   }
 
-  raw(node, prop, tokens) {
+  raw(node, prop, tokens, customProperty) {
     let token, type
     let length = tokens.length
     let value = ''
     let clean = true
     let next, prev
-    let pattern = /^([#.|])?(\w)+/i
 
     for (let i = 0; i < length; i += 1) {
       token = tokens[i]
       type = token[0]
-
-      if (type === 'comment' && node.type === 'rule') {
-        prev = tokens[i - 1]
-        next = tokens[i + 1]
-
-        if (
-          prev[0] !== 'space' &&
-          next[0] !== 'space' &&
-          pattern.test(prev[1]) &&
-          pattern.test(next[1])
-        ) {
-          value += token[1]
+      if (type === 'space' && i === length - 1 && !customProperty) {
+        clean = false
+      } else if (type === 'comment') {
+        prev = tokens[i - 1] ? tokens[i - 1][0] : 'empty'
+        next = tokens[i + 1] ? tokens[i + 1][0] : 'empty'
+        if (!SAFE_COMMENT_NEIGHBOR[prev] && !SAFE_COMMENT_NEIGHBOR[next]) {
+          if (value.slice(-1) === ',') {
+            clean = false
+          } else {
+            value += token[1]
+          }
         } else {
           clean = false
         }
-
-        continue
-      }
-
-      if (type === 'comment' || (type === 'space' && i === length - 1)) {
-        clean = false
       } else {
         value += token[1]
       }

package/lib/processor.js

@@ -7,7 +7,7 @@ let Root = require('./root')
 
 class Processor {
   constructor(plugins = []) {
-    this.version = '8.4.5'
+    this.version = '8.4.8'
     this.plugins = this.normalize(plugins)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.4.5",
+  "version": "8.4.8",
   "description": "Tool for transforming styles with JS plugins",
   "engines": {
     "node": "^10 || ^12 || >=14"
@@ -65,9 +65,9 @@
     "url": "https://github.com/postcss/postcss/issues"
   },
   "dependencies": {
-    "nanoid": "^3.1.30",
+    "nanoid": "^3.3.1",
     "picocolors": "^1.0.0",
-    "source-map-js": "^1.0.1"
+    "source-map-js": "^1.0.2"
   },
   "browser": {
     "./lib/terminal-highlight": false,