@axium/client 0.9.13 → 0.11.0

package/assets/styles.css

@@ -101,6 +101,53 @@ pre {
 	border-radius: 0.5em;
 }
 
+dialog {
+	border-radius: 1em;
+	background: var(--bg-menu);
+	border: 1px solid #8888;
+	padding: 1em;
+	max-width: calc(100% - 2em);
+	word-wrap: normal;
+
+	form {
+		max-width: 100%;
+	}
+}
+
+dialog::backdrop {
+	background: #0003;
+}
+
+dialog[open] {
+	animation: zoom 0.25s cubic-bezier(0.35, 1.55, 0.65, 1);
+}
+
+@keyframes zoom {
+	from {
+		transform: scale(0.95);
+	}
+	to {
+		transform: scale(1);
+	}
+}
+
+dialog[open]::backdrop {
+	animation: fade 0.25s ease-out;
+}
+
+@keyframes fade {
+	from {
+		opacity: 0;
+	}
+	to {
+		opacity: 1;
+	}
+}
+
+dialog form {
+	display: contents;
+}
+
 .error {
 	padding: 1em;
 	border-radius: 0.5em;
@@ -208,6 +255,9 @@ h6 {
 }
 
 @media (width < 700px) {
+	dialog {
+	}
+
 	.mobile-hide {
 		display: none !important;
 	}

package/dist/cli/config.d.ts

@@ -14,8 +14,10 @@ export declare function session(): {
             debug: boolean;
         };
         roles: string[];
+        tags: string[];
         registeredAt: Date;
         isAdmin: boolean;
+        isSuspended: boolean;
         emailVerified?: Date | null | undefined;
         image?: string | null | undefined;
     };

package/dist/config.d.ts

@@ -14,14 +14,16 @@ export declare const ClientConfig: z.ZodObject<{
                 id: z.ZodUUID;
                 name: z.ZodString;
                 email: z.ZodEmail;
-                emailVerified: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
+                emailVerified: z.ZodOptional<z.ZodNullable<z.ZodCoercedDate<unknown>>>;
                 image: z.ZodOptional<z.ZodNullable<z.ZodURL>>;
-                preferences: z.ZodObject<{
-                    debug: z.ZodBoolean;
-                }, z.core.$strip>;
+                preferences: z.ZodLazy<z.ZodObject<{
+                    debug: z.ZodDefault<z.ZodBoolean>;
+                }, z.core.$strip>>;
                 roles: z.ZodArray<z.ZodString>;
+                tags: z.ZodArray<z.ZodString>;
                 registeredAt: z.ZodCoercedDate<unknown>;
                 isAdmin: z.ZodBoolean;
+                isSuspended: z.ZodBoolean;
             }, z.core.$strip>;
         }, z.core.$strip>;
         apps: z.ZodArray<z.ZodObject<{

package/dist/requests.d.ts

@@ -1,7 +1,8 @@
-import type { $API, APIParameters, Endpoint, RequestBody } from '@axium/core/api';
+import type { APIParameters, APIValues, Endpoint, RequestBody } from '@axium/core/api';
+import { $API } from '@axium/core/api';
 import type { RequestMethod } from '@axium/core/requests';
 export declare let token: string | null;
 export declare function setToken(value: string | null): void;
 export declare let prefix: string;
 export declare function setPrefix(value: string): void;
-export declare function fetchAPI<const M extends RequestMethod, const E extends Endpoint>(method: M, endpoint: E, data?: RequestBody<M, E>, ...params: APIParameters<E>): Promise<M extends keyof $API[E] ? ($API[E][M] extends [unknown, infer R] ? R : $API[E][M]) : unknown>;
+export declare function fetchAPI<const E extends Endpoint, const M extends keyof $API[E] & RequestMethod>(method: M, endpoint: E, data?: RequestBody<M, E>, ...params: APIParameters<E>): Promise<M extends keyof APIValues[E] ? (APIValues[E][M] extends readonly [unknown, infer R] ? R : APIValues[E][M]) : unknown>;

package/dist/requests.js

@@ -1,3 +1,5 @@
+import { $API } from '@axium/core/api';
+import { prettifyError } from 'zod';
 export let token = null;
 export function setToken(value) {
     token = value;
@@ -14,6 +16,14 @@ export async function fetchAPI(method, endpoint, data, ...params) {
             Accept: 'application/json',
         },
     };
+    const schema = $API[endpoint]?.[method];
+    if (schema && Array.isArray(schema))
+        try {
+            data = schema[0].parse(data);
+        }
+        catch (e) {
+            throw prettifyError(e);
+        }
     if (method !== 'GET' && method !== 'HEAD')
         options.body = JSON.stringify(data);
     const search = method != 'GET' || typeof data != 'object' || data == null || !Object.keys(data).length
@@ -39,5 +49,13 @@ export async function fetchAPI(method, endpoint, data, ...params) {
     const json = await response.json().catch(() => ({ message: 'Unknown server error (invalid JSON response)' }));
     if (!response.ok)
         throw new Error(json.message);
-    return json;
+    if (!schema)
+        return json;
+    const Output = Array.isArray(schema) ? schema[1] : schema;
+    try {
+        return Output.parse(json);
+    }
+    catch (e) {
+        throw prettifyError(e);
+    }
 }

package/dist/user.d.ts

@@ -19,7 +19,11 @@ export declare function updateUser(userId: string, data: Record<string, FormData
 export declare function fullUserInfo(userId: string): Promise<User & {
     sessions: Session[];
 }>;
-export declare function deleteUser(userId: string): Promise<User>;
+/**
+ * @param userId The UUID of the user to delete
+ * @param deletingId The UUID of the user performing the deletion (for authentication). Defaults to userId.
+ */
+export declare function deleteUser(userId: string, deletingId?: string): Promise<User>;
 export declare function emailVerificationEnabled(userId: string): Promise<boolean>;
 export declare function sendVerificationEmail(userId: string): Promise<Verification>;
 export declare function verifyEmail(userId: string, token: string): Promise<void>;

package/dist/user.js

@@ -1,4 +1,3 @@
-import { UserChangeable } from '@axium/core';
 import { startAuthentication, startRegistration } from '@simplewebauthn/browser';
 import * as z from 'zod';
 import { fetchAPI } from './requests.js';
@@ -23,38 +22,20 @@ export async function loginByEmail(email) {
     return await login(userId);
 }
 export async function getCurrentSession() {
-    const result = await fetchAPI('GET', 'session');
-    result.created = new Date(result.created);
-    result.expires = new Date(result.expires);
-    return result;
+    return await fetchAPI('GET', 'session');
 }
 export async function getSessions(userId) {
     _checkId(userId);
-    const result = await fetchAPI('GET', 'users/:id/sessions', {}, userId);
-    for (const session of result) {
-        session.created = new Date(session.created);
-        session.expires = new Date(session.expires);
-    }
-    return result;
+    return await fetchAPI('GET', 'users/:id/sessions', {}, userId);
 }
 export async function logout(userId, ...sessionId) {
     _checkId(userId);
-    const result = await fetchAPI('DELETE', 'users/:id/sessions', { id: sessionId }, userId);
-    for (const session of result) {
-        session.created = new Date(session.created);
-        session.expires = new Date(session.expires);
-    }
-    return result;
+    return await fetchAPI('DELETE', 'users/:id/sessions', { id: sessionId }, userId);
 }
 export async function logoutAll(userId) {
     _checkId(userId);
     await elevate(userId);
-    const result = await fetchAPI('DELETE', 'users/:id/sessions', { confirm_all: true }, userId);
-    for (const session of result) {
-        session.created = new Date(session.created);
-        session.expires = new Date(session.expires);
-    }
-    return result;
+    return await fetchAPI('DELETE', 'users/:id/sessions', { confirm_all: true }, userId);
 }
 export async function logoutCurrentSession() {
     return await fetchAPI('DELETE', 'session');
@@ -80,59 +61,43 @@ function _checkId(userId) {
 }
 export async function userInfo(userId) {
     _checkId(userId);
-    const user = await fetchAPI('GET', 'users/:id', {}, userId);
-    user.registeredAt = new Date(user.registeredAt);
-    user.emailVerified = user.emailVerified ? new Date(user.emailVerified) : null;
-    return user;
+    return await fetchAPI('GET', 'users/:id', {}, userId);
 }
 export async function updateUser(userId, data) {
     _checkId(userId);
-    const body = await UserChangeable.parseAsync(data).catch(e => {
-        throw e instanceof z.core.$ZodError ? z.prettifyError(e) : e;
-    });
-    const result = await fetchAPI('PATCH', 'users/:id', body, userId);
-    result.registeredAt = new Date(result.registeredAt);
-    if (result.emailVerified)
-        result.emailVerified = new Date(result.emailVerified);
-    return result;
+    return await fetchAPI('PATCH', 'users/:id', data, userId);
 }
 export async function fullUserInfo(userId) {
     _checkId(userId);
-    const result = await fetchAPI('GET', 'users/:id/full', {}, userId);
-    result.registeredAt = new Date(result.registeredAt);
-    result.emailVerified = new Date(result.emailVerified);
-    return result;
+    return await fetchAPI('GET', 'users/:id/full', {}, userId);
 }
-export async function deleteUser(userId) {
+/**
+ * @param userId The UUID of the user to delete
+ * @param deletingId The UUID of the user performing the deletion (for authentication). Defaults to userId.
+ */
+export async function deleteUser(userId, deletingId = userId) {
     _checkId(userId);
-    const options = await fetchAPI('OPTIONS', 'users/:id/auth', { type: 'action' }, userId);
+    const options = await fetchAPI('OPTIONS', 'users/:id/auth', { type: 'action' }, deletingId);
     const response = await startAuthentication({ optionsJSON: options });
-    await fetchAPI('POST', 'users/:id/auth', response, userId);
-    const result = await fetchAPI('DELETE', 'users/:id', response, userId);
-    result.registeredAt = new Date(result.registeredAt);
-    result.emailVerified = new Date(result.emailVerified);
-    return result;
+    await fetchAPI('POST', 'users/:id/auth', response, deletingId);
+    return await fetchAPI('DELETE', 'users/:id', response, userId);
 }
 export async function emailVerificationEnabled(userId) {
     _checkId(userId);
-    const { enabled } = await fetchAPI('OPTIONS', 'users/:id/verify_email', {}, userId);
+    const { enabled } = await fetchAPI('OPTIONS', 'users/:id/verify/email', {}, userId);
     return enabled;
 }
 export async function sendVerificationEmail(userId) {
     _checkId(userId);
-    return await fetchAPI('GET', 'users/:id/verify_email', {}, userId);
+    return await fetchAPI('GET', 'users/:id/verify/email', {}, userId);
 }
 export async function verifyEmail(userId, token) {
     _checkId(userId);
-    await fetchAPI('POST', 'users/:id/verify_email', { token }, userId);
+    await fetchAPI('POST', 'users/:id/verify/email', { token }, userId);
 }
 export async function getPasskeys(userId) {
     _checkId(userId);
-    const result = await fetchAPI('GET', 'users/:id/passkeys', {}, userId);
-    for (const passkey of result) {
-        passkey.createdAt = new Date(passkey.createdAt);
-    }
-    return result;
+    return await fetchAPI('GET', 'users/:id/passkeys', {}, userId);
 }
 /**
  * Create a new passkey for an existing user.

package/lib/FormDialog.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-	import Dialog from './Dialog.svelte';
 	import type { HTMLDialogAttributes } from 'svelte/elements';
 
 	let {
@@ -59,7 +58,7 @@
 	<button type="submit" class={['submit', submitDanger && 'danger']}>{submitText}</button>
 {/snippet}
 
-<Dialog bind:dialog {onclose} {...rest}>
+<dialog bind:this={dialog} {onclose} {...rest}>
 	{@render header?.()}
 	<form {onsubmit} class="main" method="dialog">
 		{#if error}
@@ -76,7 +75,7 @@
 		{/if}
 	</form>
 	{@render footer?.()}
-</Dialog>
+</dialog>
 
 <style>
 	.actions {

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,77 +51,86 @@
 
 	function onchange(e: Event) {
 		const value = schema.parse(input instanceof HTMLInputElement && input.type === 'checkbox' ? input.checked : input.value);
-		if (value == getByString(preferences, path)) return;
-		setByString(preferences, path, value);
+		const oldValue = getByString(preferences, path);
+		if (value == oldValue) return;
+
+		if (defaultValue == value) {
+			const parts = path.split('.');
+			const prop = parts.pop()!;
+			delete getByString<Record<string, any>>(preferences, parts.join('.'))[prop];
+		} else setByString(preferences, path, value);
+
 		fetchAPI('PATCH', 'users/:id', { preferences }, userId);
 	}
 </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/lib/URLText.svelte

@@ -0,0 +1,21 @@
+<script lang="ts">
+	import ClipboardCopy from './ClipboardCopy.svelte';
+
+	const { url }: { url: string } = $props();
+
+	const href = $derived(new URL(url, location.origin).href);
+</script>
+
+<pre class="URLText"><span>{href}</span><ClipboardCopy value={href} --size="16px" /></pre>
+
+<style>
+	.URLText {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		span {
+			overflow-x: scroll;
+		}
+	}
+</style>

package/lib/index.ts

@@ -1,7 +1,6 @@
 export { default as AccessControlDialog } from './AccessControlDialog.svelte';
 export { default as AppMenu } from './AppMenu.svelte';
 export { default as ClipboardCopy } from './ClipboardCopy.svelte';
-export { default as Dialog } from './Dialog.svelte';
 export { default as FormDialog } from './FormDialog.svelte';
 export { default as Icon } from './Icon.svelte';
 export { default as Login } from './Login.svelte';
@@ -14,6 +13,7 @@ export { default as Register } from './Register.svelte';
 export { default as SessionList } from './SessionList.svelte';
 export { default as Toast } from './Toast.svelte';
 export { default as Upload } from './Upload.svelte';
+export { default as URLText } from './URLText.svelte';
 export { default as UserCard } from './UserCard.svelte';
 export { default as UserMenu } from './UserMenu.svelte';
 export { default as Version } from './Version.svelte';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/client",
-	"version": "0.9.13",
+	"version": "0.11.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.17.0",
 		"utilium": "^2.3.8",
 		"zod": "^4.0.5",
 		"svelte": "^5.36.0"

package/lib/Dialog.svelte

@@ -1,53 +0,0 @@
-<script lang="ts">
-	import type { HTMLDialogAttributes } from 'svelte/elements';
-
-	let { children, dialog = $bindable(), ...rest }: { children(): any; dialog?: HTMLDialogElement } & HTMLDialogAttributes = $props();
-</script>
-
-<dialog bind:this={dialog} {...rest}>
-	{@render children()}
-</dialog>
-
-<!-- svelte-ignore css_unused_selector -->
-<style>
-	dialog {
-		border-radius: 1em;
-		background: var(--bg-menu);
-		border: 1px solid #8888;
-		padding: 1em;
-
-		form {
-			display: contents;
-		}
-	}
-
-	dialog::backdrop {
-		background: #0003;
-	}
-
-	dialog[open] {
-		animation: zoom 0.25s cubic-bezier(0.35, 1.55, 0.65, 1);
-	}
-
-	@keyframes zoom {
-		from {
-			transform: scale(0.95);
-		}
-		to {
-			transform: scale(1);
-		}
-	}
-
-	dialog[open]::backdrop {
-		animation: fade 0.25s ease-out;
-	}
-
-	@keyframes fade {
-		from {
-			opacity: 0;
-		}
-		to {
-			opacity: 1;
-		}
-	}
-</style>