dprint 0.51.1 → 0.53.0

package/{bin.js → bin.cjs}

@@ -10,7 +10,7 @@ const exePath = path.join(__dirname, os.platform() === "win32" ? "dprint.exe" :
 
 if (!fs.existsSync(exePath)) {
   try {
-    const resolvedExePath = require("./install_api").runInstall();
+    const resolvedExePath = require("./install_api.cjs").runInstall();
     runDprintExe(resolvedExePath);
   } catch (err) {
     if (err !== undefined && typeof err.message === "string") {
@@ -32,16 +32,14 @@ function runDprintExe(exePath) {
     { stdio: "inherit" },
   );
   if (result.error) {
-    throw result.error;
-  }
-
-  throwIfNoExePath();
-
-  process.exitCode = result.status;
-
-  function throwIfNoExePath() {
     if (!fs.existsSync(exePath)) {
-      throw new Error("Could not find exe at path '" + exePath + "'. Maybe try running dprint again.");
+      throw new Error(
+        "Could not find exe at path '" + exePath
+          + "'. Maybe try installing dprint again.",
+      );
     }
+    throw result.error;
   }
+
+  process.exit(result.status ?? 1);
 }

package/install.cjs

@@ -0,0 +1,10 @@
+// @ts-check
+"use strict";
+
+const api = require("./install_api.cjs");
+const exePath = api.runInstall();
+try {
+  api.replaceBinEntry(exePath);
+} catch (_err) {
+  // ignore - falls back to bin.cjs
+}

package/{install_api.js → install_api.cjs}

@@ -8,6 +8,7 @@ const path = require("path");
 let cachedIsMusl = undefined;
 
 module.exports = {
+  replaceBinEntry,
   runInstall() {
     const dprintFileName = os.platform() === "win32" ? "dprint.exe" : "dprint";
     const targetExecutablePath = path.join(
@@ -38,7 +39,7 @@ module.exports = {
       // into the dprint package folder
       hardLinkOrCopy(sourceExecutablePath, targetExecutablePath);
       if (os.platform() !== "win32") {
-        // chomd +x
+        // chmod +x
         chmodX(targetExecutablePath);
       }
       return targetExecutablePath;
@@ -53,12 +54,6 @@ module.exports = {
           err,
         );
       }
-      // use the path found in the specific package
-      try {
-        chmodX(sourceExecutablePath);
-      } catch (_err) {
-        // ignore
-      }
       return sourceExecutablePath;
     }
   },
@@ -66,8 +61,13 @@ module.exports = {
 
 /** @filePath {string} */
 function chmodX(filePath) {
-  const perms = fs.statSync(filePath).mode;
-  fs.chmodSync(filePath, perms | 0o111);
+  const fd = fs.openSync(filePath, "r");
+  try {
+    const perms = fs.fstatSync(fd).mode;
+    fs.fchmodSync(fd, perms | 0o111);
+  } finally {
+    fs.closeSync(fd);
+  }
 }
 
 function getTarget() {
@@ -140,6 +140,89 @@ function getLinuxFamily() {
   }
 }
 
+/**
+ * Replaces the bin entry in node_modules/.bin to point directly at the
+ * native binary, avoiding Node.js startup overhead on each invocation.
+ * @param exePath {string}
+ */
+function replaceBinEntry(exePath) {
+  const binDir = findBinDir();
+  if (binDir === undefined) return;
+
+  const relative = path.relative(binDir, exePath);
+  if (os.platform() === "win32") {
+    // rewrite .cmd and .ps1 wrappers to invoke the native binary directly
+    fs.writeFileSync(
+      path.join(binDir, "dprint.cmd"),
+      "@\"%~dp0" + relative + "\" %*\r\n",
+    );
+    fs.writeFileSync(
+      path.join(binDir, "dprint.ps1"),
+      "& \"$PSScriptRoot/" + relative.replace(/\\/g, "/")
+        + "\" $args\r\nexit $LASTEXITCODE\r\n",
+    );
+  } else {
+    // replace symlink to point directly at the native binary
+    const binDprint = path.join(binDir, "dprint");
+    fs.unlinkSync(binDprint);
+    fs.symlinkSync(relative, binDprint);
+  }
+}
+
+function findBinDir() {
+  // For global installs, npm sets npm_config_global=true and npm_config_prefix
+  // to the install prefix. The bin dir is {prefix}/bin on Linux/Mac or
+  // {prefix} on Windows (e.g. %APPDATA%\npm).
+  if (process.env.npm_config_global === "true") {
+    const prefix = process.env.npm_config_prefix;
+    if (prefix) {
+      const binDir = os.platform() === "win32"
+        ? prefix
+        : path.join(prefix, "bin");
+      if (isBinDirForThisPackage(binDir)) {
+        return binDir;
+      }
+    }
+  }
+
+  // For local installs, walk up looking for node_modules/.bin
+  let dir = __dirname;
+  for (let i = 0; i < 64; i++) {
+    const parent = path.dirname(dir);
+    if (parent === dir) {
+      break;
+    }
+    if (path.basename(parent) === "node_modules") {
+      const binDir = path.join(parent, ".bin");
+      if (isBinDirForThisPackage(binDir)) {
+        return binDir;
+      }
+    }
+    dir = parent;
+  }
+  return undefined;
+}
+
+function isBinDirForThisPackage(binDir) {
+  try {
+    if (os.platform() === "win32") {
+      // verify the .cmd wrapper references our bin.cjs
+      const content = fs.readFileSync(
+        path.join(binDir, "dprint.cmd"),
+        "utf8",
+      );
+      return content.includes("bin.cjs");
+    } else {
+      // verify the symlink points into our package directory
+      const linkTarget = fs.readlinkSync(path.join(binDir, "dprint"));
+      const resolved = path.resolve(binDir, linkTarget);
+      return resolved.endsWith("bin.cjs");
+    }
+  } catch (_err) {
+    return false;
+  }
+}
+
 /**
  * @param sourcePath {string}
  * @param destinationPath {string}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dprint",
-  "version": "0.51.1",
+  "version": "0.53.0",
   "description": "Pluggable and configurable code formatting platform written in Rust.",
-  "bin": "bin.js",
+  "bin": "bin.cjs",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dprint/dprint.git"
@@ -19,19 +19,19 @@
   "homepage": "https://github.com/dprint/dprint#readme",
   "preferUnplugged": true,
   "scripts": {
-    "postinstall": "node ./install.js"
+    "postinstall": "node ./install.cjs"
   },
   "optionalDependencies": {
-    "@dprint/win32-x64": "0.51.1",
-    "@dprint/win32-arm64": "0.51.1",
-    "@dprint/darwin-x64": "0.51.1",
-    "@dprint/darwin-arm64": "0.51.1",
-    "@dprint/linux-x64-glibc": "0.51.1",
-    "@dprint/linux-x64-musl": "0.51.1",
-    "@dprint/linux-arm64-glibc": "0.51.1",
-    "@dprint/linux-arm64-musl": "0.51.1",
-    "@dprint/linux-riscv64-glibc": "0.51.1",
-    "@dprint/linux-loong64-glibc": "0.51.1",
-    "@dprint/linux-loong64-musl": "0.51.1"
+    "@dprint/win32-x64": "0.53.0",
+    "@dprint/win32-arm64": "0.53.0",
+    "@dprint/darwin-x64": "0.53.0",
+    "@dprint/darwin-arm64": "0.53.0",
+    "@dprint/linux-x64-glibc": "0.53.0",
+    "@dprint/linux-x64-musl": "0.53.0",
+    "@dprint/linux-arm64-glibc": "0.53.0",
+    "@dprint/linux-arm64-musl": "0.53.0",
+    "@dprint/linux-riscv64-glibc": "0.53.0",
+    "@dprint/linux-loong64-glibc": "0.53.0",
+    "@dprint/linux-loong64-musl": "0.53.0"
   }
 }

package/install.js

@@ -1,4 +0,0 @@
-// @ts-check
-"use strict";
-
-require("./install_api").runInstall();