tailwind-variants 0.0.13 → 0.0.15

package/dist/index.cjs

@@ -3,6 +3,6 @@
 var classVarianceAuthority = require('class-variance-authority');
 var tailwindMerge = require('tailwind-merge');
 
-var $=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,m=e=>e&&Object.keys(e).length>0,j=(...e)=>(s={})=>s.twMerge?(m(s.twMergeConfig)?tailwindMerge.extendTailwindMerge(s.twMergeConfig):tailwindMerge.twMerge)(classVarianceAuthority.cx(e)):classVarianceAuthority.cx(e),B=(e,s)=>{let f={};return typeof e!="object"||typeof s!="object"||Object.keys(e).forEach(u=>{s[u]?f[u]=classVarianceAuthority.cx([e[u],s[u]]):f[u]=e[u];}),f};var J=(e,s={twMerge:!0,twMergeConfig:{}})=>f=>{var x;let{slots:u={},variants:l={},compoundVariants:b=[],defaultVariants:d={},screenVariants:g={initial:{}}}=e;if(l==null&&!m(u))return j(e==null?void 0:e.base,f==null?void 0:f.class,f==null?void 0:f.className)(s);if(b&&!Array.isArray(b))throw new TypeError(`The "compoundVariants" prop must be an array. Received: ${typeof b}`);let M={base:e==null?void 0:e.base,...u},S=(t,r,n,a=[])=>{let i=a;if(typeof r=="string")i.push(r.split(" ").map(c=>`${t}:${c}`));else if(Array.isArray(r))i.push(r.flatMap(c=>`${t}:${c}`));else if(typeof r=="object"&&typeof n=="string"){let c=r==null?void 0:r[n];c&&typeof c=="string"?i[n]=i[n]?[...i[n],...c.split(" ").map(y=>`${t}:${y}`)]:c.split(" ").map(y=>`${t}:${y}`):Array.isArray(c)&&c.length>0&&(i[n]=c.flatMap(y=>`${t}:${y}`));}return i},C=(t,r=null)=>{var A;let n=f==null?void 0:f[t],a=l==null?void 0:l[t],i=((A=g==null?void 0:g.initial)==null?void 0:A[t])||(d==null?void 0:d[t]),c=Object.keys(g).reduce((N,O)=>{var E;if(O==="initial")return N;let U=(E=g[O])==null?void 0:E[t],W=a==null?void 0:a[U];return S(O,W,r,N)},[]);if(typeof a!="object"||!m(a)||n===null)return null;let y=$(n)||$(i);return typeof c=="object"&&typeof r=="string"&&c[r]?B(c,a[y]):c.length>0?[a[y],...c]:a[y]},T=l?Object.keys(l).map(C):null,o=t=>!l||typeof l!="object"?null:Object.keys(l).map(r=>{let n=C(r,t);return t==="base"&&typeof n=="string"?n:n&&n[t]}).filter(Boolean),F=f&&Object.fromEntries(Object.entries(f).filter(([,t])=>t!==void 0)),h=b==null?void 0:b.filter(({class:t,className:r,...n})=>Object.entries(n).every(([a,i])=>{let c={...d,...g.initial,...F};return Array.isArray(i)?i.includes(c[a]):c[a]===i})).flatMap(({class:t,className:r})=>[t,r]),R=()=>{let t=h;return Array.isArray(t)?t.reduce((r,n)=>(typeof n=="string"&&(r.base=j(r.base,n)(s)),typeof n=="object"&&Object.entries(n).forEach(([a,i])=>{r[a]=j(r[a],i)(s);}),r),{}):t};if(m(u)){let t=(x=R())!=null?x:[];return {...typeof M=="object"&&m(M)?Object.keys(M).reduce((n,a)=>(n[a]=i=>j(M[a],o(a),t==null?void 0:t[a],i==null?void 0:i.class,i==null?void 0:i.className)(s),n),{}):{}}}return j(e==null?void 0:e.base,T,h,f==null?void 0:f.class,f==null?void 0:f.className)(s)};
+var w=t=>typeof t=="boolean"?`${t}`:t===0?"0":t,g=t=>t&&Object.keys(t).length>0,j=(...t)=>(u={})=>u.twMerge?(g(u.twMergeConfig)?tailwindMerge.extendTailwindMerge(u.twMergeConfig):tailwindMerge.twMerge)(classVarianceAuthority.cx(t)):classVarianceAuthority.cx(t),E=(t,u)=>{let e={};return typeof t!="object"||typeof u!="object"||Object.keys(t).forEach(s=>{u[s]?e[s]=classVarianceAuthority.cx([t[s],u[s]]):e[s]=t[s];}),e},$=t=>!t||typeof t!="string"?t:t.replace(/\s+/g," ").trim();var H=(t,u={twMerge:!0,twMergeConfig:{}})=>e=>{var A;let{slots:s={},variants:y={},compoundVariants:b=[],defaultVariants:d={}}=t;if(y==null&&!g(s))return j(t==null?void 0:t.base,e==null?void 0:e.class,e==null?void 0:e.className)(u);if(b&&!Array.isArray(b))throw new TypeError(`The "compoundVariants" prop must be an array. Received: ${typeof b}`);let x={base:t==null?void 0:t.base,...s},S=(r,n,f=[],i)=>{let a=f;if(typeof n=="string")a.push($(n).split(" ").map(c=>`${r}:${c}`));else if(Array.isArray(n))a.push(n.flatMap(c=>`${r}:${c}`));else if(typeof n=="object"&&typeof i=="string"){let c=n==null?void 0:n[i];if(c&&typeof c=="string"){let l=$(c);a[i]=a[i]?[...a[i],...l.split(" ").map(m=>`${r}:${m}`)]:l.split(" ").map(m=>`${r}:${m}`);}else Array.isArray(c)&&c.length>0&&(a[i]=c.flatMap(l=>`${r}:${l}`));}return a},C=(r,n=null)=>{let f=y==null?void 0:y[r];if(typeof f!="object"||!g(f))return null;let i=e==null?void 0:e[r],a=d==null?void 0:d[r],c=[];if(i===null)return null;let l=w(i);typeof l=="object"&&(c=Object.keys(l).reduce((N,M)=>{let o=l[M],R=f==null?void 0:f[o];return M==="initial"?(a=o,N):S(M,R,N,n)},[]));let m=f[l]||f[w(a)];return typeof c=="object"&&typeof n=="string"&&c[n]?E(c,m):c.length>0?[m,...c]:m},B=y?Object.keys(y).map(C):null,T=r=>!y||typeof y!="object"?null:Object.keys(y).map(n=>{let f=C(n,r);return r==="base"&&typeof f=="string"?f:f&&f[r]}).filter(Boolean),v=e&&Object.fromEntries(Object.entries(e).filter(([,r])=>r!==void 0)),h=b==null?void 0:b.filter(({class:r,className:n,...f})=>Object.entries(f).every(([i,a])=>{var m;let c=typeof(e==null?void 0:e[i])=="object"?(m=e[i])==null?void 0:m.initial:{},l={...d,...c,...v};return Array.isArray(a)?a.includes(l[i]):l[i]===a})).flatMap(({class:r,className:n})=>[r,n]),F=()=>{let r=h;return Array.isArray(r)?r.reduce((n,f)=>(typeof f=="string"&&(n.base=j(n.base,f)(u)),typeof f=="object"&&Object.entries(f).forEach(([i,a])=>{n[i]=j(n[i],a)(u);}),n),{}):r};if(g(s)){let r=(A=F())!=null?A:[];return {...typeof x=="object"&&g(x)?Object.keys(x).reduce((f,i)=>(f[i]=a=>j(x[i],T(i),r==null?void 0:r[i],a==null?void 0:a.class,a==null?void 0:a.className)(u),f),{}):{}}}return j(t==null?void 0:t.base,B,h,e==null?void 0:e.class,e==null?void 0:e.className)(u)};
 
-exports.tv = J;
+exports.tv = H;

package/dist/index.d.ts

@@ -35,14 +35,12 @@ export type TVDefaultVariants<V extends TVVariants<S>, S extends TVSlots> = {
   [K in keyof V]?: StringToBoolean<keyof V[K]>;
 };
 
-export type TVScreenVariants<V extends TVVariants<S>> = {
-  [K in TVScreens]?: {
-    [K in keyof V]?: StringToBoolean<keyof V[K]>;
-  };
+export type TVScreenPropsValue<V extends TVVariants<S>, K extends keyof V> = {
+  [K2 in TVScreens]?: StringToBoolean<keyof V[K]>;
 };
 
 export type TVProps<V extends TVVariants<S>, S extends TVSlots> = {
-  [K in keyof V]?: StringToBoolean<keyof V[K]>;
+  [K in keyof V]?: StringToBoolean<keyof V[K]> | TVScreenPropsValue<V, K>;
 } & ClassProp;
 
 export type TVReturnType<V extends TVVariants<S>, S extends TVSlots, B extends ClassValue> = (
@@ -57,7 +55,6 @@ export function tv<
   V extends TVVariants<S>,
   CV extends TVCompoundVariants<V, S, B>,
   DV extends TVDefaultVariants<V, S>,
-  SV extends TVScreenVariants<V>,
   C extends TVConfig,
   B extends ClassValue = undefined,
   S extends TVSlots = undefined,
@@ -67,7 +64,6 @@ export function tv<
     slots?: S;
     variants?: V;
     compoundVariants?: CV;
-    screenVariants?: SV;
     defaultVariants?: DV;
   },
   config?: C,

package/dist/index.js

@@ -1,6 +1,6 @@
 import { cx } from 'class-variance-authority';
 import { extendTailwindMerge, twMerge } from 'tailwind-merge';
 
-var $=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,m=e=>e&&Object.keys(e).length>0,j=(...e)=>(s={})=>s.twMerge?(m(s.twMergeConfig)?extendTailwindMerge(s.twMergeConfig):twMerge)(cx(e)):cx(e),B=(e,s)=>{let f={};return typeof e!="object"||typeof s!="object"||Object.keys(e).forEach(u=>{s[u]?f[u]=cx([e[u],s[u]]):f[u]=e[u];}),f};var J=(e,s={twMerge:!0,twMergeConfig:{}})=>f=>{var x;let{slots:u={},variants:l={},compoundVariants:b=[],defaultVariants:d={},screenVariants:g={initial:{}}}=e;if(l==null&&!m(u))return j(e==null?void 0:e.base,f==null?void 0:f.class,f==null?void 0:f.className)(s);if(b&&!Array.isArray(b))throw new TypeError(`The "compoundVariants" prop must be an array. Received: ${typeof b}`);let M={base:e==null?void 0:e.base,...u},S=(t,r,n,a=[])=>{let i=a;if(typeof r=="string")i.push(r.split(" ").map(c=>`${t}:${c}`));else if(Array.isArray(r))i.push(r.flatMap(c=>`${t}:${c}`));else if(typeof r=="object"&&typeof n=="string"){let c=r==null?void 0:r[n];c&&typeof c=="string"?i[n]=i[n]?[...i[n],...c.split(" ").map(y=>`${t}:${y}`)]:c.split(" ").map(y=>`${t}:${y}`):Array.isArray(c)&&c.length>0&&(i[n]=c.flatMap(y=>`${t}:${y}`));}return i},C=(t,r=null)=>{var A;let n=f==null?void 0:f[t],a=l==null?void 0:l[t],i=((A=g==null?void 0:g.initial)==null?void 0:A[t])||(d==null?void 0:d[t]),c=Object.keys(g).reduce((N,O)=>{var E;if(O==="initial")return N;let U=(E=g[O])==null?void 0:E[t],W=a==null?void 0:a[U];return S(O,W,r,N)},[]);if(typeof a!="object"||!m(a)||n===null)return null;let y=$(n)||$(i);return typeof c=="object"&&typeof r=="string"&&c[r]?B(c,a[y]):c.length>0?[a[y],...c]:a[y]},T=l?Object.keys(l).map(C):null,o=t=>!l||typeof l!="object"?null:Object.keys(l).map(r=>{let n=C(r,t);return t==="base"&&typeof n=="string"?n:n&&n[t]}).filter(Boolean),F=f&&Object.fromEntries(Object.entries(f).filter(([,t])=>t!==void 0)),h=b==null?void 0:b.filter(({class:t,className:r,...n})=>Object.entries(n).every(([a,i])=>{let c={...d,...g.initial,...F};return Array.isArray(i)?i.includes(c[a]):c[a]===i})).flatMap(({class:t,className:r})=>[t,r]),R=()=>{let t=h;return Array.isArray(t)?t.reduce((r,n)=>(typeof n=="string"&&(r.base=j(r.base,n)(s)),typeof n=="object"&&Object.entries(n).forEach(([a,i])=>{r[a]=j(r[a],i)(s);}),r),{}):t};if(m(u)){let t=(x=R())!=null?x:[];return {...typeof M=="object"&&m(M)?Object.keys(M).reduce((n,a)=>(n[a]=i=>j(M[a],o(a),t==null?void 0:t[a],i==null?void 0:i.class,i==null?void 0:i.className)(s),n),{}):{}}}return j(e==null?void 0:e.base,T,h,f==null?void 0:f.class,f==null?void 0:f.className)(s)};
+var w=t=>typeof t=="boolean"?`${t}`:t===0?"0":t,g=t=>t&&Object.keys(t).length>0,j=(...t)=>(u={})=>u.twMerge?(g(u.twMergeConfig)?extendTailwindMerge(u.twMergeConfig):twMerge)(cx(t)):cx(t),E=(t,u)=>{let e={};return typeof t!="object"||typeof u!="object"||Object.keys(t).forEach(s=>{u[s]?e[s]=cx([t[s],u[s]]):e[s]=t[s];}),e},$=t=>!t||typeof t!="string"?t:t.replace(/\s+/g," ").trim();var H=(t,u={twMerge:!0,twMergeConfig:{}})=>e=>{var A;let{slots:s={},variants:y={},compoundVariants:b=[],defaultVariants:d={}}=t;if(y==null&&!g(s))return j(t==null?void 0:t.base,e==null?void 0:e.class,e==null?void 0:e.className)(u);if(b&&!Array.isArray(b))throw new TypeError(`The "compoundVariants" prop must be an array. Received: ${typeof b}`);let x={base:t==null?void 0:t.base,...s},S=(r,n,f=[],i)=>{let a=f;if(typeof n=="string")a.push($(n).split(" ").map(c=>`${r}:${c}`));else if(Array.isArray(n))a.push(n.flatMap(c=>`${r}:${c}`));else if(typeof n=="object"&&typeof i=="string"){let c=n==null?void 0:n[i];if(c&&typeof c=="string"){let l=$(c);a[i]=a[i]?[...a[i],...l.split(" ").map(m=>`${r}:${m}`)]:l.split(" ").map(m=>`${r}:${m}`);}else Array.isArray(c)&&c.length>0&&(a[i]=c.flatMap(l=>`${r}:${l}`));}return a},C=(r,n=null)=>{let f=y==null?void 0:y[r];if(typeof f!="object"||!g(f))return null;let i=e==null?void 0:e[r],a=d==null?void 0:d[r],c=[];if(i===null)return null;let l=w(i);typeof l=="object"&&(c=Object.keys(l).reduce((N,M)=>{let o=l[M],R=f==null?void 0:f[o];return M==="initial"?(a=o,N):S(M,R,N,n)},[]));let m=f[l]||f[w(a)];return typeof c=="object"&&typeof n=="string"&&c[n]?E(c,m):c.length>0?[m,...c]:m},B=y?Object.keys(y).map(C):null,T=r=>!y||typeof y!="object"?null:Object.keys(y).map(n=>{let f=C(n,r);return r==="base"&&typeof f=="string"?f:f&&f[r]}).filter(Boolean),v=e&&Object.fromEntries(Object.entries(e).filter(([,r])=>r!==void 0)),h=b==null?void 0:b.filter(({class:r,className:n,...f})=>Object.entries(f).every(([i,a])=>{var m;let c=typeof(e==null?void 0:e[i])=="object"?(m=e[i])==null?void 0:m.initial:{},l={...d,...c,...v};return Array.isArray(a)?a.includes(l[i]):l[i]===a})).flatMap(({class:r,className:n})=>[r,n]),F=()=>{let r=h;return Array.isArray(r)?r.reduce((n,f)=>(typeof f=="string"&&(n.base=j(n.base,f)(u)),typeof f=="object"&&Object.entries(f).forEach(([i,a])=>{n[i]=j(n[i],a)(u);}),n),{}):r};if(g(s)){let r=(A=F())!=null?A:[];return {...typeof x=="object"&&g(x)?Object.keys(x).reduce((f,i)=>(f[i]=a=>j(x[i],T(i),r==null?void 0:r[i],a==null?void 0:a.class,a==null?void 0:a.className)(u),f),{}):{}}}return j(t==null?void 0:t.base,B,h,e==null?void 0:e.class,e==null?void 0:e.className)(u)};
 
-export { J as tv };
+export { H as tv };

package/dist/utils.d.ts

@@ -10,6 +10,8 @@ export declare const cx: <T extends CxOptions>(...classes: T) => (config: TVConf
 
 export declare const joinObjects: (obj1: object, obj2: object) => object;
 
+export declare const removeExtraSpaces: (str: string) => string;
+
 export declare type ClassPropKey = "class" | "className";
 export declare type ClassValue = string | string[] | null | undefined;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-variants",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "🦄 Tailwindcss first-class variant API",
   "author": "Junior Garcia <jrgarciadev@gmail.com>",
   "license": "MIT",