tailwind-variants 0.0.3 → 0.0.5

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 g=e=>e.filter(c=>c),C=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 U=(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:w=[],variants:d,defaultVariants:f}=e,x=Array.isArray(w)?S(["base",...w]):[],M=a=>{let t=n==null?void 0:n[a],r=f==null?void 0:f[a];if(t===null)return null;let i=C(t)||C(r);return d[a][i]},h=Object.keys(d).map(M),N=a=>g(Object.keys(d).map(t=>{let r=M(t);return !r||typeof r!="object"?null:r[a]})),A=n&&Object.entries(n).reduce((a,[t,r])=>(r===void 0||(a[t]=r),a),{}),j=(V=e==null?void 0:e.compoundVariants)==null?void 0:V.reduce((a,{class:t,className:r,...i})=>Object.entries(i).every(([m,u])=>Array.isArray(u)?u.includes({...f,...A}[m]):{...f,...A}[m]===u)?[...a,t,r]:a,[]),B=()=>{let a=g(j);return Array.isArray(a)?a.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),{}):a};if(x.length>1){let a=N("base"),t=B(),r=x.slice(1).reduce((i,m)=>(i[m]=u=>b(N(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,a,t.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 = U;

package/dist/index.d.ts

@@ -1,32 +1,50 @@
 import {TVConfig} from "./config";
-import {ClassValue, ClassProp, OmitUndefined} from "./utils";
+import {
+  ClassValue,
+  ClassProp,
+  OmitUndefined,
+  StringToBoolean,
+  StringArrayToFunctions,
+  AddItemToArray,
+} from "./utils";
 
-type TVVariants<S extends string[]> = {
+type TVDefaultSlot = "";
+type TVBaseName = "base";
+
+export declare type TVVariants<S extends string[]> = {
   [key: string]: {
-    [key: string]: {[P in S[number]]?: ClassValue} | ClassValue;
+    [key: string]: S extends TVDefaultSlot
+      ? ClassValue
+      : {[P in S[number]]?: ClassValue} | ClassValue;
   };
 };
 
-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]?: keyof V[K];
+    [K in keyof V]?: StringToBoolean<keyof V[K]>;
   } & ClassProp<{[K in S[number]]?: ClassValue} | ClassValue>
 >;
 
-type TVDefaultVariants<V extends TVVariants<S>, S extends string[]> = {
-  [K in keyof V]?: keyof V[K];
+export declare type TVDefaultVariants<V extends TVVariants<S>, S extends string[]> = {
+  [K in keyof V]?: StringToBoolean<keyof V[K]>;
 };
 
-type TVReturnType<S extends string[]> = S extends string[]
-  ? {[K in S[number]]: (slotProps: ClassProp) => string}
-  : (slotProps: ClassProp) => string;
+export declare type TVProps<V extends TVVariants<S>, S extends string[]> = {
+  [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
+  ? string
+  : StringArrayToFunctions<AddItemToArray<S[], TVBaseName>, ClassProp>;
 
 export declare function tv<
-  S extends string,
   V extends TVVariants<S[]>,
   CV extends TVCompoundVariants<V, S[]>,
   DV extends TVDefaultVariants<V, S[]>,
   C extends TVConfig,
+  S extends string = TVDefaultSlot,
 >(
   options: {
     base?: ClassValue;
@@ -36,7 +54,7 @@ export declare function tv<
     defaultVariants?: DV;
   },
   config?: C,
-): TVReturnType<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 g=e=>e.filter(c=>c),C=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 U=(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:w=[],variants:d,defaultVariants:f}=e,x=Array.isArray(w)?S(["base",...w]):[],M=a=>{let t=n==null?void 0:n[a],r=f==null?void 0:f[a];if(t===null)return null;let i=C(t)||C(r);return d[a][i]},h=Object.keys(d).map(M),N=a=>g(Object.keys(d).map(t=>{let r=M(t);return !r||typeof r!="object"?null:r[a]})),A=n&&Object.entries(n).reduce((a,[t,r])=>(r===void 0||(a[t]=r),a),{}),j=(V=e==null?void 0:e.compoundVariants)==null?void 0:V.reduce((a,{class:t,className:r,...i})=>Object.entries(i).every(([m,u])=>Array.isArray(u)?u.includes({...f,...A}[m]):{...f,...A}[m]===u)?[...a,t,r]:a,[]),B=()=>{let a=g(j);return Array.isArray(a)?a.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),{}):a};if(x.length>1){let a=N("base"),t=B(),r=x.slice(1).reduce((i,m)=>(i[m]=u=>b(N(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,a,t.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 { U as tv };

package/dist/utils.d.ts

@@ -8,10 +8,12 @@ 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,5 +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 declare type StringArrayToFunctions<T extends string[], Props = {}> = {
+  [K in T[number]]: (props?: Props) => string;
+};
+
+export declare type AddItemToArray<T extends unknown[], V> = [V, ...T];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tailwind-variants",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "🦄 Tailwindcss first-class variant API",
   "author": "Junior Garcia <jrgarciadev@gmail.com>",
   "license": "MIT",
@@ -15,63 +15,30 @@
     "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"
-    }
+  "dependencies": {
+    "class-variance-authority": "0.4.0",
+    "tailwind-merge": "^1.8.1"
   },
   "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",
+    "new:pack": "npm pack && clean-package restore",
+    "new:publish:dry": "pnpm prepack && npm publish --dry-run && clean-package restore",
+    "new:publish:prod": "pnpm prepack && npm publish && clean-package restore",
     "lint": "eslint -c .eslintrc.json ./src/**/*.{ts,tsx}",
     "lint:fix": "eslint --fix -c .eslintrc.json ./src/**/*.{ts,tsx}",
     "test": "jest --verbose"
   },
-  "dependencies": {
-    "class-variance-authority": "0.4.0",
-    "tailwind-merge": "^1.8.1"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^17.2.0",
-    "@commitlint/config-conventional": "^17.2.0",
-    "@swc-node/jest": "^1.5.2",
-    "@swc/cli": "0.1.57",
-    "@swc/core": "1.2.198",
-    "@types/jest": "28.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.42.0",
-    "@typescript-eslint/parser": "^5.42.0",
-    "clean-package": "2.1.1",
-    "eslint": "^7.29.0",
-    "eslint-config-prettier": "^8.2.0",
-    "eslint-config-ts-lambdas": "^1.2.3",
-    "eslint-import-resolver-typescript": "^2.4.0",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^24.3.6",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-promise": "^6.0.0",
-    "prettier": "^2.2.1",
-    "prettier-eslint": "^12.0.0",
-    "prettier-eslint-cli": "^5.0.1",
-    "ts-node": "^10.9.1",
-    "tsup": "6.4.0",
-    "typescript": "4.6.2",
-    "webpack": "^5.53.0"
-  },
   "keywords": [
     "tailwindcss",
     "classes",
@@ -83,15 +50,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"
+    }
+  }
 }