@percy/cli-command 1.32.7-beta.0 → 1.32.7-beta.2

package/dist/intelliStory.js

@@ -290,14 +290,45 @@ function readStats(statsFile, projectRoot, log, configDirs) {
     buildId: stats.buildId
   };
 }
+
+// Every other failure mode in this module — git, fs, config, lockfile, glob,
+// degraded graph — is converted to IntelliStoryBailError so the caller can
+// degrade to a full snapshot run. API and network failures are no different: a
+// 403 means the organization is not entitled to IntelliStory, and a 5xx /
+// timeout / connection reset is transient. Neither should hard-fail the
+// storybook command, which is what a bare Error does once @percy/storybook
+// catches IntelliStoryBailError specifically.
+function isNotAllowed(e) {
+  var _e$response;
+  return (e === null || e === void 0 || (_e$response = e.response) === null || _e$response === void 0 ? void 0 : _e$response.statusCode) === 403;
+}
+function apiBailError(e, action) {
+  if (isNotAllowed(e)) {
+    return new IntelliStoryBailError(`IntelliStory: not enabled for this organization (${action} was not allowed); running full snapshot set`);
+  }
+  return new IntelliStoryBailError(`IntelliStory: ${action} failed: ${e === null || e === void 0 ? void 0 : e.message}; running full snapshot set`);
+}
 async function pollGraphStatus(percy, buildId, log) {
   for (let i = 0; i < POLL_ATTEMPTS; i++) {
-    const res = await percy.client.getStatus('intelli_story_graph', [buildId]);
-    const status = res === null || res === void 0 ? void 0 : res.status;
+    var _res, _res2;
+    let res;
+    try {
+      res = await percy.client.getStatus('intelli_story_graph', [buildId]);
+    } catch (e) {
+      // A 403 will not resolve by polling again, so stop immediately rather
+      // than burning the full POLL_ATTEMPTS window on it. Anything else is
+      // treated as "not done yet" and retried; if it never clears, the caller's
+      // timed-out bail covers it.
+      if (isNotAllowed(e)) throw apiBailError(e, 'graph status poll');
+      log.debug(`IntelliStory: graph status (attempt ${i + 1}) errored: ${e === null || e === void 0 ? void 0 : e.message}`);
+      if (i < POLL_ATTEMPTS - 1) await new Promise(r => setTimeout(r, POLL_INTERVAL_MS));
+      continue;
+    }
+    const status = (_res = res) === null || _res === void 0 ? void 0 : _res.status;
     log.debug(`IntelliStory: graph status (attempt ${i + 1}) = ${status}`);
     if (status === 'done' || status === 'failed') return {
       status,
-      data: res === null || res === void 0 ? void 0 : res.data
+      data: (_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.data
     };
     if (i < POLL_ATTEMPTS - 1) await new Promise(r => setTimeout(r, POLL_INTERVAL_MS));
   }
@@ -321,34 +352,43 @@ export async function validateAndReadStats(buildDir, statsFile, projectRoot, log
     throw new IntelliStoryBailError(`IntelliStory: stats file "${statsName}" in ${buildDir} is not a regular file; running full snapshot set`);
   }
   log.debug(`IntelliStory: parsing stats file ${resolvedStatsPath}`);
-  // The graph is now keyed by the Percy build id, not the stats-file `buildId`,
-  // so a missing `buildId` in the stats file is no longer fatal. We only need
-  // the module graph (`files`/`modules`) from here.
+  // The graph is keyed by the Percy build id, not the stats-file `buildId`, so a
+  // missing `buildId` here is not fatal — it is logged only so a support ticket
+  // can be tied back to the Storybook build that produced this stats file.
   const {
     files,
-    modules
+    modules,
+    buildId
   } = await readStats(resolvedStatsPath, projectRoot, log, configDirs);
+  log.debug(`IntelliStory: stats file buildId = ${buildId}`);
   return {
     files,
     modules
   };
 }
 export async function getBaselineAndAffectedNodes(percy, baseline, log) {
-  var _percy$build;
+  var _baseLookup;
   let baseRef;
 
   // Always look up the base build: its `browsers_changed_from_base` flag forces
   // a full snapshot run regardless of whether an explicit baseline was configured.
-  const baseLookup = await percy.client.getIntelliStorySnapshotNameToCommit((_percy$build = percy.build) === null || _percy$build === void 0 ? void 0 : _percy$build.id);
+  let baseLookup;
+  try {
+    var _percy$build;
+    baseLookup = await percy.client.getIntelliStorySnapshotNameToCommit((_percy$build = percy.build) === null || _percy$build === void 0 ? void 0 : _percy$build.id);
+  } catch (e) {
+    throw apiBailError(e, 'base build lookup');
+  }
   log.debug(`IntelliStory: base lookup ${JSON.stringify(baseLookup)}`);
-  if (baseLookup !== null && baseLookup !== void 0 && baseLookup.browsers_changed_from_base) {
+  if ((_baseLookup = baseLookup) !== null && _baseLookup !== void 0 && _baseLookup.browsers_changed_from_base) {
     throw new IntelliStoryBailError('IntelliStory: This build has to take all snapshots by fallback because this build corresponds to a browser upgrade');
   }
   if (baseline) {
     log.debug(`IntelliStory: diffing against explicit baseline "${baseline}"`);
     baseRef = baseline;
   } else {
-    if (!(baseLookup !== null && baseLookup !== void 0 && baseLookup.base_build_commit_sha)) {
+    var _baseLookup2;
+    if (!((_baseLookup2 = baseLookup) !== null && _baseLookup2 !== void 0 && _baseLookup2.base_build_commit_sha)) {
       throw new IntelliStoryBailError('IntelliStory: API could not predict a base build commit and no explicit baseline was set; running full snapshot set');
     }
     log.debug(`IntelliStory: diffing against predicted base build commit "${baseLookup.base_build_commit_sha}"`);
@@ -562,13 +602,17 @@ export async function runGraphGeneration(percy, buildId, payload, log) {
     affectedNodes,
     affectedFileLocations
   })}`);
-  await percy.client.generateIntelliStoryGraph(buildId, {
-    files,
-    modules,
-    storybookPaths,
-    affectedNodes,
-    affectedFileLocations
-  });
+  try {
+    await percy.client.generateIntelliStoryGraph(buildId, {
+      files,
+      modules,
+      storybookPaths,
+      affectedNodes,
+      affectedFileLocations
+    });
+  } catch (e) {
+    throw apiBailError(e, 'graph generation request');
+  }
   const {
     status
   } = await pollGraphStatus(percy, buildId, log);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/cli-command",
-  "version": "1.32.7-beta.0",
+  "version": "1.32.7-beta.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -37,13 +37,13 @@
     "test:coverage": "yarn test --coverage"
   },
   "dependencies": {
-    "@percy/config": "1.32.7-beta.0",
-    "@percy/core": "1.32.7-beta.0",
-    "@percy/logger": "1.32.7-beta.0",
+    "@percy/config": "1.32.7-beta.2",
+    "@percy/core": "1.32.7-beta.2",
+    "@percy/logger": "1.32.7-beta.2",
     "glob-to-regexp": "^0.4.1"
   },
   "optionalDependencies": {
     "snyk-nodejs-lockfile-parser": "2.7.1"
   },
-  "gitHead": "f86a18de3e04d3cfa9d14ce5d186ad66c3f8e020"
+  "gitHead": "be6a40b9d99ef190e4f6123491241c27c8308161"
 }