@mikitasazan/notify 1.15.1 → 1.15.2

package/dist/render.js

@@ -350,12 +350,28 @@ export const markdownToTelegram = (text) => {
                 .filter((c) => c !== '')
                 .join(' · ');
         }
+        // Each replace used to run over the OUTPUT of the previous one, so a tag
+        // this function had just written was still visible to the next pattern.
+        // Two shapes came out illegal for Telegram, and Telegram answers 4xx to
+        // both — the package does not retry a 4xx, so the whole card is lost:
+        //   `[![alt](img)](url)` — the README badge — became `<a><a>…</a></a>`,
+        //   `` `a **b** c` ``   became `<code>a <b>b</b> c</code>`.
+        // A produced tag is therefore parked in `spans` behind a sentinel that no
+        // pattern below can match, and put back only after the last replace.
+        // `plain` unwraps a parked span to its text, which is how a link label
+        // that already holds a link (or code) is flattened instead of nested.
+        const spans = [];
+        const park = (html) => `\u0000${spans.push(html) - 1}\u0000`;
+        const plain = (s) => s.replace(/\u0000(\d+)\u0000/g, (_, i) => spans[Number(i)].replace(/<[^>]+>/g, ''));
+        const bold = (s) => s.replace(/\*\*([^*\n]+)\*\*/g, '<b>$1</b>');
         row = row
-            .replace(/!\[([^\]]*)\]\((https?:\/\/[^\s)]+)\)/g, (_, alt, url) => `<a href="${url}">${alt.trim() || 'image'}</a>`)
-            .replace(/\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/g, '<a href="$2">$1</a>')
-            .replace(/\[([^\]]+)\]\([^)]*\)/g, '$1')
+            // Code first: nothing inside a `code` span may become a tag.
+            .replace(/`([^`\n]+)`/g, (_, code) => park(`<code>${code}</code>`))
+            .replace(/!\[([^\]]*)\]\((https?:\/\/[^\s)]+)\)/g, (_, alt, url) => park(`<a href="${url}">${plain(alt).trim() || 'image'}</a>`))
+            .replace(/\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/g, (_, label, url) => park(`<a href="${url}">${bold(plain(label)).trim() || 'link'}</a>`))
+            .replace(/\[([^\]]+)\]\([^)]*\)/g, (_, label) => plain(label))
             .replace(/\*\*([^*\n]+)\*\*/g, '<b>$1</b>')
-            .replace(/`([^`\n]+)`/g, '<code>$1</code>');
+            .replace(/\u0000(\d+)\u0000/g, (_, i) => spans[Number(i)]);
         out.push(row);
     }
     if (fence) {
@@ -374,12 +390,20 @@ export const markdownToTelegram = (text) => {
  */
 const firstSection = (text) => {
     const lines = text.replace(/<!--[\s\S]*?-->/g, '').split('\n');
-    let headings = 0;
+    // The cut is made at the next heading of the FIRST heading's level, not at
+    // any heading at all. `#{1,6}` treated a `###` subsection inside the first
+    // section as the second heading, so everything after it was silently
+    // dropped from a merged PR or a closed issue — the body the card exists to
+    // carry. A deeper heading belongs to the section it sits in and is kept.
+    let level = 0;
     const kept = [];
     for (const line of lines) {
-        if (/^\s*#{1,6}\s+/.test(line)) {
-            headings += 1;
-            if (headings === 2) {
+        const m = line.match(/^\s*(#{1,6})\s+/);
+        if (m) {
+            if (level === 0) {
+                level = m[1].length;
+            }
+            else if (m[1].length <= level) {
                 break;
             }
         }
@@ -593,7 +617,7 @@ const twoBlocks = (run, change) => {
 // the action text becomes the link: `Report: <a>Analytics for 12.08</a>`.
 // `aside` is the one qualifier an identifier needs to be readable on its own —
 // which day a report covers, which day its arrows are measured against. It
-// rides in brackets ON the type line instead of taking a row of its own,
+// rides in brackets on the TYPE WORD instead of taking a row of its own,
 // because a row of its own reads as another fact about the subject rather than
 // as part of the name.
 const typeLine = (icon, type, action, url, aside) => {
@@ -601,7 +625,13 @@ const typeLine = (icon, type, action, url, aside) => {
     // template prints the word "null". That is how line 2 of a card became
     // `ℹ️ null` — reachable through `--json` and through a direct call from JS,
     // where there are no types.
-    const tail = aside ? ` (${esc(aside)})` : '';
+    // The qualifier sits ON the type word, before the colon — `Deploy (OK):`,
+    // `Report (20.08):` — never after the name. After the name it read as a
+    // remark about the title («Deploy to Beget (OK)») rather than about the
+    // event, and the owner asked on 03.09.2026 why the outcome trailed the
+    // title at all. `field`/`fieldLink` escape the label, so the raw aside is
+    // safe to fold into it.
+    const label = aside ? `${cap(type)} (${aside})` : type;
     const name = action?.trim();
     // No name: the card must not invent one. It used to write the word `open`
     // into the identifier slot, so a report with a link and no title arrived as
@@ -611,11 +641,11 @@ const typeLine = (icon, type, action, url, aside) => {
     // something else instead. The type word itself takes the link, so nothing
     // clickable is lost and nothing false is said.
     if (!name) {
-        const bare = `<b>${esc(cap(type))}</b>`;
-        return `${icon} ${url ? `<a href="${esc(url)}">${bare}</a>` : bare}${tail}`;
+        const bare = `<b>${esc(cap(label))}</b>`;
+        return `${icon} ${url ? `<a href="${esc(url)}">${bare}</a>` : bare}`;
     }
-    const line = url ? fieldLink(type, url, name) : field(type, name);
-    return line === null ? `${icon} <b>${esc(cap(type))}</b>${tail}` : `${icon} ${line}${tail}`;
+    const line = url ? fieldLink(label, url, name) : field(label, name);
+    return line === null ? `${icon} <b>${esc(cap(label))}</b>` : `${icon} ${line}`;
 };
 // `workflowUrl ?? url`: half the senders send the run link under the name
 // `--url` — that name was in the package before and stayed in their calls.

package/package.json

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