@axium/storage 0.9.0 → 0.10.0

package/dist/server/api.js

@@ -23,17 +23,15 @@ addRoute({
 addRoute({
     path: '/api/storage/item/:id',
     params: { id: z.uuid() },
-    async GET(request, params) {
+    async GET(request, { id: itemId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = params.id;
         const { item } = await checkAuthForItem(request, 'storage', itemId, Permission.Read);
         return parseItem(item);
     },
-    async PATCH(request, params) {
+    async PATCH(request, { id: itemId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = params.id;
         const body = await parseBody(request, StorageItemUpdate);
         await checkAuthForItem(request, 'storage', itemId, Permission.Manage);
         const values = {};
@@ -55,10 +53,9 @@ addRoute({
             .executeTakeFirstOrThrow()
             .catch(withError('Could not update item')));
     },
-    async DELETE(request, params) {
+    async DELETE(request, { id: itemId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = params.id;
         const auth = await checkAuthForItem(request, 'storage', itemId, Permission.Manage);
         const item = parseItem(auth.item);
         await deleteRecursive(item.type != 'inode/directory', itemId);
@@ -68,10 +65,9 @@ addRoute({
 addRoute({
     path: '/api/storage/directory/:id',
     params: { id: z.uuid() },
-    async GET(request, params) {
+    async GET(request, { id: itemId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = params.id;
         const { item } = await checkAuthForItem(request, 'storage', itemId, Permission.Read);
         if (item.type != 'inode/directory')
             error(409, 'Item is not a directory');
@@ -87,10 +83,9 @@ addRoute({
 addRoute({
     path: '/api/storage/directory/:id/recursive',
     params: { id: z.uuid() },
-    async GET(request, params) {
+    async GET(request, { id: itemId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = params.id;
         const { item } = await checkAuthForItem(request, 'storage', itemId, Permission.Read);
         if (item.type != 'inode/directory')
             error(409, 'Item is not a directory');
@@ -101,18 +96,16 @@ addRoute({
 addRoute({
     path: '/api/users/:id/storage',
     params: { id: z.uuid() },
-    async OPTIONS(request, params) {
+    async OPTIONS(request, { id: userId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = params.id;
         await checkAuthForUser(request, userId);
         const [stats, limits] = await Promise.all([getUserStats(userId), getLimits(userId)]).catch(withError('Could not fetch data'));
         return Object.assign(stats, { limits });
     },
-    async GET(request, params) {
+    async GET(request, { id: userId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = params.id;
         await checkAuthForUser(request, userId);
         const [items, stats, limits] = await Promise.all([
             database.selectFrom('storage').where('userId', '=', userId).where('trashedAt', 'is', null).selectAll().execute(),
@@ -125,10 +118,9 @@ addRoute({
 addRoute({
     path: '/api/users/:id/storage/root',
     params: { id: z.uuid() },
-    async GET(request, params) {
+    async GET(request, { id: userId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = params.id;
         await checkAuthForUser(request, userId);
         const items = await database
             .selectFrom('storage')
@@ -151,10 +143,9 @@ function existsInACL(column, userId) {
 addRoute({
     path: '/api/users/:id/storage/shared',
     params: { id: z.uuid() },
-    async GET(request, params) {
+    async GET(request, { id: userId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = params.id;
         await checkAuthForUser(request, userId);
         const items = await database
             .selectFrom('storage as item')
@@ -170,10 +161,9 @@ addRoute({
 addRoute({
     path: '/api/users/:id/storage/trash',
     params: { id: z.uuid() },
-    async GET(request, params) {
+    async GET(request, { id: userId }) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = params.id;
         await checkAuthForUser(request, userId);
         const items = await database
             .selectFrom('storage')

package/dist/server/hooks.d.ts

@@ -2,7 +2,6 @@ import type { InitOptions, OpOptions } from '@axium/server/database';
 import '../common.js';
 import './index.js';
 export declare function statusText(): Promise<string>;
-export declare function init(): void;
 export declare function db_init(opt: InitOptions): Promise<void>;
 export declare function db_wipe(opt: OpOptions): Promise<void>;
 export declare function remove(opt: OpOptions): Promise<void>;

package/dist/server/hooks.js

@@ -7,6 +7,7 @@ import { sql } from 'kysely';
 import { mkdirSync } from 'node:fs';
 import '../common.js';
 import './index.js';
+mkdirSync(config.storage.data, { recursive: true });
 export async function statusText() {
     const { storage: items } = await count('storage');
     const { size } = await database
@@ -15,9 +16,6 @@ export async function statusText() {
         .executeTakeFirstOrThrow();
     return `${items} items totaling ${formatBytes(Number(size))}`;
 }
-export function init() {
-    mkdirSync(config.storage.data, { recursive: true });
-}
 export async function db_init(opt) {
     start('Creating table storage');
     await database.schema

package/lib/List.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
-	import { goto } from '$app/navigation';
-	import { FormDialog, Icon } from '@axium/client/components';
+	import { AccessControlDialog, FormDialog, Icon } from '@axium/client/components';
 	import '@axium/client/styles/list';
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
@@ -62,6 +61,7 @@
 			<span>{item.modifiedAt.toLocaleString()}</span>
 			<span>{item.type == 'inode/directory' ? '—' : formatBytes(item.size)}</span>
 			{@render action('rename', 'pencil', i)}
+			{@render action('share', 'user-group', i)}
 			{@render action('download', 'download', i)}
 			{@render action('trash', 'trash', i)}
 		</div>
@@ -84,6 +84,7 @@
 		<input name="name" type="text" required value={activeItem?.name} />
 	</div>
 </FormDialog>
+<AccessControlDialog bind:dialog={dialogs.share} bind:item={activeItem} itemType="storage" editable={true} />
 <FormDialog
 	bind:dialog={dialogs.trash}
 	submitText="Trash"
@@ -114,6 +115,6 @@
 
 <style>
 	.list-item {
-		grid-template-columns: 1em 4fr 15em 5em repeat(3, 1em);
+		grid-template-columns: 1em 4fr 15em 5em repeat(4, 1em);
 	}
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.9.0",
+	"version": "0.10.0",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {
@@ -38,9 +38,9 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.6.0",
-		"@axium/core": ">=0.10.0",
-		"@axium/server": ">=0.26.0",
+		"@axium/client": ">=0.7.0",
+		"@axium/core": ">=0.11.0",
+		"@axium/server": ">=0.27.0",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.3.8"
 	},