clava 0.2.3 → 0.2.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # clava
 
+## 0.2.4
+
+- Fixed [`cv`](https://clava.style/docs/reference/cv) variant props inferred from array class values to use boolean shorthand props.
+
 ## 0.2.3
 
 ### Improved runtime performance of `extend` chains and `getVariants` in `cv`

package/dist/index.d.ts

@@ -79,7 +79,7 @@ type MergeVariants<V, CV, E extends AnyComponent[]> = NoInfer<CV> & Omit<MergeBa
 type StringToBoolean<T> = T extends "true" | "false" ? boolean : T;
 type VariantValue = ClassValue | StyleClassValue;
 type NonNullKeys<T> = { [K in keyof T]: T[K] extends null ? never : K }[keyof T];
-type ExtractVariantValue<T> = T extends null ? never : T extends ((value: infer V) => any) ? V : T extends Record<string, any> ? StringToBoolean<NonNullKeys<T>> : T extends ClassValue ? boolean : never;
+type ExtractVariantValue<T> = T extends null ? never : T extends ((value: infer V) => any) ? V : T extends readonly unknown[] ? boolean : T extends Record<string, any> ? StringToBoolean<NonNullKeys<T>> : T extends ClassValue ? boolean : never;
 type VariantValues<V> = { [K in keyof V]?: ExtractVariantValue<V[K]> };
 type StyleValue = CSS.Properties & {
   [key: `--${string}`]: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clava",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Clava library",
   "keywords": [
     "class variance",

package/src/types.ts

@@ -248,11 +248,13 @@ type ExtractVariantValue<T> = T extends null
   ? never
   : T extends (value: infer V) => any
     ? V
-    : T extends Record<string, any>
-      ? StringToBoolean<NonNullKeys<T>>
-      : T extends ClassValue
-        ? boolean
-        : never;
+    : T extends readonly unknown[]
+      ? boolean
+      : T extends Record<string, any>
+        ? StringToBoolean<NonNullKeys<T>>
+        : T extends ClassValue
+          ? boolean
+          : never;
 
 export type VariantValues<V> = {
   [K in keyof V]?: ExtractVariantValue<V[K]>;

package/tests/variants.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, expectTypeOf, test } from "vitest";
 import {
   CONFIGS,
   createCVFromConfig,
@@ -211,6 +211,34 @@ for (const config of Object.values(CONFIGS)) {
       expect(getStyleClass(props)).toEqual({ class: "" });
     });
 
+    test("array variant shorthand", () => {
+      const component = getModeComponent(
+        mode,
+        cv({
+          variants: {
+            interactive: ["interactive", "focusable"],
+          },
+          defaultVariants: { interactive: true },
+        }),
+      );
+      expectTypeOf(component.getVariants()).branded.toEqualTypeOf<{
+        interactive?: boolean;
+      }>();
+      expect(getStyleClass(component())).toEqual({
+        class: cls("interactive focusable"),
+      });
+      expect(getStyleClass(component({ interactive: false }))).toEqual({
+        class: "",
+      });
+      const props = component({
+        // @ts-expect-error array shorthand variants are boolean
+        interactive:
+          // no error
+          "interactive",
+      });
+      expect(getStyleClass(props)).toEqual({ class: "" });
+    });
+
     test("variant style does not accept numbers", () => {
       const component = getModeComponent(
         mode,