@axium/storage 0.18.7 → 0.18.8

package/dist/client/api.d.ts

@@ -1,4 +1,4 @@
-import type { StorageItemUpdate, UserStorage, UserStorageInfo } from '../common.js';
+import type { GetItemOptions, StorageItemUpdate, UserStorage, UserStorageInfo } from '../common.js';
 import { StorageItemMetadata } from '../common.js';
 import '../polyfills.js';
 export interface UploadOptions {
@@ -21,7 +21,7 @@ declare global {
 }
 export declare function uploadItem(file: Blob | File, opt?: UploadOptions): Promise<StorageItemMetadata>;
 export declare function updateItem(fileId: string, data: Blob): Promise<StorageItemMetadata>;
-export declare function getItemMetadata(fileId: string): Promise<StorageItemMetadata>;
+export declare function getItemMetadata(fileId: string, options?: GetItemOptions): Promise<StorageItemMetadata>;
 /** Gets the metadata for all items in a directory. */
 export declare function getDirectoryMetadata(parentId: string): Promise<StorageItemMetadata[]>;
 export declare function downloadItem(fileId: string): Promise<Blob>;

package/dist/client/api.js

@@ -122,8 +122,8 @@ export async function updateItem(fileId, data) {
         throw prettifyError(e);
     }
 }
-export async function getItemMetadata(fileId) {
-    return await fetchAPI('GET', 'storage/item/:id', undefined, fileId);
+export async function getItemMetadata(fileId, options = {}) {
+    return await fetchAPI('GET', 'storage/item/:id', options, fileId);
 }
 /** Gets the metadata for all items in a directory. */
 export async function getDirectoryMetadata(parentId) {

package/dist/client/local.d.ts

@@ -40,6 +40,10 @@ declare const StorageCache: z.ZodObject<{
             }, z.core.$strip>>>;
             createdAt: z.ZodCoercedDate<unknown>;
         }, z.core.$catchall<z.ZodBoolean>>>>;
+        parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            id: z.ZodUUID;
+            name: z.ZodString;
+        }, z.core.$strip>>>;
     }, z.core.$strip>>;
     users: z.ZodRecord<z.ZodUUID, z.ZodObject<{
         id: z.ZodUUID;

package/dist/common.d.ts

@@ -8,6 +8,11 @@ export declare const StorageItemUpdate: z.ZodObject<{
     trash: z.ZodOptional<z.ZodBoolean>;
 }, 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>]>>;
+}, z.core.$strip>;
+export interface GetItemOptions extends z.infer<typeof GetItemOptions> {
+}
 export declare const StorageItemMetadata: z.ZodObject<{
     createdAt: z.ZodCoercedDate<unknown>;
     dataURL: z.ZodString;
@@ -44,6 +49,10 @@ export declare const StorageItemMetadata: z.ZodObject<{
         }, z.core.$strip>>>;
         createdAt: z.ZodCoercedDate<unknown>;
     }, z.core.$catchall<z.ZodBoolean>>>>;
+    parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        id: z.ZodUUID;
+        name: z.ZodString;
+    }, z.core.$strip>>>;
 }, z.core.$strip>;
 export interface StorageItemMetadata<T extends Record<string, unknown> = Record<string, unknown>> extends z.infer<typeof StorageItemMetadata> {
     metadata: T;
@@ -114,6 +123,10 @@ export declare const UserStorage: z.ZodObject<{
             }, z.core.$strip>>>;
             createdAt: z.ZodCoercedDate<unknown>;
         }, z.core.$catchall<z.ZodBoolean>>>>;
+        parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            id: z.ZodUUID;
+            name: z.ZodString;
+        }, z.core.$strip>>>;
     }, z.core.$strip>>;
     limits: z.ZodObject<{
         item_size: z.ZodInt;
@@ -248,6 +261,10 @@ export declare const UploadInitResult: z.ZodDiscriminatedUnion<[z.ZodObject<{
             }, z.core.$strip>>>;
             createdAt: z.ZodCoercedDate<unknown>;
         }, z.core.$catchall<z.ZodBoolean>>>>;
+        parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            id: z.ZodUUID;
+            name: z.ZodString;
+        }, z.core.$strip>>>;
     }, z.core.$strip>;
 }, z.core.$strip>], "status">;
 export type UploadInitResult = z.infer<typeof UploadInitResult>;
@@ -301,6 +318,10 @@ declare const StorageAPI: {
                     }, z.core.$strip>>>;
                     createdAt: z.ZodCoercedDate<unknown>;
                 }, z.core.$catchall<z.ZodBoolean>>>>;
+                parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                    id: z.ZodUUID;
+                    name: z.ZodString;
+                }, z.core.$strip>>>;
             }, z.core.$strip>>;
             limits: z.ZodObject<{
                 item_size: z.ZodInt;
@@ -350,6 +371,10 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
         }, z.core.$strip>>;
     };
     readonly 'users/:id/storage/trash': {
@@ -389,6 +414,10 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
         }, z.core.$strip>>;
     };
     readonly 'users/:id/storage/shared': {
@@ -428,6 +457,10 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
         }, z.core.$strip>>;
     };
     readonly storage: {
@@ -494,6 +527,10 @@ declare const StorageAPI: {
                     }, z.core.$strip>>>;
                     createdAt: z.ZodCoercedDate<unknown>;
                 }, z.core.$catchall<z.ZodBoolean>>>>;
+                parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                    id: z.ZodUUID;
+                    name: z.ZodString;
+                }, z.core.$strip>>>;
             }, z.core.$strip>;
         }, z.core.$strip>], "status">];
     };
@@ -545,10 +582,16 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
         }, z.core.$strip>>];
     };
     readonly 'storage/item/:id': {
-        readonly GET: z.ZodObject<{
+        readonly GET: readonly [z.ZodObject<{
+            parents: z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodCodec<z.ZodString, z.ZodBoolean>]>>;
+        }, z.core.$strip>, z.ZodObject<{
             createdAt: z.ZodCoercedDate<unknown>;
             dataURL: z.ZodString;
             hash: z.ZodOptional<z.ZodNullable<z.ZodString>>;
@@ -584,7 +627,11 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
-        }, z.core.$strip>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
+        }, z.core.$strip>];
         readonly DELETE: z.ZodObject<{
             createdAt: z.ZodCoercedDate<unknown>;
             dataURL: z.ZodString;
@@ -621,6 +668,10 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
         }, z.core.$strip>;
         readonly PATCH: readonly [z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
@@ -662,6 +713,10 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
         }, z.core.$strip>];
     };
     readonly 'storage/directory/:id': {
@@ -701,6 +756,10 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
         }, z.core.$strip>>;
     };
     readonly 'storage/directory/:id/recursive': {
@@ -740,6 +799,10 @@ declare const StorageAPI: {
                 }, z.core.$strip>>>;
                 createdAt: z.ZodCoercedDate<unknown>;
             }, z.core.$catchall<z.ZodBoolean>>>>;
+            parents: z.ZodOptional<z.ZodArray<z.ZodObject<{
+                id: z.ZodUUID;
+                name: z.ZodString;
+            }, z.core.$strip>>>;
             path: z.ZodString;
         }, z.core.$strip>>;
     };

package/dist/common.js

@@ -10,6 +10,11 @@ export const StorageItemUpdate = z
     trash: z.boolean(),
 })
     .partial();
+export const GetItemOptions = z
+    .object({
+    parents: z.union([z.boolean(), z.stringbool()]),
+})
+    .partial();
 export const StorageItemMetadata = z.object({
     createdAt: z.coerce.date(),
     dataURL: z.string(),
@@ -26,6 +31,7 @@ export const StorageItemMetadata = z.object({
     type: z.string(),
     metadata: z.record(z.string(), z.unknown()),
     acl: AccessControl.array().optional(),
+    parents: z.object({ id: z.uuid(), name: z.string() }).array().optional(),
 });
 export const syncProtocolVersion = 0;
 export const StorageLimits = z.object({
@@ -151,7 +157,7 @@ const StorageAPI = {
         POST: [StorageBatchUpdate.array(), StorageItemMetadata.array()],
     },
     'storage/item/:id': {
-        GET: StorageItemMetadata,
+        GET: [GetItemOptions, StorageItemMetadata],
         DELETE: StorageItemMetadata,
         PATCH: [StorageItemUpdate, StorageItemMetadata],
     },

package/dist/server/api.js

@@ -2,14 +2,14 @@ import { getConfig } from '@axium/core';
 import * as acl from '@axium/server/acl';
 import { authRequestForItem, checkAuthForUser, requireSession } from '@axium/server/auth';
 import { database } from '@axium/server/database';
-import { error, json, parseBody, withError } from '@axium/server/requests';
+import { error, json, parseBody, parseSearch, withError } from '@axium/server/requests';
 import { addRoute } from '@axium/server/routes';
 import { pick } from 'utilium';
 import * as z from 'zod';
-import { batchFormatVersion, StorageItemInit, StorageItemUpdate, syncProtocolVersion } from '../common.js';
+import { batchFormatVersion, GetItemOptions, StorageItemInit, StorageItemUpdate, syncProtocolVersion } from '../common.js';
 import '../polyfills.js';
 import { getLimits } from './config.js';
-import { deleteRecursive, getRecursive, getUserStats, parseItem } from './db.js';
+import { deleteRecursive, getParents, getRecursive, getUserStats, parseItem } from './db.js';
 import { checkNewItem, createNewItem, startUpload } from './item.js';
 addRoute({
     path: '/api/storage',
@@ -44,8 +44,12 @@ addRoute({
     async GET(request, { id: itemId }) {
         if (!getConfig('@axium/storage').enabled)
             error(503, 'User storage is disabled');
+        const options = parseSearch(request, GetItemOptions);
         const { item } = await authRequestForItem(request, 'storage', itemId, { read: true }, true);
-        return parseItem(item);
+        const result = parseItem(item);
+        if (options.parents)
+            result.parents = await getParents(itemId);
+        return result;
     },
     async PATCH(request, { id: itemId }) {
         if (!getConfig('@axium/storage').enabled)

package/dist/server/db.d.ts

@@ -29,4 +29,8 @@ export declare function getRecursive(this: {
 }>;
 export declare function getRecursiveIds(...ids: string[]): AsyncGenerator<string>;
 export declare function deleteRecursive(deleteSelf: boolean, ...itemId: string[]): Promise<void>;
+export declare function getParents(itemId: string): Promise<{
+    id: string;
+    name: string;
+}[]>;
 export declare function getTotalUse(): Promise<bigint>;

package/dist/server/db.js

@@ -64,6 +64,24 @@ export async function deleteRecursive(deleteSelf, ...itemId) {
     for (const id of toDelete)
         unlinkSync(join(getConfig('@axium/storage').data, id));
 }
+export async function getParents(itemId) {
+    const rows = await database
+        .withRecursive('parents', qb => qb
+        .selectFrom('storage')
+        .select(['id', 'name', 'parentId'])
+        .select(eb => eb.lit(0).as('depth'))
+        .where('id', '=', itemId)
+        .unionAll(qb
+        .selectFrom('storage as s')
+        .innerJoin('parents as p', 's.id', 'p.parentId')
+        .select(['s.id', 's.name', 's.parentId'])
+        .select(eb => eb(eb.ref('p.depth'), '+', eb.lit(1)).as('depth'))))
+        .selectFrom('parents')
+        .select(['name', 'id'])
+        .orderBy('depth', 'desc')
+        .execute();
+    return rows;
+}
 export async function getTotalUse() {
     const { size } = await database
         .selectFrom('storage')

package/package.json

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

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

@@ -43,6 +43,11 @@
 				(!a.userId && !a.role && !a.tag)
 		)?.manage as boolean | undefined) ?? true}
 	/>
+	{#if item.parents}
+		<p class="parents" data-sveltekit-reload>
+			{#each item.parents as { id, name } (id)}<a href="/files/{id}">{name}</a>{/each}
+		</p>
+	{/if}
 	{#if item.type == 'inode/directory'}
 		{#snippet action(i: string, text: string, handler: (e: Event) => unknown)}
 			<button
@@ -123,4 +128,9 @@
 		gap: 1em;
 		align-items: center;
 	}
+
+	.parents a::before {
+		content: ' / ';
+		color: #888;
+	}
 </style>

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

@@ -5,7 +5,7 @@ import type { StorageItemMetadata } from '@axium/storage/common';
 export const ssr = false;
 
 export async function load({ params }: PageLoadEvent) {
-	const item = await getItemMetadata(params.id);
+	const item = await getItemMetadata(params.id, { parents: true });
 
 	let items: StorageItemMetadata[] | undefined;