@mearl/setup 2.2.2 → 2.3.0

package/dist/aliSkills.js

@@ -2,33 +2,13 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { spawn } from 'node:child_process';
-import { executableNames, findExecutable, isExecutable, prependCommandPath, prependNodePath, resolveSpawnCommand, runCommand, } from './process.js';
+import { executableNames, findExecutable, isExecutable, prependCommandPath, prependNodePath, resolveSpawnCommand, runCommand, versionManagerExecutableCandidates, } from './process.js';
 const COMMAND_TIMEOUT_MS = 120_000;
 const MAX_OUTPUT_LENGTH = 1_000_000;
 const ANSI_ESCAPE_PATTERN = new RegExp(String.raw `\u001B\[[0-?]*[ -/]*[@-~]`, 'g');
 function existingExecutable(candidates, existsSync) {
     return candidates.find(candidate => candidate && existsSync(candidate)) ?? null;
 }
-function versionManagerCandidates(home, executableNames, readdirSync) {
-    const roots = [
-        path.join(home, '.nvm', 'versions', 'node'),
-        path.join(home, '.fnm', 'node-versions'),
-    ];
-    return roots.flatMap(root => {
-        try {
-            return readdirSync(root, { withFileTypes: true })
-                .filter(entry => entry.isDirectory())
-                .sort((left, right) => right.name.localeCompare(left.name, undefined, { numeric: true }))
-                .flatMap(entry => executableNames.flatMap(name => [
-                path.join(root, entry.name, 'bin', name),
-                path.join(root, entry.name, 'installation', 'bin', name),
-            ]));
-        }
-        catch {
-            return [];
-        }
-    });
-}
 export function stripAnsi(value) {
     return value.replace(ANSI_ESCAPE_PATTERN, '');
 }
@@ -53,7 +33,11 @@ export function resolveAliSkillsExecutable(options = {}) {
         ...names.map(name => path.join(home, '.volta', 'bin', name)),
         ...names.map(name => path.join(home, '.local', 'share', 'pnpm', name)),
         ...names.map(name => path.join(home, 'Library', 'pnpm', name)),
-        ...versionManagerCandidates(home, names, readdirSync),
+        ...versionManagerExecutableCandidates(home, names, {
+            env,
+            platform,
+            readdirSync,
+        }),
         ...(platform === 'win32'
             ? []
             : ['/opt/homebrew/bin/ali-skills', '/usr/local/bin/ali-skills', '/usr/bin/ali-skills']),

package/dist/process.d.ts

@@ -1,3 +1,4 @@
+import fs from 'node:fs';
 export interface SpawnCommand {
     command: string;
     args: string[];
@@ -16,6 +17,12 @@ export interface RunCommandOptions {
 export type CommandRunner = (command: string, args: string[], options?: RunCommandOptions) => Promise<CommandResult>;
 export declare function isExecutable(filePath: string, platform?: NodeJS.Platform): boolean;
 export declare function executableNames(name: string, platform?: NodeJS.Platform): string[];
+export interface VersionManagerExecutableCandidateOptions {
+    env?: NodeJS.ProcessEnv;
+    platform?: NodeJS.Platform;
+    readdirSync?: typeof fs.readdirSync;
+}
+export declare function versionManagerExecutableCandidates(home: string, names: string[], options?: VersionManagerExecutableCandidateOptions): string[];
 export declare function resolveSpawnCommand(executable: string, args: string[], platform?: NodeJS.Platform, commandInterpreter?: string | undefined): SpawnCommand;
 export declare function prependCommandPath(command: string, env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 export declare function prependNodePath(env?: NodeJS.ProcessEnv, nodeExecutable?: string): NodeJS.ProcessEnv;

package/dist/process.js

@@ -14,6 +14,37 @@ export function isExecutable(filePath, platform = process.platform) {
 export function executableNames(name, platform = process.platform) {
     return platform === 'win32' ? [`${name}.cmd`, `${name}.exe`, name] : [name];
 }
+export function versionManagerExecutableCandidates(home, names, options = {}) {
+    const env = options.env ?? process.env;
+    const platform = options.platform ?? process.platform;
+    const readdirSync = options.readdirSync ?? fs.readdirSync;
+    const fnmDefaultRoot = env.XDG_DATA_HOME
+        ? path.join(env.XDG_DATA_HOME, 'fnm')
+        : platform === 'darwin'
+            ? path.join(home, 'Library', 'Application Support', 'fnm')
+            : platform === 'win32' && env.APPDATA
+                ? path.join(env.APPDATA, 'fnm')
+                : path.join(home, '.local', 'share', 'fnm');
+    const roots = [
+        path.join(env.NVM_DIR || path.join(home, '.nvm'), 'versions', 'node'),
+        path.join(env.FNM_DIR || fnmDefaultRoot, 'node-versions'),
+        path.join(home, '.fnm', 'node-versions'),
+    ].filter((root, index, all) => all.indexOf(root) === index);
+    return roots.flatMap(root => {
+        try {
+            return readdirSync(root, { withFileTypes: true })
+                .filter(entry => entry.isDirectory())
+                .sort((left, right) => right.name.localeCompare(left.name, undefined, { numeric: true }))
+                .flatMap(entry => names.flatMap(name => [
+                path.join(root, entry.name, 'bin', name),
+                path.join(root, entry.name, 'installation', 'bin', name),
+            ]));
+        }
+        catch {
+            return [];
+        }
+    });
+}
 export function resolveSpawnCommand(executable, args, platform = process.platform, commandInterpreter = process.env.ComSpec) {
     if (platform === 'win32' && /\.(?:cmd|bat)$/i.test(executable)) {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/setup",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "description": "One-shot installer, updater, and uninstaller for Mearl environments",
   "type": "module",
   "main": "dist/index.js",