tailwind-styled-v4 5.1.33 → 5.1.35

package/dist/index.d.mts

@@ -18,9 +18,19 @@ type SizesConfig = Record<string, string>;
  * supaya kedua tempat itu tidak duplikasi & selalu konsisten.
  */
 type InferVariantPropsFromVariantsMap<V> = {
-    [K in keyof V]?: V[K] extends Record<infer Key, any> ? Key extends "true" | "false" ? boolean : Key extends number ? Key : Key extends `${infer N extends number}` ? N : Key : never;
+    [K in keyof V as string extends K ? never : number extends K ? never : K]?: V[K] extends Record<infer Key, unknown> ? Key extends "true" | "false" ? boolean : Key extends number ? Key : Key extends `${infer N extends number}` ? N : Key : never;
 };
 type InferVariantProps<T extends ComponentConfig> = InferVariantPropsFromVariantsMap<T["variants"]>;
+/**
+ * Infer allowed types for defaultVariants based on variant keys.
+ * Supports:
+ * - String keys: { variant: "primary" }
+ * - Number keys: { priority: 0 }
+ * - Boolean keys: { disabled: false } (translates true/false to "true"/"false" keys)
+ *
+ * This helper ensures type safety when defaultVariants contains non-string values.
+ */
+type InferDefaultVariantsType<T extends ComponentConfig> = InferVariantPropsFromVariantsMap<T["variants"]>;
 type InferSizeProps<T extends ComponentConfig> = T["sizes"] extends Record<string, string> ? {
     size?: keyof T["sizes"];
 } : Record<never, never>;
@@ -33,7 +43,7 @@ type InferSizeProps<T extends ComponentConfig> = T["sizes"] extends Record<strin
  * // → { loading?: boolean, fullWidth?: boolean }
  */
 type InferStatesProps<T extends ComponentConfig> = {
-    [K in keyof T["states"]]?: boolean;
+    [K in keyof T["states"] as string extends K ? never : number extends K ? never : K]?: boolean;
 };
 /**
  * Sub-component config bisa berupa:
@@ -237,7 +247,7 @@ interface StateConfig {
     defaultStates?: Record<string, boolean>;
 }
 type CvFn<C extends ComponentConfig> = (props?: {
-    [K in keyof C["variants"]]?: keyof C["variants"][K];
+    [K in keyof C["variants"] as string extends K ? never : number extends K ? never : K]?: keyof C["variants"][K];
 } & {
     class?: string;
     className?: string;
@@ -248,7 +258,7 @@ interface StyledComponentProps {
     children?: React.ReactNode;
 }
 type SubComponentMap = Record<string, unknown>;
-type TwSubComponentAccessor<Tag extends HtmlTagName = "span", ExtraProps extends Record<string, unknown> = Record<never, never>> = React.FC<Omit<React.ComponentPropsWithoutRef<Tag>, "ref"> & ExtraProps & {
+type TwSubComponentAccessor<Tag extends HtmlTagName = "span", ExtraProps extends Record<string, unknown> = Record<never, never>> = React.FC<Omit<React.ComponentPropsWithoutRef<Tag>, "ref" | keyof ExtraProps> & ExtraProps & {
     children?: React.ReactNode;
     className?: string;
 }>;
@@ -264,18 +274,24 @@ type SubComponentKeys<S extends string, TagMap extends Record<string, string> =
     [K in S]: TwSubComponentAccessor<K extends keyof TagMap ? (TagMap[K] extends HtmlTagName ? TagMap[K] : "span") : "span", K extends keyof SubVariantsMap ? SubVariantsMap[K] : Record<never, never>>;
 };
 type TwStyledComponent<Config extends ComponentConfig = ComponentConfig, S extends string = string, TagMap extends Record<string, string> = Record<string, never>, Tag extends HtmlTagName = HtmlTagName, SubVariantsMap extends Record<string, Record<string, unknown>> = Record<string, never>> = {
-    (props: React.ComponentPropsWithoutRef<Tag> & StyledComponentProps & InferVariantProps<Config> & InferSizeProps<Config> & InferStatesProps<Config>): React.ReactElement | null;
+    (props: Omit<React.ComponentPropsWithoutRef<Tag>, keyof InferVariantProps<Config> | keyof InferSizeProps<Config> | keyof InferStatesProps<Config>> & StyledComponentProps & InferVariantProps<Config> & InferSizeProps<Config> & InferStatesProps<Config>): React.ReactElement | null;
     displayName?: string;
     extend: {
         (strings: TemplateStringsArray, ...exprs: unknown[]): TwStyledComponent<Config, S, TagMap, Tag, SubVariantsMap>;
-        (config: {
+        <EC extends {
             classes?: string;
             variants?: ComponentConfig["variants"];
             defaultVariants?: ComponentConfig["defaultVariants"];
             compoundVariants?: ComponentConfig["compoundVariants"];
+        }>(config: EC & {
+            defaultVariants?: InferDefaultVariantsType<{
+                variants: EC["variants"];
+            }>;
         }): TwStyledComponent<Config, S, TagMap, Tag, SubVariantsMap>;
     };
-    withVariants: (config: Partial<Config>) => TwStyledComponent<Config, S, TagMap, Tag, SubVariantsMap>;
+    withVariants: (config: Partial<Omit<Config, "defaultVariants">> & {
+        defaultVariants?: InferDefaultVariantsType<Config>;
+    }) => TwStyledComponent<Config, S, TagMap, Tag, SubVariantsMap>;
     /**
      * Declare sub-component names secara eksplisit untuk autocomplete + type safety.
      *
@@ -296,7 +312,9 @@ interface TwSubComponent<P = unknown> {
     displayName?: string;
 }
 interface TwTemplateFactory<Config extends ComponentConfig = ComponentConfig, Tag extends HtmlTagName = HtmlTagName> {
-    <C extends ComponentConfig>(config: C): TwStyledComponent<C, InferSubFromConfig<C>, InferSubTagsFromConfig<C> extends Record<string, string> ? InferSubTagsFromConfig<C> : Record<string, never>, Tag, InferSubVariantsFromConfig<C> extends Record<string, Record<string, unknown>> ? InferSubVariantsFromConfig<C> : Record<string, never>>;
+    <C extends ComponentConfig>(config: C & {
+        defaultVariants?: InferDefaultVariantsType<C>;
+    }): TwStyledComponent<C, InferSubFromConfig<C>, InferSubTagsFromConfig<C> extends Record<string, string> ? InferSubTagsFromConfig<C> : Record<string, never>, Tag, InferSubVariantsFromConfig<C> extends Record<string, Record<string, unknown>> ? InferSubVariantsFromConfig<C> : Record<string, never>>;
     <const T extends string>(strings: readonly [T], ...exprs: []): TwStyledComponent<Config, ExtractSubNames<T>, Record<string, never>, Tag>;
     (strings: TemplateStringsArray, ...exprs: unknown[]): TwStyledComponent<Config, string, Record<string, never>, Tag>;
 }

package/dist/index.d.ts

@@ -18,9 +18,19 @@ type SizesConfig = Record<string, string>;
  * supaya kedua tempat itu tidak duplikasi & selalu konsisten.
  */
 type InferVariantPropsFromVariantsMap<V> = {
-    [K in keyof V]?: V[K] extends Record<infer Key, any> ? Key extends "true" | "false" ? boolean : Key extends number ? Key : Key extends `${infer N extends number}` ? N : Key : never;
+    [K in keyof V as string extends K ? never : number extends K ? never : K]?: V[K] extends Record<infer Key, unknown> ? Key extends "true" | "false" ? boolean : Key extends number ? Key : Key extends `${infer N extends number}` ? N : Key : never;
 };
 type InferVariantProps<T extends ComponentConfig> = InferVariantPropsFromVariantsMap<T["variants"]>;
+/**
+ * Infer allowed types for defaultVariants based on variant keys.
+ * Supports:
+ * - String keys: { variant: "primary" }
+ * - Number keys: { priority: 0 }
+ * - Boolean keys: { disabled: false } (translates true/false to "true"/"false" keys)
+ *
+ * This helper ensures type safety when defaultVariants contains non-string values.
+ */
+type InferDefaultVariantsType<T extends ComponentConfig> = InferVariantPropsFromVariantsMap<T["variants"]>;
 type InferSizeProps<T extends ComponentConfig> = T["sizes"] extends Record<string, string> ? {
     size?: keyof T["sizes"];
 } : Record<never, never>;
@@ -33,7 +43,7 @@ type InferSizeProps<T extends ComponentConfig> = T["sizes"] extends Record<strin
  * // → { loading?: boolean, fullWidth?: boolean }
  */
 type InferStatesProps<T extends ComponentConfig> = {
-    [K in keyof T["states"]]?: boolean;
+    [K in keyof T["states"] as string extends K ? never : number extends K ? never : K]?: boolean;
 };
 /**
  * Sub-component config bisa berupa:
@@ -237,7 +247,7 @@ interface StateConfig {
     defaultStates?: Record<string, boolean>;
 }
 type CvFn<C extends ComponentConfig> = (props?: {
-    [K in keyof C["variants"]]?: keyof C["variants"][K];
+    [K in keyof C["variants"] as string extends K ? never : number extends K ? never : K]?: keyof C["variants"][K];
 } & {
     class?: string;
     className?: string;
@@ -248,7 +258,7 @@ interface StyledComponentProps {
     children?: React.ReactNode;
 }
 type SubComponentMap = Record<string, unknown>;
-type TwSubComponentAccessor<Tag extends HtmlTagName = "span", ExtraProps extends Record<string, unknown> = Record<never, never>> = React.FC<Omit<React.ComponentPropsWithoutRef<Tag>, "ref"> & ExtraProps & {
+type TwSubComponentAccessor<Tag extends HtmlTagName = "span", ExtraProps extends Record<string, unknown> = Record<never, never>> = React.FC<Omit<React.ComponentPropsWithoutRef<Tag>, "ref" | keyof ExtraProps> & ExtraProps & {
     children?: React.ReactNode;
     className?: string;
 }>;
@@ -264,18 +274,24 @@ type SubComponentKeys<S extends string, TagMap extends Record<string, string> =
     [K in S]: TwSubComponentAccessor<K extends keyof TagMap ? (TagMap[K] extends HtmlTagName ? TagMap[K] : "span") : "span", K extends keyof SubVariantsMap ? SubVariantsMap[K] : Record<never, never>>;
 };
 type TwStyledComponent<Config extends ComponentConfig = ComponentConfig, S extends string = string, TagMap extends Record<string, string> = Record<string, never>, Tag extends HtmlTagName = HtmlTagName, SubVariantsMap extends Record<string, Record<string, unknown>> = Record<string, never>> = {
-    (props: React.ComponentPropsWithoutRef<Tag> & StyledComponentProps & InferVariantProps<Config> & InferSizeProps<Config> & InferStatesProps<Config>): React.ReactElement | null;
+    (props: Omit<React.ComponentPropsWithoutRef<Tag>, keyof InferVariantProps<Config> | keyof InferSizeProps<Config> | keyof InferStatesProps<Config>> & StyledComponentProps & InferVariantProps<Config> & InferSizeProps<Config> & InferStatesProps<Config>): React.ReactElement | null;
     displayName?: string;
     extend: {
         (strings: TemplateStringsArray, ...exprs: unknown[]): TwStyledComponent<Config, S, TagMap, Tag, SubVariantsMap>;
-        (config: {
+        <EC extends {
             classes?: string;
             variants?: ComponentConfig["variants"];
             defaultVariants?: ComponentConfig["defaultVariants"];
             compoundVariants?: ComponentConfig["compoundVariants"];
+        }>(config: EC & {
+            defaultVariants?: InferDefaultVariantsType<{
+                variants: EC["variants"];
+            }>;
         }): TwStyledComponent<Config, S, TagMap, Tag, SubVariantsMap>;
     };
-    withVariants: (config: Partial<Config>) => TwStyledComponent<Config, S, TagMap, Tag, SubVariantsMap>;
+    withVariants: (config: Partial<Omit<Config, "defaultVariants">> & {
+        defaultVariants?: InferDefaultVariantsType<Config>;
+    }) => TwStyledComponent<Config, S, TagMap, Tag, SubVariantsMap>;
     /**
      * Declare sub-component names secara eksplisit untuk autocomplete + type safety.
      *
@@ -296,7 +312,9 @@ interface TwSubComponent<P = unknown> {
     displayName?: string;
 }
 interface TwTemplateFactory<Config extends ComponentConfig = ComponentConfig, Tag extends HtmlTagName = HtmlTagName> {
-    <C extends ComponentConfig>(config: C): TwStyledComponent<C, InferSubFromConfig<C>, InferSubTagsFromConfig<C> extends Record<string, string> ? InferSubTagsFromConfig<C> : Record<string, never>, Tag, InferSubVariantsFromConfig<C> extends Record<string, Record<string, unknown>> ? InferSubVariantsFromConfig<C> : Record<string, never>>;
+    <C extends ComponentConfig>(config: C & {
+        defaultVariants?: InferDefaultVariantsType<C>;
+    }): TwStyledComponent<C, InferSubFromConfig<C>, InferSubTagsFromConfig<C> extends Record<string, string> ? InferSubTagsFromConfig<C> : Record<string, never>, Tag, InferSubVariantsFromConfig<C> extends Record<string, Record<string, unknown>> ? InferSubVariantsFromConfig<C> : Record<string, never>>;
     <const T extends string>(strings: readonly [T], ...exprs: []): TwStyledComponent<Config, ExtractSubNames<T>, Record<string, never>, Tag>;
     (strings: TemplateStringsArray, ...exprs: unknown[]): TwStyledComponent<Config, string, Record<string, never>, Tag>;
 }

package/dist/index.js

@@ -1046,7 +1046,7 @@ function attachExtend(component, originalTag, base, config) {
     return extended;
   }
   component.extend = extendWithClasses;
-  component.withVariants = (newConfig) => {
+  component.withVariants = ((newConfig) => {
     const existing = typeof config === "object" ? config : {};
     return createComponent(originalTag, {
       ...existing,
@@ -1061,7 +1061,7 @@ function attachExtend(component, originalTag, base, config) {
         ...newConfig.defaultVariants ?? {}
       }
     });
-  };
+  });
   component.withSub = (() => component);
   return component;
 }