node-version-use 2.4.1 → 2.4.3

package/dist/esm/lib/resolveSystemBinary.js

@@ -0,0 +1,78 @@
+/**
+ * Resolve system binaries by searching PATH while excluding ~/.nvu/bin
+ * This mirrors the Go binary's findSystemBinary() function
+ */ import fs from 'fs';
+import path from 'path';
+import { homedir } from '../compat.js';
+const isWindows = process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE);
+const nvuBinDir = path.join(homedir(), '.nvu', 'bin');
+/**
+ * Check if two paths are equal (case-insensitive on Windows)
+ */ function pathsEqual(a, b) {
+    if (isWindows) {
+        return a.toLowerCase() === b.toLowerCase();
+    }
+    return a === b;
+}
+/**
+ * Check if a path is within the nvu bin directory
+ */ function isInNvuBin(filePath) {
+    try {
+        const realPath = fs.realpathSync(filePath);
+        return realPath.indexOf(path.join('.nvu', 'bin')) >= 0 || pathsEqual(path.dirname(realPath), nvuBinDir);
+    } catch (_e) {
+        return false;
+    }
+}
+/**
+ * Find a system binary by searching PATH, excluding ~/.nvu/bin
+ * Returns the full path to the binary, or null if not found
+ */ export function resolveSystemBinary(name) {
+    const pathEnv = process.env.PATH || '';
+    const pathSep = isWindows ? ';' : ':';
+    const dirs = pathEnv.split(pathSep);
+    for(let i = 0; i < dirs.length; i++){
+        const dir = dirs[i];
+        if (!dir) continue;
+        // Skip ~/.nvu/bin
+        if (pathsEqual(dir, nvuBinDir)) continue;
+        // Build candidate path with appropriate extension
+        const candidates = isWindows ? [
+            path.join(dir, `${name}.exe`),
+            path.join(dir, `${name}.cmd`),
+            path.join(dir, name)
+        ] : [
+            path.join(dir, name)
+        ];
+        for(let j = 0; j < candidates.length; j++){
+            const candidate = candidates[j];
+            try {
+                const stat = fs.statSync(candidate);
+                if (!stat.isFile()) continue;
+                // Make sure it's not in ~/.nvu/bin (via symlink)
+                if (isInNvuBin(candidate)) continue;
+                return candidate;
+            } catch (_e) {
+            // File doesn't exist, continue
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Get PATH with ~/.nvu/bin removed
+ * Used to create an environment for spawning system commands
+ */ export function getPathWithoutNvuBin() {
+    const pathEnv = process.env.PATH || '';
+    const pathSep = isWindows ? ';' : ':';
+    const dirs = pathEnv.split(pathSep);
+    const filtered = [];
+    for(let i = 0; i < dirs.length; i++){
+        const dir = dirs[i];
+        if (!dir) continue;
+        if (pathsEqual(dir, nvuBinDir)) continue;
+        if (dir.indexOf(path.join('.nvu', 'bin')) >= 0) continue;
+        filtered.push(dir);
+    }
+    return filtered.join(pathSep);
+}

package/dist/esm/lib/resolveSystemBinary.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/node-version-use/src/lib/resolveSystemBinary.ts"],"sourcesContent":["/**\n * Resolve system binaries by searching PATH while excluding ~/.nvu/bin\n * This mirrors the Go binary's findSystemBinary() function\n */\nimport fs from 'fs';\nimport path from 'path';\nimport { homedir } from '../compat.ts';\n\nconst isWindows = process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE);\nconst nvuBinDir = path.join(homedir(), '.nvu', 'bin');\n\n/**\n * Check if two paths are equal (case-insensitive on Windows)\n */\nfunction pathsEqual(a: string, b: string): boolean {\n  if (isWindows) {\n    return a.toLowerCase() === b.toLowerCase();\n  }\n  return a === b;\n}\n\n/**\n * Check if a path is within the nvu bin directory\n */\nfunction isInNvuBin(filePath: string): boolean {\n  try {\n    const realPath = fs.realpathSync(filePath);\n    return realPath.indexOf(path.join('.nvu', 'bin')) >= 0 || pathsEqual(path.dirname(realPath), nvuBinDir);\n  } catch (_e) {\n    return false;\n  }\n}\n\n/**\n * Find a system binary by searching PATH, excluding ~/.nvu/bin\n * Returns the full path to the binary, or null if not found\n */\nexport function resolveSystemBinary(name: string): string | null {\n  const pathEnv = process.env.PATH || '';\n  const pathSep = isWindows ? ';' : ':';\n  const dirs = pathEnv.split(pathSep);\n\n  for (let i = 0; i < dirs.length; i++) {\n    const dir = dirs[i];\n    if (!dir) continue;\n\n    // Skip ~/.nvu/bin\n    if (pathsEqual(dir, nvuBinDir)) continue;\n\n    // Build candidate path with appropriate extension\n    const candidates = isWindows ? [path.join(dir, `${name}.exe`), path.join(dir, `${name}.cmd`), path.join(dir, name)] : [path.join(dir, name)];\n\n    for (let j = 0; j < candidates.length; j++) {\n      const candidate = candidates[j];\n      try {\n        const stat = fs.statSync(candidate);\n        if (!stat.isFile()) continue;\n\n        // Make sure it's not in ~/.nvu/bin (via symlink)\n        if (isInNvuBin(candidate)) continue;\n\n        return candidate;\n      } catch (_e) {\n        // File doesn't exist, continue\n      }\n    }\n  }\n\n  return null;\n}\n\n/**\n * Get PATH with ~/.nvu/bin removed\n * Used to create an environment for spawning system commands\n */\nexport function getPathWithoutNvuBin(): string {\n  const pathEnv = process.env.PATH || '';\n  const pathSep = isWindows ? ';' : ':';\n  const dirs = pathEnv.split(pathSep);\n\n  const filtered: string[] = [];\n  for (let i = 0; i < dirs.length; i++) {\n    const dir = dirs[i];\n    if (!dir) continue;\n    if (pathsEqual(dir, nvuBinDir)) continue;\n    if (dir.indexOf(path.join('.nvu', 'bin')) >= 0) continue;\n    filtered.push(dir);\n  }\n\n  return filtered.join(pathSep);\n}\n"],"names":["fs","path","homedir","isWindows","process","platform","test","env","OSTYPE","nvuBinDir","join","pathsEqual","a","b","toLowerCase","isInNvuBin","filePath","realPath","realpathSync","indexOf","dirname","_e","resolveSystemBinary","name","pathEnv","PATH","pathSep","dirs","split","i","length","dir","candidates","j","candidate","stat","statSync","isFile","getPathWithoutNvuBin","filtered","push"],"mappings":"AAAA;;;CAGC,GACD,OAAOA,QAAQ,KAAK;AACpB,OAAOC,UAAU,OAAO;AACxB,SAASC,OAAO,QAAQ,eAAe;AAEvC,MAAMC,YAAYC,QAAQC,QAAQ,KAAK,WAAW,kBAAkBC,IAAI,CAACF,QAAQG,GAAG,CAACC,MAAM;AAC3F,MAAMC,YAAYR,KAAKS,IAAI,CAACR,WAAW,QAAQ;AAE/C;;CAEC,GACD,SAASS,WAAWC,CAAS,EAAEC,CAAS;IACtC,IAAIV,WAAW;QACb,OAAOS,EAAEE,WAAW,OAAOD,EAAEC,WAAW;IAC1C;IACA,OAAOF,MAAMC;AACf;AAEA;;CAEC,GACD,SAASE,WAAWC,QAAgB;IAClC,IAAI;QACF,MAAMC,WAAWjB,GAAGkB,YAAY,CAACF;QACjC,OAAOC,SAASE,OAAO,CAAClB,KAAKS,IAAI,CAAC,QAAQ,WAAW,KAAKC,WAAWV,KAAKmB,OAAO,CAACH,WAAWR;IAC/F,EAAE,OAAOY,IAAI;QACX,OAAO;IACT;AACF;AAEA;;;CAGC,GACD,OAAO,SAASC,oBAAoBC,IAAY;IAC9C,MAAMC,UAAUpB,QAAQG,GAAG,CAACkB,IAAI,IAAI;IACpC,MAAMC,UAAUvB,YAAY,MAAM;IAClC,MAAMwB,OAAOH,QAAQI,KAAK,CAACF;IAE3B,IAAK,IAAIG,IAAI,GAAGA,IAAIF,KAAKG,MAAM,EAAED,IAAK;QACpC,MAAME,MAAMJ,IAAI,CAACE,EAAE;QACnB,IAAI,CAACE,KAAK;QAEV,kBAAkB;QAClB,IAAIpB,WAAWoB,KAAKtB,YAAY;QAEhC,kDAAkD;QAClD,MAAMuB,aAAa7B,YAAY;YAACF,KAAKS,IAAI,CAACqB,KAAK,GAAGR,KAAK,IAAI,CAAC;YAAGtB,KAAKS,IAAI,CAACqB,KAAK,GAAGR,KAAK,IAAI,CAAC;YAAGtB,KAAKS,IAAI,CAACqB,KAAKR;SAAM,GAAG;YAACtB,KAAKS,IAAI,CAACqB,KAAKR;SAAM;QAE5I,IAAK,IAAIU,IAAI,GAAGA,IAAID,WAAWF,MAAM,EAAEG,IAAK;YAC1C,MAAMC,YAAYF,UAAU,CAACC,EAAE;YAC/B,IAAI;gBACF,MAAME,OAAOnC,GAAGoC,QAAQ,CAACF;gBACzB,IAAI,CAACC,KAAKE,MAAM,IAAI;gBAEpB,iDAAiD;gBACjD,IAAItB,WAAWmB,YAAY;gBAE3B,OAAOA;YACT,EAAE,OAAOb,IAAI;YACX,+BAA+B;YACjC;QACF;IACF;IAEA,OAAO;AACT;AAEA;;;CAGC,GACD,OAAO,SAASiB;IACd,MAAMd,UAAUpB,QAAQG,GAAG,CAACkB,IAAI,IAAI;IACpC,MAAMC,UAAUvB,YAAY,MAAM;IAClC,MAAMwB,OAAOH,QAAQI,KAAK,CAACF;IAE3B,MAAMa,WAAqB,EAAE;IAC7B,IAAK,IAAIV,IAAI,GAAGA,IAAIF,KAAKG,MAAM,EAAED,IAAK;QACpC,MAAME,MAAMJ,IAAI,CAACE,EAAE;QACnB,IAAI,CAACE,KAAK;QACV,IAAIpB,WAAWoB,KAAKtB,YAAY;QAChC,IAAIsB,IAAIZ,OAAO,CAAClB,KAAKS,IAAI,CAAC,QAAQ,WAAW,GAAG;QAChD6B,SAASC,IAAI,CAACT;IAChB;IAEA,OAAOQ,SAAS7B,IAAI,CAACgB;AACvB"}

package/dist/esm/worker.js

@@ -7,9 +7,10 @@ import Queue from 'queue-cb';
 import resolveBin from 'resolve-bin-sync';
 import spawnStreaming from 'spawn-streaming';
 import { createSession, formatArguments } from 'spawn-term';
-import { stringEndsWith } from './compat.js';
+import { objectAssign, stringEndsWith } from './compat.js';
 import { storagePath } from './constants.js';
 import loadNodeVersionInstall from './lib/loadNodeVersionInstall.js';
+import { getPathWithoutNvuBin, resolveSystemBinary } from './lib/resolveSystemBinary.js';
 const isWindows = process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE);
 const NODE = isWindows ? 'node.exe' : 'node';
 // Parse npm-generated .cmd wrapper to extract the JS script path
@@ -43,9 +44,8 @@ function resolveCommand(command, args) {
             return {
                 command: NODE,
                 args: [
-                    scriptPath,
-                    ...args
-                ]
+                    scriptPath
+                ].concat(args)
             };
         }
     }
@@ -55,9 +55,8 @@ function resolveCommand(command, args) {
         return {
             command: NODE,
             args: [
-                binPath,
-                ...args
-            ]
+                binPath
+            ].concat(args)
         };
     } catch (_e) {
     // Not an npm package bin, use original command
@@ -68,6 +67,11 @@ function resolveCommand(command, args) {
     };
 }
 export default function worker(versionExpression, command, args, options, callback) {
+    // Handle "system" as a special version that uses system binaries directly
+    if (versionExpression === 'system') {
+        runWithSystemBinaries(command, args, options, callback);
+        return;
+    }
     // Load node-version-install lazily
     loadNodeVersionInstall((loadErr, installVersion)=>{
         if (loadErr) return callback(loadErr);
@@ -77,10 +81,9 @@ export default function worker(versionExpression, command, args, options, callba
                 callback(new Error(`No versions found from expression: ${versionExpression}`));
                 return;
             }
-            const installOptions = {
-                storagePath,
-                ...options
-            };
+            const installOptions = objectAssign({
+                storagePath: storagePath
+            }, options);
             const streamingOptions = options;
             const results = [];
             const queue = new Queue(1);
@@ -153,3 +156,47 @@ export default function worker(versionExpression, command, args, options, callba
         });
     });
 }
+/**
+ * Run command using system binaries (bypassing nvu version management)
+ * This handles the "system" version specifier
+ */ function runWithSystemBinaries(command, args, options, callback) {
+    // Find the system binary for the command
+    const systemBinary = resolveSystemBinary(command);
+    if (!systemBinary) {
+        callback(new Error(`System ${command} not found in PATH`));
+        return;
+    }
+    // Create spawn options with PATH excluding ~/.nvu/bin
+    // This ensures any child processes also use system binaries
+    const cleanPath = getPathWithoutNvuBin();
+    const spawnOptions = objectAssign({}, options);
+    spawnOptions.env = objectAssign({}, process.env);
+    spawnOptions.env.PATH = cleanPath;
+    spawnOptions.stdio = options.stdio || 'inherit';
+    // On Windows, resolve npm bin commands to bypass .cmd wrappers
+    const resolved = resolveCommand(command, args);
+    // For system, use the resolved system binary path
+    const finalCommand = resolved.command === command ? systemBinary : resolved.command;
+    const finalArgs = resolved.command === command ? args : resolved.args;
+    if (!options.silent) {
+        console.log(`$ ${formatArguments([
+            finalCommand
+        ].concat(finalArgs)).join(' ')}`);
+    }
+    spawn(finalCommand, finalArgs, spawnOptions, (err, res)=>{
+        if (err && err.message && err.message.indexOf('ExperimentalWarning') >= 0) {
+            res = err;
+            err = null;
+        }
+        const result = {
+            install: null,
+            command,
+            version: 'system',
+            error: err,
+            result: res
+        };
+        callback(err, [
+            result
+        ]);
+    });
+}

package/dist/esm/worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/node-version-use/src/worker.ts"],"sourcesContent":["import spawn, { type SpawnOptions } from 'cross-spawn-cb';\nimport fs from 'fs';\nimport resolveVersions, { type VersionOptions } from 'node-resolve-versions';\nimport type { InstallOptions } from 'node-version-install';\nimport { spawnOptions as createSpawnOptions } from 'node-version-utils';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport resolveBin from 'resolve-bin-sync';\nimport spawnStreaming from 'spawn-streaming';\nimport { createSession, formatArguments } from 'spawn-term';\nimport { stringEndsWith } from './compat.ts';\nimport { storagePath } from './constants.ts';\nimport loadNodeVersionInstall from './lib/loadNodeVersionInstall.ts';\n\nimport type { Options, UseCallback, UseOptions, UseResult } from './types.ts';\n\nconst isWindows = process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE);\nconst NODE = isWindows ? 'node.exe' : 'node';\n\n// Parse npm-generated .cmd wrapper to extract the JS script path\nfunction parseNpmCmdWrapper(cmdPath: string): string | null {\n  try {\n    const content = fs.readFileSync(cmdPath, 'utf8');\n    // Match: \"%_prog%\"  \"%dp0%\\node_modules\\...\\cli.js\" %*\n    // or: \"%_prog%\"  \"%dp0%\\path\\to\\script.js\" %*\n    const match = content.match(/\"%_prog%\"\\s+\"?%dp0%\\\\([^\"]+)\"?\\s+%\\*/);\n    if (match) {\n      const relativePath = match[1];\n      const cmdDir = path.dirname(cmdPath);\n      return path.join(cmdDir, relativePath);\n    }\n  } catch (_e) {\n    // ignore\n  }\n  return null;\n}\n\n// On Windows, resolve npm bin commands to their JS entry points to bypass .cmd wrappers\n// This fixes issues with nvm-windows where .cmd wrappers use symlinked node.exe directly\nfunction resolveCommand(command: string, args: string[]): { command: string; args: string[] } {\n  if (!isWindows) return { command, args };\n\n  // Case 1: Command is a .cmd file path\n  if (stringEndsWith(command.toLowerCase(), '.cmd')) {\n    const scriptPath = parseNpmCmdWrapper(command);\n    if (scriptPath) {\n      return { command: NODE, args: [scriptPath, ...args] };\n    }\n  }\n\n  // Case 2: Try to resolve the command as an npm package bin from node_modules\n  try {\n    const binPath = resolveBin(command);\n    return { command: NODE, args: [binPath, ...args] };\n  } catch (_e) {\n    // Not an npm package bin, use original command\n  }\n\n  return { command, args };\n}\n\nexport default function worker(versionExpression: string, command: string, args: string[], options: UseOptions, callback: UseCallback): void {\n  // Load node-version-install lazily\n  loadNodeVersionInstall((loadErr, installVersion) => {\n    if (loadErr) return callback(loadErr);\n\n    resolveVersions(versionExpression, options as VersionOptions, (err?: Error, versions?: string[]) => {\n      if (err) return callback(err);\n      if (!versions.length) {\n        callback(new Error(`No versions found from expression: ${versionExpression}`));\n        return;\n      }\n\n      const installOptions = { storagePath, ...options } as InstallOptions;\n      const streamingOptions = options as Options;\n      const results: UseResult[] = [];\n      const queue = new Queue(1);\n\n      // Create session once for all processes (only if multiple versions)\n      const interactive = options.interactive !== false;\n      const session = versions.length >= 2 && createSession && !streamingOptions.streaming ? createSession({ header: `${command} ${args.join(' ')}`, showStatusBar: true, interactive }) : null;\n\n      versions.forEach((version: string) => {\n        queue.defer((cb) => {\n          installVersion(version, installOptions, (err, installs) => {\n            const install = installs && installs.length === 1 ? installs[0] : null;\n            if (err || !install) {\n              const error = err || new Error(`Unexpected version results for version ${version}. Install ${JSON.stringify(installs)}`);\n              results.push({ install, command, version, error, result: null });\n              return cb();\n            }\n            const spawnOptions = createSpawnOptions(install.installPath, options as SpawnOptions);\n            const prefix = install.version;\n\n            function next(err?, res?): void {\n              if (err && err.message.indexOf('ExperimentalWarning') >= 0) {\n                res = err;\n                err = null;\n              }\n              results.push({ install, command, version, error: err, result: res });\n              cb();\n            }\n\n            // On Windows, resolve npm bin commands to bypass .cmd wrappers\n            const resolved = resolveCommand(command, args);\n\n            if (versions.length < 2) {\n              // Show command when running single version (no terminal session, unless silent)\n              if (!options.silent) console.log(`$ ${formatArguments([resolved.command].concat(resolved.args)).join(' ')}`);\n              return spawn(resolved.command, resolved.args, spawnOptions, next);\n            }\n            if (session) session.spawn(resolved.command, resolved.args, spawnOptions, { group: prefix, expanded: streamingOptions.expanded }, next);\n            else spawnStreaming(resolved.command, resolved.args, spawnOptions, { prefix }, next);\n          });\n        });\n      });\n      queue.await((err) => {\n        if (session) {\n          session.waitAndClose(() => {\n            err ? callback(err) : callback(null, results);\n          });\n        } else {\n          err ? callback(err) : callback(null, results);\n        }\n      });\n    });\n  });\n}\n"],"names":["spawn","fs","resolveVersions","spawnOptions","createSpawnOptions","path","Queue","resolveBin","spawnStreaming","createSession","formatArguments","stringEndsWith","storagePath","loadNodeVersionInstall","isWindows","process","platform","test","env","OSTYPE","NODE","parseNpmCmdWrapper","cmdPath","content","readFileSync","match","relativePath","cmdDir","dirname","join","_e","resolveCommand","command","args","toLowerCase","scriptPath","binPath","worker","versionExpression","options","callback","loadErr","installVersion","err","versions","length","Error","installOptions","streamingOptions","results","queue","interactive","session","streaming","header","showStatusBar","forEach","version","defer","cb","installs","install","error","JSON","stringify","push","result","installPath","prefix","next","res","message","indexOf","resolved","silent","console","log","concat","group","expanded","await","waitAndClose"],"mappings":"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"}
+{"version":3,"sources":["/Users/kevin/Dev/OpenSource/node-version/node-version-use/src/worker.ts"],"sourcesContent":["import spawn, { type SpawnOptions } from 'cross-spawn-cb';\nimport fs from 'fs';\nimport resolveVersions, { type VersionOptions } from 'node-resolve-versions';\nimport type { InstallOptions } from 'node-version-install';\nimport { spawnOptions as createSpawnOptions } from 'node-version-utils';\nimport path from 'path';\nimport Queue from 'queue-cb';\nimport resolveBin from 'resolve-bin-sync';\nimport spawnStreaming from 'spawn-streaming';\nimport { createSession, formatArguments } from 'spawn-term';\nimport { objectAssign, stringEndsWith } from './compat.ts';\nimport { storagePath } from './constants.ts';\nimport loadNodeVersionInstall from './lib/loadNodeVersionInstall.ts';\nimport { getPathWithoutNvuBin, resolveSystemBinary } from './lib/resolveSystemBinary.ts';\n\nimport type { Options, UseCallback, UseOptions, UseResult } from './types.ts';\n\nconst isWindows = process.platform === 'win32' || /^(msys|cygwin)$/.test(process.env.OSTYPE);\nconst NODE = isWindows ? 'node.exe' : 'node';\n\n// Parse npm-generated .cmd wrapper to extract the JS script path\nfunction parseNpmCmdWrapper(cmdPath: string): string | null {\n  try {\n    const content = fs.readFileSync(cmdPath, 'utf8');\n    // Match: \"%_prog%\"  \"%dp0%\\node_modules\\...\\cli.js\" %*\n    // or: \"%_prog%\"  \"%dp0%\\path\\to\\script.js\" %*\n    const match = content.match(/\"%_prog%\"\\s+\"?%dp0%\\\\([^\"]+)\"?\\s+%\\*/);\n    if (match) {\n      const relativePath = match[1];\n      const cmdDir = path.dirname(cmdPath);\n      return path.join(cmdDir, relativePath);\n    }\n  } catch (_e) {\n    // ignore\n  }\n  return null;\n}\n\n// On Windows, resolve npm bin commands to their JS entry points to bypass .cmd wrappers\n// This fixes issues with nvm-windows where .cmd wrappers use symlinked node.exe directly\nfunction resolveCommand(command: string, args: string[]): { command: string; args: string[] } {\n  if (!isWindows) return { command, args };\n\n  // Case 1: Command is a .cmd file path\n  if (stringEndsWith(command.toLowerCase(), '.cmd')) {\n    const scriptPath = parseNpmCmdWrapper(command);\n    if (scriptPath) {\n      return { command: NODE, args: [scriptPath].concat(args) };\n    }\n  }\n\n  // Case 2: Try to resolve the command as an npm package bin from node_modules\n  try {\n    const binPath = resolveBin(command);\n    return { command: NODE, args: [binPath].concat(args) };\n  } catch (_e) {\n    // Not an npm package bin, use original command\n  }\n\n  return { command, args };\n}\n\nexport default function worker(versionExpression: string, command: string, args: string[], options: UseOptions, callback: UseCallback): void {\n  // Handle \"system\" as a special version that uses system binaries directly\n  if (versionExpression === 'system') {\n    runWithSystemBinaries(command, args, options, callback);\n    return;\n  }\n\n  // Load node-version-install lazily\n  loadNodeVersionInstall((loadErr, installVersion) => {\n    if (loadErr) return callback(loadErr);\n\n    resolveVersions(versionExpression, options as VersionOptions, (err?: Error, versions?: string[]) => {\n      if (err) return callback(err);\n      if (!versions.length) {\n        callback(new Error(`No versions found from expression: ${versionExpression}`));\n        return;\n      }\n\n      const installOptions = objectAssign({ storagePath: storagePath }, options) as InstallOptions;\n      const streamingOptions = options as Options;\n      const results: UseResult[] = [];\n      const queue = new Queue(1);\n\n      // Create session once for all processes (only if multiple versions)\n      const interactive = options.interactive !== false;\n      const session = versions.length >= 2 && createSession && !streamingOptions.streaming ? createSession({ header: `${command} ${args.join(' ')}`, showStatusBar: true, interactive }) : null;\n\n      versions.forEach((version: string) => {\n        queue.defer((cb) => {\n          installVersion(version, installOptions, (err, installs) => {\n            const install = installs && installs.length === 1 ? installs[0] : null;\n            if (err || !install) {\n              const error = err || new Error(`Unexpected version results for version ${version}. Install ${JSON.stringify(installs)}`);\n              results.push({ install, command, version, error, result: null });\n              return cb();\n            }\n            const spawnOptions = createSpawnOptions(install.installPath, options as SpawnOptions);\n            const prefix = install.version;\n\n            function next(err?, res?): void {\n              if (err && err.message.indexOf('ExperimentalWarning') >= 0) {\n                res = err;\n                err = null;\n              }\n              results.push({ install, command, version, error: err, result: res });\n              cb();\n            }\n\n            // On Windows, resolve npm bin commands to bypass .cmd wrappers\n            const resolved = resolveCommand(command, args);\n\n            if (versions.length < 2) {\n              // Show command when running single version (no terminal session, unless silent)\n              if (!options.silent) console.log(`$ ${formatArguments([resolved.command].concat(resolved.args)).join(' ')}`);\n              return spawn(resolved.command, resolved.args, spawnOptions, next);\n            }\n            if (session) session.spawn(resolved.command, resolved.args, spawnOptions, { group: prefix, expanded: streamingOptions.expanded }, next);\n            else spawnStreaming(resolved.command, resolved.args, spawnOptions, { prefix }, next);\n          });\n        });\n      });\n      queue.await((err) => {\n        if (session) {\n          session.waitAndClose(() => {\n            err ? callback(err) : callback(null, results);\n          });\n        } else {\n          err ? callback(err) : callback(null, results);\n        }\n      });\n    });\n  });\n}\n\n/**\n * Run command using system binaries (bypassing nvu version management)\n * This handles the \"system\" version specifier\n */\nfunction runWithSystemBinaries(command: string, args: string[], options: UseOptions, callback: UseCallback): void {\n  // Find the system binary for the command\n  const systemBinary = resolveSystemBinary(command);\n  if (!systemBinary) {\n    callback(new Error(`System ${command} not found in PATH`));\n    return;\n  }\n\n  // Create spawn options with PATH excluding ~/.nvu/bin\n  // This ensures any child processes also use system binaries\n  const cleanPath = getPathWithoutNvuBin();\n  const spawnOptions: SpawnOptions = objectAssign({}, options as SpawnOptions);\n  spawnOptions.env = objectAssign({}, process.env);\n  spawnOptions.env.PATH = cleanPath;\n  spawnOptions.stdio = options.stdio || 'inherit';\n\n  // On Windows, resolve npm bin commands to bypass .cmd wrappers\n  const resolved = resolveCommand(command, args);\n\n  // For system, use the resolved system binary path\n  const finalCommand = resolved.command === command ? systemBinary : resolved.command;\n  const finalArgs = resolved.command === command ? args : resolved.args;\n\n  if (!options.silent) {\n    console.log(`$ ${formatArguments([finalCommand].concat(finalArgs)).join(' ')}`);\n  }\n\n  spawn(finalCommand, finalArgs, spawnOptions, (err?, res?) => {\n    if (err && err.message && err.message.indexOf('ExperimentalWarning') >= 0) {\n      res = err;\n      err = null;\n    }\n\n    const result: UseResult = {\n      install: null,\n      command,\n      version: 'system',\n      error: err,\n      result: res,\n    };\n\n    callback(err, [result]);\n  });\n}\n"],"names":["spawn","fs","resolveVersions","spawnOptions","createSpawnOptions","path","Queue","resolveBin","spawnStreaming","createSession","formatArguments","objectAssign","stringEndsWith","storagePath","loadNodeVersionInstall","getPathWithoutNvuBin","resolveSystemBinary","isWindows","process","platform","test","env","OSTYPE","NODE","parseNpmCmdWrapper","cmdPath","content","readFileSync","match","relativePath","cmdDir","dirname","join","_e","resolveCommand","command","args","toLowerCase","scriptPath","concat","binPath","worker","versionExpression","options","callback","runWithSystemBinaries","loadErr","installVersion","err","versions","length","Error","installOptions","streamingOptions","results","queue","interactive","session","streaming","header","showStatusBar","forEach","version","defer","cb","installs","install","error","JSON","stringify","push","result","installPath","prefix","next","res","message","indexOf","resolved","silent","console","log","group","expanded","await","waitAndClose","systemBinary","cleanPath","PATH","stdio","finalCommand","finalArgs"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-version-use",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "Cross-platform solution for using multiple versions of node. Useful for compatibility testing",
   "keywords": [
     "node",
@@ -48,8 +48,8 @@
     "version": "tsds version"
   },
   "dependencies": {
+    "cpu-arch": "^1.1.1",
     "cross-spawn-cb": "^3.0.0",
-    "env-path-key": "^1.0.0",
     "exit-compat": "^1.0.0",
     "fs-remove-compat": "^1.0.0",
     "get-file-compat": "^2.0.0",
@@ -72,6 +72,7 @@
     "@types/mocha": "*",
     "@types/node": "*",
     "cr": "^0.1.0",
+    "env-path-key": "^1.1.8",
     "fs-copy-compat": "^1.0.0",
     "fs-remove-compat": "^1.0.0",
     "is-version": "^1.0.9",