@axium/storage 0.6.7 → 0.6.9

package/dist/server.d.ts

@@ -83,4 +83,5 @@ export type ExternalLimitHandler = (userId?: string) => StorageLimits | Promise<
 export declare function useLimits(handler: ExternalLimitHandler): void;
 export declare function getLimits(userId?: string): Promise<StorageLimits>;
 export declare function getRecursive(id: string): AsyncGenerator<string>;
+export declare function deleteRecursive(itemId: string, deleteSelf: boolean): Promise<void>;
 export {};

package/dist/server.js

@@ -102,6 +102,14 @@ export async function* getRecursive(id) {
             yield* getRecursive(item.id);
     }
 }
+export async function deleteRecursive(itemId, deleteSelf) {
+    const toDelete = await Array.fromAsync(getRecursive(itemId)).catch(withError('Could not get items to delete'));
+    if (deleteSelf)
+        toDelete.push(itemId);
+    await database.deleteFrom('storage').where('id', '=', itemId).returningAll().execute().catch(withError('Could not delete item'));
+    for (const id of toDelete)
+        unlinkSync(join(config.storage.data, id));
+}
 addRoute({
     path: '/api/storage/item/:id',
     params: { id: z.uuid() },
@@ -143,10 +151,7 @@ addRoute({
         const itemId = event.params.id;
         const auth = await checkAuthForItem(event, 'storage', itemId, Permission.Manage);
         const item = parseItem(auth.item);
-        const toDelete = await Array.fromAsync(getRecursive(itemId)).catch(withError('Could not get items to delete'));
-        await database.deleteFrom('storage').where('id', '=', itemId).returningAll().execute().catch(withError('Could not delete item'));
-        for (const id of toDelete)
-            unlinkSync(join(config.storage.data, id));
+        await deleteRecursive(itemId, item.type != 'inode/directory');
         return item;
     },
 });

package/lib/Add.svelte

@@ -16,7 +16,7 @@
 
 {#snippet _item(type: string, text: string, includeContent: boolean = false)}
 	<span
-		class="icon-text add-menu-item"
+		class="menu-item"
 		onclick={() => {
 			createType = type;
 			createIncludesContent = includeContent;
@@ -33,12 +33,10 @@
 		<button class="icon-text"><Icon i="plus" />Add</button>
 	{/snippet}
 
-	<div class="add-menu">
-		<span class="icon-text add-menu-item" onclick={() => uploadDialog.showModal()}><Icon i="upload" />Upload</span>
-		{@render _item('inode/directory', 'New Folder')}
-		{@render _item('text/plain', 'Plain Text')}
-		{@render _item('text/x-uri', 'URL', true)}
-	</div>
+	<span class="menu-item" onclick={() => uploadDialog.showModal()}><Icon i="upload" />Upload</span>
+	{@render _item('inode/directory', 'New Folder')}
+	{@render _item('text/plain', 'Plain Text')}
+	{@render _item('text/x-uri', 'URL', true)}
 </Popover>
 
 <FormDialog
@@ -76,17 +74,7 @@
 </FormDialog>
 
 <style>
-	.add-menu {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.add-menu-item {
-		border-radius: 0.5em;
-		padding: 0.25em 0.25em;
-	}
-
-	.add-menu-item:hover {
+	.menu-item:hover {
 		cursor: pointer;
 		background-color: #4455;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.6.7",
+	"version": "0.6.9",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"description": "User file storage for Axium",
 	"funding": {
@@ -40,7 +40,7 @@
 	"peerDependencies": {
 		"@axium/client": ">=0.1.0",
 		"@axium/core": ">=0.5.4",
-		"@axium/server": ">=0.22.0",
+		"@axium/server": ">=0.22.5",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.3.8"
 	},

package/routes/files/+layout.ts

@@ -1,11 +1,14 @@
 import { getCurrentSession } from '@axium/client/user';
 import { redirect } from '@sveltejs/kit';
 import type { LayoutLoadEvent, LayoutRouteId } from './$types';
+import type { Session } from '@axium/core';
 
 export const ssr = false;
 
-export async function load({ url, route }: LayoutLoadEvent) {
-	const session = await getCurrentSession().catch(() => null);
+export async function load({ url, route, parent }: LayoutLoadEvent) {
+	let { session }: { session?: Session | null } = await parent();
+
+	session ||= await getCurrentSession().catch(() => null);
 
 	if (!session) redirect(307, '/login?after=' + url.pathname);