Merge pull request #1283 from gemini-testing/TESTPLANE-1046.selectivity_alg

fix(selectivity): dont rely on source maps originalPositionFor mappings

Author: KuznetsovRoman

package-lock.json

@@ -76,6 +76,7 @@
   "dependencies": {
     "@babel/code-frame": "7.24.2",
     "@gemini-testing/commander": "2.15.4",
+    "@jridgewell/trace-mapping": "0.3.31",
     "@jspm/core": "2.0.1",
     "@jsquash/png": "3.1.1",
     "@puppeteer/browsers": "3.0.4",
@@ -112,7 +113,6 @@
     "sizzle": "2.3.6",
     "socket.io": "4.7.5",
     "socket.io-client": "4.7.5",
-    "source-map-js": "1.2.1",
     "strftime": "0.10.2",
     "strip-ansi": "6.0.1",
     "temp": "0.8.3",

package.json

@@ -357,7 +357,7 @@ export class CSSSelectivity {
                     rawSourceMap.sources.forEach(sourceFilePath => {
                         // Ignore generated postcss styles:
                         // https://github.com/postcss/postcss/blob/eae46db765d752cf8f40c4fa2b0b85030079c43d/lib/map-generator.js#L122
-                        if (sourceFilePath === "<no source>") {
+                        if (!sourceFilePath || sourceFilePath === "<no source>") {
                             return;
                         }
 

src/browser/cdp/selectivity/css-selectivity.ts

@@ -11,6 +11,7 @@ export const CacheType = {
     TestFile: "t",
     Asset: "a",
     CssSessionCache: "cs",
+    SourceMapParseResult: "sm",
 } as const;
 
 type CacheTypeValue = (typeof CacheType)[keyof typeof CacheType];

src/browser/cdp/selectivity/fs-cache.ts

@@ -1,7 +1,13 @@
 import { groupBy } from "lodash";
 import { resolve as urlResolve } from "node:url";
 import { JS_SOURCE_MAP_URL_COMMENT } from "../../../error-snippets/constants";
-import { extractSourceFilesDeps, fetchTextWithBrowserFallback, isCachedOnFs, isDataProtocol } from "./utils";
+import {
+    extractSourceFilesDeps,
+    fetchTextWithBrowserFallback,
+    isCachedOnFs,
+    isDataProtocol,
+    parseSourceMapRanges,
+} from "./utils";
 import { CacheType, getCachedSelectivityFile, hasCachedSelectivityFile, setCachedSelectivityFile } from "./fs-cache";
 import { debugSelectivity } from "./debug";
 import type { CDP } from "..";
@@ -328,11 +334,14 @@ export class JSSelectivity {
                         throw new Error(`JS Selectivity: fs-cache is broken for ${sourceUrl}`);
                     }
 
-                    const dependingSourceFiles = extractSourceFilesDeps(
+                    const parsedSourceMapRanges = await parseSourceMapRanges(
                         sourceString,
                         sourceMapsString,
-                        grouppedByScriptCoverage[scriptId],
                         this._sourceRoot,
+                    );
+                    const dependingSourceFiles = extractSourceFilesDeps(
+                        parsedSourceMapRanges,
+                        grouppedByScriptCoverage[scriptId],
                         isSourceCodeFile,
                     );