@axium/storage 0.23.5 → 0.24.1

package/dist/common.d.ts

@@ -154,6 +154,14 @@ export declare const UserStorageOptions: z.ZodDefault<z.ZodObject<{
 }, z.core.$strip>>;
 export interface UserStorageOptions extends z.infer<typeof UserStorageOptions> {
 }
+export declare const UserStoragePreferences: z.ZodObject<{
+    sort_folders_first: z.ZodDefault<z.ZodBoolean>;
+}, z.core.$strip>;
+declare module '@axium/core/apps' {
+    interface $AppPreferences {
+        files: typeof UserStoragePreferences;
+    }
+}
 /**
  * Formats:
  *

package/dist/common.js

@@ -1,4 +1,5 @@
-import { $API, AccessControl, serverConfigs } from '@axium/core';
+import { $API, AccessControl, appPreferences, serverConfigs } from '@axium/core';
+import { zKeys } from '@axium/core/locales';
 import * as z from 'zod';
 export const StorageItemSize = z.coerce.bigint().nonnegative();
 export const StorageItemName = z.string().nonempty().max(255);
@@ -68,6 +69,12 @@ export const UserStorageOptions = z
 })
     .partial()
     .default({});
+export const UserStoragePreferences = z
+    .object({
+    sort_folders_first: z.boolean().default(true),
+})
+    .register(zKeys, { prefix: 'storage.preferences' });
+appPreferences.set('files', UserStoragePreferences);
 /**
  * Formats:
  *

package/lib/List.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { text } from '@axium/client';
+	import { getAppPreferences, text } from '@axium/client';
 	import { closeOnBackGesture, contextMenu } from '@axium/client/attachments';
 	import { AccessControlDialog, FormDialog, Icon } from '@axium/client/components';
 	import { copy } from '@axium/client/gui';
@@ -9,9 +9,8 @@
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
 	import { getDirectoryMetadata, updateItemMetadata } from '@axium/storage/client';
-	import { _downloadItem, copyShortURL, formatItemName } from '@axium/storage/client/frontend';
-	import { StorageItemSorting, type StorageItemMetadata } from '@axium/storage/common';
-	import { errorText } from 'ioium';
+	import { _downloadItem, copyShortURL } from '@axium/storage/client/frontend';
+	import { StorageItemSorting, UserStoragePreferences, type StorageItemMetadata } from '@axium/storage/common';
 	import Preview from './Preview.svelte';
 
 	let {
@@ -23,30 +22,30 @@
 
 	let activeId = $state<string>();
 	const activeItem = $derived(items.find(item => item.id === activeId));
-	const activeItemName = $derived(formatItemName(activeItem));
 	const dialogs = $state<Record<string, HTMLDialogElement>>({});
 
 	const search = new URLSearchParams(location.search);
-	let sort = $state<StorageItemSorting | null>();
-	try {
-		sort = StorageItemSorting.parse({
+	let sort = $state<StorageItemSorting | undefined>(
+		StorageItemSorting.safeParse({
 			by: search.get('sortBy'),
 			descending: search.has('descending'),
-		});
-	} catch (e) {
-		console.log('Ignoring invalid sorting parameters', errorText(e));
-	}
+		}).data
+	);
+
+	const { sort_folders_first } = user ? await getAppPreferences(user.id, 'files') : UserStoragePreferences.safeParse({}).data || {};
 
 	const sortedItems = $derived(
-		items.toSorted(
-			sort
-				? (_a, _b) => {
-						const [a, b] = sort?.descending ? [_b, _a] : [_a, _b];
-						// @ts-expect-error 2362 — `Date`s have a `valueOf` and can be treated like numbers
-						return sort.by == 'name' ? a.name.localeCompare(b.name) : a[sort.by] - b[sort.by];
-					}
-				: undefined
-		)
+		items.toSorted((_a, _b) => {
+			if (!sort) {
+				const dirDiff = +(_b.type == 'inode/directory') - +(_a.type == 'inode/directory');
+				if (sort_folders_first && dirDiff) return dirDiff;
+				return _a.name.localeCompare(_b.name);
+			}
+
+			const [a, b] = sort.descending ? [_b, _a] : [_a, _b];
+			// @ts-expect-error 2362 — `Date`s have a `valueOf` and can be treated like numbers
+			return sort.by == 'name' ? a.name.localeCompare(b.name) : a[sort.by] - b[sort.by];
+		})
 	);
 
 	function removeActiveItem() {
@@ -76,7 +75,7 @@
 		{#each [['name', 'storage.generic.name'], ['modifiedAt', 'storage.List.last_modified'], ['size', 'storage.List.size']] as const as [key, translation]}
 			<span
 				class="header-column"
-				onclick={() => (sort = sort?.descending === false ? null : { by: key, descending: !sort?.descending })}
+				onclick={() => (sort = sort?.descending === false ? undefined : { by: key, descending: !sort?.descending })}
 			>
 				{#if sort?.by == key}
 					<Icon i="sort-{sort.descending ? 'down' : 'up'}" />

package/locales/en.json

@@ -24,7 +24,8 @@
 			"tab": {
 				"files": "Files",
 				"trash": "Trash",
-				"shared": "Shared"
+				"shared": "Shared",
+				"settings": "Settings"
 			},
 			"trash_page": {
 				"title": "Files — Trash",
@@ -41,6 +42,9 @@
 				"bar_text": "Using {used} of {total}",
 				"bar_text_unlimited": "Using {used}",
 				"empty": "You have not uploaded any files yet."
+			},
+			"settings": {
+				"title": "Files — Settings"
 			}
 		}
 	},
@@ -65,6 +69,9 @@
 			"trash_success": "Item trashed",
 			"delete_confirm_named": "Are you sure you want to delete {name}?"
 		},
+		"preferences": {
+			"sort_folders_first": "Sort folders before other files"
+		},
 		"Add": {
 			"content": "Content",
 			"create": "Create",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.23.5",
+	"version": "0.24.1",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {
@@ -40,8 +40,8 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.24.0",
-		"@axium/core": ">=0.26.0",
+		"@axium/client": ">=0.26.0",
+		"@axium/core": ">=0.30.0",
 		"@axium/server": ">=0.39.0",
 		"@sveltejs/kit": "^2.27.3",
 		"commander": "^14.0.0",

package/routes/files/+layout.ts

@@ -19,6 +19,12 @@ export async function load({ url, route, parent }) {
 		},
 		{ name: text('page.files.tab.trash'), href: '/files/trash', icon: 'trash', active: route.id.endsWith('/files/trash') },
 		{ name: text('page.files.tab.shared'), href: '/files/shared', icon: 'user-group', active: route.id.endsWith('/files/shared') },
+		{
+			name: text('page.files.tab.settings'),
+			href: '/files/settings',
+			icon: 'gear-complex',
+			active: route.id.endsWith('/files/settings'),
+		},
 		{ href: '/files/usage', icon: 'chart-pie-simple', active: route.id.endsWith('/files/usage'), mobile: true },
 	] satisfies (
 		| { name: string; href: LayoutRouteId; icon: string; active: boolean }

package/routes/files/settings/+page.svelte

@@ -0,0 +1,13 @@
+<script lang="ts">
+	import { text } from '@axium/client';
+	import { AppPreferences } from '@axium/client/components';
+	import { UserStoragePreferences } from '@axium/storage/common';
+
+	const { data } = $props();
+</script>
+
+<svelte:head>
+	<title>{text('page.files.settings.title')}</title>
+</svelte:head>
+
+<AppPreferences userId={data.session.userId} appId="files" schema={UserStoragePreferences} />