@savvy-web/silk-effects 9.1.2 → 9.1.3

package/commitlint/hook/diagnostics/package-manager.js

@@ -6,8 +6,9 @@ import { readFile } from "node:fs/promises";
 /**
 * Package manager detection for the commit-time hooks.
 *
-* Mirrors the husky hook detection: prefer `package.json#packageManager`,
-* fall back to lockfile presence in priority order pnpm \> yarn \> bun \> npm.
+* Mirrors the husky hook detection: prefer `package.json#devEngines.packageManager`
+* (the first entry when it is an array), then the legacy `packageManager` field,
+* then lockfile presence in priority order pnpm \> yarn \> bun \> npm.
 *
 * @internal
 */
@@ -17,6 +18,14 @@ const VALID_PMS = /* @__PURE__ */ new Set([
 	"bun",
 	"npm"
 ]);
+const toPackageManager = (name) => typeof name === "string" && VALID_PMS.has(name) ? name : null;
+const devEnginesName = (manifest) => {
+	const devEngines = manifest.devEngines;
+	if (typeof devEngines !== "object" || devEngines === null) return void 0;
+	const declared = devEngines.packageManager;
+	const first = Array.isArray(declared) ? declared[0] : declared;
+	return typeof first === "object" && first !== null ? first.name : void 0;
+};
 function parsePackageManagerField(packageJsonContent) {
 	let parsed;
 	try {
@@ -24,10 +33,13 @@ function parsePackageManagerField(packageJsonContent) {
 	} catch {
 		return null;
 	}
-	const field = typeof parsed === "object" && parsed !== null && "packageManager" in parsed ? parsed.packageManager : void 0;
+	if (typeof parsed !== "object" || parsed === null) return null;
+	const manifest = parsed;
+	const fromDevEngines = toPackageManager(devEnginesName(manifest));
+	if (fromDevEngines !== null) return fromDevEngines;
+	const field = manifest.packageManager;
 	if (typeof field !== "string" || field.length === 0) return null;
-	const name = field.split("@")[0];
-	return VALID_PMS.has(name) ? name : null;
+	return toPackageManager(field.split("@")[0]);
 }
 function detectFromLockfiles(presence) {
 	if (presence.pnpm) return "pnpm";

package/index.d.ts

@@ -7909,10 +7909,11 @@ declare class Command {
    */
   static findRoot(cwd?: string): string;
   /**
-   * Detect the package manager from the root package.json's `packageManager` field.
+   * Detect the package manager declared by the root package.json.
    *
-   * Parses the `packageManager` field (e.g., `pnpm\@9.0.0`) and extracts the manager name.
-   * Falls back to "npm" if no packageManager field is found.
+   * 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.
    *
    * @param cwd - Directory to search for package.json (defaults to `Command.findRoot()`)
    * @returns The detected package manager
@@ -7963,7 +7964,7 @@ declare class Command {
    *
    * Search order:
    * 1. Global command (in PATH)
-   * 2. Project's package manager (detected from package.json `packageManager` field)
+   * 2. Project's package manager (detected from package.json `devEngines.packageManager`, `packageManager`, or a lockfile)
    *
    * @param tool - The tool name to find
    * @returns Search result with command string if found

package/lint/utils/Command.js

@@ -1,3 +1,4 @@
+import { detectFromLockfiles, parsePackageManagerField } from "../../commitlint/hook/diagnostics/package-manager.js";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { execSync } from "node:child_process";
@@ -81,10 +82,11 @@ var Command = class Command {
 		return cwd;
 	}
 	/**
-	* Detect the package manager from the root package.json's `packageManager` field.
+	* Detect the package manager declared by the root package.json.
 	*
-	* Parses the `packageManager` field (e.g., `pnpm\@9.0.0`) and extracts the manager name.
-	* Falls back to "npm" if no packageManager field is found.
+	* 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.
 	*
 	* @param cwd - Directory to search for package.json (defaults to `Command.findRoot()`)
 	* @returns The detected package manager
@@ -98,23 +100,16 @@ var Command = class Command {
 	static detectPackageManager(cwd = Command.findRoot()) {
 		if (Command.cachedPackageManager !== null) return Command.cachedPackageManager;
 		const packageJsonPath = join(cwd, "package.json");
-		if (!existsSync(packageJsonPath)) {
-			Command.cachedPackageManager = "npm";
-			return "npm";
-		}
+		let declared = null;
 		try {
-			const content = readFileSync(packageJsonPath, "utf-8");
-			const pkg = JSON.parse(content);
-			if (pkg.packageManager) {
-				const match = pkg.packageManager.match(/^(npm|pnpm|yarn|bun)@/);
-				if (match) {
-					Command.cachedPackageManager = match[1];
-					return Command.cachedPackageManager;
-				}
-			}
+			declared = parsePackageManagerField(readFileSync(packageJsonPath, "utf-8"));
 		} catch {}
-		Command.cachedPackageManager = "npm";
-		return "npm";
+		Command.cachedPackageManager = declared ?? detectFromLockfiles({
+			pnpm: existsSync(join(cwd, "pnpm-lock.yaml")),
+			yarn: existsSync(join(cwd, "yarn.lock")),
+			bun: existsSync(join(cwd, "bun.lock"))
+		});
+		return Command.cachedPackageManager;
 	}
 	/**
 	* Get the exec command prefix for a package manager.
@@ -177,7 +172,7 @@ var Command = class Command {
 	*
 	* Search order:
 	* 1. Global command (in PATH)
-	* 2. Project's package manager (detected from package.json `packageManager` field)
+	* 2. Project's package manager (detected from package.json `devEngines.packageManager`, `packageManager`, or a lockfile)
 	*
 	* @param tool - The tool name to find
 	* @returns Search result with command string if found

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/silk-effects",
-	"version": "9.1.2",
+	"version": "9.1.3",
 	"private": false,
 	"description": "Shared Effect library for Silk Suite conventions",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/silk-effects",
@@ -37,13 +37,13 @@
 		"@effected/github-references": "^0.5.0",
 		"@effected/glob": "^0.8.0",
 		"@effected/jsonc": "^0.13.0",
-		"@effected/markdown": "^0.12.0",
+		"@effected/markdown": "^0.12.1",
 		"@effected/package-json": "^0.17.0",
 		"@effected/toml": "^0.9.0",
 		"@effected/walker": "^0.12.0",
 		"@effected/yaml": "^0.17.0",
 		"@manypkg/get-packages": "^3.1.0",
-		"@savvy-web/silk-core": "0.4.4",
+		"@savvy-web/silk-core": "0.4.5",
 		"mdast-util-heading-range": "^4.0.0",
 		"mdast-util-to-string": "^4.0.0",
 		"remark-gfm": "^4.0.1",
@@ -58,7 +58,7 @@
 		"@effected/commands": "^0.9.0",
 		"@effected/git": "^0.17.0",
 		"@effected/templates": "^0.8.0",
-		"@effected/workspaces": "^0.25.0",
+		"@effected/workspaces": "^0.26.0",
 		"effect": "4.0.0-rc.117"
 	}
 }

package/tsdoc-metadata.json

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