tailwind-variants 0.0.8 → 0.0.10

package/dist/index.cjs

@@ -3,6 +3,6 @@
 var classVarianceAuthority = require('class-variance-authority');
 var tailwindMerge = require('tailwind-merge');
 
-var O=e=>{var i;return (i=e==null?void 0:e.filter)==null?void 0:i.call(e,n=>n&&String(n).match(/^[\w\s]*$/))},o=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,D=e=>e&&Object.keys(e).length>0,f=(...e)=>(i={})=>i.twMerge?(D(i.twMergeConfig)?tailwindMerge.extendTailwindMerge(i.twMergeConfig):tailwindMerge.twMerge)(classVarianceAuthority.cx(e)):classVarianceAuthority.cx(e),S=e=>Array.from(new Set(e));var K=(e,i={twMerge:!0,twMergeConfig:{}})=>n=>{var j,V;if((e==null?void 0:e.variants)==null)return f(e==null?void 0:e.base,n==null?void 0:n.class,n==null?void 0:n.className)(i);let{slots:d=[],variants:g,defaultVariants:b}=e,w=Array.isArray(d)?S(["base",...d]):[],x=t=>{let r=n==null?void 0:n[t],a=b==null?void 0:b[t];if(r===null)return null;let u=o(r)||o(a);return g[t][u]},h=Object.keys(g).map(x),C=t=>Object.keys(g).map(r=>{let a=x(r);return !a||typeof a!="object"?null:a[t]}),M=n&&Object.entries(n).reduce((t,[r,a])=>(a===void 0||(t[r]=a),t),{}),A=(j=e==null?void 0:e.compoundVariants)==null?void 0:j.reduce((t,{class:r,className:a,...u})=>Object.entries(u).every(([m,c])=>Array.isArray(c)?c.includes({...b,...M}[m]):{...b,...M}[m]===c)?[...t,r,a]:t,[]),B=()=>{let t=O(A);return Array.isArray(t)?t.reduce((r,a)=>(typeof a=="string"&&(r.base=f(r.base,a)(i)),typeof a=="object"&&Object.entries(a).forEach(([u,m])=>{r[u]=f(r[u],m)(i);}),r),{}):t};if(w.length>1){let t=C("base"),r=(V=B())!=null?V:[];return {...w.reduce((u,m)=>(u[m]=c=>f(m==="base"?[e==null?void 0:e.base,t]:[],C(m),r==null?void 0:r[m],c==null?void 0:c.class,c==null?void 0:c.className)(i),u),{})}}return f(e==null?void 0:e.base,h,A,n==null?void 0:n.class,n==null?void 0:n.className)(i)};
+var i=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,g=e=>e&&Object.keys(e).length>0,m=(...e)=>(f={})=>f.twMerge?(g(f.twMergeConfig)?tailwindMerge.extendTailwindMerge(f.twMergeConfig):tailwindMerge.twMerge)(classVarianceAuthority.cx(e)):classVarianceAuthority.cx(e);var F=(e,f={twMerge:!0,twMergeConfig:{}})=>n=>{var C,O;let{slots:l={},variants:b,defaultVariants:y}=e;if(b==null&&!g(l))return m(e==null?void 0:e.base,n==null?void 0:n.class,n==null?void 0:n.className)(f);let d={base:e==null?void 0:e.base,...l},w=t=>{let a=n==null?void 0:n[t],r=y==null?void 0:y[t];if(a===null)return null;let u=i(a)||i(r);return b[t][u]},s=b?Object.keys(b).map(w):null,N=t=>!b||typeof b!="object"?null:Object.keys(b).map(a=>{let r=w(a);return t==="base"&&typeof r=="string"?r:!r||typeof r!="object"?null:r[t]}),M=n&&Object.entries(n).reduce((t,[a,r])=>(r===void 0||(t[a]=r),t),{}),x=(C=e==null?void 0:e.compoundVariants)==null?void 0:C.reduce((t,{class:a,className:r,...u})=>Object.entries(u).every(([c,j])=>Array.isArray(j)?j.includes({...y,...M}[c]):{...y,...M}[c]===j)?[...t,a,r]:t,[]),A=()=>{let t=x;return Array.isArray(t)?t.reduce((a,r)=>(typeof r=="string"&&(a.base=m(a.base,r)(f)),typeof r=="object"&&Object.entries(r).forEach(([u,c])=>{a[u]=m(a[u],c)(f);}),a),{}):t};if(g(l)){let t=(O=A())!=null?O:[];return {...typeof d=="object"&&g(d)?Object.keys(d).reduce((r,u)=>(r[u]=c=>m(u==="base"?e==null?void 0:e.base:[],d[u],N(u),t==null?void 0:t[u],c==null?void 0:c.class,c==null?void 0:c.className)(f),r),{}):{}}}return m(e==null?void 0:e.base,s,x,n==null?void 0:n.class,n==null?void 0:n.className)(f)};
 
-exports.tv = K;
+exports.tv = F;

package/dist/index.d.ts

@@ -1,59 +1,67 @@
 import {TVConfig} from "./config";
-import {ClassValue, ClassProp, OmitUndefined, StringToBoolean, AddItemToArray} from "./utils";
+import {ClassValue, ClassProp, OmitUndefined, StringToBoolean} from "./utils";
 
-type TVDefaultSlot = "";
 type TVBaseName = "base";
 
-type SlotsWithBase<S extends string[]> = AddItemToArray<S, TVBaseName>;
+type TVSlots = Record<string, ClassValue> | undefined;
 
-type SlotsClassValue<S extends string[]> = {
-  [K in SlotsWithBase<S>[number]]: ClassValue;
+type TVSlotsWithBase<S extends TVSlots, B extends ClassValue> = B extends undefined
+  ? keyof S
+  : keyof S | TVBaseName;
+
+type SlotsClassValue<S extends TVSlots, B extends ClassValue> = {
+  [K in TVSlotsWithBase<S, B>]?: ClassValue;
 };
 
-export declare type TVVariants<S extends string[]> = {
+export type TVVariants<S extends TVSlots, B extends ClassValue> = {
   [key: string]: {
-    [key: string]: S extends TVDefaultSlot ? ClassValue : SlotsClassValue<S> | ClassValue;
+    [key: string]: S extends TVSlots ? SlotsClassValue<S, B> | ClassValue : ClassValue;
   };
 };
 
-export declare type TVCompoundVariants<V extends TVVariants<S>, S extends string[]> = Array<
+export type TVCompoundVariants<
+  V extends TVVariants<S>,
+  S extends TVSlots,
+  B extends ClassValue,
+> = Array<
   {
-    [K in keyof V]?: StringToBoolean<keyof V[K]>;
-  } & ClassProp<SlotsClassValue<S> | ClassValue>
+    [K in keyof V]?: StringToBoolean<keyof V[K]> | StringToBoolean<keyof V[K]>[];
+  } & ClassProp<SlotsClassValue<S, B> | ClassValue>
 >;
 
-export declare type TVDefaultVariants<V extends TVVariants<S>, S extends string[]> = {
+export type TVDefaultVariants<V extends TVVariants<S>, S extends TVSlots> = {
   [K in keyof V]?: StringToBoolean<keyof V[K]>;
 };
 
-export declare type TVProps<V extends TVVariants<S>, S extends string[]> = {
+export type TVProps<V extends TVVariants<S>, S extends TVSlots> = {
   [K in keyof V]?: StringToBoolean<keyof V[K]>;
 } & ClassProp;
 
-export declare type TVReturnType<V extends TVVariants<S>, S extends string> = (
-  props?: TVProps<V, S[]>,
-) => S extends TVDefaultSlot
+export type TVReturnType<V extends TVVariants<S>, S extends TVSlots, B extends ClassValue> = (
+  props?: TVProps<V, S>,
+) => S extends undefined
   ? string
   : {
-      [K in SlotsWithBase<S[]>[number]]: (props?: ClassProp) => string;
+      [K in TVSlotsWithBase<S, B>]: (slotProps?: ClassProp) => string;
     };
 
-export declare function tv<
-  V extends TVVariants<S[]>,
-  DV extends TVDefaultVariants<V, S[]>,
-  CV extends TVCompoundVariants<V, S[]>,
+export function tv<
+  DV extends TVDefaultVariants<V, S>,
+  CV extends TVCompoundVariants<V, S, B>,
   C extends TVConfig,
-  S extends string = TVDefaultSlot,
+  V extends TVVariants<S>,
+  B extends ClassValue = undefined,
+  S extends TVSlots = undefined,
 >(
   options: {
-    base?: ClassValue;
-    slots?: S[];
+    base?: B;
+    slots?: S;
     variants?: V;
     compoundVariants?: CV;
     defaultVariants?: DV;
   },
   config?: C,
-): TVReturnType<V, S>;
+): TVReturnType<V, S, B>;
 
 export type VariantProps<Component extends (...args: any) => any> = Omit<
   OmitUndefined<Parameters<Component>[0]>,

package/dist/index.js

@@ -1,6 +1,6 @@
 import { cx } from 'class-variance-authority';
 import { extendTailwindMerge, twMerge } from 'tailwind-merge';
 
-var O=e=>{var i;return (i=e==null?void 0:e.filter)==null?void 0:i.call(e,n=>n&&String(n).match(/^[\w\s]*$/))},o=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,D=e=>e&&Object.keys(e).length>0,f=(...e)=>(i={})=>i.twMerge?(D(i.twMergeConfig)?extendTailwindMerge(i.twMergeConfig):twMerge)(cx(e)):cx(e),S=e=>Array.from(new Set(e));var K=(e,i={twMerge:!0,twMergeConfig:{}})=>n=>{var j,V;if((e==null?void 0:e.variants)==null)return f(e==null?void 0:e.base,n==null?void 0:n.class,n==null?void 0:n.className)(i);let{slots:d=[],variants:g,defaultVariants:b}=e,w=Array.isArray(d)?S(["base",...d]):[],x=t=>{let r=n==null?void 0:n[t],a=b==null?void 0:b[t];if(r===null)return null;let u=o(r)||o(a);return g[t][u]},h=Object.keys(g).map(x),C=t=>Object.keys(g).map(r=>{let a=x(r);return !a||typeof a!="object"?null:a[t]}),M=n&&Object.entries(n).reduce((t,[r,a])=>(a===void 0||(t[r]=a),t),{}),A=(j=e==null?void 0:e.compoundVariants)==null?void 0:j.reduce((t,{class:r,className:a,...u})=>Object.entries(u).every(([m,c])=>Array.isArray(c)?c.includes({...b,...M}[m]):{...b,...M}[m]===c)?[...t,r,a]:t,[]),B=()=>{let t=O(A);return Array.isArray(t)?t.reduce((r,a)=>(typeof a=="string"&&(r.base=f(r.base,a)(i)),typeof a=="object"&&Object.entries(a).forEach(([u,m])=>{r[u]=f(r[u],m)(i);}),r),{}):t};if(w.length>1){let t=C("base"),r=(V=B())!=null?V:[];return {...w.reduce((u,m)=>(u[m]=c=>f(m==="base"?[e==null?void 0:e.base,t]:[],C(m),r==null?void 0:r[m],c==null?void 0:c.class,c==null?void 0:c.className)(i),u),{})}}return f(e==null?void 0:e.base,h,A,n==null?void 0:n.class,n==null?void 0:n.className)(i)};
+var i=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,g=e=>e&&Object.keys(e).length>0,m=(...e)=>(f={})=>f.twMerge?(g(f.twMergeConfig)?extendTailwindMerge(f.twMergeConfig):twMerge)(cx(e)):cx(e);var F=(e,f={twMerge:!0,twMergeConfig:{}})=>n=>{var C,O;let{slots:l={},variants:b,defaultVariants:y}=e;if(b==null&&!g(l))return m(e==null?void 0:e.base,n==null?void 0:n.class,n==null?void 0:n.className)(f);let d={base:e==null?void 0:e.base,...l},w=t=>{let a=n==null?void 0:n[t],r=y==null?void 0:y[t];if(a===null)return null;let u=i(a)||i(r);return b[t][u]},s=b?Object.keys(b).map(w):null,N=t=>!b||typeof b!="object"?null:Object.keys(b).map(a=>{let r=w(a);return t==="base"&&typeof r=="string"?r:!r||typeof r!="object"?null:r[t]}),M=n&&Object.entries(n).reduce((t,[a,r])=>(r===void 0||(t[a]=r),t),{}),x=(C=e==null?void 0:e.compoundVariants)==null?void 0:C.reduce((t,{class:a,className:r,...u})=>Object.entries(u).every(([c,j])=>Array.isArray(j)?j.includes({...y,...M}[c]):{...y,...M}[c]===j)?[...t,a,r]:t,[]),A=()=>{let t=x;return Array.isArray(t)?t.reduce((a,r)=>(typeof r=="string"&&(a.base=m(a.base,r)(f)),typeof r=="object"&&Object.entries(r).forEach(([u,c])=>{a[u]=m(a[u],c)(f);}),a),{}):t};if(g(l)){let t=(O=A())!=null?O:[];return {...typeof d=="object"&&g(d)?Object.keys(d).reduce((r,u)=>(r[u]=c=>m(u==="base"?e==null?void 0:e.base:[],d[u],N(u),t==null?void 0:t[u],c==null?void 0:c.class,c==null?void 0:c.className)(f),r),{}):{}}}return m(e==null?void 0:e.base,s,x,n==null?void 0:n.class,n==null?void 0:n.className)(f)};
 
-export { K as tv };
+export { F as tv };

package/dist/utils.d.ts

@@ -2,10 +2,10 @@ import {CxOptions, CxReturn} from "class-variance-authority";
 
 import {TVConfig} from "./config";
 
-export declare const cleanArray: (array: string[]) => string[] | undefined;
-
 export declare const falsyToString: <T extends unknown>(value: T) => string | T;
 
+export declare const isNotEmptyObject: (obj: object) => boolean;
+
 export declare const cx: <T extends CxOptions>(...classes: T) => (config: TVConfig) => CxReturn;
 
 export declare const removeDuplicates: <T extends unknown>(array: T[]) => T[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-variants",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "🦄 Tailwindcss first-class variant API",
   "author": "Junior Garcia <jrgarciadev@gmail.com>",
   "license": "MIT",
@@ -61,6 +61,7 @@
     "prettier": "^2.2.1",
     "prettier-eslint": "^12.0.0",
     "prettier-eslint-cli": "^5.0.1",
+    "jest": "28.1.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.1",
     "tsup": "6.4.0",