postcss 8.3.9 → 8.4.31

package/lib/stringify.d.ts

@@ -1,5 +1,9 @@
 import { Stringifier } from './postcss.js'
 
-declare const stringify: Stringifier
+interface Stringify extends Stringifier {
+  default: Stringify
+}
 
-export default stringify
+declare const stringify: Stringify
+
+export = stringify

package/lib/terminal-highlight.js

@@ -11,21 +11,21 @@ function registerInput(dependant) {
 }
 
 const HIGHLIGHT_THEME = {
-  'brackets': pico.cyan,
-  'at-word': pico.cyan,
-  'comment': pico.gray,
-  'string': pico.green,
-  'class': pico.yellow,
-  'hash': pico.magenta,
-  'call': pico.cyan,
+  ';': pico.yellow,
+  ':': pico.yellow,
   '(': pico.cyan,
   ')': pico.cyan,
-  '{': pico.yellow,
-  '}': pico.yellow,
   '[': pico.yellow,
   ']': pico.yellow,
-  ':': pico.yellow,
-  ';': pico.yellow
+  '{': pico.yellow,
+  '}': pico.yellow,
+  'at-word': pico.cyan,
+  'brackets': pico.cyan,
+  'call': pico.cyan,
+  'class': pico.yellow,
+  'comment': pico.gray,
+  'hash': pico.magenta,
+  'string': pico.green
 }
 
 function getTokenType([type, value], processor) {

package/lib/tokenize.js

@@ -22,7 +22,7 @@ const AT = '@'.charCodeAt(0)
 
 const RE_AT_END = /[\t\n\f\r "#'()/;[\\\]{}]/g
 const RE_WORD_END = /[\t\n\f\r !"#'():;@[\\\]{}]|\/(?=\*)/g
-const RE_BAD_BRACKET = /.[\n"'(/\\]/
+const RE_BAD_BRACKET = /.[\r\n"'(/\\]/
 const RE_HEX_ESCAPE = /[\da-f]/i
 
 module.exports = function tokenizer(input, options = {}) {
@@ -259,8 +259,8 @@ module.exports = function tokenizer(input, options = {}) {
 
   return {
     back,
-    nextToken,
     endOfFile,
+    nextToken,
     position
   }
 }

package/lib/warn-once.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 'use strict'
 
 let printed = {}

package/lib/warning.d.ts

@@ -1,26 +1,47 @@
+import { RangePosition } from './css-syntax-error.js'
 import Node from './node.js'
 
-export interface WarningOptions {
-  /**
-   * CSS node that caused the warning.
-   */
-  node?: Node
+declare namespace Warning {
+  export interface WarningOptions {
+    /**
+     * End position, exclusive, in CSS node string that caused the warning.
+     */
+    end?: RangePosition
 
-  /**
-   * Word in CSS source that caused the warning.
-   */
-  word?: string
+    /**
+     * End index, exclusive, in CSS node string that caused the warning.
+     */
+    endIndex?: number
 
-  /**
-   * Index in CSS node string that caused the warning.
-   */
-  index?: number
+    /**
+     * Start index, inclusive, in CSS node string that caused the warning.
+     */
+    index?: number
 
-  /**
-   * Name of the plugin that created this warning. `Result#warn` fills
-   * this property automatically.
-   */
-  plugin?: string
+    /**
+     * CSS node that caused the warning.
+     */
+    node?: Node
+
+    /**
+     * Name of the plugin that created this warning. `Result#warn` fills
+     * this property automatically.
+     */
+    plugin?: string
+
+    /**
+     * Start position, inclusive, in CSS node string that caused the warning.
+     */
+    start?: RangePosition
+
+    /**
+     * Word in CSS source that caused the warning.
+     */
+    word?: string
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-use-before-define
+  export { Warning_ as default }
 }
 
 /**
@@ -32,31 +53,42 @@ export interface WarningOptions {
  * }
  * ```
  */
-export default class Warning {
+declare class Warning_ {
   /**
-   * Type to filter warnings from `Result#messages`.
-   * Always equal to `"warning"`.
+   * Column for inclusive start position in the input file with this warning’s source.
+   *
+   * ```js
+   * warning.column //=> 6
+   * ```
    */
-  type: 'warning'
+  column: number
 
   /**
-   * The warning message.
+   * Column for exclusive end position in the input file with this warning’s source.
    *
    * ```js
-   * warning.text //=> 'Try to avoid !important'
+   * warning.endColumn //=> 4
    * ```
    */
-  text: string
+  endColumn?: number
 
   /**
-   * The name of the plugin that created this warning.
-   * When you call `Node#warn` it will fill this property automatically.
+   * Line for exclusive end position in the input file with this warning’s source.
    *
    * ```js
-   * warning.plugin //=> 'postcss-important'
+   * warning.endLine //=> 6
    * ```
    */
-  plugin: string
+  endLine?: number
+
+  /**
+   * Line for inclusive start position in the input file with this warning’s source.
+   *
+   * ```js
+   * warning.line //=> 5
+   * ```
+   */
+  line: number
 
   /**
    * Contains the CSS node that caused the warning.
@@ -68,28 +100,35 @@ export default class Warning {
   node: Node
 
   /**
-   * Line in the input file with this warning’s source.
+   * The name of the plugin that created this warning.
+   * When you call `Node#warn` it will fill this property automatically.
    *
    * ```js
-   * warning.line //=> 5
+   * warning.plugin //=> 'postcss-important'
    * ```
    */
-  line: number
+  plugin: string
 
   /**
-   * Column in the input file with this warning’s source.
+   * The warning message.
    *
    * ```js
-   * warning.column //=> 6
+   * warning.text //=> 'Try to avoid !important'
    * ```
    */
-  column: number
+  text: string
+
+  /**
+   * Type to filter warnings from `Result#messages`.
+   * Always equal to `"warning"`.
+   */
+  type: 'warning'
 
   /**
    * @param text Warning message.
    * @param opts Warning options.
    */
-  constructor(text: string, opts?: WarningOptions)
+  constructor(text: string, opts?: Warning.WarningOptions)
 
   /**
    * Returns a warning position and message.
@@ -102,3 +141,7 @@ export default class Warning {
    */
   toString(): string
 }
+
+declare class Warning extends Warning_ {}
+
+export = Warning

package/lib/warning.js

@@ -6,9 +6,11 @@ class Warning {
     this.text = text
 
     if (opts.node && opts.node.source) {
-      let pos = opts.node.positionBy(opts)
-      this.line = pos.line
-      this.column = pos.column
+      let range = opts.node.rangeBy(opts)
+      this.line = range.start.line
+      this.column = range.start.column
+      this.endLine = range.end.line
+      this.endColumn = range.end.column
     }
 
     for (let opt in opts) this[opt] = opts[opt]
@@ -17,8 +19,8 @@ class Warning {
   toString() {
     if (this.node) {
       return this.node.error(this.text, {
-        plugin: this.plugin,
         index: this.index,
+        plugin: this.plugin,
         word: this.word
       }).message
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.3.9",
+  "version": "8.4.31",
   "description": "Tool for transforming styles with JS plugins",
   "engines": {
     "node": "^10 || ^12 || >=14"
@@ -8,8 +8,7 @@
   "exports": {
     ".": {
       "require": "./lib/postcss.js",
-      "import": "./lib/postcss.mjs",
-      "types": "./lib/postcss.d.ts"
+      "import": "./lib/postcss.mjs"
     },
     "./lib/at-rule": "./lib/at-rule.js",
     "./lib/comment": "./lib/comment.js",
@@ -19,6 +18,7 @@
     "./lib/fromJSON": "./lib/fromJSON.js",
     "./lib/input": "./lib/input.js",
     "./lib/lazy-result": "./lib/lazy-result.js",
+    "./lib/no-work-result": "./lib/no-work-result.js",
     "./lib/list": "./lib/list.js",
     "./lib/map-generator": "./lib/map-generator.js",
     "./lib/node": "./lib/node.js",
@@ -52,10 +52,20 @@
     "manipulation",
     "transpiler"
   ],
-  "funding": {
-    "type": "opencollective",
-    "url": "https://opencollective.com/postcss/"
-  },
+  "funding": [
+    {
+      "type": "opencollective",
+      "url": "https://opencollective.com/postcss/"
+    },
+    {
+      "type": "tidelift",
+      "url": "https://tidelift.com/funding/github/npm/postcss"
+    },
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/ai"
+    }
+  ],
   "author": "Andrey Sitnik <andrey@sitnik.ru>",
   "license": "MIT",
   "homepage": "https://postcss.org/",
@@ -64,9 +74,9 @@
     "url": "https://github.com/postcss/postcss/issues"
   },
   "dependencies": {
-    "nanoid": "^3.1.28",
-    "picocolors": "^0.2.1",
-    "source-map-js": "^0.6.2"
+    "nanoid": "^3.3.6",
+    "picocolors": "^1.0.0",
+    "source-map-js": "^1.0.2"
   },
   "browser": {
     "./lib/terminal-highlight": false,