@axium/storage 0.18.11 → 0.19.0

package/dist/client/api.d.ts

@@ -1,4 +1,4 @@
-import type { GetItemOptions, StorageItemUpdate, UserStorage, UserStorageInfo } from '../common.js';
+import type { GetItemOptions, StorageItemUpdate, UserStorage, UserStorageInfo, UserStorageOptions } from '../common.js';
 import { StorageItemMetadata } from '../common.js';
 import '../polyfills.js';
 export interface UploadOptions {
@@ -27,7 +27,7 @@ export declare function getDirectoryMetadata(parentId: string): Promise<StorageI
 export declare function downloadItem(fileId: string): Promise<Blob>;
 export declare function updateItemMetadata(fileId: string, metadata: StorageItemUpdate): Promise<StorageItemMetadata>;
 export declare function deleteItem(fileId: string): Promise<StorageItemMetadata>;
-export declare function getUserStorage(userId: string): Promise<UserStorage>;
+export declare function getUserStorage(userId: string, options?: UserStorageOptions): Promise<UserStorage>;
 export declare function getUserStats(userId: string): Promise<UserStorageInfo>;
 export declare function getUserTrash(userId: string): Promise<StorageItemMetadata[]>;
 export declare function itemsSharedWith(userId: string): Promise<StorageItemMetadata[]>;

package/dist/client/api.js

@@ -143,8 +143,8 @@ export async function updateItemMetadata(fileId, metadata) {
 export async function deleteItem(fileId) {
     return await fetchAPI('DELETE', 'storage/item/:id', undefined, fileId);
 }
-export async function getUserStorage(userId) {
-    return await fetchAPI('GET', 'users/:id/storage', undefined, userId);
+export async function getUserStorage(userId, options = {}) {
+    return await fetchAPI('GET', 'users/:id/storage', options, userId);
 }
 export async function getUserStats(userId) {
     return await fetchAPI('OPTIONS', 'users/:id/storage', undefined, userId);

package/dist/client/frontend.js

@@ -11,5 +11,5 @@ export function copyShortURL(item) {
 export function formatItemName(item) {
     if (!item?.name)
         return text('storage.generic.no_name_in_dialog');
-    return `<strong>${item.name.length > 23 ? item.name.slice(0, 20) + '...' : item.name}</strong>`;
+    return item.name.length > 23 ? item.name.slice(0, 20) + '...' : item.name;
 }

package/dist/common.d.ts

@@ -9,7 +9,7 @@ export declare const StorageItemUpdate: z.ZodObject<{
 }, z.core.$strip>;
 export type StorageItemUpdate = z.infer<typeof StorageItemUpdate>;
 export declare const GetItemOptions: z.ZodObject<{
-    parents: z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodCodec<z.ZodString, z.ZodBoolean>]>>;
+    parents: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 export interface GetItemOptions extends z.infer<typeof GetItemOptions> {
 }
@@ -57,6 +57,10 @@ export declare const StorageItemMetadata: z.ZodObject<{
 export interface StorageItemMetadata<T extends Record<string, unknown> = Record<string, unknown>> extends z.infer<typeof StorageItemMetadata> {
     metadata: T;
 }
+export declare const StorageItemSorting: z.ZodObject<{
+    descending: z.ZodOptional<z.ZodBoolean>;
+    by: z.ZodLiteral<"name" | "createdAt" | "modifiedAt" | "size">;
+}, z.core.$strip>;
 export declare const syncProtocolVersion = 0;
 export declare const StorageLimits: z.ZodObject<{
     item_size: z.ZodInt;
@@ -140,6 +144,14 @@ export declare const UserStorage: z.ZodObject<{
 }, z.core.$strip>;
 export interface UserStorage extends z.infer<typeof UserStorage> {
 }
+export declare const UserStorageOptions: z.ZodDefault<z.ZodObject<{
+    sort: z.ZodOptional<z.ZodObject<{
+        descending: z.ZodOptional<z.ZodBoolean>;
+        by: z.ZodLiteral<"name" | "createdAt" | "modifiedAt" | "size">;
+    }, z.core.$strip>>;
+}, z.core.$strip>>;
+export interface UserStorageOptions extends z.infer<typeof UserStorageOptions> {
+}
 /**
  * Formats:
  *
@@ -281,7 +293,12 @@ declare const StorageAPI: {
             lastModified: z.ZodCoercedDate<unknown>;
             lastTrashed: z.ZodNullable<z.ZodCoercedDate<unknown>>;
         }, z.core.$strip>;
-        readonly GET: z.ZodObject<{
+        readonly GET: readonly [z.ZodDefault<z.ZodObject<{
+            sort: z.ZodOptional<z.ZodObject<{
+                descending: z.ZodOptional<z.ZodBoolean>;
+                by: z.ZodLiteral<"name" | "createdAt" | "modifiedAt" | "size">;
+            }, z.core.$strip>>;
+        }, z.core.$strip>>, z.ZodObject<{
             items: z.ZodArray<z.ZodObject<{
                 createdAt: z.ZodCoercedDate<unknown>;
                 dataURL: z.ZodString;
@@ -332,7 +349,7 @@ declare const StorageAPI: {
             itemCount: z.ZodInt;
             lastModified: z.ZodCoercedDate<unknown>;
             lastTrashed: z.ZodNullable<z.ZodCoercedDate<unknown>>;
-        }, z.core.$strip>;
+        }, z.core.$strip>];
     };
     readonly 'users/:id/storage/root': {
         readonly GET: z.ZodArray<z.ZodObject<{
@@ -590,7 +607,7 @@ declare const StorageAPI: {
     };
     readonly 'storage/item/:id': {
         readonly GET: readonly [z.ZodObject<{
-            parents: z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodCodec<z.ZodString, z.ZodBoolean>]>>;
+            parents: z.ZodOptional<z.ZodBoolean>;
         }, z.core.$strip>, z.ZodObject<{
             createdAt: z.ZodCoercedDate<unknown>;
             dataURL: z.ZodString;

package/dist/common.js

@@ -12,7 +12,7 @@ export const StorageItemUpdate = z
     .partial();
 export const GetItemOptions = z
     .object({
-    parents: z.union([z.boolean(), z.stringbool()]),
+    parents: z.boolean(),
 })
     .partial();
 export const StorageItemMetadata = z.object({
@@ -33,6 +33,10 @@ export const StorageItemMetadata = z.object({
     acl: AccessControl.array().optional(),
     parents: z.object({ id: z.uuid(), name: z.string() }).array().optional(),
 });
+export const StorageItemSorting = z.object({
+    descending: z.boolean().optional(),
+    by: z.literal(['createdAt', 'modifiedAt', 'name', 'size']),
+});
 export const syncProtocolVersion = 0;
 export const StorageLimits = z.object({
     /** The maximum size per item in MB */
@@ -56,6 +60,12 @@ export const UserStorage = z.object({
     ...UserStorageInfo.shape,
     items: StorageItemMetadata.array(),
 });
+export const UserStorageOptions = z
+    .object({
+    sort: StorageItemSorting,
+})
+    .partial()
+    .default({});
 /**
  * Formats:
  *
@@ -135,7 +145,7 @@ export const UploadInitResult = z.discriminatedUnion('status', [
 const StorageAPI = {
     'users/:id/storage': {
         OPTIONS: UserStorageInfo,
-        GET: UserStorage,
+        GET: [UserStorageOptions, UserStorage],
     },
     'users/:id/storage/root': {
         GET: StorageItemMetadata.array(),

package/dist/server/api.js

@@ -6,7 +6,7 @@ import { error, json, parseBody, parseSearch, withError } from '@axium/server/re
 import { addRoute } from '@axium/server/routes';
 import { pick } from 'utilium';
 import * as z from 'zod';
-import { batchFormatVersion, GetItemOptions, StorageItemInit, StorageItemUpdate, syncProtocolVersion } from '../common.js';
+import { batchFormatVersion, GetItemOptions, StorageItemInit, StorageItemUpdate, syncProtocolVersion, UserStorageOptions, } from '../common.js';
 import '../polyfills.js';
 import { getLimits } from './config.js';
 import { deleteRecursive, getParents, getRecursive, getUserStats, parseItem } from './db.js';
@@ -127,6 +127,7 @@ addRoute({
     async GET(request, { id: userId }) {
         if (!getConfig('@axium/storage').enabled)
             error(503, 'User storage is disabled');
+        const { sort } = parseSearch(request, UserStorageOptions);
         await checkAuthForUser(request, userId);
         const [items, stats, limits] = await Promise.all([
             database
@@ -135,6 +136,8 @@ addRoute({
                 .select(acl.from('storage'))
                 .where('userId', '=', userId)
                 .where('trashedAt', 'is', null)
+                .limit(250)
+                .$if(!!sort, qb => qb.orderBy(sort.by, sort.descending ? 'desc' : 'asc'))
                 .execute(),
             getUserStats(userId),
             getLimits(userId),

package/lib/List.svelte

@@ -142,7 +142,7 @@
 		items.splice(activeIndex, 1);
 	}}
 >
-	<p>{@html text('storage.List.trash_confirm', { $html: true, name: activeItemName })}</p>
+	<p>{text('storage.List.trash_confirm', { name: activeItemName })}</p>
 </FormDialog>
 <FormDialog
 	bind:dialog={dialogs.download}
@@ -155,7 +155,7 @@
 		} else open(activeItem!.dataURL, '_blank');
 	}}
 >
-	<p>{@html text('storage.generic.download_confirm', { $html: true, name: activeItemName })}</p>
+	<p>{text('storage.generic.download_confirm', { name: activeItemName })}</p>
 </FormDialog>
 
 <style>

package/lib/SidebarItem.svelte

@@ -133,7 +133,7 @@
 		if (index !== -1) items.splice(index, 1);
 	}}
 >
-	<p>{@html text('storage.SidebarItem.delete_confirm', { $html: true, name: itemName })}</p>
+	<p>{text('storage.SidebarItem.delete_confirm', { name: itemName })}</p>
 </FormDialog>
 <FormDialog
 	bind:dialog={dialogs.download}
@@ -144,7 +144,7 @@
 >
 	<p>
 		{text('storage.SidebarItem.download_disclaimer')} <br />
-		{@html text('storage.generic.download_confirm', { $html: true, name: itemName })}
+		{text('storage.generic.download_confirm', { name: itemName })}
 	</p>
 </FormDialog>
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.18.11",
+	"version": "0.19.0",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {

package/routes/files/+layout.ts

@@ -19,7 +19,11 @@ 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') },
-	] satisfies { name: string; href: LayoutRouteId; icon: string; active: boolean }[];
+		{ href: '/files/usage', icon: 'chart-pie-simple', active: route.id.endsWith('/files/usage'), mobile: true },
+	] satisfies (
+		| { name: string; href: LayoutRouteId; icon: string; active: boolean }
+		| { href: LayoutRouteId; icon: string; active: boolean; mobile: true }
+	)[];
 
 	return { session, tabs };
 }

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

@@ -65,7 +65,7 @@
 		items.splice(activeIndex, 1);
 	}}
 >
-	<p>{@html text('page.files.trash_page.restore_confirm', { $html: true, name: activeItemName })}</p>
+	<p>{text('page.files.trash_page.restore_confirm', { name: activeItemName })}</p>
 </FormDialog>
 <FormDialog
 	bind:dialog={deleteDialog}
@@ -78,7 +78,7 @@
 	}}
 >
 	<p>
-		{@html text('page.files.trash_page.delete_confirm', { $html: true, name: activeItemName })}
+		{text('page.files.trash_page.delete_confirm', { name: activeItemName })}
 	</p>
 </FormDialog>
 

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

@@ -1,14 +1,13 @@
 <script lang="ts">
 	import { text } from '@axium/client';
 	import { NumberBar } from '@axium/client/components';
-	import '@axium/client/styles/list';
 	import { formatBytes } from '@axium/core/format';
 	import { List } from '@axium/storage/components';
 
 	const { data } = $props();
 	const { limits } = data.info;
 
-	let items = $state(data.info.items.filter(i => i.type != 'inode/directory').sort((a, b) => Math.sign(b.size - a.size)));
+	let items = $state(data.info.items.filter(i => i.type != 'inode/directory'));
 	const usedBytes = $state(data.info.usedBytes);
 
 	let barText = $derived(

package/routes/files/usage/+page.ts

@@ -8,7 +8,7 @@ export async function load({ parent }) {
 
 	if (!session) redirect(307, '/login?after=/files/usage');
 
-	const info = await getUserStorage(session.userId);
+	const info = await getUserStorage(session.userId, { sort: { by: 'size', descending: true } });
 
 	return { info };
 }