feat: add resolveProps as vcn's second return

packages/react/shared.ts

@@ -20,25 +20,51 @@ export function vcn<V extends Record<string, Record<string, string>>>({
   defaults: {
     [VariantKey in keyof V]: BooleanString<keyof V[VariantKey] & string>;
   };
-}): (variantProps: RawVariantProps<V> & { className?: string }) => string {
+}): [
-  return ({ className, ...variantProps }) => {
+  (variantProps: RawVariantProps<V> & { className?: string }) => string,
-    return twMerge(
+  (
-      base,
+    anyProps: Record<string, any>,
-      ...(
+    options?: {
-        Object.entries(defaults) as [keyof V, keyof V[keyof V]][]
+      includeClassName?: boolean;
-      ).map<string>(
+    }
-        ([variantKey, defaultValue]) =>
+  ) => [RawVariantProps<V> & { className?: string }, Record<string, any>],
-          variants[variantKey][
+] {
-            (variantProps as unknown as RawVariantProps<V>)[variantKey] ??
+  return [
-              defaultValue
+    ({ className, ...variantProps }) => {
-          ]
+      return twMerge(
-      ),
+        base,
-      className
+        ...(
-    );
+          Object.entries(defaults) as [keyof V, keyof V[keyof V]][]
-  };
+        ).map<string>(
+          ([variantKey, defaultValue]) =>
+            variants[variantKey][
+              (variantProps as unknown as RawVariantProps<V>)[variantKey] ??
+                defaultValue
+            ]
+        ),
+        className
+      );
+    },
+    (anyProps, options = {}) => {
+      const variantKeys = Object.keys(variants) as (keyof V)[];
+
+      return Object.entries(anyProps).reduce(
+        ([variantProps, otherProps], [key, value]) => {
+          if (
+            variantKeys.includes(key) ||
+            (options.includeClassName && key === "className")
+          ) {
+            return [{ ...variantProps, [key]: value }, otherProps];
+          }
+          return [variantProps, { ...otherProps, [key]: value }];
+        },
+        [{}, {}]
+      );
+    },
+  ];
 }
 
-export type VariantProps<F extends ReturnType<typeof vcn>> = F extends (
+export type VariantProps<F extends ReturnType<typeof vcn>[0]> = F extends (
   props: infer P
 ) => string
   ? P