postcss 8.5.30 → 8.5.32

package/lib/input.js

@@ -230,7 +230,7 @@ class Input {
     } else {
       fromUrl = new URL(
         from.source,
-        this.map.consumer().sourceRoot || pathToFileURL(this.map.mapFile)
+        pathToFileURL(this.map.mapFile || resolve('.') + '/')
       )
     }
 

package/lib/lazy-result.js

@@ -205,7 +205,7 @@ class LazyResult {
   }
 
   finally(onFinally) {
-    return this.async().then(onFinally, onFinally)
+    return this.async().finally(onFinally)
   }
 
   getAsyncError() {

package/lib/no-work-result.js

@@ -102,7 +102,7 @@ class NoWorkResult {
   }
 
   finally(onFinally) {
-    return this.async().then(onFinally, onFinally)
+    return this.async().finally(onFinally)
   }
 
   sync() {

package/lib/node.js

@@ -240,7 +240,7 @@ class Node {
     } else if (opts.word) {
       let stringRepresentation = inputString.slice(
         sourceOffset(inputString, this.source.start),
-        sourceOffset(inputString, this.source.end)
+        this.rangeBy().end.offset
       )
       let index = stringRepresentation.indexOf(opts.word)
       if (index !== -1) pos = this.positionInside(index)
@@ -308,7 +308,7 @@ class Node {
     if (opts.word) {
       let stringRepresentation = inputString.slice(
         sourceOffset(inputString, this.source.start),
-        sourceOffset(inputString, this.source.end)
+        end.offset
       )
       let index = stringRepresentation.indexOf(opts.word)
       if (index !== -1) {

package/lib/processor.js

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

package/lib/stringify.js

@@ -10,8 +10,30 @@ function escapeHTMLInCSS(str) {
   return str.replace(STYLE_TAG, '\\3c $2').replace(COMMENT_OPEN, '\\3c $2')
 }
 
+function cutEscaped(chunks, css, escaped) {
+  let parts = []
+  let at = 0
+  let into = 0
+  for (let i = 0; i < chunks.length; i += 3) {
+    let from = into
+    let end = at + chunks[i].length
+    while (at < end) {
+      if (css[at] === escaped[into]) {
+        at += 1
+        into += 1
+      } else {
+        // The `<` of this pair was replaced by the `\3c ` in front of it
+        at += 1
+        into += 4
+      }
+    }
+    parts.push(escaped.slice(from, into))
+  }
+  return parts
+}
+
 class SafeStringifier extends Stringifier {
-  escapeHTML(node, print) {
+  escapeHTML(print) {
     let builder = this.builder
     let chunks, css
     this.builder = (str, child, type) => {
@@ -39,20 +61,20 @@ class SafeStringifier extends Stringifier {
         builder(chunks[i], chunks[i + 1], chunks[i + 2])
       }
     } else {
-      // Escaping happens only on a hack attempt, source map is not important.
-      // Map only the node start: the end mapping expects the node’s last
-      // char at the end of the string, which is wrong for Root raws.after.
-      builder(escaped, node, 'start')
+      let parts = cutEscaped(chunks, css, escaped)
+      for (let i = 0; i < chunks.length; i += 3) {
+        builder(parts[i / 3], chunks[i + 1], chunks[i + 2])
+      }
     }
   }
 
   root(node) {
     if (node.parent && node.parent.type === 'document') {
       // Document raws around the Root hold markup and are kept as is since CSS in Document can be marked with <style>
-      this.escapeHTML(node, () => this.body(node))
+      this.escapeHTML(() => this.body(node))
       if (node.raws.after) this.builder(node.raws.after)
     } else {
-      this.escapeHTML(node, () => super.root(node))
+      this.escapeHTML(() => super.root(node))
     }
   }
 }
@@ -63,7 +85,7 @@ function stringify(node, builder) {
   if (node.type === 'root' || node.type === 'document') {
     str.stringify(node)
   } else {
-    str.escapeHTML(node, () => str.stringify(node))
+    str.escapeHTML(() => str.stringify(node))
   }
 }
 

package/lib/warning.js

@@ -31,6 +31,7 @@ class Warning {
       return this.node.error(this.text, {
         index: this.index,
         plugin: this.plugin,
+        start: this.start,
         word: this.word
       }).message
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.5.30",
+  "version": "8.5.32",
   "description": "Tool for transforming styles with JS plugins",
   "keywords": [
     "css",