@shortwind/cli 0.1.0-beta.14 → 0.1.0-beta.16

package/dist/{bench-DQtfv5aq.js → bench-DG0TCu9M.js}

@@ -445,7 +445,14 @@ function blockSectionValues(selector) {
 }
 const THEME_LIGHT_VALUES = blockSectionValues(":root");
 const THEME_DARK_VALUES = blockSectionValues(".dark");
-function buildThemeSupplement(css, missing) {
+function darkSection(lines) {
+	return [
+		".dark {",
+		...lines,
+		"}"
+	];
+}
+function buildThemeSupplement(missing) {
 	const tokens = missing.filter((t) => THEME_LIGHT_VALUES.has(t));
 	if (tokens.length === 0) return null;
 	const light = tokens.map((t) => `  --${t}: ${THEME_LIGHT_VALUES.get(t)};`);
@@ -457,13 +464,44 @@ function buildThemeSupplement(css, missing) {
 		...light,
 		"}"
 	];
-	if (dark.length > 0) {
-		if (/@custom-variant\s+dark|\.dark\s*\{/.test(css)) lines.push(".dark {", ...dark, "}");
-		else if (/@media\s*\(\s*prefers-color-scheme\s*:\s*dark\s*\)/.test(css)) lines.push("@media (prefers-color-scheme: dark) {", "  :root {", ...dark.map((l) => `  ${l}`), "  }", "}");
-	}
+	if (dark.length > 0) lines.push(...darkSection(dark));
 	lines.push("@theme inline {", ...mapping, "}", "/* end shortwind theme-supplement */");
 	return lines.join("\n");
 }
+const DARK_CLASS_VARIANT = "@custom-variant dark (&:is(.dark *));";
+const CUSTOM_VARIANT_RE = /@custom-variant\s+dark\b/;
+function ensureDarkClassVariant(css) {
+	if (CUSTOM_VARIANT_RE.test(css)) return css;
+	const m = css.match(TAILWIND_IMPORT_RE);
+	if (!m) return css;
+	const at = (m.index ?? 0) + m[0].length;
+	return `${css.slice(0, at)}\n${DARK_CLASS_VARIANT}${css.slice(at)}`;
+}
+const DARK_PROMOTE_MARKER = "/* shortwind:dark-promote";
+const MEDIA_DARK_ROOT_RE = /@media\s*\(\s*prefers-color-scheme\s*:\s*dark\s*\)\s*\{\s*:root\s*\{([^}]*)\}\s*\}/;
+function convertMediaDarkToClass(css) {
+	if (css.includes("/* shortwind:dark-promote")) return {
+		css,
+		converted: false
+	};
+	const decls = [...(css.match(MEDIA_DARK_ROOT_RE)?.[1] ?? "").matchAll(/--([\w-]+)\s*:\s*([^;]+);/g)].map((d) => `  --${d[1]}: ${d[2].trim()};`);
+	if (decls.length === 0) return {
+		css,
+		converted: false
+	};
+	const without = css.replace(MEDIA_DARK_ROOT_RE, "").replace(/\n{3,}/g, "\n\n");
+	const block = [
+		`${DARK_PROMOTE_MARKER} — dark tokens moved out of the system-preference media query so a .dark toggle is the single source of truth. */`,
+		".dark {",
+		...decls,
+		"}",
+		"/* end shortwind dark-promote */"
+	].join("\n");
+	return {
+		css: `${without.replace(/\s*$/, "")}\n\n${block}\n`,
+		converted: true
+	};
+}
 const TONE_MARKER = "/* shortwind:tones";
 const TONES = [
 	{
@@ -496,7 +534,7 @@ const TONES = [
 		fg: "var(--primary)"
 	}
 ];
-function buildToneBlock(css) {
+function buildToneBlock() {
 	const rule = (name, bg, fg) => `[data-tone="${name}"] { --tone-bg: ${bg}; --tone-fg: ${fg}; }`;
 	const lines = [
 		`${TONE_MARKER} — semantic tones for tone-aware recipes (@badge, …). Set on an element:`,
@@ -506,8 +544,7 @@ function buildToneBlock(css) {
 	const darkTones = TONES.filter((t) => t.darkBg && t.darkFg);
 	if (darkTones.length > 0) {
 		const darkRules = darkTones.map((t) => "  " + rule(t.name, t.darkBg, t.darkFg));
-		if (/@custom-variant\s+dark|\.dark\s*\{/.test(css)) lines.push(".dark {", ...darkRules, "}");
-		else if (/@media\s*\(\s*prefers-color-scheme\s*:\s*dark\s*\)/.test(css)) lines.push("@media (prefers-color-scheme: dark) {", ...darkRules, "}");
+		lines.push(...darkSection(darkRules));
 	}
 	lines.push("/* end shortwind tones */");
 	return lines.join("\n");
@@ -700,7 +737,7 @@ async function init(options) {
 	if (theme.action === "skipped" && theme.themePath && skillRegistry) {
 		const css = await readFile(theme.themePath, "utf8");
 		missingThemeTokens = findMissingThemeTokens(css, skillRegistry.flattened);
-		const supplement = buildThemeSupplement(css, missingThemeTokens);
+		const supplement = buildThemeSupplement(missingThemeTokens);
 		if (supplement) {
 			await writeFile(theme.themePath, `${css.replace(/\s*$/, "")}\n\n${supplement}\n`);
 			supplementedThemeTokens = missingThemeTokens;
@@ -708,13 +745,18 @@ async function init(options) {
 			themeAction = "supplemented";
 		}
 	}
+	if (theme.themePath) {
+		const css = await readFile(theme.themePath, "utf8");
+		const { css: next } = convertMediaDarkToClass(ensureDarkClassVariant(css));
+		if (next !== css) await writeFile(theme.themePath, next);
+	}
 	let tonesPath = null;
 	let tonesAction = "skipped";
 	if (theme.themePath) {
 		const css = await readFile(theme.themePath, "utf8");
 		tonesPath = theme.themePath;
 		if (!css.includes("/* shortwind:tones")) {
-			await writeFile(theme.themePath, `${css.replace(/\s*$/, "")}\n\n${buildToneBlock(css)}\n`);
+			await writeFile(theme.themePath, `${css.replace(/\s*$/, "")}\n\n${buildToneBlock()}\n`);
 			tonesAction = "written";
 		}
 	}
@@ -767,7 +809,7 @@ function cliVersion() {
 	}
 }
 function pickPackages(bundler) {
-	const base = ["@shortwind/tailwind"];
+	const base = ["@shortwind/cli", "@shortwind/tailwind"];
 	switch (bundler) {
 		case "vite": return [...base, "@shortwind/vite"];
 		case "next": return [...base, "@shortwind/next"];
@@ -883,7 +925,7 @@ async function wireVscodeClassRegex(vscodePath) {
 	parse(next);
 	await writeFile(vscodePath, next.endsWith("\n") ? next : next + "\n");
 }
-const HUSKY_LINE = "npx @shortwind/cli build";
+const HUSKY_LINE = "npx shortwind build";
 async function installHuskyHook(cwd, huskyPath) {
 	if (!existsSync(path.join(cwd, ".git"))) return null;
 	await mkdir(path.dirname(huskyPath), { recursive: true });
@@ -893,7 +935,7 @@ async function installHuskyHook(cwd, huskyPath) {
 	}
 	const current = await readFile(huskyPath, "utf8");
 	if (current.includes(HUSKY_LINE)) return huskyPath;
-	await writeFile(huskyPath, current.endsWith("\n") ? current + HUSKY_LINE + "\n" : current + "\nnpx @shortwind/cli build\n", { mode: 493 });
+	await writeFile(huskyPath, current.endsWith("\n") ? current + HUSKY_LINE + "\n" : current + "\nnpx shortwind build\n", { mode: 493 });
 	return huskyPath;
 }
 async function writeSkillMd(skillPath, recipesDir, families, bundler) {
@@ -2555,4 +2597,4 @@ function formatBenchTable(result) {
 //#endregion
 export { createRegistrySource as A, readConfig as C, init as D, cliVersion as E, extractHeader as F, rewriteHeaderSha as I, sealRecipeFile as L, detectProject as M, buildHeaderLine as N, readLockfile as O, computeBodySha as P, verifyFetchedFamily as R, installedFamilies as S, DEFAULT_REGISTRY as T, reseal as _, extractClassUsages as a, remove as b, verify as c, dev as d, BuildError as f, preset as g, ls as h, DEFAULT_CONTENT as i, resolvePresetFamilies as j, writeLockfile as k, UpgradeError as l, formatLsText as m, formatBenchTable as n, formatFindingsText as o, build as p, ALL_RULES as r, lint as s, bench as t, upgrade as u, NewFamilyError as v, renameFamilyInSource as w, add as x, newFamily as y };
 
-//# sourceMappingURL=bench-DQtfv5aq.js.map
+//# sourceMappingURL=bench-DG0TCu9M.js.map