uncomment-cli 2.9.2 → 2.10.2

package/index.js

@@ -13,13 +13,13 @@ function getPlatform() {
   if (type === "Linux") {
     if (arch === "x64") return "x86_64-unknown-linux-gnu";
     if (arch === "arm64") return "aarch64-unknown-linux-gnu";
-    return "x86_64-unknown-linux-gnu"; // fallback
+    return "x86_64-unknown-linux-gnu";
   }
 
   if (type === "Darwin") {
     if (arch === "x64") return "x86_64-apple-darwin";
     if (arch === "arm64") return "aarch64-apple-darwin";
-    return "x86_64-apple-darwin"; // fallback
+    return "x86_64-apple-darwin";
   }
 
   throw new Error(`Unsupported platform: ${type} ${arch}`);

package/install.js

@@ -1,38 +1,43 @@
-const https = require("https");
-const http = require("http");
-const fs = require("fs");
-const path = require("path");
-const os = require("os");
+const fs = require("node:fs");
+const os = require("node:os");
+const path = require("node:path");
+const https = require("node:https");
+const http = require("node:http");
 const tar = require("tar");
+const AdmZip = require("adm-zip");
+
 const { version } = require("./package.json");
 
-function getPlatform() {
+function getPlatformTriple() {
   const type = os.type();
   const arch = os.arch();
 
   if (type === "Windows_NT") {
-    return arch === "x64" ? "x86_64-pc-windows-msvc" : "i686-pc-windows-msvc";
+    if (arch === "x64") return "x86_64-pc-windows-gnu";
+    if (arch === "ia32") return "i686-pc-windows-gnu";
+    throw new Error(`Unsupported Windows architecture: ${arch}`);
   }
 
   if (type === "Linux") {
     if (arch === "x64") return "x86_64-unknown-linux-gnu";
     if (arch === "arm64") return "aarch64-unknown-linux-gnu";
-    return "x86_64-unknown-linux-gnu"; // fallback
+    return "x86_64-unknown-linux-gnu";
   }
 
   if (type === "Darwin") {
     if (arch === "x64") return "x86_64-apple-darwin";
     if (arch === "arm64") return "aarch64-apple-darwin";
-    return "x86_64-apple-darwin"; // fallback
+    return "x86_64-apple-darwin";
   }
 
   throw new Error(`Unsupported platform: ${type} ${arch}`);
 }
 
 function getBinaryUrl() {
-  const platform = getPlatform();
+  const platform = getPlatformTriple();
   const baseUrl = `https://github.com/Goldziher/uncomment/releases/download/v${version}`;
-  return `${baseUrl}/uncomment-${platform}.tar.gz`;
+  const ext = platform.includes("windows") ? "zip" : "tar.gz";
+  return `${baseUrl}/uncomment-${platform}.${ext}`;
 }
 
 function downloadWithRedirects(url, dest, maxRedirects = 5) {
@@ -52,7 +57,6 @@ function downloadWithRedirects(url, dest, maxRedirects = 5) {
         },
       },
       (res) => {
-        // Handle redirects
         if (
           res.statusCode >= 300 &&
           res.statusCode < 400 &&
@@ -82,7 +86,7 @@ function downloadWithRedirects(url, dest, maxRedirects = 5) {
         });
 
         file.on("error", (err) => {
-          fs.unlink(dest, () => {}); // Delete partial file
+          fs.unlink(dest, () => {});
           reject(err);
         });
       },
@@ -99,36 +103,50 @@ function downloadWithRedirects(url, dest, maxRedirects = 5) {
 async function installBinary() {
   try {
     const url = getBinaryUrl();
+    const isZip = url.endsWith(".zip");
     const binDir = path.join(__dirname, "bin");
-    const tarPath = path.join(binDir, "uncomment.tar.gz");
+    const archivePath = path.join(
+      binDir,
+      isZip ? "uncomment.zip" : "uncomment.tar.gz",
+    );
     const binaryName =
       os.type() === "Windows_NT" ? "uncomment.exe" : "uncomment";
+    const binaryPath = path.join(binDir, binaryName);
 
-    // Ensure bin directory exists
     if (!fs.existsSync(binDir)) {
       fs.mkdirSync(binDir, { recursive: true });
     }
 
+    if (fs.existsSync(binaryPath)) {
+      return;
+    }
+
     console.log(`Downloading uncomment binary from ${url}...`);
 
-    // Download the tar.gz file
-    await downloadWithRedirects(url, tarPath);
+    await downloadWithRedirects(url, archivePath);
 
     console.log("Extracting binary...");
 
-    // Extract the binary from tar.gz
-    await tar.extract({
-      file: tarPath,
-      cwd: binDir,
-      filter: (path) => path.endsWith(binaryName),
-    });
+    if (isZip) {
+      const zip = new AdmZip(archivePath);
+      const entry = zip
+        .getEntries()
+        .find((e) => e.entryName.endsWith(binaryName));
+      if (!entry) {
+        throw new Error("Binary not found in downloaded archive");
+      }
+      zip.extractEntryTo(entry, binDir, false, true);
+    } else {
+      await tar.extract({
+        file: archivePath,
+        cwd: binDir,
+        filter: (entryPath) => entryPath.endsWith(binaryName),
+      });
+    }
 
-    // Clean up tar file
-    fs.unlinkSync(tarPath);
+    fs.unlinkSync(archivePath);
 
-    // Make binary executable on Unix systems
     if (os.type() !== "Windows_NT") {
-      const binaryPath = path.join(binDir, binaryName);
       fs.chmodSync(binaryPath, 0o755);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uncomment-cli",
-  "version": "2.9.2",
+  "version": "2.10.2",
   "description": "A fast Rust-based CLI tool for removing comments from source code",
   "main": "index.js",
   "bin": {
@@ -31,6 +31,7 @@
     "url": "https://github.com/Goldziher/uncomment/issues"
   },
   "dependencies": {
+    "adm-zip": "^0.5.12",
     "tar": "^6.0.0"
   },
   "files": [