postcss 8.4.48 → 8.5.0

package/lib/input.d.ts

@@ -62,6 +62,17 @@ declare class Input_ {
    */
   css: string
 
+  /**
+   * Input source with support for non-CSS documents.
+   *
+   * ```js
+   * const input = postcss.parse('a{}', { from: file, document: '<style>a {}</style>' }).input
+   * input.document //=> "<style>a {}</style>"
+   * input.css //=> "a{}"
+   * ```
+   */
+  document: string
+
   /**
    * The absolute path to the CSS source file defined
    * with the `from` option.

package/lib/input.js

@@ -33,6 +33,9 @@ class Input {
       this.hasBOM = false
     }
 
+    this.document = this.css
+    if (opts.document) this.document = opts.document.toString()
+
     if (opts.from) {
       if (
         !pathAvailable ||

package/lib/node.js

@@ -32,6 +32,36 @@ function cloneNode(obj, parent) {
   return cloned
 }
 
+function sourceOffset(inputCSS, position) {
+  // Not all custom syntaxes support `offset` in `source.start` and `source.end`
+  if (
+    position &&
+    typeof position.offset !== 'undefined'
+  ) {
+    return position.offset;
+  }
+
+  let column = 1
+  let line = 1
+  let offset = 0
+
+  for (let i = 0; i < inputCSS.length; i++) {
+    if (line === position.line && column === position.column) {
+      offset = i
+      break
+    }
+
+    if (inputCSS[i] === '\n') {
+      column = 1
+      line += 1
+    } else {
+      column += 1
+    }
+  }
+
+  return offset
+}
+
 class Node {
   constructor(defaults = {}) {
     this.raws = {}
@@ -174,12 +204,15 @@ class Node {
     return this.parent.nodes[index + 1]
   }
 
-  positionBy(opts, stringRepresentation) {
+  positionBy(opts) {
     let pos = this.source.start
     if (opts.index) {
       pos = this.positionInside(opts.index)
     } else if (opts.word) {
-      stringRepresentation = this.source.input.css.slice(this.source.start.offset, this.source.end.offset)
+      let stringRepresentation = this.source.input.document.slice(
+        sourceOffset(this.source.input.document, this.source.start),
+        sourceOffset(this.source.input.document, this.source.end)
+      )
       let index = stringRepresentation.indexOf(opts.word)
       if (index !== -1) pos = this.positionInside(index)
     }
@@ -189,11 +222,11 @@ class Node {
   positionInside(index) {
     let column = this.source.start.column
     let line = this.source.start.line
-    let offset = this.source.start.offset
+    let offset = sourceOffset(this.source.input.document, this.source.start)
     let end = offset + index
 
     for (let i = offset; i < end; i++) {
-      if (this.source.input.css[i] === '\n') {
+      if (this.source.input.document[i] === '\n') {
         column = 1
         line += 1
       } else {
@@ -226,13 +259,15 @@ class Node {
         }
 
     if (opts.word) {
-      let stringRepresentation = this.source.input.css.slice(this.source.start.offset, this.source.end.offset)
+      let stringRepresentation = this.source.input.document.slice(
+        sourceOffset(this.source.input.document, this.source.start),
+        sourceOffset(this.source.input.document, this.source.end)
+      )
       let index = stringRepresentation.indexOf(opts.word)
       if (index !== -1) {
-        start = this.positionInside(index, stringRepresentation)
+        start = this.positionInside(index)
         end = this.positionInside(
           index + opts.word.length,
-          stringRepresentation
         )
       }
     } else {

package/lib/postcss.d.ts

@@ -229,7 +229,7 @@ declare namespace postcss {
   export interface Parser<RootNode = Document | Root> {
     (
       css: { toString(): string } | string,
-      opts?: Pick<ProcessOptions, 'from' | 'map'>
+      opts?: Pick<ProcessOptions, 'document' | 'from' | 'map'>
     ): RootNode
   }
 
@@ -315,6 +315,11 @@ declare namespace postcss {
   }
 
   export interface ProcessOptions<RootNode = Document | Root> {
+    /**
+     * Input file if it is not simple CSS file, but HTML with <style> or JS with CSS-in-JS blocks.
+     */
+    document?: string
+
     /**
      * The path of the CSS source file. You should always set `from`,
      * because it is used in source map generation and syntax error messages.

package/lib/processor.js

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

package/lib/rule.d.ts

@@ -22,7 +22,7 @@ declare namespace Rule {
     between?: string
 
     /**
-     * Contains `true` if there is semicolon after rule.
+     * Contains the text of the semicolon after this rule.
      */
     ownSemicolon?: string
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.4.48",
+  "version": "8.5.0",
   "description": "Tool for transforming styles with JS plugins",
   "engines": {
     "node": "^10 || ^12 || >=14"
@@ -74,7 +74,7 @@
     "url": "https://github.com/postcss/postcss/issues"
   },
   "dependencies": {
-    "nanoid": "^3.3.7",
+    "nanoid": "^3.3.8",
     "picocolors": "^1.1.1",
     "source-map-js": "^1.2.1"
   },