@d3lm/pr-stats 0.2.9 → 0.2.10

package/README.md

@@ -27,7 +27,7 @@ pr-stats
 
 Without flags, it looks at PRs from the last 90 days across all repositories you can access. The tabs hold these views.
 
-- The queue tab, which it opens on, shows two lists. The open PRs awaiting your review come first with how long each has been waiting, and below them sit the open PRs you already reviewed or commented on with how long ago that was, so a PR stays visible until it merges or closes. A fresh review request moves a PR from the reviewing list back into the awaiting one.
+- The queue tab, which it opens on, shows two lists. The open PRs awaiting your review come first with how long each has been waiting, and below them sit the open PRs you already reviewed or commented on with how long ago that was, so a PR stays visible until it merges or closes. A fresh review request moves a PR from the reviewing list back into the awaiting one. The `--review-types` flag narrows what counts as a review to a subset of `approve`, `comment`, and `request-changes`, so with `--review-types approve,request-changes` a comment alone no longer answers a request and the PR stays in the awaiting list.
 - The Your PRs tab has two sub-tabs, which the `t` key switches. The first lists your own authored PRs that are still open with their age and size. The second reports how your authored PRs got created, merged, and closed, telling a merge apart from a close without one. It charts time-to-merge percentiles, a histogram and trend, a merge-time heatmap, and a scatter of merge time against PR size. It also measures how long your PRs wait for their first review from someone else, with a histogram and trend of the time from creation to that review and a histogram of how long the open PRs still without one have waited. It also plots a merge-rate trend over the concluded PRs, cumulative created and merged lines whose gap shows the backlog, weekly created and merged volumes, an outcome gauge, and the most recently merged and closed PRs. A reviewer leaderboard ranks who reviews your PRs by distinct PRs reviewed, and a review-coverage gauge counts the merged PRs that never received a review. Your own replies to review threads never count as a review for any of them.
 - The time-to-review report pairs its histogram, trend, heatmap, and weekly volume with a scatter of review time against PR size, the completed review cycles per PR, and a verdict gauge splitting approvals from change requests. It also shows the age of the requests still waiting on you, how old PRs already were when the request reached you, and an off-hours gauge that splits weekdays into work hours and after hours once `--work-hours` is set. On the aggregate view it additionally compares median review times by repo.
 - The PR size report carries the same histogram, trend, heatmap, and weekly volume for PR sizes and adds a net-lines trend that sums additions minus deletions per week.
@@ -49,6 +49,9 @@ pr-stats --work-hours 9-17 --target 1d
 # Report how many authored PRs stayed under 400 changed lines
 pr-stats --size-target 400
 
+# Count only approvals and change requests as reviews
+pr-stats --review-types approve,request-changes
+
 # Authenticate with an access token instead of the gh CLI
 pr-stats --token your-access-token
 ```

package/dist/tui-app.mjs

@@ -2393,6 +2393,12 @@ var OPTIONS = [
     default: false,
     help: "Include PRs that are currently drafts. Excluded by default."
   },
+  {
+    name: "review-types",
+    type: "string",
+    placeholder: "<list>",
+    help: "Count only these review types as a review. Accepts a comma-separated list of `approve`, `comment`, and `request-changes`, for example `approve,request-changes`. A review of another type never answers a request, so the PR stays in the awaiting queue until a counted review lands. Without this flag, every submitted review counts."
+  },
   {
     name: "no-cache",
     type: "boolean",
@@ -2534,6 +2540,22 @@ function parseSizeTarget(input) {
   }
   return target;
 }
+var REVIEW_TYPES = /* @__PURE__ */ new Map([
+  ["approve", "APPROVED"],
+  ["comment", "COMMENTED"],
+  ["request-changes", "CHANGES_REQUESTED"]
+]);
+function parseReviewTypes(input) {
+  const states = /* @__PURE__ */ new Set();
+  for (const part of input.split(",")) {
+    const state = REVIEW_TYPES.get(part.trim().toLowerCase());
+    if (state === void 0) {
+      throw new CliError(`invalid --review-types value "${part.trim()}", use approve, comment, or request-changes`);
+    }
+    states.add(state);
+  }
+  return states;
+}
 function toMinutesOfDay(hourText, minuteText, meridiem) {
   const minute = Number(minuteText ?? 0);
   if (minute > 59) {
@@ -2615,6 +2637,13 @@ var FIELDS = [
     kind: "toggle",
     fetch: true
   },
+  {
+    key: "reviewTypes",
+    label: "Review types",
+    hint: "enter opens the type list, checked types count as a review",
+    kind: "multi",
+    fetch: true
+  },
   {
     key: "target",
     label: "Review target",
@@ -2651,6 +2680,26 @@ var FIELDS = [
     fetch: false
   }
 ];
+var REVIEW_TYPE_CHOICES = ["approve", "comment", "request-changes"];
+function checkedReviewTypes(value2) {
+  if (value2.trim() === "") {
+    return new Set(REVIEW_TYPE_CHOICES);
+  }
+  return new Set(value2.split(",").map((part) => part.trim().toLowerCase()));
+}
+function toggleReviewType(value2, type) {
+  const checked = checkedReviewTypes(value2);
+  if (checked.has(type)) {
+    checked.delete(type);
+  } else {
+    checked.add(type);
+  }
+  const next = REVIEW_TYPE_CHOICES.filter((choice) => checked.has(choice));
+  if (next.length === 0) {
+    return value2;
+  }
+  return next.length === REVIEW_TYPE_CHOICES.length ? "" : next.join(",");
+}
 function validateField(key, value2) {
   if (value2 === "" && key !== "workHours" && key !== "since") {
     return;
@@ -2676,6 +2725,10 @@ function validateField(key, value2) {
       resolveTimezone(value2);
       break;
     }
+    case "reviewTypes": {
+      parseReviewTypes(value2);
+      break;
+    }
   }
 }
 function sameOptions(a, b) {
@@ -2687,6 +2740,7 @@ function readSavedOptions() {
     return null;
   }
   const record = value2;
+  record.reviewTypes ??= "";
   const options = {};
   for (const field of FIELDS) {
     const raw = record[field.key];
@@ -2745,10 +2799,13 @@ function applySavedOptions(values, explicit) {
   if (!explicit.has("include-drafts")) {
     values["include-drafts"] = saved2.includeDrafts;
   }
+  if (!explicit.has("review-types") && saved2.reviewTypes !== "") {
+    values["review-types"] = saved2.reviewTypes;
+  }
   return saved2;
 }
 function fetchParamsKey(options) {
-  return JSON.stringify([options.since, options.repos, options.user, options.includeDrafts]);
+  return JSON.stringify([options.since, options.repos, options.user, options.includeDrafts, options.reviewTypes]);
 }
 function targetLabelOf(target) {
   if (target === "") {
@@ -2824,7 +2881,8 @@ var EMPTY_PLACEHOLDERS = {
   user: "(authenticated user)",
   target: "(none)",
   sizeTarget: "(none)",
-  tz: "(system)"
+  tz: "(system)",
+  reviewTypes: "(every type)"
 };
 var SECTIONS = [
   { title: "Data", fields: FIELDS.filter((field) => field.fetch) },
@@ -2837,7 +2895,8 @@ function OptionsModal({
   editing,
   fieldError,
   onDraft,
-  onSubmit
+  onSubmit,
+  onToggleReviewType
 }) {
   const savedState = savedLine(options, saved2);
   return /* @__PURE__ */ jsxs10(ModalFrame, { title: "Options", children: [
@@ -2851,9 +2910,10 @@ function OptionsModal({
             field,
             options,
             isSelected: index === selected,
-            isEditing: index === selected && editing && field.kind === "text",
+            isEditing: index === selected && editing && field.kind !== "toggle",
             onDraft,
-            onSubmit
+            onSubmit,
+            onToggleType: onToggleReviewType
           },
           field.key
         );
@@ -2897,10 +2957,17 @@ function FieldRow({
   isSelected,
   isEditing,
   onDraft,
-  onSubmit
+  onSubmit,
+  onToggleType
 }) {
   const value2 = displayValue(field.key, options[field.key]);
   const valueColor = value2.isPlaceholder ? isSelected ? theme.muted : theme.dim : theme.muted;
+  if (isEditing && field.kind === "multi") {
+    return /* @__PURE__ */ jsxs10("box", { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx11(ModalRow, { label: field.label, isSelected, children: /* @__PURE__ */ jsx11("text", { wrapMode: "none", children: /* @__PURE__ */ jsx11("b", { fg: value2.isPlaceholder ? theme.muted : theme.text, children: value2.text }) }) }),
+      /* @__PURE__ */ jsx11(TypeChecklist, { value: String(options[field.key]), onToggle: onToggleType })
+    ] });
+  }
   return /* @__PURE__ */ jsx11(ModalRow, { label: field.label, isSelected, children: isEditing ? /* @__PURE__ */ jsx11(
     "input",
     {
@@ -2924,6 +2991,35 @@ function FieldRow({
     /* @__PURE__ */ jsx11("span", { fg: theme.muted, children: " \u203A" })
   ] }) : isSelected ? /* @__PURE__ */ jsx11("text", { wrapMode: "none", children: /* @__PURE__ */ jsx11("b", { fg: value2.isPlaceholder ? theme.muted : theme.text, children: value2.text }) }) : /* @__PURE__ */ jsx11("text", { wrapMode: "none", fg: valueColor, children: value2.text }) });
 }
+function TypeChecklist({ value: value2, onToggle }) {
+  const checked = checkedReviewTypes(value2);
+  return /* @__PURE__ */ jsx11("box", { alignSelf: "flex-end", width: 30, height: REVIEW_TYPE_CHOICES.length, marginRight: 2, children: /* @__PURE__ */ jsx11(
+    "select",
+    {
+      focused: true,
+      width: "100%",
+      height: REVIEW_TYPE_CHOICES.length,
+      options: REVIEW_TYPE_CHOICES.map((choice) => {
+        return { name: `[${checked.has(choice) ? "x" : " "}] ${choice}`, description: "", value: choice };
+      }),
+      showDescription: false,
+      showScrollIndicator: false,
+      showSelectionIndicator: false,
+      wrapSelection: true,
+      backgroundColor: theme.inputBg,
+      focusedBackgroundColor: theme.inputFocusedBg,
+      textColor: theme.muted,
+      focusedTextColor: theme.muted,
+      selectedBackgroundColor: theme.selectedBg,
+      selectedTextColor: theme.text,
+      onSelect: (_index, option) => {
+        if (option !== null) {
+          onToggle(option.value);
+        }
+      }
+    }
+  ) });
+}
 
 // src/tui/components/SettingsModal.tsx
 import { homedir as homedir2 } from "node:os";
@@ -3279,7 +3375,7 @@ function collectReviewPrs(requested, reviewed) {
   }
   return [...prByKey.values()];
 }
-function classifyPr(pr, details, user) {
+function classifyPr(pr, details, user, countedStates) {
   if (!details) {
     return [{ kind: "inaccessible", pr }];
   }
@@ -3287,7 +3383,7 @@ function classifyPr(pr, details, user) {
     (node) => node?.requestedReviewer?.login === user ? [new Date(node.createdAt)] : []
   );
   const reviews = details.reviews.nodes.flatMap(
-    (node) => node?.author?.login === user && node.submittedAt ? [{ at: new Date(node.submittedAt), state: node.state }] : []
+    (node) => node?.author?.login === user && node.submittedAt && (countedStates === void 0 || countedStates.has(node.state)) ? [{ at: new Date(node.submittedAt), state: node.state }] : []
   );
   if (requests.length === 0) {
     if (reviews.length === 0) {
@@ -3350,7 +3446,9 @@ async function fetchReviewRaw(prs, user, onProgress, options = {}) {
   });
   cache.save();
   return {
-    results: prs.flatMap((pr) => classifyPr(pr, found.get(prKey(pr.repo, pr.number)) ?? null, user)),
+    results: prs.flatMap(
+      (pr) => classifyPr(pr, found.get(prKey(pr.repo, pr.number)) ?? null, user, options.countedStates)
+    ),
     cacheHits
   };
 }
@@ -3442,7 +3540,7 @@ function loadSnapshot(options) {
     return null;
   }
   const { params } = stored;
-  if (params.repos !== options.repos || params.user !== options.user || params.includeDrafts !== options.includeDrafts) {
+  if (params.repos !== options.repos || params.user !== options.user || params.includeDrafts !== options.includeDrafts || params.reviewTypes !== options.reviewTypes) {
     return null;
   }
   const sinceIso = parseSince(options.since).toISOString().slice(0, 10);
@@ -3485,7 +3583,8 @@ function saveSnapshot(options, data) {
     since: options.since,
     repos: options.repos,
     user: options.user,
-    includeDrafts: options.includeDrafts
+    includeDrafts: options.includeDrafts,
+    reviewTypes: options.reviewTypes
   };
   writeCacheFile("snapshot", { params, data });
 }
@@ -3508,6 +3607,7 @@ async function loadData(options, onPhase, { bypassCache = false } = {}) {
     onPhase({ phase: "details", done: progress.review + progress.sizes, total });
   };
   report();
+  const countedStates = options.reviewTypes === "" ? void 0 : parseReviewTypes(options.reviewTypes);
   const [review, size] = await Promise.all([
     reviewPrs.length === 0 ? { results: [], cacheHits: 0 } : fetchReviewRaw(
       reviewPrs,
@@ -3516,7 +3616,7 @@ async function loadData(options, onPhase, { bypassCache = false } = {}) {
         progress.review = done;
         report();
       },
-      { bypassCache }
+      { bypassCache, countedStates }
     ),
     authoredPrs.length === 0 ? { sizes: [], cacheHits: 0 } : fetchSizeRaw(
       authoredPrs,
@@ -3618,6 +3718,7 @@ function buildStatsReport(raw, options) {
       timezone,
       wallClock: options.wallClock,
       includeDrafts: options.includeDrafts,
+      reviewTypes: options.reviewTypes === "" ? null : options.reviewTypes,
       reviewTarget: targetLabel ?? null,
       sizeTarget: options.sizeTarget === "" ? null : options.sizeTarget
     },
@@ -4001,7 +4102,8 @@ function Modals({
   themeState,
   onDraft,
   onSubmitField,
-  onSubmitThemeColor
+  onSubmitThemeColor,
+  onToggleReviewType
 }) {
   if (ui.modal === "options") {
     return /* @__PURE__ */ jsx14(
@@ -4013,7 +4115,8 @@ function Modals({
         editing: ui.editing,
         fieldError: ui.fieldError,
         onDraft,
-        onSubmit: onSubmitField
+        onSubmit: onSubmitField,
+        onToggleReviewType
       }
     );
   }
@@ -5740,6 +5843,10 @@ function handleOptionsModalKey(key, context) {
         context.setOptions((previous) => {
           return { ...previous, [field.key]: !previous[field.key] };
         });
+      } else if (field.kind === "multi") {
+        if (key.name === "return" || key.name === "space") {
+          context.dispatchUi({ type: "editStarted" });
+        }
       } else if (key.name === "return") {
         context.beginEdit(String(context.options[field.key]));
       }
@@ -6387,7 +6494,12 @@ function App({
           draftRef.current = value2;
         },
         onSubmitField: commitField,
-        onSubmitThemeColor: commitThemeColor
+        onSubmitThemeColor: commitThemeColor,
+        onToggleReviewType: (type) => {
+          setOptions((previous) => {
+            return { ...previous, reviewTypes: toggleReviewType(previous.reviewTypes, type) };
+          });
+        }
       }
     )
   ] });
@@ -6415,7 +6527,8 @@ function bootstrap() {
       workHours: values["work-hours"],
       tz: values.tz ?? "",
       wallClock: values["wall-clock"],
-      includeDrafts: values["include-drafts"]
+      includeDrafts: values["include-drafts"],
+      reviewTypes: values["review-types"] ?? ""
     };
     for (const field of FIELDS) {
       const value2 = initial2[field.key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3lm/pr-stats",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "GitHub PR stats in an interactive terminal UI, via the gh CLI or an access token",
   "type": "module",
   "author": "Dominic Elm",