refactor(nlx): use npx suggestions as main source

Author: JonathanXDR

src/nlx.ts

@@ -1,66 +1,53 @@
-import bunxSpec from "./bunx";
-import { npmSearchGenerator } from "./npm";
-import npxSpec, { npxSuggestions } from "./npx";
-import pnpxSpec from "./pnpx";
+import { npxSuggestions } from "./npx";
 
-// Helper to coerce a Fig.Spec into a Fig.Subcommand when possible
-const toSubcommand = (spec: Fig.Spec): Fig.Subcommand | null => {
-  if (typeof spec === "function") {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const res = (spec as any)();
-    if (res && typeof res === "object" && "versionedSpecPath" in res)
-      return null;
-    return res as Fig.Subcommand;
-  }
-  return spec as Fig.Subcommand;
-};
-
-const npxCmd = toSubcommand(npxSpec);
-const bunxCmd = toSubcommand(bunxSpec);
-const pnpxCmd = toSubcommand(pnpxSpec);
-
-const mergedSubcommands: Fig.Subcommand[] = [
-  ...(npxCmd?.subcommands ?? []),
-  ...(bunxCmd?.subcommands ?? []),
-  ...(pnpxCmd?.subcommands ?? []),
-];
-
-const mergedOptions: Fig.Option[] = [
-  ...(npxCmd?.options ?? []),
-  ...(bunxCmd?.options ?? []),
-  ...(pnpxCmd?.options ?? []),
-].filter((opt, idx, arr) => {
-  const key = Array.isArray(opt.name) ? opt.name.join("|") : String(opt.name);
-  return (
-    idx ===
-    arr.findIndex((o) => {
-      const k = Array.isArray(o.name) ? o.name.join("|") : String(o.name);
-      return k === key;
-    })
-  );
+// Merge curated lists (currently only npx exports suggestions).
+// If bunx/pnpx add their own in the future, they can be merged here too.
+const curatedSuggestions: Fig.Suggestion[] = (
+  npxSuggestions as Fig.Suggestion[]
+).map((s) => {
+  if (typeof s === "string") return { name: s, loadSpec: s };
+  const name = Array.isArray(s.name) ? s.name[0] : s.name;
+  return { ...s, ...(name && { loadSpec: name }) };
 });
 
 const completionSpec: Fig.Spec = {
   name: "nlx",
   description: "Download & execute a package binary with the correct agent",
-  subcommands: mergedSubcommands,
-  args: [
-    {
-      name: "commandOrPackage",
-      description: "Package name (and optional subcommand) to execute",
-      isOptional: true,
-      generators: npmSearchGenerator,
-      suggestions: npxSuggestions,
-    },
-    {
-      name: "args",
-      isOptional: true,
-      isVariadic: true,
-      description: "Arguments passed to the executed binary",
+  args: {
+    name: "command",
+    isCommand: true,
+    description: "The package binary to run (e.g. vitest, tsc, prisma, next)",
+    // Prefer curated CLI list, but also surface local node_modules/.bin executables
+    generators: {
+      script: [
+        "bash",
+        "-c",
+        "until [[ -d node_modules/ ]] || [[ $PWD = '/' ]]; do cd ..; done; ls -1 node_modules/.bin/",
+      ],
+      postProcess: function (out) {
+        const curated = curatedSuggestions.reduce((acc, cur) => {
+          const name =
+            typeof cur === "string"
+              ? cur
+              : Array.isArray(cur.name)
+                ? cur.name[0]
+                : cur.name;
+          return name ? acc.concat(name) : acc;
+        }, [] as string[]);
+        return out
+          .split("\\n")
+          .filter((name) => !!name && !curated.includes(name))
+          .map((name) => ({
+            name,
+            icon: "fig://icon?type=command",
+            loadSpec: name,
+          }));
+      },
     },
-  ],
+    suggestions: curatedSuggestions,
+    isOptional: true,
+  },
   options: [
-    ...mergedOptions,
     {
       name: "-C",
       description: "Change directory before running the command",