postcss 8.5.19 → 8.5.21

package/lib/node.d.ts

@@ -31,12 +31,12 @@ declare namespace Node {
 
   export interface Position {
     /**
-     * Source line in file. In contrast to `offset` it starts from 1.
+     * Source column in file. It starts from 1.
      */
     column: number
 
     /**
-     * Source column in file.
+     * Source line in file. It starts from 1.
      */
     line: number
 

package/lib/processor.js

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

package/lib/stringifier.js

@@ -6,6 +6,10 @@
 const STYLE_TAG = /(<)(\/?style\b)/gi
 const COMMENT_OPEN = /(<)(!--)/g
 
+// Characters that end an at-rule name, mirroring RE_AT_END in the tokenizer.
+// Params starting with anything else need a space to stay separate tokens.
+const AT_NAME_END = /[\t\n\f\r "#'()/;[\\\]{}]/
+
 function escapeHTMLInCSS(str) {
   if (typeof str !== 'string') return str
   if (!str.includes('<')) return str
@@ -34,14 +38,15 @@ function capitalize(str) {
 function atruleStart(str, node) {
   let name = '@' + node.name
   let params = node.params ? str.rawValue(node, 'params') : ''
+  let afterName = node.raws.afterName
 
-  if (typeof node.raws.afterName !== 'undefined') {
-    name += node.raws.afterName
-  } else if (params) {
-    name += ' '
+  if (typeof afterName === 'undefined') {
+    afterName = params ? ' ' : ''
+  } else if (afterName === '' && params && !AT_NAME_END.test(params[0])) {
+    afterName = ' '
   }
 
-  return name + params
+  return name + afterName + params
 }
 
 function pushBody(str, stack, node) {
@@ -55,10 +60,23 @@ function pushBody(str, stack, node) {
   let semicolon = str.raw(node, 'semicolon')
   let isDocument = node.type === 'document'
   for (let i = nodes.length - 1; i >= 0; i--) {
+    let child = nodes[i]
+    let childSemicolon = last !== i || semicolon
+    // A childless at-rule that still has following siblings must be
+    // terminated. Without the semicolon those trailing comments are folded
+    // into the at-rule's prelude and disappear when the output is re-parsed.
+    if (
+      !childSemicolon &&
+      i < nodes.length - 1 &&
+      child.type === 'atrule' &&
+      !child.nodes
+    ) {
+      childSemicolon = true
+    }
     stack.push({
       document: isDocument,
-      node: nodes[i],
-      semicolon: last !== i || semicolon
+      node: child,
+      semicolon: childSemicolon
     })
   }
 }

package/lib/warning.js

@@ -1,11 +1,21 @@
 'use strict'
 
+let Container = require('./container')
+let { my } = require('./symbols')
+
 class Warning {
   constructor(text, opts = {}) {
     this.type = 'warning'
     this.text = text
 
     if (opts.node && opts.node.source) {
+      if (!opts.node[my]) {
+        // The node comes from another PostCSS copy in node_modules, so it does
+        // not have this copy’s methods. Container#normalize() rebuilds such
+        // nodes on insert, but a node passed straight to Result#warn() never
+        // goes through it.
+        Container.rebuild(opts.node)
+      }
       let range = opts.node.rangeBy(opts)
       this.line = range.start.line
       this.column = range.start.column

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.5.19",
+  "version": "8.5.21",
   "description": "Tool for transforming styles with JS plugins",
   "keywords": [
     "css",
@@ -78,7 +78,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "nanoid": "^3.3.12",
+    "nanoid": "^3.3.16",
     "picocolors": "^1.1.1",
     "source-map-js": "^1.2.1"
   },