@mikitasazan/notify 1.12.1 → 1.14.0

package/dist/render.js

@@ -252,13 +252,18 @@ const groupItem = (it, index, numbered) => {
 // part of the heading. Longer than ~400 characters and the quote collapses
 // on its own (`expandable`, Bot API), otherwise a stack trace or a log dump
 // stretches the card across the whole screen.
+// A quote collapses when it would take more than a screenful — by length OR
+// by line count, because five short lines eat as much screen as one long
+// paragraph and the old length-only rule let them through (v2.1).
 const EXPAND_AT = 400;
+const EXPAND_LINES = 5;
 const note = (text) => {
     if (!text) {
         return null;
     }
     const body = esc(text);
-    return body.length > EXPAND_AT ? `<blockquote expandable>${body}</blockquote>` : `<blockquote>${body}</blockquote>`;
+    const long = body.length > EXPAND_AT || body.split('\n').length > EXPAND_LINES;
+    return long ? `<blockquote expandable>${body}</blockquote>` : `<blockquote>${body}</blockquote>`;
 };
 /**
  * A quote with a caption. A bare quote reads as a continuation of the
@@ -349,12 +354,17 @@ const renderGroup = (g) => [
  * was the same row the issue card had already lost for the same reason: you
  * could not read what the card was about without reading two lines.
  */
-const commitRow = (hash, url, title) => {
-    const linked = fieldLink('Commit', url, hash);
-    if (linked === null || !title) {
-        return linked ?? field('Commit', title);
-    }
-    return `${linked} ${esc(firstLine(title))}`;
+const commitRow = (hash, title) => {
+    // The title is the content — what the commit DID — so it is what the row
+    // says. The hash is a pointer, and pointers live in the last block with
+    // `Log`, `Check` and `Source`; the owner caught the hash still carrying the
+    // link from the middle of the card (31.08.2026): "source, это hash", and on
+    // a manual deploy that buried link was the card's ONLY way back to its
+    // source while the pointer block sat empty.
+    //
+    // With no title there is nothing to say but the hash, so it stands here as
+    // plain text — the link to it is in the pointer block either way.
+    return field('Commit', title ? firstLine(title) : hash);
 };
 const bodyQuote = (body) => body ? note(body) : null;
 /**
@@ -512,7 +522,7 @@ const renderDeploy = (e) => {
         // The run URL is gone from this line too — it is the `Source:` row now.
         typeLine(icon, 'Deploy', mechanism(e.workflowName, e.via), undefined, e.status === 'fail' ? 'Fail' : 'OK'),
         ...twoBlocks([field('Target', e.target), reason('Reason', e.note), field('Still red', e.stillRed ? `day ${e.stillRed}` : null)], [
-            commitRow(e.commit, e.commitUrl, e.commitTitle),
+            commitRow(e.commit, e.commitTitle),
             fieldPerson('Author', e.commitAuthor),
             bodyQuote(e.commitBody)
         ])
@@ -609,7 +619,7 @@ const renderCi = (e) => {
         // on a nightly card, the same person everywhere else.
         ...twoBlocks([reason('Reason', e.note), field('Still red', e.stillRed ? `day ${e.stillRed}` : null)], [
             fieldTelegram('Actor', e.actor),
-            commitRow(e.commit, e.commitUrl, e.commitTitle),
+            commitRow(e.commit, e.commitTitle),
             fieldPerson('Author', e.commitAuthor),
             bodyQuote(e.commitBody)
         ])
@@ -621,7 +631,26 @@ const renderCi = (e) => {
 // the thing the card is about could not be read without reading three lines.
 // The action is not repeated in words: the icon carries it, and no two actions
 // of one type share an icon.
-const named = (number, title) => title ? `#${number} ${title}` : `#${number}`;
+// The number left line 2 on 31.08.2026, by the same rule that moved the commit
+// hash the same day: `#347` is a pointer, and every pointer lives in the last
+// block. Line 2 keeps the title, which is what the thing IS; the number comes
+// back as the text of the `Source` link, where it names exactly what opens.
+//
+// With no title there is nothing left to say, so line 2 falls back to the bare
+// type word — `typeLine` already does that on an empty name. The number is not
+// put back here: it would then appear twice on a titled card and once on an
+// untitled one, which is the inconsistency this move exists to remove.
+//
+// With NO url the number stays put, because then the `Source` row does not
+// exist and dropping it here would erase the number from everything a person
+// reads — the card would name a task without saying which. Same law as
+// `fieldLink`: an identifier must not vanish just because the caller passed no
+// address for it.
+const named = (number, title, url) => {
+    if (!title)
+        return url ? '' : `#${number}`;
+    return url ? title : `#${number} ${title}`;
+};
 // The people come BEFORE the text, and the text comes only when it is the
 // news. An `assigned` card carries one new fact — who took it — and it used to
 // sit dead last, under the issue's entire description: the owner read a card
@@ -636,32 +665,35 @@ const named = (number, title) => title ? `#${number} ${title}` : `#${number}`;
 // REVIEWER'S OWN comment there, which is new text he has not seen. "Verdict:
 // changes_requested, then nothing" was the owner's complaint: a verdict with
 // no comment attached said less than the review itself did.
+// Same rule as the issue card since 31.08.2026: the body prints on every
+// action, collapsed when long. `VERDICT` stays because it changes what the
+// body MEANS — on approved/changes_requested the sender puts the reviewer's
+// own comment there, not the PR description — and that is what the caption
+// has to say.
 const VERDICT = new Set(['approved', 'changes_requested']);
-const opening = (action, body) => action === 'opened' || VERDICT.has(action) ? bodyQuote(body) : null;
+const prBody = (action, body) => VERDICT.has(action) ? quoted('Review', body) : bodyQuote(body);
 // The body is what the title stands for — it sits directly under the name,
 // with nothing between them. The people come after, consolidated in one
 // place, never splitting the title from what it names: the owner on the
 // old order, title then Author then Assignee then finally the body — "why
 // does the assignee cut apart what should be inseparable?"
 const renderPr = (e) => join([
-    typeLine(iconFor(e), 'PR', named(e.number, e.title)),
-    opening(e.action, e.body),
-    (e.action === 'opened' || VERDICT.has(e.action)) && e.body ? '' : null,
+    typeLine(iconFor(e), 'PR', named(e.number, e.title, e.url)),
+    prBody(e.action, e.body),
+    e.body ? '' : null,
     fieldPerson('Author', e.author),
     fieldPerson('Reviewer', e.reviewer)
 ]);
-// The issue's body prints ONLY on `opened` — the same law the PR card
-// follows. History of this line: hidden → shown everywhere (the owner's call
-// of 26.08.2026, "inconsistent with the same card showing it moments
-// earlier") → hidden again on 31.08.2026, when the owner, shown the live
-// duplicate ("the full body arrives a second time in one day"), delegated
-// the call ("сделай как лучше по оптимизации и простоте") and approved the
-// short assigned card in the v2.1 mockups. On assigned/closed the card is
-// the one new fact plus the `Source:` link to the full text.
+// The body prints on EVERY action, as a quote that collapses when it is
+// long. The owner settled this on 31.08.2026, after the short assigned card
+// shipped: "если это ишью, то видеть тело ишью… везде, где это может быть
+// полезно, не переходя по ссылке на источник." A collapsed quote costs four
+// lines, which is what the earlier "he already saw it" reasoning was trying
+// to save — the expandable quote buys the context back without the cost.
 const renderIssue = (e) => join([
-    typeLine(iconFor(e), 'Issue', named(e.number, e.title)),
-    e.action === 'opened' ? bodyQuote(e.body) : null,
-    e.action === 'opened' && e.body ? '' : null,
+    typeLine(iconFor(e), 'Issue', named(e.number, e.title, e.url)),
+    bodyQuote(e.body),
+    e.body ? '' : null,
     fieldPerson('Author', e.author),
     fieldPerson('Assignee', e.assignee)
 ]);
@@ -847,13 +879,44 @@ const sourceUrl = (e) => {
     const url = 'url' in e ? e.url : undefined;
     return wf ?? url;
 };
+const link = (url, text) => `<a href="${esc(firstLine(url))}">${esc(text)}</a>`;
+/**
+ * Everything the card can be traced back to, as one `Source:` row.
+ *
+ * A card can have more than one honest source — a deploy through Actions has
+ * both a run and the commit that triggered it — and one label with two links
+ * beside each other reads better than two rows both called `Source`. They are
+ * ordered widest first: the run contains the commit, not the other way round.
+ */
+const sourceLinks = (e) => {
+    const out = [];
+    const run = sourceUrl(e);
+    const commitUrl = 'commitUrl' in e ? e.commitUrl : undefined;
+    const commit = 'commit' in e ? e.commit : undefined;
+    // A pull request and an issue are named by their number and by NOTHING else.
+    // `pull request #118` says the type a second time — line 2 already opens with
+    // `PR:` — and the owner cut it the hour it shipped: "сверху написано PR,
+    // зачем здесь ещё писать PR? Здесь можно просто номер и всё."
+    //
+    // Only these two types have a number, and only for them is the type word
+    // redundant: `workflow run` and `commit 9b1fc68` name things line 2 does NOT,
+    // so they keep their nouns.
+    const numbered = 'number' in e && typeof e.number === 'number' ? `#${e.number}` : null;
+    if (run)
+        out.push(link(run, numbered ?? SOURCE_NAME[e.type] ?? 'source'));
+    // Without a hash there is no text to put on the link but the word itself,
+    // and `commit` alone next to `workflow run` says nothing a reader can use.
+    if (commitUrl && commit)
+        out.push(link(commitUrl, `commit ${firstLine(commit)}`));
+    return out;
+};
 const pointerBlock = (e) => {
-    const url = sourceUrl(e);
+    const sources = sourceLinks(e);
     const logs = 'logs' in e ? e.logs : undefined;
     const rows = [
         fieldCode('Log', logs),
         fieldCode('Check', e.check),
-        url ? `<b>Source:</b> <a href="${esc(url)}">${esc(SOURCE_NAME[e.type] ?? 'source')}</a>` : null
+        sources.length > 0 ? `<b>Source:</b> ${sources.join(' · ')}` : null
     ].filter((r) => r !== null);
     return rows.length > 0 ? `\n\n${rows.join('\n')}` : '';
 };
@@ -868,8 +931,23 @@ const cutMarker = (e) => {
     if (e.path) {
         return '⋯ cut, full text attached';
     }
+    // A bare `⋯ cut` announces a loss and then says nothing about it. The owner
+    // met one on a live PR card (31.08.2026) — a description long enough to be
+    // clamped — and asked what the three dots even referred to. The card had a
+    // `Source` link the whole time: the rest was one tap away and the marker
+    // never said so.
+    //
+    // So the marker NAMES the row that holds the rest, and never repeats its
+    // value: it used to print the log path in full, and the pointer block then
+    // printed the same path again on the very next line.
+    //
+    // `below` is literal, not a figure of speech: the marker closes the clamped
+    // body and the pointer block is appended after it.
     const logs = 'logs' in e ? e.logs : undefined;
-    return logs ? `⋯ cut, full: <code>${esc(logs)}</code>` : '⋯ cut';
+    if (logs) {
+        return '⋯ cut, full text at Log below';
+    }
+    return sourceLinks(e).length > 0 ? '⋯ cut, full text at Source below' : '⋯ cut';
 };
 /**
  * Renders an event into finished HTML text, cut to Telegram's limit.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikitasazan/notify",
-  "version": "1.12.1",
+  "version": "1.14.0",
   "description": "Единая типизированная отправка Telegram-уведомлений (форум-темы, маршрутизация, ретраи) для всех проектов",
   "type": "module",
   "license": "MIT",