From 34adf8e65ac773ac0805b1d543aa4e5a204d5189 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Tue, 10 Jan 2023 15:44:26 +0900
Subject: [PATCH] Fix registry hydratation

---
 examples/next-example/src/pages/_app.tsx    |  2 +-
 packages/yoshiki/src/web/automatic-theme.ts |  7 +++----
 packages/yoshiki/src/web/registry.ts        | 23 +++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/examples/next-example/src/pages/_app.tsx b/examples/next-example/src/pages/_app.tsx
index d472226..a573aef 100644
--- a/examples/next-example/src/pages/_app.tsx
+++ b/examples/next-example/src/pages/_app.tsx
@@ -4,7 +4,7 @@
 //
 
 import { AppProps } from "next/app";
-import { ReactNode, useMemo } from "react";
+import { useMemo } from "react";
 import {
 	useYoshiki,
 	createStyleRegistry,
diff --git a/packages/yoshiki/src/web/automatic-theme.ts b/packages/yoshiki/src/web/automatic-theme.ts
index d5bc68d..122de34 100644
--- a/packages/yoshiki/src/web/automatic-theme.ts
+++ b/packages/yoshiki/src/web/automatic-theme.ts
@@ -50,10 +50,9 @@ export const useAutomaticTheme = <T extends Record<string, Child>>(
 	const auto = Object.fromEntries(traverseEntries(theme.light, theme.dark, toAuto)) as ToChild<T>;
 	const rule = `
 body { ${cssVariables.map((x) => `${x.name}: ${x.light}`).join(";")} }
-@media (prefers-color-scheme: dark) {
-	body { ${cssVariables.map((x) => `${x.name}: ${x.dark}`).join(";")} }
-}
-	`;
+@media (prefers-color-scheme: dark) { body { ${cssVariables
+		.map((x) => `${x.name}: ${x.dark}`)
+		.join(";")} } }`;
 	registry.addRule({ type: "user", key, state: "normal", breakpoint: "default" }, rule);
 	return auto;
 };
diff --git a/packages/yoshiki/src/web/registry.ts b/packages/yoshiki/src/web/registry.ts
index 1755193..19c9a89 100644
--- a/packages/yoshiki/src/web/registry.ts
+++ b/packages/yoshiki/src/web/registry.ts
@@ -36,7 +36,6 @@ export class StyleRegistry {
 				"Warning: Yoshiki was used without a top level StyleRegistry. SSR won't be supported.",
 			);
 		}
-		if (typeof window !== "undefined") this.hydrate();
 	}
 
 	addRule(key: StyleKey, rule: string) {
@@ -93,10 +92,10 @@ export class StyleRegistry {
 			this.cssOutput[key.state][key.breakpoint].push(css);
 		}
 		return Object.entries(this.cssOutput)
-			.map(([state, bp]) =>
-				Object.entries(bp)
-					.map(([breakpoint, css]) => `/* ${state}-${breakpoint} */\n${css.join("\n")}\n`)
-					.join("\n"),
+			.flatMap(([state, bp]) =>
+				Object.entries(bp).flatMap(([breakpoint, css]) =>
+					css.length ? ["", `/* ${state}-${breakpoint} */`, ...css] : [],
+				),
 			)
 			.join("\n");
 	}
@@ -116,19 +115,21 @@ export class StyleRegistry {
 	}
 
 	hydrateStyle(css: string) {
-		const comReg = new RegExp("/\\* (\\w+):(\\w) \\*/");
+		const comReg = new RegExp("/\\* (\\w+)-(\\w+) \\*/");
 		let state: StyleKey["state"] = "normal";
 		let bp: StyleKey["breakpoint"] = "default";
 
 		for (const line of css.split("\n")) {
 			const match = line.match(comReg);
-			if (!match) {
-				this.cssOutput[state][bp].push(line);
+			if (match) {
+				// Not really safe but will break only if the user modifies the css manually.
+				state = match[1] as StyleKey["state"];
+				bp = match[2] as StyleKey["breakpoint"];
 				continue;
 			}
-			// Not really safe but will break only if the user modifies the css manually.
-			state = match[1] as StyleKey["state"];
-			bp = match[2] as StyleKey["breakpoint"];
+
+			if (line.length)
+				this.cssOutput[state][bp].push(line);
 		}
 	}
 }