@substrat-run/contract-tests 0.143.0 → 0.144.0

package/dist/derived-module.d.ts

@@ -8,6 +8,11 @@
  * - `dfolder` — the parent a page is scoped to.
  * - `dnote` — its child: derived get / list / update / delete. The writes that seed it, and the
  *   read of its history, are authored — none of them is a derivable shape.
+ * - `dtag` — another child of `dfolder`, made by a derived CREATE (#2157): keyed per folder, its
+ *   time and author stamped, linked to the folder it was checked on; read and changed derived too.
+ * - `dlabel` — a scope-wide derived create, with no parent and no natural key.
+ * - `dshelf` — archivable and trashable, each under its own key (#119): derived archive /
+ *   unarchive / trash / restore, the bin page, and a list with the archive view.
  */
 import { z } from 'zod';
 import { type ModuleRegistration } from '@substrat-run/kernel';
@@ -31,6 +36,43 @@ export declare const derivedEntities: {
         }, z.core.$strip>;
         readonly parents: readonly ["dfolder"];
     };
+    readonly dtag: {
+        readonly table: "derived_tags";
+        readonly fields: z.ZodObject<{
+            id: z.ZodString;
+            dfolder_id: z.ZodString;
+            label: z.ZodString;
+            note: z.ZodNullable<z.ZodString>;
+            created_at: z.ZodString;
+            created_by: z.ZodString;
+        }, z.core.$strip>;
+        readonly parents: readonly ["dfolder"];
+        readonly key: readonly ["dfolder_id", "label"];
+        readonly stamps: {
+            readonly created_at: "createdAt";
+            readonly created_by: "createdBy";
+        };
+    };
+    readonly dlabel: {
+        readonly table: "derived_labels";
+        readonly fields: z.ZodObject<{
+            id: z.ZodString;
+            name: z.ZodString;
+        }, z.core.$strip>;
+    };
+    readonly dshelf: {
+        readonly table: "derived_shelves";
+        readonly fields: z.ZodObject<{
+            id: z.ZodString;
+            label: z.ZodString;
+        }, z.core.$strip>;
+        readonly archive: {
+            readonly permission: "dshelf:archive";
+        };
+        readonly trash: {
+            readonly permission: "dshelf:trash";
+        };
+    };
 };
 export declare const derivedOperations: {
     readonly 'derived/add-folder': {
@@ -70,7 +112,7 @@ export declare const derivedOperations: {
         readonly summary: "One note";
         readonly derive: "get";
         readonly permission: {
-            readonly key: "dnote:read" | "dnote:write";
+            readonly key: "dnote:read" | "dnote:write" | "dshelf:archive" | "dshelf:trash";
             readonly entity: 'dnote';
             readonly idFrom: 'noteId';
         };
@@ -125,7 +167,7 @@ export declare const derivedOperations: {
         readonly summary: "Change a note";
         readonly derive: "update";
         readonly permission: {
-            readonly key: "dnote:read" | "dnote:write";
+            readonly key: "dnote:read" | "dnote:write" | "dshelf:archive" | "dshelf:trash";
             readonly entity: 'dnote';
             readonly idFrom: 'noteId';
         };
@@ -163,7 +205,7 @@ export declare const derivedOperations: {
         readonly summary: "Remove a note";
         readonly derive: "delete";
         readonly permission: {
-            readonly key: "dnote:read" | "dnote:write";
+            readonly key: "dnote:read" | "dnote:write" | "dshelf:archive" | "dshelf:trash";
             readonly entity: 'dnote';
             readonly idFrom: 'noteId';
         };
@@ -187,6 +229,304 @@ export declare const derivedOperations: {
             readonly payload: readonly ["id"];
         };
     };
+    readonly 'derived/create-tag': {
+        readonly summary: "Tag a folder";
+        readonly derive: "create";
+        readonly permission: {
+            readonly key: "dnote:write";
+            readonly entity: "dfolder";
+            readonly idFrom: "dfolderId";
+        };
+        readonly input: z.ZodObject<{
+            dfolderId: z.ZodString;
+            label: z.ZodString;
+            note: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            dfolder_id: z.ZodString;
+            label: z.ZodString;
+            note: z.ZodNullable<z.ZodString>;
+            created_at: z.ZodString;
+            created_by: z.ZodString;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "POST";
+            readonly path: "/folders/{dfolderId}/tags";
+        };
+        readonly emits: {
+            readonly entity: "dtag";
+            readonly entityIdFrom: "id";
+            readonly type: "dtag.created";
+            readonly schemaVersion: 1;
+            readonly piiClass: "none";
+            readonly payload: readonly ["id", "dfolder_id", "label", "created_at", "created_by"];
+        };
+    };
+    readonly 'derived/get-tag': {
+        readonly summary: "One tag — narrowed to the tag, so a grant on its folder reaches it only through the link";
+        readonly derive: "get";
+        readonly permission: {
+            readonly key: "dnote:read";
+            readonly entity: "dtag";
+            readonly idFrom: "tagId";
+        };
+        readonly input: z.ZodObject<{
+            tagId: z.ZodString;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            dfolder_id: z.ZodString;
+            label: z.ZodString;
+            note: z.ZodNullable<z.ZodString>;
+            created_at: z.ZodString;
+            created_by: z.ZodString;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "GET";
+            readonly path: "/tags/{tagId}";
+        };
+    };
+    readonly 'derived/update-tag': {
+        readonly summary: "Change a tag's note";
+        readonly derive: "update";
+        readonly permission: {
+            readonly key: "dnote:write";
+            readonly entity: "dtag";
+            readonly idFrom: "tagId";
+        };
+        readonly input: z.ZodObject<{
+            tagId: z.ZodString;
+            note: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            dfolder_id: z.ZodString;
+            label: z.ZodString;
+            note: z.ZodNullable<z.ZodString>;
+            created_at: z.ZodString;
+            created_by: z.ZodString;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "PATCH";
+            readonly path: "/tags/{tagId}";
+        };
+        readonly concurrency: {
+            readonly over: "dtag";
+            readonly idFrom: "tagId";
+        };
+        readonly emits: {
+            readonly entity: "dtag";
+            readonly entityIdFrom: "id";
+            readonly type: "dtag.updated";
+            readonly schemaVersion: 1;
+            readonly piiClass: "none";
+            readonly payload: readonly ["id", "note", "created_by"];
+        };
+    };
+    readonly 'derived/create-label': {
+        readonly summary: "Add a label";
+        readonly derive: "create";
+        readonly permission: "dnote:write";
+        readonly input: z.ZodObject<{
+            name: z.ZodString;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            name: z.ZodString;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "POST";
+            readonly path: "/labels";
+        };
+        readonly emits: {
+            readonly entity: "dlabel";
+            readonly entityIdFrom: "id";
+            readonly type: "dlabel.created";
+            readonly schemaVersion: 1;
+            readonly piiClass: "none";
+            readonly payload: readonly ["id", "name"];
+        };
+    };
+    readonly 'derived/add-shelf': {
+        readonly summary: "Add a shelf";
+        readonly permission: "dnote:write";
+        readonly input: z.ZodObject<{
+            id: z.ZodString;
+            label: z.ZodString;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            ok: z.ZodBoolean;
+        }, z.core.$strip>;
+    };
+    readonly 'derived/create-shelf': {
+        readonly summary: "Add a shelf, its id minted";
+        readonly derive: "create";
+        readonly permission: "dnote:write";
+        readonly input: z.ZodObject<{
+            label: z.ZodString;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            label: z.ZodString;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "POST";
+            readonly path: "/shelves";
+        };
+        readonly emits: {
+            readonly entity: "dshelf";
+            readonly entityIdFrom: "id";
+            readonly type: "dshelf.created";
+            readonly schemaVersion: 1;
+            readonly piiClass: "none";
+            readonly payload: readonly ["id", "label"];
+        };
+    };
+    readonly 'derived/list-shelves': {
+        readonly summary: "The shelves, active unless the archive is asked for";
+        readonly derive: "list";
+        readonly permission: "dnote:read";
+        readonly input: z.ZodObject<{
+            view: z.ZodOptional<z.ZodEnum<{
+                active: "active";
+                archived: "archived";
+            }>>;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            label: z.ZodString;
+        }, z.core.$strip>;
+        readonly paged: {
+            readonly over: {
+                readonly entity: "dshelf";
+                readonly sortable: readonly ["label"];
+            };
+        };
+        readonly http: {
+            readonly method: "GET";
+            readonly path: "/shelves";
+        };
+    };
+    readonly 'derived/archive-shelf': {
+        readonly summary: "File a shelf away";
+        readonly derive: "archive";
+        readonly permission: {
+            readonly key: "dshelf:archive" | "dshelf:trash";
+            readonly entity: 'dshelf';
+            readonly idFrom: 'shelfId';
+        };
+        readonly input: z.ZodObject<{
+            shelfId: z.ZodString;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            state: z.ZodEnum<{
+                active: "active";
+                archived: "archived";
+                trashed: "trashed";
+            }>;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "POST";
+            readonly path: "/shelves/{shelfId}/archive";
+        };
+    };
+    readonly 'derived/unarchive-shelf': {
+        readonly summary: "Bring a shelf back from the archive";
+        readonly derive: "unarchive";
+        readonly permission: {
+            readonly key: "dshelf:archive" | "dshelf:trash";
+            readonly entity: 'dshelf';
+            readonly idFrom: 'shelfId';
+        };
+        readonly input: z.ZodObject<{
+            shelfId: z.ZodString;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            state: z.ZodEnum<{
+                active: "active";
+                archived: "archived";
+                trashed: "trashed";
+            }>;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "POST";
+            readonly path: "/shelves/{shelfId}/unarchive";
+        };
+    };
+    readonly 'derived/trash-shelf': {
+        readonly summary: "Bin a shelf";
+        readonly derive: "trash";
+        readonly permission: {
+            readonly key: "dshelf:archive" | "dshelf:trash";
+            readonly entity: 'dshelf';
+            readonly idFrom: 'shelfId';
+        };
+        readonly input: z.ZodObject<{
+            shelfId: z.ZodString;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            state: z.ZodEnum<{
+                active: "active";
+                archived: "archived";
+                trashed: "trashed";
+            }>;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "POST";
+            readonly path: "/shelves/{shelfId}/trash";
+        };
+    };
+    readonly 'derived/restore-shelf': {
+        readonly summary: "Take a shelf out of the bin";
+        readonly derive: "restore";
+        readonly permission: {
+            readonly key: "dshelf:archive" | "dshelf:trash";
+            readonly entity: 'dshelf';
+            readonly idFrom: 'shelfId';
+        };
+        readonly trashed: "admits";
+        readonly input: z.ZodObject<{
+            shelfId: z.ZodString;
+        }, z.core.$strip>;
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            state: z.ZodEnum<{
+                active: "active";
+                archived: "archived";
+                trashed: "trashed";
+            }>;
+        }, z.core.$strip>;
+        readonly http: {
+            readonly method: "POST";
+            readonly path: "/shelves/{shelfId}/restore";
+        };
+    };
+    readonly 'derived/trashed-shelves': {
+        readonly summary: "The bin";
+        readonly derive: "trashed";
+        readonly narrows: {
+            readonly reason: "Only the binned shelves the caller may restore";
+            readonly checks: readonly ["dshelf:trash"];
+        };
+        readonly output: z.ZodObject<{
+            id: z.ZodString;
+            label: z.ZodString;
+        }, z.core.$strip>;
+        readonly paged: {
+            readonly over: {
+                readonly entity: "dshelf";
+                readonly sortable: readonly ["label"];
+            };
+        };
+        readonly http: {
+            readonly method: "GET";
+            readonly path: "/shelves/trash";
+        };
+    };
     readonly 'derived/history': {
         readonly summary: "A note's events, after it is gone too";
         readonly permission: "dnote:read";

package/dist/derived-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derived-module.d.ts","sourceRoot":"","sources":["../src/derived-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAA6C,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1G,eAAO,MAAM,iBAAiB,kBAAkB,CAAC;AAEjD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;CAa1B,CAAC;AAMH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAHsC,OAAO;6BAAU,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuE3F,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAY7B,CAAC;AAMH,eAAO,MAAM,UAAU,EAAE,kBAkCxB,CAAC"}
+{"version":3,"file":"derived-module.d.ts","sourceRoot":"","sources":["../src/derived-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,OAAO,EAA6C,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1G,eAAO,MAAM,iBAAiB,kBAAkB,CAAC;AAEjD,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkC1B,CAAC;AAQH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAHsC,OAAO;6BAAU,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAFnB,QAAQ;6BAAU,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8LnG,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiB7B,CAAC;AAMH,eAAO,MAAM,UAAU,EAAE,kBAkDxB,CAAC"}

package/dist/derived-module.js

@@ -8,9 +8,14 @@
  * - `dfolder` — the parent a page is scoped to.
  * - `dnote` — its child: derived get / list / update / delete. The writes that seed it, and the
  *   read of its history, are authored — none of them is a derivable shape.
+ * - `dtag` — another child of `dfolder`, made by a derived CREATE (#2157): keyed per folder, its
+ *   time and author stamped, linked to the folder it was checked on; read and changed derived too.
+ * - `dlabel` — a scope-wide derived create, with no parent and no natural key.
+ * - `dshelf` — archivable and trashable, each under its own key (#119): derived archive /
+ *   unarchive / trash / restore, the bin page, and a list with the archive view.
  */
 import { z } from 'zod';
-import { defineEntities, defineOperations, listsDeclaredBy, manifestEntities, manifestOperations, moduleManifest, permissionKey, } from '@substrat-run/contracts';
+import { defineEntities, defineOperations, entityStateOutput, listsDeclaredBy, manifestEntities, manifestOperations, moduleManifest, permissionKey, } from '@substrat-run/contracts';
 import { assertAllowed, operationsFor, readHistory } from '@substrat-run/kernel';
 export const DERIVED_MODULE_ID = '@test/derived';
 export const derivedEntities = defineEntities({
@@ -26,8 +31,31 @@ export const derivedEntities = defineEntities({
         }),
         parents: ['dfolder'],
     },
+    dtag: {
+        table: 'derived_tags',
+        fields: z.object({
+            id: z.string(),
+            dfolder_id: z.string(),
+            label: z.string(),
+            note: z.string().nullable(),
+            created_at: z.string(),
+            created_by: z.string(),
+        }),
+        parents: ['dfolder'],
+        key: ['dfolder_id', 'label'],
+        stamps: { created_at: 'createdAt', created_by: 'createdBy' },
+    },
+    dlabel: { table: 'derived_labels', fields: z.object({ id: z.string(), name: z.string() }) },
+    dshelf: {
+        table: 'derived_shelves',
+        fields: z.object({ id: z.string(), label: z.string() }),
+        archive: { permission: 'dshelf:archive' },
+        trash: { permission: 'dshelf:trash' },
+    },
 });
-const PERMISSIONS = ['dnote:read', 'dnote:write'];
+const PERMISSIONS = ['dnote:read', 'dnote:write', 'dshelf:archive', 'dshelf:trash'];
+const shelf = (key) => ({ key, entity: 'dshelf', idFrom: 'shelfId' });
+const byShelf = z.object({ shelfId: z.string() });
 const note = (key) => ({ key, entity: 'dnote', idFrom: 'noteId' });
 const ok = z.object({ ok: z.boolean() });
 export const derivedOperations = defineOperations(derivedEntities, PERMISSIONS)({
@@ -92,6 +120,123 @@ export const derivedOperations = defineOperations(derivedEntities, PERMISSIONS)(
         http: { method: 'DELETE', path: '/notes/{noteId}' },
         emits: { entity: 'dnote', entityIdFrom: 'id', type: 'dnote.deleted', schemaVersion: 1, piiClass: 'none', payload: ['id'] },
     },
+    'derived/create-tag': {
+        summary: 'Tag a folder',
+        derive: 'create',
+        permission: { key: 'dnote:write', entity: 'dfolder', idFrom: 'dfolderId' },
+        input: z.object({ dfolderId: z.string(), label: z.string(), note: z.string().nullable().optional() }),
+        output: derivedEntities.dtag.fields,
+        http: { method: 'POST', path: '/folders/{dfolderId}/tags' },
+        emits: {
+            entity: 'dtag',
+            entityIdFrom: 'id',
+            type: 'dtag.created',
+            schemaVersion: 1,
+            piiClass: 'none',
+            payload: ['id', 'dfolder_id', 'label', 'created_at', 'created_by'],
+        },
+    },
+    'derived/get-tag': {
+        summary: 'One tag — narrowed to the tag, so a grant on its folder reaches it only through the link',
+        derive: 'get',
+        permission: { key: 'dnote:read', entity: 'dtag', idFrom: 'tagId' },
+        input: z.object({ tagId: z.string() }),
+        output: derivedEntities.dtag.fields,
+        http: { method: 'GET', path: '/tags/{tagId}' },
+    },
+    'derived/update-tag': {
+        summary: "Change a tag's note",
+        derive: 'update',
+        permission: { key: 'dnote:write', entity: 'dtag', idFrom: 'tagId' },
+        input: z.object({ tagId: z.string(), note: z.string().nullable().optional() }),
+        output: derivedEntities.dtag.fields,
+        http: { method: 'PATCH', path: '/tags/{tagId}' },
+        concurrency: { over: 'dtag', idFrom: 'tagId' },
+        emits: {
+            entity: 'dtag',
+            entityIdFrom: 'id',
+            type: 'dtag.updated',
+            schemaVersion: 1,
+            piiClass: 'none',
+            payload: ['id', 'note', 'created_by'],
+        },
+    },
+    'derived/create-label': {
+        summary: 'Add a label',
+        derive: 'create',
+        permission: 'dnote:write',
+        input: z.object({ name: z.string() }),
+        output: derivedEntities.dlabel.fields,
+        http: { method: 'POST', path: '/labels' },
+        emits: { entity: 'dlabel', entityIdFrom: 'id', type: 'dlabel.created', schemaVersion: 1, piiClass: 'none', payload: ['id', 'name'] },
+    },
+    'derived/add-shelf': {
+        summary: 'Add a shelf',
+        permission: 'dnote:write',
+        input: z.object({ id: z.string(), label: z.string() }),
+        output: ok,
+    },
+    // A derived create on an archivable, trashable entity with no natural key (#2162): there is no
+    // replay to answer a hidden row, so it derives. With a key it would not (`createPlan`).
+    'derived/create-shelf': {
+        summary: 'Add a shelf, its id minted',
+        derive: 'create',
+        permission: 'dnote:write',
+        input: z.object({ label: z.string() }),
+        output: derivedEntities.dshelf.fields,
+        http: { method: 'POST', path: '/shelves' },
+        emits: { entity: 'dshelf', entityIdFrom: 'id', type: 'dshelf.created', schemaVersion: 1, piiClass: 'none', payload: ['id', 'label'] },
+    },
+    'derived/list-shelves': {
+        summary: 'The shelves, active unless the archive is asked for',
+        derive: 'list',
+        permission: 'dnote:read',
+        input: z.object({ view: z.enum(['active', 'archived']).optional() }),
+        output: derivedEntities.dshelf.fields,
+        paged: { over: { entity: 'dshelf', sortable: ['label'] } },
+        http: { method: 'GET', path: '/shelves' },
+    },
+    'derived/archive-shelf': {
+        summary: 'File a shelf away',
+        derive: 'archive',
+        permission: shelf('dshelf:archive'),
+        input: byShelf,
+        output: entityStateOutput,
+        http: { method: 'POST', path: '/shelves/{shelfId}/archive' },
+    },
+    'derived/unarchive-shelf': {
+        summary: 'Bring a shelf back from the archive',
+        derive: 'unarchive',
+        permission: shelf('dshelf:archive'),
+        input: byShelf,
+        output: entityStateOutput,
+        http: { method: 'POST', path: '/shelves/{shelfId}/unarchive' },
+    },
+    'derived/trash-shelf': {
+        summary: 'Bin a shelf',
+        derive: 'trash',
+        permission: shelf('dshelf:trash'),
+        input: byShelf,
+        output: entityStateOutput,
+        http: { method: 'POST', path: '/shelves/{shelfId}/trash' },
+    },
+    'derived/restore-shelf': {
+        summary: 'Take a shelf out of the bin',
+        derive: 'restore',
+        permission: shelf('dshelf:trash'),
+        trashed: 'admits',
+        input: byShelf,
+        output: entityStateOutput,
+        http: { method: 'POST', path: '/shelves/{shelfId}/restore' },
+    },
+    'derived/trashed-shelves': {
+        summary: 'The bin',
+        derive: 'trashed',
+        narrows: { reason: 'Only the binned shelves the caller may restore', checks: ['dshelf:trash'] },
+        output: derivedEntities.dshelf.fields,
+        paged: { over: { entity: 'dshelf', sortable: ['label'] } },
+        http: { method: 'GET', path: '/shelves/trash' },
+    },
     'derived/history': {
         summary: "A note's events, after it is gone too",
         permission: 'dnote:read',
@@ -105,7 +250,12 @@ export const derivedModManifest = moduleManifest.parse({
     kernelContract: '^0.0.1',
     migrations: { journalDir: './migrations', compatibleFrom: '1.0.0' },
     ...manifestOperations(derivedOperations, {
-        permissions: { 'dnote:read': 'read notes', 'dnote:write': 'write notes' },
+        permissions: {
+            'dnote:read': 'read notes',
+            'dnote:write': 'write notes',
+            'dshelf:archive': 'archive shelves',
+            'dshelf:trash': 'bin and restore shelves',
+        },
         consumes: [],
     }),
     ...manifestEntities(derivedEntities, {}),
@@ -122,10 +272,16 @@ export const derivedMod = {
             version: '0001-init',
             sql: `CREATE TABLE derived_folders (id TEXT PRIMARY KEY, name TEXT NOT NULL);
             CREATE TABLE derived_notes (id TEXT PRIMARY KEY, dfolder_id TEXT NOT NULL, title TEXT NOT NULL,
-                                        body TEXT, rank INTEGER NOT NULL);`,
+                                        body TEXT, rank INTEGER NOT NULL);
+            CREATE TABLE derived_tags (id TEXT PRIMARY KEY, dfolder_id TEXT NOT NULL, label TEXT NOT NULL, note TEXT,
+                                       created_at TEXT NOT NULL, created_by TEXT NOT NULL,
+                                       UNIQUE (dfolder_id, label));
+            CREATE TABLE derived_labels (id TEXT PRIMARY KEY, name TEXT NOT NULL);
+
+            CREATE TABLE derived_shelves (id TEXT PRIMARY KEY, label TEXT NOT NULL);`,
         },
     ],
-    // The four derived operations are absent here — and could not be present: the type refuses them.
+    // The derived operations are absent here — and could not be present: the type refuses them.
     ...operationsFor(derivedOperations)({
         'derived/add-folder': async (ctx, i) => {
             assertAllowed(await ctx.check(WRITE));
@@ -144,9 +300,20 @@ export const derivedMod = {
             ctx.emit({ type: 'dnote.added', schemaVersion: 1, entity: noteRef(i.id), piiClass: 'none', payload: { id: i.id } });
             return { id: i.id };
         },
+        'derived/add-shelf': async (ctx, i) => {
+            assertAllowed(await ctx.check(WRITE));
+            ctx.sql.exec('INSERT INTO derived_shelves (id, label) VALUES (?, ?)', [i.id, i.label]);
+            return { ok: true };
+        },
         'derived/history': async (ctx, i) => {
             assertAllowed(await ctx.check(READ));
-            return { entries: readHistory({ sql: ctx.sql }, noteRef(i.noteId)).entries };
+            // Any entity's history: a note's, a tag's or a label's — the id is enough to find it.
+            for (const entityType of ['dnote', 'dtag', 'dlabel']) {
+                const { entries } = readHistory({ sql: ctx.sql }, { entityType, entityId: i.noteId });
+                if (entries.length > 0)
+                    return { entries };
+            }
+            return { entries: [] };
         },
     }),
 };

package/dist/derived-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"derived-module.js","sourceRoot":"","sources":["../src/derived-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"derived-module.js","sourceRoot":"","sources":["../src/derived-module.ts"],"names":[],"mappings":"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"}

package/dist/derived-suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derived-suite.d.ts","sourceRoot":"","sources":["../src/derived-suite.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAM9D,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAuPpH"}
+{"version":3,"file":"derived-suite.d.ts","sourceRoot":"","sources":["../src/derived-suite.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAgB9D,wBAAgB,4BAA4B,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAugBpH"}