tailwind-variants 0.0.4 → 0.0.6

package/dist/index.cjs

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

package/dist/index.d.ts

@@ -5,11 +5,13 @@ import {
   OmitUndefined,
   StringToBoolean,
   StringArrayToFunctions,
+  AddItemToArray,
 } from "./utils";
 
 type TVDefaultSlot = "";
+type TVBaseName = "base";
 
-type TVVariants<S extends string[]> = {
+export declare type TVVariants<S extends string[]> = {
   [key: string]: {
     [key: string]: S extends TVDefaultSlot
       ? ClassValue
@@ -17,23 +19,25 @@ type TVVariants<S extends string[]> = {
   };
 };
 
-type TVCompoundVariants<V extends TVVariants<S>, S extends string[]> = Array<
+export declare type TVCompoundVariants<V extends TVVariants<S>, S extends string[]> = Array<
   {
     [K in keyof V]?: StringToBoolean<keyof V[K]>;
   } & ClassProp<{[K in S[number]]?: ClassValue} | ClassValue>
 >;
 
-type TVDefaultVariants<V extends TVVariants<S>, S extends string[]> = {
+export declare type TVDefaultVariants<V extends TVVariants<S>, S extends string[]> = {
   [K in keyof V]?: StringToBoolean<keyof V[K]>;
 };
 
-type TVProps<V extends TVVariants<S>, S extends string[]> = {
+export declare type TVProps<V extends TVVariants<S>, S extends string[]> = {
   [K in keyof V]?: StringToBoolean<keyof V[K]>;
 } & ClassProp;
 
-type TVReturnType<V extends TVVariants<S>, S extends string[]> = (
-  props?: TVProps<V, S>,
-) => S extends TVDefaultSlot ? string : StringArrayToFunctions<S, ClassProp>;
+export declare type TVReturnType<V extends TVVariants<S>, S extends string> = (
+  props?: TVProps<V, S[]>,
+) => S extends TVDefaultSlot
+  ? string
+  : StringArrayToFunctions<AddItemToArray<S[], TVBaseName>, ClassProp>;
 
 export declare function tv<
   V extends TVVariants<S[]>,
@@ -50,7 +54,7 @@ export declare function tv<
     defaultVariants?: DV;
   },
   config?: C,
-): TVReturnType<V, S[]>;
+): TVReturnType<V, S>;
 
 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 g=e=>e.filter(c=>c),C=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,k=e=>e&&Object.keys(e).length>0,b=(...e)=>(c={})=>c.merge?(k(c.twMergeConfig)?extendTailwindMerge(c.twMergeConfig):twMerge)(cx(e)):cx(e);var W=(e,c={twMerge:!0,twMergeConfig:{}})=>a=>{var V;if((e==null?void 0:e.variants)==null)return b(e==null?void 0:e.base,a==null?void 0:a.class,a==null?void 0:a.className)(c);let{slots:w=[],variants:d,defaultVariants:f}=e,N=Array.isArray(w)?new Set(["base",...w.filter(n=>n!=="base")]):[],x=n=>{let t=a==null?void 0:a[n],r=f==null?void 0:f[n];if(t===null)return null;let i=C(t)||C(r);return d[n][i]},S=Object.keys(d).map(x),M=n=>g(Object.keys(d).map(t=>{let r=x(t);return !r||typeof r!="object"?null:r[n]})),j=a&&Object.entries(a).reduce((n,[t,r])=>(r===void 0||(n[t]=r),n),{}),A=(V=e==null?void 0:e.compoundVariants)==null?void 0:V.reduce((n,{class:t,className:r,...i})=>Object.entries(i).every(([m,u])=>Array.isArray(u)?u.includes({...f,...j}[m]):{...f,...j}[m]===u)?[...n,t,r]:n,[]),h=()=>{let n=g(A);return Array.isArray(n)?n.reduce((t,r)=>(typeof r=="string"&&(t.base=b(t.base,r)(c)),typeof r=="object"&&Object.entries(r).forEach(([i,m])=>{t[i]=b(t[i],m)(c);}),t),{}):n};if(N.length>1){let n=M("base"),t=h(),r=N.slice(1).reduce((i,m)=>(i[m]=u=>b(M(m),t[m],u==null?void 0:u.class,u==null?void 0:u.className)(c),i),{});return {base:i=>b(e==null?void 0:e.base,n,t.base,i==null?void 0:i.class,i==null?void 0:i.className)(c),...r}}return b(e==null?void 0:e.base,S,A,a==null?void 0:a.class,a==null?void 0:a.className)(c)};
+var d=e=>{var c;return (c=e==null?void 0:e.filter)==null?void 0:c.call(e,n=>n&&String(n).match(/^[\w\s]*$/))},w=e=>typeof e=="boolean"?`${e}`:e===0?"0":e,D=e=>e&&Object.keys(e).length>0,b=(...e)=>(c={})=>c.twMerge?(D(c.twMergeConfig)?extendTailwindMerge(c.twMergeConfig):twMerge)(cx(e)):cx(e),S=e=>Array.from(new Set(e));var K=(e,c={twMerge:!0,twMergeConfig:{}})=>n=>{var V;if((e==null?void 0:e.variants)==null)return b(e==null?void 0:e.base,n==null?void 0:n.class,n==null?void 0:n.className)(c);let{slots:C=[],variants:g,defaultVariants:f}=e,x=Array.isArray(C)?S(["base",...C]):[],M=t=>{let a=n==null?void 0:n[t],r=f==null?void 0:f[t];if(a===null)return null;let i=w(a)||w(r);return g[t][i]},h=Object.keys(g).map(M),N=t=>d(Object.keys(g).map(a=>{let r=M(a);return !r||typeof r!="object"?null:r[t]})),A=n&&Object.entries(n).reduce((t,[a,r])=>(r===void 0||(t[a]=r),t),{}),j=(V=e==null?void 0:e.compoundVariants)==null?void 0:V.reduce((t,{class:a,className:r,...i})=>Object.entries(i).every(([m,u])=>Array.isArray(u)?u.includes({...f,...A}[m]):{...f,...A}[m]===u)?[...t,a,r]:t,[]),B=()=>{let t=d(j);return Array.isArray(t)?t.reduce((a,r)=>(typeof r=="string"&&(a.base=b(a.base,r)(c)),typeof r=="object"&&Object.entries(r).forEach(([i,m])=>{a[i]=b(a[i],m)(c);}),a),{}):t};if(x.length>1){let t=N("base"),a=B(),r=x.slice(1).reduce((i,m)=>(i[m]=u=>b(N(m),a[m],u==null?void 0:u.class,u==null?void 0:u.className)(c),i),{});return {base:i=>b(e==null?void 0:e.base,t,a.base,i==null?void 0:i.class,i==null?void 0:i.className)(c),...r}}return b(e==null?void 0:e.base,h,j,n==null?void 0:n.class,n==null?void 0:n.className)(c)};
 
-export { W as tv };
+export { K as tv };

package/dist/utils.d.ts

@@ -2,16 +2,18 @@ import {CxOptions, CxReturn} from "class-variance-authority";
 
 import {TVConfig} from "./config";
 
-export declare const cleanArray: (array: string[]) => string[];
+export declare const cleanArray: (array: string[]) => string[] | undefined;
 
 export declare const falsyToString: <T extends unknown>(value: T) => string | T;
 
 export declare const cx: <T extends CxOptions>(...classes: T) => (config: TVConfig) => CxReturn;
 
-export type ClassPropKey = "class" | "className";
-export type ClassValue = string | string[] | null | undefined;
+export declare const removeDuplicates: <T extends unknown>(array: T[]) => T[];
 
-export type ClassProp<V extends unknown = ClassValue> =
+export declare type ClassPropKey = "class" | "className";
+export declare type ClassValue = string | string[] | null | undefined;
+
+export declare type ClassProp<V extends unknown = ClassValue> =
   | {
       class: V;
       className?: never;
@@ -19,13 +21,12 @@ export type ClassProp<V extends unknown = ClassValue> =
   | {class?: never; className: V}
   | {class?: never; className?: never};
 
-export type OmitUndefined<T> = T extends undefined ? never : T;
-export type StringToBoolean<T> = T extends "true" | "false" ? boolean : T;
+export declare type OmitUndefined<T> = T extends undefined ? never : T;
+
+export declare type StringToBoolean<T> = T extends "true" | "false" ? boolean : T;
 
-export type StringArrayToFunctions<T extends string[], Props = {}> = {
+export declare type StringArrayToFunctions<T extends string[], Props = {}> = {
   [K in T[number]]: (props?: Props) => string;
 };
 
-type Slots = ["trigger", "item", "list"];
-
-type SlotsReturnType = StringArrayToFunctions<Slots>;
+export declare type AddItemToArray<T extends unknown[], V> = [V, ...T];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-variants",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "🦄 Tailwindcss first-class variant API",
   "author": "Junior Garcia <jrgarciadev@gmail.com>",
   "license": "MIT",
@@ -15,25 +15,18 @@
     "url": "https://github.com/nextui-org/tailwind-variants/issues"
   },
   "type": "module",
-  "main": "src/index.ts",
+  "main": "dist/index.cjs",
   "typings": "./dist/index.d.ts",
   "sideEffects": false,
   "files": [
     "dist"
   ],
-  "exports": {
-    ".": {
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js",
-      "types": "./types/index.d.ts"
-    }
-  },
   "scripts": {
     "build": "tsup src/index.js && node copy-types.cjs",
     "dev": "pnpm build:fast -- --watch",
     "clean": "rimraf dist .turbo",
     "typecheck": "tsc --noEmit",
-    "dry-run": "pnpm ts-node tests/dry-run.js",
+    "dry-run": "node ./scripts/dry-run.js",
     "prepack": "clean-package",
     "postpack": "clean-package restore",
     "lint": "eslint -c .eslintrc.json ./src/**/*.{ts,tsx}",
@@ -51,6 +44,7 @@
     "@swc/cli": "0.1.57",
     "@swc/core": "1.2.198",
     "@types/jest": "28.1.1",
+    "@types/node": "^18.11.18",
     "@typescript-eslint/eslint-plugin": "^5.42.0",
     "@typescript-eslint/parser": "^5.42.0",
     "clean-package": "2.1.1",
@@ -68,6 +62,7 @@
     "prettier-eslint": "^12.0.0",
     "prettier-eslint-cli": "^5.0.1",
     "ts-node": "^10.9.1",
+    "tslib": "^2.4.1",
     "tsup": "6.4.0",
     "typescript": "4.6.2",
     "webpack": "^5.53.0"
@@ -83,15 +78,13 @@
     "node": ">=16.x",
     "pnpm": ">=7.x"
   },
-  "tsup": {
-    "clean": true,
-    "minify": true,
-    "treeshake": true,
-    "target": "es2019",
-    "format": [
-      "cjs",
-      "esm"
-    ]
-  },
-  "packageManager": "pnpm@7.14.2"
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js",
+      "types": "./types/index.d.ts"
+    }
+  }
 }

package/dist/types.d.ts

@@ -1,58 +0,0 @@
-import type {Config as TwMergeConfig} from "tailwind-merge";
-
-export type ClassPropKey = "class" | "className";
-export type ClassValue = string | null | undefined | ClassValue[];
-
-export type ClassProp =
-  | {
-      class: ClassValue;
-      className?: never;
-    }
-  | {class?: never; className: ClassValue}
-  | {class?: never; className?: never};
-
-export type OmitUndefined<T> = T extends undefined ? never : T;
-export type StringToBoolean<T> = T extends "true" | "false" ? boolean : T;
-
-export type Config = {
-  /**
-   * Whether to merge the class names with `tailwind-merge` library.
-   * It's avoid to have duplicate tailwind classes. (Recommended)
-   * @see https://github.com/dcastil/tailwind-merge/blob/v1.8.1/README.md
-   * @default true
-   */
-  twMerge?: boolean;
-  /**
-   * The config object for `tailwind-merge` library.
-   * @see https://github.com/dcastil/tailwind-merge/blob/v1.8.1/docs/configuration.md
-   */
-  twMergeConfig?: TwMergeConfig;
-};
-
-type StylesSchema = Record<string, Record<string, ClassValue>>;
-
-export type SlotVariants<T extends StylesConfig> = {
-  [Slot in keyof T["slots"]]?: ClassValue;
-};
-
-type StylesVariants<T extends StylesSchema> = {
-  [Variant in keyof T]?: StringToBoolean<keyof T[Variant]> | null;
-};
-
-type StylesVariantsMulti<T extends StylesSchema> = {
-  [Variant in keyof T]?: StringToBoolean<keyof T[Variant]> | StringToBoolean<keyof T[Variant]>[];
-};
-
-export type StylesConfig<T = {}> = T extends StylesSchema
-  ? {
-      base?: ClassValue;
-      slots?: string[];
-      variants?: T;
-      defaultVariants?: StylesVariants<T>;
-      compoundVariants?: (T extends StylesSchema
-        ? (StylesVariants<T> | StylesVariantsMulti<T>) & ClassProp
-        : ClassProp)[];
-    }
-  : never;
-
-export type TvVariantsProps = StylesVariants<StylesSchema> & ClassProp;