@svelte-atoms/core 1.0.0-alpha.30 → 1.0.0-alpha.32

package/dist/components/alert/bond.svelte.d.ts

@@ -1,8 +1,5 @@
 import { Bond, BondState, type BondStateProps } from '../../shared/bond.svelte';
 export type AlertBondProps = BondStateProps & {
-    variant?: 'info' | 'success' | 'warning' | 'error';
-    dismissible?: boolean;
-    dismissed?: boolean;
     disabled?: boolean;
     extend?: Record<string, unknown>;
 };
@@ -25,9 +22,6 @@ export declare class AlertBond<State extends AlertBondState<AlertBondProps> = Al
         'aria-labelledby': string;
         'aria-describedby': string;
         'aria-disabled': boolean;
-        'data-variant': "success" | "error" | "info" | "warning";
-        'data-dismissed': boolean;
-        'data-dismissible': boolean;
     };
     icon(props?: Record<string, unknown>): {
         id: string;
@@ -49,17 +43,10 @@ export declare class AlertBond<State extends AlertBondState<AlertBondProps> = Al
         id: string;
         type: string;
         'aria-label': string;
-        'aria-expanded': boolean;
-        onclick: () => void;
     };
     static get(): AlertBond | undefined;
     static set(bond: AlertBond): AlertBond;
 }
 export declare class AlertBondState<Props extends AlertBondProps> extends BondState<Props> {
     constructor(props: () => Props);
-    dismiss(): void;
-    restore(): void;
-    get isDismissed(): boolean;
-    get isDismissible(): boolean;
-    get variant(): "success" | "error" | "info" | "warning";
 }

package/dist/components/alert/bond.svelte.js

@@ -10,8 +10,6 @@ export class AlertBond extends Bond {
         return AlertBond.set(this);
     }
     root(props = {}) {
-        const variant = this.state.props.variant ?? 'info';
-        const dismissed = this.state.props.dismissed ?? false;
         const disabled = this.state.props.disabled ?? false;
         return {
             id: `alert-root-${this.id}`,
@@ -19,9 +17,6 @@ export class AlertBond extends Bond {
             'aria-labelledby': `alert-title-${this.id}`,
             'aria-describedby': `alert-description-${this.id}`,
             'aria-disabled': disabled,
-            'data-variant': variant,
-            'data-dismissed': dismissed,
-            'data-dismissible': this.state.props.dismissible ?? false,
             ...props,
             [createAttachmentKey()]: (node) => {
                 this.elements.root = node;
@@ -75,13 +70,10 @@ export class AlertBond extends Bond {
         };
     }
     closeButton(props = {}) {
-        const dismissed = this.state.props.dismissed ?? false;
         return {
             id: `alert-close-button-${this.id}`,
             type: 'button',
             'aria-label': 'Dismiss alert',
-            'aria-expanded': !dismissed,
-            onclick: () => this.state.dismiss(),
             ...props,
             [createAttachmentKey()]: (node) => {
                 this.elements.closeButton = node;
@@ -99,28 +91,4 @@ export class AlertBondState extends BondState {
     constructor(props) {
         super(props);
     }
-    dismiss() {
-        if (this.props.dismissible && !this.props.disabled) {
-            // Update the dismissed state through props if mutable
-            const props = this.props;
-            if ('dismissed' in props) {
-                props.dismissed = true;
-            }
-        }
-    }
-    restore() {
-        const props = this.props;
-        if ('dismissed' in props) {
-            props.dismissed = false;
-        }
-    }
-    get isDismissed() {
-        return this.props.dismissed ?? false;
-    }
-    get isDismissible() {
-        return this.props.dismissible ?? false;
-    }
-    get variant() {
-        return this.props.variant ?? 'info';
-    }
 }

package/dist/components/alert/types.d.ts

@@ -1,6 +1,6 @@
 import type { Snippet } from 'svelte';
 import type { HtmlAtomProps, Base } from '../atom';
-import type { Factory, Override } from '../../types';
+import type { Factory } from '../../types';
 import type { AlertBond } from './bond.svelte';
 /**
  * Extend this interface to add custom alert root properties in your application.
@@ -37,7 +37,7 @@ export interface AlertActionsExtendProps {
  */
 export interface AlertCloseButtonExtendProps {
 }
-export interface AlertRootProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends Omit<HtmlAtomProps<E, B>, 'children'>, AlertRootExtendProps {
+export interface AlertRootProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends HtmlAtomProps<E, B>, AlertRootExtendProps {
     dismissible?: boolean;
     dismissed?: boolean;
     disabled?: boolean;
@@ -47,39 +47,15 @@ export interface AlertRootProps<E extends keyof HTMLElementTagNameMap = 'div', B
         alert: AlertBond;
     }]>;
 }
-export interface AlertContentProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends Override<HtmlAtomProps<E, B>, {
-    children?: Snippet<[{
-        alert: AlertBond;
-    }]>;
-}>, AlertContentExtendProps {
+export interface AlertContentProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends HtmlAtomProps<E, B>, AlertContentExtendProps {
 }
-export interface AlertTitleProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends Override<HtmlAtomProps<E, B>, {
-    children?: Snippet<[{
-        alert: AlertBond;
-    }]>;
-}>, AlertTitleExtendProps {
+export interface AlertTitleProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends HtmlAtomProps<E, B>, AlertTitleExtendProps {
 }
-export interface AlertDescriptionProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends Override<HtmlAtomProps<E, B>, {
-    children?: Snippet<[{
-        alert: AlertBond;
-    }]>;
-}>, AlertDescriptionExtendProps {
+export interface AlertDescriptionProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends HtmlAtomProps<E, B>, AlertDescriptionExtendProps {
 }
-export interface AlertIconProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends Override<HtmlAtomProps<E, B>, {
-    children?: Snippet<[{
-        alert: AlertBond;
-    }]>;
-}>, AlertIconExtendProps {
+export interface AlertIconProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends HtmlAtomProps<E, B>, AlertIconExtendProps {
 }
-export interface AlertActionsProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends Override<HtmlAtomProps<E, B>, {
-    children?: Snippet<[{
-        alert: AlertBond;
-    }]>;
-}>, AlertActionsExtendProps {
+export interface AlertActionsProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends HtmlAtomProps<E, B>, AlertActionsExtendProps {
 }
-export interface AlertCloseButtonProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends Override<HtmlAtomProps<E, B>, {
-    children?: Snippet<[{
-        alert: AlertBond;
-    }]>;
-}>, AlertCloseButtonExtendProps {
+export interface AlertCloseButtonProps<E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base> extends HtmlAtomProps<E, B>, AlertCloseButtonExtendProps {
 }

package/dist/components/atom/html-atom.svelte

@@ -1,261 +1,93 @@
-<script lang="ts" generics="E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base">
-	import type { HTMLAttributes } from 'svelte/elements';
-	import type { Base, HtmlAtomProps, SnippetBase } from './types';
-	import { RootBond } from '../root';
-	import { HtmlElement } from '../element';
-	import { cn, type ClassValue, type VariantDefinition } from '../../utils';
-	import { getPreset } from '../../context';
-	import type { PresetModuleName } from '../../context/preset.svelte';
-	import type { Bond } from '../../shared';
-	import SnippetRenderer from './snippet-renderer.svelte';
-	import type { Component } from 'svelte';
-	import { call } from '../../utils/function';
-
-	type Element = HTMLElementTagNameMap[E];
-
-	const rootBond = RootBond.get();
-
-	let {
-		class: klass = '',
-		as = 'div',
-		base = undefined,
-		preset: presetKey = undefined,
-		bond = undefined,
-		variants = undefined,
-		children: childrenProp = undefined,
-		...restProps
-	}: HtmlAtomProps<E, B> & Omit<HTMLAttributes<Element>, 'children'> = $props();
-
-	/**
-	 * Resolve variant definition to props
-	 */
-	// Cache for resolved variants to avoid recomputation
-	// Key: JSON stringified combination of variant props
-	const variantCache = new Map<string, Record<string, any>>();
-
-	// Memoize preset resolution - only recompute when presetKey or bond changes
-	const preset = $derived.by(() => {
-		if (!presetKey) return undefined;
-		const result = getPreset(presetKey as PresetModuleName)?.apply?.(bond, [bond]);
-		// Handle deferred preset result (factory function)
-		return call(result);
-	});
-
-	const presetProps = $derived(preset?.variants);
-
-	// Resolve local variants - either VariantDefinition or function
-	const localVariants = $derived.by(() => {
-		if (!variants) return undefined;
-
-		// If it's a function, call it directly
-		if (typeof variants === 'function') {
-			return variants(bond as Bond, restProps);
-		}
-
-		// Otherwise it's a VariantDefinition, resolve it
-		return resolveVariants(variants, bond as Bond, restProps);
-	});
-
-	// Merge preset variants with local variants
-	// Memoized to avoid recomputation when inputs haven't changed
-	const mergedVariants = $derived.by(() => {
-		// No variants at all
-		if (!presetProps && !localVariants) return undefined;
-
-		// Only preset variants (raw object from preset)
-		if (presetProps && !localVariants) {
-			// Convert preset variants to VariantDefinition-like structure
-			const variantDef: VariantDefinition<any> = {
-				class: preset?.class ?? '',
-				variants: presetProps,
-				compounds: preset?.compounds ?? [],
-				defaults: preset?.defaults ?? {}
-			};
-			return resolveVariants(variantDef, bond as Bond, restProps);
-		}
-
-		// Only local variants
-		if (!presetProps && localVariants) {
-			return localVariants;
-		}
-
-		// Both exist - merge them
-		// When both preset and local variants exist, we need to merge the resolved props
-		const presetVariantDef: VariantDefinition<any> = {
-			class: preset?.class ?? '',
-			variants: presetProps ?? {},
-			compounds: preset?.compounds ?? [],
-			defaults: preset?.defaults ?? {}
-		};
-
-		const presetResolved = resolveVariants(presetVariantDef, bond as Bond, restProps);
-
-		// Merge the resolved variant props
-		// Local variant classes and attributes override preset
-		const presetClasses = Array.isArray(presetResolved.class)
-			? presetResolved.class
-			: [presetResolved.class];
-		const localClasses = Array.isArray(localVariants?.class)
-			? localVariants.class
-			: [localVariants?.class];
-
-		return {
-			class: [...presetClasses, ...localClasses].filter(Boolean),
-			...presetResolved,
-			...localVariants
-		};
-	});
-
-	const presetClassString = $derived(cn(preset?.class));
-
-	const _klass = $derived.by(() => {
-		const klassStr = cn(klass ?? '');
-		// Check for $preset placeholder first
-		if (!klassStr.includes('$preset')) {
-			// No placeholder - normal merge: variants override direct class
-			return cn(klass, mergedVariants?.class ?? '');
-		}
-
-		// Has placeholder - calculate position and inject preset classes
-		const parts = klassStr.split('$preset');
-
-		// Only keep the last $preset placeholder
-		const beforeLastPlaceholder = parts.slice(0, -1).join('');
-		const afterLastPlaceholder = parts[parts.length - 1];
-
-		// Merge: before + preset + variants + after
-		return cn(
-			beforeLastPlaceholder,
-			presetClassString,
-			mergedVariants?.class ?? '',
-			afterLastPlaceholder
-		);
-	});
-
-	const _base = $derived(base ?? preset?.base);
-	const _as = $derived(as ?? preset?.as);
-	const _restProps = $derived.by(() => {
-		const {
-			class: klassPreset,
-			base,
-			as,
-			variants: presetProps,
-			...restPresetProps
-		} = preset ?? {};
-		const { class: variantClass, ...variantsRestProps } = mergedVariants ?? {};
-
-		return { ...restPresetProps, ...variantsRestProps, ...restProps };
-	});
-
-	const isSnippet = $derived(typeof _base === 'function' && _base.length === 1 && !_base.prototype);
-
-	const snippet = $derived(_base as SnippetBase);
-
-	const atom = rootBond?.state?.props?.renderers?.html ?? HtmlElement;
-
-	const renderer = $derived.by(() => {
-		if (isSnippet)
-			return {
-				component: SnippetRenderer,
-				props: { snippet: snippet, class: _klass, as: _as, children: childrenProp, ..._restProps }
-			};
-
-		return {
-			component: base ?? atom,
-			props: { class: _klass, as: _as, ..._restProps }
-		};
-	}) as { component: Component; props: Record<string, any> };
-
-	function resolveVariants(
-		def: VariantDefinition<any>,
-		bond: Bond | null | undefined,
-		props: Record<string, any>
-	): Record<string, any> {
-		const { variants: variantMap, compounds, defaults, class: baseClass } = def;
-
-		// Merge props with defaults
-		const finalProps = { ...defaults, ...props };
-
-		// Create cache key from final props (only variant-related props)
-		const variantKeys = variantMap ? Object.keys(variantMap) : [];
-		const relevantProps = Object.fromEntries(
-			Object.entries(finalProps).filter(([key]) => variantKeys.includes(key))
-		);
-		const cacheKey = JSON.stringify({ relevantProps, baseClass, compounds });
-
-		// Check cache
-		if (variantCache.has(cacheKey)) {
-			return variantCache.get(cacheKey)!;
-		}
-
-		const classes: ClassValue[] = [];
-		const attributes: Record<string, any> = {};
-
-		// Add base class
-		if (baseClass) classes.push(baseClass);
-
-		// Add variant classes
-		if (variantMap) {
-			for (const [key, value] of Object.entries(finalProps)) {
-				const variantValue = variantMap[key]?.[value as string];
-				if (variantValue !== undefined) {
-					const resolved = typeof variantValue === 'function' ? variantValue(bond) : variantValue;
-
-					if (typeof resolved === 'string') {
-						classes.push(resolved);
-					} else if (typeof resolved === 'object' && resolved !== null) {
-						if ('class' in resolved) {
-							classes.push(resolved.class);
-						}
-						// Add other attributes
-						Object.entries(resolved).forEach(([k, v]) => {
-							if (k !== 'class') {
-								attributes[k] = v;
-							}
-						});
-					}
-				}
-			}
-		}
-
-		// Add compound variants
-		if (compounds) {
-			for (const compound of compounds) {
-				const { class: compoundClass, ...compoundProps } = compound;
-				const matches = Object.entries(compoundProps).every(
-					([key, value]) => finalProps[key] === value
-				);
-				if (matches) {
-					if (compoundClass) classes.push(compoundClass);
-					// Add compound attributes
-					Object.entries(compound).forEach(([k, v]) => {
-						if (k !== 'class' && !Object.keys(compoundProps).includes(k)) {
-							attributes[k] = v;
-						}
-					});
-				}
-			}
-		}
-
-		const result = {
-			class: classes,
-			...attributes
-		};
-
-		// Store in cache (limit cache size to prevent memory leaks)
-		if (variantCache.size > 100) {
-			// Clear oldest entry (first in Map)
-			const firstKey = variantCache.keys().next().value;
-			if (firstKey) variantCache.delete(firstKey);
-		}
-		variantCache.set(cacheKey, result);
-
-		return result;
-	}
-</script>
-
-<renderer.component {...renderer.props}>
-	{#snippet children(args: any)}
-		{@render (childrenProp as any)?.(args)}
-	{/snippet}
-</renderer.component>
+<script lang="ts" generics="E extends keyof HTMLElementTagNameMap = 'div', B extends Base = Base">
+	import type { HTMLAttributes } from 'svelte/elements';
+	import type { Base, HtmlAtomProps, SnippetBase } from './types';
+	import { RootBond } from '../root';
+	import { HtmlElement } from '../element';
+	import { getPreset } from '../../context';
+	import type { PresetModuleName } from '../../context/preset.svelte';
+	import SnippetRenderer from './snippet-renderer.svelte';
+	import type { Component } from 'svelte';
+	import type { ClassValue } from '../../utils';
+	import {
+		resolvePreset,
+		resolveLocalVariants,
+		mergeVariants,
+		mergeClassesWithPreset,
+		extractRestProps,
+		isSnippetBase
+	} from './utils';
+
+	type Element = HTMLElementTagNameMap[E];
+
+	const rootBond = RootBond.get();
+
+	let {
+		class: klass = '',
+		as = 'div',
+		base = undefined,
+		preset: presetKey = undefined,
+		bond = undefined,
+		variants = undefined,
+		children: childrenProp = undefined,
+		...restProps
+	}: HtmlAtomProps<E, B> & Omit<HTMLAttributes<Element>, 'children'> = $props();
+
+	// Memoize preset resolution - only recompute when presetKey or bond changes
+	const preset = $derived.by(() => {
+		if (!presetKey) return undefined;
+		const result = getPreset(presetKey as PresetModuleName)?.apply?.(bond, [bond]);
+		return resolvePreset(result);
+	});
+
+	const presetVariantsProps = $derived(preset?.variants);
+
+	// Resolve local variants - either VariantDefinition or function
+	const localVariants = $derived(resolveLocalVariants(variants, bond, restProps));
+
+	// Merge preset variants with local variants
+	// Memoized to avoid recomputation when inputs haven't changed
+	const mergedVariants = $derived.by(() => {
+		return mergeVariants(
+			presetVariantsProps,
+			preset?.class,
+			preset?.compounds,
+			preset?.defaults,
+			localVariants,
+			bond,
+			restProps
+		);
+	});
+
+	const _klass = $derived(
+		mergeClassesWithPreset(klass, preset?.class, mergedVariants?.class as ClassValue)
+	);
+
+	const _base = $derived(base ?? preset?.base);
+	const _as = $derived(as ?? preset?.as);
+	const _restProps = $derived(extractRestProps(preset, mergedVariants, restProps));
+
+	const isSnippet = $derived(isSnippetBase(_base));
+
+	const snippet = $derived(_base as SnippetBase);
+
+	const atom = rootBond?.state?.props?.renderers?.html ?? HtmlElement;
+
+	const renderer = $derived.by(() => {
+		if (isSnippet)
+			return {
+				component: SnippetRenderer,
+				props: { snippet: snippet, class: _klass, as: _as, children: childrenProp, ..._restProps }
+			};
+
+		return {
+			component: base ?? atom,
+			props: { class: _klass, as: _as, ..._restProps }
+		};
+	}) as { component: Component; props: Record<string, any> };
+</script>
+
+<renderer.component {...renderer.props}>
+	{#snippet children(args: any)}
+		{@render (childrenProp as any)?.(args)}
+	{/snippet}
+</renderer.component>

package/dist/components/atom/types.d.ts

@@ -12,15 +12,16 @@ export type Base<Args = any> = Args extends Record<string, any> ? ComponentBase
  */
 export interface HtmlAtomExtendProps {
 }
+type Variants = VariantDefinition<any> | ((bond: Bond, variantProps: Record<string, any>) => Record<string, any>);
 export interface HtmlAtomProps<E extends HtmlElementTagName = HtmlElementTagName, B extends Base<any> = Base> extends HtmlElementProps<E>, HtmlAtomExtendProps {
     bond?: Bond;
-    base?: B;
+    base?: B | undefined;
     preset?: PresetModuleName | (string & {});
     /**
      * Variant definition or function to resolve variants
      * - VariantDefinition: Static variant config with base, variants, compoundVariants, defaultVariants
      * - Function: Dynamic function that receives bond and props, returns props (legacy)
      */
-    variants?: VariantDefinition<any> | ((bond: Bond, variantProps: Record<string, any>) => Record<string, any>);
+    variants?: Variants;
 }
 export type { ElementType };

package/dist/components/atom/utils.d.ts

@@ -0,0 +1,37 @@
+import type { Bond } from '../../shared';
+import { type ClassValue, type VariantDefinition } from '../../utils';
+type ResolvedProps = Record<string, unknown>;
+type AnyVariantDefinition = VariantDefinition<any>;
+/**
+ * Resolves preset to its final value, handling both direct values and factory functions
+ */
+export declare function resolvePreset<T>(preset: T | (() => T) | undefined): T | undefined;
+/**
+ * Pure function to resolve variant definition to props
+ * Caches results to avoid recomputation with same inputs
+ */
+export declare function resolveVariants(def: AnyVariantDefinition, bond: Bond | null | undefined, props: Record<string, unknown>): ResolvedProps;
+/**
+ * Pure function to merge preset and local variant definitions
+ * Returns merged variant props with local overriding preset
+ */
+export declare function mergeVariants(presetVariants: Record<string, any> | undefined, presetClass: ClassValue | undefined, presetCompounds: Array<Record<string, any>> | undefined, presetDefaults: Record<string, any> | undefined, localVariants: ResolvedProps | undefined, bond: Bond | null | undefined, props: Record<string, unknown>): ResolvedProps | undefined;
+/**
+ * Pure function to merge classes with $preset placeholder support
+ * Handles the special $preset placeholder for precise positioning of preset classes
+ */
+export declare function mergeClassesWithPreset(userClass: string | ClassValue | undefined, presetClass: ClassValue | undefined, variantClass: ClassValue | undefined): string;
+/**
+ * Pure function to resolve local variants
+ * Handles both function-based and VariantDefinition-based variants
+ */
+export declare function resolveLocalVariants(variants: any, bond: Bond | null | undefined, props: Record<string, unknown>): ResolvedProps | undefined;
+/**
+ * Pure function to extract rest props by filtering out preset and variant-specific props
+ */
+export declare function extractRestProps(preset: Record<string, any> | undefined, mergedVariants: ResolvedProps | undefined, restProps: Record<string, unknown>): Record<string, unknown>;
+/**
+ * Pure function to check if a base is a snippet
+ */
+export declare function isSnippetBase(base: unknown): boolean;
+export {};