dsh-mnemon 0.1.3 → 0.1.5

package/lib/index.js

@@ -1,5 +1,5 @@
 import z from "schemastery";
-import { basename, delimiter, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { basename, delimiter, dirname, isAbsolute, join, posix, relative, resolve, sep, win32 } from "node:path";
 import { createHash, randomUUID } from "node:crypto";
 import { accessSync, closeSync, constants, existsSync, fstatSync, lstatSync, mkdirSync, mkdtempSync, openSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
@@ -2015,7 +2015,8 @@ const runProcess = (command, args, options) => new Promise((resolve, reject) =>
 			"pipe",
 			"pipe"
 		],
-		shell: false
+		shell: false,
+		windowsHide: true
 	});
 	const maxOutputBytes = options.maxOutputBytes ?? DEFAULT_MAX_OUTPUT_BYTES;
 	let stdout = "";
@@ -2078,47 +2079,70 @@ const runProcess = (command, args, options) => new Promise((resolve, reject) =>
 });
 //#endregion
 //#region lib/types/runner.js
-const COMMON_CLI_PATHS = [
+const UNIX_COMMON_CLI_PATHS = [
 	"~/.local/bin/mnemon",
 	"/opt/homebrew/bin/mnemon",
 	"/usr/local/bin/mnemon",
 	"/usr/bin/mnemon"
 ];
-function expandHome$1(path) {
-	if (path === "~") return homedir();
-	return path.startsWith("~/") ? join(homedir(), path.slice(2)) : path;
+function pathApi(platform) {
+	return platform === "win32" ? win32 : posix;
+}
+function expandHome$1(path, home = homedir(), platform = process.platform) {
+	if (path === "~") return home;
+	return path.startsWith("~/") || path.startsWith("~\\") ? pathApi(platform).join(home, path.slice(2)) : path;
+}
+function envValue(env, name, platform) {
+	if (platform !== "win32") return env[name];
+	const key = Object.keys(env).find((candidate) => candidate.toLowerCase() === name.toLowerCase());
+	return key === void 0 ? void 0 : env[key];
 }
-function executable$1(path) {
+function executable$1(path, platform = process.platform) {
+	if (platform === "win32" && win32.extname(path).toLowerCase() !== ".exe") return false;
 	try {
-		accessSync(path, constants.X_OK);
-		return true;
+		accessSync(path, platform === "win32" ? constants.F_OK : constants.X_OK);
+		return statSync(path).isFile();
 	} catch {
 		return false;
 	}
 }
+function windowsCommonCliPaths(env, home) {
+	const candidates = [];
+	const goBin = envValue(env, "GOBIN", "win32")?.trim();
+	if (goBin !== void 0 && win32.isAbsolute(goBin)) candidates.push(win32.join(goBin, "mnemon.exe"));
+	const goInstallRoot = (envValue(env, "GOPATH", "win32")?.trim())?.split(win32.delimiter).map((candidate) => candidate.trim()).find((candidate) => candidate !== "" && win32.isAbsolute(candidate)) ?? win32.join(home, "go");
+	candidates.push(win32.join(goInstallRoot, "bin", "mnemon.exe"));
+	const localAppData = envValue(env, "LOCALAPPDATA", "win32")?.trim();
+	if (localAppData !== void 0 && win32.isAbsolute(localAppData)) candidates.push(win32.join(localAppData, "Programs", "mnemon", "mnemon.exe"));
+	const programFiles = envValue(env, "ProgramFiles", "win32")?.trim();
+	if (programFiles !== void 0 && win32.isAbsolute(programFiles)) candidates.push(win32.join(programFiles, "mnemon", "mnemon.exe"));
+	return [...new Set(candidates)];
+}
+function commonCliPaths(platform, env, home) {
+	if (platform === "win32") return windowsCommonCliPaths(env, home);
+	return UNIX_COMMON_CLI_PATHS.map((candidate) => expandHome$1(candidate, home, platform));
+}
 /** Locate the local Mnemon binary without invoking a shell. */
-function findMnemonCommand(config) {
-	if (config.cliPath !== void 0) return expandHome$1(config.cliPath);
-	const envPath = process.env.MNEMON_CLI_PATH?.trim();
+function findMnemonCommand(config, options = {}) {
+	const platform = options.platform ?? process.platform;
+	const env = options.env ?? process.env;
+	const home = options.home ?? homedir();
+	const isExecutable = options.isExecutable ?? ((path) => executable$1(path, platform));
+	if (config.cliPath !== void 0) return expandHome$1(config.cliPath, home, platform);
+	const envPath = envValue(env, "MNEMON_CLI_PATH", platform)?.trim();
 	if (envPath !== void 0 && envPath !== "") {
-		const path = expandHome$1(envPath);
-		if (executable$1(path)) return path;
+		const path = expandHome$1(envPath, home, platform);
+		if (isExecutable(path)) return path;
 	}
-	for (const directory of (process.env.PATH ?? "").split(delimiter)) {
+	const paths = pathApi(platform);
+	for (const directory of (envValue(env, "PATH", platform) ?? "").split(paths.delimiter)) {
 		if (directory === "") continue;
-		for (const name of process.platform === "win32" ? [
-			"mnemon.exe",
-			"mnemon.cmd",
-			"mnemon"
-		] : ["mnemon"]) {
-			const path = join(directory, name);
-			if (executable$1(path)) return path;
+		for (const name of platform === "win32" ? ["mnemon.exe"] : ["mnemon"]) {
+			const path = paths.join(directory, name);
+			if (isExecutable(path)) return path;
 		}
 	}
-	for (const candidate of COMMON_CLI_PATHS) {
-		const path = expandHome$1(candidate);
-		if (executable$1(path)) return path;
-	}
+	for (const path of commonCliPaths(platform, env, home)) if (isExecutable(path)) return path;
 }
 var MnemonCliError = class extends Error {
 	exitCode;
@@ -2157,7 +2181,7 @@ function createRunner(config, processRunner = runProcess, workspaceRoot) {
 		try {
 			result = await processRunner(command, argv, processOptions);
 		} catch (error) {
-			throw new MnemonCliError(`${error instanceof Error ? error.message : String(error)}. Install Mnemon and ensure "mnemon" is on PATH, or set dsh-mnemon.cliPath.`);
+			throw new MnemonCliError(`${error instanceof Error ? error.message : String(error)}. ${process.platform === "win32" ? "Install the official Mnemon Windows release, ensure mnemon.exe is on PATH or under %LOCALAPPDATA%\\Programs\\mnemon, or set MNEMON_CLI_PATH or mnemon.cliPath to its absolute path." : "Install Mnemon and ensure \"mnemon\" is on PATH, or set MNEMON_CLI_PATH or mnemon.cliPath."}`);
 		}
 		if (result.exitCode !== 0) {
 			const detail = result.stderr.trim() || result.stdout.trim() || "no output";
@@ -4840,11 +4864,16 @@ function profileFromAncestor(packageManifestPath) {
 	let directory = dirname(packageManifestPath);
 	for (let depth = 0; depth < 12; depth++) {
 		const profile = manifest(join(directory, "package.json"));
-		if (profile?.name?.startsWith("dsh-profile-") === true) return {
-			mode: isLinkSpec(dependencySpec(profile)) ? "link" : "npm",
-			profileName: profile.name.slice(12),
-			profileDir: directory
-		};
+		if (profile?.name?.startsWith("dsh-profile-") === true) {
+			const spec = dependencySpec(profile);
+			const linked = isLinkSpec(spec);
+			return {
+				mode: linked ? "link" : "npm",
+				locationDir: linked && spec !== void 0 ? linkedTarget(directory, spec) ?? resolve(dirname(packageManifestPath)) : directory,
+				profileName: profile.name.slice(12),
+				profileDir: directory
+			};
+		}
 		const parent = dirname(directory);
 		if (parent === directory) break;
 		directory = parent;
@@ -4865,19 +4894,24 @@ function linkedProfile(packageManifestPath, dshHome) {
 		try {
 			if (realpathSync(target) === packageRoot) matches.push({
 				name: entry.name,
-				dir: profileDir
+				dir: profileDir,
+				locationDir: target
 			});
 		} catch {}
 	}
 	const match = matches[0];
 	return match === void 0 ? void 0 : {
 		mode: "link",
+		locationDir: match.locationDir,
 		profileName: match.name,
 		profileDir: match.dir
 	};
 }
 function inspectDshInstall(packageManifestPath, dshHome) {
-	return profileFromAncestor(packageManifestPath) ?? linkedProfile(packageManifestPath, dshHome) ?? { mode: "manual" };
+	return profileFromAncestor(packageManifestPath) ?? linkedProfile(packageManifestPath, dshHome) ?? {
+		mode: "manual",
+		locationDir: resolve(dirname(packageManifestPath))
+	};
 }
 async function resultOrThrow(runner, command, args, timeoutMs) {
 	const result = await runner(command, args, {
@@ -4933,7 +4967,8 @@ var VersionUpdateManager = class {
 		try {
 			realCommand = realpathSync(command);
 		} catch {}
-		if (realCommand.includes("/Caskroom/mnemon/")) {
+		const normalizedCommand = realCommand.replaceAll("\\", "/");
+		if (normalizedCommand.includes("/Caskroom/mnemon/")) {
 			const brew = this.executable("brew");
 			return {
 				...current === void 0 ? {} : { current },
@@ -4951,7 +4986,7 @@ var VersionUpdateManager = class {
 				}
 			};
 		}
-		if (realCommand.includes("/Cellar/mnemon/")) {
+		if (normalizedCommand.includes("/Cellar/mnemon/")) {
 			const brew = this.executable("brew");
 			return {
 				...current === void 0 ? {} : { current },
@@ -5006,6 +5041,7 @@ var VersionUpdateManager = class {
 			components: [{
 				id: "mnemon",
 				name: "Mnemon CLI",
+				...mnemonLocal.install.command === void 0 ? {} : { executablePath: mnemonLocal.install.command },
 				...mnemonLocal.current === void 0 ? {} : { current: mnemonLocal.current },
 				...mnemonLatest === void 0 ? {} : { latest: mnemonLatest },
 				outdated: mnemonOutdated,
@@ -5016,6 +5052,8 @@ var VersionUpdateManager = class {
 			}, {
 				id: "dsh-mnemon",
 				name: "dsh-mnemon",
+				...dshInstall.profileName === void 0 ? {} : { installProfile: dshInstall.profileName },
+				installPath: dshInstall.locationDir,
 				current: this.currentDshMnemonVersion,
 				...dshLatest === void 0 ? {} : { latest: dshLatest },
 				outdated: dshOutdated,

package/lib/types/client/MnemonView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MnemonView.d.ts","sourceRoot":"","sources":["../../../src/client/MnemonView.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAClF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAkB1C,OAAO,EAA+B,KAAK,eAAe,EAAE,MAAM,cAAc,CAAA;AAEhF,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,4BAA4B,CAAA;AAGnC,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,sBAAsB,CAAA;IAClC,aAAa,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,kBAAkB,CAAC,EAAE,wBAAwB,CAAA;IAC7C,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,CAAC,CAAC,EAAE,eAAe,CAAA;IACnB,MAAM,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IACnC,OAAO,IAAI,IAAI,CAAA;CAChB;AA6oDD,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,GAAG,CAAC,OAAO,CAI9D"}
+{"version":3,"file":"MnemonView.d.ts","sourceRoot":"","sources":["../../../src/client/MnemonView.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAClF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAkB1C,OAAO,EAA+B,KAAK,eAAe,EAAE,MAAM,cAAc,CAAA;AAEhF,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,4BAA4B,CAAA;AAGnC,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,sBAAsB,CAAA;IAClC,aAAa,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,kBAAkB,CAAC,EAAE,wBAAwB,CAAA;IAC7C,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,CAAC,CAAC,EAAE,eAAe,CAAA;IACnB,MAAM,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CACrB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC3D,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IACnC,OAAO,IAAI,IAAI,CAAA;CAChB;AAupDD,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,GAAG,CAAC,OAAO,CAI9D"}

package/lib/types/client/MnemonView.js

@@ -1365,6 +1365,15 @@ function versionHint(t, component) {
         return t('versions.hintInstall');
     return t('versions.hintManual');
 }
+function dshInstallLabel(t, component) {
+    if (component.installMode === 'npm')
+        return t('versions.profileLocation', { name: component.installProfile ?? '—' });
+    if (component.installMode === 'link')
+        return component.installProfile === undefined
+            ? t('versions.sourceLocation')
+            : t('versions.linkSourceLocation', { name: component.installProfile });
+    return t('versions.packageLocation');
+}
 function VersionDialog(props) {
     const t = useT();
     const [snapshot, setSnapshot] = useState(null);
@@ -1411,7 +1420,7 @@ function VersionDialog(props) {
     return _jsx(SidebarModal, { title: t('versions.title'), description: t('versions.description'), busy: busy, onClose: props.onClose, children: _jsxs("div", { className: css.versionDialogBody, children: [checking && snapshot === null && _jsxs("div", { className: css.versionChecking, role: "status", children: [_jsx("span", {}), t('versions.checking')] }), error !== null && _jsxs("div", { className: css.versionError, role: "alert", children: [_jsx("strong", { children: t('versions.failed') }), _jsx("p", { children: error })] }), result !== null && _jsxs("div", { className: css.versionResult, role: "status", children: [_jsx("strong", { children: result.updated ? t('versions.updated', { name: result.component === 'mnemon' ? 'Mnemon CLI' : 'dsh-mnemon' }) : t('versions.alreadyCurrent') }), result.restartRequired && _jsx("p", { children: t('versions.restartRequired') })] }), snapshot !== null && _jsx("div", { className: css.versionList, children: snapshot.components.map(component => {
                         const canUpdate = component.outdated && component.updateSupported && component.checkError === undefined;
                         const state = component.checkError !== undefined ? t('versions.unknown') : component.outdated ? t('versions.available') : t('versions.current');
-                        return _jsxs("article", { "data-outdated": component.outdated || undefined, children: [_jsxs("header", { children: [_jsxs("div", { children: [_jsx("strong", { children: component.name }), _jsx("span", { children: versionModeLabel(t, component.installMode) })] }), _jsx("em", { children: state })] }), _jsxs("div", { className: css.versionNumbers, children: [_jsxs("div", { children: [_jsx("small", { children: t('versions.installed') }), _jsx("code", { children: component.current ?? '—' })] }), _jsx("span", { children: "\u2192" }), _jsxs("div", { children: [_jsx("small", { children: t('versions.latest') }), _jsx("code", { children: component.latest ?? '—' })] })] }), _jsxs("footer", { children: [_jsx("p", { children: versionHint(t, component) }), canUpdate && _jsx("button", { type: "button", className: css.primaryButton, disabled: busy, onClick: () => void update(component), children: updating === component.id ? t('versions.updating') : t('versions.update') })] })] }, component.id);
+                        return _jsxs("article", { "data-outdated": component.outdated || undefined, children: [_jsxs("header", { children: [_jsxs("div", { children: [_jsx("strong", { children: component.name }), _jsx("span", { children: versionModeLabel(t, component.installMode) })] }), _jsx("em", { children: state })] }), _jsxs("div", { className: css.versionNumbers, children: [_jsxs("div", { children: [_jsx("small", { children: t('versions.installed') }), _jsx("code", { children: component.current ?? '—' })] }), _jsx("span", { children: "\u2192" }), _jsxs("div", { children: [_jsx("small", { children: t('versions.latest') }), _jsx("code", { children: component.latest ?? '—' })] })] }), component.id === 'mnemon' && component.executablePath !== undefined && _jsxs("small", { className: css.versionLocation, title: component.executablePath, children: [_jsx("span", { children: t('versions.executable') }), _jsx("code", { children: component.executablePath })] }), component.id === 'dsh-mnemon' && component.installPath !== undefined && _jsxs("small", { className: css.versionLocation, title: component.installPath, children: [_jsx("span", { children: dshInstallLabel(t, component) }), _jsx("code", { children: component.installPath })] }), _jsxs("footer", { children: [_jsx("p", { children: versionHint(t, component) }), canUpdate && _jsx("button", { type: "button", className: css.primaryButton, disabled: busy, onClick: () => void update(component), children: updating === component.id ? t('versions.updating') : t('versions.update') })] })] }, component.id);
                     }) }), _jsxs("div", { className: css.versionDialogActions, children: [_jsx("span", { children: snapshot === null ? '' : t('versions.checkedAt', { time: new Date(snapshot.checkedAt).toLocaleTimeString() }) }), _jsxs("div", { children: [_jsx("button", { type: "button", className: css.ghostButton, disabled: busy, onClick: props.onClose, children: t('common.cancel') }), _jsx("button", { type: "button", "data-autofocus": true, className: css.secondaryButton, disabled: busy, onClick: () => void check(), children: checking ? t('versions.checkingShort') : t('versions.recheck') })] })] })] }) });
 }
 function StatusPage(props) {