@axium/storage 0.19.0 → 0.19.2

package/db.json

@@ -79,6 +79,16 @@
 					}
 				}
 			}
+		},
+		{
+			"delta": true,
+			"alter_tables": {
+				"storage": {
+					"add_constraints": {
+						"unique_name_parentId": { "type": "unique", "on": ["name", "parentId"] }
+					}
+				}
+			}
 		}
 	],
 	"wipe": ["storage", "acl.storage"],

package/dist/common.d.ts

@@ -61,6 +61,8 @@ export declare const StorageItemSorting: z.ZodObject<{
     descending: z.ZodOptional<z.ZodBoolean>;
     by: z.ZodLiteral<"name" | "createdAt" | "modifiedAt" | "size">;
 }, z.core.$strip>;
+export interface StorageItemSorting extends z.infer<typeof StorageItemSorting> {
+}
 export declare const syncProtocolVersion = 0;
 export declare const StorageLimits: z.ZodObject<{
     item_size: z.ZodInt;

package/dist/server/item.js

@@ -77,7 +77,14 @@ export async function createNewItem(init, userId, writeContent) {
             hash,
         })
             .returningAll()
-            .executeTakeFirstOrThrow());
+            .executeTakeFirstOrThrow()
+            .catch(e => {
+            if (!(e instanceof Error))
+                throw e;
+            if (e.message.includes('unique_name_parentId') && e.message.includes('duplicate'))
+                error(409, 'A file with that name already exists in this folder.');
+            throw e;
+        }));
         const path = join(dataDir, item.id);
         if (existing)
             linkSync(join(dataDir, existing.id), path);

package/lib/Add.svelte

@@ -32,7 +32,7 @@
 
 <Popover>
 	{#snippet toggle()}
-		<button class="icon-text"><Icon i="plus" />{text('storage.Add.text')}</button>
+		<button class="icon-text StorageAdd"><Icon i="plus" />{text('storage.Add.text')}</button>
 	{/snippet}
 
 	<span class="menu-item" onclick={() => uploadDialog.showModal()}><Icon i="upload" />{text('storage.Add.upload')}</span>

package/lib/List.svelte

@@ -1,16 +1,17 @@
 <script lang="ts">
 	import { text } from '@axium/client';
-	import { contextMenu } from '@axium/client/attachments';
+	import { closeOnBackGesture, contextMenu } from '@axium/client/attachments';
 	import { AccessControlDialog, FormDialog, Icon } from '@axium/client/components';
+	import { copy } from '@axium/client/gui';
 	import '@axium/client/styles/list';
 	import type { AccessControllable, UserPublic } from '@axium/core';
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
+	import { errorText } from '@axium/core/io';
 	import { getDirectoryMetadata, updateItemMetadata } from '@axium/storage/client';
 	import { copyShortURL, formatItemName } from '@axium/storage/client/frontend';
-	import type { StorageItemMetadata } from '@axium/storage/common';
+	import { StorageItemSorting, type StorageItemMetadata } from '@axium/storage/common';
 	import Preview from './Preview.svelte';
-	import { copy } from '@axium/client/gui';
 
 	let {
 		items = $bindable(),
@@ -23,6 +24,31 @@
 	const activeItem = $derived(items[activeIndex]);
 	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({
+			by: search.get('sortBy'),
+			descending: search.has('descending'),
+		});
+	} catch (e) {
+		console.log('Ignoring invalid sorting parameters', errorText(e));
+	}
+
+	const sortedItems = $derived(
+		items
+			.map((item, i) => [item, i] as const)
+			.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
+			)
+	);
 </script>
 
 {#snippet action(name: string, icon: string, i: number, preview: boolean = false)}
@@ -40,11 +66,19 @@
 <div class="list">
 	<div class="list-item list-header">
 		<span></span>
-		<span>{text('storage.generic.name')}</span>
-		<span>{text('storage.List.last_modified')}</span>
-		<span>{text('storage.List.size')}</span>
+		{#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 })}
+			>
+				{#if sort?.by == key}
+					<Icon i="sort-{sort.descending ? 'down' : 'up'}" />
+				{/if}
+				<span>{text(translation)}</span>
+			</span>
+		{/each}
 	</div>
-	{#each items as item, i (item.id)}
+	{#each sortedItems as [item, i] (item.id)}
 		<div
 			class="list-item"
 			onclick={async () => {
@@ -107,7 +141,7 @@
 	{/each}
 </div>
 
-<dialog bind:this={dialogs.preview} class="preview" onclick={e => e.stopPropagation()}>
+<dialog bind:this={dialogs.preview} class="preview" onclick={e => e.stopPropagation()} {@attach closeOnBackGesture}>
 	{#if activeItem}
 		<Preview
 			item={activeItem}
@@ -167,6 +201,15 @@
 		grid-template-columns: 1em 4fr 15em 5em repeat(4, 1em);
 	}
 
+	.header-column {
+		display: inline-flex;
+		align-items: center;
+
+		&:hover {
+			cursor: pointer;
+		}
+	}
+
 	@media (width < 700px) {
 		.item-actions {
 			display: none;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.19.0",
+	"version": "0.19.2",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {
@@ -40,7 +40,7 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.18.0",
+		"@axium/client": ">=0.19.0",
 		"@axium/core": ">=0.19.0",
 		"@axium/server": ">=0.39.0",
 		"@sveltejs/kit": "^2.27.3",

package/routes/files/[id]/+page.svelte

@@ -131,8 +131,12 @@
 		align-items: center;
 	}
 
-	.parents a::before {
-		content: ' / ';
-		color: #888;
+	.parents {
+		margin-top: 0;
+
+		a::before {
+			content: ' / ';
+			color: #888;
+		}
 	}
 </style>