clava 0.2.4 → 0.4.0

package/dist/index.d.ts

@@ -28,10 +28,11 @@ type ComponentResultValue<K extends AllComponentResultKeys> = K extends "style"
 type NullableComponentResult = { [K in AllComponentResultKeys]?: ComponentResultValue<K> | null };
 type ComponentProps<V = {}> = VariantValues<V> & NullableComponentResult;
 type GetVariants<V> = (variants?: VariantValues<V>) => VariantValues<V>;
+type ComponentPropKey<R extends ComponentResult> = keyof R | (R extends StyleClassProps ? "className" : never);
 type KeySourceArray = readonly string[];
 type KeySourceComponent = {
-  keys: readonly (string | number | symbol)[];
-  variantKeys: readonly (string | number | symbol)[];
+  propKeys: readonly string[];
+  variantKeys: readonly string[];
   getVariants: () => Record<string, unknown>;
 };
 type KeySource = KeySourceArray | KeySourceComponent;
@@ -39,7 +40,7 @@ type IsComponent<S> = S extends {
   getVariants: () => unknown;
 } ? true : false;
 type SourceKeys<S> = S extends readonly (infer K)[] ? K : S extends {
-  keys: readonly (infer K)[];
+  propKeys: readonly (infer K)[];
 } ? K : never;
 type SourceVariantKeys<S> = S extends readonly (infer K)[] ? K : S extends {
   variantKeys: readonly (infer K)[];
@@ -57,25 +58,20 @@ interface ModalComponent<V, R extends ComponentResult> {
   class: (props?: ComponentProps<V>) => string;
   style: (props?: ComponentProps<V>) => R["style"];
   getVariants: GetVariants<V>;
-  keys: (keyof V | keyof NullableComponentResult)[];
   variantKeys: (keyof V)[];
-  propKeys: (keyof V | keyof NullableComponentResult)[];
+  propKeys: (keyof V | ComponentPropKey<R>)[];
 }
-interface CVComponent<V extends Variants = {}, CV extends ComputedVariants = {}, E extends AnyComponent[] = [], R extends ComponentResult = StyleClassProps> extends ModalComponent<MergeVariants<V, CV, E>, R> {
-  jsx: ModalComponent<MergeVariants<V, CV, E>, JSXProps>;
-  html: ModalComponent<MergeVariants<V, CV, E>, HTMLProps>;
-  htmlObj: ModalComponent<MergeVariants<V, CV, E>, HTMLObjProps>;
+interface CVComponent<V extends Variants = {}, E extends AnyComponent[] = [], R extends ComponentResult = StyleClassProps> extends ModalComponent<MergeVariants<V, E>, R> {
+  jsx: ModalComponent<MergeVariants<V, E>, JSXProps>;
+  html: ModalComponent<MergeVariants<V, E>, HTMLProps>;
+  htmlObj: ModalComponent<MergeVariants<V, E>, HTMLObjProps>;
 }
-type AnyComponent = CVComponent<any, any, any, any> | ModalComponent<any, any>;
+type AnyComponent = CVComponent<any, any, any> | ModalComponent<any, any>;
 type MergeExtendedVariants<T> = T extends readonly [infer First, ...infer Rest] ? ExtractVariants<First> & MergeExtendedVariants<Rest> : {};
-type MergeExtendedComputedVariants<T> = T extends readonly [infer First, ...infer Rest] ? ExtractComputedVariants<First> & MergeExtendedComputedVariants<Rest> : {};
-type ExtractVariants<T> = T extends CVComponent<infer V, any, infer E, any> ? V & MergeExtendedVariants<E> : {};
-type ExtractComputedVariants<T> = T extends CVComponent<any, infer CV, infer E, any> ? CV & Omit<MergeExtendedComputedVariants<E>, keyof CV> : {};
-type MergeVariantDefinition<Child, Parent> = Child extends Record<string, any> ? Parent extends Record<string, any> ? Omit<Parent, keyof Child> & Child : Child : Child;
+type ExtractVariants<T> = T extends CVComponent<infer V, infer E, any> ? MergeVariantMaps<V, MergeExtendedVariants<E>> : {};
+type MergeVariantDefinition<Child, Parent> = Child extends ((...args: any[]) => any) ? Child : Parent extends ((...args: any[]) => any) ? Child : Child extends Record<string, any> ? Parent extends Record<string, any> ? Omit<Parent, keyof Child> & Child : Child : Child;
 type MergeVariantMaps<Child, Parent> = Omit<Parent, keyof Child> & Child & { [K in keyof Child & keyof Parent]: MergeVariantDefinition<Child[K], Parent[K]> };
-type MergeExtendedAllVariants<E extends AnyComponent[]> = MergeExtendedVariants<E> & MergeExtendedComputedVariants<E>;
-type MergeBaseVariants<V, E extends AnyComponent[]> = MergeVariantMaps<NoInfer<V>, MergeExtendedAllVariants<E>>;
-type MergeVariants<V, CV, E extends AnyComponent[]> = NoInfer<CV> & Omit<MergeBaseVariants<V, E>, keyof CV>;
+type MergeVariants<V, E extends AnyComponent[]> = MergeVariantMaps<NoInfer<V>, MergeExtendedVariants<E>>;
 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];
@@ -88,34 +84,30 @@ interface StyleClassValue {
   style?: StyleValue;
   class?: ClassValue;
 }
-interface ComputedContext<V> {
+interface RefineContext<V> {
   variants: VariantValues<V>;
   setVariants: (variants: VariantValues<V>) => void;
   setDefaultVariants: (variants: VariantValues<V>) => void;
   addClass: (className: ClassValue) => void;
   addStyle: (style: StyleValue) => void;
 }
-type Computed<V> = (context: ComputedContext<V>) => VariantValue;
-type ComputedVariant = (value: any) => VariantValue;
-type ComputedVariants = Record<string, ComputedVariant>;
-type Variant$1 = ClassValue | Record<string, VariantValue>;
+type Refine<V> = (context: RefineContext<V>) => VariantValue;
+type Variant$1 = ClassValue | Record<string, VariantValue> | ((value: any) => VariantValue);
 type Variants = Record<string, Variant$1>;
-type ExtendedVariants<E extends AnyComponent[]> = MergeExtendedVariants<E> & MergeExtendedComputedVariants<E>;
 type NullablePartial<T> = T extends Record<string, any> ? { [K in keyof T]?: T[K] | null } : T | null;
-type ExtendableVariants<V extends Variants, E extends AnyComponent[]> = V & { [K in keyof ExtendedVariants<E>]?: NullablePartial<ExtendedVariants<E>[K]> | Variant$1 };
+type ExtendableVariants<V extends Variants, E extends AnyComponent[]> = V & { [K in keyof MergeExtendedVariants<E>]?: NullablePartial<MergeExtendedVariants<E>[K]> | Variant$1 };
 //#endregion
 //#region src/index.d.ts
 type VariantProps<T extends Pick<AnyComponent, "getVariants">> = ReturnType<T["getVariants"]>;
 type VariantKey<T> = T extends boolean ? "true" | "false" : Extract<T, string>;
 type Variant<T extends Pick<AnyComponent, "getVariants">, K extends keyof VariantProps<T>> = Record<VariantKey<NonNullable<VariantProps<T>[K]>>, ClassValue | StyleClassValue>;
-interface CVConfig<V extends Variants = {}, CV extends ComputedVariants = {}, E extends AnyComponent[] = []> {
+interface CVConfig<V extends Variants = {}, E extends AnyComponent[] = []> {
   extend?: E;
   class?: ClassValue;
   style?: StyleValue;
   variants?: ExtendableVariants<V, E>;
-  computedVariants?: CV;
-  defaultVariants?: VariantValues<MergeVariants<V, CV, E>>;
-  computed?: Computed<MergeVariants<V, CV, E>>;
+  defaultVariants?: VariantValues<MergeVariants<V, E>>;
+  refine?: Refine<MergeVariants<V, E>>;
 }
 interface CreateParams {
   transformClass?: (className: string) => string;
@@ -135,10 +127,10 @@ declare const splitProps: SplitPropsFunction;
 declare function create({
   transformClass
 }?: CreateParams): {
-  cv: <V extends Variants = {}, CV extends ComputedVariants = {}, const E extends AnyComponent[] = []>(config?: CVConfig<V, CV, E>) => CVComponent<V, CV, E>;
+  cv: <V extends Variants = {}, const E extends AnyComponent[] = []>(config?: CVConfig<V, E>) => CVComponent<V, E>;
   cx: (...classes: ClassValue$1[]) => string;
 };
-declare const cv: <V extends Variants = {}, CV extends ComputedVariants = {}, const E extends AnyComponent[] = []>(config?: CVConfig<V, CV, E>) => CVComponent<V, CV, E>, cx: (...classes: ClassValue$1[]) => string;
+declare const cv: <V extends Variants = {}, const E extends AnyComponent[] = []>(config?: CVConfig<V, E>) => CVComponent<V, E>, cx: (...classes: ClassValue$1[]) => string;
 //#endregion
 export { type CVComponent, CVConfig, type ClassValue, type HTMLObjProps, type HTMLProps, type JSXProps, type StyleClassProps, type StyleClassValue, type StyleValue, Variant, VariantProps, create, cv, cx, splitProps };
 //# sourceMappingURL=index.d.ts.map