@axium/client 0.32.1 → 0.33.1

package/dist/cli/cache.d.ts

@@ -34,6 +34,7 @@ export declare const meta: Handle<z.ZodObject<{
         user: z.ZodObject<{
             id: z.ZodUUID;
             name: z.ZodString;
+            username: z.ZodOptional<z.ZodNullable<z.ZodString>>;
             email: z.ZodEmail;
             emailVerified: z.ZodOptional<z.ZodNullable<z.ZodCoercedDate<unknown>>>;
             preferences: z.ZodLazy<z.ZodObject<{

package/dist/cli/config.d.ts

@@ -1,3 +1,4 @@
+import { type PluginLoadOptions } from '@axium/core/node/plugins';
 export declare const configDir: string;
 export declare const axcConfigPath: string;
 export declare function session(): {
@@ -18,9 +19,17 @@ export declare function session(): {
         registeredAt: Date;
         isAdmin: boolean;
         isSuspended: boolean;
+        username?: string | null | undefined;
         emailVerified?: Date | null | undefined;
     };
     name?: string | null | undefined;
 };
-export declare function loadConfig(safe: boolean): Promise<void>;
+export interface LoadConfigOptions {
+    plugins?: PluginLoadOptions;
+}
+/**
+ *
+ * @param safe whether to run code from plugins
+ */
+export declare function loadConfig(options?: LoadConfigOptions): Promise<void>;
 export declare function saveConfig(): void;

package/dist/cli/config.js

@@ -18,7 +18,11 @@ export function session() {
         io.exit('No session data available.', 3);
     return cache.meta.data.session;
 }
-export async function loadConfig(safe) {
+/**
+ *
+ * @param safe whether to run code from plugins
+ */
+export async function loadConfig(options = {}) {
     try {
         Object.assign(config, io.readJSON(axcConfigPath, ClientConfig));
         if (config.server)
@@ -26,7 +30,7 @@ export async function loadConfig(safe) {
         if (config.token)
             setToken(config.token);
         for (const plugin of config.plugins ?? [])
-            await loadPlugin('client', plugin, axcConfigPath, safe);
+            await loadPlugin('client', plugin, axcConfigPath, options.plugins);
     }
     catch (e) {
         io.warn('Failed to load config: ' + io.errorText(e));

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 import { formatBytes } from '@axium/core';
-import { loadPlugin, outputDaemonStatus, pluginText } from '@axium/core/node';
+import { createPluginCommand, outputDaemonStatus } from '@axium/core/node';
 import { _findPlugin, plugins } from '@axium/core/plugins';
 import { CommanderError, program } from 'commander';
 import * as io from 'ioium/node';
@@ -20,11 +20,11 @@ const debug = z.stringbool().default(false).parse(process.env.DEBUG?.toLowerCase
 if (debug)
     io._setDebugOutput(true);
 useUserAgent(clientUA);
-await loadConfig(safe);
+await loadConfig({ plugins: { safe } });
 cache.load();
 process.on('SIGHUP', () => {
     io.info('Reloading configuration due to SIGHUP.');
-    void loadConfig(safe);
+    void loadConfig({ plugins: { safe } });
 });
 program
     .version($pkg.version)
@@ -74,7 +74,19 @@ program
     if (opt.socket && config.token)
         await connectSocket({ rejectUnauthorized: !opt.insecure });
 });
-const axcPlugin = program.command('plugin').alias('plugins').description('Manage plugins');
+const axcPlugin = createPluginCommand('client', program, {
+    safe,
+    loadedBy: () => axcConfigPath,
+    enabled: config.plugins,
+    enable(spec) {
+        config.plugins.push(spec);
+        saveConfig();
+    },
+    disable(spec) {
+        config.plugins = config.plugins.filter(p => p !== spec);
+        saveConfig();
+    },
+});
 axcPlugin
     .command('run')
     .description('Run a plugin')
@@ -83,71 +95,6 @@ axcPlugin
     const plugin = _findPlugin(search);
     await plugin._client?.run?.();
 });
-axcPlugin
-    .command('list')
-    .alias('ls')
-    .description('List loaded plugins')
-    .option('-l, --long', 'use the long listing format')
-    .option('--no-versions', 'do not show plugin versions')
-    .action(opt => {
-    if (!plugins.size) {
-        console.log('No plugins loaded.');
-        return;
-    }
-    if (!opt.long) {
-        console.log(plugins.keys().toArray().join(', '));
-        return;
-    }
-    console.log(styleText('whiteBright', plugins.size + ' plugin(s) loaded:'));
-    for (const plugin of plugins.values()) {
-        console.log(plugin.name, opt.versions ? plugin.version : '');
-    }
-});
-axcPlugin
-    .command('info')
-    .description('Get information about a plugin')
-    .argument('<plugin>', 'the plugin to get information about')
-    .action((search) => {
-    const plugin = _findPlugin(search);
-    for (const line of pluginText(plugin))
-        console.log(line);
-});
-axcPlugin
-    .command('add')
-    .description('Add a plugin')
-    .option('-k, --keep-going', 'continue adding plugins even if one fails')
-    .argument('<spec...>', 'the plugin specifier (e.g. a package name) to add')
-    .action(async (specs, { keepGoing }) => {
-    for (const spec of specs) {
-        try {
-            if (config.plugins.includes(spec))
-                throw `Plugin "${spec}" is already added.`;
-            const plugin = await loadPlugin('client', spec, axcConfigPath, safe);
-            if (!plugin)
-                throw `Failed to load a client plugin from "${spec}".`;
-            config.plugins.push(spec);
-            saveConfig();
-            console.log('Added plugin:', plugin.name, styleText('dim', 'v' + plugin.version));
-        }
-        catch (e) {
-            if (keepGoing)
-                io.error(e);
-            else
-                io.exit(e);
-        }
-    }
-});
-axcPlugin
-    .command('remove')
-    .alias('rm')
-    .description('Remove a plugin')
-    .argument('<plugin>', 'the plugin to remove')
-    .action((search) => {
-    const plugin = _findPlugin(search);
-    config.plugins = config.plugins.filter(p => p !== plugin.specifier);
-    plugins.delete(plugin.name);
-    saveConfig();
-});
 const axcCache = program.command('cache').description('Manage the local cache');
 axcCache
     .command('info')

package/dist/locales.d.ts

@@ -91,7 +91,8 @@ declare let currentLoaded: {
         readonly success: "Success";
         readonly unknown: "Unknown";
         readonly unnamed: "Unnamed";
-        readonly username: "Name";
+        readonly user_display_name: "Name";
+        readonly username: "Username";
         readonly yes: "Yes";
     };
     readonly page: {
@@ -100,6 +101,7 @@ declare let currentLoaded: {
             readonly delete_account_confirm: "Are you sure you want to delete your account?";
             readonly edit_email: "Email Address";
             readonly edit_name: "What do you want to be called?";
+            readonly edit_username: "Pick a unique username";
             readonly email_verified_on: "Email verified on {date}";
             readonly greeting: "Welcome, {name}";
             readonly passkeys: {

package/dist/user.d.ts

@@ -1,4 +1,4 @@
-import type { NewSessionResponse, Passkey, PasskeyChangeable, Session, User, UserPublic, Verification } from '@axium/core';
+import type { NewSessionResponse, Passkey, PasskeyChangeable, Session, User, UserChangeable, UserPublic, Verification } from '@axium/core';
 import * as z from 'zod';
 import Cache from './cache.js';
 export declare function login(userId: string): Promise<NewSessionResponse>;
@@ -18,7 +18,7 @@ export declare function register(_data: Record<string, unknown>): Promise<void>;
 declare const userCache: Cache<[string], UserPublic>;
 export { userCache as apiUserCache };
 export declare function userInfo(userId: string): Promise<UserPublic>;
-export declare function updateUser(userId: string, data: Record<string, FormDataEntryValue>): Promise<User>;
+export declare function updateUser(userId: string, data: UserChangeable | Record<string, FormDataEntryValue>): Promise<User>;
 export declare function fullUserInfo(userId: string): Promise<User & {
     sessions: Session[];
 }>;

package/lib/SidebarLayout.svelte

@@ -57,7 +57,6 @@
 		display: inline-flex;
 		flex-direction: column;
 		gap: 0.5em;
-		background-color: var(--bg-alt);
 		padding: 1em;
 		padding-left: 0;
 		border-radius: 0 1em 1em 0;
@@ -71,6 +70,7 @@
 			flex-direction: row;
 			justify-content: space-around;
 			gap: 1em;
+			background-color: var(--bg-alt);
 			padding: 0.5em;
 			z-index: 6;
 
@@ -80,10 +80,11 @@
 		}
 
 		.item {
-			padding: 0.3em 0.5em;
+			padding: 0.5em 1em;
 			border-radius: 0.25em 1em 1em 0.25em;
 
 			@media (width < 700px) {
+				padding: 0.3em 0.5em;
 				flex: 1 1 0;
 				border-radius: 1em;
 				padding: 1em;
@@ -92,7 +93,7 @@
 		}
 
 		.item:hover {
-			background-color: var(--bg-strong);
+			background-color: var(--bg-alt);
 			cursor: pointer;
 		}
 
@@ -121,4 +122,16 @@
 			display: none;
 		}
 	}
+
+	:global(:has(.sidebar-theme-alt)) .sidebar {
+		background-color: var(--bg-alt);
+	}
+
+	@media (width >= 700px) {
+		:not(:has(.sidebar-theme-alt)) .sidebar-content {
+			border-radius: 1em;
+			background-color: var(--bg-menu);
+			margin: 0 1em 1em 0;
+		}
+	}
 </style>

package/locales/en.json

@@ -85,7 +85,8 @@
 		"success": "Success",
 		"unknown": "Unknown",
 		"unnamed": "Unnamed",
-		"username": "Name",
+		"user_display_name": "Name",
+		"username": "Username",
 		"yes": "Yes"
 	},
 	"page": {
@@ -94,6 +95,7 @@
 			"delete_account_confirm": "Are you sure you want to delete your account?",
 			"edit_email": "Email Address",
 			"edit_name": "What do you want to be called?",
+			"edit_username": "Pick a unique username",
 			"email_verified_on": "Email verified on {date}",
 			"greeting": "Welcome, {name}",
 			"passkeys": {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/client",
-	"version": "0.32.1",
+	"version": "0.33.1",
 	"author": "James Prevett <jp@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -49,7 +49,7 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/core": ">=0.33.0",
+		"@axium/core": ">=0.35.0",
 		"ioium": "^1.0.2",
 		"semver": "^7.7.4",
 		"svelte": "^5.36.0",

package/styles/list.css

@@ -23,7 +23,7 @@ div.list-header {
 	font-weight: bold;
 	border-bottom: 1.5px solid var(--fg-accent);
 	position: sticky;
-	background-color: var(--bg-normal);
+	background-color: inherit;
 	top: 0em;
 	z-index: 1;