dprint 0.32.0 → 0.32.2

package/bin.js

@@ -8,25 +8,38 @@ const fs = require("fs");
 
 const exePath = path.join(__dirname, os.platform() === "win32" ? "dprint.exe" : "dprint");
 
-try {
-  const result = child_process.spawnSync(
-    exePath,
-    process.argv.slice(2),
-    { stdio: "inherit" },
-  );
+if (!fs.existsSync(exePath)) {
+  require("./install_api").runInstall().then(() => {
+    runDprintExe();
+  }).catch(err => {
+    console.error(err);
+    process.exit(child_process.exitCode || 1);
+  });
+} else {
+  runDprintExe();
+}
+
+function runDprintExe() {
+  try {
+    const result = child_process.spawnSync(
+      exePath,
+      process.argv.slice(2),
+      { stdio: "inherit" },
+    );
+    if (result.error) {
+      throw result.error;
+    }
 
-  if (result.status !== 0) {
     throwIfNoExePath();
-  }
 
-  process.exitCode = result.status;
-} catch (err) {
-  throwIfNoExePath();
-  throw err;
+    process.exitCode = result.status;
+  } catch (err) {
+    throw err;
+  }
 }
 
 function throwIfNoExePath() {
   if (!fs.existsSync(exePath)) {
-    throw new Error("Could not find exe at path '" + exePath + "'. Please ensure the dprint 'postinstall' script runs on install.");
+    throw new Error("Could not find exe at path '" + exePath + "'. Maybe try running dprint again.");
   }
 }

package/info.json

@@ -1,10 +1,10 @@
 {
-  "version": "0.32.0",
+  "version": "0.32.2",
   "checksums": {
-    "windows-x86_64": "910c047191d1d2ff6177713dd3b199b02c76ac5e9f202128b52f2a015057488e",
-    "darwin-x86_64": "6447c2bbcb61aca4d32bba3b677b5a741d7d0b36f001ec0d12c71982ff5c51ad",
-    "darwin-aarch64": "11596c9edb64ecec199268477c6938960ae2c7e5b0a6776d4c97bd2f453fd479",
-    "linux-x86_64": "c339d67de7b2b119590629440b9809deb4f220b38c2f9bfd4c41af330731b901",
-    "linux-aarch64": "2e164b3d1481df5b87bfab3c3dc91cbc34127fade224ba3b90e747090a81b2fc"
+    "windows-x86_64": "e4c0916438a11b18b1d6a3ce7c4e23f18998648d39247fa0b617c9863dea6d11",
+    "darwin-x86_64": "5abcc7e2f99b98a629b73ded47ca84bc851b4f6ec35ff6df496c2eefd569c55c",
+    "darwin-aarch64": "ec909acfc179b064e7d19e130c1aa1bdf0350d929b9a04dc6f6b5ce84432eb69",
+    "linux-x86_64": "8e8d0f32e5522a61f6251fb3b9c6be106584ccdfdb13008b276c1ee8bfdc6ffa",
+    "linux-aarch64": "ddff520568958b6dfeac83105a913db7247188035a0e1af12d4100d0c0d631e4"
   }
 }

package/install.js

@@ -1,180 +1,4 @@
 // @ts-check
 "use strict";
 
-const https = require("https");
-const fs = require("fs");
-const crypto = require("crypto");
-const os = require("os");
-const path = require("path");
-const yauzl = require("yauzl");
-
-const info = JSON.parse(fs.readFileSync(path.join(__dirname, "info.json"), "utf8"));
-const executableFilePath = path.join(
-  __dirname,
-  os.platform() === "win32" ? "dprint.exe" : "dprint",
-);
-const zipFilePath = path.join(__dirname, "dprint.zip");
-
-if (fs.existsSync(executableFilePath)) {
-  process.exit(0);
-}
-
-const target = getTarget();
-const url = "https://github.com/dprint/dprint/releases/download/"
-  + info.version
-  + "/dprint-" + target + ".zip";
-
-// remove the old zip file if it exists
-try {
-  fs.unlinkSync(zipFilePath);
-} catch (err) {
-  // ignore
-}
-
-// now try to download it
-downloadZipFile(url).then(() => {
-  verifyZipChecksum();
-  extractZipFile().then(() => {
-    // todo: how to just +x? does it matter?
-    fs.chmodSync(executableFilePath, 0o755);
-
-    // delete the zip file
-    try {
-      fs.unlinkSync(zipFilePath);
-    } catch (err) {
-      // ignore
-    }
-  }).catch(err => {
-    console.error("Error extracting dprint zip file.", err);
-    process.exit(1);
-  });
-}).catch(err => {
-  console.error("Error downloading dprint zip file.", err);
-  process.exit(1);
-});
-
-function getTarget() {
-  if (os.platform() === "win32") {
-    return "x86_64-pc-windows-msvc";
-  } else if (os.platform() === "darwin") {
-    if (os.arch() === "arm64") {
-      return "aarch64-apple-darwin";
-    } else if (os.arch() === "x64") {
-      return "x86_64-apple-darwin";
-    } else {
-      throw new Error("Unsupported architecture " + os.arch() + ". Only x64 and M1 binaries are available.");
-    }
-  } else {
-    if (os.arch() === "arm64") {
-      return "aarch64-unknown-linux-gnu";
-    } else if (os.arch() === "x64") {
-      return "x86_64-unknown-linux-gnu";
-    } else {
-      throw new Error("Unsupported architecture " + os.arch() + ". Only x64 and aarch64 binaries are available.");
-    }
-  }
-}
-
-function downloadZipFile(url) {
-  return new Promise((resolve, reject) => {
-    https.get(url, function(response) {
-      if (response.statusCode >= 200 && response.statusCode <= 299) {
-        downloadResponse(response).then(resolve).catch(reject);
-      } else if (response.headers.location) {
-        downloadZipFile(response.headers.location).then(resolve).catch(reject);
-      } else {
-        reject(new Error("Unknown status code " + response.statusCode + " : " + response.statusMessage));
-      }
-    }).on("error", function(err) {
-      try {
-        fs.unlinkSync(zipFilePath);
-      } catch (err) {
-        // ignore
-      }
-      reject(err);
-    });
-  });
-
-  /** @param response {import("http").IncomingMessage} */
-  function downloadResponse(response) {
-    return new Promise((resolve, reject) => {
-      const file = fs.createWriteStream(zipFilePath);
-      response.pipe(file);
-      file.on("finish", function() {
-        file.close((err) => {
-          if (err) {
-            reject(err);
-          } else {
-            resolve();
-          }
-        });
-      });
-    });
-  }
-}
-
-function verifyZipChecksum() {
-  const fileData = fs.readFileSync(zipFilePath);
-  const actualZipChecksum = crypto.createHash("sha256").update(fileData).digest("hex").toLowerCase();
-  const expectedZipChecksum = getExpectedZipChecksum().toLowerCase();
-
-  if (actualZipChecksum !== expectedZipChecksum) {
-    console.error(
-      "Downloaded dprint zip checksum did not match the expected checksum (Actual: "
-        + actualZipChecksum
-        + ", Expected: "
-        + expectedZipChecksum
-        + ").",
-    );
-    process.exit(1);
-  }
-
-  function getExpectedZipChecksum() {
-    switch (os.platform()) {
-      case "win32":
-        return info.checksums["windows-x86_64"];
-      case "darwin":
-        if (os.arch() === "arm64") {
-          return info.checksums["darwin-aarch64"];
-        } else {
-          return info.checksums["darwin-x86_64"];
-        }
-      default:
-        if (os.arch() === "arm64") {
-          return info.checksums["linux-aarch64"];
-        } else {
-          return info.checksums["linux-x86_64"];
-        }
-    }
-  }
-}
-
-function extractZipFile() {
-  return new Promise((resolve, reject) => {
-    // code adapted from: https://github.com/thejoshwolfe/yauzl#usage
-    yauzl.open(zipFilePath, { autoClose: true }, (err, zipFile) => {
-      if (err) {
-        reject(err);
-        return;
-      }
-
-      zipFile.on("entry", (entry) => {
-        if (!/\/$/.test(entry.fileName)) {
-          // file entry
-          zipFile.openReadStream(entry, (err, readStream) => {
-            if (err) {
-              reject(err);
-              return;
-            }
-            const destination = path.join(__dirname, entry.fileName);
-            readStream.pipe(fs.createWriteStream(destination));
-          });
-        }
-      });
-
-      zipFile.once("close", function() {
-        resolve();
-      });
-    });
-  });
-}
+require("./install_api").runInstall();

package/install_api.js

@@ -0,0 +1,209 @@
+// @ts-check
+"use strict";
+
+const https = require("https");
+const fs = require("fs");
+const crypto = require("crypto");
+const os = require("os");
+const path = require("path");
+const yauzl = require("yauzl");
+
+function install() {
+  const executableFilePath = path.join(
+    __dirname,
+    os.platform() === "win32" ? "dprint.exe" : "dprint",
+  );
+
+  if (fs.existsSync(executableFilePath)) {
+    return Promise.resolve();
+  }
+
+  const info = JSON.parse(fs.readFileSync(path.join(__dirname, "info.json"), "utf8"));
+  const zipFilePath = path.join(__dirname, "dprint.zip");
+
+  const target = getTarget();
+  const url = "https://github.com/dprint/dprint/releases/download/"
+    + info.version
+    + "/dprint-" + target + ".zip";
+
+  // remove the old zip file if it exists
+  try {
+    fs.unlinkSync(zipFilePath);
+  } catch (err) {
+    // ignore
+  }
+
+  // now try to download it
+  return downloadZipFile(url).then(() => {
+    verifyZipChecksum();
+    return extractZipFile().then(() => {
+      // todo: how to just +x? does it matter?
+      fs.chmodSync(executableFilePath, 0o755);
+
+      // delete the zip file
+      try {
+        fs.unlinkSync(zipFilePath);
+      } catch (err) {
+        // ignore
+      }
+    }).catch(err => {
+      throw new Error("Error extracting dprint zip file.\n\n" + err);
+    });
+  }).catch(err => {
+    throw new Error("Error downloading dprint zip file.\n\n" + err);
+  });
+
+  function getTarget() {
+    if (os.platform() === "win32") {
+      return "x86_64-pc-windows-msvc";
+    } else if (os.platform() === "darwin") {
+      if (os.arch() === "arm64") {
+        return "aarch64-apple-darwin";
+      } else if (os.arch() === "x64") {
+        return "x86_64-apple-darwin";
+      } else {
+        throw new Error("Unsupported architecture " + os.arch() + ". Only x64 and M1 binaries are available.");
+      }
+    } else {
+      if (os.arch() === "arm64") {
+        return "aarch64-unknown-linux-gnu";
+      } else if (os.arch() === "x64") {
+        return "x86_64-unknown-linux-gnu";
+      } else {
+        throw new Error("Unsupported architecture " + os.arch() + ". Only x64 and aarch64 binaries are available.");
+      }
+    }
+  }
+
+  function downloadZipFile(url) {
+    return new Promise((resolve, reject) => {
+      https.get(url, function(response) {
+        if (response.statusCode >= 200 && response.statusCode <= 299) {
+          downloadResponse(response).then(resolve).catch(reject);
+        } else if (response.headers.location) {
+          downloadZipFile(response.headers.location).then(resolve).catch(reject);
+        } else {
+          reject(new Error("Unknown status code " + response.statusCode + " : " + response.statusMessage));
+        }
+      }).on("error", function(err) {
+        try {
+          fs.unlinkSync(zipFilePath);
+        } catch (err) {
+          // ignore
+        }
+        reject(err);
+      });
+    });
+
+    /** @param response {import("http").IncomingMessage} */
+    function downloadResponse(response) {
+      return new Promise((resolve, reject) => {
+        const file = fs.createWriteStream(zipFilePath);
+        response.pipe(file);
+        file.on("finish", function() {
+          file.close((err) => {
+            if (err) {
+              reject(err);
+            } else {
+              resolve();
+            }
+          });
+        });
+      });
+    }
+  }
+
+  function verifyZipChecksum() {
+    const fileData = fs.readFileSync(zipFilePath);
+    const actualZipChecksum = crypto.createHash("sha256").update(fileData).digest("hex").toLowerCase();
+    const expectedZipChecksum = getExpectedZipChecksum().toLowerCase();
+
+    if (actualZipChecksum !== expectedZipChecksum) {
+      throw new Error(
+        "Downloaded dprint zip checksum did not match the expected checksum (Actual: "
+          + actualZipChecksum
+          + ", Expected: "
+          + expectedZipChecksum
+          + ").",
+      );
+    }
+
+    function getExpectedZipChecksum() {
+      switch (os.platform()) {
+        case "win32":
+          return info.checksums["windows-x86_64"];
+        case "darwin":
+          if (os.arch() === "arm64") {
+            return info.checksums["darwin-aarch64"];
+          } else {
+            return info.checksums["darwin-x86_64"];
+          }
+        default:
+          if (os.arch() === "arm64") {
+            return info.checksums["linux-aarch64"];
+          } else {
+            return info.checksums["linux-x86_64"];
+          }
+      }
+    }
+  }
+
+  function extractZipFile() {
+    return new Promise((resolve, reject) => {
+      // code adapted from: https://github.com/thejoshwolfe/yauzl#usage
+      yauzl.open(zipFilePath, { autoClose: true }, (err, zipFile) => {
+        if (err) {
+          reject(err);
+          return;
+        }
+
+        const pendingWrites = [];
+
+        zipFile.on("entry", (entry) => {
+          if (!/\/$/.test(entry.fileName)) {
+            // file entry
+
+            // note: reject at the top level, but resolve this promise when finished
+            pendingWrites.push(
+              new Promise((resolve) => {
+                zipFile.openReadStream(entry, (err, readStream) => {
+                  if (err) {
+                    reject(err);
+                    return;
+                  }
+                  const destination = path.join(__dirname, entry.fileName);
+                  const writeStream = fs.createWriteStream(destination);
+                  readStream.pipe(writeStream);
+
+                  writeStream.on("error", (err) => {
+                    reject(err);
+                  });
+                  writeStream.on("finish", () => {
+                    resolve();
+                  });
+                });
+              }),
+            );
+          }
+        });
+
+        zipFile.once("close", function() {
+          Promise.all(pendingWrites).then(resolve).catch(reject);
+        });
+      });
+    });
+  }
+}
+
+module.exports = {
+  runInstall() {
+    return install().catch(err => {
+      if (err !== undefined && typeof err.message === "string") {
+        console.error(err.message);
+      } else {
+        console.error(err);
+      }
+      process.exit(1);
+    });
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dprint",
-  "version": "0.32.0",
+  "version": "0.32.2",
   "description": "Pluggable and configurable code formatting platform written in Rust.",
   "bin": "bin.js",
   "scripts": {