@percy/cli-command 1.32.0-beta.9 → 1.32.1

package/dist/smartsnap.js

@@ -115,6 +115,60 @@ function gitProjectRoot() {
   return git(['rev-parse', '--show-toplevel']).trim();
 }
 
+// Parse `git diff --unified=0` hunk headers to find which line ranges are new
+// or changed (on the HEAD side) for each file, then key them by the file's
+// index in the stats `files` array — the same index module/source refs use, so
+// the graph can join them without a path lookup. `--unified=0` drops context
+// lines so every hunk header bounds an actual change; `--no-renames` makes a
+// rename surface as add+delete so the new path is always concrete.
+//
+// Files in the diff that aren't tracked in `files` (e.g. node_modules,
+// .storybook, or anything the stats compactor didn't index) are skipped — the
+// graph can only reason about indexed files. Returns { <fileIndex>: [[start, end], ...] }.
+export function getAffectedFileLocations(baseRef, files) {
+  assertSafeRef(baseRef);
+  const diff = git(['diff', '--unified=0', '--no-color', '--no-renames', baseRef, 'HEAD', '--']);
+
+  // The `files` array uses the platform separator (path.relative → back-slash
+  // on Windows); git diff always emits forward slashes. Normalize both to
+  // forward-slash for the path→index lookup.
+  const toPosix = p => p.split(path.sep).join('/');
+  const indexByPath = new Map(files.map((f, i) => [toPosix(f), i]));
+
+  // @@ -a,b +c,d @@ — the new-side `+c,d` is what we want. `d` defaults to 1
+  // when omitted; `d === 0` is a pure deletion anchored at line c (no added
+  // lines), so it contributes no range.
+  const HUNK = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/;
+  const locations = {};
+  let currentIdx;
+  for (const line of diff.split('\n')) {
+    // `+++ b/<path>` opens a file's hunks with its new-side path; a pure
+    // deletion shows `+++ /dev/null`, so leave currentIdx unset and skip it.
+    if (line.startsWith('+++ ')) {
+      const p = line.slice(4);
+      if (p === '/dev/null') {
+        currentIdx = undefined;
+        continue;
+      }
+      /* istanbul ignore next: git always prefixes the new-side path with `b/`
+         (anything else is `/dev/null`, handled above), so the bare `: p`
+         fallback is defensive and unreachable in real diff output */
+      const rel = p.startsWith('b/') ? p.slice(2) : p;
+      currentIdx = indexByPath.get(rel);
+      continue;
+    }
+    if (currentIdx === undefined) continue;
+    const m = HUNK.exec(line);
+    if (!m) continue;
+    const start = parseInt(m[1], 10);
+    const count = m[2] === undefined ? 1 : parseInt(m[2], 10);
+    if (count === 0) continue;
+    if (!locations[currentIdx]) locations[currentIdx] = [];
+    locations[currentIdx].push([start, start + count - 1]);
+  }
+  return locations;
+}
+
 // Paths under these directories are dependencies / framework wiring rather
 // than first-party source, so we don't track them in the file index.
 const EXCLUDED_DIRS = new Set(['node_modules', '.storybook']);
@@ -156,6 +210,11 @@ function transformModule(m, fileIndex, projectRoot) {
     if (copy.type === 'src' && typeof copy.source === 'string') {
       copy.source = resolveAndIndex(copy.source, fileIndex, projectRoot);
     }
+    // `loc` (when present) is an array of `{ start, end }` source spans; the
+    // graph expects each span as a `[start, end]` tuple instead.
+    if (Array.isArray(copy.loc)) {
+      copy.loc = copy.loc.map(l => [l.start, l.end]);
+    }
     return copy;
   };
   if (Array.isArray(m.imports)) out.imports = m.imports.map(mapEntry);
@@ -220,7 +279,7 @@ async function pollGraphStatus(percy, buildId, log) {
     const res = await percy.client.getStatus('smartsnap_graph', [buildId]);
     const status = res === null || res === void 0 ? void 0 : res.status;
     log.debug(`SmartSnap: graph status (attempt ${i + 1}) = ${status}`);
-    if (status === 'done' || status === 'failure') return {
+    if (status === 'done' || status === 'failed') return {
       status,
       data: res === null || res === void 0 ? void 0 : res.data
     };
@@ -453,20 +512,25 @@ export async function runGraphGeneration(percy, buildId, payload, log) {
     files,
     modules,
     storybookPaths,
-    affectedNodes
+    affectedNodes,
+    affectedFileLocations
   } = payload;
   log.debug(`SmartSnap: starting graph generation job ${JSON.stringify({
     buildId,
     files,
     modules,
     storybookPaths,
-    affectedNodes
+    affectedNodes,
+    affectedFileLocations
   })}`);
+  // Pass camelCase to the client, which snake_cases it to `affected_file_locations`
+  // for the API (same convention as storybookPaths → storybook_paths).
   await percy.client.generateSmartsnapGraph(buildId, {
     files,
     modules,
     storybookPaths,
-    affectedNodes
+    affectedNodes,
+    affectedFileLocations
   });
   const {
     status,
@@ -621,11 +685,15 @@ export async function applySmartSnap(percy, snapshots, smartSnapConfig, buildDir
   if (packageAffectedNodes.length) {
     affectedNodes = [...affectedNodes, ...packageAffectedNodes];
   }
+
+  // Line-level diff ranges for the indexed files, keyed by their `files` index.
+  const affectedFileLocations = getAffectedFileLocations(baseRef, files);
   const data = await runGraphGeneration(percy, buildId, {
     files,
     modules,
     storybookPaths,
-    affectedNodes
+    affectedNodes,
+    affectedFileLocations
   }, log);
   maybeWriteTrace(trace, data, log);
   return selectAffectedSnapshots(snapshots, data, baseline, baselineSnapshots, normalizeImportPath, log);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/cli-command",
-  "version": "1.32.0-beta.9",
+  "version": "1.32.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "tag": "beta"
+    "tag": "latest"
   },
   "files": [
     "dist",
@@ -37,14 +37,14 @@
     "test:coverage": "yarn test --coverage"
   },
   "dependencies": {
-    "@percy/config": "1.32.0-beta.9",
-    "@percy/core": "1.32.0-beta.9",
-    "@percy/logger": "1.32.0-beta.9",
+    "@percy/config": "1.32.1",
+    "@percy/core": "1.32.1",
+    "@percy/logger": "1.32.1",
     "glob-to-regexp": "^0.4.1",
     "stream-json": "^1.8.0"
   },
   "optionalDependencies": {
     "snyk-nodejs-lockfile-parser": "2.7.1"
   },
-  "gitHead": "cc176ec0fa5e36551db037a14186ea8b7cd07ff6"
+  "gitHead": "a6c8730bc89f5ba6a562b2afe317d534fb66d6eb"
 }