postcss 8.4.40 → 8.4.41

package/lib/at-rule.d.ts

@@ -79,18 +79,6 @@ declare namespace AtRule {
  * ```
  */
 declare class AtRule_ extends Container {
-  /**
-   * The at-rule’s name immediately follows the `@`.
-   *
-   * ```js
-   * const root  = postcss.parse('@media print {}')
-   * const media = root.first
-   * media.name //=> 'media'
-   * ```
-   */
-  get name(): string
-  set name(value: string)
-
   /**
    * An array containing the layer’s children.
    *
@@ -110,6 +98,29 @@ declare class AtRule_ extends Container {
    * ```
    */
   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 {}')
+   * const media = root.first
+   * media.name //=> 'media'
+   * ```
+   */
+  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.
@@ -122,17 +133,6 @@ declare class AtRule_ extends Container {
    */
   get params(): string
   set params(value: string)
-  parent: ContainerWithChildren | 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
 }
 
 declare class AtRule extends AtRule_ {}

package/lib/comment.d.ts

@@ -48,19 +48,19 @@ declare namespace Comment {
 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)
-
-  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
 }
 
 declare class Comment extends Comment_ {}

package/lib/container.d.ts

@@ -24,7 +24,7 @@ declare namespace Container {
   }
 
   export interface ContainerProps extends NodeProps {
-    nodes?: (ChildNode | ChildProps)[]
+    nodes?: (Node | ChildProps)[]
   }
 
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -84,9 +84,9 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
   ): 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,
@@ -161,8 +161,8 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
   insertAfter(
     oldNode: Child | number,
     newNode:
-      | Child
-      | Child[]
+      | Node
+      | Node[]
       | ChildProps
       | ChildProps[]
       | string
@@ -183,8 +183,8 @@ declare abstract class Container_<Child extends Node = ChildNode> extends Node {
   insertBefore(
     oldNode: Child | number,
     newNode:
-      | Child
-      | Child[]
+      | Node
+      | Node[]
       | ChildProps
       | ChildProps[]
       | string

package/lib/container.js

@@ -198,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)]

package/lib/declaration.d.ts

@@ -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.
    *
@@ -78,10 +91,8 @@ declare class Declaration_ extends Node {
    * ```
    */
   get important(): boolean
-  set important(value: boolean)
-
-  parent: ContainerWithChildren | undefined
 
+  set important(value: boolean)
   /**
    * The property name for a CSS declaration.
    *
@@ -93,12 +104,8 @@ declare class Declaration_ extends Node {
    * ```
    */
   get prop(): string
-  set prop(value: string)
-
-  raws: Declaration.DeclarationRaws
-
-  type: 'decl'
 
+  set prop(value: string)
   /**
    * The property value for a CSS declaration.
    *
@@ -118,7 +125,6 @@ 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.
@@ -138,13 +144,6 @@ declare class Declaration_ extends Node {
    * ```
    */
   get variable(): boolean
-  set varaible(value: string)
-
-  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
 }
 
 declare class Declaration extends Declaration_ {}

package/lib/document.d.ts

@@ -42,9 +42,9 @@ declare class Document_ extends Container<Root> {
   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/input.d.ts

@@ -187,6 +187,9 @@ declare class Input_ {
    * ```
    */
   get from(): string
+
+  /** Converts this to a JSON-friendly object representation. */
+  toJSON(): object
 }
 
 declare class Input extends Input_ {}

package/lib/list.d.ts

@@ -51,7 +51,6 @@ declare namespace list {
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 declare const list: list.List
 
 export = list

package/lib/map-generator.js

@@ -75,7 +75,7 @@ class MapGenerator {
         }
       }
     } else if (this.css) {
-      this.css = this.css.replace(/\n*?\/\*#[\S\s]*?\*\/$/gm, '')
+      this.css = this.css.replace(/\n*\/\*#[\S\s]*?\*\/$/gm, '')
     }
   }
 

package/lib/node.d.ts

@@ -303,7 +303,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 +312,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 +326,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
@@ -472,8 +472,8 @@ declare abstract class Node_ {
    */
   replaceWith(
     ...nodes: (
-      | Node.ChildNode
-      | Node.ChildNode[]
+      | Node
+      | Node[]
       | Node.ChildProps
       | Node.ChildProps[]
     )[]

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

@@ -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
@@ -176,9 +185,9 @@ declare namespace postcss {
     WarningOptions
   }
 
-  export type SourceMap = SourceMapGenerator & {
+  export type SourceMap = {
     toJSON(): RawSourceMap
-  }
+  } & SourceMapGenerator
 
   export type Helpers = { postcss: Postcss; result: Result } & Postcss
 

package/lib/previous-map.js

@@ -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.js

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

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

@@ -62,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.

package/lib/rule.d.ts

@@ -40,14 +40,21 @@ declare namespace Rule {
     semicolon?: boolean
   }
 
-  export interface RuleProps extends ContainerProps {
+  export type RuleProps = ContainerProps & {
     /** Information used to generate byte-to-byte equal node string as it was in the origin input. */
     raws?: RuleRaws
-    /** Selector or selectors of the rule. */
-    selector?: string
-    /** Selectors of the rule represented as an array of strings. */
-    selectors?: string[]
-  }
+  } & (
+      | {
+          /** Selector or selectors of the rule. */
+          selector: string
+          selectors?: never
+        }
+      | {
+          /** Selectors of the rule represented as an array of strings. */
+          selectors: string[]
+          selector?: never
+        }
+    )
 
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
   export { Rule_ as default }
@@ -75,6 +82,15 @@ declare class Rule_ extends Container {
   nodes: NonNullable<Container['nodes']>
   parent: ContainerWithChildren | undefined
   raws: Rule.RuleRaws
+  type: 'rule'
+  constructor(defaults?: Rule.RuleProps)
+
+  assign(overrides: object | Rule.RuleProps): this
+  clone(overrides?: Partial<Rule.RuleProps>): this
+
+  cloneAfter(overrides?: Partial<Rule.RuleProps>): this
+
+  cloneBefore(overrides?: Partial<Rule.RuleProps>): this
   /**
    * The rule’s full selector represented as a string.
    *
@@ -85,8 +101,7 @@ declare class Rule_ extends Container {
    * ```
    */
   get selector(): string
-  set selector(value: string);
-
+  set selector(value: string)
   /**
    * An array containing the rule’s individual selectors.
    * Groups of selectors are split at commas.
@@ -103,15 +118,7 @@ declare class Rule_ extends Container {
    * ```
    */
   get selectors(): string[]
-  set selectors(values: string[]);
-
-  type: 'rule'
-
-  constructor(defaults?: Rule.RuleProps)
-  assign(overrides: object | Rule.RuleProps): this
-  clone(overrides?: Partial<Rule.RuleProps>): Rule
-  cloneAfter(overrides?: Partial<Rule.RuleProps>): Rule
-  cloneBefore(overrides?: Partial<Rule.RuleProps>): Rule
+  set selectors(values: string[])
 }
 
 declare class Rule extends Rule_ {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.4.40",
+  "version": "8.4.41",
   "description": "Tool for transforming styles with JS plugins",
   "engines": {
     "node": "^10 || ^12 || >=14"