repomap-bin 2.1.0 → 2.1.1

package/index.js

@@ -1,8 +1,10 @@
 import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const localRequire = createRequire(import.meta.url);
 
 function findBinary() {
   const platform = process.platform;
@@ -13,7 +15,7 @@ function findBinary() {
   const repoBin = join(__dirname, "..", "..", "dist", binName);
   if (existsSync(repoBin)) return repoBin;
 
-  // 2. Check npm platform packages
+  // 2. Resolve platform package via Node module resolution (handles hoisted, npx, yarn, pnpm)
   const platformPackages = {
     "linux-x64": { pkg: "repomap-bin-linux-x64", bin: "repomap" },
     "darwin-arm64": { pkg: "repomap-bin-darwin-arm64", bin: "repomap" },
@@ -23,15 +25,18 @@ function findBinary() {
   const key = `${platform}-${arch}`;
   const info = platformPackages[key];
   if (info) {
-    const candidate = join(__dirname, "node_modules", info.pkg, info.bin);
-    if (existsSync(candidate)) return candidate;
+    try {
+      const pkgJson = localRequire.resolve(`${info.pkg}/package.json`);
+      const candidate = join(dirname(pkgJson), info.bin);
+      if (existsSync(candidate)) return candidate;
+    } catch { /* not resolvable */ }
+
+    // Non-hoisted: inside repomap-bin's own node_modules
+    const nested = join(__dirname, "node_modules", info.pkg, info.bin);
+    if (existsSync(nested)) return nested;
   }
 
-  // 3. Vendor fallback
-  const fallback = join(__dirname, "vendor", binName);
-  if (existsSync(fallback)) return fallback;
-
-  // 4. PATH fallback
+  // 3. PATH fallback
   return binName;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repomap-bin",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Standalone repomap binary \u2014 tree-sitter AST code intelligence CLI",
   "type": "module",
   "bin": {
@@ -11,9 +11,9 @@
     "index.js"
   ],
   "optionalDependencies": {
-    "repomap-bin-linux-x64": "2.1.0",
-    "repomap-bin-darwin-arm64": "2.1.0",
-    "repomap-bin-windows-x64": "2.1.0"
+    "repomap-bin-linux-x64": "2.1.1",
+    "repomap-bin-darwin-arm64": "2.1.1",
+    "repomap-bin-windows-x64": "2.1.1"
   },
   "engines": {
     "node": ">=18"

package/run.js

@@ -1,9 +1,11 @@
 import { execFileSync } from "node:child_process";
+import { createRequire } from "node:module";
 import { existsSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const localRequire = createRequire(import.meta.url);
 
 function findBinary() {
   const platform = process.platform;
@@ -14,7 +16,7 @@ function findBinary() {
   const repoBin = join(__dirname, "..", "..", "dist", binName);
   if (existsSync(repoBin)) return repoBin;
 
-  // 2. Check npm platform packages
+  // 2. Resolve platform package via Node module resolution (handles hoisted, npx, yarn, pnpm)
   const platformPackages = {
     "linux-x64": { pkg: "repomap-bin-linux-x64", bin: "repomap" },
     "darwin-arm64": { pkg: "repomap-bin-darwin-arm64", bin: "repomap" },
@@ -24,15 +26,18 @@ function findBinary() {
   const key = `${platform}-${arch}`;
   const info = platformPackages[key];
   if (info) {
-    const candidate = join(__dirname, "node_modules", info.pkg, info.bin);
-    if (existsSync(candidate)) return candidate;
+    try {
+      const pkgJson = localRequire.resolve(`${info.pkg}/package.json`);
+      const candidate = join(dirname(pkgJson), info.bin);
+      if (existsSync(candidate)) return candidate;
+    } catch { /* not resolvable */ }
+
+    // Non-hoisted: inside repomap-bin's own node_modules
+    const nested = join(__dirname, "node_modules", info.pkg, info.bin);
+    if (existsSync(nested)) return nested;
   }
 
-  // 3. Vendor fallback
-  const fallback = join(__dirname, "vendor", binName);
-  if (existsSync(fallback)) return fallback;
-
-  // 4. PATH fallback
+  // 3. PATH fallback
   return binName;
 }
 
@@ -41,8 +46,7 @@ const binaryPath = findBinary();
 if (!binaryPath) {
   console.error(
     "repomap binary not found for this platform.\n" +
-    "Try: npm install repomap-bin\n" +
-    "Or:  pip install repomap-cli"
+    "Try: npm install repomap-bin"
   );
   process.exit(1);
 }