tailwind-variants 0.0.12 → 0.0.14

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

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,8 +35,12 @@ export type TVDefaultVariants<V extends TVVariants<S>, S extends TVSlots> = {
   [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> = (
@@ -45,16 +51,10 @@ export type TVReturnType<V extends TVVariants<S>, S extends TVSlots, B extends C
       [K in TVSlotsWithBase<S, B>]: (slotProps?: ClassProp) => string;
     };
 
-export type TVDark<S extends TVSlots, B extends ClassValue> =
-  | {
-      [K in TVSlotsWithBase<S, B>]?: ClassValue;
-    }
-  | ClassValue;
-
 export function tv<
   V extends TVVariants<S>,
-  DV extends TVDefaultVariants<V, S>,
   CV extends TVCompoundVariants<V, S, B>,
+  DV extends TVDefaultVariants<V, S>,
   C extends TVConfig,
   B extends ClassValue = undefined,
   S extends TVSlots = undefined,
@@ -62,7 +62,6 @@ export function tv<
   options: {
     base?: B;
     slots?: S;
-    dark?: TVDark<S, B>;
     variants?: V;
     compoundVariants?: CV;
     defaultVariants?: DV;

package/dist/index.js

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

package/dist/utils.d.ts

@@ -8,7 +8,9 @@ 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 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.12",
+  "version": "0.0.14",
   "description": "🦄 Tailwindcss first-class variant API",
   "author": "Junior Garcia <jrgarciadev@gmail.com>",
   "license": "MIT",