css-variants 2.1.2 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/README.md +1298 -219
  2. package/dist/cjs/cv.bench.d.ts +1 -0
  3. package/dist/cjs/cv.bench.js +207 -0
  4. package/dist/cjs/cv.bench.js.map +1 -0
  5. package/dist/cjs/cv.js +11 -9
  6. package/dist/cjs/cv.js.map +1 -1
  7. package/dist/cjs/scv.bench.d.ts +1 -0
  8. package/dist/cjs/scv.bench.js +409 -0
  9. package/dist/cjs/scv.bench.js.map +1 -0
  10. package/dist/cjs/scv.js +13 -11
  11. package/dist/cjs/scv.js.map +1 -1
  12. package/dist/cjs/ssv.bench.d.ts +1 -0
  13. package/dist/cjs/ssv.bench.js +506 -0
  14. package/dist/cjs/ssv.bench.js.map +1 -0
  15. package/dist/cjs/ssv.js +14 -12
  16. package/dist/cjs/ssv.js.map +1 -1
  17. package/dist/cjs/sv.bench.d.ts +1 -0
  18. package/dist/cjs/sv.bench.js +264 -0
  19. package/dist/cjs/sv.bench.js.map +1 -0
  20. package/dist/cjs/sv.js +15 -10
  21. package/dist/cjs/sv.js.map +1 -1
  22. package/dist/cjs/utils/merge-props.d.ts +1 -1
  23. package/dist/cjs/utils/merge-props.js +8 -6
  24. package/dist/cjs/utils/merge-props.js.map +1 -1
  25. package/dist/esm/cv.bench.d.ts +1 -0
  26. package/dist/esm/cv.bench.js +205 -0
  27. package/dist/esm/cv.bench.js.map +1 -0
  28. package/dist/esm/cv.js +11 -9
  29. package/dist/esm/cv.js.map +1 -1
  30. package/dist/esm/scv.bench.d.ts +1 -0
  31. package/dist/esm/scv.bench.js +407 -0
  32. package/dist/esm/scv.bench.js.map +1 -0
  33. package/dist/esm/scv.js +13 -11
  34. package/dist/esm/scv.js.map +1 -1
  35. package/dist/esm/ssv.bench.d.ts +1 -0
  36. package/dist/esm/ssv.bench.js +504 -0
  37. package/dist/esm/ssv.bench.js.map +1 -0
  38. package/dist/esm/ssv.js +14 -12
  39. package/dist/esm/ssv.js.map +1 -1
  40. package/dist/esm/sv.bench.d.ts +1 -0
  41. package/dist/esm/sv.bench.js +262 -0
  42. package/dist/esm/sv.bench.js.map +1 -0
  43. package/dist/esm/sv.js +15 -10
  44. package/dist/esm/sv.js.map +1 -1
  45. package/dist/esm/utils/merge-props.d.ts +1 -1
  46. package/dist/esm/utils/merge-props.js +8 -6
  47. package/dist/esm/utils/merge-props.js.map +1 -1
  48. package/package.json +3 -3
@@ -0,0 +1,262 @@
1
+ import { bench, describe } from 'vitest';
2
+ import { sv } from './sv';
3
+ describe('sv benchmarks', () => {
4
+ // Simple base style only
5
+ const simpleVariant = sv({
6
+ base: { color: 'black', fontSize: '16px' },
7
+ });
8
+ bench('base style only', () => {
9
+ simpleVariant();
10
+ });
11
+ // Single variant
12
+ const singleVariant = sv({
13
+ base: { fontFamily: 'sans-serif' },
14
+ variants: {
15
+ color: {
16
+ primary: { color: 'blue', backgroundColor: '#e3f2fd' },
17
+ secondary: { color: 'gray', backgroundColor: '#f5f5f5' },
18
+ danger: { color: 'red', backgroundColor: '#ffebee' },
19
+ },
20
+ },
21
+ });
22
+ bench('single variant', () => {
23
+ singleVariant({ color: 'primary' });
24
+ });
25
+ // Multiple variants
26
+ const multipleVariants = sv({
27
+ base: { display: 'inline-flex', alignItems: 'center', borderRadius: '4px' },
28
+ variants: {
29
+ color: {
30
+ primary: { color: 'blue', backgroundColor: '#1976d2' },
31
+ secondary: { color: 'white', backgroundColor: '#757575' },
32
+ danger: { color: 'white', backgroundColor: '#d32f2f' },
33
+ },
34
+ size: {
35
+ sm: { padding: '4px 8px', fontSize: '12px' },
36
+ md: { padding: '8px 16px', fontSize: '14px' },
37
+ lg: { padding: '12px 24px', fontSize: '16px' },
38
+ },
39
+ fontWeight: {
40
+ normal: { fontWeight: '400' },
41
+ medium: { fontWeight: '500' },
42
+ bold: { fontWeight: '700' },
43
+ },
44
+ },
45
+ });
46
+ bench('multiple variants', () => {
47
+ multipleVariants({ color: 'primary', size: 'md', fontWeight: 'medium' });
48
+ });
49
+ // With default variants
50
+ const withDefaults = sv({
51
+ base: { display: 'flex', transition: 'all 0.2s' },
52
+ variants: {
53
+ color: {
54
+ primary: { color: 'blue', backgroundColor: '#1976d2' },
55
+ secondary: { color: 'white', backgroundColor: '#757575' },
56
+ danger: { color: 'white', backgroundColor: '#d32f2f' },
57
+ },
58
+ size: {
59
+ sm: { padding: '4px 8px', fontSize: '12px' },
60
+ md: { padding: '8px 16px', fontSize: '14px' },
61
+ lg: { padding: '12px 24px', fontSize: '16px' },
62
+ },
63
+ },
64
+ defaultVariants: {
65
+ color: 'primary',
66
+ size: 'md',
67
+ },
68
+ });
69
+ bench('with default variants (no props)', () => {
70
+ withDefaults();
71
+ });
72
+ bench('with default variants (override one)', () => {
73
+ withDefaults({ size: 'lg' });
74
+ });
75
+ // Compound variants
76
+ const withCompoundVariants = sv({
77
+ base: { display: 'inline-flex', borderRadius: '4px' },
78
+ variants: {
79
+ color: {
80
+ primary: { color: 'white', backgroundColor: '#1976d2' },
81
+ secondary: { color: 'white', backgroundColor: '#757575' },
82
+ danger: { color: 'white', backgroundColor: '#d32f2f' },
83
+ },
84
+ size: {
85
+ sm: { padding: '4px 8px', fontSize: '12px' },
86
+ md: { padding: '8px 16px', fontSize: '14px' },
87
+ lg: { padding: '12px 24px', fontSize: '16px' },
88
+ },
89
+ disabled: {
90
+ true: { opacity: 0.5, cursor: 'not-allowed' },
91
+ false: { cursor: 'pointer' },
92
+ },
93
+ },
94
+ compoundVariants: [
95
+ {
96
+ size: 'lg',
97
+ color: 'primary',
98
+ style: { fontWeight: '700', boxShadow: '0 4px 6px rgba(0,0,0,0.1)' },
99
+ },
100
+ {
101
+ size: ['sm', 'md'],
102
+ color: 'danger',
103
+ style: { fontWeight: '600' },
104
+ },
105
+ {
106
+ disabled: true,
107
+ color: ['primary', 'secondary', 'danger'],
108
+ style: { pointerEvents: 'none' },
109
+ },
110
+ ],
111
+ });
112
+ bench('compound variants (no match)', () => {
113
+ withCompoundVariants({ color: 'secondary', size: 'sm', disabled: false });
114
+ });
115
+ bench('compound variants (single match)', () => {
116
+ withCompoundVariants({ color: 'primary', size: 'lg', disabled: false });
117
+ });
118
+ bench('compound variants (multiple matches)', () => {
119
+ withCompoundVariants({ color: 'danger', size: 'sm', disabled: true });
120
+ });
121
+ // With style override
122
+ const withStyleOverride = sv({
123
+ base: { color: 'black' },
124
+ variants: {
125
+ color: {
126
+ primary: { backgroundColor: '#1976d2' },
127
+ secondary: { backgroundColor: '#757575' },
128
+ },
129
+ },
130
+ });
131
+ bench('with style override', () => {
132
+ withStyleOverride({
133
+ color: 'primary',
134
+ style: { margin: '8px', border: '1px solid #ccc' },
135
+ });
136
+ });
137
+ // Complex real-world example
138
+ const complexCard = sv({
139
+ base: {
140
+ display: 'flex',
141
+ flexDirection: 'column',
142
+ borderRadius: '8px',
143
+ boxShadow: '0 2px 4px rgba(0,0,0,0.1)',
144
+ overflow: 'hidden',
145
+ transition: 'all 0.3s ease',
146
+ },
147
+ variants: {
148
+ elevation: {
149
+ low: { boxShadow: '0 1px 3px rgba(0,0,0,0.1)' },
150
+ medium: { boxShadow: '0 4px 6px rgba(0,0,0,0.1)' },
151
+ high: { boxShadow: '0 10px 20px rgba(0,0,0,0.15)' },
152
+ },
153
+ padding: {
154
+ none: { padding: '0' },
155
+ sm: { padding: '8px' },
156
+ md: { padding: '16px' },
157
+ lg: { padding: '24px' },
158
+ },
159
+ variant: {
160
+ outlined: { border: '1px solid #e0e0e0', boxShadow: 'none' },
161
+ filled: { backgroundColor: '#f5f5f5' },
162
+ elevated: {},
163
+ },
164
+ },
165
+ compoundVariants: [
166
+ {
167
+ elevation: 'high',
168
+ variant: 'elevated',
169
+ style: {
170
+ transform: 'translateY(-2px)',
171
+ boxShadow: '0 12px 24px rgba(0,0,0,0.2)',
172
+ },
173
+ },
174
+ {
175
+ variant: 'outlined',
176
+ padding: ['sm', 'md'],
177
+ style: { borderRadius: '4px' },
178
+ },
179
+ ],
180
+ defaultVariants: {
181
+ elevation: 'medium',
182
+ padding: 'md',
183
+ variant: 'elevated',
184
+ },
185
+ });
186
+ bench('complex real-world card (defaults)', () => {
187
+ complexCard();
188
+ });
189
+ bench('complex real-world card (with overrides)', () => {
190
+ complexCard({
191
+ elevation: 'high',
192
+ padding: 'lg',
193
+ variant: 'elevated',
194
+ style: { width: '100%', maxWidth: '600px' },
195
+ });
196
+ });
197
+ // Boolean variants
198
+ const booleanVariants = sv({
199
+ base: { display: 'inline-block' },
200
+ variants: {
201
+ disabled: {
202
+ true: { opacity: 0.5, cursor: 'not-allowed', pointerEvents: 'none' },
203
+ false: { cursor: 'pointer' },
204
+ },
205
+ loading: {
206
+ true: { opacity: 0.7, cursor: 'wait' },
207
+ false: {},
208
+ },
209
+ fullWidth: {
210
+ true: { width: '100%', display: 'block' },
211
+ false: { width: 'auto' },
212
+ },
213
+ },
214
+ });
215
+ bench('boolean variants', () => {
216
+ booleanVariants({ disabled: true, loading: false, fullWidth: true });
217
+ });
218
+ // No variants (edge case)
219
+ const noVariants = sv({
220
+ base: { color: 'black', fontSize: '14px' },
221
+ });
222
+ bench('no variants (optimized path)', () => {
223
+ noVariants({ style: { margin: '10px' } });
224
+ });
225
+ // Many CSS properties (stress test)
226
+ const manyProperties = sv({
227
+ base: {
228
+ display: 'flex',
229
+ flexDirection: 'column',
230
+ alignItems: 'center',
231
+ justifyContent: 'center',
232
+ padding: '16px',
233
+ margin: '8px',
234
+ borderRadius: '8px',
235
+ backgroundColor: '#ffffff',
236
+ color: '#000000',
237
+ fontSize: '14px',
238
+ fontWeight: '400',
239
+ lineHeight: '1.5',
240
+ boxShadow: '0 2px 4px rgba(0,0,0,0.1)',
241
+ transition: 'all 0.3s ease',
242
+ },
243
+ variants: {
244
+ theme: {
245
+ light: {
246
+ backgroundColor: '#ffffff',
247
+ color: '#000000',
248
+ borderColor: '#e0e0e0',
249
+ },
250
+ dark: {
251
+ backgroundColor: '#1a1a1a',
252
+ color: '#ffffff',
253
+ borderColor: '#333333',
254
+ },
255
+ },
256
+ },
257
+ });
258
+ bench('many CSS properties', () => {
259
+ manyProperties({ theme: 'dark' });
260
+ });
261
+ });
262
+ //# sourceMappingURL=sv.bench.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sv.bench.js","sourceRoot":"","sources":["../../src/sv.bench.ts"],"names":[],"mappings":"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"}
package/dist/esm/sv.js CHANGED
@@ -33,32 +33,37 @@ export const sv = (config) => {
33
33
  return (props) => ({ ...base, ...props?.style });
34
34
  }
35
35
  return (props) => {
36
- const { style, ...rest } = props ?? {};
37
- let result = { ...base };
38
- const mergedProps = defaultVariants ? mergeProps(defaultVariants, rest) : rest;
36
+ const result = { ...base };
37
+ const mergedProps = mergeProps(defaultVariants, props, ['style']);
39
38
  for (const key in mergedProps) {
40
39
  const styleValue = variants[key]?.[mergedProps[key]];
41
40
  if (styleValue) {
42
- result = { ...result, ...styleValue };
41
+ Object.assign(result, styleValue);
43
42
  }
44
43
  }
45
44
  if (compoundVariants) {
46
- for (const { style: styleValue, ...compoundVariant } of compoundVariants) {
45
+ for (let i = 0; i < compoundVariants.length; i++) {
46
+ const compound = compoundVariants[i];
47
47
  let matches = true;
48
- for (const key in compoundVariant) {
49
- const value = compoundVariant[key];
48
+ for (const key in compound) {
49
+ if (key === 'style')
50
+ continue;
51
+ const value = compound[key];
50
52
  const propValue = mergedProps[key];
51
53
  if (Array.isArray(value) ? !value.includes(propValue) : value !== propValue) {
52
54
  matches = false;
53
55
  break;
54
56
  }
55
57
  }
56
- if (matches) {
57
- result = { ...result, ...styleValue };
58
+ if (matches && compound.style) {
59
+ Object.assign(result, compound.style);
58
60
  }
59
61
  }
60
62
  }
61
- return { ...result, ...style };
63
+ if (props?.style) {
64
+ Object.assign(result, props.style);
65
+ }
66
+ return result;
62
67
  };
63
68
  };
64
69
  export default sv;
@@ -1 +1 @@
1
- {"version":3,"file":"sv.js","sourceRoot":"","sources":["../../src/sv.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAuBhD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,MAAM,EAAE,GAA0B,CAAC,MAAM,EAAE,EAAE;IAClD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,MAAM,CAAA;IAEpE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,IAAI,EAAE,CAAA;QAEtC,IAAI,MAAM,GAAkB,EAAE,GAAG,IAAI,EAAE,CAAA;QAEvC,MAAM,WAAW,GAA4B,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAEvG,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAW,CAAC,CAAA;YAC9D,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,UAAU,EAAE,CAAA;YACvC,CAAC;QACH,CAAC;QAED,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,eAAe,EAAE,IAAI,gBAAgB,EAAE,CAAC;gBACzE,IAAI,OAAO,GAAG,IAAI,CAAA;gBAClB,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;oBAClC,MAAM,KAAK,GAAG,eAAe,CAAC,GAAmC,CAAC,CAAA;oBAClE,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;oBAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;wBAC5E,OAAO,GAAG,KAAK,CAAA;wBACf,MAAK;oBACP,CAAC;gBACH,CAAC;gBACD,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,UAAU,EAAE,CAAA;gBACvC,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,KAAK,EAAE,CAAA;IAChC,CAAC,CAAA;AACH,CAAC,CAAA;AAED,eAAe,EAAE,CAAA"}
1
+ {"version":3,"file":"sv.js","sourceRoot":"","sources":["../../src/sv.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAuBhD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,MAAM,EAAE,GAA0B,CAAC,MAAM,EAAE,EAAE;IAClD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,eAAe,EAAE,GAAG,MAAM,CAAA;IAEpE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IAClD,CAAC;IAED,OAAO,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,MAAM,GAAkB,EAAE,GAAG,IAAI,EAAE,CAAA;QAEzC,MAAM,WAAW,GAAG,UAAU,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;QAEjE,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,CAAW,CAAC,CAAA;YAC9D,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;YACnC,CAAC;QACH,CAAC;QAED,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAA;gBACpC,IAAI,OAAO,GAAG,IAAI,CAAA;gBAClB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;oBAC3B,IAAI,GAAG,KAAK,OAAO;wBAAE,SAAQ;oBAC7B,MAAM,KAAK,GAAG,QAAQ,CAAC,GAA4B,CAAC,CAAA;oBACpD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;oBAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;wBAC5E,OAAO,GAAG,KAAK,CAAA;wBACf,MAAK;oBACP,CAAC;gBACH,CAAC;gBACD,IAAI,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBAC9B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACvC,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,KAAK,EAAE,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;QACpC,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC,CAAA;AACH,CAAC,CAAA;AAED,eAAe,EAAE,CAAA"}
@@ -1 +1 @@
1
- export declare function mergeProps<T extends Record<string, unknown>>(defaultProps: T, props: T): T;
1
+ export declare function mergeProps<T extends Record<string, unknown>, P extends Record<string, unknown>>(defaultProps: T | undefined, props: P | undefined, omitKeys?: (keyof P)[]): Record<string, unknown>;
@@ -1,10 +1,12 @@
1
- export function mergeProps(defaultProps, props) {
2
- const newObj = { ...defaultProps };
3
- for (const k in props) {
4
- if (props[k] !== undefined) {
5
- newObj[k] = props[k];
1
+ export function mergeProps(defaultProps, props, omitKeys) {
2
+ const merged = { ...defaultProps };
3
+ if (props) {
4
+ for (const k in props) {
5
+ if (props[k] !== undefined && (!omitKeys || !omitKeys.includes(k))) {
6
+ merged[k] = props[k];
7
+ }
6
8
  }
7
9
  }
8
- return newObj;
10
+ return merged;
9
11
  }
10
12
  //# sourceMappingURL=merge-props.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge-props.js","sourceRoot":"","sources":["../../../src/utils/merge-props.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CAAoC,YAAe,EAAE,KAAQ;IACrF,MAAM,MAAM,GAAG,EAAE,GAAG,YAAY,EAAE,CAAA;IAElC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QACtB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
1
+ {"version":3,"file":"merge-props.js","sourceRoot":"","sources":["../../../src/utils/merge-props.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CACxB,YAA2B,EAC3B,KAAoB,EACpB,QAAsB;IAEtB,MAAM,MAAM,GAA4B,EAAE,GAAG,YAAY,EAAE,CAAA;IAE3D,IAAI,KAAK,EAAE,CAAC;QACV,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnE,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "css-variants",
3
- "version": "2.1.2",
3
+ "version": "2.2.0",
4
4
  "description": "Lightweight helpers to compose class names and inline styles using variants. Zero runtime deps, small bundle, and first-class TypeScript support.",
5
5
  "main": "dist/cjs/index.js",
6
6
  "module": "dist/esm/index.js",
@@ -57,7 +57,7 @@
57
57
  "@eslint/js": "^9.17.0",
58
58
  "@types/eslint__js": "^8.42.3",
59
59
  "@types/node": "^20.12.12",
60
- "@vitest/coverage-v8": "^2.1.8",
60
+ "@vitest/coverage-v8": "^4.0.15",
61
61
  "csstype": "^3.1.3",
62
62
  "eslint": "^9.17.0",
63
63
  "eslint-config-prettier": "^9.1.0",
@@ -66,6 +66,6 @@
66
66
  "rimraf": "^5.0.7",
67
67
  "typescript": "^5.4.5",
68
68
  "typescript-eslint": "^7.16.1",
69
- "vitest": "^2.1.8"
69
+ "vitest": "^4.0.15"
70
70
  }
71
71
  }