postcss 8.5.26 → 8.5.28

package/lib/container.d.ts

@@ -178,23 +178,6 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    */
   insertAfter(oldNode: Child | number, newNode: Container.NewChild): this
 
-  /**
-   * Traverses the container’s descendant nodes, calling callback
-   * for each comment node.
-   *
-   * Like `Container#each`, this method is safe
-   * to use if you are mutating arrays during iteration.
-   *
-   * ```js
-   * root.walkComments(comment => {
-   *   comment.remove()
-   * })
-   * ```
-   *
-   * @param callback Iterator receives each node and index.
-   * @return Returns `false` if iteration was broke.
-   */
-
   /**
    * Insert new node before old node within the container.
    *
@@ -378,9 +361,22 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
     callback: (atRule: AtRule, index: number) => false | void
   ): false | undefined
 
-  walkComments(
-    callback: (comment: Comment, indexed: number) => false | void
-  ): false | undefined
+  /**
+   * Traverses the container’s descendant nodes, calling callback
+   * for each comment node.
+   *
+   * Like `Container#each`, this method is safe
+   * to use if you are mutating arrays during iteration.
+   *
+   * ```js
+   * root.walkComments(comment => {
+   *   comment.remove()
+   * })
+   * ```
+   *
+   * @param callback Iterator receives each node and index.
+   * @return Returns `false` if iteration was broke.
+   */
   walkComments(
     callback: (comment: Comment, indexed: number) => false | void
   ): false | undefined

package/lib/declaration.d.ts

@@ -1,5 +1,5 @@
 import { ContainerWithChildren } from './container.js'
-import Node from './node.js'
+import Node, { NodeProps } from './node.js'
 
 declare namespace Declaration {
   export interface DeclarationRaws extends Record<string, unknown> {
@@ -28,7 +28,7 @@ declare namespace Declaration {
     }
   }
 
-  export interface DeclarationProps {
+  export interface DeclarationProps extends NodeProps {
     /** Whether the declaration has an `!important` annotation. */
     important?: boolean
     /** Name of the declaration. */

package/lib/list.js

@@ -42,7 +42,8 @@ let list = {
       }
 
       if (split) {
-        if (current !== '') array.push(current.trim())
+        let value = current.trim()
+        if (last || value !== '') array.push(value)
         current = ''
         split = false
       } else {
@@ -50,7 +51,8 @@ let list = {
       }
     }
 
-    if (last || current !== '') array.push(current.trim())
+    let value = current.trim()
+    if (last || value !== '') array.push(value)
     return array
   }
 }

package/lib/map-generator.js

@@ -75,9 +75,10 @@ class MapGenerator {
         }
       }
     } else if (this.css) {
+      let annotation = '/*# sourceMappingURL='
       let startIndex
-      while ((startIndex = this.css.lastIndexOf('/*#')) !== -1) {
-        let endIndex = this.css.indexOf('*/', startIndex + 3)
+      while ((startIndex = this.css.lastIndexOf(annotation)) !== -1) {
+        let endIndex = this.css.indexOf('*/', startIndex + annotation.length)
         if (endIndex === -1) break
         while (startIndex > 0 && this.css[startIndex - 1] === '\n') {
           startIndex--

package/lib/parser.js

@@ -354,8 +354,11 @@ class Parser {
       if (prev && prev.type === 'rule' && !prev.raws.ownSemicolon) {
         prev.raws.ownSemicolon = this.spaces
         this.spaces = ''
+        // `ownSemicolon` also holds the spaces before the semicolon, but
+        // the position above is the semicolon itself, so the node ends
+        // right after it.
         prev.source.end = this.getPosition(token[2])
-        prev.source.end.offset += prev.raws.ownSemicolon.length
+        prev.source.end.offset++
       }
     }
   }

package/lib/postcss.js

@@ -38,7 +38,7 @@ postcss.plugin = function plugin(name, initializer) {
           ': postcss.plugin was deprecated. Migration guide:\n' +
           'https://evilmartians.com/chronicles/postcss-8-plugin-migration'
       )
-      if (process.env.LANG && process.env.LANG.startsWith('cn')) {
+      if (process.env.LANG && process.env.LANG.startsWith('zh')) {
         /* c8 ignore next 7 */
         // eslint-disable-next-line no-console
         console.warn(

package/lib/processor.js

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

package/lib/stringifier.js

@@ -49,6 +49,14 @@ function atruleStart(str, node) {
   return name + afterName + params
 }
 
+// `*--x` is not a custom property: the parser checks the first token, and the
+// `*`/`_` hack prefix moves from `prop` into `before` only after that.
+function isCustomProperty(node) {
+  if (!node.prop.startsWith('--')) return false
+  let before = node.raws.before
+  return typeof before === 'undefined' || !/\S$/.test(before)
+}
+
 function pushBody(str, stack, node) {
   let nodes = node.nodes
   let last = nodes.length - 1
@@ -70,7 +78,7 @@ function pushBody(str, stack, node) {
       !childSemicolon &&
       i < nodes.length - 1 &&
       ((child.type === 'atrule' && !child.nodes) ||
-        (child.type === 'decl' && child.prop.startsWith('--')))
+        (child.type === 'decl' && isCustomProperty(child)))
     ) {
       childSemicolon = true
     }

package/package.json

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