postcss 8.4.49 → 8.5.10

package/lib/input.js

@@ -9,12 +9,31 @@ let CssSyntaxError = require('./css-syntax-error')
 let PreviousMap = require('./previous-map')
 let terminalHighlight = require('./terminal-highlight')
 
-let fromOffsetCache = Symbol('fromOffsetCache')
+let lineToIndexCache = Symbol('lineToIndexCache')
 
 let sourceMapAvailable = Boolean(SourceMapConsumer && SourceMapGenerator)
 let pathAvailable = Boolean(resolve && isAbsolute)
 
+function getLineToIndex(input) {
+  if (input[lineToIndexCache]) return input[lineToIndexCache]
+  let lines = input.css.split('\n')
+  let 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
+  }
+
+  input[lineToIndexCache] = lineToIndex
+  return lineToIndex
+}
+
 class Input {
+  get from() {
+    return this.file || this.id
+  }
+
   constructor(css, opts = {}) {
     if (
       css === null ||
@@ -33,6 +52,9 @@ class Input {
       this.hasBOM = false
     }
 
+    this.document = this.css
+    if (opts.document) this.document = opts.document.toString()
+
     if (opts.from) {
       if (
         !pathAvailable ||
@@ -61,31 +83,38 @@ class Input {
   }
 
   error(message, line, column, opts = {}) {
-    let endColumn, endLine, result
+    let endColumn, endLine, endOffset, offset, result
 
     if (line && typeof line === 'object') {
       let start = line
       let end = column
       if (typeof start.offset === 'number') {
-        let pos = this.fromOffset(start.offset)
+        offset = start.offset
+        let pos = this.fromOffset(offset)
         line = pos.line
         column = pos.col
       } else {
         line = start.line
         column = start.column
+        offset = this.fromLineAndColumn(line, column)
       }
       if (typeof end.offset === 'number') {
-        let pos = this.fromOffset(end.offset)
+        endOffset = end.offset
+        let pos = this.fromOffset(endOffset)
         endLine = pos.line
         endColumn = pos.col
       } else {
         endLine = end.line
         endColumn = end.column
+        endOffset = this.fromLineAndColumn(end.line, end.column)
       }
     } else if (!column) {
-      let pos = this.fromOffset(line)
+      offset = line
+      let pos = this.fromOffset(offset)
       line = pos.line
       column = pos.col
+    } else {
+      offset = this.fromLineAndColumn(line, column)
     }
 
     let origin = this.origin(line, column, endLine, endColumn)
@@ -113,7 +142,15 @@ class Input {
       )
     }
 
-    result.input = { column, endColumn, endLine, line, source: this.css }
+    result.input = {
+      column,
+      endColumn,
+      endLine,
+      endOffset,
+      line,
+      offset,
+      source: this.css
+    }
     if (this.file) {
       if (pathToFileURL) {
         result.input.url = pathToFileURL(this.file).toString()
@@ -124,23 +161,15 @@ class Input {
     return result
   }
 
-  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
-      }
+  fromLineAndColumn(line, column) {
+    let lineToIndex = getLineToIndex(this)
+    let index = lineToIndex[line - 1]
+    return index + column - 1
+  }
 
-      this[fromOffsetCache] = lineToIndex
-    } else {
-      lineToIndex = this[fromOffsetCache]
-    }
-    lastLine = lineToIndex[lineToIndex.length - 1]
+  fromOffset(offset) {
+    let lineToIndex = getLineToIndex(this)
+    let lastLine = lineToIndex[lineToIndex.length - 1]
 
     let min = 0
     if (offset >= lastLine) {
@@ -234,10 +263,6 @@ class Input {
     }
     return json
   }
-
-  get from() {
-    return this.file || this.id
-  }
 }
 
 module.exports = Input

package/lib/lazy-result.d.ts

@@ -6,7 +6,6 @@ import Root from './root.js'
 import Warning from './warning.js'
 
 declare namespace LazyResult {
-  // eslint-disable-next-line @typescript-eslint/no-use-before-define
   export { LazyResult_ as default }
 }
 
@@ -19,9 +18,9 @@ declare namespace LazyResult {
  * const lazy = postcss([autoprefixer]).process(css)
  * ```
  */
-declare class LazyResult_<RootNode = Document | Root>
-  implements PromiseLike<Result<RootNode>>
-{
+declare class LazyResult_<RootNode = Document | Root> implements PromiseLike<
+  Result<RootNode>
+> {
   /**
    * Processes input CSS through synchronous and asynchronous plugins
    * and calls onRejected for each error thrown in any plugin.
@@ -67,46 +66,6 @@ declare class LazyResult_<RootNode = Document | Root>
    */
   then: Promise<Result<RootNode>>['then']
 
-  /**
-   * @param processor Processor used for this transformation.
-   * @param css       CSS to parse and transform.
-   * @param opts      Options from the `Processor#process` or `Root#toResult`.
-   */
-  constructor(processor: Processor, css: string, opts: ResultOptions)
-
-  /**
-   * Run plugin in async way and return `Result`.
-   *
-   * @return Result with output content.
-   */
-  async(): Promise<Result<RootNode>>
-
-  /**
-   * Run plugin in sync way and return `Result`.
-   *
-   * @return Result with output content.
-   */
-  sync(): Result<RootNode>
-
-  /**
-   * Alias for the `LazyResult#css` property.
-   *
-   * ```js
-   * lazy + '' === lazy.css
-   * ```
-   *
-   * @return Output CSS.
-   */
-  toString(): string
-
-  /**
-   * Processes input CSS through synchronous plugins
-   * and calls `Result#warnings`.
-   *
-   * @return Warnings from plugins.
-   */
-  warnings(): Warning[]
-
   /**
    * An alias for the `css` property. Use it with syntaxes
    * that generate non-CSS output.
@@ -181,6 +140,46 @@ declare class LazyResult_<RootNode = Document | Root>
    * Required to implement the Promise interface.
    */
   get [Symbol.toStringTag](): string
+
+  /**
+   * @param processor Processor used for this transformation.
+   * @param css       CSS to parse and transform.
+   * @param opts      Options from the `Processor#process` or `Root#toResult`.
+   */
+  constructor(processor: Processor, css: string, opts: ResultOptions)
+
+  /**
+   * Run plugin in async way and return `Result`.
+   *
+   * @return Result with output content.
+   */
+  async(): Promise<Result<RootNode>>
+
+  /**
+   * Run plugin in sync way and return `Result`.
+   *
+   * @return Result with output content.
+   */
+  sync(): Result<RootNode>
+
+  /**
+   * Alias for the `LazyResult#css` property.
+   *
+   * ```js
+   * lazy + '' === lazy.css
+   * ```
+   *
+   * @return Output CSS.
+   */
+  toString(): string
+
+  /**
+   * Processes input CSS through synchronous plugins
+   * and calls `Result#warnings`.
+   *
+   * @return Warnings from plugins.
+   */
+  warnings(): Warning[]
 }
 
 declare class LazyResult<

package/lib/lazy-result.js

@@ -105,6 +105,38 @@ function cleanMarks(node) {
 let postcss = {}
 
 class LazyResult {
+  get content() {
+    return this.stringify().content
+  }
+
+  get css() {
+    return this.stringify().css
+  }
+
+  get map() {
+    return this.stringify().map
+  }
+
+  get messages() {
+    return this.sync().messages
+  }
+
+  get opts() {
+    return this.result.opts
+  }
+
+  get processor() {
+    return this.result.processor
+  }
+
+  get root() {
+    return this.sync().root
+  }
+
+  get [Symbol.toStringTag]() {
+    return 'LazyResult'
+  }
+
   constructor(processor, css, opts) {
     this.stringified = false
     this.processed = false
@@ -505,38 +537,6 @@ class LazyResult {
   warnings() {
     return this.sync().warnings()
   }
-
-  get content() {
-    return this.stringify().content
-  }
-
-  get css() {
-    return this.stringify().css
-  }
-
-  get map() {
-    return this.stringify().map
-  }
-
-  get messages() {
-    return this.sync().messages
-  }
-
-  get opts() {
-    return this.result.opts
-  }
-
-  get processor() {
-    return this.result.processor
-  }
-
-  get root() {
-    return this.sync().root
-  }
-
-  get [Symbol.toStringTag]() {
-    return 'LazyResult'
-  }
 }
 
 LazyResult.registerPostcss = dependant => {

package/lib/list.d.ts

@@ -55,6 +55,6 @@ declare namespace list {
   }
 }
 
-declare const list: list.List
+declare let list: list.List
 
 export = list

package/lib/map-generator.js

@@ -75,7 +75,15 @@ class MapGenerator {
         }
       }
     } else if (this.css) {
-      this.css = this.css.replace(/\n*\/\*#[\S\s]*?\*\/$/gm, '')
+      let startIndex
+      while ((startIndex = this.css.lastIndexOf('/*#')) !== -1) {
+        let endIndex = this.css.indexOf('*/', startIndex + 3)
+        if (endIndex === -1) break
+        while (startIndex > 0 && this.css[startIndex - 1] === '\n') {
+          startIndex--
+        }
+        this.css = this.css.slice(0, startIndex) + this.css.slice(endIndex + 2)
+      }
     }
   }
 

package/lib/no-work-result.d.ts

@@ -6,7 +6,6 @@ import Root from './root.js'
 import Warning from './warning.js'
 
 declare namespace NoWorkResult {
-  // eslint-disable-next-line @typescript-eslint/no-use-before-define
   export { NoWorkResult_ as default }
 }
 
@@ -26,11 +25,6 @@ declare class NoWorkResult_ implements LazyResult<Root> {
   catch: Promise<Result<Root>>['catch']
   finally: Promise<Result<Root>>['finally']
   then: Promise<Result<Root>>['then']
-  constructor(processor: Processor, css: string, opts: ResultOptions)
-  async(): Promise<Result<Root>>
-  sync(): Result<Root>
-  toString(): string
-  warnings(): Warning[]
   get content(): string
   get css(): string
   get map(): SourceMap
@@ -39,6 +33,11 @@ declare class NoWorkResult_ implements LazyResult<Root> {
   get processor(): Processor
   get root(): Root
   get [Symbol.toStringTag](): string
+  constructor(processor: Processor, css: string, opts: ResultOptions)
+  async(): Promise<Result<Root>>
+  sync(): Result<Root>
+  toString(): string
+  warnings(): Warning[]
 }
 
 declare class NoWorkResult extends NoWorkResult_ {}

package/lib/no-work-result.js

@@ -2,11 +2,61 @@
 
 let MapGenerator = require('./map-generator')
 let parse = require('./parse')
-const Result = require('./result')
+let Result = require('./result')
 let stringify = require('./stringify')
 let warnOnce = require('./warn-once')
 
 class NoWorkResult {
+  get content() {
+    return this.result.css
+  }
+
+  get css() {
+    return this.result.css
+  }
+
+  get map() {
+    return this.result.map
+  }
+
+  get messages() {
+    return []
+  }
+
+  get opts() {
+    return this.result.opts
+  }
+
+  get processor() {
+    return this.result.processor
+  }
+
+  get root() {
+    if (this._root) {
+      return this._root
+    }
+
+    let root
+    let parser = parse
+
+    try {
+      root = parser(this._css, this._opts)
+    } catch (error) {
+      this.error = error
+    }
+
+    if (this.error) {
+      throw this.error
+    } else {
+      this._root = root
+      return root
+    }
+  }
+
+  get [Symbol.toStringTag]() {
+    return 'NoWorkResult'
+  }
+
   constructor(processor, css, opts) {
     css = css.toString()
     this.stringified = false
@@ -15,10 +65,9 @@ class NoWorkResult {
     this._css = css
     this._opts = opts
     this._map = undefined
-    let root
 
     let str = stringify
-    this.result = new Result(this._processor, root, this._opts)
+    this.result = new Result(this._processor, undefined, this._opts)
     this.result.css = css
 
     let self = this
@@ -28,7 +77,7 @@ class NoWorkResult {
       }
     })
 
-    let map = new MapGenerator(str, root, this._opts, css)
+    let map = new MapGenerator(str, undefined, this._opts, css)
     if (map.isMap()) {
       let [generatedCSS, generatedMap] = map.generate()
       if (generatedCSS) {
@@ -82,56 +131,6 @@ class NoWorkResult {
   warnings() {
     return []
   }
-
-  get content() {
-    return this.result.css
-  }
-
-  get css() {
-    return this.result.css
-  }
-
-  get map() {
-    return this.result.map
-  }
-
-  get messages() {
-    return []
-  }
-
-  get opts() {
-    return this.result.opts
-  }
-
-  get processor() {
-    return this.result.processor
-  }
-
-  get root() {
-    if (this._root) {
-      return this._root
-    }
-
-    let root
-    let parser = parse
-
-    try {
-      root = parser(this._css, this._opts)
-    } catch (error) {
-      this.error = error
-    }
-
-    if (this.error) {
-      throw this.error
-    } else {
-      this._root = root
-      return root
-    }
-  }
-
-  get [Symbol.toStringTag]() {
-    return 'NoWorkResult'
-  }
 }
 
 module.exports = NoWorkResult

package/lib/node.d.ts

@@ -1,5 +1,4 @@
 import AtRule = require('./at-rule.js')
-
 import { AtRuleProps } from './at-rule.js'
 import Comment, { CommentProps } from './comment.js'
 import Container, { NewChild } from './container.js'
@@ -66,6 +65,22 @@ declare namespace Node {
     /**
      * The inclusive ending position for the source
      * code of a node.
+     *
+     * However, `end.offset` of a non `Root` node is the exclusive position.
+     * See https://github.com/postcss/postcss/pull/1879 for details.
+     *
+     * ```js
+     * const root = postcss.parse('a { color: black }')
+     * const a = root.first
+     * const color = a.first
+     *
+     * // The offset of `Root` node is the inclusive position
+     * css.source.end   // { line: 1, column: 19, offset: 18 }
+     *
+     * // The offset of non `Root` node is the exclusive position
+     * a.source.end     // { line: 1, column: 18, offset: 18 }
+     * color.source.end // { line: 1, column: 16, offset: 16 }
+     * ```
      */
     end?: Position
 
@@ -111,7 +126,6 @@ declare namespace Node {
     word?: string
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-shadow
   class Node extends Node_ {}
   export { Node as default }
 }
@@ -234,14 +248,6 @@ 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.
    *
@@ -432,7 +438,7 @@ declare abstract class Node_ {
    * @return Range.
    */
   rangeBy(
-    opts?: Pick<WarningOptions, 'endIndex' | 'index' | 'word'>
+    opts?: Pick<WarningOptions, 'end' | 'endIndex' | 'index' | 'start' | 'word'>
   ): Node.Range
 
   /**
@@ -534,6 +540,14 @@ declare abstract class Node_ {
    * @return `Warning` instance is returned
    */
   warn(result: Result, message: string, options?: WarningOptions): Warning
+
+  /**
+   * 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
 }
 
 declare class Node extends Node_ {}