tailwind-variants 0.1.5 → 0.1.7

package/dist/config.d.ts

@@ -17,7 +17,12 @@ export type TWMConfig = {
   twMergeConfig?: TwMergeConfig;
 };
 
-export type TVConfig<V extends TVVariants<S>, EV extends TVVariants> = {
+export type TVConfig<
+  // @ts-expect-error
+  V extends TVVariants | undefined = undefined,
+  // @ts-expect-error
+  EV extends TVVariants | undefined = undefined,
+> = {
   /**
    * Whether to enable responsive variant transform.
    * Which variants or screens(breakpoints) for responsive variant transform.

package/dist/index.d.ts

@@ -44,8 +44,6 @@ export declare const cn: <T extends CnOptions>(...classes: T) => (config?: TWMCo
 // compare if the value is true or array of values
 export type isTrueOrArray<T> = T extends true | unknown[] ? true : false;
 
-export type isStringArray<T> = T extends Array<string> ? true : false;
-
 export type WithInitialScreen<T extends Array<string>> = ["initial", ...T];
 
 /**
@@ -69,9 +67,10 @@ type TVVariantsDefault<S extends TVSlots, B extends ClassValue> = {
 };
 
 export type TVVariants<
-  S extends TVSlots,
-  B extends ClassValue,
-  EV extends TVVariants = undefined,
+  S extends TVSlots | undefined,
+  B extends ClassValue | undefined = undefined,
+  EV extends TVVariants<ES> | undefined = undefined,
+  ES extends TVSlots | undefined = undefined,
 > = EV extends undefined
   ? TVVariantsDefault<S, B>
   :
@@ -87,14 +86,16 @@ export type TVVariants<
 
 export type TVCompoundVariants<
   V extends TVVariants<S>,
-  EV extends TVVariants,
   S extends TVSlots,
   B extends ClassValue,
+  EV extends TVVariants<ES>,
+  ES extends TVSlots,
 > = Array<
   {
     [K in keyof V | keyof EV]?:
-      | StringToBoolean<keyof V[K] | keyof EV[K]>
-      | StringToBoolean<keyof V[K]>[];
+      | (K extends keyof V ? StringToBoolean<keyof V[K]> : never)
+      | (K extends keyof EV ? StringToBoolean<keyof EV[K]> : never)
+      | (K extends keyof V ? StringToBoolean<keyof V[K]>[] : never);
   } & ClassProp<SlotsClassValue<S, B> | ClassValue>
 >;
 
@@ -114,15 +115,23 @@ export type TVCompoundSlots<
       } & ClassProp
 >;
 
-export type TVDefaultVariants<V extends TVVariants<S>, EV extends TVVariants, S extends TVSlots> = {
-  [K in keyof V | keyof EV]?: StringToBoolean<keyof V[K] | keyof EV[K]>;
+export type TVDefaultVariants<
+  V extends TVVariants<S>,
+  S extends TVSlots,
+  EV extends TVVariants<ES>,
+  ES extends TVSlots,
+> = {
+  [K in keyof V | keyof EV]?:
+    | (K extends keyof V ? StringToBoolean<keyof V[K]> : never)
+    | (K extends keyof EV ? StringToBoolean<keyof EV[K]> : never);
 };
 
 export type TVScreenPropsValue<
-  V extends TVVariants,
+  V extends TVVariants<S>,
+  S extends TVSlots,
   K extends keyof V,
   C extends TVConfig,
-> = isStringArray<C["responsiveVariants"]> extends true
+> = C["responsiveVariants"] extends string[]
   ? {
       [Screen in WithInitialScreen<C["responsiveVariants"]>[number]]?: StringToBoolean<keyof V[K]>;
     }
@@ -132,68 +141,90 @@ export type TVScreenPropsValue<
 
 export type TVProps<
   V extends TVVariants<S>,
-  EV extends TVVariants,
   S extends TVSlots,
   C extends TVConfig<V, EV>,
+  EV extends TVVariants<ES>,
+  ES extends TVSlots,
 > = EV extends undefined
   ? V extends undefined
     ? ClassProp<ClassValue>
     : {
         [K in keyof V]?: isTrueOrArray<C["responsiveVariants"]> extends true
-          ? StringToBoolean<keyof V[K]> | TVScreenPropsValue<V, K, C>
+          ? StringToBoolean<keyof V[K]> | TVScreenPropsValue<V, S, K, C>
           : StringToBoolean<keyof V[K]>;
       } & ClassProp<ClassValue>
   : V extends undefined
   ? {
       [K in keyof EV]?: isTrueOrArray<C["responsiveVariants"]> extends true
-        ? StringToBoolean<keyof EV[K]> | TVScreenPropsValue<EV, K, C>
+        ? StringToBoolean<keyof EV[K]> | TVScreenPropsValue<EV, ES, K, C>
         : StringToBoolean<keyof EV[K]>;
     } & ClassProp<ClassValue>
   : {
       [K in keyof V | keyof EV]?: isTrueOrArray<C["responsiveVariants"]> extends true
-        ? StringToBoolean<keyof V[K] | keyof EV[K]> | TVScreenPropsValue<EV & V, K, C>
-        : StringToBoolean<keyof V[K] | keyof EV[K]>;
+        ?
+            | (K extends keyof V ? StringToBoolean<keyof V[K]> : never)
+            | (K extends keyof EV ? StringToBoolean<keyof EV[K]> : never)
+            | TVScreenPropsValue<EV & V, S, K, C>
+        :
+            | (K extends keyof V ? StringToBoolean<keyof V[K]> : never)
+            | (K extends keyof EV ? StringToBoolean<keyof EV[K]> : never);
     } & ClassProp<ClassValue>;
 
 export type TVVariantKeys<V extends TVVariants<S>, S extends TVSlots> = V extends Object
   ? Array<keyof V>
   : undefined;
 
-export type TVReturnProps<V extends TVVariants<S>, S extends TVSlots, B extends ClassValue> = {
+export type TVReturnProps<
+  V extends TVVariants<S>,
+  S extends TVSlots,
+  B extends ClassValue,
+  EV extends TVVariants<ES>,
+  ES extends TVSlots,
+> = {
   base: B;
   slots: S;
   variants: V;
-  defaultVariants: TVDefaultVariants<V, S>;
-  compoundVariants: TVCompoundVariants<V, S, B>;
+  defaultVariants: TVDefaultVariants<V, S, EV, ES>;
+  compoundVariants: TVCompoundVariants<V, S, B, EV, ES>;
   compoundSlots: TVCompoundSlots<V, S, B>;
   variantKeys: TVVariantKeys<V, S>;
 };
 
 export type TVReturnType<
   V extends TVVariants<S>,
-  EV extends TVVariants,
   S extends TVSlots,
-  ES extends TVSlots,
   B extends ClassValue,
   C extends TVConfig<V, EV>,
+  EV extends TVVariants<ES>,
+  ES extends TVSlots,
 > = {
-  (props?: TVProps<V, EV, S, C>): ES extends undefined
+  (props?: TVProps<V, S, C, EV, ES>): ES extends undefined
     ? S extends undefined
       ? string
       : {[K in TVSlotsWithBase<S, B>]: (slotProps?: ClassProp) => string}
     : {[K in TVSlotsWithBase<ES & S, B>]: (slotProps?: ClassProp) => string};
-} & TVReturnProps<V, S, B>;
+} & TVReturnProps<V, S, B, EV, ES>;
 
 export type TV = {
   <
-    V extends TVVariants<S, B, EV> = undefined,
-    CV extends TVCompoundVariants<V, EV, S, B> = undefined,
-    DV extends TVDefaultVariants<V, EV, S> = undefined,
-    C extends TVConfig<V, EV> = undefined,
+    V extends TVVariants<S, B, EV>,
+    CV extends TVCompoundVariants<V, S, B, EV, ES>,
+    DV extends TVDefaultVariants<V, S, EV, ES>,
+    C extends TVConfig<V, EV>,
     B extends ClassValue = undefined,
     S extends TVSlots = undefined,
-    E extends TVReturnType = undefined,
-    EV extends TVVariants = E["variants"] extends TVVariants ? E["variants"] : undefined,
+    // @ts-expect-error
+    E extends TVReturnType = TVReturnType<
+      V,
+      S,
+      B,
+      C,
+      // @ts-expect-error
+      EV extends undefined ? {} : EV,
+      // @ts-expect-error
+      ES extends undefined ? {} : ES
+    >,
+    EV extends TVVariants<ES, B, E["variants"], ES> = E["variants"],
     ES extends TVSlots = E["slots"] extends TVSlots ? E["slots"] : undefined,
   >(
     options: {
@@ -236,7 +267,7 @@ export type TV = {
      * @see https://www.tailwind-variants.org/docs/api-reference#config-optional
      */
     config?: C,
-  ): TVReturnType<V, EV, S, ES, B, C>;
+  ): TVReturnType<V, S, B, C, EV, ES>;
 };
 
 // main function
@@ -244,7 +275,8 @@ export declare const tv: TV;
 
 export declare const defaultConfig: TVConfig;
 
-export type VariantProps<Component extends (...args: any) => any> = Omit<
-  OmitUndefined<Parameters<Component>[0]>,
-  "class" | "className"
->;
+export type VariantProps<T> = T extends {variants: infer V}
+  ? V extends TVVariantsDefault<any, undefined>
+    ? {[K in TVVariantKeys<V, any>[number]]?: keyof V[K]}
+    : never
+  : never;

package/dist/transformer.d.ts

@@ -4,7 +4,7 @@ import type {DefaultTheme} from "tailwindcss/types/generated/default-theme";
 export type DefaultScreens = keyof DefaultTheme["screens"];
 
 export type WithTV = {
-  <C extends Config = {}>(tvConfig: Config): C;
+  <C extends Config>(tvConfig: C): C;
 };
 
 export declare const withTV: WithTV;

package/dist/utils.d.ts

@@ -0,0 +1,9 @@
+export declare const falsyToString: <T>(value: T) => T | string;
+
+export declare const isEmptyObject: (obj: unknown) => boolean;
+
+export declare const flatMergeArrays: <T extends unknown[]>(...arrays: T[]) => T;
+
+export declare const mergeObjects: (obj1: unknown, obj2: unknown) => unknown;
+
+export declare const removeExtraSpaces: (str: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-variants",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "🦄 Tailwindcss first-class variant API",
   "author": "Junior Garcia <jrgarciadev@gmail.com>",
   "license": "MIT",
@@ -35,7 +35,7 @@
     "test": "jest --verbose"
   },
   "dependencies": {
-    "tailwind-merge": "^1.10.0"
+    "tailwind-merge": "^1.13.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.2.0",
@@ -67,7 +67,7 @@
     "ts-node": "^10.9.1",
     "tslib": "^2.4.1",
     "tsup": "6.6.3",
-    "typescript": "4.9.5",
+    "typescript": "5.1.3",
     "webpack": "^5.53.0"
   },
   "peerDependencies": {