postcss 8.4.31 → 8.4.49

package/lib/map-generator.js

@@ -1,7 +1,7 @@
 'use strict'
 
-let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 let { dirname, relative, resolve, sep } = require('path')
+let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 let { pathToFileURL } = require('url')
 
 let Input = require('./input')
@@ -16,6 +16,7 @@ class MapGenerator {
     this.root = root
     this.opts = opts
     this.css = cssString
+    this.originalCSS = cssString
     this.usesFileUrls = !this.mapOpts.from && this.mapOpts.absolute
 
     this.memoizedFileURLs = new Map()
@@ -51,7 +52,7 @@ class MapGenerator {
       if (this.mapOpts.sourcesContent === false) {
         map = new SourceMapConsumer(prev.text)
         if (map.sourcesContent) {
-          map.sourcesContent = map.sourcesContent.map(() => null)
+          map.sourcesContent = null
         }
       } else {
         map = prev.consumer()
@@ -69,12 +70,12 @@ class MapGenerator {
       for (let i = this.root.nodes.length - 1; i >= 0; i--) {
         node = this.root.nodes[i]
         if (node.type !== 'comment') continue
-        if (node.text.indexOf('# sourceMappingURL=') === 0) {
+        if (node.text.startsWith('# sourceMappingURL=')) {
           this.root.removeChild(i)
         }
       }
     } else if (this.css) {
-      this.css = this.css.replace(/(\n)?\/\*#[\S\s]*?\*\/$/gm, '')
+      this.css = this.css.replace(/\n*\/\*#[\S\s]*?\*\/$/gm, '')
     }
   }
 
@@ -97,9 +98,14 @@ class MapGenerator {
     } else if (this.previous().length === 1) {
       let prev = this.previous()[0].consumer()
       prev.file = this.outputFile()
-      this.map = SourceMapGenerator.fromSourceMap(prev)
+      this.map = SourceMapGenerator.fromSourceMap(prev, {
+        ignoreInvalidMapping: true
+      })
     } else {
-      this.map = new SourceMapGenerator({ file: this.outputFile() })
+      this.map = new SourceMapGenerator({
+        file: this.outputFile(),
+        ignoreInvalidMapping: true
+      })
       this.map.addMapping({
         generated: { column: 0, line: 1 },
         original: { column: 0, line: 1 },
@@ -122,7 +128,10 @@ class MapGenerator {
 
   generateString() {
     this.css = ''
-    this.map = new SourceMapGenerator({ file: this.outputFile() })
+    this.map = new SourceMapGenerator({
+      file: this.outputFile(),
+      ignoreInvalidMapping: true
+    })
 
     let line = 1
     let column = 1
@@ -134,7 +143,7 @@ class MapGenerator {
       source: ''
     }
 
-    let lines, last
+    let last, lines
     this.stringify(this.root, (str, node, type) => {
       this.css += str
 
@@ -276,7 +285,7 @@ class MapGenerator {
           }
         })
       } else {
-        let input = new Input(this.css, this.opts)
+        let input = new Input(this.originalCSS, this.opts)
         if (input.map) this.previousMaps.push(input.map)
       }
     }

package/lib/no-work-result.js

@@ -1,10 +1,10 @@
 'use strict'
 
 let MapGenerator = require('./map-generator')
-let stringify = require('./stringify')
-let warnOnce = require('./warn-once')
 let parse = require('./parse')
 const Result = require('./result')
+let stringify = require('./stringify')
+let warnOnce = require('./warn-once')
 
 class NoWorkResult {
   constructor(processor, css, opts) {
@@ -37,6 +37,9 @@ class NoWorkResult {
       if (generatedMap) {
         this.result.map = generatedMap
       }
+    } else {
+      map.clearAnnotation()
+      this.result.css = map.css
     }
   }
 

package/lib/node.d.ts

@@ -2,7 +2,7 @@ import AtRule = require('./at-rule.js')
 
 import { AtRuleProps } from './at-rule.js'
 import Comment, { CommentProps } from './comment.js'
-import Container from './container.js'
+import Container, { NewChild } from './container.js'
 import CssSyntaxError from './css-syntax-error.js'
 import Declaration, { DeclarationProps } from './declaration.js'
 import Document from './document.js'
@@ -234,6 +234,14 @@ declare abstract class Node_ {
 
   constructor(defaults?: object)
 
+  /**
+   * If this node isn't already dirty, marks it and its ancestors as such. This
+   * indicates to the LazyResult processor that the {@link Root} has been
+   * modified by the current plugin and may need to be processed again by other
+   * plugins.
+   */
+  protected markDirty(): void
+
   /**
    * Insert new node after current node to current node’s parent.
    *
@@ -246,7 +254,9 @@ declare abstract class Node_ {
    * @param newNode New node.
    * @return This node for methods chain.
    */
-  after(newNode: Node | Node.ChildProps | Node[] | string): this
+  after(
+    newNode: Node | Node.ChildProps | readonly Node[] | string | undefined
+  ): this
 
   /**
    * It assigns properties to an existing node instance.
@@ -273,7 +283,9 @@ declare abstract class Node_ {
    * @param newNode New node.
    * @return This node for methods chain.
    */
-  before(newNode: Node | Node.ChildProps | Node[] | string): this
+  before(
+    newNode: Node | Node.ChildProps | readonly Node[] | string | undefined
+  ): this
 
   /**
    * Clear the code style properties for the node and its children.
@@ -303,7 +315,7 @@ declare abstract class Node_ {
    *
    * @return Duplicate of the node instance.
    */
-  clone(overrides?: object): Node
+  clone(overrides?: object): this
 
   /**
    * Shortcut to clone the node and insert the resulting cloned node
@@ -312,7 +324,7 @@ declare abstract class Node_ {
    * @param overrides New properties to override in the clone.
    * @return New node.
    */
-  cloneAfter(overrides?: object): Node
+  cloneAfter(overrides?: object): this
 
   /**
    * Shortcut to clone the node and insert the resulting cloned node
@@ -326,7 +338,7 @@ declare abstract class Node_ {
    *
    * @return New node
    */
-  cloneBefore(overrides?: object): Node
+  cloneBefore(overrides?: object): this
 
   /**
    * It creates an instance of the class `CssSyntaxError` and parameters passed
@@ -470,14 +482,7 @@ declare abstract class Node_ {
    * @param nodes Mode(s) to replace current one.
    * @return Current node to methods chain.
    */
-  replaceWith(
-    ...nodes: (
-      | Node.ChildNode
-      | Node.ChildNode[]
-      | Node.ChildProps
-      | Node.ChildProps[]
-    )[]
-  ): this
+  replaceWith(...nodes: NewChild[]): this
 
   /**
    * Finds the Root instance of the node’s tree.
@@ -531,6 +536,6 @@ declare abstract class Node_ {
   warn(result: Result, message: string, options?: WarningOptions): Warning
 }
 
-declare class Node extends Node_ { }
+declare class Node extends Node_ {}
 
 export = Node

package/lib/node.js

@@ -1,9 +1,9 @@
 'use strict'
 
-let { isClean, my } = require('./symbols')
 let CssSyntaxError = require('./css-syntax-error')
 let Stringifier = require('./stringifier')
 let stringify = require('./stringify')
+let { isClean, my } = require('./symbols')
 
 function cloneNode(obj, parent) {
   let cloned = new obj.constructor()
@@ -32,6 +32,36 @@ function cloneNode(obj, parent) {
   return cloned
 }
 
+function sourceOffset(inputCSS, position) {
+  // Not all custom syntaxes support `offset` in `source.start` and `source.end`
+  if (
+    position &&
+    typeof position.offset !== 'undefined'
+  ) {
+    return position.offset;
+  }
+
+  let column = 1
+  let line = 1
+  let offset = 0
+
+  for (let i = 0; i < inputCSS.length; i++) {
+    if (line === position.line && column === position.column) {
+      offset = i
+      break
+    }
+
+    if (inputCSS[i] === '\n') {
+      column = 1
+      line += 1
+    } else {
+      column += 1
+    }
+  }
+
+  return offset
+}
+
 class Node {
   constructor(defaults = {}) {
     this.raws = {}
@@ -153,6 +183,11 @@ class Node {
     }
   }
 
+  /* c8 ignore next 3 */
+  markClean() {
+    this[isClean] = true
+  }
+
   markDirty() {
     if (this[isClean]) {
       this[isClean] = false
@@ -169,25 +204,29 @@ class Node {
     return this.parent.nodes[index + 1]
   }
 
-  positionBy(opts, stringRepresentation) {
+  positionBy(opts) {
     let pos = this.source.start
     if (opts.index) {
-      pos = this.positionInside(opts.index, stringRepresentation)
+      pos = this.positionInside(opts.index)
     } else if (opts.word) {
-      stringRepresentation = this.toString()
+      let stringRepresentation = this.source.input.css.slice(
+        sourceOffset(this.source.input.css, this.source.start),
+        sourceOffset(this.source.input.css, this.source.end)
+      )
       let index = stringRepresentation.indexOf(opts.word)
-      if (index !== -1) pos = this.positionInside(index, stringRepresentation)
+      if (index !== -1) pos = this.positionInside(index)
     }
     return pos
   }
 
-  positionInside(index, stringRepresentation) {
-    let string = stringRepresentation || this.toString()
+  positionInside(index) {
     let column = this.source.start.column
     let line = this.source.start.line
+    let offset = sourceOffset(this.source.input.css, this.source.start)
+    let end = offset + index
 
-    for (let i = 0; i < index; i++) {
-      if (string[i] === '\n') {
+    for (let i = offset; i < end; i++) {
+      if (this.source.input.css[i] === '\n') {
         column = 1
         line += 1
       } else {
@@ -211,20 +250,25 @@ class Node {
     }
     let end = this.source.end
       ? {
-        column: this.source.end.column + 1,
-        line: this.source.end.line
-      }
+          column: this.source.end.column + 1,
+          line: this.source.end.line
+        }
       : {
-        column: start.column + 1,
-        line: start.line
-      }
+          column: start.column + 1,
+          line: start.line
+        }
 
     if (opts.word) {
-      let stringRepresentation = this.toString()
+      let stringRepresentation = this.source.input.css.slice(
+        sourceOffset(this.source.input.css, this.source.start),
+        sourceOffset(this.source.input.css, this.source.end)
+      )
       let index = stringRepresentation.indexOf(opts.word)
       if (index !== -1) {
-        start = this.positionInside(index, stringRepresentation)
-        end = this.positionInside(index + opts.word.length, stringRepresentation)
+        start = this.positionInside(index)
+        end = this.positionInside(
+          index + opts.word.length,
+        )
       }
     } else {
       if (opts.start) {
@@ -241,7 +285,7 @@ class Node {
           column: opts.end.column,
           line: opts.end.line
         }
-      } else if (opts.endIndex) {
+      } else if (typeof opts.endIndex === 'number') {
         end = this.positionInside(opts.endIndex)
       } else if (opts.index) {
         end = this.positionInside(opts.index + 1)

package/lib/parse.js

@@ -1,8 +1,8 @@
 'use strict'
 
 let Container = require('./container')
-let Parser = require('./parser')
 let Input = require('./input')
+let Parser = require('./parser')
 
 function parse(css, opts) {
   let input = new Input(css, opts)

package/lib/parser.js

@@ -1,11 +1,11 @@
 'use strict'
 
-let Declaration = require('./declaration')
-let tokenizer = require('./tokenize')
-let Comment = require('./comment')
 let AtRule = require('./at-rule')
+let Comment = require('./comment')
+let Declaration = require('./declaration')
 let Root = require('./root')
 let Rule = require('./rule')
+let tokenizer = require('./tokenize')
 
 const SAFE_COMMENT_NEIGHBOR = {
   empty: true,
@@ -28,7 +28,6 @@ class Parser {
     this.current = this.root
     this.spaces = ''
     this.semicolon = false
-    this.customProperty = false
 
     this.createTokenizer()
     this.root.source = { input, start: { column: 1, line: 1, offset: 0 } }
@@ -144,7 +143,7 @@ class Parser {
 
   colon(tokens) {
     let brackets = 0
-    let token, type, prev
+    let prev, token, type
     for (let [i, element] of tokens.entries()) {
       token = element
       type = token[0]
@@ -268,12 +267,12 @@ class Parser {
         let str = ''
         for (let j = i; j > 0; j--) {
           let type = cache[j][0]
-          if (str.trim().indexOf('!') === 0 && type !== 'space') {
+          if (str.trim().startsWith('!') && type !== 'space') {
             break
           }
           str = cache.pop()[1] + str
         }
-        if (str.trim().indexOf('!') === 0) {
+        if (str.trim().startsWith('!')) {
           node.important = true
           node.raws.important = str
           tokens = cache

package/lib/postcss.d.mts

@@ -9,14 +9,12 @@ export {
   plugin,
   parse,
   list,
-
   document,
   comment,
   atRule,
   rule,
   decl,
   root,
-
   CssSyntaxError,
   Declaration,
   Container,
@@ -67,6 +65,5 @@ export {
   WarningOptions,
 
   // This is a class, but it’s not re-exported. That’s why it’s exported as type-only here.
-  type LazyResult,
-
+  type LazyResult
 } from './postcss.js'

package/lib/postcss.d.ts

@@ -2,7 +2,7 @@ import { RawSourceMap, SourceMapGenerator } from 'source-map-js'
 
 import AtRule, { AtRuleProps } from './at-rule.js'
 import Comment, { CommentProps } from './comment.js'
-import Container, { ContainerProps } from './container.js'
+import Container, { ContainerProps, NewChild } from './container.js'
 import CssSyntaxError from './css-syntax-error.js'
 import Declaration, { DeclarationProps } from './declaration.js'
 import Document, { DocumentProps } from './document.js'
@@ -28,13 +28,22 @@ type DocumentProcessor = (
   document: Document,
   helper: postcss.Helpers
 ) => Promise<void> | void
-type RootProcessor = (root: Root, helper: postcss.Helpers) => Promise<void> | void
+type RootProcessor = (
+  root: Root,
+  helper: postcss.Helpers
+) => Promise<void> | void
 type DeclarationProcessor = (
   decl: Declaration,
   helper: postcss.Helpers
 ) => Promise<void> | void
-type RuleProcessor = (rule: Rule, helper: postcss.Helpers) => Promise<void> | void
-type AtRuleProcessor = (atRule: AtRule, helper: postcss.Helpers) => Promise<void> | void
+type RuleProcessor = (
+  rule: Rule,
+  helper: postcss.Helpers
+) => Promise<void> | void
+type AtRuleProcessor = (
+  atRule: AtRule,
+  helper: postcss.Helpers
+) => Promise<void> | void
 type CommentProcessor = (
   comment: Comment,
   helper: postcss.Helpers
@@ -161,6 +170,7 @@ declare namespace postcss {
     LazyResult,
     list,
     Message,
+    NewChild,
     Node,
     NodeErrorOptions,
     NodeProps,
@@ -176,9 +186,9 @@ declare namespace postcss {
     WarningOptions
   }
 
-  export type SourceMap = SourceMapGenerator & {
+  export type SourceMap = {
     toJSON(): RawSourceMap
-  }
+  } & SourceMapGenerator
 
   export type Helpers = { postcss: Postcss; result: Result } & Postcss
 
@@ -309,7 +319,7 @@ declare namespace postcss {
      * The path of the CSS source file. You should always set `from`,
      * because it is used in source map generation and syntax error messages.
      */
-    from?: string
+    from?: string | undefined
 
     /**
      * Source map options
@@ -435,7 +445,9 @@ declare namespace postcss {
  * @param plugins PostCSS plugins.
  * @return Processor to process multiple CSS.
  */
-declare function postcss(plugins?: postcss.AcceptedPlugin[]): Processor
+declare function postcss(
+  plugins?: readonly postcss.AcceptedPlugin[]
+): Processor
 declare function postcss(...plugins: postcss.AcceptedPlugin[]): Processor
 
 export = postcss

package/lib/postcss.js

@@ -1,23 +1,23 @@
 'use strict'
 
+let AtRule = require('./at-rule')
+let Comment = require('./comment')
+let Container = require('./container')
 let CssSyntaxError = require('./css-syntax-error')
 let Declaration = require('./declaration')
-let LazyResult = require('./lazy-result')
-let Container = require('./container')
-let Processor = require('./processor')
-let stringify = require('./stringify')
-let fromJSON = require('./fromJSON')
 let Document = require('./document')
-let Warning = require('./warning')
-let Comment = require('./comment')
-let AtRule = require('./at-rule')
-let Result = require('./result.js')
+let fromJSON = require('./fromJSON')
 let Input = require('./input')
-let parse = require('./parse')
+let LazyResult = require('./lazy-result')
 let list = require('./list')
-let Rule = require('./rule')
-let Root = require('./root')
 let Node = require('./node')
+let parse = require('./parse')
+let Processor = require('./processor')
+let Result = require('./result.js')
+let Root = require('./root')
+let Rule = require('./rule')
+let stringify = require('./stringify')
+let Warning = require('./warning')
 
 function postcss(...plugins) {
   if (plugins.length === 1 && Array.isArray(plugins[0])) {

package/lib/previous-map.js

@@ -1,8 +1,8 @@
 'use strict'
 
-let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 let { existsSync, readFileSync } = require('fs')
 let { dirname, join } = require('path')
+let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 
 function fromBase64(str) {
   if (Buffer) {
@@ -41,12 +41,14 @@ class PreviousMap {
     let charsetUri = /^data:application\/json;charset=utf-?8,/
     let uri = /^data:application\/json,/
 
-    if (charsetUri.test(text) || uri.test(text)) {
-      return decodeURIComponent(text.substr(RegExp.lastMatch.length))
+    let uriMatch = text.match(charsetUri) || text.match(uri)
+    if (uriMatch) {
+      return decodeURIComponent(text.substr(uriMatch[0].length))
     }
 
-    if (baseCharsetUri.test(text) || baseUri.test(text)) {
-      return fromBase64(text.substr(RegExp.lastMatch.length))
+    let baseUriMatch = text.match(baseCharsetUri) || text.match(baseUri)
+    if (baseUriMatch) {
+      return fromBase64(text.substr(baseUriMatch[0].length))
     }
 
     let encoding = text.match(/data:application\/json;([^,]+),/)[1]
@@ -67,7 +69,7 @@ class PreviousMap {
   }
 
   loadAnnotation(css) {
-    let comments = css.match(/\/\*\s*# sourceMappingURL=/gm)
+    let comments = css.match(/\/\*\s*# sourceMappingURL=/g)
     if (!comments) return
 
     // sourceMappingURLs from comments, strings, etc.

package/lib/processor.d.ts

@@ -51,7 +51,7 @@ declare class Processor_ {
   /**
    * @param plugins PostCSS plugins
    */
-  constructor(plugins?: AcceptedPlugin[])
+  constructor(plugins?: readonly AcceptedPlugin[])
 
   /**
    * Parses source CSS and returns a `LazyResult` Promise proxy.

package/lib/processor.js

@@ -1,13 +1,13 @@
 'use strict'
 
-let NoWorkResult = require('./no-work-result')
-let LazyResult = require('./lazy-result')
 let Document = require('./document')
+let LazyResult = require('./lazy-result')
+let NoWorkResult = require('./no-work-result')
 let Root = require('./root')
 
 class Processor {
   constructor(plugins = []) {
-    this.version = '8.4.31'
+    this.version = '8.4.49'
     this.plugins = this.normalize(plugins)
   }
 
@@ -43,10 +43,10 @@ class Processor {
 
   process(css, opts = {}) {
     if (
-      this.plugins.length === 0 &&
-      typeof opts.parser === 'undefined' &&
-      typeof opts.stringifier === 'undefined' &&
-      typeof opts.syntax === 'undefined'
+      !this.plugins.length &&
+      !opts.parser &&
+      !opts.stringifier &&
+      !opts.syntax
     ) {
       return new NoWorkResult(this, css, opts)
     } else {

package/lib/result.d.ts

@@ -39,7 +39,6 @@ declare namespace Result {
     plugin?: string
   }
 
-
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
   export { Result_ as default }
 }

package/lib/root.d.ts

@@ -54,6 +54,7 @@ declare namespace Root {
  * ```
  */
 declare class Root_ extends Container {
+  nodes: NonNullable<Container['nodes']>
   parent: Document | undefined
   raws: Root.RootRaws
   type: 'root'
@@ -61,9 +62,9 @@ declare class Root_ extends Container {
   constructor(defaults?: Root.RootProps)
 
   assign(overrides: object | Root.RootProps): this
-  clone(overrides?: Partial<Root.RootProps>): Root
-  cloneAfter(overrides?: Partial<Root.RootProps>): Root
-  cloneBefore(overrides?: Partial<Root.RootProps>): Root
+  clone(overrides?: Partial<Root.RootProps>): this
+  cloneAfter(overrides?: Partial<Root.RootProps>): this
+  cloneBefore(overrides?: Partial<Root.RootProps>): this
 
   /**
    * Returns a `Result` instance representing the root’s CSS.
@@ -75,7 +76,7 @@ declare class Root_ extends Container {
    * const result = root1.toResult({ to: 'all.css', map: true })
    * ```
    *
-   * @param opts Options.
+   * @param options Options.
    * @return Result with current root’s CSS.
    */
   toResult(options?: ProcessOptions): Result