cvax - npm Package Compare versions

Comparing version 0.5.3 to 0.5.4

dist/cn.d.ts

@@ -1,2 +0,2 @@
-import { ClassValue } from "./types"
-export declare function cn(...inputs: ClassValue[]): string
+import { ClassValue } from "./types";
+export declare function cn(...inputs: ClassValue[]): string;

dist/cx.d.ts

@@ -1,4 +0,2 @@
-import { ClassValue } from "./types"
-export type CxOptions = Parameters<typeof cx>
-export type CxReturn = ReturnType<typeof cx>
-export declare function cx(...inputs: ClassValue[]): string
+import { ClassValue } from "./types";
+export declare function cx(...inputs: ClassValue[]): string;

dist/index.cjs.js

@@ -1,3 +0,3 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});function _export(target,all){for(var name in all)Object.defineProperty(target,name,{enumerable:true,get:all[name]})}_export(exports,{createVariant:function(){return createVariant},cvax:function(){return cvax},cn:function(){return cn},cx:function(){return cx},mergeVariants:function(){return mergeVariants},mergeTwoObjects:function(){return mergeTwoObjects}});const _tailwindmerge=require("tailwind-merge");const _lodashisequal=_interop_require_default(require("lodash.isequal"));function _interop_require_default(obj){return obj&&obj.__esModule?obj:{default:obj}}function createVariant(arg){return arg}function cvax(config){if(!config)return props=>cx(props?.class,props?.className);if(!config.variants)return props=>cx(config.base,props?.class,props?.className);return props=>{let classes=cx(config.base);let tmp="";if(!props){if(!("defaultVariants"in config)||!config?.defaultVariants)return classes;for(const variant in config.variants){const key=toString(config?.defaultVariants?.[variant]);if(tmp=config.variants[variant][key]){classes=cx(classes,tmp)}}if(!config?.compoundVariants)return classes;let adding=true;for(const{class:Class,className,...compound}of config.compoundVariants){for(const prop in compound){assertsKeyof(prop);if(config?.defaultVariants?.[prop]!==compound[prop]){adding=false;break}}if(adding)classes=cx(classes,Class,className);adding=true}return classes}for(const variant in config.variants){const value=toString(props[variant])||toString(config.defaultVariants?.[variant]);if(tmp=config.variants?.[variant][value]){classes=cx(classes,tmp)}}if(!config.compoundVariants)return cx(classes,props.class,props.className);let adding=true;for(const{class:Class,className,...compound}of config.compoundVariants){for(const prop in compound){assertsKeyof(prop);if(Array.isArray(compound[prop])){if(!compound[prop].includes(props[prop])){adding=false}}else{const some=prop in props?props?.[prop]:config?.defaultVariants?.[prop];if(some!==compound[prop]){adding=false;break}}}if(adding)classes=cx(classes,Class,className);adding=true}return cx(classes,props?.class,props?.className)}}function assertsKeyof(arg){}function toString(value){if(typeof value==="boolean"||typeof value==="number"){return value.toString()}if(!value)return"";return value.toString()}function cn(){for(var _len=arguments.length,inputs=new Array(_len),_key=0;_key<_len;_key++){inputs[_key]=arguments[_key]}return(0,_tailwindmerge.twMerge)(cx(inputs))}function cx(){let i=0,str="",tmp,{length}=arguments;while(i<length){if(tmp=arguments[i++]){str+=getStr(tmp)}}return str.trim()}function getStr(classes){if(!classes||typeof classes==="boolean")return"";if(typeof classes==="number")return classes+" ";if(typeof classes==="object"){let str="";if(Array.isArray(classes)){if(classes.length===0)return"";for(const item of classes.flat(Infinity)){if(item){str+=getStr(item)}}}else{for(const key in classes){if(key==="class"||key==="className"){str+=getStr(classes[key])+" "}else if(classes[key]){str+=key+" "}}}return str}return classes+" "}function mergeVariants(baseVariants,newVariants){const base=cn(baseVariants.base,newVariants.base);const variants=getVariants(baseVariants.variants,newVariants.variants);const defaultVariants=getDefaultVariants(baseVariants.defaultVariants,newVariants.defaultVariants);const compoundVariants=getCompoundVariants(baseVariants.compoundVariants,newVariants.compoundVariants);return{base,variants,defaultVariants,compoundVariants}}function mergeTwoObjects(left,right){if(Array.isArray(left)||Array.isArray(left))return{};return Object.assign({},left,right)}function getVariants(left,right){const acc={};if(left)for(const variants in left){for(const variant in left[variants]){Object.assign(acc,{[variants]:{}});Object.assign(acc[variants],{[variant]:left[variants][variant]})}}if(right)for(const variants in right){for(const variant in right[variants]){if(!(variants in acc)){Object.assign(acc,{[variants]:{}});Object.assign(acc[variants],{[variant]:right[variants][variant]})}else{Object.assign(acc[variants],{[variant]:cn(left?.[variants][variant],right[variants][variant])})}}}return acc}function getDefaultVariants(left,right){const acc=Object.assign({},left);if(right)for(const variants in right){Object.assign(acc,{[variants]:right[variants]})}return acc}function length(obj){return obj?Object.keys(obj).length:-1}function getCompoundVariants(baseVariants,newVariants){if(!baseVariants)return newVariants?newVariants:[];if(!newVariants)return baseVariants;const base=[...baseVariants,...newVariants];const markingArray=new Array(base.length);for(const[key,compound]of base.entries()){let compoundLength=length(compound);if(compoundLength<=1){markingArray[key]=null;continue}const{className:_,class:__,...rest}=base[key];for(let i=key+1;i<base.length;i++){if(base[i]<compoundLength){compoundLength--;break}const{className:_,class:__,...rest2}=base[i];if((0,_lodashisequal.default)(rest,rest2))markingArray[i]=null}}for(let i=base.length;i>=0;i--){if(markingArray[i]===null)[base.splice(i,1)]}return base}
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});function _export(target,all){for(var name in all)Object.defineProperty(target,name,{enumerable:true,get:all[name]})}_export(exports,{createVariant:function(){return createVariant},cvax:function(){return cvax},assertsKeyof:function(){return assertsKeyof},cn:function(){return cn},cx:function(){return cx},mergeVariants:function(){return mergeVariants},mergeTwoObjects:function(){return mergeTwoObjects}});const _tailwindmerge=require("tailwind-merge");const _lodashisequal=_interop_require_default(require("lodash.isequal"));function _interop_require_default(obj){return obj&&obj.__esModule?obj:{default:obj}}function createVariant(base){let variants=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},defaultVariants=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},compoundVariants=arguments.length>3&&arguments[3]!==void 0?arguments[3]:[];return{base,variants,defaultVariants,compoundVariants}}function cvax(config){if(!config)return props=>cx(props?.class,props?.className);if(!config.variants)return props=>cx(config.base,props?.class,props?.className);return props=>{let classes=cx(config.base);let tmp="";if(!props){if(!("defaultVariants"in config)||!config?.defaultVariants)return classes;for(const variant in config.variants){const key=toString(config?.defaultVariants?.[variant]);if(tmp=config.variants[variant][key]){classes=cx(classes,tmp)}}if(!config?.compoundVariants)return classes;let adding=true;for(const{class:Class,className,...compound}of config.compoundVariants){for(const prop in compound){assertsKeyof(prop);if(config?.defaultVariants?.[prop]!==compound[prop]){adding=false;break}}if(adding)classes=cx(classes,Class,className);adding=true}return classes}for(const variant in config.variants){const value=toString(props[variant])||toString(config.defaultVariants?.[variant]);if(tmp=config.variants?.[variant][value]){classes=cx(classes,tmp)}}if(!config.compoundVariants)return cx(classes,props.class,props.className);let adding=true;for(const{class:Class,className,...compound}of config.compoundVariants){for(const prop in compound){assertsKeyof(prop);if(Array.isArray(compound[prop])){if(!compound[prop].includes(props[prop])){adding=false}}else{const some=prop in props?props?.[prop]:config?.defaultVariants?.[prop];if(some!==compound[prop]){adding=false;break}}}if(adding)classes=cx(classes,Class,className);adding=true}return cx(classes,props?.class,props?.className)}}function assertsKeyof(arg){}function toString(value){if(typeof value==="boolean"||typeof value==="number"){return value.toString()}if(!value)return"";return value.toString()}function cn(){for(var _len=arguments.length,inputs=new Array(_len),_key=0;_key<_len;_key++){inputs[_key]=arguments[_key]}return(0,_tailwindmerge.twMerge)(cx(inputs))}function cx(){let i=0,str="",tmp,{length}=arguments;while(i<length){if(tmp=arguments[i++]){str+=getStr(tmp)}}return str.trim()}function getStr(classes){if(!classes||typeof classes==="boolean")return"";if(typeof classes==="number")return classes+" ";if(typeof classes==="object"){let str="";if(Array.isArray(classes)){if(classes.length===0)return"";for(const item of classes.flat(Infinity)){if(item){str+=getStr(item)}}}else{for(const key in classes){if(key==="class"||key==="className"){str+=getStr(classes[key])+" "}else if(classes[key]){str+=key+" "}}}return str}return classes+" "}function mergeVariants(baseVariants,newVariants){const base=cn(baseVariants.base,newVariants.base);const variants=getVariants(baseVariants.variants,newVariants.variants);const defaultVariants=getDefaultVariants(baseVariants.defaultVariants,newVariants.defaultVariants);const compoundVariants=getCompoundVariants(baseVariants.compoundVariants,newVariants.compoundVariants);return{base,variants,defaultVariants,compoundVariants}}function mergeTwoObjects(left,right){if(Array.isArray(left)||Array.isArray(left))return{};return Object.assign({},left,right)}function getVariants(left,right){const acc={};if(left)for(const variants in left){for(const variant in left[variants]){Object.assign(acc,{[variants]:{}});Object.assign(acc[variants],{[variant]:left[variants][variant]})}}if(right)for(const variants in right){for(const variant in right[variants]){if(!(variants in acc)){Object.assign(acc,{[variants]:{}});Object.assign(acc[variants],{[variant]:right[variants][variant]})}else{Object.assign(acc[variants],{[variant]:cn(left?.[variants][variant],right[variants][variant])})}}}return acc}function getDefaultVariants(left,right){const acc=Object.assign({},left);if(right)for(const variants in right){Object.assign(acc,{[variants]:right[variants]})}return acc}function length(obj){return obj?Object.keys(obj).length:-1}function getCompoundVariants(baseVariants,newVariants){if(!baseVariants)return newVariants?newVariants:[];if(!newVariants)return baseVariants;const base=[...baseVariants,...newVariants];const markingArray=new Array(base.length);for(const[key,compound]of base.entries()){let compoundLength=length(compound);if(compoundLength<=1){markingArray[key]=null;continue}const{className:_,class:__,...rest}=base[key];for(let i=key+1;i<base.length;i++){if(base[i]<compoundLength){compoundLength--;break}const{className:_,class:__,...rest2}=base[i];if((0,_lodashisequal.default)(rest,rest2))markingArray[i]=null}}for(let i=base.length;i>=0;i--){if(markingArray[i]===null)[base.splice(i,1)]}return base}
 
 //# sourceMappingURL=index.cjs.js.map

dist/index.d.ts

@@ -1,70 +0,57 @@
-import type { ClassProp, ClassValue, ExcludeUndefined, Prettify, StringToBoolean } from "./types"
-export declare function createVariant<T>(arg: Config<T>): Prettify<Config<T>>
-export type VariantProps<T> = T extends (props: infer U) => string
-  ? Omit<ExcludeUndefined<U>, keyof ClassProp>
-  : never
-export type VariantShape = Record<string, Record<string, ClassValue>>
+import type { ClassProp, ClassValue, ExcludeUndefined, Prettify, StringToBoolean } from "./types";
+export declare function createVariant<Base extends ClassValue, Variants extends VariantShape>(base: Base, variants?: Variants, defaultVariants?: {
+    [Key in keyof Variants]?: StringToBoolean<keyof Variants[Key]> | "unset";
+}, compoundVariants?: ({
+    [Key in keyof Variants]?: StringToBoolean<keyof Variants[Key]> | "unset";
+} & ClassProp)[]): {
+    base: Base;
+    variants: Variants;
+    defaultVariants: { [Key in keyof Variants]?: StringToBoolean<keyof Variants[Key]> | "unset" | undefined; };
+    compoundVariants: ({ [Key_1 in keyof Variants]?: "unset" | StringToBoolean<keyof Variants[Key_1]> | undefined; } & ClassProp)[];
+};
+export type VariantProps<T> = T extends (props: infer U) => string ? Omit<ExcludeUndefined<U>, keyof ClassProp> : never;
+export type VariantShape = Record<string, Record<string, ClassValue>>;
 export type ConfigVariantsMulti<V extends VariantShape> = {
-  [Variant in keyof V]?: StringToBoolean<keyof V[Variant]> | StringToBoolean<keyof V[Variant]>[]
-}
+    [Variant in keyof V]?: StringToBoolean<keyof V[Variant]> | StringToBoolean<keyof V[Variant]>[];
+};
 export type VariantSchema<V extends VariantShape> = {
-  [Variant in keyof V]?: StringToBoolean<keyof V[Variant]> | "unset" | undefined | null
-}
-export type Config<V> = V extends VariantShape
-  ? ConfigBase & {
-      variants?: V
-      defaultVariants?: VariantSchema<V>
-      compoundVariants?: (V extends VariantShape
-        ? (VariantSchema<V> | VariantSchemaMultiple<V>) & ClassProp
-        : ClassProp)[]
-    }
-  : ConfigBase & {
-      variants?: never
-      defaultVariants?: never
-      compoundVariants?: never
-    }
+    [Variant in keyof V]?: StringToBoolean<keyof V[Variant]> | "unset" | undefined | null;
+};
+export type Config<V> = V extends VariantShape ? ConfigBase & {
+    variants?: V;
+    defaultVariants?: VariantSchema<V>;
+    compoundVariants?: (V extends VariantShape ? (VariantSchema<V> | VariantSchemaMultiple<V>) & ClassProp : ClassProp)[];
+} : ConfigBase & {
+    variants?: never;
+    defaultVariants?: never;
+    compoundVariants?: never;
+};
 type VariantSchemaMultiple<V extends VariantShape> = {
-  [Variant in keyof V]?:
-    | StringToBoolean<keyof V[Variant]>
-    | StringToBoolean<keyof V[Variant]>[]
-    | undefined
-}
+    [Variant in keyof V]?: StringToBoolean<keyof V[Variant]> | StringToBoolean<keyof V[Variant]>[] | undefined;
+};
 type ConfigBase = {
-  base?: ClassValue
-}
-type Props<T> = T extends VariantShape ? Prettify<VariantSchema<T>> & ClassProp : ClassProp
-export declare function cvax<_ extends "internal use only.", T>(
-  config: Config<T>
-): (props?: Props<T>) => string
-export declare function cn(...inputs: ClassValue[]): string
-export type CxOptions = Parameters<typeof cx>
-export type CxReturn = ReturnType<typeof cx>
-export declare function cx(...inputs: ClassValue[]): string
+    base?: ClassValue;
+};
+type Props<T> = T extends VariantShape ? Prettify<VariantSchema<T>> & ClassProp : ClassProp;
+export declare function cvax<_ extends "internal use only.", T>(config: Config<T>): (props?: Props<T>) => string;
+export declare function assertsKeyof<T>(arg: unknown): asserts arg is T;
+export declare function cn(...inputs: ClassValue[]): string;
+export declare function cx(...inputs: ClassValue[]): string;
 type MergeVariants<Left, Right> = {
-  [Key in keyof Left & keyof Right]: MergeObjects<Left[Key], Right[Key]>
-} & MergeObjects<Left, Right>
-type ToString<T> = T extends string ? string : T extends string[] ? string[] : T
+    [Key in keyof Left & keyof Right]: MergeObjects<Left[Key], Right[Key]>;
+} & MergeObjects<Left, Right>;
+type ToString<T> = T extends string ? string : T extends string[] ? string[] : T;
 type MergeObjects<Left, Right> = {
-  [Prop in keyof Left | keyof Right]: Prop extends keyof Right
-    ? Right[Prop]
-    : Prop extends keyof Left
-    ? ToString<Left[Prop]>
-    : never
-}
+    [Prop in keyof Left | keyof Right]: Prop extends keyof Right ? Right[Prop] : Prop extends keyof Left ? ToString<Left[Prop]> : never;
+};
 type DefaultVariants<T> = {
-  [Key in keyof T]?: keyof T[Key]
-}
-export declare function mergeVariants<T, U>(
-  baseVariants: Config<T>,
-  newVariants: Config<U>
-): Prettify<{
-  base: string
-  variants: Prettify<MergeVariants<T, U>>
-  defaultVariants: DefaultVariants<MergeVariants<T, U>>
-  compoundVariants: []
-}>
-export declare function mergeTwoObjects<Left extends object, Right extends object>(
-  left: Left,
-  right: Right
-): Prettify<MergeObjects<Left, Right>>
-export {}
+    [Key in keyof T]?: keyof T[Key];
+};
+export declare function mergeVariants<T, U>(baseVariants: Config<T>, newVariants: Config<U>): Prettify<{
+    base: string;
+    variants: Prettify<MergeVariants<T, U>>;
+    defaultVariants: DefaultVariants<MergeVariants<T, U>>;
+    compoundVariants: [];
+}>;
+export declare function mergeTwoObjects<Left extends object, Right extends object>(left: Left, right: Right): Prettify<MergeObjects<Left, Right>>;
+export {};

dist/index.esm.js

@@ -1,3 +0,3 @@
-import{twMerge}from"tailwind-merge";import isEqual from"lodash.isequal";export function createVariant(arg){return arg}export function cvax(config){if(!config)return props=>cx(props?.class,props?.className);if(!config.variants)return props=>cx(config.base,props?.class,props?.className);return props=>{let classes=cx(config.base);let tmp="";if(!props){if(!("defaultVariants"in config)||!config?.defaultVariants)return classes;for(const variant in config.variants){const key=toString(config?.defaultVariants?.[variant]);if(tmp=config.variants[variant][key]){classes=cx(classes,tmp)}}if(!config?.compoundVariants)return classes;let adding=true;for(const{class:Class,className,...compound}of config.compoundVariants){for(const prop in compound){assertsKeyof(prop);if(config?.defaultVariants?.[prop]!==compound[prop]){adding=false;break}}if(adding)classes=cx(classes,Class,className);adding=true}return classes}for(const variant in config.variants){const value=toString(props[variant])||toString(config.defaultVariants?.[variant]);if(tmp=config.variants?.[variant][value]){classes=cx(classes,tmp)}}if(!config.compoundVariants)return cx(classes,props.class,props.className);let adding=true;for(const{class:Class,className,...compound}of config.compoundVariants){for(const prop in compound){assertsKeyof(prop);if(Array.isArray(compound[prop])){if(!compound[prop].includes(props[prop])){adding=false}}else{const some=prop in props?props?.[prop]:config?.defaultVariants?.[prop];if(some!==compound[prop]){adding=false;break}}}if(adding)classes=cx(classes,Class,className);adding=true}return cx(classes,props?.class,props?.className)}}function assertsKeyof(arg){}function toString(value){if(typeof value==="boolean"||typeof value==="number"){return value.toString()}if(!value)return"";return value.toString()}export function cn(){for(var _len=arguments.length,inputs=new Array(_len),_key=0;_key<_len;_key++){inputs[_key]=arguments[_key]}return twMerge(cx(inputs))}export function cx(){let i=0,str="",tmp,{length}=arguments;while(i<length){if(tmp=arguments[i++]){str+=getStr(tmp)}}return str.trim()}function getStr(classes){if(!classes||typeof classes==="boolean")return"";if(typeof classes==="number")return classes+" ";if(typeof classes==="object"){let str="";if(Array.isArray(classes)){if(classes.length===0)return"";for(const item of classes.flat(Infinity)){if(item){str+=getStr(item)}}}else{for(const key in classes){if(key==="class"||key==="className"){str+=getStr(classes[key])+" "}else if(classes[key]){str+=key+" "}}}return str}return classes+" "}export function mergeVariants(baseVariants,newVariants){const base=cn(baseVariants.base,newVariants.base);const variants=getVariants(baseVariants.variants,newVariants.variants);const defaultVariants=getDefaultVariants(baseVariants.defaultVariants,newVariants.defaultVariants);const compoundVariants=getCompoundVariants(baseVariants.compoundVariants,newVariants.compoundVariants);return{base,variants,defaultVariants,compoundVariants}}export function mergeTwoObjects(left,right){if(Array.isArray(left)||Array.isArray(left))return{};return Object.assign({},left,right)}function getVariants(left,right){const acc={};if(left)for(const variants in left){for(const variant in left[variants]){Object.assign(acc,{[variants]:{}});Object.assign(acc[variants],{[variant]:left[variants][variant]})}}if(right)for(const variants in right){for(const variant in right[variants]){if(!(variants in acc)){Object.assign(acc,{[variants]:{}});Object.assign(acc[variants],{[variant]:right[variants][variant]})}else{Object.assign(acc[variants],{[variant]:cn(left?.[variants][variant],right[variants][variant])})}}}return acc}function getDefaultVariants(left,right){const acc=Object.assign({},left);if(right)for(const variants in right){Object.assign(acc,{[variants]:right[variants]})}return acc}function length(obj){return obj?Object.keys(obj).length:-1}function getCompoundVariants(baseVariants,newVariants){if(!baseVariants)return newVariants?newVariants:[];if(!newVariants)return baseVariants;const base=[...baseVariants,...newVariants];const markingArray=new Array(base.length);for(const[key,compound]of base.entries()){let compoundLength=length(compound);if(compoundLength<=1){markingArray[key]=null;continue}const{className:_,class:__,...rest}=base[key];for(let i=key+1;i<base.length;i++){if(base[i]<compoundLength){compoundLength--;break}const{className:_,class:__,...rest2}=base[i];if(isEqual(rest,rest2))markingArray[i]=null}}for(let i=base.length;i>=0;i--){if(markingArray[i]===null)[base.splice(i,1)]}return base}
+import{twMerge}from"tailwind-merge";import isEqual from"lodash.isequal";export function createVariant(base){let variants=arguments.length>1&&arguments[1]!==void 0?arguments[1]:{},defaultVariants=arguments.length>2&&arguments[2]!==void 0?arguments[2]:{},compoundVariants=arguments.length>3&&arguments[3]!==void 0?arguments[3]:[];return{base,variants,defaultVariants,compoundVariants}}export function cvax(config){if(!config)return props=>cx(props?.class,props?.className);if(!config.variants)return props=>cx(config.base,props?.class,props?.className);return props=>{let classes=cx(config.base);let tmp="";if(!props){if(!("defaultVariants"in config)||!config?.defaultVariants)return classes;for(const variant in config.variants){const key=toString(config?.defaultVariants?.[variant]);if(tmp=config.variants[variant][key]){classes=cx(classes,tmp)}}if(!config?.compoundVariants)return classes;let adding=true;for(const{class:Class,className,...compound}of config.compoundVariants){for(const prop in compound){assertsKeyof(prop);if(config?.defaultVariants?.[prop]!==compound[prop]){adding=false;break}}if(adding)classes=cx(classes,Class,className);adding=true}return classes}for(const variant in config.variants){const value=toString(props[variant])||toString(config.defaultVariants?.[variant]);if(tmp=config.variants?.[variant][value]){classes=cx(classes,tmp)}}if(!config.compoundVariants)return cx(classes,props.class,props.className);let adding=true;for(const{class:Class,className,...compound}of config.compoundVariants){for(const prop in compound){assertsKeyof(prop);if(Array.isArray(compound[prop])){if(!compound[prop].includes(props[prop])){adding=false}}else{const some=prop in props?props?.[prop]:config?.defaultVariants?.[prop];if(some!==compound[prop]){adding=false;break}}}if(adding)classes=cx(classes,Class,className);adding=true}return cx(classes,props?.class,props?.className)}}export function assertsKeyof(arg){}function toString(value){if(typeof value==="boolean"||typeof value==="number"){return value.toString()}if(!value)return"";return value.toString()}export function cn(){for(var _len=arguments.length,inputs=new Array(_len),_key=0;_key<_len;_key++){inputs[_key]=arguments[_key]}return twMerge(cx(inputs))}export function cx(){let i=0,str="",tmp,{length}=arguments;while(i<length){if(tmp=arguments[i++]){str+=getStr(tmp)}}return str.trim()}function getStr(classes){if(!classes||typeof classes==="boolean")return"";if(typeof classes==="number")return classes+" ";if(typeof classes==="object"){let str="";if(Array.isArray(classes)){if(classes.length===0)return"";for(const item of classes.flat(Infinity)){if(item){str+=getStr(item)}}}else{for(const key in classes){if(key==="class"||key==="className"){str+=getStr(classes[key])+" "}else if(classes[key]){str+=key+" "}}}return str}return classes+" "}export function mergeVariants(baseVariants,newVariants){const base=cn(baseVariants.base,newVariants.base);const variants=getVariants(baseVariants.variants,newVariants.variants);const defaultVariants=getDefaultVariants(baseVariants.defaultVariants,newVariants.defaultVariants);const compoundVariants=getCompoundVariants(baseVariants.compoundVariants,newVariants.compoundVariants);return{base,variants,defaultVariants,compoundVariants}}export function mergeTwoObjects(left,right){if(Array.isArray(left)||Array.isArray(left))return{};return Object.assign({},left,right)}function getVariants(left,right){const acc={};if(left)for(const variants in left){for(const variant in left[variants]){Object.assign(acc,{[variants]:{}});Object.assign(acc[variants],{[variant]:left[variants][variant]})}}if(right)for(const variants in right){for(const variant in right[variants]){if(!(variants in acc)){Object.assign(acc,{[variants]:{}});Object.assign(acc[variants],{[variant]:right[variants][variant]})}else{Object.assign(acc[variants],{[variant]:cn(left?.[variants][variant],right[variants][variant])})}}}return acc}function getDefaultVariants(left,right){const acc=Object.assign({},left);if(right)for(const variants in right){Object.assign(acc,{[variants]:right[variants]})}return acc}function length(obj){return obj?Object.keys(obj).length:-1}function getCompoundVariants(baseVariants,newVariants){if(!baseVariants)return newVariants?newVariants:[];if(!newVariants)return baseVariants;const base=[...baseVariants,...newVariants];const markingArray=new Array(base.length);for(const[key,compound]of base.entries()){let compoundLength=length(compound);if(compoundLength<=1){markingArray[key]=null;continue}const{className:_,class:__,...rest}=base[key];for(let i=key+1;i<base.length;i++){if(base[i]<compoundLength){compoundLength--;break}const{className:_,class:__,...rest2}=base[i];if(isEqual(rest,rest2))markingArray[i]=null}}for(let i=base.length;i>=0;i--){if(markingArray[i]===null)[base.splice(i,1)]}return base}
 
 //# sourceMappingURL=index.esm.js.map

dist/merge-variants.d.ts

@@ -1,30 +0,20 @@
-import type { Prettify } from "./types"
-import type { Config } from "."
+import type { Prettify } from "./types";
+import type { Config } from ".";
 type MergeVariants<Left, Right> = {
-  [Key in keyof Left & keyof Right]: MergeObjects<Left[Key], Right[Key]>
-} & MergeObjects<Left, Right>
-type ToString<T> = T extends string ? string : T extends string[] ? string[] : T
+    [Key in keyof Left & keyof Right]: MergeObjects<Left[Key], Right[Key]>;
+} & MergeObjects<Left, Right>;
+type ToString<T> = T extends string ? string : T extends string[] ? string[] : T;
 type MergeObjects<Left, Right> = {
-  [Prop in keyof Left | keyof Right]: Prop extends keyof Right
-    ? Right[Prop]
-    : Prop extends keyof Left
-    ? ToString<Left[Prop]>
-    : never
-}
+    [Prop in keyof Left | keyof Right]: Prop extends keyof Right ? Right[Prop] : Prop extends keyof Left ? ToString<Left[Prop]> : never;
+};
 type DefaultVariants<T> = {
-  [Key in keyof T]?: keyof T[Key]
-}
-export declare function mergeVariants<T, U>(
-  baseVariants: Config<T>,
-  newVariants: Config<U>
-): Prettify<{
-  base: string
-  variants: Prettify<MergeVariants<T, U>>
-  defaultVariants: DefaultVariants<MergeVariants<T, U>>
-  compoundVariants: []
-}>
-export declare function mergeTwoObjects<Left extends object, Right extends object>(
-  left: Left,
-  right: Right
-): Prettify<MergeObjects<Left, Right>>
-export {}
+    [Key in keyof T]?: keyof T[Key];
+};
+export declare function mergeVariants<T, U>(baseVariants: Config<T>, newVariants: Config<U>): Prettify<{
+    base: string;
+    variants: Prettify<MergeVariants<T, U>>;
+    defaultVariants: DefaultVariants<MergeVariants<T, U>>;
+    compoundVariants: [];
+}>;
+export declare function mergeTwoObjects<Left extends object, Right extends object>(left: Left, right: Right): Prettify<MergeObjects<Left, Right>>;
+export {};

dist/types.d.ts

@@ -1,39 +0,18 @@
-export type ClassValue =
-  | ClassValue[]
-  | ClassDictionary
-  | string
-  | number
-  | null
-  | boolean
-  | undefined
-export type ClassDictionary = Record<
-  string,
-  | ClassValue[]
-  | string
-  | number
-  | null
-  | boolean
-  | undefined
-  | Record<string, ClassValue[] | string | number | null | boolean | undefined>
->
-export type ClassPropKey = "class" | "className"
-export type ClassProp =
-  | {
-      class: ClassValue
-      className?: never
-    }
-  | {
-      class?: never
-      className: ClassValue
-    }
-  | {
-      class?: never
-      className?: never
-    }
-export type ExcludeUndefined<T> = T extends undefined ? never : T
-export type StringToBoolean<T> = T extends "true" | "false" ? boolean : T
-export type CxOptions = ClassValue[]
-export type CxReturn = string
+export type ClassValue = ClassValue[] | ClassDictionary | string | number | null | boolean | undefined;
+export type ClassDictionary = Record<string, ClassValue[] | string | number | null | boolean | undefined | Record<string, ClassValue[] | string | number | null | boolean | undefined>>;
+export type ClassPropKey = "class" | "className";
+export type ClassProp = {
+    class: ClassValue;
+    className?: never;
+} | {
+    class?: never;
+    className: ClassValue;
+} | {
+    class?: never;
+    className?: never;
+};
+export type ExcludeUndefined<T> = T extends undefined ? never : T;
+export type StringToBoolean<T> = T extends "true" | "false" ? boolean : T;
 export type Prettify<T> = {
-  [K in keyof T]: T[K] extends object ? Prettify<T[K]> : T[K]
-} & {}
+    [K in keyof T]: T[K] extends object ? Prettify<T[K]> : T[K];
+} & {};

package.json

 {
   "name": "cvax",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Customized CVA. fork 'class-variance-authority'",
@@ -30,3 +30,3 @@ "repository": "https://github.com/alexvyber/cvax.git",
     "test:vitest": "vitest",
-    "test:size": "pnpm build && bundlesize -f 'dist/*.js' -s 1.1KB",
+    "test:size": "pnpm build && bundlesize -f 'dist/*.js' -s 2.1KB",
     "tsc": "tsc --project tsconfig.json --noEmit"
@@ -33,0 +33,0 @@ },

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Minified code

Quality

This package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.

Found 1 instance in 1 package

Fixed alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Minified code

Quality

This package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

47445

increased by2.35%

Number of package files

13

increased by18.18%

Worsened metrics

Lines of code

141

decreased by-22.95%

No dependency changes