tailwind-variants 0.0.11 → 0.0.13

package/README.md

@@ -1,3 +1,23 @@
+<p align="center">
+  <a href="https://tailwind-variants.org">
+    <img width="20%" src=".github/assets/isotipo.png" alt="tailwind-variants" />
+    <h1 align="center">tailwind-variants</h1>
+  </a>
+</p>
+<p align="center">
+  The <em>power</em> of Tailwind combined with a <em>first-class</em> variant API.<br><br>
+  <a href="https://www.npmjs.com/package/tailwind-variants">
+    <img src="https://img.shields.io/npm/dm/tailwind-variants.svg?style=flat-round" alt="npm downloads">
+  </a>
+  <a href="https://www.npmjs.com/package/tailwind-variants">
+    <img alt="NPM Version" src="https://badgen.net/npm/v/tailwind-variants" />
+  </a>
+  <a href="https://github.com/nextui-org/tailwind-variants/blob/main/LICENSE">
+    <img src="https://img.shields.io/npm/l/tailwind-variants?style=flat" alt="License">
+  </a>
+</p>
+
+
 # Tailwind Variants
 
 🚧 Under construction - please check back later

package/dist/index.cjs

@@ -3,6 +3,6 @@
 var classVarianceAuthority = require('class-variance-authority');
 var tailwindMerge = require('tailwind-merge');
 
-var j=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,g=e=>e&&Object.keys(e).length>0,i=(...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;let{slots:l={},variants:b={},defaultVariants:m={},compoundVariants:y=[]}=e;if(b==null&&!g(l))return i(e==null?void 0:e.base,n==null?void 0:n.class,n==null?void 0:n.className)(f);if(y&&!Array.isArray(y))throw new TypeError(`The "compoundVariants" prop must be an array. Received: ${typeof y}`);let d={base:e==null?void 0:e.base,...l},w=t=>{let a=n==null?void 0:n[t],r=m==null?void 0:m[t];if(a===null)return null;let u=j(a)||j(r);return b[t][u]},N=b?Object.keys(b).map(w):null,V=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=y==null?void 0:y.reduce((t,{class:a,className:r,...u})=>Object.entries(u).every(([c,s])=>Array.isArray(s)?s.includes({...m,...M}[c]):{...m,...M}[c]===s)?[...t,a,r]:t,[]),A=()=>{let t=x;return Array.isArray(t)?t.reduce((a,r)=>(typeof r=="string"&&(a.base=i(a.base,r)(f)),typeof r=="object"&&Object.entries(r).forEach(([u,c])=>{a[u]=i(a[u],c)(f);}),a),{}):t};if(g(l)){let t=(C=A())!=null?C:[];return {...typeof d=="object"&&g(d)?Object.keys(d).reduce((r,u)=>(r[u]=c=>i(u==="base"?e==null?void 0:e.base:[],d[u],V(u),t==null?void 0:t[u],c==null?void 0:c.class,c==null?void 0:c.className)(f),r),{}):{}}}return i(e==null?void 0:e.base,N,x,n==null?void 0:n.class,n==null?void 0:n.className)(f)};
+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)};
 
-exports.tv = F;
+exports.tv = J;

package/dist/index.d.ts

@@ -3,6 +3,8 @@ import {ClassValue, ClassProp, OmitUndefined, StringToBoolean} from "./utils";
 
 type TVBaseName = "base";
 
+type TVScreens = "initial" | "xs" | "sm" | "md" | "lg" | "xl" | "2xl";
+
 type TVSlots = Record<string, ClassValue> | undefined;
 
 type TVSlotsWithBase<S extends TVSlots, B extends ClassValue> = B extends undefined
@@ -33,6 +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 TVProps<V extends TVVariants<S>, S extends TVSlots> = {
   [K in keyof V]?: StringToBoolean<keyof V[K]>;
 } & ClassProp;
@@ -46,10 +54,11 @@ export type TVReturnType<V extends TVVariants<S>, S extends TVSlots, B extends C
     };
 
 export function tv<
-  DV extends TVDefaultVariants<V, S>,
+  V extends TVVariants<S>,
   CV extends TVCompoundVariants<V, S, B>,
+  DV extends TVDefaultVariants<V, S>,
+  SV extends TVScreenVariants<V>,
   C extends TVConfig,
-  V extends TVVariants<S>,
   B extends ClassValue = undefined,
   S extends TVSlots = undefined,
 >(
@@ -58,6 +67,7 @@ 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 j=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,g=e=>e&&Object.keys(e).length>0,i=(...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;let{slots:l={},variants:b={},defaultVariants:m={},compoundVariants:y=[]}=e;if(b==null&&!g(l))return i(e==null?void 0:e.base,n==null?void 0:n.class,n==null?void 0:n.className)(f);if(y&&!Array.isArray(y))throw new TypeError(`The "compoundVariants" prop must be an array. Received: ${typeof y}`);let d={base:e==null?void 0:e.base,...l},w=t=>{let a=n==null?void 0:n[t],r=m==null?void 0:m[t];if(a===null)return null;let u=j(a)||j(r);return b[t][u]},N=b?Object.keys(b).map(w):null,V=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=y==null?void 0:y.reduce((t,{class:a,className:r,...u})=>Object.entries(u).every(([c,s])=>Array.isArray(s)?s.includes({...m,...M}[c]):{...m,...M}[c]===s)?[...t,a,r]:t,[]),A=()=>{let t=x;return Array.isArray(t)?t.reduce((a,r)=>(typeof r=="string"&&(a.base=i(a.base,r)(f)),typeof r=="object"&&Object.entries(r).forEach(([u,c])=>{a[u]=i(a[u],c)(f);}),a),{}):t};if(g(l)){let t=(C=A())!=null?C:[];return {...typeof d=="object"&&g(d)?Object.keys(d).reduce((r,u)=>(r[u]=c=>i(u==="base"?e==null?void 0:e.base:[],d[u],V(u),t==null?void 0:t[u],c==null?void 0:c.class,c==null?void 0:c.className)(f),r),{}):{}}}return i(e==null?void 0:e.base,N,x,n==null?void 0:n.class,n==null?void 0:n.className)(f)};
+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)};
 
-export { F as tv };
+export { J as tv };

package/dist/utils.d.ts

@@ -8,7 +8,7 @@ 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[];
+export declare const joinObjects: (obj1: object, obj2: object) => object;
 
 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.11",
+  "version": "0.0.13",
   "description": "🦄 Tailwindcss first-class variant API",
   "author": "Junior Garcia <jrgarciadev@gmail.com>",
   "license": "MIT",