postcss 8.4.21 → 8.4.22

package/lib/postcss.d.ts

@@ -20,65 +20,24 @@ import Result, { Message } from './result.js'
 import Root, { RootProps } from './root.js'
 import Rule, { RuleProps } from './rule.js'
 import CssSyntaxError from './css-syntax-error.js'
-import list, { List } from './list.js'
+import list from './list.js'
 import LazyResult from './lazy-result.js'
 import Processor from './processor.js'
 
-export {
-  NodeErrorOptions,
-  DeclarationProps,
-  CssSyntaxError,
-  ContainerProps,
-  WarningOptions,
-  DocumentProps,
-  FilePosition,
-  CommentProps,
-  AtRuleProps,
-  Declaration,
-  ChildProps,
-  LazyResult,
-  ChildNode,
-  NodeProps,
-  Processor,
-  RuleProps,
-  RootProps,
-  Container,
-  Position,
-  Document,
-  AnyNode,
-  Warning,
-  Message,
-  Comment,
-  Source,
-  AtRule,
-  Result,
-  Input,
-  Node,
-  list,
-  Rule,
-  Root
-}
-
-export type SourceMap = SourceMapGenerator & {
-  toJSON(): RawSourceMap
-}
-
-export type Helpers = { result: Result; postcss: Postcss } & Postcss
-
 type DocumentProcessor = (
   document: Document,
-  helper: Helpers
+  helper: postcss.Helpers
 ) => Promise<void> | void
-type RootProcessor = (root: Root, helper: Helpers) => Promise<void> | void
+type RootProcessor = (root: Root, helper: postcss.Helpers) => Promise<void> | void
 type DeclarationProcessor = (
   decl: Declaration,
-  helper: Helpers
+  helper: postcss.Helpers
 ) => Promise<void> | void
-type RuleProcessor = (rule: Rule, helper: Helpers) => Promise<void> | void
-type AtRuleProcessor = (atRule: AtRule, helper: 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: Helpers
+  helper: postcss.Helpers
 ) => Promise<void> | void
 
 interface Processors {
@@ -188,185 +147,210 @@ interface Processors {
   Exit?: RootProcessor
 }
 
-export interface Plugin extends Processors {
-  postcssPlugin: string
-  prepare?: (result: Result) => Processors
-}
-
-export interface PluginCreator<PluginOptions> {
-  (opts?: PluginOptions): Plugin | Processor
-  postcss: true
-}
-
-export interface Transformer extends TransformCallback {
-  postcssPlugin: string
-  postcssVersion: string
-}
-
-export interface TransformCallback {
-  (root: Root, result: Result): Promise<void> | void
-}
-
-export interface OldPlugin<T> extends Transformer {
-  (opts?: T): Transformer
-  postcss: Transformer
-}
-
-export type AcceptedPlugin =
-  | Plugin
-  | PluginCreator<any>
-  | OldPlugin<any>
-  | TransformCallback
-  | {
-      postcss: TransformCallback | Processor
-    }
-  | Processor
-
-export interface Parser<RootNode = Root | Document> {
-  (
-    css: string | { toString(): string },
-    opts?: Pick<ProcessOptions, 'map' | 'from'>
-  ): RootNode
-}
-
-export interface Builder {
-  (part: string, node?: AnyNode, type?: 'start' | 'end'): void
-}
-
-export interface Stringifier {
-  (node: AnyNode, builder: Builder): void
-}
-
-export interface JSONHydrator {
-  (data: object[]): Node[]
-  (data: object): Node
-}
-
-export interface Syntax {
-  /**
-   * Function to generate AST by string.
-   */
-  parse?: Parser
-
-  /**
-   * Class to generate string by AST.
-   */
-  stringify?: Stringifier
-}
-
-export interface SourceMapOptions {
-  /**
-   * Indicates that the source map should be embedded in the output CSS
-   * as a Base64-encoded comment. By default, it is `true`.
-   * But if all previous maps are external, not inline, PostCSS will not embed
-   * the map even if you do not set this option.
-   *
-   * If you have an inline source map, the result.map property will be empty,
-   * as the source map will be contained within the text of `result.css`.
-   */
-  inline?: boolean
-
-  /**
-   * Source map content from a previous processing step (e.g., Sass).
-   *
-   * PostCSS will try to read the previous source map
-   * automatically (based on comments within the source CSS), but you can use
-   * this option to identify it manually.
-   *
-   * If desired, you can omit the previous map with prev: `false`.
-   */
-  prev?: string | boolean | object | ((file: string) => string)
-
-  /**
-   * Indicates that PostCSS should set the origin content (e.g., Sass source)
-   * of the source map. By default, it is true. But if all previous maps do not
-   * contain sources content, PostCSS will also leave it out even if you
-   * do not set this option.
-   */
-  sourcesContent?: boolean
-
-  /**
-   * Indicates that PostCSS should add annotation comments to the CSS.
-   * By default, PostCSS will always add a comment with a path
-   * to the source map. PostCSS will not add annotations to CSS files
-   * that do not contain any comments.
-   *
-   * By default, PostCSS presumes that you want to save the source map as
-   * `opts.to + '.map'` and will use this path in the annotation comment.
-   * A different path can be set by providing a string value for annotation.
-   *
-   * If you have set `inline: true`, annotation cannot be disabled.
-   */
-  annotation?: string | boolean | ((file: string, root: Root) => string)
-
-  /**
-   * Override `from` in map’s sources.
-   */
-  from?: string
-
-  /**
-   * Use absolute path in generated source map.
-   */
-  absolute?: boolean
-}
-
-export interface ProcessOptions {
-  /**
-   * 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
-
-  /**
-   * The path where you'll put the output CSS file. You should always set `to`
-   * to generate correct source maps.
-   */
-  to?: string
-
-  /**
-   * Function to generate AST by string.
-   */
-  parser?: Syntax | Parser
-
-  /**
-   * Class to generate string by AST.
-   */
-  stringifier?: Syntax | Stringifier
-
-  /**
-   * Object with parse and stringify.
-   */
-  syntax?: Syntax
-
-  /**
-   * Source map options
-   */
-  map?: SourceMapOptions | boolean
-}
-
-export interface Postcss {
-  /**
-   * Create a new `Processor` instance that will apply `plugins`
-   * as CSS processors.
-   *
-   * ```js
-   * let postcss = require('postcss')
-   *
-   * postcss(plugins).process(css, { from, to }).then(result => {
-   *   console.log(result.css)
-   * })
-   * ```
-   *
-   * @param plugins PostCSS plugins.
-   * @return Processor to process multiple CSS.
-   */
-  (plugins?: AcceptedPlugin[]): Processor
-  (...plugins: AcceptedPlugin[]): Processor
+declare namespace postcss {
+  export {
+    NodeErrorOptions,
+    DeclarationProps,
+    CssSyntaxError,
+    ContainerProps,
+    WarningOptions,
+    DocumentProps,
+    FilePosition,
+    CommentProps,
+    AtRuleProps,
+    Declaration,
+    ChildProps,
+    LazyResult,
+    ChildNode,
+    NodeProps,
+    Processor,
+    RuleProps,
+    RootProps,
+    Container,
+    Position,
+    Document,
+    AnyNode,
+    Warning,
+    Message,
+    Comment,
+    Source,
+    AtRule,
+    Result,
+    Input,
+    Node,
+    list,
+    Rule,
+    Root
+  }
+
+  export type SourceMap = SourceMapGenerator & {
+    toJSON(): RawSourceMap
+  }
+
+  export type Helpers = { result: Result; postcss: Postcss } & Postcss
+
+  export interface Plugin extends Processors {
+    postcssPlugin: string
+    prepare?: (result: Result) => Processors
+  }
+
+  export interface PluginCreator<PluginOptions> {
+    (opts?: PluginOptions): Plugin | Processor
+    postcss: true
+  }
+
+  export interface Transformer extends TransformCallback {
+    postcssPlugin: string
+    postcssVersion: string
+  }
+
+  export interface TransformCallback {
+    (root: Root, result: Result): Promise<void> | void
+  }
+
+  export interface OldPlugin<T> extends Transformer {
+    (opts?: T): Transformer
+    postcss: Transformer
+  }
+
+  export type AcceptedPlugin =
+    | Plugin
+    | PluginCreator<any>
+    | OldPlugin<any>
+    | TransformCallback
+    | {
+        postcss: TransformCallback | Processor
+      }
+    | Processor
+
+  export interface Parser<RootNode = Root | Document> {
+    (
+      css: string | { toString(): string },
+      opts?: Pick<ProcessOptions, 'map' | 'from'>
+    ): RootNode
+  }
+
+  export interface Builder {
+    (part: string, node?: AnyNode, type?: 'start' | 'end'): void
+  }
+
+  export interface Stringifier {
+    (node: AnyNode, builder: Builder): void
+  }
+
+  export interface JSONHydrator {
+    (data: object[]): Node[]
+    (data: object): Node
+  }
+
+  export interface Syntax {
+    /**
+     * Function to generate AST by string.
+     */
+    parse?: Parser
+
+    /**
+     * Class to generate string by AST.
+     */
+    stringify?: Stringifier
+  }
+
+  export interface SourceMapOptions {
+    /**
+     * Indicates that the source map should be embedded in the output CSS
+     * as a Base64-encoded comment. By default, it is `true`.
+     * But if all previous maps are external, not inline, PostCSS will not embed
+     * the map even if you do not set this option.
+     *
+     * If you have an inline source map, the result.map property will be empty,
+     * as the source map will be contained within the text of `result.css`.
+     */
+    inline?: boolean
+
+    /**
+     * Source map content from a previous processing step (e.g., Sass).
+     *
+     * PostCSS will try to read the previous source map
+     * automatically (based on comments within the source CSS), but you can use
+     * this option to identify it manually.
+     *
+     * If desired, you can omit the previous map with prev: `false`.
+     */
+    prev?: string | boolean | object | ((file: string) => string)
+
+    /**
+     * Indicates that PostCSS should set the origin content (e.g., Sass source)
+     * of the source map. By default, it is true. But if all previous maps do not
+     * contain sources content, PostCSS will also leave it out even if you
+     * do not set this option.
+     */
+    sourcesContent?: boolean
+
+    /**
+     * Indicates that PostCSS should add annotation comments to the CSS.
+     * By default, PostCSS will always add a comment with a path
+     * to the source map. PostCSS will not add annotations to CSS files
+     * that do not contain any comments.
+     *
+     * By default, PostCSS presumes that you want to save the source map as
+     * `opts.to + '.map'` and will use this path in the annotation comment.
+     * A different path can be set by providing a string value for annotation.
+     *
+     * If you have set `inline: true`, annotation cannot be disabled.
+     */
+    annotation?: string | boolean | ((file: string, root: Root) => string)
+
+    /**
+     * Override `from` in map’s sources.
+     */
+    from?: string
+
+    /**
+     * Use absolute path in generated source map.
+     */
+    absolute?: boolean
+  }
+
+  export interface ProcessOptions {
+    /**
+     * 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
+
+    /**
+     * The path where you'll put the output CSS file. You should always set `to`
+     * to generate correct source maps.
+     */
+    to?: string
+
+    /**
+     * Function to generate AST by string.
+     */
+    parser?: Syntax | Parser
+
+    /**
+     * Class to generate string by AST.
+     */
+    stringifier?: Syntax | Stringifier
+
+    /**
+     * Object with parse and stringify.
+     */
+    syntax?: Syntax
+
+    /**
+     * Source map options
+     */
+    map?: SourceMapOptions | boolean
+  }
+
+  export type Postcss = typeof postcss
 
   /**
    * Default function to convert a node tree into a CSS string.
    */
-  stringify: Stringifier
+  export let stringify: Stringifier
 
   /**
    * Parses source css and returns a new `Root` or `Document` node,
@@ -379,7 +363,7 @@ export interface Postcss {
    * root1.append(root2).toResult().css
    * ```
    */
-  parse: Parser<Root>
+  export let parse: Parser<Root>
 
   /**
    * Rehydrate a JSON AST (from `Node#toJSON`) back into the AST classes.
@@ -390,12 +374,7 @@ export interface Postcss {
    * const root2  = postcss.fromJSON(json)
    * ```
    */
-  fromJSON: JSONHydrator
-
-  /**
-   * Contains the `list` module.
-   */
-  list: List
+  export let fromJSON: JSONHydrator
 
   /**
    * Creates a new `Comment` node.
@@ -403,7 +382,7 @@ export interface Postcss {
    * @param defaults Properties for the new node.
    * @return New comment node
    */
-  comment(defaults?: CommentProps): Comment
+  export function comment(defaults?: CommentProps): Comment
 
   /**
    * Creates a new `AtRule` node.
@@ -411,7 +390,7 @@ export interface Postcss {
    * @param defaults Properties for the new node.
    * @return New at-rule node.
    */
-  atRule(defaults?: AtRuleProps): AtRule
+  export function atRule(defaults?: AtRuleProps): AtRule
 
   /**
    * Creates a new `Declaration` node.
@@ -419,7 +398,7 @@ export interface Postcss {
    * @param defaults Properties for the new node.
    * @return New declaration node.
    */
-  decl(defaults?: DeclarationProps): Declaration
+  export function decl(defaults?: DeclarationProps): Declaration
 
   /**
    * Creates a new `Rule` node.
@@ -427,7 +406,7 @@ export interface Postcss {
    * @param default Properties for the new node.
    * @return New rule node.
    */
-  rule(defaults?: RuleProps): Rule
+  export function rule(defaults?: RuleProps): Rule
 
   /**
    * Creates a new `Root` node.
@@ -435,7 +414,7 @@ export interface Postcss {
    * @param defaults Properties for the new node.
    * @return New root node.
    */
-  root(defaults?: RootProps): Root
+  export function root(defaults?: RootProps): Root
 
   /**
    * Creates a new `Document` node.
@@ -443,31 +422,27 @@ export interface Postcss {
    * @param defaults Properties for the new node.
    * @return New document node.
    */
-  document(defaults?: DocumentProps): Document
-
-  CssSyntaxError: typeof CssSyntaxError
-  Declaration: typeof Declaration
-  Container: typeof Container
-  Comment: typeof Comment
-  Warning: typeof Warning
-  AtRule: typeof AtRule
-  Result: typeof Result
-  Input: typeof Input
-  Rule: typeof Rule
-  Root: typeof Root
-  Node: typeof Node
-}
-
-export const stringify: Stringifier
-export const parse: Parser<Root>
-export const fromJSON: JSONHydrator
+  export function document(defaults?: DocumentProps): Document
 
-export const comment: Postcss['comment']
-export const atRule: Postcss['atRule']
-export const decl: Postcss['decl']
-export const rule: Postcss['rule']
-export const root: Postcss['root']
-
-declare const postcss: Postcss
+  export { postcss as default }
+}
 
-export default postcss
+/**
+ * Create a new `Processor` instance that will apply `plugins`
+ * as CSS processors.
+ *
+ * ```js
+ * let postcss = require('postcss')
+ *
+ * postcss(plugins).process(css, { from, to }).then(result => {
+ *   console.log(result.css)
+ * })
+ * ```
+ *
+ * @param plugins PostCSS plugins.
+ * @return Processor to process multiple CSS.
+ */
+declare function postcss(plugins?: postcss.AcceptedPlugin[]): Processor
+declare function postcss(...plugins: postcss.AcceptedPlugin[]): Processor
+
+export = postcss

package/lib/previous-map.d.ts

@@ -2,6 +2,11 @@ import { SourceMapConsumer } from 'source-map-js'
 
 import { ProcessOptions } from './postcss.js'
 
+declare namespace PreviousMap {
+  // eslint-disable-next-line @typescript-eslint/no-use-before-define
+  export { PreviousMap_ as default }
+}
+
 /**
  * Source map information from input CSS.
  * For example, source map after Sass compiler.
@@ -14,7 +19,7 @@ import { ProcessOptions } from './postcss.js'
  * root.input.map //=> PreviousMap
  * ```
  */
-export default class PreviousMap {
+declare class PreviousMap_ {
   /**
    * Was source map inlined by data-uri to input CSS.
    */
@@ -70,3 +75,7 @@ export default class PreviousMap {
    */
   withContent(): boolean
 }
+
+declare class PreviousMap extends PreviousMap_ {}
+
+export = PreviousMap

package/lib/processor.d.ts

@@ -10,6 +10,11 @@ import Result from './result.js'
 import Root from './root.js'
 import NoWorkResult from './no-work-result.js'
 
+declare namespace Processor {
+  // eslint-disable-next-line @typescript-eslint/no-use-before-define
+  export { Processor_ as default }
+}
+
 /**
  * Contains plugins to process CSS. Create one `Processor` instance,
  * initialize its plugins, and then use that instance on numerous CSS files.
@@ -20,7 +25,7 @@ import NoWorkResult from './no-work-result.js'
  * processor.process(css2).then(result => console.log(result.css))
  * ```
  */
-export default class Processor {
+declare class Processor_ {
   /**
    * Current PostCSS version.
    *
@@ -100,3 +105,7 @@ export default class Processor {
     options?: ProcessOptions
   ): LazyResult | NoWorkResult
 }
+
+declare class Processor extends Processor_ {}
+
+export = Processor

package/lib/processor.js

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