@aedis/cli 0.3.0 → 0.4.1

package/README.md

@@ -6,9 +6,9 @@ before any file is written, npm dependencies are pinned to exact versions at lea
 script runs.
 
 ```bash
-npx @aedis/cli@0.3.0 init
-npx @aedis/cli@0.3.0 add button approval-card
-npx @aedis/cli@0.3.0 diff
+npx @aedis/cli@0.4.1 init
+npx @aedis/cli@0.4.1 add button approval-card
+npx @aedis/cli@0.4.1 diff
 ```
 
 Always pin the version, as above. Never run `npx aedis`: the unscoped `aedis` package on npm is not this one.

package/dist/aedis.js

@@ -978,13 +978,34 @@ function readConfig(root) {
 const isRelease = (value) => RELEASE.test(value);
 //#endregion
 //#region src/deps.ts
-/** The package manager the project uses, from its lockfile. Yarn 2+ lockfiles start with __metadata. */
+const FROM_FIELD = /^(npm|pnpm|yarn|bun)@(\d+)/;
+/** The package manager a package.json declares in `packageManager` ("pnpm@9.1.0"), if any. */
+function declared(json) {
+	try {
+		const match = FROM_FIELD.exec(String(JSON.parse(json).packageManager ?? ""));
+		if (!match) return null;
+		return match[1] === "yarn" ? Number(match[2]) >= 2 ? "yarn" : "yarn1" : match[1];
+	} catch {
+		return null;
+	}
+}
+/**
+* The package manager the project uses. From `root` up to the folder that holds `.git` (or the filesystem root),
+* the first folder with a lockfile, a pnpm-workspace.yaml or a package.json `packageManager` decides: an app inside a
+* workspace installs with the workspace's manager. npm only when nothing up the tree says otherwise. Yarn 2+
+* lockfiles start with __metadata.
+*/
 function detectPackageManager(root, exists = existsSync, read = (p) => readFileSync(p, "utf8")) {
-	const at = (f) => path.join(root, f);
-	if (exists(at("pnpm-lock.yaml"))) return "pnpm";
-	if (exists(at("bun.lock")) || exists(at("bun.lockb"))) return "bun";
-	if (exists(at("yarn.lock"))) return /__metadata:/.test(read(at("yarn.lock")).slice(0, 4096)) ? "yarn" : "yarn1";
-	return "npm";
+	for (let dir = path.resolve(root);; dir = path.dirname(dir)) {
+		const at = (f) => path.join(dir, f);
+		if (exists(at("pnpm-lock.yaml")) || exists(at("pnpm-workspace.yaml"))) return "pnpm";
+		if (exists(at("bun.lock")) || exists(at("bun.lockb"))) return "bun";
+		if (exists(at("yarn.lock"))) return /__metadata:/.test(read(at("yarn.lock")).slice(0, 4096)) ? "yarn" : "yarn1";
+		if (exists(at("package-lock.json"))) return "npm";
+		const pm = exists(at("package.json")) ? declared(read(at("package.json"))) : null;
+		if (pm) return pm;
+		if (exists(at(".git")) || path.dirname(dir) === dir) return "npm";
+	}
 }
 /** Exact versions, no lifecycle scripts, whatever the package manager. */
 function installCommand(pm, specs) {
@@ -1618,7 +1639,7 @@ function planFiles(items, config, root) {
 }
 //#endregion
 //#region src/cli.ts
-const VERSION = "0.3.0";
+const VERSION = "0.4.1";
 /** What `aedis init` installs: config, theme tokens, cn and the security primitives. */
 const INIT_ITEMS = [
 	"theme",
@@ -1782,7 +1803,7 @@ async function run(argv, io) {
 		}
 		if (!existsSync(path.join(root, "package.json"))) throw new Error(`${root} has no package.json; run inside your app`);
 		if (command === "init") {
-			const config = readConfig(root) ?? defaultConfig(root, flags.release ?? `v0.3.0`);
+			const config = readConfig(root) ?? defaultConfig(root, flags.release ?? `v0.4.1`);
 			if (!isRelease(config.release)) throw new Error(`invalid release ${config.release}`);
 			const decoded = flags.preset === void 0 ? null : decodePreset(flags.preset);
 			if (decoded && !decoded.ok) throw new Error(`preset refused: ${decoded.error}`);
@@ -1818,7 +1839,7 @@ ${themeToCss(theme)}
 		}
 		if (command === "theme" && args[0] === "import") {
 			if (!args[1]) throw new Error("theme import: give the theme's JSON file");
-			const config = readConfig(root) ?? defaultConfig(root, `v0.3.0`);
+			const config = readConfig(root) ?? defaultConfig(root, `v0.4.1`);
 			const input = insideProject(root, path.relative(root, path.resolve(io.cwd, args[1])));
 			const result = themeImport(readFileSync(input, "utf8"), path.basename(input));
 			if (!result.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aedis/cli",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Add Aedis UI components to your app with verified provenance: signed releases, exact and aged dependencies, no install scripts.",
   "keywords": [
     "aedis",