@axium/client 0.9.12 → 0.10.0

package/dist/config.d.ts

@@ -17,7 +17,7 @@ export declare const ClientConfig: z.ZodObject<{
                 emailVerified: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
                 image: z.ZodOptional<z.ZodNullable<z.ZodURL>>;
                 preferences: z.ZodObject<{
-                    debug: z.ZodBoolean;
+                    debug: z.ZodDefault<z.ZodBoolean>;
                 }, z.core.$strip>;
                 roles: z.ZodArray<z.ZodString>;
                 registeredAt: z.ZodCoercedDate<unknown>;

package/lib/Preference.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { fetchAPI } from '@axium/client/requests';
-	import { preferenceDefaults, zIs, type Preferences, type ZodPref } from '@axium/core';
+	import type { Preferences, ZodPref } from '@axium/core';
 	import type { HTMLInputAttributes } from 'svelte/elements';
 	import { getByString, pick, setByString } from 'utilium';
 	import Icon from './Icon.svelte';
@@ -11,15 +11,16 @@
 		preferences: Preferences;
 		path: string;
 		schema: ZodPref;
+		defaultValue?: any;
 		optional?: boolean;
 	}
 
-	let { preferences = $bindable(), userId, path, schema, optional = false }: Props = $props();
+	let { preferences = $bindable(), userId, path, schema, optional = false, defaultValue }: Props = $props();
 	const id = $props.id();
 
 	let input = $state<HTMLInputElement | HTMLSelectElement>()!;
 	let checked = $state(schema.def.type == 'boolean' && getByString<boolean>(preferences, path));
-	const initialValue = $derived<any>(getByString(preferences, path) ?? getByString(preferenceDefaults, path));
+	const initialValue = $derived<any>(getByString(preferences, path));
 
 	function dateAttr(date: Date | null, format: 'date' | 'time' | 'datetime' | 'time+sec') {
 		if (!date) return null;
@@ -50,9 +51,10 @@
 
 	function onchange(e: Event) {
 		const value = schema.parse(input instanceof HTMLInputElement && input.type === 'checkbox' ? input.checked : input.value);
-		if (value == getByString(preferences, path)) return;
+		const oldValue = getByString(preferences, path);
+		if (value == oldValue) return;
 
-		if (getByString(preferenceDefaults, path) == value) {
+		if (defaultValue == value) {
 			const parts = path.split('.');
 			const prop = parts.pop()!;
 			delete getByString<Record<string, any>>(preferences, parts.join('.'))[prop];
@@ -63,70 +65,72 @@
 </script>
 
 {#snippet _in(rest: HTMLInputAttributes)}
-	<input bind:this={input} {id} {...rest} value={initialValue} {onchange} required={!optional} />
+	<input bind:this={input} {id} {...rest} value={initialValue} {onchange} required={!optional} {defaultValue} />
 {/snippet}
 
-{#if zIs(schema, 'string')}
+{#if schema.type == 'string'}
 	{@render _in({ type: schema.format == 'email' ? 'email' : 'text', ...pick(schema, 'minLength', 'maxLength') })}
-{:else if zIs(schema, 'number')}
+{:else if schema.type == 'number'}
 	{@render _in({ type: 'number', min: schema.minValue, max: schema.maxValue, step: schema.format?.includes('int') ? 1 : 0.1 })}
-{:else if zIs(schema, 'bigint')}
+{:else if schema.type == 'bigint'}
 	{@render _in({ type: 'number', min: Number(schema.minValue), max: Number(schema.maxValue), step: 1 })}
-{:else if zIs(schema, 'boolean')}
+{:else if schema.type == 'boolean'}
 	<input bind:checked bind:this={input} {id} type="checkbox" {onchange} required={!optional} />
 	<label for={id} class="checkbox">
 		{#if checked}<Icon i="check" --size="1.3em" />{/if}
 	</label>
-{:else if zIs(schema, 'date')}
+{:else if schema.type == 'date'}
 	{@render _in({
 		type: 'date',
 		min: dateAttr(schema.minDate, 'date'),
 		max: dateAttr(schema.maxDate, 'date'),
 	})}
-{:else if zIs(schema, 'file')}
+{:else if schema.type == 'file'}
 	<!-- todo -->
-{:else if zIs(schema, 'literal')}
+{:else if schema.type == 'literal'}
 	<select bind:this={input} {id} {onchange} required={!optional}>
 		{#each schema.values as value}
 			<option {value} selected={initialValue === value}>{value}</option>
 		{/each}
 	</select>
-{:else if zIs(schema, 'template_literal')}
+{:else if schema.type == 'template_literal'}
 	<!-- todo -->
-{:else if zIs(schema, 'nullable') || zIs(schema, 'optional')}
+{:else if schema.type == 'default'}
+	<Preference {userId} bind:preferences {path} schema={schema.def.innerType} defaultValue={schema.def.defaultValue} />
+{:else if schema.type == 'nullable' || schema.type == 'optional'}
 	<!-- defaults are handled differently -->
-	<Preference {userId} bind:preferences {path} schema={schema.def.innerType} optional={true} />
-{:else if zIs(schema, 'array')}
+	<Preference {userId} bind:preferences {path} {defaultValue} schema={schema.def.innerType} optional={true} />
+{:else if schema.type == 'array'}
 	<div class="pref-sub">
 		{#each initialValue, i}
 			<div class="pref-record-entry">
-				<Preference {userId} bind:preferences path="{path}.{i}" schema={schema.element} />
+				<Preference {userId} bind:preferences {defaultValue} path="{path}.{i}" schema={schema.element} />
 			</div>
 		{/each}
 	</div>
-{:else if zIs(schema, 'record')}
+{:else if schema.type == 'record'}
 	<div class="pref-sub">
 		{#each Object.keys(initialValue) as key}
 			<div class="pref-record-entry">
 				<label for={id}>{key}</label>
-				<Preference {userId} bind:preferences path="{path}.{key}" schema={schema.valueType} />
+				<Preference {userId} bind:preferences {defaultValue} path="{path}.{key}" schema={schema.valueType} />
 			</div>
 		{/each}
 	</div>
-{:else if zIs(schema, 'object')}
+{:else if schema.type == 'object'}
 	{#each Object.entries(schema.shape) as [key, value]}
 		<div class="pref-sub">
 			<label for={id}>{key}</label>
-			<Preference {userId} bind:preferences path="{path}.{key}" schema={value} />
+			<Preference {userId} bind:preferences {defaultValue} path="{path}.{key}" schema={value} />
 		</div>
 	{/each}
-{:else if zIs(schema, 'tuple')}
+{:else if schema.type == 'tuple'}
 	<div class="pref-sub" data-rest={schema.def.rest}>
 		{#each schema.def.items as item, i}
-			<Preference {userId} bind:preferences path="{path}.{i}" schema={item} />
+			<Preference {userId} bind:preferences {defaultValue} path="{path}.{i}" schema={item} />
 		{/each}
 	</div>
-{:else if zIs(schema, 'enum')}
+{:else if schema.type == 'enum'}
 	<select bind:this={input} {id} {onchange} required={!optional}>
 		{#each Object.entries(schema.enum) as [key, value]}
 			<option {value} selected={initialValue === value}>{key}</option>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/client",
-	"version": "0.9.12",
+	"version": "0.10.0",
 	"author": "James Prevett <jp@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -40,7 +40,7 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/core": ">=0.15.0",
+		"@axium/core": ">=0.16.0",
 		"utilium": "^2.3.8",
 		"zod": "^4.0.5",
 		"svelte": "^5.36.0"