@staff0rd/assist 0.839.0 → 0.841.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -6,7 +6,7 @@ import { Command } from "commander";
6
6
  // package.json
7
7
  var package_default = {
8
8
  name: "@staff0rd/assist",
9
- version: "0.839.0",
9
+ version: "0.841.0",
10
10
  type: "module",
11
11
  main: "dist/index.js",
12
12
  bin: {
@@ -12663,6 +12663,14 @@ function githubPullNumber(url) {
12663
12663
  return PULL_PATH.exec(parsed.pathname)?.[1];
12664
12664
  }
12665
12665
 
12666
+ // src/shared/prActions.ts
12667
+ var prActions = [
12668
+ { label: "Checkout", args: ["review", "--checkout-only"] },
12669
+ { label: "Address Comments", args: ["review-pr-comments"] },
12670
+ { label: "Fix conflicts (merge)", args: ["fix-conflict"] },
12671
+ { label: "Fix conflicts (rebase)", args: ["fix-conflict", "--rebase"] }
12672
+ ];
12673
+
12666
12674
  // src/shared/reviewButtonModes.ts
12667
12675
  var reviewButtonModes = [
12668
12676
  { label: "Review", args: ["review"] },
@@ -12672,11 +12680,35 @@ var reviewButtonModes = [
12672
12680
  { label: "High-level review", args: ["review", "--high-level"] }
12673
12681
  ];
12674
12682
 
12675
- // src/shared/isReviewModeArgs.ts
12676
- function isReviewModeArgs(args) {
12683
+ // src/shared/reviewOptionFlags.ts
12684
+ var reviewOptionFlags = [
12685
+ { key: "force", label: "Force re-run", flag: "--force" },
12686
+ {
12687
+ key: "addressComments",
12688
+ label: "Address comments after",
12689
+ flag: "--address-comments"
12690
+ },
12691
+ { key: "announce", label: "Announce to Slack after", flag: "--announce" }
12692
+ ];
12693
+ function reviewOptionArgs(options2) {
12694
+ return reviewOptionFlags.filter(({ key }) => options2[key]).map(({ flag }) => flag);
12695
+ }
12696
+
12697
+ // src/shared/isAllowedPrArgs.ts
12698
+ function sameArgs(a, b) {
12699
+ return a.length === b.length && a.every((arg, index2) => arg === b[index2]);
12700
+ }
12701
+ function isOptionFlags(flags2) {
12702
+ const options2 = Object.fromEntries(
12703
+ reviewOptionFlags.map(({ key, flag }) => [key, flags2.includes(flag)])
12704
+ );
12705
+ return sameArgs(flags2, reviewOptionArgs(options2));
12706
+ }
12707
+ function isAllowedPrArgs(args) {
12677
12708
  if (!Array.isArray(args)) return false;
12709
+ if (prActions.some((action) => sameArgs(action.args, args))) return true;
12678
12710
  return reviewButtonModes.some(
12679
- (mode) => mode.args.length === args.length && mode.args.every((arg, index2) => arg === args[index2])
12711
+ (mode) => sameArgs(mode.args, args.slice(0, mode.args.length)) && isOptionFlags(args.slice(mode.args.length))
12680
12712
  );
12681
12713
  }
12682
12714
 
@@ -12716,7 +12748,7 @@ function resolveGithubClone(url, baseDir) {
12716
12748
  // src/commands/sessions/web/fromGithub/planGithubReview.ts
12717
12749
  function planGithubReview(body, baseDir) {
12718
12750
  const { url, args } = body ?? {};
12719
- if (!isReviewModeArgs(args))
12751
+ if (!isAllowedPrArgs(args))
12720
12752
  return { ok: false, status: 400, error: "Unsupported assist args" };
12721
12753
  const prNumber = typeof url === "string" ? githubPullNumber(url.trim()) : "";
12722
12754
  if (!prNumber)
@@ -22765,7 +22797,7 @@ async function signExtension() {
22765
22797
  // src/commands/registerExtension.ts
22766
22798
  function registerExtension(program2) {
22767
22799
  program2.command("extension").description(
22768
- "Print the directory to load the acceptance criteria outliner browser extension from (load unpacked)"
22800
+ "Print the directory to load the assist browser extension from (load unpacked)"
22769
22801
  ).option(
22770
22802
  "--sign",
22771
22803
  "Sign the extension on AMO's unlisted channel and print the .xpi to install permanently in Firefox (needs WEB_EXT_API_KEY and WEB_EXT_API_SECRET)"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@staff0rd/assist",
3
- "version": "0.839.0",
3
+ "version": "0.841.0",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "bin": {