@0x-jerry/x 2.12.2 → 2.12.4

package/dist/{chunk-OEKTPD6V.js → chunk-MLK4NZGK.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "2.12.2";
+var version = "2.12.4";
 
 export {
   version

package/dist/x.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   version
-} from "./chunk-OEKTPD6V.js";
+} from "./chunk-MLK4NZGK.js";
 
 // src/x.ts
 import { sliver } from "@0x-jerry/silver";

package/dist/xn.js

@@ -6,7 +6,7 @@ import {
 } from "./chunk-ELIYGHQS.js";
 import {
   version
-} from "./chunk-OEKTPD6V.js";
+} from "./chunk-MLK4NZGK.js";
 
 // src/xn.ts
 import { sliver } from "@0x-jerry/silver";

package/dist/xr.js

@@ -4,7 +4,7 @@ import {
 } from "./chunk-ELIYGHQS.js";
 import {
   version
-} from "./chunk-OEKTPD6V.js";
+} from "./chunk-MLK4NZGK.js";
 
 // src/xr.ts
 import { sliver } from "@0x-jerry/silver";
@@ -41,9 +41,9 @@ var DenoTaskDetecter = class {
 };
 
 // src/commands/run/node.ts
-import { readFile as readFile2, readdir } from "fs/promises";
+import { readdir, readFile as readFile2 } from "fs/promises";
 import path2 from "path";
-import { pathExists as pathExists2 } from "fs-extra";
+import { pathExists as pathExists2 } from "fs-extra/esm";
 var NodeTaskDetecter = class {
   async binaryPaths(cwd) {
     const envPaths = [];
@@ -68,22 +68,24 @@ var NodeTaskDetecter = class {
     const text = await readFile2(pkgPath, "utf8");
     const json = JSON.parse(text);
     const tasks = json.scripts || {};
-    {
-      let dir = cwd;
-      do {
-        const binPath = path2.join(dir, "node_modules", ".bin");
-        if (await pathExists2(binPath)) {
-          const files = await readdir(binPath);
-          for (const filename of files) {
-            tasks[filename] ??= filename;
-          }
-        }
-        dir = path2.resolve(dir, "..");
-      } while (dir !== path2.resolve(dir, ".."));
-    }
     return tasks;
   }
 };
+async function getBinariesPairs() {
+  let dir = process.cwd();
+  const binaries = {};
+  do {
+    const binPath = path2.join(dir, "node_modules", ".bin");
+    if (await pathExists2(binPath)) {
+      const files = await readdir(binPath);
+      for (const filename of files) {
+        binaries[filename] = path2.join(binPath, filename);
+      }
+    }
+    dir = path2.resolve(dir, "..");
+  } while (dir !== path2.resolve(dir, ".."));
+  return binaries;
+}
 
 // src/commands/run/rust.ts
 import path3 from "path";
@@ -115,14 +117,29 @@ async function runScript(command, params = []) {
       }
     }
   }
+  if (await runAsBinary(command, params)) {
+    return;
+  }
   const allScripts = await getAvailableCommands();
   console.log(
     pc.red("["),
     pc.cyan(`${command}`),
-    pc.red("] not exists in the list: "),
+    pc.red("] does not exists in the list: "),
     allScripts.map((name) => pc.cyan(name)).join(", ")
   );
 }
+async function runAsBinary(command, params) {
+  const cwd = process.cwd();
+  const binariesPair = await getBinariesPairs();
+  const binaries = Object.keys(binariesPair);
+  if (binaries.includes(command)) {
+    const binPaths = await new NodeTaskDetecter().binaryPaths(cwd);
+    const env = makeEnv(binPaths || []);
+    await exec(command, params, { env });
+    return true;
+  }
+  return false;
+}
 function makeEnv(extraPaths) {
   const env = process.env;
   const envPaths = process.env.PATH?.split(path4.delimiter) || [];
@@ -147,12 +164,13 @@ async function getAvailableCommands() {
 var ins = sliver`
 v${version} @help @autocompletion
 
-xr <@command|_files:command-or-file> #stopEarly, run npm script or ts/js file quickly. ${defaultAction}
+xr <@scripts|bin|_files:command-or-file> #stopEarly, run npm script or ts/js file quickly. ${defaultAction}
 `;
-ins.type("command", async () => {
+ins.type("scripts", async () => {
   const allScripts = await getAvailableCommands();
   return allScripts;
 });
+ins.type("bin", () => getBinariesPairs().then((resp) => Object.keys(resp)));
 async function defaultAction(_, arg) {
   const [commandOrFile, ...params] = arg._;
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0x-jerry/x",
-  "version": "2.12.2",
+  "version": "2.12.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/0x-jerry/x.git"
@@ -47,7 +47,7 @@
     "clean": true
   },
   "dependencies": {
-    "@0x-jerry/silver": "^1.2.3",
+    "@0x-jerry/silver": "^1.2.4",
     "@0x-jerry/utils": "^5.0.0",
     "decompress": "^4.2.1",
     "fs-extra": "^11.3.1",
@@ -63,7 +63,7 @@
   },
   "devDependencies": {
     "@0x-jerry/x-release": "^2.4.0",
-    "@biomejs/biome": "^2.2.3",
+    "@biomejs/biome": "^2.2.4",
     "@types/decompress": "^4.2.7",
     "@types/fs-extra": "^11.0.4",
     "@types/global-agent": "^3.0.0",

package/readme.md

@@ -1,94 +1,95 @@
-# X
-
-Some useful command for myself.
-
-## Install
-
-```sh
-pnpm i -g @0x-jerry/x
-```
-
-## Run task `xr`
-
-`xr` command can auto detect tasks in `package.json/scripts`, `deno.json/tasks`, and run it. you can also append any parameters.
-
-Example: In a node project with `pnpm-lock.yaml`. And `package.json` has a script `"test": "vitest run"`
-
-```sh
-xr test test/*.ts
-# equals
-vitest run test/*.ts
-
-# you can also execute binary file in `node_modules/.bin` folder.
-xr vite --port 4004
-```
-
-Example: In a deno project with `deno.json` or `deno.jsonc`. And have a task `"dev": "deno run -A main.ts"`
-
-```sh
-xr dev
-# equals
-deno run -A main.ts
-```
-
-## Dependency Manager `xn`
-
-`xn` command can install modules by detect the correct tool, it detects lockfile to decide which dependency manager tools should be used.
-
-Example: install packages in a node project with `pnpm-lock.yaml`
-
-```sh
-xn i lodash-es
-# equals
-pnpm i lodash-es
-
-xn i lodash-es -D
-# equals
-pnpm i lodash-es -D
-
-# -t/--types option support install @types/xx package in one command.
-xn i lodash-es --types
-# equals
-pnpm i lodash-es && pnpm i @types/lodash-es -D
-```
-
-Example: remove packages in a node project with `pnpm-lock.yaml`
-
-```sh
-xn rm lodash-es
-# equals
-pnpm uninstall lodash-es
-
-xn rm lodash-es -D
-# equals
-pnpm uninstall lodash-es -D
-
-# -t/--types option support remove @types/xx package in one command.
-xn rm lodash-es --types
-# equals
-pnpm uninstall lodash-es @types/lodash-es
-```
-
-`xn` also support rust project.
-
-Example: in a rust project with `Cargo.toml`
-
-```sh
-xn i log
-# equals
-cargo add log
-
-xn rm log
-# equals
-cargo remove log
-```
-
-## Command Completions
-
-Add this code to `~/.zshrc`
-
-```zsh
-source <(x completions)
-source <(xr completions)
-source <(xn completions)
-```
+# X
+
+Some useful command for myself.
+
+## Install
+
+```sh
+pnpm i -g @0x-jerry/x
+```
+
+## Run task `xr`
+
+`xr` command can auto detect tasks in `package.json/scripts`, `deno.json/tasks`, and run it. you can also append any parameters.
+
+Example: In a node project with `pnpm-lock.yaml`. And `package.json` has a script `"test": "vitest run"`
+
+```sh
+xr test test/*.ts
+# equals
+vitest run test/*.ts
+
+# you can also execute binary file in `node_modules/.bin` folder.
+xr vite --port 4004
+```
+
+Example: In a deno project with `deno.json` or `deno.jsonc`. And have a task `"dev": "deno run -A main.ts"`
+
+```sh
+xr dev
+# equals
+deno run -A main.ts
+```
+
+## Dependency Manager `xn`
+
+`xn` command can install modules by detect the correct tool, it detects lockfile to decide which dependency manager tools should be used.
+
+Example: install packages in a node project with `pnpm-lock.yaml`
+
+```sh
+xn i lodash-es
+# equals
+pnpm i lodash-es
+
+xn i lodash-es -D
+# equals
+pnpm i lodash-es -D
+
+# -t/--types option support install @types/xx package in one command.
+xn i lodash-es --types
+# equals
+pnpm i lodash-es && pnpm i @types/lodash-es -D
+```
+
+Example: remove packages in a node project with `pnpm-lock.yaml`
+
+```sh
+xn rm lodash-es
+# equals
+pnpm uninstall lodash-es
+
+xn rm lodash-es -D
+# equals
+pnpm uninstall lodash-es -D
+
+# -t/--types option support remove @types/xx package in one command.
+xn rm lodash-es --types
+# equals
+pnpm uninstall lodash-es @types/lodash-es
+```
+
+`xn` also support rust project.
+
+Example: in a rust project with `Cargo.toml`
+
+```sh
+xn i log
+# equals
+cargo add log
+
+xn rm log
+# equals
+cargo remove log
+```
+
+## Command Completions
+
+Add this code to `~/.zshrc`
+
+```zsh
+source <(x completion)
+source <(xr completion)
+source <(xn completion)
+```
+