tricu

A lazy functional language based on Tree Calculus
Log | Files | Refs | README | LICENSE

commit 0f0ee35db2f8f8c46da9fe17ff4fbb91f155a8f8
parent 86e92aab6dbc854d005877095c5fcdfaa97959d4
Author: James Eversole <james@eversole.co>
Date:   Mon, 26 Oct 2026 20:11:54 -0500

Unify editor amenities around compact contextual cards

Diffstat:
Mext/demo-site/README.md | 15+++++++++++++--
Mext/demo-site/dist/definition-inspector.js | 10++++++++--
Mext/demo-site/dist/module-inspector.js | 21+++++++++++++++++----
Mext/demo-site/index.html | 2+-
Mext/demo-site/src/definition-inspector.ts | 6++++--
Mext/demo-site/src/module-inspector.ts | 12++++++++----
Mext/demo-site/style.css | 58++++++++++++++++++++++++++++++++++++++--------------------
Aext/demo-site/test/editor-amenities.mjs | 110+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 199 insertions(+), 35 deletions(-)

diff --git a/ext/demo-site/README.md b/ext/demo-site/README.md @@ -18,14 +18,25 @@ executes actions. Copy/Download in the card retain complete results behind the bounded preview. Source-free packages expose searchable stored definitions, without generating source or applications. -The sticky toolbar keeps Program, Runtime, Settings, Reload Playground, status +The sticky toolbar keeps Program, Libraries, Settings, Restart, status and Stop while work is active or queued. Settings dock on desktop and become a dismissible modal sheet on mobile, with Escape, focus containment/return and an inert background. The mobile source editor reaches both viewport edges; padding is inside the editor. Cards stay inside the source viewport and scroll their own -contents. Input is focused only after an explicit IO run requests a line. The +contents. Definition and module cards share compact labeled headers and quiet +actions; module cards and Libraries use two-column export lists with wrapping +names. Input is focused only after an explicit IO run requests a line. The footer credits Copyright 2026 James Eversole. +Presentation checks for editor cards and library browsing use fixture metadata and +inspection replies, with desktop/mobile viewport and export-label bounds checks: + +```sh +nix shell nixpkgs#nodejs nixpkgs#chromium -c node ext/demo-site/test/editor-amenities.mjs +``` + +Set `SCREENSHOTS=/tmp/editor-amenities` to save the light/dark screenshots. + ## Color scheme The site follows the browser/system light or dark preference, including live diff --git a/ext/demo-site/dist/definition-inspector.js b/ext/demo-site/dist/definition-inspector.js @@ -21,7 +21,13 @@ export function definitionInspector(input, request, io) { close.title = 'Close (Escape)'; const heading = document.createElement('div'); heading.className = 'definition-card-controls'; - heading.append(title, format, close); + const identity = document.createElement('div'); + identity.className = 'inspection-title'; + const kind = document.createElement('span'); + kind.className = 'inspection-kind'; + kind.textContent = 'Definition'; + identity.append(kind, title); + heading.append(identity, format, close); const status = document.createElement('p'); status.className = 'hint'; status.setAttribute('role', 'status'); @@ -198,7 +204,7 @@ export function definitionInspector(input, request, io) { edit.disabled = busy || input.isDisabled || input.isReadOnly; edit.title = input.isReadOnly ? 'This source is read-only.' : 'Select the declaration name in the editor.'; const height = input.dom.clientHeight; - card.style.maxHeight = `${input.dom.hidden ? Math.min(540, innerHeight * .75) : Math.min(height - 16, innerHeight * .75, ioDetected ? 540 : 260)}px`; + card.style.maxHeight = `${input.dom.hidden ? Math.min(540, innerHeight * .75) : Math.min(height - 16, innerHeight * .75, ioDetected ? 540 : 400)}px`; if (selected && !card.hidden && !input.dom.hidden) { const site = input.declarations().find(site => site.name === selected); const rect = site ? input.view.coordsAtPos(site.start + site.name.length) : null; diff --git a/ext/demo-site/dist/module-inspector.js b/ext/demo-site/dist/module-inspector.js @@ -14,15 +14,24 @@ export function moduleInspector(input, local) { close.setAttribute('aria-label', 'Close module inspection'); const search = document.createElement('input'); search.type = 'search'; - search.placeholder = 'Search definitions'; + search.placeholder = 'Filter definitions…'; search.setAttribute('aria-label', 'Search module definitions'); const list = document.createElement('div'); list.className = 'module-exports'; const status = document.createElement('p'); status.className = 'hint'; status.setAttribute('role', 'status'); - heading.append(title, close); - card.append(heading, search, list, status); + const identity = document.createElement('div'); + identity.className = 'inspection-title'; + const kind = document.createElement('span'); + kind.className = 'inspection-kind'; + kind.textContent = 'Imported module'; + const description = document.createElement('p'); + description.className = 'module-description'; + description.hidden = true; + identity.append(kind, title); + heading.append(identity, close); + card.append(heading, description, search, list, status); input.dom.append(card); let selected, names = [], revision = 0; function hide() { revision++; selected = undefined; card.hidden = true; } @@ -35,7 +44,7 @@ export function moduleInspector(input, local) { return; } const rect = input.view.coordsAtPos(site.to), height = input.dom.clientHeight; - card.style.maxHeight = `${Math.max(80, Math.min(height - 16, innerHeight * .75, 300))}px`; + card.style.maxHeight = `${Math.max(80, Math.min(height - 16, innerHeight * .75, 400))}px`; const top = rect ? rect.bottom - input.dom.getBoundingClientRect().top + 4 : 8; card.style.top = `${Math.max(8, Math.min(top, height - card.offsetHeight - 8))}px`; } @@ -55,6 +64,8 @@ export function moduleInspector(input, local) { names = []; search.value = ''; list.replaceChildren(); + description.hidden = true; + description.textContent = ''; title.textContent = 'Imported module'; status.textContent = 'Loading module definitions…'; card.hidden = false; @@ -66,6 +77,8 @@ export function moduleInspector(input, local) { if (current !== revision) return; title.textContent = nearby?.label ?? published?.title ?? 'Imported module'; + description.textContent = published?.description ?? (nearby ? 'Local module' : ''); + description.hidden = !description.textContent; names = nearby?.names ?? published?.names ?? []; status.textContent = nearby || published ? `${names.length} definitions · Click a name to copy it.` : 'This module is not in the library index or local modules.'; render(); diff --git a/ext/demo-site/index.html b/ext/demo-site/index.html @@ -42,7 +42,7 @@ <section id="editor" class="workspace" aria-label="tricu editor"> <div class="editor-toolbar" data-inspector-background> <div class="toolbar-selection"><label for="program-picker">Program</label><select id="program-picker" disabled><option value="">Loading Names and values…</option></select></div> - <div class="toolbar-actions"><button id="add-import" disabled>Explore libraries…</button><button id="stop" disabled hidden>Stop</button><button id="reload-playground" title="Reload the page to restart all runtimes. Local drafts, output and opened modules are cleared.">Reload Playground</button><button id="settings-toggle" aria-controls="settings-panel" aria-expanded="false">Settings</button></div> + <div class="toolbar-actions"><button id="add-import" disabled>Libraries</button><button id="stop" disabled hidden>Stop</button><button id="reload-playground" title="Reload the page to restart all runtimes. Local drafts, output and opened modules are cleared.">Restart</button><button id="settings-toggle" aria-controls="settings-panel" aria-expanded="false">Settings</button></div> <span id="status" role="status">Loading Names and values</span> </div> <div id="editor-body" class="editor-body"> diff --git a/ext/demo-site/src/definition-inspector.ts b/ext/demo-site/src/definition-inspector.ts @@ -20,7 +20,9 @@ export function definitionInspector(input: SourceEditor, request: (id: number, n for (const [value, label] of [['auto', 'Auto'], ['tricu', 'tricu · t source'], ['triangle', '△ source'], ['dag', 'DAG · shared △'], ['ternary', 'Ternary'], ['string', 'Text'], ['number', 'Natural number'], ['bool', 'Boolean'], ['bytes', 'Bytes'], ['values', 'List · text / numbers']]) format.add(new Option(label, value)); const close = document.createElement('button'); close.className = 'definition-card-close'; close.textContent = '×'; close.type = 'button'; close.setAttribute('aria-label', 'Close definition inspection'); close.title = 'Close (Escape)'; - const heading = document.createElement('div'); heading.className = 'definition-card-controls'; heading.append(title, format, close); + const heading = document.createElement('div'); heading.className = 'definition-card-controls'; const identity = document.createElement('div'); identity.className = 'inspection-title'; + const kind = document.createElement('span'); kind.className = 'inspection-kind'; kind.textContent = 'Definition'; + identity.append(kind, title); heading.append(identity, format, close); const status = document.createElement('p'); status.className = 'hint'; status.setAttribute('role', 'status'); const result = document.createElement('pre'); result.tabIndex = 0; result.setAttribute('aria-label', 'Compiled definition result'); card.append(heading, result, status); wrapper.append(card); @@ -116,7 +118,7 @@ export function definitionInspector(input: SourceEditor, request: (id: number, n edit.hidden = input.dom.hidden || !available; edit.disabled = busy || input.isDisabled || input.isReadOnly; edit.title = input.isReadOnly ? 'This source is read-only.' : 'Select the declaration name in the editor.'; const height=input.dom.clientHeight; - card.style.maxHeight = `${input.dom.hidden ? Math.min(540,innerHeight*.75) : Math.min(height-16,innerHeight*.75,ioDetected?540:260)}px`; + card.style.maxHeight = `${input.dom.hidden ? Math.min(540,innerHeight*.75) : Math.min(height-16,innerHeight*.75,ioDetected?540:400)}px`; if(selected&&!card.hidden&&!input.dom.hidden){ const site=input.declarations().find(site=>site.name===selected); const rect=site?input.view.coordsAtPos(site.start+site.name.length):null; diff --git a/ext/demo-site/src/module-inspector.ts b/ext/demo-site/src/module-inspector.ts @@ -8,10 +8,13 @@ export function moduleInspector(input: SourceEditor, local: () => { label: strin const heading = document.createElement('div'); heading.className = 'definition-card-controls'; const title = document.createElement('strong'), close = document.createElement('button'); close.type = 'button'; close.textContent = '×'; close.className = 'definition-card-close'; close.setAttribute('aria-label', 'Close module inspection'); - const search = document.createElement('input'); search.type = 'search'; search.placeholder = 'Search definitions'; search.setAttribute('aria-label', 'Search module definitions'); + const search = document.createElement('input'); search.type = 'search'; search.placeholder = 'Filter definitions…'; search.setAttribute('aria-label', 'Search module definitions'); const list = document.createElement('div'); list.className = 'module-exports'; const status = document.createElement('p'); status.className = 'hint'; status.setAttribute('role', 'status'); - heading.append(title, close); card.append(heading, search, list, status); input.dom.append(card); + const identity = document.createElement('div'); identity.className = 'inspection-title'; + const kind = document.createElement('span'); kind.className = 'inspection-kind'; kind.textContent = 'Imported module'; + const description = document.createElement('p'); description.className = 'module-description'; description.hidden = true; + identity.append(kind, title); heading.append(identity, close); card.append(heading, description, search, list, status); input.dom.append(card); let selected: {hash: string; from: number} | undefined, names: string[] = [], revision = 0; function hide(): void { revision++; selected = undefined; card.hidden = true; } function position(): void { @@ -19,7 +22,7 @@ export function moduleInspector(input: SourceEditor, local: () => { label: strin const site = importSites(input.view.state).find(site => site.from === selected!.from && site.hash === selected!.hash); if (!site || input.view.state.doc.lineAt(input.view.state.selection.main.head).number !== site.line) { hide(); return; } const rect = input.view.coordsAtPos(site.to), height = input.dom.clientHeight; - card.style.maxHeight = `${Math.max(80, Math.min(height - 16, innerHeight * .75, 300))}px`; + card.style.maxHeight = `${Math.max(80, Math.min(height - 16, innerHeight * .75, 400))}px`; const top = rect ? rect.bottom - input.dom.getBoundingClientRect().top + 4 : 8; card.style.top = `${Math.max(8, Math.min(top, height - card.offsetHeight - 8))}px`; } @@ -34,13 +37,14 @@ export function moduleInspector(input: SourceEditor, local: () => { label: strin const site = importSites(input.view.state).find(site => site.hash === hash && site.line === input.view.state.doc.lineAt(input.view.state.selection.main.head).number); if (!site) return; const current = ++revision; - selected = { hash: site.hash, from: site.from }; names = []; search.value = ''; list.replaceChildren(); + selected = { hash: site.hash, from: site.from }; names = []; search.value = ''; list.replaceChildren(); description.hidden = true; description.textContent = ''; title.textContent = 'Imported module'; status.textContent = 'Loading module definitions…'; card.hidden = false; position(); search.focus({preventScroll:true}); try { const nearby = local().find(row => row.manifest === hash); const published = nearby ? undefined : (await loadLibraries()).find(row => row.manifest === hash); if (current !== revision) return; title.textContent = nearby?.label ?? published?.title ?? 'Imported module'; + description.textContent = published?.description ?? (nearby ? 'Local module' : ''); description.hidden = !description.textContent; names = nearby?.names ?? published?.names ?? []; status.textContent = nearby || published ? `${names.length} definitions · Click a name to copy it.` : 'This module is not in the library index or local modules.'; render(); diff --git a/ext/demo-site/style.css b/ext/demo-site/style.css @@ -2,14 +2,14 @@ :root{color-scheme:light;--paper:#f5f2ea;--ink:#202d29;--muted:#626d65;--green:#235a43;--line:#d8dcd0;--panel:#fffef9;--code:#172a24;--toolbar:#eaf0e6;--dock:#eef2e8;--output:#f3f4ee;--error:#9b3422;--warning:#8b581b;--focus:#b65b28;--primary:var(--green);--on-primary:white;font-family:system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif} *{box-sizing:border-box}html{scroll-behavior:smooth}body{margin:0;background:var(--paper);color:var(--ink)}a{color:var(--green);text-underline-offset:4px}button,input,select{font:inherit}button,.button{border:1px solid var(--line);background:var(--panel);color:var(--ink);border-radius:6px;padding:10px 14px;cursor:pointer;text-decoration:none;display:inline-block;min-height:44px}button:hover:not(:disabled),.button:hover{border-color:var(--green)}button:disabled{cursor:default;opacity:.45}button.primary,.button.primary{background:var(--primary);color:var(--on-primary);border-color:var(--green)}:focus-visible{outline:3px solid var(--focus);outline-offset:3px}.wrap{max-width:1120px;margin:auto;padding-inline:28px}header{display:flex;justify-content:space-between;align-items:center;padding-block:28px;border-bottom:1px solid var(--line);gap:20px}.wordmark{font-weight:800;font-size:25px;text-decoration:none}.wordmark span{font-size:13px;font-weight:400;color:var(--muted)}nav{display:flex;gap:22px;font-size:14px}.hero{padding-block:64px;position:relative}.eyebrow{font:600 12px ui-monospace,monospace;letter-spacing:.12em;text-transform:uppercase;color:var(--green)}.pronunciation{text-transform:none;letter-spacing:normal}h1{font-size:clamp(48px,6vw,78px);line-height:1.03;letter-spacing:-.055em;font-weight:650;margin:22px 0}h1 span{color:var(--green)}.intro{max-width:570px;font-size:19px;line-height:1.7;color:var(--muted)}.shapes{display:flex;gap:35px;margin:28px 0 35px}.shapes div{width:100px;text-align:center}.shapes svg{width:100px;height:80px;display:block;fill:var(--green)}.shapes>div:first-child circle{transform:translateY(18.5px)}.shapes path{stroke:var(--green);stroke-width:2;fill:none}.shapes strong,.shapes code{display:block;font-size:13px;margin-top:5px}.shapes code{color:var(--muted)}h2{font-size:36px;letter-spacing:-.035em;font-weight:600;margin:8px 0 16px}h3{font-size:15px;font-weight:650;margin:0 0 12px}.hint{font-size:12px;line-height:1.7;color:var(--muted);overflow-wrap:anywhere}label{display:block;font-size:12px;font-weight:600;margin-bottom:6px}select,textarea,input:not([type=checkbox]){font:inherit;background:var(--panel);color:var(--ink);border:1px solid var(--line);border-radius:4px;padding:9px;width:100%;min-width:0}select{min-height:44px}textarea{resize:vertical;font:14px/1.6 ui-monospace,monospace}pre{font:14px/1.65 ui-monospace,monospace;white-space:pre-wrap;overflow-wrap:anywhere}details{margin-top:14px;font-size:13px}summary{cursor:pointer;color:var(--green);min-height:32px}button,input,select,textarea{touch-action:manipulation}[hidden]{display:none!important}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap}.error{color:var(--error)}.input-row{display:flex;gap:8px;margin-bottom:12px}.input-row button{white-space:nowrap}.check{display:flex;align-items:center;gap:8px;font-weight:400;margin-block:14px}.check input{flex:none}.demo-picker{display:flex;flex-wrap:wrap;gap:8px}.demo-picker button{font-size:12px} -.workspace{max-width:1064px;margin:0 auto;border:1px solid var(--line);border-radius:12px;background:var(--panel);overflow:clip;scroll-margin-top:16px}.editor-toolbar{position:sticky;top:0;z-index:5;display:flex;align-items:end;gap:12px;flex-wrap:wrap;padding:16px 20px;border-bottom:1px solid var(--line);background:var(--toolbar)}.toolbar-selection{flex:1 1 220px;min-width:0}.toolbar-actions{display:flex;gap:8px;align-items:center;flex-wrap:wrap;max-width:100%}.editor-toolbar #status{flex-basis:100%;font-size:12px;color:var(--muted);min-height:18px}.editor-body{display:grid;grid-template-columns:minmax(0,1fr)}.editor-body.settings-open{grid-template-columns:minmax(0,1fr) 320px}.editor-main{min-width:0}.source-panel{background:var(--code);color:#e3edde;min-width:0}.source-heading{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:16px 20px 8px}.source-heading h2{font-size:14px;letter-spacing:0;margin:0}.source-heading span{font:11px ui-monospace,monospace;color:#b1c1b7}#authorship{font-size:12px;color:#b1c1b7;margin:0;padding:0 20px 12px}#authorship.modified{color:#ffda98}#source-editor{display:block;width:100%;height:460px;min-height:240px;max-height:none;border:0;border-radius:0;padding:18px 20px;margin:0;color:inherit;background:transparent;font:14px/24px ui-monospace,monospace;tab-size:2}#source-editor.modified{background:#273c32;box-shadow:inset 4px 0 #e5b96b}#source-editor:disabled{opacity:.75}#source-notes{margin:0;padding:18px 20px;max-height:460px;overflow:auto;white-space:pre;tab-size:2}#source-availability,#compile-diagnostic,#compile-activity{margin:0;padding:10px 20px;color:#e2d5af}#compile-diagnostic{color:#ffc5b9}.source-actions{display:flex;gap:12px;align-items:center;flex-wrap:wrap;padding:12px 20px;border-top:1px solid #385045}.source-actions .hint{color:#b1c1b7;margin:0}.source-actions button{font-size:12px;padding:6px 10px;background:transparent;color:#e3edde;border-color:#385045} +.workspace{max-width:1064px;margin:0 auto;border:1px solid var(--line);border-radius:12px;background:var(--panel);overflow:clip;scroll-margin-top:16px}.editor-toolbar{position:sticky;top:0;z-index:5;display:flex;align-items:center;gap:8px 20px;flex-wrap:wrap;padding:12px 20px;border-bottom:1px solid var(--line);background:var(--panel)}.toolbar-selection{flex:1 1 240px;min-width:0;display:flex;align-items:center;gap:12px}.toolbar-selection label{margin:0;font-weight:400;color:var(--muted)}.toolbar-selection select{width:auto;flex:1;min-width:0;background:transparent;border-color:transparent;font-size:14px;font-weight:600;padding-left:0}.toolbar-actions{display:flex;gap:4px;align-items:center;flex-wrap:wrap;max-width:100%}.toolbar-actions button{background:transparent;border-color:transparent;font-size:13px;padding-inline:12px}.toolbar-actions #add-import,.toolbar-actions #stop{border-color:var(--line)}.editor-toolbar #status{flex-basis:100%;font-size:11px;line-height:1.5;color:var(--muted);min-height:17px;overflow-wrap:anywhere}.editor-body{display:grid;grid-template-columns:minmax(0,1fr)}.editor-body.settings-open{grid-template-columns:minmax(0,1fr) 320px}.editor-main{min-width:0}.source-panel{background:var(--code);color:#e3edde;min-width:0}.source-heading{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:14px 20px 8px}.source-heading h2{font-size:12px;letter-spacing:0;margin:0}.source-heading span{font:11px ui-monospace,monospace;color:#b1c1b7}#authorship{font-size:11px;color:#b1c1b7;margin:0;padding:0 20px 12px}#authorship.modified{color:#ffda98}#source-editor{display:block;width:100%;height:510px;min-height:240px;max-height:none;border:0;border-radius:0;padding:18px 20px;margin:0;color:inherit;background:transparent;font:14px/24px ui-monospace,monospace;tab-size:2}#source-editor.modified{background:#273c32;box-shadow:inset 4px 0 #e5b96b}#source-editor:disabled{opacity:.75}#source-notes{margin:0;padding:18px 20px;max-height:460px;overflow:auto;white-space:pre;tab-size:2}#source-availability,#compile-diagnostic,#compile-activity{margin:0;padding:10px 20px;color:#e2d5af}#compile-diagnostic{color:#ffc5b9}.source-actions{display:flex;gap:12px;align-items:center;flex-wrap:wrap;padding:10px 20px;border-top:1px solid #385045}.source-actions .hint{color:#b1c1b7;margin:0;font-size:11px}.source-actions button{font-size:12px;padding:6px 10px;background:transparent;color:#e3edde;border-color:#385045} #settings-panel{min-width:0;padding:18px;background:var(--paper);border-left:1px solid var(--line);font-size:13px}#settings-panel section{padding-block:20px;border-bottom:1px solid var(--line)}#settings-panel section:last-child{border:0}.inspector-heading{display:flex;align-items:center;justify-content:space-between;gap:8px}.inspector-heading h2{font-size:16px;margin:0;letter-spacing:0}#settings-panel button{font-size:12px}#settings-panel .hint{margin-bottom:0}#settings-panel details>p{margin-top:8px}#package-info,#release-info,#compiler-stats{overflow-wrap:anywhere}#download-bundle{margin-top:12px;width:100%}#bundle-download-status:empty{display:none}#trace{max-height:260px;overflow:auto;list-style:none;padding:0;font:12px/1.6 ui-monospace,monospace}#trace li{padding-block:8px;border-bottom:1px solid var(--line);overflow-wrap:anywhere;white-space:pre-wrap}#trace li.pending{color:var(--green)}.trace-panel{border-top:1px solid var(--line);padding-top:12px} .explanation{padding-block:64px}.explanation-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:36px;margin-top:28px}.explanation-grid h3{font-size:17px}.explanation-grid p{font-size:14px;line-height:1.8;color:var(--muted)}footer{padding-block:25px 35px;border-top:1px solid var(--line);font-size:12px;line-height:1.8;color:var(--muted)} @media(min-width:950px){.shapes{position:absolute;right:38px;top:70px;flex-direction:column;gap:15px}} @media(max-width:1119px) and (min-width:741px){.workspace{margin-inline:28px}} @media(max-width:949px){.shapes{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:16px;max-width:570px}.shapes div{width:auto}.shapes svg{max-width:100%;margin-inline:auto}.hero>.button{display:block;width:fit-content;max-width:100%;margin-inline:auto;text-align:center}} -@media(max-width:740px){.wrap{padding-inline:18px}.hero{padding-block:38px}.wordmark span{display:none}header{flex-wrap:wrap;gap:10px;padding-block:20px}nav{gap:14px}nav a{display:inline-flex;align-items:center;min-height:44px}.workspace{width:100%;max-width:none;margin:0;border-left:0;border-right:0;border-radius:0;overflow:visible}.editor-body.settings-open{grid-template-columns:minmax(0,1fr)}.editor-toolbar{padding:14px 16px;gap:10px}.toolbar-selection{flex:1 1 220px}.toolbar-actions{flex-basis:auto;order:4;display:flex;margin-left:auto}.toolbar-actions button{min-width:0}.source-heading{padding-inline:16px}#authorship{padding-inline:16px}#source-editor{font-size:16px;line-height:27px;padding:16px;width:100%;height:360px;min-height:240px;max-height:none}.source-actions{padding-inline:16px}input,textarea,select{font-size:16px}#settings-panel{position:fixed;inset:12vh 0 0;z-index:20;border:0;border-top:1px solid var(--line);border-radius:16px 16px 0 0;overflow:auto;padding:18px 18px max(24px,env(safe-area-inset-bottom));box-shadow:0 -8px 40px #0003}#settings-backdrop{position:fixed;inset:0;background:#14271e77;z-index:19}.inspector-modal{overflow:hidden}.inspector-heading{position:sticky;top:-18px;background:var(--paper);padding-block:12px;z-index:1}.explanation-grid{grid-template-columns:1fr;gap:16px}.explanation{padding-block:45px}} +@media(max-width:740px){.wrap{padding-inline:18px}.hero{padding-block:38px}.wordmark span{display:none}header{flex-wrap:wrap;gap:10px;padding-block:20px}nav{gap:14px}nav a{display:inline-flex;align-items:center;min-height:44px}.workspace{width:100%;max-width:none;margin:0;border-left:0;border-right:0;border-radius:0;overflow:visible}.editor-body.settings-open{grid-template-columns:minmax(0,1fr)}.editor-toolbar{padding:14px 16px;gap:10px}.toolbar-selection{flex:1 1 220px}.toolbar-actions{flex-basis:auto;order:4;display:flex;margin-left:auto}.toolbar-actions button{min-width:0}.source-heading{padding-inline:16px}#authorship{padding-inline:16px}#source-editor{font-size:16px;line-height:27px;padding:16px;width:100%;height:570px;min-height:240px;max-height:none}.source-actions{padding-inline:16px}input,textarea,select{font-size:16px}#settings-panel{position:fixed;inset:12vh 0 0;z-index:20;border:0;border-top:1px solid var(--line);border-radius:16px 16px 0 0;overflow:auto;padding:18px 18px max(24px,env(safe-area-inset-bottom));box-shadow:0 -8px 40px #0003}#settings-backdrop{position:fixed;inset:0;background:#14271e77;z-index:19}.inspector-modal{overflow:hidden}.inspector-heading{position:sticky;top:-18px;background:var(--paper);padding-block:12px;z-index:1}.explanation-grid{grid-template-columns:1fr;gap:16px}.explanation{padding-block:45px}} @media(prefers-reduced-motion:reduce){html{scroll-behavior:auto}} @@ -50,32 +50,37 @@ header nav{align-items:center;gap:12px}#theme-separator{color:var(--muted)} .definition-name[aria-disabled="true"]{cursor:default;pointer-events:none}.definition-name:focus-visible{outline:2px solid #bfe2ba;outline-offset:2px} .source-editor.composing .definition-name{text-decoration:none;pointer-events:none} @media(max-width:740px){.source-editor .cm-content{padding:16px}} -.definition-card{position:absolute;left:8px;right:8px;z-index:3;max-height:260px;overflow:auto;margin:0;padding:12px;border:1px solid #587362;border-radius:8px;background:#21352b;color:#e3edde;min-width:0} -.definition-card-controls{position:sticky;top:-12px;z-index:1;display:grid;grid-template-columns:minmax(0,1fr) auto 44px;align-items:center;gap:8px;margin:-12px -12px 10px;padding:8px 12px;border-bottom:1px solid #385045;background:#21352b} -.definition-card-controls strong{flex:1;min-width:0;overflow-wrap:anywhere;font-size:12px;font-weight:500;color:#b1c1b7} -.definition-card select,.definition-card button{background:transparent;color:#b1c1b7;border-color:#385045;max-width:100%;font-size:12px;min-height:32px;padding:4px 6px} -.definition-card select{width:auto;flex:0 1 auto}.definition-card button{width:32px;height:32px;display:grid;place-items:center;padding:0;font-size:20px;border-color:transparent} +/* Contextual inspection surfaces use content-sized controls and a bounded viewport. */ +.definition-card{position:absolute;left:20px;right:auto;width:440px;max-width:calc(100% - 40px);z-index:3;max-height:400px;overflow:auto;margin:0;padding:0;border:1px solid #587362;border-radius:10px;background:#21352b;color:#e3edde;min-width:0;font:13px/1.5 system-ui,sans-serif;box-shadow:0 12px 32px #0004} +.definition-card-controls{position:sticky;top:0;z-index:1;display:grid;grid-template-columns:minmax(0,1fr) auto 44px;align-items:center;gap:12px;margin:0;padding:12px 18px;background:#21352b} +.inspection-title{min-width:0}.inspection-kind{display:block;font-size:10px;font-weight:500;letter-spacing:.08em;text-transform:uppercase;color:#b1c1b7;margin-bottom:3px} +.definition-card-controls strong{display:block;min-width:0;overflow-wrap:anywhere;font-size:16px;font-weight:600;color:#e3edde} +.definition-card select,.definition-card button{background:transparent;color:#b1c1b7;border-color:#587362;max-width:100%;font-size:12px;min-height:36px;padding:6px 10px} +.definition-card select{width:auto;max-width:145px}.definition-card button{width:auto;height:auto} .definition-card button:hover{color:#e3edde;background:#385045} -.definition-card .definition-card-close{grid-column:3;grid-row:1;align-self:start;width:44px;height:44px;min-height:44px;font-size:28px;line-height:1;color:#e3edde;background:#2b4236;border:1px solid #587362} -.definition-card .definition-card-close:hover{background:#385045;border-color:#8bd3ad} +.definition-card .definition-card-close{grid-column:3;grid-row:1;align-self:start;width:44px;height:44px;min-height:44px;padding:0;font-size:24px;line-height:1;color:#b1c1b7;background:transparent;border:0} +.definition-card .definition-card-close:hover{background:#385045} .definition-card .definition-card-close:focus-visible{outline:2px solid #bfe2ba;outline-offset:2px} -@media(max-width:540px){.definition-card-controls select{grid-column:1 / -1;grid-row:2;width:100%}} -.definition-card .hint{color:#b1c1b7;font-size:11px;margin:6px 0 0} -.definition-card pre{max-height:160px;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;margin:0;padding:2px 0 6px;font-size:18px;line-height:1.5} -#import-exports{display:flex;gap:6px;flex-wrap:wrap}#import-exports button{font:inherit;font-size:13px;padding:5px 8px} +.definition-card .hint{color:#b1c1b7;font-size:11px;margin:8px 18px;line-height:1.6} +.definition-card> .hint{margin:12px 0 0;padding:10px 18px;border-top:1px solid #385045} +.definition-card pre{max-height:200px;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;margin:0 18px;padding:12px 14px;background:#172a24;border:1px solid #385045;border-radius:6px;font-size:18px;line-height:1.5} +@media(max-width:540px){.definition-card{left:12px;max-width:calc(100% - 24px)}.definition-card-controls{gap:8px;padding-inline:14px}.definition-card-controls select{max-width:120px}.definition-card pre{margin-inline:14px}} +#import-exports,.module-exports{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));grid-auto-rows:max-content;align-content:start;gap:0;overflow:auto;white-space:normal} +#import-exports button,.definition-card .module-exports button{display:block;min-width:0;width:100%;height:auto;min-height:44px;border:0;border-radius:4px;text-align:left;font:13px/1.5 ui-monospace,monospace;padding:10px;white-space:normal;overflow-wrap:anywhere;background:transparent} +#import-exports button:hover{background:var(--toolbar)} #import-results h3{margin-bottom:0}#try-library,#copy-qualified{margin:8px 8px 8px 0} @media(forced-colors:active){.definition-name{color:LinkText}.definition-name:focus-visible{outline-color:Highlight}.definition-card{background:Canvas;color:CanvasText;border-color:CanvasText}.definition-card-controls,.definition-card .hint,.definition-card button,.definition-card select,.definition-card .definition-card-close{color:CanvasText;background:Canvas}.definition-card .definition-card-close{border-color:ButtonText}.definition-card .definition-card-close:focus-visible{outline-color:Highlight}} /* Definition cards own both inspection and explicitly authorized IO. */ -.definition-card .definition-actions,.inline-io-actions{display:flex;gap:8px;flex-wrap:wrap;margin-top:8px} +.definition-card .definition-actions,.inline-io-actions{display:flex;gap:8px;flex-wrap:wrap;margin:14px 18px} .definition-card .definition-actions button,.definition-card .inline-io button{display:inline-block;width:auto;height:auto;min-height:32px;padding:4px 10px;font-size:12px;border:1px solid #587362} .definition-card:has(.inline-io:not([hidden])){max-height:min(540px,75vh)} -.definition-card .inline-io pre{font-size:14px;max-height:220px;white-space:pre-wrap} +.definition-card .inline-io{padding:0 18px 18px}.definition-card .inline-io .inline-io-actions{margin-inline:0}.definition-card .inline-io pre{font-size:14px;max-height:220px;white-space:pre-wrap} .inline-io label{color:#b1c1b7;font-size:12px}.inline-io input[type=checkbox]{width:auto}.inline-io details{margin-top:12px}.inline-io ol{max-height:140px;overflow:auto;font-size:12px;white-space:pre-wrap} .inline-io input:not([type=checkbox]){background:#21352b;color:#e3edde;border-color:#587362} #package-definitions{padding:12px 20px}#package-definition-list{display:flex;gap:6px;flex-wrap:wrap;max-height:180px;overflow:auto;margin:8px 0}#package-definition-list button{font-size:12px;padding:4px 8px} -.definition-card.external-definition{position:relative;inset:auto;max-height:540px} +.definition-card.external-definition{position:relative;inset:auto;max-width:100%;max-height:540px} #operation-diagnostic{padding:10px 20px} @@ -83,12 +88,25 @@ header nav{align-items:center;gap:12px}#theme-separator{color:var(--muted)} /* Cards share the source's dark surface even when the surrounding page is light. */ .definition-card{color-scheme:dark;--green:#8bd3ad} -.definition-card .edit-definition-name{display:inline-block;width:auto;height:auto;padding:4px 10px;margin-top:8px;font-size:12px;border:1px solid #587362} +.definition-card .edit-definition-name{display:inline-block;width:auto;height:auto;padding:4px 0;margin:0 18px 12px;font-size:11px;border:0} .source-editor .import-hash{display:inline;min-width:0;min-height:0;max-width:100%;margin:0;padding:0;border:0;border-radius:0;font:inherit;line-height:inherit;vertical-align:baseline;color:#8accc8;background:transparent;white-space:pre-wrap;overflow-wrap:anywhere;text-decoration:underline dotted;text-underline-offset:3px;cursor:pointer} .source-editor .import-hash:hover{background:#8bd3ad24}.source-editor .import-hash:focus-visible{outline:2px solid #bfe2ba;outline-offset:2px}.source-editor .import-hash-full{color:#8accc8} @media(forced-colors:active){.source-editor .import-hash{color:LinkText}.source-editor .import-hash-full{color:CanvasText}} .source-editor .import-hash-full{cursor:pointer;text-decoration:underline dotted;text-underline-offset:3px} -.module-card input{width:100%;box-sizing:border-box;margin:.5rem 0} -.module-exports{display:flex;flex-wrap:wrap;gap:.4rem} -.definition-card .module-exports button{display:block;flex:0 1 auto;min-width:0;width:auto;height:auto;min-height:32px;padding:5px 8px;font:inherit;font-size:13px;line-height:1.5;white-space:normal;overflow-wrap:anywhere;border:1px solid #587362} +/* Module and library browsing share the same scannable export rows. */ +.module-card input{display:block;width:calc(100% - 36px);box-sizing:border-box;margin:0 18px 12px;padding:10px 12px;font:13px system-ui,sans-serif;color:#e3edde;background:#172a24;border-color:#385045;border-radius:6px} +.module-card .module-description{margin:0 18px 14px;color:#b1c1b7;font-size:12px;line-height:1.6;overflow-wrap:anywhere} +.module-card{display:flex;flex-direction:column;overflow:hidden}.module-card> *{flex-shrink:0}.module-card .module-exports{flex:0 1 auto;min-height:44px;padding:0 8px;max-height:220px}.module-card .definition-card-controls{position:static} +.definition-card .module-exports button{color:#e3edde} +.definition-card .definition-actions button{border-color:transparent}.definition-card .definition-actions button:first-child{border-color:#587362} +#import-dialog{padding:0;box-shadow:0 16px 48px #0004}.import-heading{margin:0;padding:18px 22px;border-bottom:1px solid var(--line)}.import-heading h2{font-size:20px;letter-spacing:-.02em}.import-heading button{background:transparent;border:0;font-size:13px} +#import-content{padding:18px 22px}#import-dialog label{font-size:12px;font-weight:500;color:var(--muted)} +#import-results{gap:0;max-height:none;margin-top:14px}#import-results h3{font-size:11px;letter-spacing:.07em;text-transform:uppercase;color:var(--muted);padding:18px 10px 8px} +#import-results button{border:0;border-bottom:1px solid var(--line);border-radius:0;background:transparent;padding:14px 10px;gap:5px}#import-results button:hover{background:var(--toolbar)}#import-results strong{font-size:14px;font-weight:600}#import-results span{font-size:13px;color:var(--muted);line-height:1.5}#import-results small{font-size:11px;color:var(--muted)} +#import-back{padding-inline:0;border:0;background:transparent;color:var(--muted);font-size:12px}#import-title{font-size:20px;margin:12px 0 8px}#import-description{font-size:13px;line-height:1.6;color:var(--muted)} +#import-preview{padding:12px;background:var(--output);border:1px solid var(--line);border-radius:6px;font-size:12px}#import-reference{font-size:12px} +#import-exports{max-height:220px;margin:8px 0 16px}#import-actions{margin:0;padding:14px 22px;border-top:1px solid var(--line)}#import-status{padding:0 22px 14px;font-size:12px;color:var(--muted);line-height:1.6} +#settings-panel button{background:transparent}#settings-panel section{padding-block:18px}#settings-panel h3{font-size:13px} +@media(max-width:740px){.editor-toolbar{padding:8px 16px;gap:4px 8px}.toolbar-selection{flex-basis:100%}.toolbar-actions{order:0;width:100%;margin:0;justify-content:space-between}.toolbar-actions button{font-size:12px;padding:8px 10px}.editor-toolbar #status{order:1;flex-basis:100%}.source-actions{padding-block:10px}} +@media(max-width:540px){.module-card input{font-size:16px}.import-heading{padding:14px 16px}#import-content{padding:14px 16px}#import-dialog{padding:0}#import-actions{padding:12px 16px}.import-actions{gap:8px}.import-actions button{font-size:12px}} diff --git a/ext/demo-site/test/editor-amenities.mjs b/ext/demo-site/test/editor-amenities.mjs @@ -0,0 +1,110 @@ +// Presentation regression with library metadata and inspection replies supplied as fixtures. +// nix shell nixpkgs#nodejs nixpkgs#chromium -c node ext/demo-site/test/editor-amenities.mjs +import assert from 'node:assert/strict'; +import {createServer} from 'node:http'; +import {spawn} from 'node:child_process'; +import {mkdtemp,readFile,writeFile,mkdir,rm} from 'node:fs/promises'; +import {tmpdir} from 'node:os'; +import {join} from 'node:path'; +const dir=await mkdtemp(join(tmpdir(),'arboricx-editor-amenities-')); +let browser,socket,server; +try{ + const root=new URL('../',import.meta.url); + browser=spawn(process.argv[2]||'chromium',['--headless','--no-sandbox','--disable-dev-shm-usage','--remote-debugging-port=0',`--user-data-dir=${join(dir,'profile')}`,'about:blank'],{stdio:['ignore','ignore','pipe']}); + const endpoint=await new Promise((resolve,reject)=>{ + let log='';const timer=setTimeout(()=>reject(Error(log)),15000); + browser.on('error',reject); + browser.stderr.on('data',chunk=>{log+=chunk;const m=log.match(/DevTools listening on (ws:\/\/\S+)/);if(m){clearTimeout(timer);resolve(new URL(m[1]));}}); + }); + const tab=await(await fetch(`http://${endpoint.host}/json/new?about:blank`,{method:'PUT'})).json(); + socket=new WebSocket(tab.webSocketDebuggerUrl); + await new Promise((resolve,reject)=>{socket.onopen=resolve;socket.onerror=reject;}); + let id=0;const pending=new Map(); + socket.onmessage=({data})=>{const event=JSON.parse(data);if(event.id){const p=pending.get(event.id);pending.delete(event.id);event.error?p.reject(Error(JSON.stringify(event.error))):p.resolve(event.result);}}; + const send=(method,params={})=>new Promise((resolve,reject)=>{pending.set(++id,{resolve,reject});socket.send(JSON.stringify({id,method,params}));}); + const evaluate=async expression=>{const r=await send('Runtime.evaluate',{expression,returnByValue:true,awaitPromise:true});if(r.exceptionDetails)throw Error(JSON.stringify(r.exceptionDetails));return r.result.value;}; + + + const source=await readFile(new URL('demos/lists.tri',root),'utf8'); + const output=process.env.SCREENSHOTS; if(output)await mkdir(output,{recursive:true}); + const names=['add','and?','append','compose','const','div','divMod','drop','equal?','filter','foldl','foldr','head','id','intercalate','length','map','matchBool','matchMaybe','matchResult','mul','not?','or?','pair','reverse','sub','sum','tail','take','zip']; + const descriptions=JSON.parse(await readFile(new URL('reference-input/libraries.json',root),'utf8')); + const releases=['base','native-math','io'].map((name,i)=>({name,version:'0.3.0',title:name,hash:'a'.repeat(64),manifest:i?String(i).repeat(64):source.split(' ')[1],names,reference:'libraries/'+name+'.md',...descriptions[name]})); + const original=await readFile(new URL('index.html',root),'utf8'); + const html=original.replace(/<script[^>]*>[\s\S]*?<\/script>/g,''); + server=createServer(async(req,res)=>{ + try{ + if(req.url==='/reference/libraries.json'){res.setHeader('Content-Type','application/json');res.end(JSON.stringify({schema:1,releases}));return;} + if(req.url==='/'){res.setHeader('Content-Type','text/html');res.end(html);return;} + res.setHeader('Content-Type',req.url.endsWith('.js')?'text/javascript':req.url.endsWith('.css')?'text/css':'text/plain'); + res.end(await readFile(new URL('.'+req.url,root))); + }catch{res.statusCode=404;res.end();} + }); + await new Promise(resolve=>server.listen(0,'127.0.0.1',resolve)); + await send('Emulation.setEmulatedMedia',{features:[{name:'prefers-color-scheme',value:'light'}]}); + await send('Page.navigate',{url:`http://127.0.0.1:${server.address().port}/`}); + for(let i=0;!await evaluate("!!document.getElementById('source-editor')");i++){assert(i<200);await new Promise(r=>setTimeout(r,25));} + await evaluate(`(async()=>{ + document.querySelectorAll('header,.hero,#ecosystem,footer').forEach(e=>e.remove()); + document.body.insertAdjacentHTML('afterbegin','<div class="study-header"><div><b>Arboricx</b><span>Playground</span></div><div id="study-label">Visual study · fixture data</div></div>'); + document.querySelector('#source-notes').hidden=true; + const node=document.querySelector('#source-editor');node.hidden=false; + document.querySelector('#program-picker').innerHTML='<option>Working with lists</option>'; + document.querySelector('#program-picker').disabled=false; + document.querySelector('#add-import').disabled=false; + document.querySelector('#status').textContent='Compiled'; + document.querySelector('#authorship').textContent='Published source'; + const {SourceEditor}=await import('/dist/source-editor.js'); + const {importPicker}=await import('/dist/import-picker.js'); + const {definitionInspector}=await import('/dist/definition-inspector.js'); + const editor=new SourceEditor(node);globalThis.editor=editor; + editor.replaceSource(${JSON.stringify(source)}); + globalThis.picker=importPicker({source:editor,backend:()=> 'haskell-wasm',available:()=>true,editable:()=>false,local:()=>[],inputs:()=>[],tryLibrary(){}}); + globalThis.inspector=definitionInspector(editor,(id)=>setTimeout(()=>inspector.reply({type:'inspected',id,result:{type:'number',value:'12'}}),0),{run(){},stop(){},resume(){}}); + inspector.update(true,false); + const style=document.createElement('style');style.textContent='body{padding-block:24px}.study-header span{margin-left:12px}.study-header{max-width:1064px;margin:0 auto 20px;padding-inline:16px;display:flex;justify-content:space-between;font:12px system-ui;color:var(--muted)}';document.head.append(style); + })()`); + + for(const scheme of ['light','dark'])for(const width of [1280,390])for(const kind of ['module','definition','libraries','library-detail']){ + await send('Emulation.setEmulatedMedia',{features:[{name:'prefers-color-scheme',value:scheme}]}); + await send('Emulation.setDeviceMetricsOverride',{width,height:width===390?1000:820,deviceScaleFactor:1,mobile:false}); + await evaluate(`(async()=>{ + picker.cancel();inspector.reset();editor.select(editor.getSource().length);await Promise.resolve(); + if('${kind}'==='module'){ + editor.select(8);document.querySelector('.import-hash-full').click(); + }else if('${kind}'==='definition'){ + inspector.open('total'); + }else{ + document.querySelector('#add-import').click(); + } + editor.view.requestMeasure(); + })()`); + await new Promise(r=>setTimeout(r,150)); + if(kind==='library-detail')await evaluate("document.querySelector('#import-results button').click()"); + await new Promise(r=>setTimeout(r,100)); + const checks=await evaluate(`(()=>{ + const surface=document.querySelector('${kind.startsWith('librar')?'#import-dialog':kind==='module'?'.module-card':'#inline-definition'}'); + const r=surface.getBoundingClientRect(); + const labels=[...surface.querySelectorAll('.module-exports button,#import-exports button')]; + return {visible:!surface.hidden&&r.width>0,contained:r.left>=0&&r.right<=innerWidth&&r.top>=0&&r.bottom<=innerHeight, + noOverflow:surface.scrollWidth<=surface.clientWidth, + labelsFit:labels.every(button=>{const range=document.createRange();range.selectNodeContents(button);const text=range.getBoundingClientRect(),box=button.getBoundingClientRect();return text.left>=box.left&&text.right<=box.right&&text.top>=box.top&&text.bottom<=box.bottom;}), + label:surface.querySelector('.inspection-kind')?.textContent, + result:surface.querySelector('pre')?.textContent}; + })()`); + assert(checks.visible&&checks.contained&&checks.noOverflow&&checks.labelsFit,`${kind} at ${width}px: ${JSON.stringify(checks)}`); + if(kind==='definition')assert.equal(checks.result,'12'); + if(kind==='module')assert.equal(checks.label,'Imported module'); + if(kind==='libraries'){ + await evaluate("document.querySelector('#import-search').value='base';document.querySelector('#import-search').dispatchEvent(new Event('input'))"); + assert.equal(await evaluate("document.querySelectorAll('#import-results button').length"),1); + await evaluate("document.querySelector('#import-search').value='';document.querySelector('#import-search').dispatchEvent(new Event('input'))"); + } + if(output){ + const shot=await send('Page.captureScreenshot',{format:'png',captureBeyondViewport:false}); + const path=join(output,`${scheme}-${width===390?'mobile':'desktop'}-${kind}.png`); + await writeFile(path,Buffer.from(shot.data,'base64'));console.log(path); + } + } + console.log('Editor amenities: cards, library search/details, viewport bounds and export labels passed at desktop/mobile sizes.'); +}finally{socket?.close();browser?.kill();server?.close();await rm(dir,{recursive:true,force:true,maxRetries:10,retryDelay:100});}