@axium/notes 0.1.12 → 0.2.1

package/db.json

@@ -0,0 +1,61 @@
+{
+	"$schema": "../server/schemas/db.json",
+	"format": 0,
+	"versions": [
+		{
+			"delta": false,
+			"tables": {
+				"notes": {
+					"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()" },
+						"modified": { "type": "timestamptz", "required": true, "default": "now()" },
+						"publicPermission": { "type": "integer", "required": true, "default": 0 },
+						"title": { "type": "text", "required": true },
+						"content": { "type": "text" },
+						"labels": { "type": "text[]", "required": true, "default": "'{}'::text[]" }
+					}
+				},
+				"acl.notes": {
+					"columns": {
+						"userId": { "type": "uuid", "required": true, "references": "users.id", "onDelete": "cascade" },
+						"itemId": { "type": "uuid", "required": true, "references": "notes.id", "onDelete": "cascade" },
+						"createdAt": { "type": "timestamptz", "required": true, "default": "now()" },
+						"permission": { "type": "integer", "required": true, "check": "permission >= 0 AND permission <= 5" }
+					}
+				}
+			},
+			"indexes": ["notes:userId", "acl.notes:userId", "acl.notes:itemId"]
+		},
+		{
+			"delta": true,
+			"alter_tables": {
+				"notes": {
+					"drop_columns": ["publicPermission"]
+				},
+				"acl.notes": {
+					"drop_constraints": ["PK_acl_notes"],
+					"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_notes": { "type": "unique", "on": ["itemId", "userId", "role", "tag"], "nulls_not_distinct": true }
+					}
+				}
+			}
+		}
+	],
+	"wipe": ["notes", "acl.notes"],
+	"acl_tables": {
+		"notes": "acl.notes"
+	}
+}

package/dist/common.d.ts

@@ -3,19 +3,6 @@ export declare const NoteInit: z.ZodObject<{
     title: z.ZodString;
     content: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     labels: z.ZodDefault<z.ZodArray<z.ZodString>>;
-    publicPermission: z.ZodDefault<z.ZodEnum<{
-        readonly None: 0;
-        readonly Read: 1;
-        readonly Comment: 2;
-        readonly Edit: 3;
-        readonly Manage: 5;
-    }> & {
-        readonly None: 0;
-        readonly Read: 1;
-        readonly Comment: 2;
-        readonly Edit: 3;
-        readonly Manage: 5;
-    }>;
 }, z.core.$strip>;
 export interface NoteInit extends z.infer<typeof NoteInit> {
 }

package/dist/common.js

@@ -1,8 +1,6 @@
-import { Permission } from '@axium/core/access';
 import * as z from 'zod';
 export const NoteInit = z.object({
     title: z.string().max(100),
     content: z.string().max(10_000).nullish(),
     labels: z.array(z.string().max(30)).default([]),
-    publicPermission: Permission.default(0),
 });

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,38 +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 { notes } = await count('notes');
     return `${notes} notes`;
 }
-export async function db_init() {
-    start('Creating table notes');
-    await database.schema
-        .createTable('notes')
-        .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('modified', 'timestamptz', col => col.notNull().defaultTo(sql `now()`))
-        .addColumn('publicPermission', 'integer', col => col.notNull().defaultTo(0))
-        .addColumn('title', 'text', col => col.notNull())
-        .addColumn('content', 'text')
-        .addColumn('labels', sql `text[]`, col => col.notNull().defaultTo(sql `'{}'::text[]`))
-        .execute()
-        .then(done)
-        .catch(warnExists);
-    await createIndex('notes', 'userId');
-    await acl.createTable('notes');
-}
-export async function db_wipe() {
-    start('Wiping data from notes');
-    await database.deleteFrom('notes').execute().then(done);
-    await acl.wipeTable('notes');
-}
-export async function remove() {
-    await acl.dropTable('notes');
-    start('Dropping table notes');
-    await database.schema.dropTable('notes').execute().then(done);
-}

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 {
@@ -9,11 +8,8 @@ declare module '@axium/server/database' {
             modified: Generated<Date>;
             title: string;
             content: string | null;
-            publicPermission: Generated<Permission>;
             labels: Generated<string[]>;
         };
-    }
-    interface ExpectedSchema {
-        notes: ColumnTypes<Schema['notes']>;
+        'acl.notes': DBAccessControl & DBBool<'read' | 'edit' | 'manage'>;
     }
 }

package/dist/server.js

@@ -1,20 +1,9 @@
-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 * as z from 'zod';
 import { NoteInit } from './common.js';
-expectedTypes.notes = {
-    id: { type: 'uuid', required: true, hasDefault: true },
-    userId: { type: 'uuid', required: true },
-    created: { type: 'timestamptz', required: true, hasDefault: true },
-    modified: { type: 'timestamptz', required: true, hasDefault: true },
-    title: { type: 'text', required: true },
-    content: { type: 'text' },
-    publicPermission: { type: 'int4', required: true, hasDefault: true },
-    labels: { type: '_text', required: true, hasDefault: true },
-};
 addRoute({
     path: '/api/users/:id/notes',
     params: { id: z.uuid() },
@@ -42,12 +31,12 @@ addRoute({
     path: '/api/notes/:id',
     params: { id: z.uuid() },
     async GET(request, { id }) {
-        const { item } = await checkAuthForItem(request, 'notes', id, Permission.Read);
+        const { item } = await checkAuthForItem(request, 'notes', id, { read: true });
         return item;
     },
     async PATCH(request, { id }) {
         const init = await parseBody(request, NoteInit);
-        await checkAuthForItem(request, 'notes', id, Permission.Edit);
+        await checkAuthForItem(request, 'notes', id, { edit: true });
         return await database
             .updateTable('notes')
             .set(init)
@@ -58,7 +47,7 @@ addRoute({
             .catch(withError('Could not update note'));
     },
     async DELETE(request, { id }) {
-        await checkAuthForItem(request, 'notes', id, Permission.Manage);
+        await checkAuthForItem(request, 'notes', id, { manage: true });
         return await database
             .deleteFrom('notes')
             .where('id', '=', id)

package/lib/Note.svelte

@@ -7,10 +7,10 @@
 	import { copy } from '@axium/client/clipboard';
 	import { download } from 'utilium/dom.js';
 
-	let { note = $bindable(), notes = $bindable() }: { note: Note; notes?: Note[] } = $props();
+	let { note = $bindable(), notes = $bindable(), pageMode = false }: { note: Note; notes?: Note[]; pageMode?: boolean } = $props();
 </script>
 
-<div class="note">
+<div class={['note', pageMode && 'full-page']}>
 	<div class="note-header">
 		<input
 			type="text"
@@ -22,7 +22,7 @@
 				fetchAPI('PATCH', 'notes/:id', note, note.id);
 			}}
 		/>
-		<Popover>
+		<Popover showToggle="hover">
 			<div
 				class="menu-item"
 				onclick={() =>
@@ -77,6 +77,20 @@
 		padding: 1em;
 		border: 1px solid var(--bg-accent);
 		background-color: var(--bg-alt);
+		height: fit-content;
+		max-height: 40em;
+		anchor-name: --note;
+
+		textarea {
+			resize: none;
+			field-sizing: content;
+			height: max-content;
+		}
+	}
+
+	.note.full-page {
+		max-height: unset;
+		height: 100%;
 	}
 
 	.note-header {
@@ -90,12 +104,4 @@
 			padding: 0;
 		}
 	}
-
-	.note :global(.popover-toggle) {
-		visibility: hidden;
-	}
-
-	.note:hover :global(.popover-toggle) {
-		visibility: visible;
-	}
 </style>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/notes",
-	"version": "0.1.12",
+	"version": "0.2.1",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "Notes 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.10.0",
-		"@axium/server": ">=0.27.0",
+		"@axium/client": ">=0.9.6",
+		"@axium/core": ">=0.12.0",
+		"@axium/server": ">=0.28.0",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.4.0"
 	},
@@ -46,7 +47,8 @@
 	"axium": {
 		"server": {
 			"routes": "routes",
-			"hooks": "./dist/hooks.js"
+			"hooks": "./dist/hooks.js",
+			"db": "./db.json"
 		},
 		"apps": [
 			{

package/routes/notes/+page.svelte

@@ -15,18 +15,17 @@
 
 <div class="notes-main">
 	<h1>Notes</h1>
-	<span>
-		<button
-			class="icon-text"
-			onclick={async () => {
-				const result = await fetchAPI('PUT', 'users/:id/notes', { title: '' }, data.session.userId);
-				parseNote(result);
-				notes.push(result);
-			}}
-		>
-			<Icon i="plus" /> New Note
-		</button>
-	</span>
+	<button
+		id="create-note"
+		class="icon-text mobile-float-right"
+		onclick={async () => {
+			const result = await fetchAPI('PUT', 'users/:id/notes', { title: '' }, data.session.userId);
+			parseNote(result);
+			notes.push(result);
+		}}
+	>
+		<Icon i="plus" /> New Note
+	</button>
 	<div class="lists-container">
 		{#each notes as note}
 			<Note {note} bind:notes />
@@ -48,4 +47,8 @@
 		grid-template-columns: repeat(auto-fill, minmax(400px, 1fr));
 		gap: 1em;
 	}
+
+	#create-note {
+		width: fit-content;
+	}
 </style>

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

@@ -32,7 +32,7 @@
 		</div>
 	{/if}
 
-	<Note note={data.note} />
+	<Note note={data.note} pageMode />
 </div>
 
 <style>