postcss 8.4.24 → 8.4.25

package/lib/input.js

@@ -2,7 +2,7 @@
 
 let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 let { fileURLToPath, pathToFileURL } = require('url')
-let { resolve, isAbsolute } = require('path')
+let { isAbsolute, resolve } = require('path')
 let { nanoid } = require('nanoid/non-secure')
 
 let terminalHighlight = require('./terminal-highlight')
@@ -60,48 +60,6 @@ class Input {
     if (this.map) this.map.file = this.from
   }
 
-  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
-      }
-
-      this[fromOffsetCache] = lineToIndex
-    } else {
-      lineToIndex = this[fromOffsetCache]
-    }
-    lastLine = lineToIndex[lineToIndex.length - 1]
-
-    let min = 0
-    if (offset >= lastLine) {
-      min = lineToIndex.length - 1
-    } else {
-      let max = lineToIndex.length - 2
-      let mid
-      while (min < max) {
-        mid = min + ((max - min) >> 1)
-        if (offset < lineToIndex[mid]) {
-          max = mid - 1
-        } else if (offset >= lineToIndex[mid + 1]) {
-          min = mid + 1
-        } else {
-          min = mid
-          break
-        }
-      }
-    }
-    return {
-      line: min + 1,
-      col: offset - lineToIndex[min] + 1
-    }
-  }
-
   error(message, line, column, opts = {}) {
     let result, endLine, endColumn
 
@@ -136,10 +94,10 @@ class Input {
         message,
         origin.endLine === undefined
           ? origin.line
-          : { line: origin.line, column: origin.column },
+          : { column: origin.column, line: origin.line },
         origin.endLine === undefined
           ? origin.column
-          : { line: origin.endLine, column: origin.endColumn },
+          : { column: origin.endColumn, line: origin.endLine },
         origin.source,
         origin.file,
         opts.plugin
@@ -147,15 +105,15 @@ class Input {
     } else {
       result = new CssSyntaxError(
         message,
-        endLine === undefined ? line : { line, column },
-        endLine === undefined ? column : { line: endLine, column: endColumn },
+        endLine === undefined ? line : { column, line },
+        endLine === undefined ? column : { column: endColumn, line: endLine },
         this.css,
         this.file,
         opts.plugin
       )
     }
 
-    result.input = { line, column, endLine, endColumn, source: this.css }
+    result.input = { column, endColumn, endLine, line, source: this.css }
     if (this.file) {
       if (pathToFileURL) {
         result.input.url = pathToFileURL(this.file).toString()
@@ -166,16 +124,69 @@ class Input {
     return result
   }
 
+  get from() {
+    return this.file || this.id
+  }
+
+  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
+      }
+
+      this[fromOffsetCache] = lineToIndex
+    } else {
+      lineToIndex = this[fromOffsetCache]
+    }
+    lastLine = lineToIndex[lineToIndex.length - 1]
+
+    let min = 0
+    if (offset >= lastLine) {
+      min = lineToIndex.length - 1
+    } else {
+      let max = lineToIndex.length - 2
+      let mid
+      while (min < max) {
+        mid = min + ((max - min) >> 1)
+        if (offset < lineToIndex[mid]) {
+          max = mid - 1
+        } else if (offset >= lineToIndex[mid + 1]) {
+          min = mid + 1
+        } else {
+          min = mid
+          break
+        }
+      }
+    }
+    return {
+      col: offset - lineToIndex[min] + 1,
+      line: min + 1
+    }
+  }
+
+  mapResolve(file) {
+    if (/^\w+:\/\//.test(file)) {
+      return file
+    }
+    return resolve(this.map.consumer().sourceRoot || this.map.root || '.', file)
+  }
+
   origin(line, column, endLine, endColumn) {
     if (!this.map) return false
     let consumer = this.map.consumer()
 
-    let from = consumer.originalPositionFor({ line, column })
+    let from = consumer.originalPositionFor({ column, line })
     if (!from.source) return false
 
     let to
     if (typeof endLine === 'number') {
-      to = consumer.originalPositionFor({ line: endLine, column: endColumn })
+      to = consumer.originalPositionFor({ column: endColumn, line: endLine })
     }
 
     let fromUrl
@@ -190,11 +201,11 @@ class Input {
     }
 
     let result = {
-      url: fromUrl.toString(),
-      line: from.line,
       column: from.column,
+      endColumn: to && to.column,
       endLine: to && to.line,
-      endColumn: to && to.column
+      line: from.line,
+      url: fromUrl.toString()
     }
 
     if (fromUrl.protocol === 'file:') {
@@ -212,17 +223,6 @@ class Input {
     return result
   }
 
-  mapResolve(file) {
-    if (/^\w+:\/\//.test(file)) {
-      return file
-    }
-    return resolve(this.map.consumer().sourceRoot || this.map.root || '.', file)
-  }
-
-  get from() {
-    return this.file || this.id
-  }
-
   toJSON() {
     let json = {}
     for (let name of ['hasBOM', 'css', 'file', 'id']) {

package/lib/lazy-result.d.ts

@@ -1,8 +1,8 @@
-import Result, { Message, ResultOptions } from './result.js'
 import { SourceMap } from './postcss.js'
 import Processor from './processor.js'
-import Warning from './warning.js'
+import Result, { Message, ResultOptions } from './result.js'
 import Root from './root.js'
+import Warning from './warning.js'
 
 declare namespace LazyResult {
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -21,48 +21,48 @@ declare namespace LazyResult {
 declare class LazyResult_ implements PromiseLike<Result> {
   /**
    * Processes input CSS through synchronous and asynchronous plugins
-   * and calls `onFulfilled` with a Result instance. If a plugin throws
-   * an error, the `onRejected` callback will be executed.
+   * and calls onRejected for each error thrown in any plugin.
    *
    * It implements standard Promise API.
    *
    * ```js
-   * postcss([autoprefixer]).process(css, { from: cssPath }).then(result => {
+   * postcss([autoprefixer]).process(css).then(result => {
    *   console.log(result.css)
+   * }).catch(error => {
+   *   console.error(error)
    * })
    * ```
    */
-  then: Promise<Result>['then']
+  catch: Promise<Result>['catch']
 
   /**
    * Processes input CSS through synchronous and asynchronous plugins
-   * and calls onRejected for each error thrown in any plugin.
+   * and calls onFinally on any error or when all plugins will finish work.
    *
    * It implements standard Promise API.
    *
    * ```js
-   * postcss([autoprefixer]).process(css).then(result => {
-   *   console.log(result.css)
-   * }).catch(error => {
-   *   console.error(error)
+   * postcss([autoprefixer]).process(css).finally(() => {
+   *   console.log('processing ended')
    * })
    * ```
    */
-  catch: Promise<Result>['catch']
+  finally: Promise<Result>['finally']
 
   /**
    * Processes input CSS through synchronous and asynchronous plugins
-   * and calls onFinally on any error or when all plugins will finish work.
+   * and calls `onFulfilled` with a Result instance. If a plugin throws
+   * an error, the `onRejected` callback will be executed.
    *
    * It implements standard Promise API.
    *
    * ```js
-   * postcss([autoprefixer]).process(css).finally(() => {
-   *   console.log('processing ended')
+   * postcss([autoprefixer]).process(css, { from: cssPath }).then(result => {
+   *   console.log(result.css)
    * })
    * ```
    */
-  finally: Promise<Result>['finally']
+  then: Promise<Result>['then']
 
   /**
    * @param processor Processor used for this transformation.
@@ -72,25 +72,15 @@ declare class LazyResult_ implements PromiseLike<Result> {
   constructor(processor: Processor, css: string, opts: ResultOptions)
 
   /**
-   * Returns the default string description of an object.
-   * Required to implement the Promise interface.
-   */
-  get [Symbol.toStringTag](): string
-
-  /**
-   * Returns a `Processor` instance, which will be used
-   * for CSS transformations.
-   */
-  get processor(): Processor
-
-  /**
-   * Options from the `Processor#process` call.
+   * Run plugin in async way and return `Result`.
+   *
+   * @return Result with output content.
    */
-  get opts(): ResultOptions
+  async(): Promise<Result>
 
   /**
-   * Processes input CSS through synchronous plugins, converts `Root`
-   * to a CSS string and returns `Result#css`.
+   * An alias for the `css` property. Use it with syntaxes
+   * that generate non-CSS output.
    *
    * This property will only work with synchronous plugins.
    * If the processor contains any asynchronous plugins
@@ -98,11 +88,11 @@ declare class LazyResult_ implements PromiseLike<Result> {
    *
    * PostCSS runners should always use `LazyResult#then`.
    */
-  get css(): string
+  get content(): string
 
   /**
-   * An alias for the `css` property. Use it with syntaxes
-   * that generate non-CSS output.
+   * Processes input CSS through synchronous plugins, converts `Root`
+   * to a CSS string and returns `Result#css`.
    *
    * This property will only work with synchronous plugins.
    * If the processor contains any asynchronous plugins
@@ -110,7 +100,7 @@ declare class LazyResult_ implements PromiseLike<Result> {
    *
    * PostCSS runners should always use `LazyResult#then`.
    */
-  get content(): string
+  get css(): string
 
   /**
    * Processes input CSS through synchronous plugins
@@ -126,33 +116,49 @@ declare class LazyResult_ implements PromiseLike<Result> {
 
   /**
    * Processes input CSS through synchronous plugins
-   * and returns `Result#root`.
+   * and returns `Result#messages`.
    *
    * This property will only work with synchronous plugins. If the processor
    * contains any asynchronous plugins it will throw an error.
    *
    * PostCSS runners should always use `LazyResult#then`.
    */
-  get root(): Root
+  get messages(): Message[]
+
+  /**
+   * Options from the `Processor#process` call.
+   */
+  get opts(): ResultOptions
+
+  /**
+   * Returns a `Processor` instance, which will be used
+   * for CSS transformations.
+   */
+  get processor(): Processor
 
   /**
    * Processes input CSS through synchronous plugins
-   * and returns `Result#messages`.
+   * and returns `Result#root`.
    *
    * This property will only work with synchronous plugins. If the processor
    * contains any asynchronous plugins it will throw an error.
    *
    * PostCSS runners should always use `LazyResult#then`.
    */
-  get messages(): Message[]
+  get root(): Root
 
   /**
-   * Processes input CSS through synchronous plugins
-   * and calls `Result#warnings`.
+   * Returns the default string description of an object.
+   * Required to implement the Promise interface.
+   */
+  get [Symbol.toStringTag](): string
+
+  /**
+   * Run plugin in sync way and return `Result`.
    *
-   * @return Warnings from plugins.
+   * @return Result with output content.
    */
-  warnings(): Warning[]
+  sync(): Result
 
   /**
    * Alias for the `LazyResult#css` property.
@@ -166,18 +172,12 @@ declare class LazyResult_ implements PromiseLike<Result> {
   toString(): string
 
   /**
-   * Run plugin in sync way and return `Result`.
-   *
-   * @return Result with output content.
-   */
-  sync(): Result
-
-  /**
-   * Run plugin in async way and return `Result`.
+   * Processes input CSS through synchronous plugins
+   * and calls `Result#warnings`.
    *
-   * @return Result with output content.
+   * @return Warnings from plugins.
    */
-  async(): Promise<Result>
+  warnings(): Warning[]
 }
 
 declare class LazyResult extends LazyResult_ {}