Merge pull request #209 from modulz/update-util-api

Simplify utils API
stitchesjs · Sep 10, 2020 · f156210 · f156210
2 parents bef0c97 + e400438
commit f156210
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -109,7 +109,7 @@ const processStyleObject = (
     /** Utils: */
     if (isUtilProp) {
       // Resolve the util from the util function:
-      const resolvedUtils = config.utils[key](config)(val);
+      const resolvedUtils = config.utils[key](val, config);
       processStyleObject(resolvedUtils, config, valueMiddleware, [...currentNestingPath], false);
       continue;
     }

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -65,7 +65,7 @@ export type TFlatUtils<
   T extends TConfig,
   UT = {
     [U in keyof T['utils']]?: T['utils'][U] extends TUtility<any, any>
-      ? ReturnType<T['utils'][U]> extends (arg: infer A) => {}
+      ? T['utils'][U] extends (arg: infer A, config: T) => {}
         ? A
         : never
       : never;
@@ -74,7 +74,7 @@ export type TFlatUtils<
 
 export type TTopUtils<T extends TConfig> = {
   [U in keyof T['utils']]?: T['utils'][U] extends TUtility<any, any>
-    ? ReturnType<T['utils'][U]> extends (arg: infer A) => {}
+    ? T['utils'][U] extends (arg: infer A, config: T) => {}
       ? A
       : never
     : never;
@@ -86,7 +86,7 @@ export type TRecursiveUtils<T extends TConfig> =
       [pseudo: string]: TRecursiveUtils<T>;
     };
 
-export type TUtility<A extends any, T extends TConfig> = (config: T) => (arg: A) => TRecursiveCss<T>;
+export type TUtility<A extends any, T extends TConfig> = (arg: A, config: T) => TRecursiveCss<T>;
 
 export type ICssPropToToken<T extends TConfig> = T['tokens'] extends object
   ? {

diff --git a/packages/core/tests/index.test.ts b/packages/core/tests/index.test.ts
@@ -338,7 +338,7 @@ describe('createCss: mixed(SSR & Client)', () => {
     const css = createCss(
       {
         utils: {
-          marginX: () => (value: string) => ({
+          marginX: (value: string, config) => ({
             marginLeft: value,
             marginRight: value,
           }),
@@ -353,7 +353,7 @@ describe('createCss: mixed(SSR & Client)', () => {
     const css = createCss(
       {
         utils: {
-          hover: () => (value) => ({
+          hover: (value, config) => ({
             ':hover': value,
             ':focus': value,
           }),
@@ -926,7 +926,7 @@ describe('createCss: mixed(SSR & Client)', () => {
     const css = createCss(
       {
         utils: {
-          mx: (config) => (value) => ({
+          mx: (value, config) => ({
             marginLeft: value,
             marginRight: value,
           }),