Merge pull request #1909 from romainmenke/no-work-result-vs-lazy-result--inventive-pygmy-marmoset-5bbea7d7dd

ai · web-flow · commit c751e11ae85f · 2024-01-04T16:12:47.000+01:00
Ensure that `NoWorkResult` and `LazyResult` have the same outcome.
diff --git a/lib/map-generator.js b/lib/map-generator.js
@@ -16,6 +16,7 @@ class MapGenerator {
     this.root = root
     this.opts = opts
     this.css = cssString
+    this.originalCSS = cssString
     this.usesFileUrls = !this.mapOpts.from && this.mapOpts.absolute
 
     this.memoizedFileURLs = new Map()
@@ -74,7 +75,7 @@ class MapGenerator {
         }
       }
     } else if (this.css) {
-      this.css = this.css.replace(/(\n)?\/\*#[\S\s]*?\*\/$/gm, '')
+      this.css = this.css.replace(/\n*?\/\*#[\S\s]*?\*\/$/gm, '')
     }
   }
 
@@ -276,7 +277,7 @@ class MapGenerator {
           }
         })
       } else {
-        let input = new Input(this.css, this.opts)
+        let input = new Input(this.originalCSS, this.opts)
         if (input.map) this.previousMaps.push(input.map)
       }
     }
diff --git a/lib/no-work-result.js b/lib/no-work-result.js
@@ -37,6 +37,9 @@ class NoWorkResult {
       if (generatedMap) {
         this.result.map = generatedMap
       }
+    } else {
+      map.clearAnnotation();
+      this.result.css = map.css;
     }
   }
 
diff --git a/test/no-work-result.test.ts b/test/no-work-result.test.ts
@@ -1,9 +1,12 @@
+import postcss = require('../lib/postcss.js')
+import stringify = require('../lib/stringify.js')
 import { spy } from 'nanospy'
 import { SourceMapGenerator } from 'source-map-js'
 import { test } from 'uvu'
 import { equal, instance, is, not, throws, type } from 'uvu/assert'
 
 import NoWorkResult from '../lib/no-work-result.js'
+import parse from '../lib/parse.js'
 import Processor from '../lib/processor.js'
 
 let processor = new Processor()
@@ -98,4 +101,75 @@ test('prints its object type', () => {
   is(Object.prototype.toString.call(result), '[object NoWorkResult]')
 })
 
+test('no work result matches lazy result', async () => {
+  let source = '.foo { color: red }\n';
+
+  let noWorkResult = await postcss([]).process(source, {
+    from: 'foo.css',
+    map: false
+  });
+
+  let lazyResult = await postcss([]).process(source, {
+    from: 'foo.css',
+    map: false,
+    syntax: { parse, stringify }
+  });
+
+  equal(noWorkResult.css, lazyResult.css);
+})
+
+// https://github.com/postcss/postcss/issues/1911
+test('no work result matches lazy result when map is true', async () => {
+  let source = '.foo { color: red }\n';
+
+  let noWorkResult = await postcss([]).process(source, {
+    from: 'foo.css',
+    map: true
+  });
+
+  equal(noWorkResult.css, '.foo { color: red }\n\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImZvby5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEiLCJmaWxlIjoiZm9vLmNzcyIsInNvdXJjZXNDb250ZW50IjpbIi5mb28geyBjb2xvcjogcmVkIH1cbiJdfQ== */');
+
+  let lazyResult = await postcss([]).process(source, {
+    from: 'foo.css',
+    map: true,
+    syntax: { parse, stringify }
+  });
+
+  equal(lazyResult.css, '.foo { color: red }\n\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImZvby5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxXQUFXIiwiZmlsZSI6ImZvby5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIuZm9vIHsgY29sb3I6IHJlZCB9XG4iXX0= */');
+})
+
+test('no work result matches lazy result when the source contains an inline source map', async () => {
+  let source = '.foo { color: red }\n\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImZvby5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxXQUFXIiwiZmlsZSI6ImZvby5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIuZm9vIHsgY29sb3I6IHJlZCB9XG4iXX0= */\n';
+
+  let noWorkResult = await postcss([]).process(source, {
+    from: 'foo.css',
+    map: false
+  });
+
+  let lazyResult = await postcss([]).process(source, {
+    from: 'foo.css',
+    map: false,
+    syntax: { parse, stringify }
+  });
+
+  equal(noWorkResult.css, lazyResult.css);
+})
+
+test('no work result matches lazy result when map is true and the source contains an inline source map', async () => {
+  let source = '.foo { color: red }\n\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImZvby5jc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxXQUFXIiwiZmlsZSI6ImZvby5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIuZm9vIHsgY29sb3I6IHJlZCB9XG4iXX0= */\n';
+
+  let lazyResult = await postcss([]).process(source, {
+    from: 'bar.css',
+    map: true,
+    syntax: { parse, stringify }
+  });
+
+  let noWorkResult = await postcss([]).process(source, {
+    from: 'bar.css',
+    map: true
+  });
+
+  equal(noWorkResult.css, lazyResult.css);
+})
+
 test.run()

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class MapGenerator {`
`16`	`16`	`this.root = root`
`17`	`17`	`this.opts = opts`
`18`	`18`	`this.css = cssString`
	`19`	`+ this.originalCSS = cssString`
`19`	`20`	`this.usesFileUrls = !this.mapOpts.from && this.mapOpts.absolute`
`20`	`21`
`21`	`22`	`this.memoizedFileURLs = new Map()`
`@@ -74,7 +75,7 @@ class MapGenerator {`
`74`	`75`	`}`
`75`	`76`	`}`
`76`	`77`	`} else if (this.css) {`
`77`		`- this.css = this.css.replace(/(\n)?\/\#[\S\s]?\*\/$/gm, '')`
	`78`	`+ this.css = this.css.replace(/\n?\/\#[\S\s]?\\/$/gm, '')`
`78`	`79`	`}`
`79`	`80`	`}`
`80`	`81`
`@@ -276,7 +277,7 @@ class MapGenerator {`
`276`	`277`	`}`
`277`	`278`	`})`
`278`	`279`	`} else {`
`279`		`- let input = new Input(this.css, this.opts)`
	`280`	`+ let input = new Input(this.originalCSS, this.opts)`
`280`	`281`	`if (input.map) this.previousMaps.push(input.map)`
`281`	`282`	`}`
`282`	`283`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ class NoWorkResult {`
`37`	`37`	`if (generatedMap) {`
`38`	`38`	`this.result.map = generatedMap`
`39`	`39`	`}`
	`40`	`+ } else {`
	`41`	`+ map.clearAnnotation();`
	`42`	`+ this.result.css = map.css;`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`