postcss 8.4.1 → 8.4.2

package/lib/map-generator.js

@@ -4,6 +4,8 @@ let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 let { dirname, resolve, relative, sep } = require('path')
 let { pathToFileURL } = require('url')
 
+let Input = require('./input')
+
 let sourceMapAvailable = Boolean(SourceMapConsumer && SourceMapGenerator)
 let pathAvailable = Boolean(dirname && resolve && relative && sep)
 
@@ -26,14 +28,19 @@ class MapGenerator {
   previous() {
     if (!this.previousMaps) {
       this.previousMaps = []
-      this.root.walk(node => {
-        if (node.source && node.source.input.map) {
-          let map = node.source.input.map
-          if (!this.previousMaps.includes(map)) {
-            this.previousMaps.push(map)
+      if (this.root) {
+        this.root.walk(node => {
+          if (node.source && node.source.input.map) {
+            let map = node.source.input.map
+            if (!this.previousMaps.includes(map)) {
+              this.previousMaps.push(map)
+            }
           }
-        }
-      })
+        })
+      } else {
+        let input = new Input(this.css, this.opts)
+        if (input.map) this.previousMaps.push(input.map)
+      }
     }
 
     return this.previousMaps
@@ -68,9 +75,7 @@ class MapGenerator {
   clearAnnotation() {
     if (this.mapOpts.annotation === false) return
 
-    if (!this.root && typeof this.css === 'string') {
-      this.css = this.css.replace(/(\n)?\/\*#[\S\s]*?\*\/$/gm, '')
-    } else {
+    if (this.root) {
       let node
       for (let i = this.root.nodes.length - 1; i >= 0; i--) {
         node = this.root.nodes[i]
@@ -79,23 +84,32 @@ class MapGenerator {
           this.root.removeChild(i)
         }
       }
+    } else {
+      this.css = this.css.replace(/(\n)?\/\*#[\S\s]*?\*\/$/gm, '')
     }
   }
 
   setSourcesContent() {
     let already = {}
-    this.root.walk(node => {
-      if (node.source) {
-        let from = node.source.input.from
-        if (from && !already[from]) {
-          already[from] = true
-          this.map.setSourceContent(
-            this.toUrl(this.path(from)),
-            node.source.input.css
-          )
+    if (this.root) {
+      this.root.walk(node => {
+        if (node.source) {
+          let from = node.source.input.from
+          if (from && !already[from]) {
+            already[from] = true
+            this.map.setSourceContent(
+              this.toUrl(this.path(from)),
+              node.source.input.css
+            )
+          }
         }
-      }
-    })
+      })
+    } else {
+      let from = this.opts.from
+        ? this.toUrl(this.path(this.opts.from))
+        : '<no source>'
+      this.map.setSourceContent(from, this.css)
+    }
   }
 
   applyPrevMaps() {
@@ -134,7 +148,6 @@ class MapGenerator {
     if (Buffer) {
       return Buffer.from(str).toString('base64')
     } else {
-      /* c8 ignore next 2 */
       return window.btoa(unescape(encodeURIComponent(str)))
     }
   }
@@ -152,7 +165,6 @@ class MapGenerator {
     } else {
       content = this.outputFile() + '.map'
     }
-    /* c8 ignore next 6 */
     let eol = '\n'
     if (this.css.includes('\r\n')) eol = '\r\n'
 
@@ -162,49 +174,38 @@ class MapGenerator {
   outputFile() {
     if (this.opts.to) {
       return this.path(this.opts.to)
-    }
-    if (this.opts.from) {
+    } else if (this.opts.from) {
       return this.path(this.opts.from)
+    } else {
+      return 'to.css'
     }
-    return 'to.css'
   }
 
   generateMap() {
-    this.generateString()
-    if (this.isSourcesContent()) this.setSourcesContent()
-    if (this.previous().length > 0) this.applyPrevMaps()
-    if (this.isAnnotation()) this.addAnnotation()
-
-    if (this.isInline()) {
-      return [this.css]
-    }
-    return [this.css, this.map]
-  }
-
-  generateSimpleMap() {
-    this.map = new SourceMapGenerator({ file: this.outputFile() })
-    this.previousMaps = []
-
-    let source
-    if (this.opts.from) {
-      source = this.toUrl(this.opts.from)
+    if (this.root) {
+      this.generateString()
+    } else if (this.previous().length === 1) {
+      let prev = this.previous()[0].consumer()
+      prev.file = this.outputFile()
+      this.map = SourceMapGenerator.fromSourceMap(prev)
     } else {
-      source = '<no source>'
+      this.map = new SourceMapGenerator({ file: this.outputFile() })
+      this.map.addMapping({
+        source: this.opts.from ? this.toUrl(this.opts.from) : '<no source>',
+        generated: { line: 1, column: 0 },
+        original: { line: 1, column: 0 }
+      })
     }
 
-    this.map.addMapping({
-      source,
-      generated: { line: 1, column: 0 },
-      original: { line: 1, column: 0 }
-    })
-
+    if (this.isSourcesContent()) this.setSourcesContent()
+    if (this.root && this.previous().length > 0) this.applyPrevMaps()
     if (this.isAnnotation()) this.addAnnotation()
 
     if (this.isInline()) {
       return [this.css]
+    } else {
+      return [this.css, this.map]
     }
-
-    return [this.cssString, this.map]
   }
 
   path(file) {
@@ -224,7 +225,6 @@ class MapGenerator {
 
   toUrl(path) {
     if (sep === '\\') {
-      /* c8 ignore next 2 */
       path = path.replace(/\\/g, '/')
     }
     return encodeURI(path).replace(/[#?]/g, encodeURIComponent)
@@ -237,7 +237,6 @@ class MapGenerator {
       if (pathToFileURL) {
         return pathToFileURL(node.source.input.from).toString()
       } else {
-        /* c8 ignore next 4 */
         throw new Error(
           '`map.absolute` option is not available in this PostCSS build'
         )
@@ -267,7 +266,6 @@ class MapGenerator {
 
       if (node && type !== 'end') {
         mapping.generated.line = line
-        /* c8 ignore next */
         mapping.generated.column = column - 1
         if (node.source && node.source.start) {
           mapping.source = this.sourcePath(node)
@@ -275,7 +273,6 @@ class MapGenerator {
           mapping.original.column = node.source.start.column - 1
           this.map.addMapping(mapping)
         } else {
-          /* c8 ignore next 8 */
           mapping.source = noSource
           mapping.original.line = 1
           mapping.original.column = 0
@@ -317,20 +314,15 @@ class MapGenerator {
 
   generate() {
     this.clearAnnotation()
-
-    if (pathAvailable && sourceMapAvailable && this.isMap() && !this.root) {
-      return this.generateSimpleMap()
-    }
-
     if (pathAvailable && sourceMapAvailable && this.isMap()) {
       return this.generateMap()
+    } else {
+      let result = ''
+      this.stringify(this.root, i => {
+        result += i
+      })
+      return [result]
     }
-
-    let result = ''
-    this.stringify(this.root, i => {
-      result += i
-    })
-    return [result]
   }
 }
 

package/lib/no-work-result.js

@@ -27,8 +27,8 @@ class NoWorkResult {
       }
     })
 
-    if (this._opts.map) {
-      let map = new MapGenerator(str, root, this._opts, css)
+    let map = new MapGenerator(str, root, this._opts, css)
+    if (map.isMap()) {
       let [generatedCSS, generatedMap] = map.generate()
       if (generatedCSS) {
         this.result.css = generatedCSS

package/lib/processor.js

@@ -1,13 +1,13 @@
 'use strict'
 
+let NoWorkResult = require('./no-work-result')
 let LazyResult = require('./lazy-result')
 let Document = require('./document')
 let Root = require('./root')
-let NoWorkResult = require('./no-work-result')
 
 class Processor {
   constructor(plugins = []) {
-    this.version = '8.4.1'
+    this.version = '8.4.2'
     this.plugins = this.normalize(plugins)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss",
-  "version": "8.4.1",
+  "version": "8.4.2",
   "description": "Tool for transforming styles with JS plugins",
   "engines": {
     "node": "^10 || ^12 || >=14"