@aedis/cli 0.4.0 → 0.4.2

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.4.0 init
-npx @aedis/cli@0.4.0 add button approval-card
-npx @aedis/cli@0.4.0 diff
+npx @aedis/cli@0.4.2 init
+npx @aedis/cli@0.4.2 add button approval-card
+npx @aedis/cli@0.4.2 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

@@ -47,36 +47,26 @@ function oklchToRgba({ l, c, h, alpha }) {
 	const l_ = (l + .3963377774 * a + .2158037573 * b) ** 3;
 	const m_ = (l - .1055613458 * a - .0638541728 * b) ** 3;
 	const s_ = (l - .0894841775 * a - 1.291485548 * b) ** 3;
-	const linear = [
-		4.0767416621 * l_ - 3.3077115913 * m_ + .2309699292 * s_,
-		-1.2684380046 * l_ + 2.6097574011 * m_ - .3413193965 * s_,
-		-.0041960863 * l_ - .7034186147 * m_ + 1.707614701 * s_
-	];
 	const gamma = (x) => x <= .0031308 ? 12.92 * x : 1.055 * x ** (1 / 2.4) - .055;
-	const [r, g, bl] = linear.map((x) => Math.round(Math.min(1, Math.max(0, gamma(x))) * 255));
+	const channel = (x) => Math.round(Math.min(1, Math.max(0, gamma(x))) * 255);
 	return [
-		r,
-		g,
-		bl,
+		channel(4.0767416621 * l_ - 3.3077115913 * m_ + .2309699292 * s_),
+		channel(-1.2684380046 * l_ + 2.6097574011 * m_ - .3413193965 * s_),
+		channel(-.0041960863 * l_ - .7034186147 * m_ + 1.707614701 * s_),
 		alpha
 	];
 }
 /** Reads #rgb, #rrggbb, #rrggbbaa, rgb()/rgba() and oklch(). Throws on anything else. */
 function parseColor(value) {
-	const hex = HEX$1.exec(value);
-	if (hex) {
-		const h = hex[1].length === 3 ? [...hex[1]].map((c) => c + c).join("") : hex[1];
-		const [r, g, b, a = 255] = [
-			0,
-			2,
-			4,
-			6
-		].filter((i) => i < h.length).map((i) => parseInt(h.slice(i, i + 2), 16));
+	const digits = HEX$1.exec(value)?.[1];
+	if (digits !== void 0) {
+		const h = digits.length === 3 ? [...digits].map((c) => c + c).join("") : digits;
+		const byte = (i) => parseInt(h.slice(i, i + 2), 16);
 		return [
-			r,
-			g,
-			b,
-			a / 255
+			byte(0),
+			byte(2),
+			byte(4),
+			h.length === 8 ? byte(6) / 255 : 1
 		];
 	}
 	const rgba = RGBA.exec(value);
@@ -104,8 +94,8 @@ const luminance = ([r, g, b]) => {
 function contrast(foreground, background, page = "#ffffff") {
 	const bg = over(parseColor(background), parseColor(page));
 	const fg = over(parseColor(foreground), bg);
-	const [hi, lo] = [luminance(fg), luminance(bg)].sort((a, b) => b - a);
-	return (hi + .05) / (lo + .05);
+	const [a, b] = [luminance(fg), luminance(bg)];
+	return (Math.max(a, b) + .05) / (Math.min(a, b) + .05);
 }
 /** Euclidean distance in sRGB, 0–1: how far apart two opaque colors look at a glance. */
 function colorDistance(a, b) {
@@ -978,13 +968,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 +1629,7 @@ function planFiles(items, config, root) {
 }
 //#endregion
 //#region src/cli.ts
-const VERSION = "0.4.0";
+const VERSION = "0.4.2";
 /** What `aedis init` installs: config, theme tokens, cn and the security primitives. */
 const INIT_ITEMS = [
 	"theme",
@@ -1782,7 +1793,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.4.0`);
+			const config = readConfig(root) ?? defaultConfig(root, flags.release ?? `v0.4.2`);
 			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 +1829,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.4.0`);
+			const config = readConfig(root) ?? defaultConfig(root, `v0.4.2`);
 			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.4.0",
+  "version": "0.4.2",
   "description": "Add Aedis UI components to your app with verified provenance: signed releases, exact and aged dependencies, no install scripts.",
   "keywords": [
     "aedis",