@impeccable/reviews 0.1.20 → 0.1.22

package/dist/ui/bridge.js

@@ -121,7 +121,9 @@ async function askOnStdin(q) {
     const out = process.stdout;
     if (q.kind === 'confirm') {
         out.write(`\n${q.title ? `${q.title}\n` : ''}${q.hint ? `${q.hint}\n` : ''}${q.prompt}\n`);
-        const how = `Type y to ${(q.confirmLabel ?? 'continue').toLowerCase()}, or Enter to ${(q.skipLabel ?? 'skip').toLowerCase()}:`;
+        // Lowercased after "to", but for the I of "I'll install it myself".
+        const lower = (label) => label.toLowerCase().replace(/^i(?=['\s])/, 'I');
+        const how = `Type y to ${lower(q.confirmLabel ?? 'continue')}, or Enter to ${lower(q.skipLabel ?? 'skip')}:`;
         out.write(`${how} `);
         for (let line = await nextLine(); line !== null; line = await nextLine()) {
             if (/^y(es)?$/i.test(line.trim()))
@@ -130,7 +132,7 @@ async function askOnStdin(q) {
                 return { skipped: true };
             out.write(`That is not an answer to this one. ${how} `);
         }
-        return { skipped: true };
+        return { skipped: true, closed: true };
     }
     if (q.kind === 'account') {
         // An empty username keeps the one the field would hold; an empty password skips the account.
@@ -158,5 +160,5 @@ async function askOnStdin(q) {
         out.write(`That is not an answer to this one. ${how} `);
     }
     // Nobody is there to answer.
-    return { skipped: true };
+    return { skipped: true, closed: true };
 }

package/dist/ui/look.js

@@ -63,13 +63,30 @@ function block(lines, width, size = Math.max(0, ...lines.map((line) => visibleWi
     const left = ' '.repeat(Math.max(0, Math.floor((width - Math.min(size, width)) / 2)));
     return lines.map((line) => left + truncateToWidth(line, width - left.length, '…'));
 }
+/** A word wider than `max` columns (a host name, an address) cut after a dot or a slash in each row's last two thirds, so it breaks where a reader expects (#390); a word with none stays whole. */
+function dotRows(word, max) {
+    const rows = [];
+    let rest = word;
+    while (visibleWidth(rest) > max) {
+        const head = rest.slice(0, max);
+        const cut = Math.max(head.lastIndexOf('.'), head.lastIndexOf('/')) + 1;
+        if (cut < max / 3)
+            break;
+        rows.push(rest.slice(0, cut));
+        rest = rest.slice(cut);
+    }
+    return [...rows, rest];
+}
 /** A paragraph of plain text wrapped to at most `max` columns: a sentence a line when each fits, else lines as even as the words allow. */
-function balanced(text, max) {
+function balanced(given, max) {
+    const text = given.split(' ').map((word) => dotRows(word, max).join('\n')).join(' ');
     const sentences = text.split(/(?<=[.!?])\s+/);
     if (sentences.length > 1 && sentences.every((line) => visibleWidth(line) <= max))
         return sentences;
     const lines = wrapTextWithAnsi(text, Math.max(10, max));
-    for (let w = Math.ceil(visibleWidth(text) / lines.length); lines.length > 1 && w < max; w++) {
+    // Never narrower than its longest word, which would then break mid-word.
+    const longest = Math.max(0, ...text.split(/\s+/).map((word) => visibleWidth(word)));
+    for (let w = Math.max(longest, Math.ceil(visibleWidth(text) / lines.length)); lines.length > 1 && w < max; w++) {
         const even = wrapTextWithAnsi(text, w);
         if (even.length === lines.length)
             return even;
@@ -240,24 +257,33 @@ function runPage(scene, f, inner, st) {
     if (!workStarted(scene.tasks))
         return { heading: 'Understanding your app', rule: loader(inner, f.motion?.frame ?? 0, st), action: status, ...around };
     const running = scene.tasks.findIndex((t) => t.status === 'in_progress');
-    const lines = scene.tasks.map((t, i) => {
+    const rows = scene.tasks.map((t, i) => {
+        // A task back to pending after it started (Preview method while Test drive runs) keeps a started mark, never ○ (#390).
         const mark = t.status === 'completed' ? '✓'
             : t.status === 'in_progress' ? (i === running && f.motion?.at === 'task' ? glyph : '•')
                 : t.status === 'failed' ? '✗'
                     : t.status === 'skipped' ? '–'
-                        : '○';
+                        : t.started ? '•'
+                            : '○';
         const ink = t.status === 'in_progress' || t.status === 'failed' ? st.full : t.status === 'skipped' ? st.faint : st.soft;
         const row = (detail) => `${mark} ${t.title}${detail ? ` · ${detail}` : ''}`;
-        if (t.status === 'skipped' || t.status === 'failed')
-            return ink(row(t.status));
+        return { ink, row, line: t.status === 'skipped' || t.status === 'failed' ? row(t.status) : row() };
+    });
+    // The list's left edge is set by the rows without the wait's words, so it stays put while a wait comes and goes (#390).
+    const widest = Math.max(...rows.map(({ line }) => visibleWidth(line)));
+    const room = inner - Math.max(0, Math.floor((inner - Math.min(widest, inner)) / 2));
+    const lines = rows.map(({ ink, row, line }, i) => {
         if (i !== running || !scene.wait)
-            return ink(row());
+            return ink(line);
         // The task in progress says what the run waits for and the time so far, never how long it may wait, so a screen
         // waiting on a host's build is never still; the time alone where the words would push it off the row.
         const waiting = row(`waiting for ${scene.wait.host ? `${scene.wait.host}'s preview` : 'the preview'} · ${scene.wait.timer}`);
-        return ink(visibleWidth(waiting) <= inner ? waiting : row(scene.wait.timer));
+        if (visibleWidth(waiting) <= room)
+            return ink(waiting);
+        // Where even the time alone would pass the box from that edge, the title gives way, never the time.
+        const tail = ` · ${scene.wait.timer}`;
+        return ink(visibleWidth(row(scene.wait.timer)) <= room ? row(scene.wait.timer) : truncateToWidth(row(), Math.max(1, room - visibleWidth(tail)), '…') + tail);
     });
-    const widest = Math.max(...lines.map((line) => visibleWidth(line)));
     // No count over the list: the list shows each task's state itself.
     return {
         heading: 'Setting up',
@@ -323,7 +349,7 @@ function pageOf(f, inner) {
             return runPage(scene, f, inner, st);
         case 'pull':
             return {
-                heading: 'Your first review is on its way',
+                heading: scene.app ? `${scene.app}'s first review is on its way` : 'Your first review is on its way',
                 text: said(SEE_THE_REVIEW, inner, st),
                 rule: divider(inner, st),
                 action: pullAction(scene.url, scene.copied, inner, st),

package/dist/ui/run-state.js

@@ -26,6 +26,8 @@ export class RunState {
     current;
     /** A bounded wait under way: the current line carries its timer, counting up. */
     waiting;
+    /** The tasks that have been in progress, done or failed in this run. */
+    started = new Set();
     /** When something last changed on screen: a status, the task list, an answered question. */
     changedAt;
     constructor(now = Date.now, first) {
@@ -59,7 +61,11 @@ export class RunState {
         return this.waiting && { host: this.waiting.host, timer: timer(live ? this.now() - this.waiting.since : 0) };
     }
     setTasks(tasks) {
-        this.tasks = tasks.map((t) => ({ ...t }));
+        for (const t of tasks)
+            if (t.status === 'in_progress' || t.status === 'completed' || t.status === 'failed')
+                this.started.add(t.id);
+        // A task that has started never reads as not started again (#390).
+        this.tasks = tasks.map((t) => ({ ...t, ...(t.status === 'pending' && this.started.has(t.id) ? { started: true } : {}) }));
         this.touch();
     }
     /** Something happened that the person saw, so the silence starts again. */

package/dist/ui/screens.js

@@ -117,7 +117,7 @@ class Wizard {
         process.off('SIGHUP', this.onSignal);
         mountUi(null);
         for (const question of this.questions.splice(0))
-            question.resolve({ skipped: true });
+            question.resolve({ skipped: true, closed: true });
         // Leaves the alternate screen without copying the last frame out of it: the scrollback gets the outro's summary only.
         this.tui.stop({ preserveScreen: true });
         this.restoreConsole();
@@ -240,7 +240,7 @@ class Wizard {
         }
         this.stopAsked = 0;
         for (const question of this.questions.splice(0))
-            question.resolve({ skipped: true });
+            question.resolve({ skipped: true, closed: true });
         this.state.status('Stopping the setup');
         this.redraw();
         run.cancel();
@@ -342,7 +342,7 @@ class Wizard {
         if (view.kind === 'signin')
             return { kind: 'signin', link: view.link, copied: view.copied, again: view.again, note: view.pasting ? undefined : view.note, checkout: view.opts.checkout };
         if (view.kind === 'pull')
-            return { kind: 'pull', url: view.url, copied: view.copied };
+            return { kind: 'pull', url: view.url, ...(view.app ? { app: view.app } : {}), copied: view.copied };
         if (view.kind === 'outro')
             return { kind: 'outro', outro: view.outro, leaving: view.leaving, copied: view.copied };
         return { kind: 'run', tasks: this.state.tasks, band: this.state.band(!this.questions.length, live), wait: this.state.timer(live) };
@@ -486,8 +486,8 @@ async function handOver(url, hand) {
     const copied = hand.copy(url).catch(() => false);
     return (await Promise.race([copied, new Promise((r) => setTimeout(() => r(false), 1000).unref())])) === true;
 }
-/** The test drive on a screen of its own once the run has ended, before the last screen shows the setup pull request, handed over as it appears, until a key other than ↑↓ PgUp PgDn is pressed, or for 20 minutes. Without a terminal there is no such screen: the summary has it. */
-export async function showPullRequest(url, hand) {
+/** The test drive on a screen of its own once the run has ended, before the last screen shows the setup pull request, handed over as it appears, until a key other than ↑↓ PgUp PgDn is pressed, or for 20 minutes; on a repository with several apps, each app's in turn, named (impeccable-reviews#397). Without a terminal there is no such screen: the summary has it. */
+export async function showPullRequest(url, hand, app) {
     const screen = host();
     if (!screen)
         return;
@@ -499,7 +499,7 @@ export async function showPullRequest(url, hand) {
             resolve();
         };
         const timer = setTimeout(done, CLOSE_AFTER_MS).unref();
-        const view = { kind: 'pull', url, copied, copy: () => hand.copy(url), done };
+        const view = { kind: 'pull', url, ...(app ? { app } : {}), copied, copy: () => hand.copy(url), done };
         screen.views = [];
         screen.push(view);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impeccable/reviews",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "Set up a repository for Impeccable for PRs from your terminal.",
   "license": "SEE LICENSE IN LICENSE",
   "private": false,