From a7564651b4be13a1ca047703a6056e68d07891de Mon Sep 17 00:00:00 2001
From: yarastqt <yarastqt@gmail.com>
Date: Tue, 21 Apr 2020 17:42:49 +0300
Subject: [PATCH] feat: impl di for theme tokens

---
 src/core/theme-layers.ts |  4 +++-
 src/index.ts             | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/core/theme-layers.ts b/src/core/theme-layers.ts
index f3e3d53..881ef1e 100644
--- a/src/core/theme-layers.ts
+++ b/src/core/theme-layers.ts
@@ -22,7 +22,9 @@ export async function getThemeLayers(
   // @ts-ignore
   const files = await fg('**/*.{js,ts}', { cwd: source, ignore: options.exclude })
   for (const fileName of files) {
-    const data = await importModule<ThemeTokens>(resolve(source, fileName))
+    const fn = await importModule<ThemeTokens>(resolve(source, fileName))
+    const maybeFn = fn()
+    const data = typeof maybeFn === 'function' ? maybeFn() : maybeFn
     const { name: layer } = parse(fileName)
     for (const [platform, levels] of platforms) {
       if (options !== undefined && !options.platforms.includes(platform)) {
diff --git a/src/index.ts b/src/index.ts
index 33a6a9e..3db6d5e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,15 +1,17 @@
-import Color from 'color'
 import deepmerge from 'deepmerge'
 
-import { ThemeTokens } from './core/token.h'
+import { Shape, ThemeTokens } from './core/token.h'
 
-export function theme(shape1: ThemeTokens, shape2: ThemeTokens = {}): ThemeTokens {
-  return deepmerge(shape1, shape2)
-}
+type Primitives = Shape<string | number>
+type ThemeFn = (primitives: Primitives) => ThemeTokens
 
-export function color(inputColor: string, options: { h?: number; s?: number; l?: number }): string {
-  return Color(inputColor)
-    // @ts-ignore
-    .hsl(options.h, options.s, options.l)
-    .hex()
+// TODO: theme args must be fn or plain shape.
+export function withTokens(theme1: ThemeFn, theme2?: ThemeFn) {
+  return (primitives1: Primitives = {}) => (primitives2: Primitives = {}) => {
+    const composedPrimitives = deepmerge(primitives1, primitives2)
+    if (theme2 === undefined) {
+      return theme1(composedPrimitives)
+    }
+    return deepmerge(theme1(composedPrimitives), theme2(composedPrimitives))
+  }
 }