Merge pull request #115 from danpacho/114-bug-twvariants-type-is-not-…

…correctly-inferred [bug] `tw.variants` type is not correctly inferred
danpacho · Aug 12, 2024 · 30db5a2 · 30db5a2
2 parents 1abbd1d + b9df36c
commit 30db5a2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 37 deletions.
diff --git a/packages/tailwindest/CHANGELOG.md b/packages/tailwindest/CHANGELOG.md
@@ -1,5 +1,11 @@
 # tailwindest
 
+## 2.3.4
+
+### Patch Changes
+
+-   Fix invalid typing at createTools.variants
+
 ## 2.3.3
 
 ### Patch Changes

diff --git a/packages/tailwindest/__tests__/get.variants.test.ts b/packages/tailwindest/__tests__/get.variants.test.ts
@@ -227,15 +227,9 @@ describe(label.unit("GetVariants - variants: with boolean | number"), () => {
                     onlyTrue?: true
                     onlyFalse?: false
                     numbers?: 1 | 2
-                    never?: "Error: typeof variants key should be <string> | <number> | <'true' | 'false'>"
-                    withNever?:
-                        | "withNever"
-                        | "Error: typeof variants key should be <string> | <number> | <'true' | 'false'>"
-                    combinations?:
-                        | 1
-                        | boolean
-                        | "withNever"
-                        | "Error: typeof variants key should be <string> | <number> | <'true' | 'false'>"
+                    never?: never
+                    withNever?: "withNever"
+                    combinations?: 1 | boolean | "withNever"
                 }
             >
         >(true)
@@ -252,15 +246,9 @@ describe(label.unit("GetVariants - variants: with boolean | number"), () => {
                     onlyTrue?: true
                     onlyFalse?: false
                     numbers?: 1 | 2
-                    never?: "Error: typeof variants key should be <string> | <number> | <'true' | 'false'>"
-                    withNever?:
-                        | "withNever"
-                        | "Error: typeof variants key should be <string> | <number> | <'true' | 'false'>"
-                    combinations?:
-                        | 1
-                        | boolean
-                        | "withNever"
-                        | "Error: typeof variants key should be <string> | <number> | <'true' | 'false'>"
+                    never?: never
+                    withNever?: "withNever"
+                    combinations?: 1 | boolean | "withNever"
                 }
             >
         >(true)

diff --git a/packages/tailwindest/package.json b/packages/tailwindest/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tailwindest",
-    "version": "2.3.3",
+    "version": "2.3.4",
     "description": "typesafe, reusable tailwind",
     "homepage": "https://tailwindest.vercel.app",
     "author": "danpacho",

diff --git a/packages/tailwindest/src/core/tools/create.rotary.ts b/packages/tailwindest/src/core/tools/create.rotary.ts
@@ -7,11 +7,7 @@ import type { TailwindestStyler } from "./tool.interface"
 
 const createRotary =
     <StyleType>() =>
-    <
-        VariantsStylesType extends {
-            [key in keyof VariantsStylesType]: StyleType
-        },
-    >({
+    <VariantsStylesType>({
         base,
         ...styles
     }: { [key in keyof VariantsStylesType]: StyleType } & {

diff --git a/packages/tailwindest/src/create.tools.ts b/packages/tailwindest/src/create.tools.ts
@@ -106,11 +106,7 @@ const createTools = <StyleType>(): {
      * )
      * ```
      */
-    rotary: <
-        VariantsStylesType extends {
-            [key in keyof VariantsStylesType]: StyleType
-        },
-    >({
+    rotary: <VariantsStylesType>({
         base,
         ...styles
     }: { [key in keyof VariantsStylesType]: StyleType } & {
@@ -184,17 +180,16 @@ const createTools = <StyleType>(): {
      * )
      * ```
      */
-    variants: <
-        Variants extends {
-            [VariantsKey in keyof Variants]: {
-                [key in keyof Variants[VariantsKey]]: StyleType
-            }
-        },
-    >({
+    variants: <Variants>({
         base,
         variants,
     }: {
-        variants: Variants
+        variants: {
+            [VariantsKey in keyof Variants]: Record<
+                keyof Variants[VariantsKey],
+                StyleType
+            >
+        }
     } & {
         base?: StyleType
     }) => {