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

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

@@ -445,6 +445,21 @@ function blockSectionValues(selector) {
 }
 const THEME_LIGHT_VALUES = blockSectionValues(":root");
 const THEME_DARK_VALUES = blockSectionValues(".dark");
+const PREFERS_DARK_RE = /@media\s*\(\s*prefers-color-scheme\s*:\s*dark\s*\)/;
+function darkSection(css, lines, { mediaWrapRoot = true } = {}) {
+	const out = [
+		".dark {",
+		...lines,
+		"}"
+	];
+	if (PREFERS_DARK_RE.test(css)) {
+		out.push("@media (prefers-color-scheme: dark) {");
+		if (mediaWrapRoot) out.push("  :root {", ...lines.map((l) => `  ${l}`), "  }");
+		else out.push(...lines.map((l) => `  ${l}`));
+		out.push("}");
+	}
+	return out;
+}
 function buildThemeSupplement(css, missing) {
 	const tokens = missing.filter((t) => THEME_LIGHT_VALUES.has(t));
 	if (tokens.length === 0) return null;
@@ -457,13 +472,32 @@ 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(css, 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";
+function promoteMediaDarkToClass(css) {
+	if (css.includes("/* shortwind:dark-promote")) return null;
+	const decls = [...(css.match(/@media\s*\(\s*prefers-color-scheme\s*:\s*dark\s*\)\s*\{\s*:root\s*\{([^}]*)\}/)?.[1] ?? "").matchAll(/--([\w-]+)\s*:\s*([^;]+);/g)].map((d) => `  --${d[1]}: ${d[2].trim()};`);
+	if (decls.length === 0) return null;
+	return [
+		`${DARK_PROMOTE_MARKER} — base dark tokens mirrored from your @media block so a .dark toggle drives them. */`,
+		".dark {",
+		...decls,
+		"}",
+		"/* end shortwind dark-promote */"
+	].join("\n");
+}
 const TONE_MARKER = "/* shortwind:tones";
 const TONES = [
 	{
@@ -506,8 +540,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(css, darkRules, { mediaWrapRoot: false }));
 	}
 	lines.push("/* end shortwind tones */");
 	return lines.join("\n");
@@ -708,6 +741,13 @@ async function init(options) {
 			themeAction = "supplemented";
 		}
 	}
+	if (theme.themePath) {
+		const css = await readFile(theme.themePath, "utf8");
+		let next = ensureDarkClassVariant(css);
+		const promote = promoteMediaDarkToClass(next);
+		if (promote) next = `${next.replace(/\s*$/, "")}\n\n${promote}\n`;
+		if (next !== css) await writeFile(theme.themePath, next);
+	}
 	let tonesPath = null;
 	let tonesAction = "skipped";
 	if (theme.themePath) {
@@ -2555,4 +2595,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-vo5aWJUx.js.map