feat: more : commands, grouped help, legible vim prompt

Adds :today, :next/:prev, :first/:last, :random, :clear, :reload, :copy,
:export, :stats and :theme, plus bangs on :w, :wq and :e. Every command now
declares a group so :help can lay them out under headings.

The help sheet flowed its columns wider than the sheet and clipped the
descriptions; it is newspaper columns now, and it lists the ! variants.

CodeMirror's base theme styles panels for a light editor with selectors the
app stylesheet cannot outrank, so the vim `:` prompt rendered black on black.
Those rules move into the editor's own theme, which does win, and the theme
declares itself dark so the light defaults stop applying at all.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01476ZKdB4k3rPDwvVhXcnDg
This commit is contained in:
nvrlandClaude Opus 5 committed 2026-09-05 07:18:32 +02:00
1 parent bf3c1f547a
commit 888e2bf7fe
4 files changed
+278 -38

No files matched your search

+1 -3
View File
@@ -232,6 +232,4 @@ input::placeholder { color: var(--fg-faint); }
outline: 1px solid var(--accent-dim) !important; outline: 1px solid var(--accent-dim) !important;
color: transparent !important; color: transparent !important;
} }
.cm-panels { background: var(--bg-alt); color: var(--fg); border-color: var(--line); } /* The panel and vim `:` prompt are themed in Editor.svelte — see the note there. */
.cm-vim-panel { padding: 2px 8px; background: var(--bg-alt); }
.cm-vim-panel input { background: transparent; border: 0; color: var(--accent); }
+29 -5
View File
@@ -34,11 +34,35 @@
{ tag: tags.processingInstruction, color: 'var(--fg-faint)' }, { tag: tags.processingInstruction, color: 'var(--fg-faint)' },
]) ])
const editorTheme = EditorView.theme({ /*
'&': { color: 'var(--fg)', backgroundColor: 'transparent', height: '100%' }, * CodeMirror's base theme paints panels and the caret for a light editor
'.cm-content': { padding: '12px 16px', maxWidth: '90ch' }, * (`&light .cm-panels { color: black }`), and those selectors outrank
'.cm-line': { padding: '0' }, * anything the app stylesheet can say. Theme rules do win, so the parts that
}) * would otherwise render black on black live here rather than in app.css.
* `dark: true` also stops the light defaults applying in the first place.
*/
const editorTheme = EditorView.theme(
{
'&': { color: 'var(--fg)', backgroundColor: 'transparent', height: '100%' },
'.cm-content': { padding: '12px 16px', maxWidth: '90ch' },
'.cm-line': { padding: '0' },
'.cm-cursor, .cm-dropCursor': { borderLeft: '2px solid var(--accent)' },
'.cm-panels': {
backgroundColor: 'var(--bg-alt)',
color: 'var(--fg)',
borderColor: 'var(--line)',
},
'.cm-panels-bottom': { borderTop: '1px solid var(--line)' },
// The `:` prompt is a bare text node in the panel; the input follows it.
'.cm-vim-panel': { padding: '2px 8px', color: 'var(--accent)' },
'.cm-vim-panel input': {
fontFamily: 'inherit',
color: 'var(--accent)',
caretColor: 'var(--accent)',
},
},
{ dark: true },
)
/** Route every `:command` typed inside the editor through the shared handler. */ /** Route every `:command` typed inside the editor through the shared handler. */
function bridgeExCommands() { function bridgeExCommands() {
+65 -27
View File
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { commands } from './commands' import { commands, groups, type CommandSpec, type Group } from './commands'
import { diary } from './store.svelte' import { diary } from './store.svelte'
const keys: [string, string][] = [ const keys: [string, string][] = [
@@ -14,20 +14,36 @@
['s', 'toggle sharing for the entry'], ['s', 'toggle sharing for the entry'],
['y', 'copy the share link'], ['y', 'copy the share link'],
['x · dd', 'delete the entry (asks first)'], ['x · dd', 'delete the entry (asks first)'],
[': ', 'command line'], [':', 'command line'],
['Ctrl-S', 'save, from anywhere'], ['Ctrl-S', 'save, from anywhere'],
['?', 'this screen'], ['?', 'this screen'],
] ]
const titles: Record<Group, string> = {
entries: 'entries',
editing: 'writing',
sharing: 'sharing & export',
view: 'session',
}
const grouped = groups.map(
(group) => [group, commands.filter((spec) => spec.group === group)] as [Group, CommandSpec[]],
)
/** `:write(w)` — the name first, then whatever else reaches it. */
const signature = (spec: CommandSpec) =>
`:${spec.name}${spec.aliases?.length ? `(${spec.aliases.join(' ')})` : ''}`
</script> </script>
<div class="sheet"> <div class="sheet">
<header> <header>
<span class="accent">:help</span> <span class="accent">:help</span>
<span class="faint">everything is a key or a `:` command</span>
<button onclick={() => (diary.overlay = 'none')}>esc</button> <button onclick={() => (diary.overlay = 'none')}>esc</button>
</header> </header>
<div class="cols"> <div class="cols">
<section> <section class="keys">
<h2>keys</h2> <h2>keys</h2>
<dl> <dl>
{#each keys as [key, description] (key)} {#each keys as [key, description] (key)}
@@ -37,28 +53,29 @@
</dl> </dl>
</section> </section>
<section> {#each grouped as [group, specs] (group)}
<h2>commands</h2> <section>
<dl> <h2>{titles[group]}</h2>
{#each commands as spec (spec.name)} <dl>
<dt> {#each specs as spec (spec.name)}
:{spec.name}{#if spec.aliases?.length}<span class="faint"> ({spec.aliases.join(' ')})</span>{/if} <dt>
{#if spec.args}<span class="faint"> {spec.args}</span>{/if} {signature(spec)}{#if spec.args}<span class="args faint">{spec.args}</span>{/if}
</dt> </dt>
<dd>{spec.help}</dd> <dd>{spec.help}</dd>
{#if spec.bang} {#if spec.bang}
<dt>:{spec.name}!{#if spec.aliases?.length}<span class="faint"> ({spec.aliases.map((a) => `${a}!`).join(' ')})</span>{/if}</dt> <dt>:{spec.name}!</dt>
<dd>{spec.bang.help}</dd> <dd>{spec.bang.help}</dd>
{/if} {/if}
{/each} {/each}
</dl> </dl>
</section> </section>
{/each}
</div> </div>
<footer class="faint"> <footer class="faint">
inside the editor the full vim keymap is live — hjkl, w/b, dd, ciw, visual mode, macros, and inside the editor the full vim keymap is live — hjkl, w/b, dd, ciw, visual mode, macros, and
<span class="accent">:w</span> to write. drop or paste an image, video or audio file into the <span class="accent">:w</span> to write. drop or paste an image, video or audio file into the
editor to attach it. editor to attach it. <span class="accent">:12</span> jumps straight to entry 12.
</footer> </footer>
</div> </div>
@@ -66,25 +83,46 @@
.sheet { .sheet {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 12px; gap: 14px;
width: min(100%, 90ch); width: min(100%, 110ch);
max-height: 100%; max-height: 100%;
background: var(--bg-alt); background: var(--bg-alt);
border: 1px solid var(--accent-dim); border: 1px solid var(--accent-dim);
border-radius: var(--radius); border-radius: var(--radius);
padding: 14px 16px; padding: 14px 16px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden;
} }
header { display: flex; justify-content: space-between; align-items: center; } header { display: flex; align-items: baseline; gap: 12px; }
header .faint { flex: 1; font-size: 12px; }
header button { align-self: center; }
.cols { display: grid; grid-template-columns: repeat(auto-fit, minmax(30ch, 1fr)); gap: 20px; } /* Newspaper columns, so the short groups fill the gaps under the long ones. */
.cols { columns: 38ch; column-gap: 28px; }
h2 { font-size: 12px; color: var(--fg-dim); text-transform: uppercase; letter-spacing: 0.1em; margin: 0 0 6px; } section { break-inside: avoid; min-width: 0; margin: 0 0 16px; }
dl { margin: 0; display: grid; grid-template-columns: auto 1fr; gap: 2px 12px; font-size: 12px; } h2 {
font-size: 12px;
color: var(--fg-dim);
text-transform: uppercase;
letter-spacing: 0.1em;
margin: 0 0 6px;
border-bottom: 1px dashed var(--line);
padding-bottom: 4px;
}
dl {
margin: 0;
display: grid;
grid-template-columns: max-content minmax(0, 1fr);
gap: 3px 12px;
font-size: 12px;
}
dt { color: var(--accent); white-space: nowrap; } dt { color: var(--accent); white-space: nowrap; }
dd { margin: 0; color: var(--fg-dim); } .args { margin-left: 0.6ch; }
dd { margin: 0; color: var(--fg-dim); overflow-wrap: anywhere; }
footer { font-size: 12px; border-top: 1px solid var(--line); padding-top: 10px; } footer { font-size: 12px; border-top: 1px solid var(--line); padding-top: 10px; }
</style> </style>
+183 -3
View File
@@ -1,5 +1,5 @@
import { diary, type Theme } from './store.svelte' import { diary, type Theme } from './store.svelte'
import { parseDay } from './util' import { formatDay, parseDay } from './util'
/** Filled in by App.svelte so ex-commands can reach the DOM-bound bits. */ /** Filled in by App.svelte so ex-commands can reach the DOM-bound bits. */
export const hooks = { export const hooks = {
@@ -10,10 +10,15 @@ export const hooks = {
openCommandLine: (_initial: string) => {}, openCommandLine: (_initial: string) => {},
} }
/** Help groups the command list under these headings, in this order. */
export const groups = ['entries', 'editing', 'sharing', 'view'] as const
export type Group = (typeof groups)[number]
export interface CommandSpec { export interface CommandSpec {
name: string name: string
aliases?: string[] aliases?: string[]
args?: string args?: string
group: Group
help: string help: string
run: (arg: string) => void | Promise<void> run: (arg: string) => void | Promise<void>
/** The forcing variant, `:name!` — vim hands the bang over as an argument. */ /** The forcing variant, `:name!` — vim hands the bang over as an argument. */
@@ -28,26 +33,61 @@ const requireOpen = () => {
return diary.open return diary.open
} }
/** Move the cursor and follow it, so `:next` reads as well as `j` then `Enter`. */
const jumpTo = async (index: number) => {
if (diary.entries.length === 0) return diary.say('no entries', 'error')
diary.cursor = Math.min(Math.max(index, 0), diary.entries.length - 1)
await diary.guard(() => diary.openSelected())
}
const themes: Theme[] = ['mocha', 'green', 'amber', 'ice']
const setTheme = (name: string) => {
if (!themes.includes(name as Theme)) {
return diary.say(`unknown theme: ${name} — try ${themes.join(', ')}`, 'error')
}
diary.setTheme(name as Theme)
diary.say(`theme ${name}`)
}
/** A filename that survives a download folder: `2026-09-05-first-light.md`. */
const exportName = (title: string, at: number) => {
const slug = title.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '')
return `${formatDay(at)}${slug ? `-${slug}` : ''}.md`
}
export const commands: CommandSpec[] = [ export const commands: CommandSpec[] = [
{ {
name: 'write', name: 'write',
aliases: ['w'], aliases: ['w'],
group: 'editing',
help: 'save the open entry', help: 'save the open entry',
run: () => diary.guard(() => diary.save()), run: () => diary.guard(() => diary.save()),
bang: { help: 'same as :w — the bang is accepted out of habit', run: () => diary.guard(() => diary.save()) },
}, },
{ {
name: 'wq', name: 'wq',
aliases: ['x'], aliases: ['x'],
group: 'editing',
help: 'save and leave insert/editor mode', help: 'save and leave insert/editor mode',
run: async () => { run: async () => {
await diary.guard(() => diary.save()) await diary.guard(() => diary.save())
diary.editing = false diary.editing = false
hooks.focusList() hooks.focusList()
}, },
bang: {
help: 'same as :wq — the bang is accepted out of habit',
run: async () => {
await diary.guard(() => diary.save())
diary.editing = false
hooks.focusList()
},
},
}, },
{ {
name: 'quit', name: 'quit',
aliases: ['q'], aliases: ['q'],
group: 'editing',
help: 'close the editor, or the entry when already reading', help: 'close the editor, or the entry when already reading',
run: () => { run: () => {
if (diary.dirty) { if (diary.dirty) {
@@ -76,6 +116,7 @@ export const commands: CommandSpec[] = [
name: 'new', name: 'new',
aliases: ['n', 'o'], aliases: ['n', 'o'],
args: '[yyyy-mm-dd]', args: '[yyyy-mm-dd]',
group: 'entries',
help: 'start a new entry, optionally dated', help: 'start a new entry, optionally dated',
run: async (arg) => { run: async (arg) => {
await diary.guard(async () => { await diary.guard(async () => {
@@ -91,10 +132,29 @@ export const commands: CommandSpec[] = [
hooks.focusEditor() hooks.focusEditor()
}, },
}, },
{
name: 'today',
aliases: ['t'],
group: 'entries',
help: "open today's entry, starting one if there is none yet",
run: async () => {
await diary.guard(async () => {
if (diary.query) await diary.search('')
const midnight = new Date()
midnight.setHours(0, 0, 0, 0)
const from = Math.floor(midnight.getTime() / 1000)
const entry = diary.entries.find((e) => e.created_at >= from && e.created_at < from + 86400)
if (entry) await diary.openEntry(entry.id, true)
else await diary.createEntry()
})
hooks.focusEditor()
},
},
{ {
name: 'edit', name: 'edit',
aliases: ['e'], aliases: ['e'],
args: '[id]', args: '[id]',
group: 'editing',
help: 'edit the open entry, or open an entry by id', help: 'edit the open entry, or open an entry by id',
run: async (arg) => { run: async (arg) => {
const id = arg ? Number(arg) : diary.open?.id ?? diary.selected?.id const id = arg ? Number(arg) : diary.open?.id ?? diary.selected?.id
@@ -102,11 +162,54 @@ export const commands: CommandSpec[] = [
await diary.guard(() => diary.openEntry(id, true)) await diary.guard(() => diary.openEntry(id, true))
hooks.focusEditor() hooks.focusEditor()
}, },
bang: {
help: 'throw away the draft and re-read the entry from the server',
run: async () => {
const open = requireOpen()
if (!open) return
diary.dirty = false
await diary.guard(() => diary.openEntry(open.id, diary.editing))
diary.say(`entry:${open.id} reloaded`)
},
},
},
{
name: 'next',
aliases: ['bn'],
group: 'entries',
help: 'open the next entry down the list',
run: () => jumpTo(diary.cursor + 1),
},
{
name: 'prev',
aliases: ['bp'],
group: 'entries',
help: 'open the previous entry',
run: () => jumpTo(diary.cursor - 1),
},
{
name: 'first',
group: 'entries',
help: 'open the newest entry',
run: () => jumpTo(0),
},
{
name: 'last',
group: 'entries',
help: 'open the oldest entry',
run: () => jumpTo(diary.entries.length - 1),
},
{
name: 'random',
group: 'entries',
help: 'open an entry at random — good for re-reading',
run: () => jumpTo(Math.floor(Math.random() * diary.entries.length)),
}, },
{ {
name: 'delete', name: 'delete',
aliases: ['d', 'rm'], aliases: ['d', 'rm'],
args: '[id]', args: '[id]',
group: 'entries',
help: 'delete an entry (asks first)', help: 'delete an entry (asks first)',
run: async (arg) => { run: async (arg) => {
const id = arg ? Number(arg) : diary.open?.id ?? diary.selected?.id const id = arg ? Number(arg) : diary.open?.id ?? diary.selected?.id
@@ -118,6 +221,7 @@ export const commands: CommandSpec[] = [
{ {
name: 'title', name: 'title',
args: '<text>', args: '<text>',
group: 'editing',
help: 'set the title of the open entry', help: 'set the title of the open entry',
run: async (arg) => { run: async (arg) => {
if (!requireOpen()) return if (!requireOpen()) return
@@ -129,6 +233,7 @@ export const commands: CommandSpec[] = [
{ {
name: 'date', name: 'date',
args: '<yyyy-mm-dd>', args: '<yyyy-mm-dd>',
group: 'editing',
help: 're-date the open entry', help: 're-date the open entry',
run: async (arg) => { run: async (arg) => {
if (!requireOpen()) return if (!requireOpen()) return
@@ -141,6 +246,7 @@ export const commands: CommandSpec[] = [
}, },
{ {
name: 'share', name: 'share',
group: 'sharing',
help: 'publish the entry behind an unguessable link and copy it', help: 'publish the entry behind an unguessable link and copy it',
run: async () => { run: async () => {
const id = diary.open?.id ?? diary.selected?.id const id = diary.open?.id ?? diary.selected?.id
@@ -152,6 +258,7 @@ export const commands: CommandSpec[] = [
}, },
{ {
name: 'unshare', name: 'unshare',
group: 'sharing',
help: 'revoke the share link', help: 'revoke the share link',
run: async () => { run: async () => {
const id = diary.open?.id ?? diary.selected?.id const id = diary.open?.id ?? diary.selected?.id
@@ -163,6 +270,7 @@ export const commands: CommandSpec[] = [
}, },
{ {
name: 'link', name: 'link',
group: 'sharing',
help: 'copy the share link of the current entry', help: 'copy the share link of the current entry',
run: async () => { run: async () => {
const token = diary.open?.share_token ?? diary.selected?.share_token const token = diary.open?.share_token ?? diary.selected?.share_token
@@ -171,14 +279,46 @@ export const commands: CommandSpec[] = [
diary.say((await diary.copy(url)) ? `copied ${url}` : url) diary.say((await diary.copy(url)) ? `copied ${url}` : url)
}, },
}, },
{
name: 'copy',
aliases: ['yank'],
group: 'sharing',
help: 'copy the whole entry to the clipboard as markdown',
run: async () => {
if (!requireOpen()) return
const { title, body } = diary.draft
const text = title.trim() ? `# ${title.trim()}\n\n${body}` : body
diary.say((await diary.copy(text)) ? 'entry copied' : 'the clipboard said no', 'info')
},
},
{
name: 'export',
aliases: ['exp'],
group: 'sharing',
help: 'download the open entry as a .md file',
run: () => {
if (!requireOpen()) return
const { title, body, created_at } = diary.draft
const text = title.trim() ? `# ${title.trim()}\n\n${body}` : body
const url = URL.createObjectURL(new Blob([text], { type: 'text/markdown' }))
const anchor = document.createElement('a')
anchor.href = url
anchor.download = exportName(title.trim(), created_at)
anchor.click()
URL.revokeObjectURL(url)
diary.say(`wrote ${anchor.download}`)
},
},
{ {
name: 'upload', name: 'upload',
aliases: ['up'], aliases: ['up'],
group: 'editing',
help: 'pick files to attach at the cursor', help: 'pick files to attach at the cursor',
run: () => hooks.pickFiles(), run: () => hooks.pickFiles(),
}, },
{ {
name: 'media', name: 'media',
group: 'editing',
help: 'browse everything you have uploaded', help: 'browse everything you have uploaded',
run: () => diary.guard(async () => { run: () => diary.guard(async () => {
await diary.loadMedia() await diary.loadMedia()
@@ -189,25 +329,64 @@ export const commands: CommandSpec[] = [
name: 'search', name: 'search',
aliases: ['se'], aliases: ['se'],
args: '[text]', args: '[text]',
group: 'entries',
help: 'full-text search (empty clears)', help: 'full-text search (empty clears)',
run: (arg) => diary.guard(() => diary.search(arg)), run: (arg) => diary.guard(() => diary.search(arg)),
}, },
{
name: 'clear',
aliases: ['noh'],
group: 'entries',
help: 'clear the search filter',
run: () => diary.guard(() => diary.search('')),
},
{
name: 'reload',
aliases: ['r'],
group: 'entries',
help: 're-read the entry list from the server',
run: () =>
diary.guard(async () => {
await diary.refresh()
diary.say(`${diary.entries.length} entries`)
}),
},
{
name: 'stats',
group: 'view',
help: 'word, line and entry counts',
run: () => {
const body = diary.open ? diary.draft.body : ''
const words = body.split(/\s+/).filter(Boolean).length
const here = diary.open ? `entry:${diary.open.id} ${words}w ${body.split('\n').length}L · ` : ''
diary.say(`${here}${diary.entries.length} entries${diary.query ? ` matching "${diary.query}"` : ''}`)
},
},
{
name: 'theme',
args: '<mocha|green|amber|ice>',
group: 'view',
help: 'switch the colour scheme',
run: (arg) => setTheme(arg.trim() || diary.theme),
},
{ {
name: 'set', name: 'set',
args: '<option>', args: '<option>',
group: 'view',
help: 'theme=mocha|green|amber|ice, vim, novim', help: 'theme=mocha|green|amber|ice, vim, novim',
run: (arg) => { run: (arg) => {
const option = arg.trim() const option = arg.trim()
if (option === 'vim') return diary.setVim(true), diary.say('vim keys on') if (option === 'vim') return diary.setVim(true), diary.say('vim keys on')
if (option === 'novim') return diary.setVim(false), diary.say('vim keys off') if (option === 'novim') return diary.setVim(false), diary.say('vim keys off')
const theme = /^theme=(mocha|green|amber|ice)$/.exec(option)?.[1] const theme = /^theme=(\w+)$/.exec(option)?.[1]
if (theme) return diary.setTheme(theme as Theme), diary.say(`theme ${theme}`) if (theme) return setTheme(theme)
diary.say(`unknown option: ${option}`, 'error') diary.say(`unknown option: ${option}`, 'error')
}, },
}, },
{ {
name: 'help', name: 'help',
aliases: ['h'], aliases: ['h'],
group: 'view',
help: 'show the key and command reference', help: 'show the key and command reference',
run: () => { run: () => {
diary.overlay = diary.overlay === 'help' ? 'none' : 'help' diary.overlay = diary.overlay === 'help' ? 'none' : 'help'
@@ -215,6 +394,7 @@ export const commands: CommandSpec[] = [
}, },
{ {
name: 'logout', name: 'logout',
group: 'view',
help: 'end the session', help: 'end the session',
run: () => diary.guard(() => diary.logout()), run: () => diary.guard(() => diary.logout()),
}, },