@axium/tasks 0.2.4 → 0.3.0

package/db.json

@@ -0,0 +1,71 @@
+{
+	"$schema": "../server/schemas/db.json",
+	"format": 0,
+	"versions": [
+		{
+			"delta": false,
+			"tables": {
+				"task_lists": {
+					"columns": {
+						"id": { "type": "uuid", "required": true, "primary": true, "default": "gen_random_uuid()" },
+						"userId": { "type": "uuid", "required": true, "references": "users.id", "onDelete": "cascade" },
+						"created": { "type": "timestamptz", "required": true, "default": "now()" },
+						"publicPermission": { "type": "integer", "required": true, "default": 0 },
+						"name": { "type": "text", "required": true },
+						"description": { "type": "text" }
+					}
+				},
+				"tasks": {
+					"columns": {
+						"id": { "type": "uuid", "required": true, "primary": true, "default": "gen_random_uuid()" },
+						"created": { "type": "timestamptz", "required": true, "default": "now()" },
+						"listId": { "type": "uuid", "required": true, "references": "task_lists.id", "onDelete": "cascade" },
+						"summary": { "type": "text", "required": true },
+						"description": { "type": "text" },
+						"parentId": { "type": "uuid", "references": "tasks.id", "onDelete": "cascade" },
+						"completed": { "type": "boolean", "required": true, "default": false },
+						"due": { "type": "timestamptz" }
+					}
+				},
+				"acl.task_lists": {
+					"columns": {
+						"userId": { "type": "uuid", "required": true, "references": "users.id", "onDelete": "cascade" },
+						"itemId": { "type": "uuid", "required": true, "references": "task_lists.id", "onDelete": "cascade" },
+						"createdAt": { "type": "timestamptz", "required": true, "default": "now()" },
+						"permission": { "type": "integer", "required": true, "check": "permission >= 0 AND permission <= 5" }
+					}
+				}
+			},
+			"indexes": ["task_lists:userId", "acl.task_lists:userId", "acl.task_lists:itemId", "tasks:listId", "tasks:parentId"]
+		},
+		{
+			"delta": true,
+			"alter_tables": {
+				"task_lists": {
+					"drop_columns": ["publicPermission"]
+				},
+				"acl.task_lists": {
+					"drop_constraints": ["PK_acl_task_lists"],
+					"drop_columns": ["permission"],
+					"add_columns": {
+						"role": { "type": "text" },
+						"tag": { "type": "text" },
+						"read": { "type": "boolean", "required": true, "default": false },
+						"edit": { "type": "boolean", "required": true, "default": false },
+						"manage": { "type": "boolean", "required": true, "default": false }
+					},
+					"alter_columns": {
+						"userId": { "ops": ["drop_required"] }
+					},
+					"add_constraints": {
+						"unique_task_lists": { "type": "unique", "on": ["itemId", "userId", "role", "tag"], "nulls_not_distinct": true }
+					}
+				}
+			}
+		}
+	],
+	"wipe": ["task_lists", "tasks", "acl.task_lists"],
+	"acl_tables": {
+		"task_lists": "acl.task_lists"
+	}
+}

package/dist/common.d.ts

@@ -1,4 +1,3 @@
-import type { Permission } from '@axium/core';
 import type { WithRequired } from 'utilium';
 import * as z from 'zod';
 export declare const TaskInit: z.ZodObject<{
@@ -27,7 +26,6 @@ export interface TaskList extends TaskListInit {
     id: string;
     userId: string;
     created: Date;
-    publicPermission: Permission;
     tasks?: Task[];
 }
 declare module '@axium/core/api' {

package/dist/hooks.d.ts

@@ -1,6 +1,3 @@
 import './common.js';
 import './server.js';
 export declare function statusText(): Promise<string>;
-export declare function db_init(): Promise<void>;
-export declare function db_wipe(): Promise<void>;
-export declare function remove(): Promise<void>;

package/dist/hooks.js

@@ -1,56 +1,7 @@
-import { done, start } from '@axium/core/node/io';
-import * as acl from '@axium/server/acl';
-import { count, createIndex, database, warnExists } from '@axium/server/database';
-import { sql } from 'kysely';
+import { count } from '@axium/server/database';
 import './common.js';
 import './server.js';
 export async function statusText() {
     const { tasks, task_lists } = await count('tasks', 'task_lists');
     return `${tasks} tasks, ${task_lists} lists`;
 }
-export async function db_init() {
-    start('Creating table task_lists');
-    await database.schema
-        .createTable('task_lists')
-        .addColumn('id', 'uuid', col => col.primaryKey().defaultTo(sql `gen_random_uuid()`))
-        .addColumn('userId', 'uuid', col => col.notNull().references('users.id').onDelete('cascade'))
-        .addColumn('created', 'timestamptz', col => col.notNull().defaultTo(sql `now()`))
-        .addColumn('publicPermission', 'integer', col => col.notNull().defaultTo(0))
-        .addColumn('name', 'text', col => col.notNull())
-        .addColumn('description', 'text')
-        .execute()
-        .then(done)
-        .catch(warnExists);
-    await createIndex('task_lists', 'userId');
-    await acl.createTable('task_lists');
-    start('Creating table tasks');
-    await database.schema
-        .createTable('tasks')
-        .addColumn('id', 'uuid', col => col.primaryKey().defaultTo(sql `gen_random_uuid()`))
-        .addColumn('created', 'timestamptz', col => col.notNull().defaultTo(sql `now()`))
-        .addColumn('listId', 'uuid', col => col.notNull().references('task_lists.id').onDelete('cascade'))
-        .addColumn('summary', 'text', col => col.notNull())
-        .addColumn('description', 'text')
-        .addColumn('parentId', 'uuid', col => col.references('tasks.id').onDelete('cascade'))
-        .addColumn('completed', 'boolean', col => col.notNull().defaultTo(false))
-        .addColumn('due', 'timestamptz')
-        .execute()
-        .then(done)
-        .catch(warnExists);
-    await createIndex('tasks', 'listId');
-    await createIndex('tasks', 'parentId');
-}
-export async function db_wipe() {
-    start('Wiping data from tasks');
-    await database.deleteFrom('tasks').execute().then(done);
-    start('Wiping data from task_lists');
-    await database.deleteFrom('task_lists').execute().then(done);
-    await acl.wipeTable('task_lists');
-}
-export async function remove() {
-    start('Dropping table tasks');
-    await database.schema.dropTable('tasks').execute().then(done);
-    start('Dropping table task_lists');
-    await database.schema.dropTable('task_lists').execute().then(done);
-    await acl.dropTable('task_lists');
-}

package/dist/server.d.ts

@@ -1,4 +1,3 @@
-import { Permission } from '@axium/core';
 import type { Generated, GeneratedAlways } from 'kysely';
 declare module '@axium/server/database' {
     interface Schema {
@@ -16,13 +15,9 @@ declare module '@axium/server/database' {
             id: GeneratedAlways<string>;
             userId: string;
             created: GeneratedAlways<Date>;
-            publicPermission: Generated<Permission>;
             name: string;
             description?: string | null;
         };
-    }
-    interface ExpectedSchema {
-        tasks: ColumnTypes<Schema['tasks']>;
-        task_lists: ColumnTypes<Schema['task_lists']>;
+        'acl.task_lists': DBAccessControl & DBBool<'read' | 'edit' | 'manage'>;
     }
 }

package/dist/server.js

@@ -1,34 +1,14 @@
-import { Permission } from '@axium/core';
 import { checkAuthForItem, checkAuthForUser } from '@axium/server/auth';
-import { database, expectedTypes } from '@axium/server/database';
+import { database } from '@axium/server/database';
 import { parseBody, withError } from '@axium/server/requests';
 import { addRoute } from '@axium/server/routes';
+import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import * as z from 'zod';
 import { TaskInit, TaskListInit, TaskListUpdate } from './common.js';
-import { jsonArrayFrom } from 'kysely/helpers/postgres';
-expectedTypes.tasks = {
-    id: { type: 'uuid', required: true, hasDefault: true },
-    created: { type: 'timestamptz', required: true, hasDefault: true },
-    summary: { type: 'text', required: true },
-    description: { type: 'text' },
-    listId: { type: 'uuid', required: true },
-    parentId: { type: 'uuid' },
-    completed: { type: 'bool', required: true, hasDefault: true },
-    due: { type: 'timestamptz' },
-};
-expectedTypes.task_lists = {
-    id: { type: 'uuid', required: true, hasDefault: true },
-    userId: { type: 'uuid', required: true },
-    created: { type: 'timestamptz', required: true, hasDefault: true },
-    publicPermission: { type: 'int4', required: true, hasDefault: true },
-    name: { type: 'text', required: true },
-    description: { type: 'text' },
-};
 addRoute({
     path: '/api/users/:id/task_lists',
     params: { id: z.uuid() },
-    async GET(request, params) {
-        const userId = params.id;
+    async GET(request, { id: userId }) {
         await checkAuthForUser(request, userId);
         const lists = await database
             .selectFrom('task_lists')
@@ -42,9 +22,8 @@ addRoute({
             tasks: list.tasks.map(t => ({ ...t, created: new Date(t.created), due: t.due ? new Date(t.due) : null })),
         }));
     },
-    async PUT(request, params) {
+    async PUT(request, { id: userId }) {
         const init = await parseBody(request, TaskListInit);
-        const userId = params.id;
         await checkAuthForUser(request, userId);
         return await database
             .insertInto('task_lists')
@@ -57,9 +36,8 @@ addRoute({
 addRoute({
     path: '/api/task_lists/:id',
     params: { id: z.uuid() },
-    async GET(request, params) {
-        const id = params.id;
-        const { item } = await checkAuthForItem(request, 'task_lists', id, Permission.Read);
+    async GET(request, { id }) {
+        const { item } = await checkAuthForItem(request, 'task_lists', id, { read: true });
         const tasks = await database
             .selectFrom('tasks')
             .selectAll()
@@ -68,10 +46,9 @@ addRoute({
             .catch(withError('Could not get tasks'));
         return Object.assign(item, { tasks });
     },
-    async PUT(request, params) {
-        const listId = params.id;
+    async PUT(request, { id: listId }) {
         const init = await parseBody(request, TaskInit.omit({ listId: true }));
-        await checkAuthForItem(request, 'task_lists', listId, Permission.Edit);
+        await checkAuthForItem(request, 'task_lists', listId, { edit: true });
         return await database
             .insertInto('tasks')
             .values({ summary: '', ...init, listId })
@@ -79,9 +56,8 @@ addRoute({
             .executeTakeFirstOrThrow()
             .catch(withError('Could not update task list'));
     },
-    async PATCH(request, params) {
-        const id = params.id;
-        await checkAuthForItem(request, 'task_lists', id, Permission.Edit);
+    async PATCH(request, { id }) {
+        await checkAuthForItem(request, 'task_lists', id, { edit: true });
         const init = await parseBody(request, TaskListInit);
         return await database
             .updateTable('task_lists')
@@ -91,10 +67,9 @@ addRoute({
             .executeTakeFirstOrThrow()
             .catch(withError('Could not update task list'));
     },
-    async POST(request, params) {
+    async POST(request, { id }) {
         const body = await parseBody(request, TaskListUpdate);
-        const id = params.id;
-        await checkAuthForItem(request, 'task_lists', id, Permission.Edit);
+        await checkAuthForItem(request, 'task_lists', id, { edit: true });
         if (typeof body.all_completed == 'boolean') {
             await database
                 .updateTable('tasks')
@@ -107,9 +82,8 @@ addRoute({
         }
         return {};
     },
-    async DELETE(request, params) {
-        const id = params.id;
-        await checkAuthForItem(request, 'task_lists', id, Permission.Manage);
+    async DELETE(request, { id }) {
+        await checkAuthForItem(request, 'task_lists', id, { manage: true });
         return await database
             .deleteFrom('task_lists')
             .where('id', '=', id)
@@ -121,16 +95,15 @@ addRoute({
 addRoute({
     path: '/api/tasks/:id',
     params: { id: z.uuid() },
-    async PATCH(request, params) {
+    async PATCH(request, { id }) {
         const init = await parseBody(request, TaskInit.omit({ listId: true }));
-        const id = params.id;
         const task = await database
             .selectFrom('tasks')
             .select('listId')
             .where('id', '=', id)
             .executeTakeFirstOrThrow()
             .catch(withError('Could not get task'));
-        await checkAuthForItem(request, 'task_lists', task.listId, Permission.Edit);
+        await checkAuthForItem(request, 'task_lists', task.listId, { edit: true });
         return await database
             .updateTable('tasks')
             .set(init)
@@ -139,15 +112,14 @@ addRoute({
             .executeTakeFirstOrThrow()
             .catch(withError('Could not update task'));
     },
-    async DELETE(request, params) {
-        const id = params.id;
+    async DELETE(request, { id }) {
         const task = await database
             .selectFrom('tasks')
             .select('listId')
             .where('id', '=', id)
             .executeTakeFirstOrThrow()
             .catch(withError('Could not fetch task'));
-        await checkAuthForItem(request, 'task_lists', task.listId, Permission.Manage);
+        await checkAuthForItem(request, 'task_lists', task.listId, { manage: true });
         return await database
             .deleteFrom('tasks')
             .where('id', '=', id)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/tasks",
-	"version": "0.2.4",
+	"version": "0.3.0",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "Tasks for Axium",
 	"funding": {
@@ -28,15 +28,16 @@
 	"files": [
 		"dist",
 		"lib",
-		"routes"
+		"routes",
+		"db.json"
 	],
 	"scripts": {
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.6.0",
-		"@axium/core": ">=0.9.0",
-		"@axium/server": ">=0.26.0",
+		"@axium/client": ">=0.9.0",
+		"@axium/core": ">=0.12.0",
+		"@axium/server": ">=0.28.0",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.3.8"
 	},
@@ -46,7 +47,8 @@
 	"axium": {
 		"server": {
 			"routes": "routes",
-			"hooks": "./dist/hooks.js"
+			"hooks": "./dist/hooks.js",
+			"db": "./db.json"
 		},
 		"apps": [
 			{