From e1ada31468e0f8f44ca37433b43b4dba4a8b9345 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Tue, 17 Oct 2023 22:01:18 +0200
Subject: [PATCH] Allow ysMap to map to anoter type

---
 packages/yoshiki/package.json         |  2 +-
 packages/yoshiki/src/native/index.tsx |  1 +
 packages/yoshiki/src/type.ts          | 16 ----------------
 packages/yoshiki/src/utils.ts         | 18 +++++++++++++++++-
 packages/yoshiki/src/web/index.ts     |  1 +
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/packages/yoshiki/package.json b/packages/yoshiki/package.json
index b3491c6..75a45e3 100644
--- a/packages/yoshiki/package.json
+++ b/packages/yoshiki/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "yoshiki",
-	"version": "1.2.8",
+	"version": "1.2.9",
 	"author": "Zoe Roux <zoe.roux@sdg.moe> (https://github.com/zoriya)",
 	"license": "MIT",
 	"keywords": [
diff --git a/packages/yoshiki/src/native/index.tsx b/packages/yoshiki/src/native/index.tsx
index 5d48a5b..bfbef17 100644
--- a/packages/yoshiki/src/native/index.tsx
+++ b/packages/yoshiki/src/native/index.tsx
@@ -34,3 +34,4 @@ export const ThemeProvider = ({ theme, children }: { theme: Theme; children?: Re
 };
 
 export * from "../type";
+export * from "../utils";
diff --git a/packages/yoshiki/src/type.ts b/packages/yoshiki/src/type.ts
index d8253f3..d54aa07 100644
--- a/packages/yoshiki/src/type.ts
+++ b/packages/yoshiki/src/type.ts
@@ -79,19 +79,3 @@ export const assignChilds = <Style>(
 	}
 	return target;
 };
-
-export const ysMap = <Property>(
-	value: YoshikiStyle<Property>,
-	f: (p: Property) => Property,
-): YoshikiStyle<Property> => {
-	if (typeof value === "function") {
-		// @ts-ignore too hard to type right
-		return (theme) => ysMap(value(theme), f);
-	}
-	if (isBreakpoints(value)) {
-		return Object.fromEntries(
-			Object.entries(value).map(([bp, bpValue]) => [bp, ysMap(bpValue, f)]),
-		);
-	}
-	return f(value);
-};
diff --git a/packages/yoshiki/src/utils.ts b/packages/yoshiki/src/utils.ts
index 06676e3..aed1ca5 100644
--- a/packages/yoshiki/src/utils.ts
+++ b/packages/yoshiki/src/utils.ts
@@ -4,7 +4,7 @@
 //
 
 import { breakpoints } from "./theme";
-import { Breakpoints } from "./type";
+import { Breakpoints, YoshikiStyle } from "./type";
 
 export const isBreakpoints = <T>(value: unknown): value is Breakpoints<T> => {
 	if (typeof value !== "object" || !value) return false;
@@ -26,3 +26,19 @@ export const forceBreakpoint = <T extends Record<string, unknown>>(
 		Object.entries(value).map(([key, value]) => [key, { [breakpoint]: value }]),
 	) as any;
 };
+
+export const ysMap = <Property, Mapped>(
+	value: YoshikiStyle<Property>,
+	f: (p: Property) => Mapped,
+): YoshikiStyle<Mapped> => {
+	if (typeof value === "function") {
+		// @ts-ignore too hard to type right
+		return (theme) => ysMap(value(theme), f);
+	}
+	if (isBreakpoints(value)) {
+		return Object.fromEntries(
+			Object.entries(value).map(([bp, bpValue]) => [bp, ysMap(bpValue, f)]),
+		);
+	}
+	return f(value);
+};
diff --git a/packages/yoshiki/src/web/index.ts b/packages/yoshiki/src/web/index.ts
index ef81b6d..ad0005a 100644
--- a/packages/yoshiki/src/web/index.ts
+++ b/packages/yoshiki/src/web/index.ts
@@ -27,3 +27,4 @@ export const ThemeProvider = ({ theme, children }: { theme: Theme; children?: Re
 	createElement(ThemeContext.Provider, { value: theme }, [children]);
 
 export * from "../type";
+export * from "../utils";