domma-cms 1.6.6 → 1.6.7

package/server/routes/api/todo.js

@@ -1,8 +1,7 @@
 /**
  * Todo API - /api/todo
  *
- * Was the `todo` plugin until 0.67.0. The logic is unchanged; what moved is
- * where it lives and how it is gated.
+ * Was the `todo` plugin until 0.67.0. Personal entries now use recoverable Trash; normal reads omit trashed rows.
  *
  * **Per-user scope.** Entries carry a `userId` and every read is filtered to the
  * caller's own. The plugin made this configurable (`scope: 'user' | 'site'`) and
@@ -15,9 +14,10 @@
  * `setupPlugin()` read `schema.slug`, so the live collection has always been
  * called this, and existing entries are found only if it stays exactly so.
  */
+import {registerToolTrash, trashToolEntry} from '../../services/tool-trash.js';
 import {clip, plural} from '../../services/sidebarBadges.js';
 import {authenticate as defaultAuthenticate, requirePermission as defaultRequirePermission} from '../../middleware/auth.js';
-import {createEntry, deleteEntry, getEntry, listEntries, updateEntry} from '../../services/collections.js';
+import {createEntry, getEntry, listEntries, updateEntry} from '../../services/collections.js';
 import {registerCalendarSource} from '../../services/hooks.js';
 import {getPermissionsFor} from '../../services/roles.js';
 
@@ -83,6 +83,8 @@ export async function todoRoutes(fastify, opts = {}) {
     const requirePermission = opts.requirePermission || defaultRequirePermission;
 
 
+    registerToolTrash(fastify, {slug: SLUG, resource: 'todo', itemPath: '/items', authenticate, requirePermission, project: toTodo, onChange: tell});
+
     function userId(request) {
         return request.user?.id ?? request.user?.sub ?? null;
     }
@@ -213,7 +215,7 @@ export async function todoRoutes(fastify, opts = {}) {
         const uid = userId(request);
         const all = await loadAll(uid);
         const completed = all.filter(t => t.status === 'completed');
-        await Promise.all(completed.map(t => deleteEntry(SLUG, t.id)));
+        await Promise.all(completed.map(async t => trashToolEntry(SLUG, await getEntry(SLUG, t.id))));
         if (completed.length) tell(uid);
         return reply.send({success: true, removed: completed.length});
     });
@@ -227,7 +229,7 @@ export async function todoRoutes(fastify, opts = {}) {
         if (!entry) return reply.code(404).send({error: 'Todo not found'});
         if (uid && entry.data.userId !== uid) return reply.code(404).send({error: 'Todo not found'});
 
-        await deleteEntry(SLUG, id);
+        await trashToolEntry(SLUG, entry);
         tell(entry.data.userId);
         return reply.send({ success: true });
     });

package/server/services/collections.js

@@ -16,6 +16,7 @@ import {typedEntryData} from './entryValues.js';
 import {toCsv} from '../../public/js/collection-export.mjs';
 
 const COLLECTIONS_DIR = path.resolve(config.content.collectionsDir);
+const TOOL_TRASH_SLUGS = new Set(['notes-notes', 'todo-items', 'contacts-contacts']);
 
 // ---------------------------------------------------------------------------
 // Internal helpers (schema only)
@@ -352,6 +353,7 @@ export async function validateReferences(schema, data) {
  * @param {string}                    [opts.search]            - Substring match across all fields
  * @param {Record<string, unknown>}   [opts.filter]            - Structured filter; see filterEngine.js
  * @param {boolean}                   [opts.resolveRefs=false] - Batch-resolve reference fields to display labels
+ * @param {boolean}                   [opts.includeToolTrash=false] - Internal recovery/maintenance reads only
  * @returns {Promise<{ entries: object[], total: number, page: number, limit: number }>}
  * @throws {Error} If collection slug does not exist
  */
@@ -359,6 +361,11 @@ export async function listEntries(slug, opts = {}) {
     const schema = await getCollection(slug);
     if (!schema) throw new Error(`Collection "${slug}" not found`);
     const adapter = await getAdapter(slug);
+    // Personal Tool trash is retained for recovery, but must stay out of
+    // normal lists, badges, notifications and contact-sharing integrations.
+    if (TOOL_TRASH_SLUGS.has(slug) && !opts.includeToolTrash) {
+        opts = {...opts, filter: {...opts.filter, _toolTrashedAt_exists: false}};
+    }
     const result = await adapter.list(slug, opts);
     if (opts.resolveRefs) {
         const {resolveReferences} = await import('./references.js');
@@ -372,11 +379,13 @@ export async function listEntries(slug, opts = {}) {
  *
  * @param {string} slug
  * @param {string} entryId
+ * @param {{includeToolTrash?: boolean}} [opts] - Internal recovery/maintenance reads only
  * @returns {Promise<object|null>}
  */
-export async function getEntry(slug, entryId) {
+export async function getEntry(slug, entryId, opts = {}) {
     const adapter = await getAdapter(slug);
-    return adapter.get(slug, entryId);
+    const entry = await adapter.get(slug, entryId);
+    return TOOL_TRASH_SLUGS.has(slug) && entry?.data?._toolTrashedAt && !opts.includeToolTrash ? null : entry;
 }
 
 /**

package/server/services/markdown.js

@@ -1819,17 +1819,17 @@ function processEffectsBlocks(markdown) {
 
     apply('firework', (attrStr, body) => {
         const attrs = parseShortcodeAttrs(attrStr);
+        const flag = name => attrs[name] === true || attrs[name] === 'true';
         const classes = ['firework'];
-        if (attrs.type) classes.push(`firework-${attrs.type}`);
-        if (attrs.colour) classes.push(`firework-${attrs.colour}`);
-        if (attrs.size) classes.push(`firework-${attrs.size}`);
-        if (attrs.continuous === 'true') classes.push('firework-continuous');
-        if (attrs.hover === 'true') classes.push('firework-on-hover');
-        if (body === null) return `<div class="${classes.join(' ')}"></div>`;
-        // Restore code placeholders before the nested parse (tabs-handler
-        // pattern) so code spans/fences render as <code>, not raw backticks.
-        const innerHtml = marked.parse(processCardBlocks(processGridBlocks(processInlineShortcodes(restore(body.trim())))));
-        return `<div class="${classes.join(' ')}">${innerHtml}</div>\n`;
+        for (const name of ['type', 'colour', 'size']) if (attrs[name]) classes.push(`firework-${escapeAttr(attrs[name])}`);
+        if (flag('continuous')) classes.push('firework-continuous');
+        const hover = flag('hover');
+        if (hover) classes.push('firework-on-hover');
+        // Native hover fireworks need a hit target; the base decoration ignores pointer events.
+        const style = hover ? ' style="pointer-events:auto;--dm-fw-size:var(--dm-fw-particle-size)"' : '';
+        const particles = hover ? '' : '<div class="firework-launch"></div><div class="firework-particles"></div>';
+        const innerHtml = body === null ? '' : marked.parse(processCardBlocks(processGridBlocks(processInlineShortcodes(restore(body.trim())))));
+        return `<div class="${classes.join(' ')}"${style}>${particles}${innerHtml}</div>\n`;
     });
 
     apply('fireworks', (_attrStr, body) => {

package/server/services/renderer.js

@@ -367,7 +367,7 @@ export async function renderPage(page, opts = {}) {
         ? `window.__CMS_CTXMENUS__ = ${JSON.stringify(ctxMenus).replace(/<\/script>/gi, '<\\/script>')};`
         : '';
     const ctxMenusModule = ctxMenus.length
-        ? '<script src="/public/js/context-menus.js?v=20261009-classes" type="module"></script>'
+        ? '<script src="/public/js/context-menus.js?v=20261010-utf8-payloads" type="module"></script>'
         : '';
 
     const vars = {
@@ -1081,7 +1081,7 @@ export async function renderBlogPage(templatePath, data = {}, seoMeta = {}) {
         ? `window.__CMS_CTXMENUS__ = ${JSON.stringify(ctxMenus).replace(/<\/script>/gi, '<\\/script>')};`
         : '';
     const ctxMenusModule = ctxMenus.length
-        ? '<script src="/public/js/context-menus.js?v=20261009-classes" type="module"></script>'
+        ? '<script src="/public/js/context-menus.js?v=20261010-utf8-payloads" type="module"></script>'
         : '';
 
     const vars = {

package/server/services/tool-trash.js

@@ -0,0 +1,39 @@
+import {deleteEntry, getEntry, listEntries, updateEntry} from './collections.js';
+
+/** Keep the original row (including Pro fields and related IDs) until purged. */
+export async function trashToolEntry(slug, entry) {
+    return updateEntry(slug, entry.id, {...entry.data, _toolTrashedAt: new Date().toISOString()});
+}
+
+/** Routes remain owner-scoped, even for administrators. Restore needs update. */
+export function registerToolTrash(fastify, {slug, resource, itemPath, authenticate, requirePermission, project, onChange, onPurge}) {
+    const uid = request => request.user?.id ?? request.user?.sub ?? null;
+    const may = action => ({preHandler: [authenticate, requirePermission(resource, action)]});
+    const own = async request => {
+        const entry = await getEntry(slug, request.params.id, {includeToolTrash: true});
+        return uid(request) && entry?.data.userId === uid(request) && entry.data._toolTrashedAt ? entry : null;
+    };
+    fastify.get('/trash', may('read'), async request => {
+        if (!uid(request)) return [];
+        const {entries} = await listEntries(slug, {limit: 100000, includeToolTrash: true});
+        return entries.filter(e => e.data.userId === uid(request) && e.data._toolTrashedAt)
+            .sort((a, b) => String(b.data._toolTrashedAt).localeCompare(String(a.data._toolTrashedAt)))
+            .map(e => ({...project(e), trashedAt: e.data._toolTrashedAt}));
+    });
+    fastify.post(`${itemPath}/:id/restore`, may('update'), async (request, reply) => {
+        const entry = await own(request);
+        if (!entry) return reply.code(404).send({error: 'Item not found in Trash'});
+        const data = {...entry.data};
+        delete data._toolTrashedAt;
+        const restored = await updateEntry(slug, entry.id, data);
+        await onChange?.(uid(request));
+        return project(restored);
+    });
+    fastify.delete('/trash/:id', may('delete'), async (request, reply) => {
+        const entry = await own(request);
+        if (!entry) return reply.code(404).send({error: 'Item not found in Trash'});
+        await deleteEntry(slug, entry.id);
+        await onPurge?.(entry);
+        return {success: true};
+    });
+}

package/server/templates/page.html

@@ -19,7 +19,7 @@
   {{#if fontLink}}{{fontLink}}{{/if}}
 
     <!-- DommaJS CSS -->
-    <link rel="stylesheet" href="/dist/domma/domma.css">
+    <link rel="stylesheet" href="/dist/domma/domma.css?v=20261010-fireworks">
     <link rel="stylesheet" href="/dist/domma/grid.css">
     <link rel="stylesheet" href="/dist/domma/elements.css">
     <link rel="stylesheet" href="/dist/domma/themes/domma-themes.css">
@@ -137,8 +137,8 @@
     </script>
 
     <!-- Site initialisation -->
-    <script src="/public/js/site.js?v=20261009-more-classes" type="module"></script>
-    <script src="/public/js/collection-context.js?v=20260927-ctx" type="module"></script>
+    <script src="/public/js/site.js?v=20261010-utf8-payloads" type="module"></script>
+    <script src="/public/js/collection-context.js?v=20261010-utf8-payloads" type="module"></script>
     {{ctxMenusModule}}
 
     <!-- Floating menu panels: collapse to a hamburger, drag to move, resize.
@@ -155,7 +155,7 @@
     <script src="/public/js/forms.js?v=20261009-form-classes" type="module"></script>
 
     <!-- Core effects runtime -->
-    <script src="/public/js/effects.js?v=20261003-characters"></script>
+    <script src="/public/js/effects.js?v=20261010-motion-demos"></script>
 
     <!-- Plugin body-end injection -->
     {{bodyEndInject}}