postcss 8.5.2 → 8.5.4

package/README.md

@@ -9,7 +9,7 @@ These plugins can lint your CSS, support variables and mixins,
 transpile future CSS syntax, inline images, and more.
 
 PostCSS is used by industry leaders including Wikipedia, Twitter, Alibaba,
-and JetBrains. The [Autoprefixer] and [Stylelint] PostCSS plugins is one of the most popular CSS tools.
+and JetBrains. The [Autoprefixer] and [Stylelint] PostCSS plugins are some of the most popular CSS tools.
 
 ---
 

package/lib/at-rule.d.ts

@@ -97,19 +97,11 @@ declare class AtRule_ extends Container {
    * layer.nodes //=> undefined
    * ```
    */
-  nodes: Container['nodes']
+  nodes: Container['nodes'] | undefined
   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 `@`.
    *
@@ -121,6 +113,7 @@ declare class AtRule_ extends Container {
    */
   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.
@@ -132,7 +125,14 @@ declare class AtRule_ extends Container {
    * ```
    */
   get params(): string
+
   set params(value: string)
+
+  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
 }
 
 declare class AtRule extends AtRule_ {}

package/lib/comment.d.ts

@@ -49,18 +49,18 @@ declare class Comment_ extends Node {
   parent: Container | undefined
   raws: Comment.CommentRaws
   type: 'comment'
-  constructor(defaults?: Comment.CommentProps)
-
-  assign(overrides: Comment.CommentProps | object): this
-
-  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)
+
+  constructor(defaults?: Comment.CommentProps)
+  assign(overrides: Comment.CommentProps | object): this
+  clone(overrides?: Partial<Comment.CommentProps>): this
+  cloneAfter(overrides?: Partial<Comment.CommentProps>): this
+  cloneBefore(overrides?: Partial<Comment.CommentProps>): this
 }
 
 declare class Comment extends Comment_ {}

package/lib/container.d.ts

@@ -65,25 +65,22 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
   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.
+   * The container’s first child.
    *
-   * @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
+   * ```js
+   * rule.first === rules.nodes[0]
+   * ```
    */
-  protected normalize(
-    nodes: Container.NewChild,
-    sample: Node | undefined,
-    type?: 'prepend' | false
-  ): Child[]
+  get first(): Child | undefined
 
+  /**
+   * The container’s last child.
+   *
+   * ```js
+   * rule.last === rule.nodes[rule.nodes.length - 1]
+   * ```
+   */
+  get last(): Child | undefined
   /**
    * Inserts new nodes to the end of the container.
    *
@@ -107,10 +104,10 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
   append(...nodes: Container.NewChild[]): this
   assign(overrides: Container.ContainerProps | object): this
   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,
    * calling `callback` for each child.
@@ -147,6 +144,7 @@ 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.
@@ -161,7 +159,6 @@ 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.
    *
@@ -173,6 +170,7 @@ 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.
    *
@@ -182,19 +180,6 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    */
   insertAfter(oldNode: Child | number, newNode: Container.NewChild): this
 
-  /**
-   * Insert new node before old node within the container.
-   *
-   * ```js
-   * rule.insertBefore(decl, decl.clone({ prop: '-webkit-' + decl.prop }))
-   * ```
-   *
-   * @param oldNode Child or child’s index.
-   * @param newNode New node.
-   * @return This node for methods chain.
-   */
-  insertBefore(oldNode: Child | number, newNode: Container.NewChild): this
-
   /**
    * Traverses the container’s descendant nodes, calling callback
    * for each comment node.
@@ -212,6 +197,18 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * @return Returns `false` if iteration was broke.
    */
 
+  /**
+   * Insert new node before old node within the container.
+   *
+   * ```js
+   * rule.insertBefore(decl, decl.clone({ prop: '-webkit-' + decl.prop }))
+   * ```
+   *
+   * @param oldNode Child or child’s index.
+   * @param newNode New node.
+   * @return This node for methods chain.
+   */
+  insertBefore(oldNode: Child | number, newNode: Container.NewChild): this
   /**
    * Inserts new nodes to the start of the container.
    *
@@ -233,6 +230,7 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
    * @return This node for methods chain.
    */
   prepend(...nodes: Container.NewChild[]): this
+
   /**
    * Add child to the end of the node.
    *
@@ -278,7 +276,6 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
     pattern: RegExp | string,
     replaced: { (substring: string, ...args: any[]): string } | string
   ): this
-
   /**
    * Passes all declaration values within the container that match pattern
    * through callback, replacing those values with the returned result
@@ -379,14 +376,13 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
     nameFilter: RegExp | string,
     callback: (atRule: AtRule, index: number) => false | void
   ): false | undefined
-
   walkAtRules(
     callback: (atRule: AtRule, index: number) => false | void
   ): false | undefined
+
   walkComments(
     callback: (comment: Comment, indexed: number) => false | void
   ): false | undefined
-
   walkComments(
     callback: (comment: Comment, indexed: number) => false | void
   ): false | undefined
@@ -424,11 +420,9 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
     propFilter: RegExp | string,
     callback: (decl: Declaration, index: number) => false | void
   ): false | undefined
-
   walkDecls(
     callback: (decl: Declaration, index: number) => false | void
   ): false | undefined
-
   /**
    * Traverses the container’s descendant nodes, calling callback
    * for each rule node.
@@ -459,21 +453,24 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
     callback: (rule: Rule, index: number) => false | void
   ): false | undefined
   /**
-   * The container’s first child.
+   * An internal method that converts a {@link NewChild} into a list of actual
+   * child nodes that can then be added to this container.
    *
-   * ```js
-   * rule.first === rules.nodes[0]
-   * ```
-   */
-  get first(): Child | undefined
-  /**
-   * The container’s last child.
+   * 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.
    *
-   * ```js
-   * rule.last === rule.nodes[rule.nodes.length - 1]
-   * ```
+   * @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
    */
-  get last(): Child | undefined
+  protected normalize(
+    nodes: Container.NewChild,
+    sample: Node | undefined,
+    type?: 'prepend' | false
+  ): Child[]
 }
 
 declare class Container<

package/lib/container.js

@@ -25,6 +25,16 @@ function markTreeDirty(node) {
 }
 
 class Container extends Node {
+  get first() {
+    if (!this.proxyOf.nodes) return undefined
+    return this.proxyOf.nodes[0]
+  }
+
+  get last() {
+    if (!this.proxyOf.nodes) return undefined
+    return this.proxyOf.nodes[this.proxyOf.nodes.length - 1]
+  }
+
   append(...children) {
     for (let child of children) {
       let nodes = this.normalize(child, this.last)
@@ -391,16 +401,6 @@ class Container extends Node {
       }
     })
   }
-
-  get first() {
-    if (!this.proxyOf.nodes) return undefined
-    return this.proxyOf.nodes[0]
-  }
-
-  get last() {
-    if (!this.proxyOf.nodes) return undefined
-    return this.proxyOf.nodes[this.proxyOf.nodes.length - 1]
-  }
 }
 
 Container.registerParse = dependant => {

package/lib/declaration.d.ts

@@ -68,14 +68,6 @@ declare class Declaration_ extends Node {
 
   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.
    *
@@ -91,8 +83,8 @@ declare class Declaration_ extends Node {
    * ```
    */
   get important(): boolean
-
   set important(value: boolean)
+
   /**
    * The property name for a CSS declaration.
    *
@@ -106,6 +98,7 @@ declare class Declaration_ extends Node {
   get prop(): string
 
   set prop(value: string)
+
   /**
    * The property value for a CSS declaration.
    *
@@ -125,6 +118,7 @@ declare class Declaration_ extends Node {
    */
   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.
@@ -144,6 +138,12 @@ declare class Declaration_ extends Node {
    * ```
    */
   get variable(): boolean
+  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
 }
 
 declare class Declaration extends Declaration_ {}

package/lib/declaration.js

@@ -3,6 +3,10 @@
 let Node = require('./node')
 
 class Declaration extends Node {
+  get variable() {
+    return this.prop.startsWith('--') || this.prop[0] === '$'
+  }
+
   constructor(defaults) {
     if (
       defaults &&
@@ -14,10 +18,6 @@ class Declaration extends Node {
     super(defaults)
     this.type = 'decl'
   }
-
-  get variable() {
-    return this.prop.startsWith('--') || this.prop[0] === '$'
-  }
 }
 
 module.exports = Declaration

package/lib/input.d.ts

@@ -18,6 +18,11 @@ declare namespace Input {
      */
     endLine?: number
 
+    /**
+     * Offset of exclusive end position in source file.
+     */
+    endOffset?: number
+
     /**
      * Absolute path to the source file.
      */
@@ -28,6 +33,11 @@ declare namespace Input {
      */
     line: number
 
+    /**
+     * Offset of inclusive start position in source file.
+     */
+    offset: number
+
     /**
      * Source code.
      */
@@ -111,12 +121,29 @@ declare class Input_ {
    */
   map: PreviousMap
 
+  /**
+   * The CSS source identifier. Contains `Input#file` if the user
+   * set the `from` option, or `Input#id` if they did not.
+   *
+   * ```js
+   * const root = postcss.parse(css, { from: 'a.css' })
+   * root.source.input.from //=> "/home/ai/a.css"
+   *
+   * const root = postcss.parse(css)
+   * root.source.input.from //=> "<input css 1>"
+   * ```
+   */
+  get from(): string
+
   /**
    * @param css  Input CSS source.
    * @param opts Process options.
    */
   constructor(css: string, opts?: ProcessOptions)
 
+  /**
+   * Returns `CssSyntaxError` with information about the error and its position.
+   */
   error(
     message: string,
     start:
@@ -137,29 +164,34 @@ declare class Input_ {
         },
     opts?: { plugin?: CssSyntaxError['plugin'] }
   ): CssSyntaxError
-
-  /**
-   * Returns `CssSyntaxError` with information about the error and its position.
-   */
   error(
     message: string,
     line: number,
     column: number,
     opts?: { plugin?: CssSyntaxError['plugin'] }
   ): CssSyntaxError
-
   error(
     message: string,
     offset: number,
     opts?: { plugin?: CssSyntaxError['plugin'] }
   ): CssSyntaxError
 
+  /**
+   * Converts source line and column to offset.
+   *
+   * @param line   Source line.
+   * @param column Source column.
+   * @return Source offset.
+   */
+  fromLineAndColumn(line: number, column: number): number
+
   /**
    * Converts source offset to line and column.
    *
    * @param offset Source offset.
    */
   fromOffset(offset: number): { col: number; line: number } | null
+
   /**
    * Reads the input source map and returns a symbol position
    * in the input source (e.g., in a Sass file that was compiled
@@ -185,22 +217,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.
-   *
-   * ```js
-   * const root = postcss.parse(css, { from: 'a.css' })
-   * root.source.input.from //=> "/home/ai/a.css"
-   *
-   * const root = postcss.parse(css)
-   * root.source.input.from //=> "<input css 1>"
-   * ```
-   */
-  get from(): string
 }
 
 declare class Input extends Input_ {}

package/lib/input.js

@@ -9,12 +9,31 @@ let CssSyntaxError = require('./css-syntax-error')
 let PreviousMap = require('./previous-map')
 let terminalHighlight = require('./terminal-highlight')
 
-let fromOffsetCache = Symbol('fromOffsetCache')
+let lineToIndexCache = Symbol('lineToIndexCache')
 
 let sourceMapAvailable = Boolean(SourceMapConsumer && SourceMapGenerator)
 let pathAvailable = Boolean(resolve && isAbsolute)
 
+function getLineToIndex(input) {
+  if (input[lineToIndexCache]) return input[lineToIndexCache]
+  let lines = input.css.split('\n')
+  let lineToIndex = new Array(lines.length)
+  let prevIndex = 0
+
+  for (let i = 0, l = lines.length; i < l; i++) {
+    lineToIndex[i] = prevIndex
+    prevIndex += lines[i].length + 1
+  }
+
+  input[lineToIndexCache] = lineToIndex
+  return lineToIndex
+}
+
 class Input {
+  get from() {
+    return this.file || this.id
+  }
+
   constructor(css, opts = {}) {
     if (
       css === null ||
@@ -64,31 +83,38 @@ class Input {
   }
 
   error(message, line, column, opts = {}) {
-    let endColumn, endLine, result
+    let endColumn, endLine, endOffset, offset, result
 
     if (line && typeof line === 'object') {
       let start = line
       let end = column
       if (typeof start.offset === 'number') {
-        let pos = this.fromOffset(start.offset)
+        offset = start.offset
+        let pos = this.fromOffset(offset)
         line = pos.line
         column = pos.col
       } else {
         line = start.line
         column = start.column
+        offset = this.fromLineAndColumn(line, column)
       }
       if (typeof end.offset === 'number') {
-        let pos = this.fromOffset(end.offset)
+        endOffset = end.offset
+        let pos = this.fromOffset(endOffset)
         endLine = pos.line
         endColumn = pos.col
       } else {
         endLine = end.line
         endColumn = end.column
+        endOffset = this.fromLineAndColumn(end.line, end.column)
       }
     } else if (!column) {
-      let pos = this.fromOffset(line)
+      offset = line
+      let pos = this.fromOffset(offset)
       line = pos.line
       column = pos.col
+    } else {
+      offset = this.fromLineAndColumn(line, column)
     }
 
     let origin = this.origin(line, column, endLine, endColumn)
@@ -116,7 +142,7 @@ class Input {
       )
     }
 
-    result.input = { column, endColumn, endLine, line, source: this.css }
+    result.input = { column, endColumn, endLine, endOffset, line, offset, source: this.css }
     if (this.file) {
       if (pathToFileURL) {
         result.input.url = pathToFileURL(this.file).toString()
@@ -127,23 +153,15 @@ class Input {
     return result
   }
 
-  fromOffset(offset) {
-    let lastLine, lineToIndex
-    if (!this[fromOffsetCache]) {
-      let lines = this.css.split('\n')
-      lineToIndex = new Array(lines.length)
-      let prevIndex = 0
-
-      for (let i = 0, l = lines.length; i < l; i++) {
-        lineToIndex[i] = prevIndex
-        prevIndex += lines[i].length + 1
-      }
+  fromLineAndColumn(line, column) {
+    let lineToIndex = getLineToIndex(this)
+    let index = lineToIndex[line - 1]
+    return index + column - 1
+  }
 
-      this[fromOffsetCache] = lineToIndex
-    } else {
-      lineToIndex = this[fromOffsetCache]
-    }
-    lastLine = lineToIndex[lineToIndex.length - 1]
+  fromOffset(offset) {
+    let lineToIndex = getLineToIndex(this)
+    let lastLine = lineToIndex[lineToIndex.length - 1]
 
     let min = 0
     if (offset >= lastLine) {
@@ -237,10 +255,6 @@ class Input {
     }
     return json
   }
-
-  get from() {
-    return this.file || this.id
-  }
 }
 
 module.exports = Input