@xx-in/tools 0.0.3 → 0.0.5

package/README.md

@@ -65,13 +65,13 @@ npm run publish:npm:registry
 - **`open [path]`**：文件管理器目录打开工具。
   - 在系统内置文件管理器中打开指定目录。若未提供参数，则默认打开当前的工作目录。
 
-### 2. macOS 本地工具安装管理
+### 2. 本地工具安装管理
 
-- **`install <path>`**：macOS 本地工具安装器。
-  - 支持安装单个可执行文件，以及 `.tar.gz`、`.tgz`、`.tar.xz`、`.txz`、`.tar` 压缩包。
+- **`install <path>`**：macOS / Windows 本地工具安装器。
+  - 支持安装单个可执行文件，以及 `.zip`、`.tar.gz`、`.tgz`、`.tar.xz`、`.txz`、`.tar` 压缩包。
   - 自动安装到 `~/.xx-tools/apps/`，并在 `~/.xx-tools/bin/` 创建终端命令入口。
-  - 首次安装时会自动把 `~/.xx-tools/bin` 写入你的 Shell 配置，后续即可在终端中直接调用已安装工具。
-- **`uninstall <package>`**：macOS 本地工具卸载器。
+  - macOS 下会自动写入 Shell 配置；Windows 下会自动写入当前用户 PATH，后续即可在终端中直接调用已安装工具。
+- **`uninstall <package>`**：macOS / Windows 本地工具卸载器。
   - 按安装名卸载工具，同时删除安装目录和终端命令入口。
 
 ### 3. 压缩与解压

package/dist/cli.js

@@ -7,7 +7,7 @@ import process4 from "process";
 // package.json
 var package_default = {
   name: "@xx-in/tools",
-  version: "0.0.3",
+  version: "0.0.5",
   description: "A command-line tool to run in any system",
   license: "MIT",
   type: "module",
@@ -21,7 +21,7 @@ var package_default = {
     build: "tsup",
     dev: "tsup --watch",
     prepublishOnly: "npm run build",
-    "publish:npm": "npm publish --access public",
+    publish: "npm publish --access public",
     "publish:npm:registry": "npm --registry=https://registry.npmjs.org/ publish --access public"
   },
   engines: {
@@ -72,7 +72,7 @@ _xx() {
         'create:\u9012\u5F52\u521B\u5EFA\u6587\u4EF6\u6216\u76EE\u5F55'
         'format:\u4F7F\u7528 Prettier \u683C\u5F0F\u5316\u4EE3\u7801'
         'help:\u663E\u793A\u6307\u5B9A\u547D\u4EE4\u7684\u5E2E\u52A9\u4FE1\u606F'
-        'install:macOS \u672C\u5730\u5DE5\u5177\u5B89\u88C5\u5668 (\u652F\u6301\u53EF\u6267\u884C\u6587\u4EF6\u4E0E tar \u5305)'
+        'install:macOS/Windows \u672C\u5730\u5DE5\u5177\u5B89\u88C5\u5668 (\u652F\u6301\u53EF\u6267\u884C\u6587\u4EF6\u3001zip\u3001tar \u5305)'
         'ip:\u672C\u5730\u6D3B\u8DC3\u7F51\u5361\u53CA\u7F51\u5173\u4FA6\u6D4B'
         'list:\u5217\u51FA\u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u548C\u76EE\u5F55\uFF08\u542B\u9690\u85CF\u9879\uFF09'
         'move:\u79FB\u52A8\u6216\u91CD\u547D\u540D\u6587\u4EF6\u53CA\u76EE\u5F55'
@@ -82,7 +82,7 @@ _xx() {
         'remove:\u5B89\u5168\u5730\u5C06\u6307\u5B9A\u7684\u6587\u4EF6\u6216\u76EE\u5F55\u79FB\u81F3\u7CFB\u7EDF\u56DE\u6536\u7AD9\uFF08\u652F\u6301\u901A\u914D\u7B26\u53CA\u591A\u9009\uFF09'
         'search:\u9012\u5F52\u641C\u7D22\u76EE\u5F55\u4E0B\u5305\u542B\u6307\u5B9A\u5173\u952E\u8BCD\u7684\u6587\u4EF6\u6216\u76EE\u5F55'
         'translate:\u7EC8\u7AEF\u7FFB\u8BD1\u5DE5\u5177'
-        'uninstall:macOS \u672C\u5730\u5DE5\u5177\u5378\u8F7D\u5668\uFF08\u79FB\u9664\u5B89\u88C5\u76EE\u5F55\u548C\u7EC8\u7AEF\u547D\u4EE4\u5165\u53E3\uFF09'
+        'uninstall:macOS/Windows \u672C\u5730\u5DE5\u5177\u5378\u8F7D\u5668\uFF08\u79FB\u9664\u5B89\u88C5\u76EE\u5F55\u548C\u7EC8\u7AEF\u547D\u4EE4\u5165\u53E3\uFF09'
         'unzip:\u89E3\u538B ZIP \u538B\u7F29\u5305'
         'upgrade:\u81EA\u52A8\u66F4\u65B0 xx \u547D\u4EE4\u884C\u5DE5\u5177\u81F3\u6700\u65B0\u7248\u672C'
         'zip:\u81EA\u52A8\u8FC7\u6EE4\u5E76\u6253\u5305\u4E3A ZIP'
@@ -104,6 +104,10 @@ _xx() {
           _arguments \\
             '*:Target Path:_files'
           ;;
+        install)
+          _arguments \\
+            '*:Install Package:_files'
+          ;;
         help)
           local -a sub_cmds
           sub_cmds=(
@@ -111,7 +115,7 @@ _xx() {
             'copy:\u590D\u5236\u6587\u4EF6\u6216\u76EE\u5F55\uFF08\u652F\u6301\u9012\u5F52\u590D\u5236\uFF09'
             'create:\u9012\u5F52\u521B\u5EFA\u6587\u4EF6\u6216\u76EE\u5F55'
             'format:\u4F7F\u7528 Prettier \u683C\u5F0F\u5316\u4EE3\u7801'
-            'install:macOS \u672C\u5730\u5DE5\u5177\u5B89\u88C5\u5668 (\u652F\u6301\u53EF\u6267\u884C\u6587\u4EF6\u4E0E tar \u5305)'
+            'install:macOS/Windows \u672C\u5730\u5DE5\u5177\u5B89\u88C5\u5668 (\u652F\u6301\u53EF\u6267\u884C\u6587\u4EF6\u3001zip\u3001tar \u5305)'
             'ip:\u672C\u5730\u6D3B\u8DC3\u7F51\u5361\u53CA\u7F51\u5173\u4FA6\u6D4B'
             'list:\u5217\u51FA\u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u548C\u76EE\u5F55\uFF08\u542B\u9690\u85CF\u9879\uFF09'
             'move:\u79FB\u52A8\u6216\u91CD\u547D\u540D\u6587\u4EF6\u53CA\u76EE\u5F55'
@@ -121,7 +125,7 @@ _xx() {
             'remove:\u5B89\u5168\u5730\u5C06\u6307\u5B9A\u7684\u6587\u4EF6\u6216\u76EE\u5F55\u79FB\u81F3\u7CFB\u7EDF\u56DE\u6536\u7AD9\uFF08\u652F\u6301\u901A\u914D\u7B26\u53CA\u591A\u9009\uFF09'
             'search:\u9012\u5F52\u641C\u7D22\u76EE\u5F55\u4E0B\u5305\u542B\u6307\u5B9A\u5173\u952E\u8BCD\u7684\u6587\u4EF6\u6216\u76EE\u5F55'
             'translate:\u7EC8\u7AEF\u7FFB\u8BD1\u5DE5\u5177'
-            'uninstall:macOS \u672C\u5730\u5DE5\u5177\u5378\u8F7D\u5668\uFF08\u79FB\u9664\u5B89\u88C5\u76EE\u5F55\u548C\u7EC8\u7AEF\u547D\u4EE4\u5165\u53E3\uFF09'
+            'uninstall:macOS/Windows \u672C\u5730\u5DE5\u5177\u5378\u8F7D\u5668\uFF08\u79FB\u9664\u5B89\u88C5\u76EE\u5F55\u548C\u7EC8\u7AEF\u547D\u4EE4\u5165\u53E3\uFF09'
             'unzip:\u89E3\u538B ZIP \u538B\u7F29\u5305'
             'upgrade:\u81EA\u52A8\u66F4\u65B0 xx \u547D\u4EE4\u884C\u5DE5\u5177\u81F3\u6700\u65B0\u7248\u672C'
             'zip:\u81EA\u52A8\u8FC7\u6EE4\u5E76\u6253\u5305\u4E3A ZIP'
@@ -160,7 +164,7 @@ _xx() {
           ;;
         uninstall)
           _arguments \\
-            '*:Package Path:_files'
+            '*:Installed App:'
           ;;
         unzip)
           _arguments \\
@@ -253,6 +257,10 @@ _xx_completion() {
             COMPREPLY=( $(compgen -W "\${sub_opts}" -- \${cur}) )
             return 0
             ;;
+        install|uninstall)
+            COMPREPLY=( $(compgen -f -- "\${cur}") )
+            return 0
+            ;;
         upgrade)
             local sub_opts="-r --registry"
             COMPREPLY=( $(compgen -W "\${sub_opts}" -- \${cur}) )
@@ -770,13 +778,38 @@ import { resolve as resolve4, join as join5, basename as basename3 } from "path"
 
 // utils/macos-apps.ts
 import fs5 from "fs/promises";
-import { basename as basename2, extname, join as join4 } from "path";
+import { basename as basename2, delimiter, extname, join as join4 } from "path";
 import pc5 from "picocolors";
+
+// utils/archive.ts
+import AdmZip from "adm-zip";
+import * as tar from "tar";
+import { mkdir } from "fs/promises";
+async function compressZip(sourceDir, outputPath) {
+  const zip = new AdmZip();
+  zip.addLocalFolder(sourceDir);
+  zip.writeZip(outputPath);
+}
+async function uncompressZip(src, destDir) {
+  await mkdir(destDir, { recursive: true });
+  const zip = new AdmZip(src);
+  zip.extractAllTo(destDir, true);
+}
+async function uncompressTar(src, destDir) {
+  await mkdir(destDir, { recursive: true });
+  await tar.x({ file: src, cwd: destDir });
+}
+async function uncompressTgz(src, destDir) {
+  await mkdir(destDir, { recursive: true });
+  await tar.x({ file: src, gzip: true, cwd: destDir });
+}
+
+// utils/macos-apps.ts
 var APP_DIR_NAME = ".xx-tools";
 var PATH_MARKER_BEGIN = "# >>> xx-tools path >>>";
 var PATH_MARKER_END = "# <<< xx-tools path <<<";
 function getHomeDir() {
-  return process.env["HOME"] || process.cwd();
+  return process.env["HOME"] || process.env["USERPROFILE"] || process.cwd();
 }
 function getToolsRootDir() {
   return join4(getHomeDir(), APP_DIR_NAME);
@@ -790,9 +823,11 @@ function getBinDir() {
 function getManifestPath(appName) {
   return join4(getAppsDir(), appName, ".xx-manifest.json");
 }
-function ensureMacOS() {
-  if (process.platform !== "darwin") {
-    console.error(pc5.red("\u274C \u5F53\u524D install/uninstall \u4EC5\u652F\u6301 macOS\u3002"));
+function ensureSupportedDesktopOS() {
+  if (process.platform !== "darwin" && process.platform !== "win32") {
+    console.error(
+      pc5.red("\u274C \u5F53\u524D install/uninstall \u4EC5\u652F\u6301 macOS \u548C Windows\u3002")
+    );
     return false;
   }
   return true;
@@ -815,6 +850,10 @@ function getPreferredProfiles() {
   return Array.from(new Set(profiles));
 }
 async function ensureBinDirOnPath() {
+  if (process.platform === "win32") {
+    await ensureWindowsBinDirOnPath();
+    return;
+  }
   const pathBlock = `${PATH_MARKER_BEGIN}
 export PATH="$HOME/${APP_DIR_NAME}/bin:$PATH"
 ${PATH_MARKER_END}`;
@@ -836,7 +875,43 @@ ${PATH_MARKER_END}`;
     }
   }
 }
+async function ensureWindowsBinDirOnPath() {
+  const binDir = getBinDir();
+  const currentUserPath = process.env["Path"] || process.env["PATH"] || "";
+  const alreadyInCurrentEnv = currentUserPath.split(delimiter).some((item) => item.trim().toLowerCase() === binDir.toLowerCase());
+  const script = [
+    "$binDir = [System.IO.Path]::GetFullPath($args[0])",
+    "$userPath = [Environment]::GetEnvironmentVariable('Path', 'User')",
+    "if ([string]::IsNullOrWhiteSpace($userPath)) { $userPath = '' }",
+    "$items = $userPath -split ';' | Where-Object { $_ -and $_.Trim() -ne '' }",
+    "$exists = $items | Where-Object { $_.Trim().ToLower() -eq $binDir.ToLower() }",
+    "if (-not $exists) {",
+    '  $newPath = if ($userPath) { "$binDir;$userPath" } else { $binDir }',
+    "  [Environment]::SetEnvironmentVariable('Path', $newPath, 'User')",
+    "  Write-Output 'UPDATED'",
+    "} else {",
+    "  Write-Output 'UNCHANGED'",
+    "}"
+  ].join(" ");
+  const { success, stdout } = await runCommand("powershell", [
+    "-NoProfile",
+    "-Command",
+    script,
+    binDir
+  ]);
+  if (success) {
+    const output = decodeOutput(stdout).trim();
+    if (output.includes("UPDATED")) {
+      console.log(pc5.green(`\u2714 \u5DF2\u5199\u5165\u7528\u6237 PATH: ${binDir}`));
+    } else if (!alreadyInCurrentEnv) {
+      console.log(pc5.dim(`\u2796 \u7528\u6237 PATH \u4E2D\u5DF2\u5B58\u5728: ${binDir}`));
+    }
+  }
+}
 function getShellReloadCommand() {
+  if (process.platform === "win32") {
+    return "\u91CD\u65B0\u6253\u5F00 PowerShell \u6216 CMD";
+  }
   const shell = process.env["SHELL"] || "";
   if (shell.includes("zsh")) {
     return "source ~/.zshrc";
@@ -878,10 +953,18 @@ async function findExecutablesRecursively(rootDir) {
       }
       if (!entry.isFile()) continue;
       const stat = await fs5.stat(fullPath);
-      const isExecutable = stat.mode ? (stat.mode & 73) !== 0 : false;
-      if (!isExecutable) continue;
-      if (/\.(dylib|so|a|o|txt|md|json|yaml|yml|ts|js|c|h|sh)$/i.test(entry.name)) {
-        continue;
+      if (process.platform === "win32") {
+        if (!/\.(exe|cmd|bat|ps1)$/i.test(entry.name)) {
+          continue;
+        }
+      } else {
+        const isExecutable = stat.mode ? (stat.mode & 73) !== 0 : false;
+        if (!isExecutable) continue;
+        if (/\.(dylib|so|a|o|txt|md|json|yaml|yml|ts|js|c|h|sh)$/i.test(
+          entry.name
+        )) {
+          continue;
+        }
       }
       matches.push(fullPath);
     }
@@ -893,11 +976,34 @@ async function createLinks(appName, executablePaths) {
   const binDir = getBinDir();
   const linkNames = [];
   for (const executablePath of executablePaths) {
-    const linkName = basename2(executablePath);
-    const linkPath = join4(binDir, linkName);
-    await fs5.rm(linkPath, { force: true });
-    await fs5.symlink(executablePath, linkPath);
-    linkNames.push(linkName);
+    const executableBaseName = basename2(executablePath);
+    if (process.platform === "win32") {
+      const commandName = basename2(
+        executableBaseName,
+        extname(executableBaseName)
+      );
+      const cmdPath = join4(binDir, `${commandName}.cmd`);
+      const ps1Path = join4(binDir, `${commandName}.ps1`);
+      const quotedExecutable = executablePath.replace(/"/g, '""');
+      await fs5.rm(cmdPath, { force: true });
+      await fs5.rm(ps1Path, { force: true });
+      await fs5.writeFile(
+        cmdPath,
+        `@echo off\r
+"${quotedExecutable}" %*\r
+`,
+        "utf-8"
+      );
+      await fs5.writeFile(ps1Path, `& "${quotedExecutable}" @args
+`, "utf-8");
+      linkNames.push(commandName);
+    } else {
+      const linkName = executableBaseName;
+      const linkPath = join4(binDir, linkName);
+      await fs5.rm(linkPath, { force: true });
+      await fs5.symlink(executablePath, linkPath);
+      linkNames.push(linkName);
+    }
   }
   if (linkNames.length > 0) {
     console.log(
@@ -927,7 +1033,12 @@ async function removeInstalledApp(appName) {
   const manifest = await readManifest(appName);
   if (!manifest) return false;
   for (const linkName of manifest.links) {
-    await fs5.rm(join4(getBinDir(), linkName), { force: true });
+    if (process.platform === "win32") {
+      await fs5.rm(join4(getBinDir(), `${linkName}.cmd`), { force: true });
+      await fs5.rm(join4(getBinDir(), `${linkName}.ps1`), { force: true });
+    } else {
+      await fs5.rm(join4(getBinDir(), linkName), { force: true });
+    }
     console.log(pc5.green(`\u2714 \u5DF2\u79FB\u9664\u7EC8\u7AEF\u547D\u4EE4: ${linkName}`));
   }
   await fs5.rm(manifest.installDir, { recursive: true, force: true });
@@ -944,6 +1055,10 @@ async function listInstalledApps() {
 }
 async function extractArchiveToDir(archivePath, destDir) {
   const lower = archivePath.toLowerCase();
+  if (lower.endsWith(".zip")) {
+    await uncompressZip(archivePath, destDir);
+    return true;
+  }
   let args;
   if (lower.endsWith(".tar.gz") || lower.endsWith(".tgz")) {
     args = ["-xzf", archivePath, "-C", destDir];
@@ -1016,9 +1131,9 @@ async function installArchive(absPath) {
 }
 function registerInstallCommand(program2) {
   program2.command("install [path]").description(
-    "macOS \u672C\u5730\u5DE5\u5177\u5B89\u88C5\u5668\uFF08\u652F\u6301\u53EF\u6267\u884C\u6587\u4EF6\u3001.tar.gz\u3001.tgz\u3001.tar.xz\u3001.txz\u3001.tar\uFF09"
+    "macOS/Windows \u672C\u5730\u5DE5\u5177\u5B89\u88C5\u5668\uFF08\u652F\u6301\u53EF\u6267\u884C\u6587\u4EF6\u3001.zip\u3001.tar.gz\u3001.tgz\u3001.tar.xz\u3001.txz\u3001.tar\uFF09"
   ).action(async (target) => {
-    if (!ensureMacOS()) return;
+    if (!ensureSupportedDesktopOS()) return;
     if (!target) {
       console.error(pc6.red("\u274C \u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u672C\u5730\u6587\u4EF6\u8DEF\u5F84\u3002"));
       return;
@@ -1037,7 +1152,7 @@ function registerInstallCommand(program2) {
     await ensureToolDirectories();
     await ensureBinDirOnPath();
     const lowerPath = target.toLowerCase();
-    if (lowerPath.endsWith(".tar.gz") || lowerPath.endsWith(".tgz") || lowerPath.endsWith(".tar.xz") || lowerPath.endsWith(".txz") || lowerPath.endsWith(".tar")) {
+    if (lowerPath.endsWith(".zip") || lowerPath.endsWith(".tar.gz") || lowerPath.endsWith(".tgz") || lowerPath.endsWith(".tar.xz") || lowerPath.endsWith(".txz") || lowerPath.endsWith(".tar")) {
       await installArchive(absPath);
     } else {
       await installBinary(absPath);
@@ -1928,8 +2043,8 @@ function registerTanslateCommand(program2) {
 // commands/uninstall.ts
 import pc16 from "picocolors";
 function registerUninstallCommand(program2) {
-  program2.command("uninstall <package>").description("macOS \u672C\u5730\u5DE5\u5177\u5378\u8F7D\u5668\uFF08\u79FB\u9664\u5B89\u88C5\u76EE\u5F55\u548C\u7EC8\u7AEF\u547D\u4EE4\u5165\u53E3\uFF09").action(async (pkg) => {
-    if (!ensureMacOS()) return;
+  program2.command("uninstall <package>").description("macOS/Windows \u672C\u5730\u5DE5\u5177\u5378\u8F7D\u5668\uFF08\u79FB\u9664\u5B89\u88C5\u76EE\u5F55\u548C\u7EC8\u7AEF\u547D\u4EE4\u5165\u53E3\uFF09").action(async (pkg) => {
+    if (!ensureSupportedDesktopOS()) return;
     if (!pkg) {
       console.error(pc16.red("\u274C \u8BF7\u63D0\u4F9B\u8981\u5378\u8F7D\u7684\u5E94\u7528\u540D\u3002"));
       return;
@@ -1962,31 +2077,6 @@ function registerUninstallCommand(program2) {
 import fs13 from "fs/promises";
 import pc17 from "picocolors";
 import { join as join8, basename as basename6, extname as extname2, resolve as resolve11 } from "path";
-
-// utils/archive.ts
-import AdmZip from "adm-zip";
-import * as tar from "tar";
-import { mkdir } from "fs/promises";
-async function compressZip(sourceDir, outputPath) {
-  const zip = new AdmZip();
-  zip.addLocalFolder(sourceDir);
-  zip.writeZip(outputPath);
-}
-async function uncompressZip(src, destDir) {
-  await mkdir(destDir, { recursive: true });
-  const zip = new AdmZip(src);
-  zip.extractAllTo(destDir, true);
-}
-async function uncompressTar(src, destDir) {
-  await mkdir(destDir, { recursive: true });
-  await tar.x({ file: src, cwd: destDir });
-}
-async function uncompressTgz(src, destDir) {
-  await mkdir(destDir, { recursive: true });
-  await tar.x({ file: src, gzip: true, cwd: destDir });
-}
-
-// commands/unzip.ts
 async function uncompressRar(src, dest) {
   const hasUnrar = isCommandAvailable("unrar");
   if (hasUnrar) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xx-in/tools",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "A command-line tool to run in any system",
   "license": "MIT",
   "type": "module",
@@ -14,7 +14,7 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "prepublishOnly": "npm run build",
-    "publish:npm": "npm publish --access public",
+    "publish": "npm publish --access public",
     "publish:npm:registry": "npm --registry=https://registry.npmjs.org/ publish --access public"
   },
   "engines": {