postcss 8.4.31 → 8.4.49

package/README.md

@@ -13,7 +13,7 @@ and JetBrains. The [Autoprefixer] and [Stylelint] PostCSS plugins is one of
 
 ---
 
-<img src="https://cdn.evilmartians.com/badges/logo-no-label.svg" alt="" width="22" height="16" />  Made in <b><a href="https://evilmartians.com/?utm_source=postcss&utm_campaign=devtools-button&utm_medium=github">Evil Martians</a></b>, product consulting for <b>developer tools</b>.
+<img src="https://cdn.evilmartians.com/badges/logo-no-label.svg" alt="" width="22" height="16" />  Made at <b><a href="https://evilmartians.com/devtools?utm_source=postcss&utm_campaign=devtools-button&utm_medium=github">Evil Martians</a></b>, product consulting for <b>developer tools</b>.
 
 ---
 

package/lib/at-rule.d.ts

@@ -1,4 +1,7 @@
-import Container, { ContainerProps } from './container.js'
+import Container, {
+  ContainerProps,
+  ContainerWithChildren
+} from './container.js'
 
 declare namespace AtRule {
   export interface AtRuleRaws extends Record<string, unknown> {
@@ -76,16 +79,48 @@ declare namespace AtRule {
  * ```
  */
 declare class AtRule_ extends Container {
+  /**
+   * An array containing the layer’s children.
+   *
+   * ```js
+   * const root = postcss.parse('@layer example { a { color: black } }')
+   * const layer = root.first
+   * layer.nodes.length           //=> 1
+   * layer.nodes[0].selector      //=> 'a'
+   * ```
+   *
+   * Can be `undefinded` if the at-rule has no body.
+   *
+   * ```js
+   * const root = postcss.parse('@layer a, b, c;')
+   * const layer = root.first
+   * layer.nodes //=> undefined
+   * ```
+   */
+  nodes: Container['nodes']
+  parent: ContainerWithChildren | undefined
+
+  raws: AtRule.AtRuleRaws
+  type: 'atrule'
+  constructor(defaults?: AtRule.AtRuleProps)
+  assign(overrides: AtRule.AtRuleProps | object): this
+
+  clone(overrides?: Partial<AtRule.AtRuleProps>): this
+
+  cloneAfter(overrides?: Partial<AtRule.AtRuleProps>): this
+
+  cloneBefore(overrides?: Partial<AtRule.AtRuleProps>): this
   /**
    * The at-rule’s name immediately follows the `@`.
    *
    * ```js
    * const root  = postcss.parse('@media print {}')
-   * media.name //=> 'media'
    * const media = root.first
+   * media.name //=> 'media'
    * ```
    */
-  name: string
+  get name(): string
+  set name(value: string)
   /**
    * The at-rule’s parameters, the values that follow the at-rule’s name
    * but precede any `{}` block.
@@ -96,18 +131,8 @@ declare class AtRule_ extends Container {
    * media.params //=> 'print, screen'
    * ```
    */
-  params: string
-  parent: Container | undefined
-
-  raws: AtRule.AtRuleRaws
-
-  type: 'atrule'
-
-  constructor(defaults?: AtRule.AtRuleProps)
-  assign(overrides: AtRule.AtRuleProps | object): this
-  clone(overrides?: Partial<AtRule.AtRuleProps>): AtRule
-  cloneAfter(overrides?: Partial<AtRule.AtRuleProps>): AtRule
-  cloneBefore(overrides?: Partial<AtRule.AtRuleProps>): AtRule
+  get params(): string
+  set params(value: string)
 }
 
 declare class AtRule extends AtRule_ {}

package/lib/comment.d.ts

@@ -48,18 +48,19 @@ declare namespace Comment {
 declare class Comment_ extends Node {
   parent: Container | undefined
   raws: Comment.CommentRaws
-  /**
-   * The comment's text.
-   */
-  text: string
-
   type: 'comment'
-
   constructor(defaults?: Comment.CommentProps)
+
   assign(overrides: Comment.CommentProps | object): this
-  clone(overrides?: Partial<Comment.CommentProps>): Comment
-  cloneAfter(overrides?: Partial<Comment.CommentProps>): Comment
-  cloneBefore(overrides?: Partial<Comment.CommentProps>): Comment
+
+  clone(overrides?: Partial<Comment.CommentProps>): this
+  cloneAfter(overrides?: Partial<Comment.CommentProps>): this
+  cloneBefore(overrides?: Partial<Comment.CommentProps>): this
+  /**
+   * The comment's text.
+   */
+  get text(): string
+  set text(value: string)
 }
 
 declare class Comment extends Comment_ {}

package/lib/container.d.ts

@@ -5,6 +5,12 @@ import Node, { ChildNode, ChildProps, NodeProps } from './node.js'
 import Rule from './rule.js'
 
 declare namespace Container {
+  export class ContainerWithChildren<
+    Child extends Node = ChildNode
+  > extends Container_<Child> {
+    nodes: Child[]
+  }
+
   export interface ValueOptions {
     /**
      * String that’s used to narrow down values and speed up the regexp search.
@@ -14,13 +20,26 @@ declare namespace Container {
     /**
      * An array of property names.
      */
-    props?: string[]
+    props?: readonly string[]
   }
 
   export interface ContainerProps extends NodeProps {
-    nodes?: (ChildNode | ChildProps)[]
+    nodes?: readonly (ChildProps | Node)[]
   }
 
+  /**
+   * All types that can be passed into container methods to create or add a new
+   * child node.
+   */
+  export type NewChild =
+    | ChildProps
+    | Node
+    | readonly ChildProps[]
+    | readonly Node[]
+    | readonly string[]
+    | string
+    | undefined
+
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
   export { Container_ as default }
 }
@@ -43,7 +62,27 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * root.nodes[0].nodes[0].prop //=> 'color'
    * ```
    */
-  nodes: Child[]
+  nodes: Child[] | undefined
+
+  /**
+   * An internal method that converts a {@link NewChild} into a list of actual
+   * child nodes that can then be added to this container.
+   *
+   * This ensures that the nodes' parent is set to this container, that they use
+   * the correct prototype chain, and that they're marked as dirty.
+   *
+   * @param mnodes The new node or nodes to add.
+   * @param sample A node from whose raws the new node's `before` raw should be
+   *               taken.
+   * @param type   This should be set to `'prepend'` if the new nodes will be
+   *               inserted at the beginning of the container.
+   * @hidden
+   */
+  protected normalize(
+    nodes: Container.NewChild,
+    sample: Node | undefined,
+    type?: 'prepend' | false
+  ): Child[]
 
   /**
    * Inserts new nodes to the end of the container.
@@ -65,14 +104,12 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * @param nodes New nodes.
    * @return This node for methods chain.
    */
-  append(
-    ...nodes: (ChildProps | ChildProps[] | Node | Node[] | string | string[])[]
-  ): this
-
+  append(...nodes: Container.NewChild[]): this
   assign(overrides: Container.ContainerProps | object): this
-  clone(overrides?: Partial<Container.ContainerProps>): Container<Child>
-  cloneAfter(overrides?: Partial<Container.ContainerProps>): Container<Child>
-  cloneBefore(overrides?: Partial<Container.ContainerProps>): Container<Child>
+  clone(overrides?: Partial<Container.ContainerProps>): this
+  cloneAfter(overrides?: Partial<Container.ContainerProps>): this
+
+  cloneBefore(overrides?: Partial<Container.ContainerProps>): this
 
   /**
    * Iterates through the container’s immediate children,
@@ -110,7 +147,6 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
   each(
     callback: (node: Child, index: number) => false | void
   ): false | undefined
-
   /**
    * Returns `true` if callback returns `true`
    * for all of the container’s children.
@@ -125,6 +161,7 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
   every(
     condition: (node: Child, index: number, nodes: Child[]) => boolean
   ): boolean
+
   /**
    * Returns a `child`’s index within the `Container#nodes` array.
    *
@@ -136,7 +173,6 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * @return Child index.
    */
   index(child: Child | number): number
-
   /**
    * Insert new node after old node within the container.
    *
@@ -144,10 +180,8 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * @param newNode New node.
    * @return This node for methods chain.
    */
-  insertAfter(
-    oldNode: Child | number,
-    newNode: Child | Child[] | ChildProps | ChildProps[] | string | string[]
-  ): this
+  insertAfter(oldNode: Child | number, newNode: Container.NewChild): this
+
   /**
    * Insert new node before old node within the container.
    *
@@ -159,10 +193,7 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * @param newNode New node.
    * @return This node for methods chain.
    */
-  insertBefore(
-    oldNode: Child | number,
-    newNode: Child | Child[] | ChildProps | ChildProps[] | string | string[]
-  ): this
+  insertBefore(oldNode: Child | number, newNode: Container.NewChild): this
 
   /**
    * Traverses the container’s descendant nodes, calling callback
@@ -201,9 +232,7 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * @param nodes New nodes.
    * @return This node for methods chain.
    */
-  prepend(
-    ...nodes: (ChildProps | ChildProps[] | Node | Node[] | string | string[])[]
-  ): this
+  prepend(...nodes: Container.NewChild[]): this
   /**
    * Add child to the end of the node.
    *
@@ -265,8 +294,8 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * ```
    *
    * @param pattern      Replace pattern.
-   * @param {object} opts                Options to speed up the search.
-   * @param callback   String to replace pattern or callback
+   * @param {object} options             Options to speed up the search.
+   * @param replaced   String to replace pattern or callback
    *                                     that returns a new value. The callback
    *                                     will receive the same arguments
    *                                     as those passed to a function parameter
@@ -447,6 +476,8 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
   get last(): Child | undefined
 }
 
-declare class Container<Child extends Node = ChildNode> extends Container_<Child> {}
+declare class Container<
+  Child extends Node = ChildNode
+> extends Container_<Child> {}
 
 export = Container

package/lib/container.js

@@ -1,11 +1,11 @@
 'use strict'
 
-let { isClean, my } = require('./symbols')
-let Declaration = require('./declaration')
 let Comment = require('./comment')
+let Declaration = require('./declaration')
 let Node = require('./node')
+let { isClean, my } = require('./symbols')
 
-let parse, Rule, AtRule, Root
+let AtRule, parse, Root, Rule
 
 function cleanSource(nodes) {
   return nodes.map(i => {
@@ -15,11 +15,11 @@ function cleanSource(nodes) {
   })
 }
 
-function markDirtyUp(node) {
+function markTreeDirty(node) {
   node[isClean] = false
   if (node.proxyOf.nodes) {
     for (let i of node.proxyOf.nodes) {
-      markDirtyUp(i)
+      markTreeDirty(i)
     }
   }
 }
@@ -153,7 +153,11 @@ class Container extends Node {
   insertBefore(exist, add) {
     let existIndex = this.index(exist)
     let type = existIndex === 0 ? 'prepend' : false
-    let nodes = this.normalize(add, this.proxyOf.nodes[existIndex], type).reverse()
+    let nodes = this.normalize(
+      add,
+      this.proxyOf.nodes[existIndex],
+      type
+    ).reverse()
     existIndex = this.index(exist)
     for (let node of nodes) this.proxyOf.nodes.splice(existIndex, 0, node)
 
@@ -173,6 +177,8 @@ class Container extends Node {
   normalize(nodes, sample) {
     if (typeof nodes === 'string') {
       nodes = cleanSource(parse(nodes).nodes)
+    } else if (typeof nodes === 'undefined') {
+      nodes = []
     } else if (Array.isArray(nodes)) {
       nodes = nodes.slice(0)
       for (let i of nodes) {
@@ -192,7 +198,7 @@ class Container extends Node {
         nodes.value = String(nodes.value)
       }
       nodes = [new Declaration(nodes)]
-    } else if (nodes.selector) {
+    } else if (nodes.selector || nodes.selectors) {
       nodes = [new Rule(nodes)]
     } else if (nodes.name) {
       nodes = [new AtRule(nodes)]
@@ -207,7 +213,9 @@ class Container extends Node {
       if (!i[my]) Container.rebuild(i)
       i = i.proxyOf
       if (i.parent) i.parent.removeChild(i)
-      if (i[isClean]) markDirtyUp(i)
+      if (i[isClean]) markTreeDirty(i)
+
+      if (!i.raws) i.raws = {}
       if (typeof i.raws.before === 'undefined') {
         if (sample && typeof sample.raws.before !== 'undefined') {
           i.raws.before = sample.raws.before.replace(/\S/g, '')

package/lib/css-syntax-error.d.ts

@@ -49,7 +49,7 @@ declare namespace CssSyntaxError {
  * }
  * ```
  */
-declare class CssSyntaxError_ {
+declare class CssSyntaxError_ extends Error {
   /**
    * Source column of the error.
    *

package/lib/css-syntax-error.js

@@ -52,37 +52,70 @@ class CssSyntaxError extends Error {
 
     let css = this.source
     if (color == null) color = pico.isColorSupported
-    if (terminalHighlight) {
-      if (color) css = terminalHighlight(css)
-    }
-
-    let lines = css.split(/\r?\n/)
-    let start = Math.max(this.line - 3, 0)
-    let end = Math.min(this.line + 2, lines.length)
 
-    let maxWidth = String(end).length
-
-    let mark, aside
+    let aside = text => text
+    let mark = text => text
+    let highlight = text => text
     if (color) {
       let { bold, gray, red } = pico.createColors(true)
       mark = text => bold(red(text))
       aside = text => gray(text)
-    } else {
-      mark = aside = str => str
+      if (terminalHighlight) {
+        highlight = text => terminalHighlight(text)
+      }
     }
 
+    let lines = css.split(/\r?\n/)
+    let start = Math.max(this.line - 3, 0)
+    let end = Math.min(this.line + 2, lines.length)
+    let maxWidth = String(end).length
+
     return lines
       .slice(start, end)
       .map((line, index) => {
         let number = start + 1 + index
         let gutter = ' ' + (' ' + number).slice(-maxWidth) + ' | '
         if (number === this.line) {
+          if (line.length > 160) {
+            let padding = 20
+            let subLineStart = Math.max(0, this.column - padding)
+            let subLineEnd = Math.max(
+              this.column + padding,
+              this.endColumn + padding
+            )
+            let subLine = line.slice(subLineStart, subLineEnd)
+
+            let spacing =
+              aside(gutter.replace(/\d/g, ' ')) +
+              line
+                .slice(0, Math.min(this.column - 1, padding - 1))
+                .replace(/[^\t]/g, ' ')
+
+            return (
+              mark('>') +
+              aside(gutter) +
+              highlight(subLine) +
+              '\n ' +
+              spacing +
+              mark('^')
+            )
+          }
+
           let spacing =
             aside(gutter.replace(/\d/g, ' ')) +
             line.slice(0, this.column - 1).replace(/[^\t]/g, ' ')
-          return mark('>') + aside(gutter) + line + '\n ' + spacing + mark('^')
+
+          return (
+            mark('>') +
+            aside(gutter) +
+            highlight(line) +
+            '\n ' +
+            spacing +
+            mark('^')
+          )
         }
-        return ' ' + aside(gutter) + line
+
+        return ' ' + aside(gutter) + highlight(line)
       })
       .join('\n')
   }

package/lib/declaration.d.ts

@@ -1,4 +1,4 @@
-import Container from './container.js'
+import { ContainerWithChildren } from './container.js'
 import Node from './node.js'
 
 declare namespace Declaration {
@@ -63,6 +63,19 @@ declare namespace Declaration {
  * ```
  */
 declare class Declaration_ extends Node {
+  parent: ContainerWithChildren | undefined
+  raws: Declaration.DeclarationRaws
+
+  type: 'decl'
+
+  constructor(defaults?: Declaration.DeclarationProps)
+  assign(overrides: Declaration.DeclarationProps | object): this
+
+  clone(overrides?: Partial<Declaration.DeclarationProps>): this
+
+  cloneAfter(overrides?: Partial<Declaration.DeclarationProps>): this
+
+  cloneBefore(overrides?: Partial<Declaration.DeclarationProps>): this
   /**
    * It represents a specificity of the declaration.
    *
@@ -77,10 +90,9 @@ declare class Declaration_ extends Node {
    * root.first.last.important  //=> undefined
    * ```
    */
-  important: boolean
-
-  parent: Container | undefined
+  get important(): boolean
 
+  set important(value: boolean)
   /**
    * The property name for a CSS declaration.
    *
@@ -91,12 +103,9 @@ declare class Declaration_ extends Node {
    * decl.prop //=> 'color'
    * ```
    */
-  prop: string
-
-  raws: Declaration.DeclarationRaws
-
-  type: 'decl'
+  get prop(): string
 
+  set prop(value: string)
   /**
    * The property value for a CSS declaration.
    *
@@ -114,8 +123,8 @@ declare class Declaration_ extends Node {
    * decl.value //=> 'black'
    * ```
    */
-  value: string
-
+  get value(): string
+  set value(value: string)
   /**
    * It represents a getter that returns `true` if a declaration starts with
    * `--` or `$`, which are used to declare variables in CSS and SASS/SCSS.
@@ -134,13 +143,7 @@ declare class Declaration_ extends Node {
    * one.variable //=> true
    * ```
    */
-  variable: boolean
-
-  constructor(defaults?: Declaration.DeclarationProps)
-  assign(overrides: Declaration.DeclarationProps | object): this
-  clone(overrides?: Partial<Declaration.DeclarationProps>): Declaration
-  cloneAfter(overrides?: Partial<Declaration.DeclarationProps>): Declaration
-  cloneBefore(overrides?: Partial<Declaration.DeclarationProps>): Declaration
+  get variable(): boolean
 }
 
 declare class Declaration extends Declaration_ {}

package/lib/document.d.ts

@@ -5,7 +5,7 @@ import Root from './root.js'
 
 declare namespace Document {
   export interface DocumentProps extends ContainerProps {
-    nodes?: Root[]
+    nodes?: readonly Root[]
 
     /**
      * Information to generate byte-to-byte equal node string as it was
@@ -35,15 +35,16 @@ declare namespace Document {
  * ```
  */
 declare class Document_ extends Container<Root> {
+  nodes: Root[]
   parent: undefined
   type: 'document'
 
   constructor(defaults?: Document.DocumentProps)
 
   assign(overrides: Document.DocumentProps | object): this
-  clone(overrides?: Partial<Document.DocumentProps>): Document
-  cloneAfter(overrides?: Partial<Document.DocumentProps>): Document
-  cloneBefore(overrides?: Partial<Document.DocumentProps>): Document
+  clone(overrides?: Partial<Document.DocumentProps>): this
+  cloneAfter(overrides?: Partial<Document.DocumentProps>): this
+  cloneBefore(overrides?: Partial<Document.DocumentProps>): this
 
   /**
    * Returns a `Result` instance representing the document’s CSS roots.

package/lib/fromJSON.js

@@ -1,10 +1,10 @@
 'use strict'
 
-let Declaration = require('./declaration')
-let PreviousMap = require('./previous-map')
-let Comment = require('./comment')
 let AtRule = require('./at-rule')
+let Comment = require('./comment')
+let Declaration = require('./declaration')
 let Input = require('./input')
+let PreviousMap = require('./previous-map')
 let Root = require('./root')
 let Rule = require('./rule')
 

package/lib/input.d.ts

@@ -174,6 +174,9 @@ declare class Input_ {
     endLine?: number,
     endColumn?: number
   ): false | Input.FilePosition
+  /** Converts this to a JSON-friendly object representation. */
+  toJSON(): object
+
   /**
    * The CSS source identifier. Contains `Input#file` if the user
    * set the `from` option, or `Input#id` if they did not.

package/lib/input.js

@@ -1,13 +1,13 @@
 'use strict'
 
+let { nanoid } = require('nanoid/non-secure')
+let { isAbsolute, resolve } = require('path')
 let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 let { fileURLToPath, pathToFileURL } = require('url')
-let { isAbsolute, resolve } = require('path')
-let { nanoid } = require('nanoid/non-secure')
 
-let terminalHighlight = require('./terminal-highlight')
 let CssSyntaxError = require('./css-syntax-error')
 let PreviousMap = require('./previous-map')
+let terminalHighlight = require('./terminal-highlight')
 
 let fromOffsetCache = Symbol('fromOffsetCache')
 
@@ -61,7 +61,7 @@ class Input {
   }
 
   error(message, line, column, opts = {}) {
-    let result, endLine, endColumn
+    let endColumn, endLine, result
 
     if (line && typeof line === 'object') {
       let start = line

package/lib/lazy-result.js

@@ -1,14 +1,14 @@
 'use strict'
 
-let { isClean, my } = require('./symbols')
-let MapGenerator = require('./map-generator')
-let stringify = require('./stringify')
 let Container = require('./container')
 let Document = require('./document')
-let warnOnce = require('./warn-once')
-let Result = require('./result')
+let MapGenerator = require('./map-generator')
 let parse = require('./parse')
+let Result = require('./result')
 let Root = require('./root')
+let stringify = require('./stringify')
+let { isClean, my } = require('./symbols')
+let warnOnce = require('./warn-once')
 
 const TYPE_TO_CLASS_NAME = {
   atrule: 'AtRule',

package/lib/list.d.ts

@@ -47,11 +47,14 @@ declare namespace list {
      * @param last boolean indicator.
      * @return Split values.
      */
-    split(string: string, separators: string[], last: boolean): string[]
+    split(
+      string: string,
+      separators: readonly string[],
+      last: boolean
+    ): string[]
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 declare const list: list.List
 
 export = list