@stim-cli/core 1.22.0 → 1.23.1

package/dist/state.mjs

@@ -1,6 +1,6 @@
 import { S as tryAcquireClaim, _ as releaseClaim, f as isClaimRefusal, g as readClaimSet } from "./ownership-claim-DHUs_Dir.mjs";
 import { inspectProcessIdentity } from "./process-identity.mjs";
-import { C as workspaceName, H as ambientContext, J as readJsonObject, K as isJsonObject, Q as withDirLockAsync, T as workspaceStateDir, U as ambientEnv, X as withStateReadCache, Y as readStateFile, Z as withDirLock, _ as rotatedLogPath, d as ensurePrivateDir, g as rotateLog, q as readJsonFile, t as LOG_ROTATE_BYTES, u as configDir } from "./core-BTsCO1nW.mjs";
+import { C as workspaceName, H as ambientContext, J as readJsonObject, K as isJsonObject, Q as withDirLockAsync, T as workspaceStateDir, U as ambientEnv, X as withStateReadCache, Y as readStateFile, Z as withDirLock, _ as rotatedLogPath, d as ensurePrivateDir, g as rotateLog, q as readJsonFile, t as LOG_ROTATE_BYTES, u as configDir } from "./core-B23eUZZp.mjs";
 import { readOrCreateKeyFile } from "./noise-session.mjs";
 import { validHomeId } from "./workspace-link.mjs";
 import { a as workspaceSummary, i as statusViews, n as applyKeyedDelta, o as withDerivedFacts, r as SUMMARY_ARCHIVES, s as withGitChip, t as KeyedEntities } from "./keyed-delta-BBoOeR2J.mjs";

package/dist/toolchain.d.mts

@@ -8,6 +8,8 @@ interface ToolchainProbe {
   isFile(path: string): boolean;
   read(path: string): string | null;
   list(path: string): string[];
+  /** The target of the symbolic link at `path`, or null when it is not one. */
+  link(path: string): string | null;
 }
 declare function defaultToolchainProbe(): ToolchainProbe;
 /**
@@ -27,6 +29,11 @@ interface Toolchain {
 }
 /** Whether Node `version`, such as `22.12.0`, satisfies a pin such as `22`, `v22.12` or `22.12.0`. */
 declare function satisfiesNodePin(version: string, spec: string): boolean;
+/**
+ * Whether Node `version` is an acceptable stand-in for a pin no install matches: the pin's major, and not older than
+ * the version the pin names.
+ */
+declare function meetsNodePinMajor(version: string, spec: string): boolean;
 /** The `bin` directory of the Node a version manager makes the default in new shells, and where that came from. */
 declare function defaultNodeBin(env: NodeJS.ProcessEnv, probe: ToolchainProbe): {
   bin: string;
@@ -44,21 +51,29 @@ declare function discoverToolchain(base: NodeJS.ProcessEnv, probe?: ToolchainPro
   runningNode?: boolean;
   platform?: NodeJS.Platform;
 }): Toolchain;
-/** The Node version `root` pins, from `.nvmrc`, `.node-version`, `.tool-versions` or `package.json`'s `volta.node`. */
-declare function projectNodePin(root: string, probe?: ToolchainProbe): {
+/**
+ * The Node version pinned by `.nvmrc`, `.node-version`, `.tool-versions` or `package.json`'s `volta.node` in `root`,
+ * or else in the nearest directory above it up to `top`.
+ */
+declare function projectNodePin(root: string, probe?: ToolchainProbe, top?: string): {
   spec: string;
   file: string;
 } | null;
+/** A pin's version spec, with an `lts/...` pin resolved through nvm's aliases, or null when nvm cannot resolve it. */
+declare function resolveNodePinSpec(spec: string, env: NodeJS.ProcessEnv, probe?: ToolchainProbe): string | null;
 /**
- * The `bin` directory of an installed Node that satisfies `root`'s pin, from nvm, fnm, Volta, asdf or mise, or
- * nil when the project pins none or no installed version satisfies the pin. An `lts/...` pin resolves through
- * nvm's aliases.
+ * The `bin` directory of an installed Node for the pin `projectNodePin` finds, from nvm, fnm, Volta, asdf, mise or a
+ * linked Homebrew `node` or `node@NN`, or null when the project pins none or no install fits. `match` is `exact` for an
+ * install the pin names. When none is, it is `major` for the newest install of the pinned major that is not older than
+ * the pinned version, since Homebrew cannot install a chosen patch release. An `lts/...` pin resolves through
+ * `resolveNodePinSpec`.
  */
-declare function projectNodeBin(root: string, env: NodeJS.ProcessEnv, probe?: ToolchainProbe): {
+declare function projectNodeBin(root: string, env: NodeJS.ProcessEnv, probe?: ToolchainProbe, top?: string): {
   bin: string;
   version: string;
   pin: string;
   spec: string;
+  match: "exact" | "major";
 } | null;
 //#endregion
-export { Toolchain, ToolchainEntry, ToolchainProbe, defaultNodeBin, defaultToolchainProbe, discoverToolchain, projectNodeBin, projectNodePin, satisfiesNodePin };
+export { Toolchain, ToolchainEntry, ToolchainProbe, defaultNodeBin, defaultToolchainProbe, discoverToolchain, meetsNodePinMajor, projectNodeBin, projectNodePin, resolveNodePinSpec, satisfiesNodePin };

package/dist/toolchain.mjs

@@ -1,6 +1,6 @@
-import { readFileSync, readdirSync, statSync } from "node:fs";
+import { readFileSync, readdirSync, readlinkSync, statSync } from "node:fs";
 import { homedir } from "node:os";
-import { delimiter, dirname, join } from "node:path";
+import { basename, delimiter, dirname, join } from "node:path";
 //#region toolchain.ts
 const stat = (path) => statSync(path, { throwIfNoEntry: false });
 function defaultToolchainProbe() {
@@ -22,6 +22,13 @@ function defaultToolchainProbe() {
 			} catch {
 				return [];
 			}
+		},
+		link: (path) => {
+			try {
+				return readlinkSync(path);
+			} catch {
+				return null;
+			}
 		}
 	};
 }
@@ -38,8 +45,9 @@ function jdkRank(name) {
 	return major === 17 ? 0 : major === 21 ? 1 : 1e4 - major;
 }
 const ANDROID_STUDIOS = ["/Applications/Android Studio.app", "/Applications/Android Studio Preview.app"];
+/** Accepts Homebrew's Cellar names too, such as `22.23.2_1`, whose `_1` is the formula revision. */
 function parseVersion(text) {
-	const match = /^v?(\d+)\.(\d+)\.(\d+)$/.exec(text.trim());
+	const match = /^v?(\d+)\.(\d+)\.(\d+)(?:_\d+)?$/.exec(text.trim());
 	return match ? [
 		Number(match[1]),
 		Number(match[2]),
@@ -69,6 +77,24 @@ function newestMatching(names, wanted) {
 function satisfiesNodePin(version, spec) {
 	return newestMatching([version], spec) !== null;
 }
+/** The lowest version a pin such as `22.22` or `v22.22.0` names, or null for a pin that names only a major or no number. */
+function pinFloor(spec) {
+	const match = /^v?(\d+)\.(\d+)(?:\.(\d+))?$/.exec(spec.trim());
+	return match ? [
+		Number(match[1]),
+		Number(match[2]),
+		Number(match[3] ?? 0)
+	] : null;
+}
+/**
+* Whether Node `version` is an acceptable stand-in for a pin no install matches: the pin's major, and not older than
+* the version the pin names.
+*/
+function meetsNodePinMajor(version, spec) {
+	const parsed = parseVersion(version);
+	const floor = pinFloor(spec);
+	return !!parsed && !!floor && parsed[0] === floor[0] && compareVersions(parsed, floor) >= 0;
+}
 function matchesPrefix(version, spec) {
 	if (spec === "" || spec === "node" || spec === "stable") return true;
 	const parts = spec.split(".");
@@ -254,8 +280,17 @@ function javaEntry(env, probe) {
 		source: "missing"
 	};
 }
-/** The Node version `root` pins, from `.nvmrc`, `.node-version`, `.tool-versions` or `package.json`'s `volta.node`. */
-function projectNodePin(root, probe = defaultToolchainProbe()) {
+/**
+* The Node version pinned by `.nvmrc`, `.node-version`, `.tool-versions` or `package.json`'s `volta.node` in `root`,
+* or else in the nearest directory above it up to `top`.
+*/
+function projectNodePin(root, probe = defaultToolchainProbe(), top = root) {
+	for (let dir = root;; dir = dirname(dir)) {
+		const pin = nodePinIn(dir, probe);
+		if (pin || dir === top || dirname(dir) === dir) return pin;
+	}
+}
+function nodePinIn(root, probe) {
 	for (const file of [".nvmrc", ".node-version"]) {
 		const line = probe.read(join(root, file))?.split("\n").map((text) => text.trim()).find((text) => text && !text.startsWith("#"));
 		if (line) return {
@@ -275,52 +310,78 @@ function projectNodePin(root, probe = defaultToolchainProbe()) {
 		file: "package.json"
 	} : null;
 }
+/** A pin's version spec, with an `lts/...` pin resolved through nvm's aliases, or null when nvm cannot resolve it. */
+function resolveNodePinSpec(spec, env, probe = defaultToolchainProbe()) {
+	if (!spec.startsWith("lts/")) return spec;
+	const resolved = nvmAlias(nvmDir(env, probe), spec, probe);
+	return resolved.startsWith("lts/") ? null : resolved;
+}
 /**
-* The `bin` directory of an installed Node that satisfies `root`'s pin, from nvm, fnm, Volta, asdf or mise, or
-* nil when the project pins none or no installed version satisfies the pin. An `lts/...` pin resolves through
-* nvm's aliases.
+* The `bin` directory of an installed Node for the pin `projectNodePin` finds, from nvm, fnm, Volta, asdf, mise or a
+* linked Homebrew `node` or `node@NN`, or null when the project pins none or no install fits. `match` is `exact` for an
+* install the pin names. When none is, it is `major` for the newest install of the pinned major that is not older than
+* the pinned version, since Homebrew cannot install a chosen patch release. An `lts/...` pin resolves through
+* `resolveNodePinSpec`.
 */
-function projectNodeBin(root, env, probe = defaultToolchainProbe()) {
-	const pin = projectNodePin(root, probe);
+function projectNodeBin(root, env, probe = defaultToolchainProbe(), top = root) {
+	const pin = projectNodePin(root, probe, top);
 	if (!pin) return null;
+	const spec = resolveNodePinSpec(pin.spec, env, probe);
+	if (!spec) return null;
 	const nvm = nvmDir(env, probe);
-	const spec = pin.spec.startsWith("lts/") ? nvmAlias(nvm, pin.spec, probe) : pin.spec;
-	const stores = [
+	const asdf = join(env.ASDF_DATA_DIR || join(probe.home, ".asdf"), "installs", "nodejs");
+	const groups = [
 		{
 			dir: join(nvm, "versions", "node"),
 			bin: (name) => join(nvm, "versions", "node", name, "bin")
 		},
-		{
-			dir: join(probe.home, ".local", "share", "fnm", "node-versions"),
-			bin: (name) => join(probe.home, ".local", "share", "fnm", "node-versions", name, "installation", "bin")
-		},
-		{
-			dir: join(probe.home, "Library", "Application Support", "fnm", "node-versions"),
-			bin: (name) => join(probe.home, "Library", "Application Support", "fnm", "node-versions", name, "installation", "bin")
-		},
+		...[join(probe.home, ".local", "share", "fnm"), join(probe.home, "Library", "Application Support", "fnm")].map((fnm) => ({
+			dir: join(fnm, "node-versions"),
+			bin: (name) => join(fnm, "node-versions", name, "installation", "bin")
+		})),
 		{
 			dir: join(probe.home, ".volta", "tools", "image", "node"),
 			bin: (name) => join(probe.home, ".volta", "tools", "image", "node", name, "bin")
 		},
 		{
-			dir: join(env.ASDF_DATA_DIR || join(probe.home, ".asdf"), "installs", "nodejs"),
-			bin: (name) => join(env.ASDF_DATA_DIR || join(probe.home, ".asdf"), "installs", "nodejs", name, "bin")
+			dir: asdf,
+			bin: (name) => join(asdf, name, "bin")
 		},
 		{
 			dir: join(probe.home, ".local", "share", "mise", "installs", "node"),
 			bin: (name) => join(probe.home, ".local", "share", "mise", "installs", "node", name, "bin")
 		}
-	];
-	for (const store of stores) {
-		const name = newestMatching(probe.list(store.dir), spec);
-		if (name && probe.isFile(join(store.bin(name), "node"))) return {
-			bin: store.bin(name),
-			version: name.replace(/^v/, ""),
-			pin: pin.file,
-			spec
+	].map(({ dir, bin }) => probe.list(dir).map((name) => ({
+		name,
+		bin: bin(name)
+	})));
+	groups.push(HOMEBREW_PREFIXES.flatMap((prefix) => probe.list(join(prefix, "opt")).filter((keg) => /^node(@\d+)?$/.test(keg)).map((keg) => ({
+		name: basename(probe.link(join(prefix, "opt", keg)) ?? ""),
+		bin: join(prefix, "opt", keg, "bin")
+	}))));
+	const installs = groups.map((group) => group.filter(({ bin }) => probe.isFile(join(bin, "node"))));
+	const found = (install, match) => ({
+		bin: install.bin,
+		version: install.name.replace(/^v/, "").replace(/_\d+$/, ""),
+		pin: pin.file,
+		spec,
+		match
+	});
+	for (const group of installs) {
+		const name = newestMatching(group.map((install) => install.name), spec);
+		const install = group.find((candidate) => candidate.name === name);
+		if (install) return found(install, "exact");
+	}
+	let fallback = null;
+	for (const install of installs.flat()) {
+		const version = parseVersion(install.name);
+		if (!version || !meetsNodePinMajor(install.name, spec)) continue;
+		if (!fallback || compareVersions(version, fallback.version) > 0) fallback = {
+			install,
+			version
 		};
 	}
-	return null;
+	return fallback ? found(fallback.install, "major") : null;
 }
 //#endregion
-export { defaultNodeBin, defaultToolchainProbe, discoverToolchain, projectNodeBin, projectNodePin, satisfiesNodePin };
+export { defaultNodeBin, defaultToolchainProbe, discoverToolchain, meetsNodePinMajor, projectNodeBin, projectNodePin, resolveNodePinSpec, satisfiesNodePin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stim-cli/core",
-  "version": "1.22.0",
+  "version": "1.23.1",
   "description": "Shared internal cache and runtime primitives for Stim packages.",
   "license": "MIT",
   "repository": {