@savvy-web/silk-effects 10.0.0 → 10.1.0

package/index.d.ts

@@ -6939,6 +6939,9 @@ declare class Command {
   private static cachedPackageManager;
   /** Cached project root path */
   private static cachedRoot;
+  /** Memoizing tool discovery, created lazily and dropped by `clearCache` */
+  private static discovery;
+  private static getDiscovery;
   /**
    * Find the project root directory by walking up from `cwd`.
    *
@@ -6963,9 +6966,8 @@ declare class Command {
   /**
    * Detect the package manager declared by the root package.json.
    *
-   * Reads `devEngines.packageManager.name` (the first entry when it is an array), then the
-   * legacy `packageManager` field (e.g., `pnpm\@9.0.0`), then lockfile presence in priority
-   * order pnpm, yarn, bun. Falls back to "npm" when none of them names a manager.
+   * Delegates to the kit's `detectPackageManagerSync` (manifest fields, then workspace and
+   * lockfile markers) at `cwd` without walking up. Falls back to "npm" when none names a manager.
    *
    * @param cwd - Directory to search for package.json (defaults to `Command.findRoot()`)
    * @returns The detected package manager
@@ -6986,7 +6988,7 @@ declare class Command {
    * @example
    * ```typescript
    * Command.getExecPrefix('pnpm'); // ['pnpm', 'exec']
-   * Command.getExecPrefix('npm');  // ['npx', '--no']
+   * Command.getExecPrefix('npm');  // ['npx', '--no', '--']
    * Command.getExecPrefix('yarn'); // ['yarn', 'exec']
    * Command.getExecPrefix('bun');  // ['bun', 'x', "--no-install"]
    * ```
@@ -7061,6 +7063,8 @@ declare class Command {
   /**
    * Execute a command and return its output.
    *
+   * @deprecated No in-repo consumers; will be removed in a future major.
+   *
    * @param command - The command to execute
    * @returns The command output as a string (trimmed)
    * @throws If the command fails
@@ -7075,6 +7079,8 @@ declare class Command {
   /**
    * Execute a command silently (ignore output).
    *
+   * @deprecated No in-repo consumers; will be removed in a future major.
+   *
    * @param command - The command to execute
    * @returns `true` if successful, `false` if failed
    */

package/lint/utils/Command.js

@@ -1,7 +1,11 @@
-import { detectFromLockfiles, parsePackageManagerField } from "../../commitlint/hook/diagnostics/package-manager.js";
-import { existsSync, readFileSync } from "node:fs";
+import { Result } from "effect";
+import { existsSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
+import { detectPackageManagerSync } from "@effected/workspaces";
 import { execSync } from "node:child_process";
+import { LocalExec, Tool, makeToolDiscoverySync } from "@effected/commands";
+import { nodeSpawnSync } from "@effected/commands/node-sync";
+import { nodeSyncOps } from "@effected/workspaces/node-sync";
 
 // src/lint/utils/Command.ts
 /**
@@ -46,6 +50,18 @@ var Command = class Command {
 	static cachedPackageManager = null;
 	/** Cached project root path */
 	static cachedRoot = null;
+	/** Memoizing tool discovery, created lazily and dropped by `clearCache` */
+	static discovery = null;
+	static getDiscovery() {
+		if (Command.discovery === null) {
+			const context = LocalExec.contextFor(Command.detectPackageManager(), { directory: Command.findRoot() });
+			Command.discovery = makeToolDiscoverySync({
+				spawn: nodeSpawnSync,
+				context
+			});
+		}
+		return Command.discovery;
+	}
 	/**
 	* Find the project root directory by walking up from `cwd`.
 	*
@@ -84,9 +100,8 @@ var Command = class Command {
 	/**
 	* Detect the package manager declared by the root package.json.
 	*
-	* Reads `devEngines.packageManager.name` (the first entry when it is an array), then the
-	* legacy `packageManager` field (e.g., `pnpm\@9.0.0`), then lockfile presence in priority
-	* order pnpm, yarn, bun. Falls back to "npm" when none of them names a manager.
+	* Delegates to the kit's `detectPackageManagerSync` (manifest fields, then workspace and
+	* lockfile markers) at `cwd` without walking up. Falls back to "npm" when none names a manager.
 	*
 	* @param cwd - Directory to search for package.json (defaults to `Command.findRoot()`)
 	* @returns The detected package manager
@@ -99,16 +114,8 @@ var Command = class Command {
 	*/
 	static detectPackageManager(cwd = Command.findRoot()) {
 		if (Command.cachedPackageManager !== null) return Command.cachedPackageManager;
-		const packageJsonPath = join(cwd, "package.json");
-		let declared = null;
-		try {
-			declared = parsePackageManagerField(readFileSync(packageJsonPath, "utf-8"));
-		} catch {}
-		Command.cachedPackageManager = declared ?? detectFromLockfiles({
-			pnpm: existsSync(join(cwd, "pnpm-lock.yaml")),
-			yarn: existsSync(join(cwd, "yarn.lock")),
-			bun: existsSync(join(cwd, "bun.lock"))
-		});
+		const detected = detectPackageManagerSync(cwd, nodeSyncOps);
+		Command.cachedPackageManager = Result.isSuccess(detected) ? detected.success.name : "npm";
 		return Command.cachedPackageManager;
 	}
 	/**
@@ -120,22 +127,13 @@ var Command = class Command {
 	* @example
 	* ```typescript
 	* Command.getExecPrefix('pnpm'); // ['pnpm', 'exec']
-	* Command.getExecPrefix('npm');  // ['npx', '--no']
+	* Command.getExecPrefix('npm');  // ['npx', '--no', '--']
 	* Command.getExecPrefix('yarn'); // ['yarn', 'exec']
 	* Command.getExecPrefix('bun');  // ['bun', 'x', "--no-install"]
 	* ```
 	*/
 	static getExecPrefix(packageManager) {
-		switch (packageManager) {
-			case "pnpm": return ["pnpm", "exec"];
-			case "yarn": return ["yarn", "exec"];
-			case "bun": return [
-				"bun",
-				"x",
-				"--no-install"
-			];
-			default: return ["npx", "--no"];
-		}
+		return [...LocalExec.contextFor(packageManager).prefix];
 	}
 	/**
 	* Clear the cached package manager and project root detection.
@@ -144,6 +142,8 @@ var Command = class Command {
 	static clearCache() {
 		Command.cachedPackageManager = null;
 		Command.cachedRoot = null;
+		Command.discovery?.invalidateAll();
+		Command.discovery = null;
 	}
 	/**
 	* Check if a command is available in the system PATH.
@@ -160,12 +160,7 @@ var Command = class Command {
 	*/
 	static isAvailable(command) {
 		validateCommandName(command);
-		try {
-			execSync(`command -v ${command}`, { stdio: "ignore" });
-			return true;
-		} catch {
-			return false;
-		}
+		return Command.getDiscovery().isAvailable(Tool.named(command, { source: "global" }));
 	}
 	/**
 	* Find a tool, checking global installation first, then the project's package manager.
@@ -188,26 +183,18 @@ var Command = class Command {
 	*/
 	static findTool(tool) {
 		validateCommandName(tool);
-		if (Command.isAvailable(tool)) return {
-			available: true,
-			command: tool,
-			source: "global"
-		};
-		const pm = Command.detectPackageManager();
-		const execCmd = [...Command.getExecPrefix(pm), tool].join(" ");
-		try {
-			execSync(`${execCmd} --version`, { stdio: "ignore" });
-			return {
-				available: true,
-				command: execCmd,
-				source: pm
-			};
-		} catch {}
-		return {
+		const resolved = Command.getDiscovery().resolve(Tool.named(tool, { prefer: "global" }));
+		if (Result.isFailure(resolved)) return {
 			available: false,
 			command: void 0,
 			source: void 0
 		};
+		const found = resolved.success;
+		return {
+			available: true,
+			command: found.argv().join(" "),
+			source: found.source === "global" ? "global" : Command.detectPackageManager()
+		};
 	}
 	/**
 	* Find a tool or throw an error if not available.
@@ -247,6 +234,8 @@ var Command = class Command {
 	/**
 	* Execute a command and return its output.
 	*
+	* @deprecated No in-repo consumers; will be removed in a future major.
+	*
 	* @param command - The command to execute
 	* @returns The command output as a string (trimmed)
 	* @throws If the command fails
@@ -263,6 +252,8 @@ var Command = class Command {
 	/**
 	* Execute a command silently (ignore output).
 	*
+	* @deprecated No in-repo consumers; will be removed in a future major.
+	*
 	* @param command - The command to execute
 	* @returns `true` if successful, `false` if failed
 	*/

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "10.0.0",
+	"version": "10.1.0",
 	"private": false,
 	"description": "Shared Effect library for Silk Suite conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk-effects",
@@ -40,20 +40,20 @@
 		"@effected/github-references": "^0.11.0",
 		"@effected/glob": "^0.14.0",
 		"@effected/jsonc": "^0.20.0",
-		"@effected/markdown": "^0.22.0",
-		"@effected/package-json": "^0.25.1",
+		"@effected/markdown": "^0.23.0",
+		"@effected/package-json": "^0.26.0",
 		"@effected/toml": "^0.16.0",
-		"@effected/walker": "^0.19.0",
-		"@effected/yaml": "^0.25.0",
+		"@effected/walker": "^0.20.1",
+		"@effected/yaml": "^0.25.1",
 		"@manypkg/get-packages": "^3.1.0",
-		"@savvy-web/silk-core": "^0.5.1",
+		"@savvy-web/silk-core": "^0.5.2",
 		"shell-quote": "^1.12.0"
 	},
 	"peerDependencies": {
-		"@effected/commands": "^0.15.0",
+		"@effected/commands": "^0.16.0",
 		"@effected/git": "^0.25.0",
 		"@effected/templates": "^0.14.0",
-		"@effected/workspaces": "^0.38.0",
+		"@effected/workspaces": "^0.39.0",
 		"effect": "^4.0.0"
 	}
 }

package/services/SilkPublishability.js

@@ -1,10 +1,35 @@
 import { ChangesetConfig } from "./ChangesetConfig.js";
 import { PublishTargetBindingError, ReleaseChannelError, trimTrailingSlashes } from "@savvy-web/silk-core";
-import { Effect, FileSystem, Layer } from "effect";
+import { Effect, FileSystem, Layer, Schema } from "effect";
 import { isAbsolute, join, relative } from "node:path";
 import { PublishTarget, PublishabilityDetector, WorkspaceDiscovery } from "@effected/workspaces";
 
 // src/services/SilkPublishability.ts
+/**
+* Structural decoder for {@link TargetsBinding}.
+*
+* @remarks
+* `releases` is decoded as `unknown` on purpose: an unrecognised channel must surface as a typed
+* `ReleaseChannelError` from `releaseChannelOf` (which names the package and target), not collapse
+* into a missing binding here. Every other field is validated structurally.
+*/
+const TargetsBindingSchema = Schema.Struct({
+	groups: Schema.Array(Schema.Struct({
+		id: Schema.String,
+		name: Schema.String,
+		dir: Schema.String
+	})),
+	targets: Schema.Array(Schema.Struct({
+		id: Schema.String,
+		group: Schema.String,
+		name: Schema.String,
+		registry: Schema.String,
+		releases: Schema.optionalKey(Schema.Unknown),
+		provenance: Schema.optionalKey(Schema.Boolean)
+	}))
+});
+/** `targets.json` file contents (a JSON string) decoded to a {@link TargetsBinding}. */
+const TargetsBindingFromJson = Schema.fromJsonString(TargetsBindingSchema);
 const NPM_DEFAULT = "https://registry.npmjs.org/";
 /**
 * Default registry endpoints for the well-known target keys. Kept in sync with the
@@ -413,9 +438,6 @@ const readRaw = (fs, packageJsonPath) => fs.readFileString(packageJsonPath).pipe
 * @since 1.0.0
 * @public
 */
-const readTargetsBinding = (fs, pkgPath) => fs.readFileString(join(pkgPath, "dist", "prod", "targets.json")).pipe(Effect.flatMap((content) => Effect.try({
-	try: () => JSON.parse(content),
-	catch: () => /* @__PURE__ */ new Error("invalid targets.json")
-})), Effect.orElseSucceed(() => null));
+const readTargetsBinding = (fs, pkgPath) => fs.readFileString(join(pkgPath, "dist", "prod", "targets.json")).pipe(Effect.flatMap(Schema.decodeUnknownEffect(TargetsBindingFromJson)), Effect.map((binding) => binding), Effect.orElseSucceed(() => null));
 
 export { SilkPublishability, readTargetsBinding };

package/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.59.1"
+      "packageVersion": "7.59.4"
     }
   ]
 }