comfy-pr 1.1.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "comfy-pr",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Make PRs that publishes ComfyUI Custom Nodes to [ComfyUI Registry]( https://registry.comfy.org/ ).",
   "keywords": [],
   "license": "ISC",
@@ -10,6 +10,7 @@
     "url": "https://github.com/Comfy-Org/Comfy-PR"
   },
   "bin": {
+    "cmpr": "./src/cli.ts",
     "comfy-pr": "./src/cli.ts",
     "pr-bot": "./bot/cli.ts",
     "prbot": "./bot/cli.ts"

package/src/cli.ts

@@ -1,40 +1,77 @@
 #!/usr/bin/env bun
-import DIE from "@snomiao/die";
 import { readFile } from "fs/promises";
-import { argv, $ as zx } from "zx";
+import { hideBin } from "yargs/helpers";
+import yargs from "yargs/yargs";
 import { checkComfyActivated } from "./checkComfyActivated";
 import { createComfyRegistryPullRequests } from "./createComfyRegistryPullRequests";
-zx.verbose = true;
-
-if (argv.help) {
-  console.log(
-    `
-  bunx comfy-pr --repolist repos.txt       one repo per-line
-  bunx comfy-pr [...GITHUB_REPO_URLS]      github repos
-  bunx cross-env REPO=https://github.com/OWNER/REPO bunx comfy-pr
-    `.trim(),
-  );
-}
-
-{
-  await checkComfyActivated();
 
+async function resolveRepos(args: {
+  repolist?: string;
+  _: (string | number)[];
+}): Promise<string[]> {
   const envRepos =
     process.env.REPO?.split("\n")
       .map((e) => e.trim())
       .filter(Boolean) || [];
-  const argvRepos = argv._.filter((a) => !a.endsWith(import.meta.filename));
+
+  const argvRepos = args._.map(String).filter(Boolean);
+
   const listRepos =
-    (argv.repolist &&
-      (await readFile(argv.repolist, "utf8").catch(() => ""))
+    (args.repolist &&
+      (await readFile(args.repolist, "utf8").catch(() => ""))
         .split("\n")
         .map((e) => e.trim())
         .filter(Boolean)) ||
     [];
-  const repos = (listRepos.length && listRepos) ||
+
+  const repos =
+    (listRepos.length && listRepos) ||
     (argvRepos.length && argvRepos) ||
-    (envRepos.length && envRepos) || [DIE("Missing PR target, please set env.REPO")];
-  for await (const upstreamUrl of repos) {
-    await createComfyRegistryPullRequests(upstreamUrl);
+    (envRepos.length && envRepos) ||
+    [];
+
+  if (repos.length === 0) {
+    console.error("Error: No repos specified. Provide URLs as args, --repolist, or REPO env var.");
+    process.exit(1);
   }
+  return repos;
 }
+
+const cli = yargs(hideBin(process.argv))
+  .scriptName("cmpr")
+  .usage("$0 <command> [options]")
+  .command(
+    "create [repos..]",
+    "Create registry publish PRs for ComfyUI custom nodes",
+    (yargs) =>
+      yargs
+        .positional("repos", {
+          describe: "GitHub repository URLs",
+          type: "string",
+          array: true,
+        })
+        .option("repolist", {
+          alias: "l",
+          type: "string",
+          describe: "File with one repo URL per line",
+        }),
+    async (args) => {
+      await checkComfyActivated();
+      const repos = await resolveRepos({ repolist: args.repolist, _: args.repos || [] });
+      for (const url of repos) {
+        await createComfyRegistryPullRequests(url);
+      }
+    },
+  )
+  .example("$0 create https://github.com/owner/repo", "Create PR for a single repo")
+  .example("$0 create --repolist repos.txt", "Create PRs from a file (one URL per line)")
+  .example("$0 create url1 url2 url3", "Create PRs for multiple repos")
+  .example("REPO=https://github.com/owner/repo $0 create", "Create PR via env variable")
+  .demandCommand(1, "Please specify a command. Run with --help to see available commands.")
+  .strict()
+  .help()
+  .alias("h", "help")
+  .version()
+  .alias("v", "version");
+
+await cli.parse();