@capybara-hq/plugin-telegram 0.1.0-rc.4 → 0.1.0-rc.6

package/.capybara-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "name": "telegram",
-  "version": "0.1.0-rc.4",
+  "version": "0.1.0-rc.6",
   "publisher": "Capybara",
   "description": {
     "en": "Telegram (channel@1 bot over the Bot API: long polling or webhook, inline keyboard cards)",
@@ -17,7 +17,7 @@
     "entry": "./dist/index.mjs",
     "manifest": {
       "name": "telegram",
-      "version": "0.1.0-rc.4",
+      "version": "0.1.0-rc.6",
       "sdk": "^0.1.0-rc.4",
       "provides": [
         "channel@1"

package/dist/index.mjs

@@ -265,6 +265,102 @@ import {
   renderCardAsText
 } from "@capybara-hq/plugin-sdk";
 
+// src/tables.ts
+var FENCE_OPEN = /^\s*(?:```|~~~)/;
+var FENCE_CLOSE = /^\s*(```|~~~)\s*$/;
+var DELIM_CELL = /^:?-+:?$/;
+function splitRow(line) {
+  let s = line.trim();
+  if (!/(^|[^\\])\|/.test(s)) return void 0;
+  if (s.startsWith("|")) s = s.slice(1);
+  if (s.endsWith("|") && !s.endsWith("\\|")) s = s.slice(0, -1);
+  const cells = [];
+  let cur = "";
+  for (let i = 0; i < s.length; i++) {
+    const c = s[i];
+    if (c === "\\" && s[i + 1] === "|") {
+      cur += "|";
+      i++;
+    } else if (c === "|") {
+      cells.push(cur.trim());
+      cur = "";
+    } else cur += c;
+  }
+  cells.push(cur.trim());
+  return cells;
+}
+var candidate = (line) => !/^\s{4,}/.test(line) && !/^\s*>/.test(line);
+function delimiterRow(line, width) {
+  if (line === void 0 || !candidate(line)) return false;
+  const cells = splitRow(line);
+  return cells !== void 0 && cells.length === width && cells.every((c) => DELIM_CELL.test(c));
+}
+var fit = (cells, width) => Array.from({ length: width }, (_, i) => cells[i] ?? "");
+function segmentTables(md) {
+  const lines = md.replace(/\r\n?/g, "\n").split("\n");
+  const out = [];
+  let text = [];
+  const flushText = () => {
+    if (text.length > 0) out.push({ kind: "text", lines: text });
+    text = [];
+  };
+  let inFence = false;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    if (inFence ? FENCE_CLOSE.test(line) : FENCE_OPEN.test(line)) {
+      inFence = !inFence;
+      text.push(line);
+      continue;
+    }
+    const header = !inFence && candidate(line) ? splitRow(line) : void 0;
+    if (!header || !delimiterRow(lines[i + 1], header.length)) {
+      text.push(line);
+      continue;
+    }
+    const rows = [];
+    let j = i + 2;
+    for (; j < lines.length; j++) {
+      const l = lines[j];
+      if (l.trim() === "" || FENCE_OPEN.test(l) || !candidate(l)) break;
+      const cells = splitRow(l);
+      if (!cells) break;
+      rows.push(fit(cells, header.length));
+    }
+    flushText();
+    out.push({ kind: "table", table: { header, rows } });
+    i = j - 1;
+  }
+  flushText();
+  return out;
+}
+var BR = /<br\s*\/?>/gi;
+var CJK_END = /[⺀-鿿가-힯豈-﫿＀-￯]$/u;
+var INDENT = "   ";
+var pair = (h, v) => h === "" ? v : `${h}${CJK_END.test(h) ? "：" : ": "}${v}`;
+var lead = (cell) => /`|\*\*|__/.test(cell) ? cell : `**${cell}**`;
+function tableToListMarkdown(t) {
+  const clean = (s) => s.replace(BR, " / ").trim();
+  const header = t.header.map(clean);
+  if (t.rows.length === 0) return [header.filter((h) => h !== "").join(" · ")];
+  const out = [];
+  for (const raw of t.rows) {
+    const [first = "", ...rest] = raw.map(clean);
+    const head = first === "" ? "" : lead(first);
+    const items = rest.flatMap((v, i) => v === "" ? [] : [pair(header[i + 1] ?? "", v)]);
+    if (head === "" && items.length === 0) continue;
+    if (header.length === 2) {
+      out.push(`- ${[head, rest[0] ?? ""].filter((s) => s !== "").join(" — ")}`);
+      continue;
+    }
+    out.push(`- ${head === "" ? items.shift() ?? "" : head}`);
+    for (const it of items) out.push(`${INDENT}${it}`);
+  }
+  return out;
+}
+function tablesToLists(md) {
+  return segmentTables(md).flatMap((s) => s.kind === "text" ? s.lines : tableToListMarkdown(s.table)).join("\n");
+}
+
 // src/html.ts
 var TEXT_LIMIT = 4096;
 function escapeHtml(s) {
@@ -347,7 +443,7 @@ function codeBlock(lang, lines) {
   return l === "" ? `<pre>${body}</pre>` : `<pre><code class="language-${l}">${body}</code></pre>`;
 }
 function markdownToTelegramHtml(md) {
-  const lines = md.replace(/\r\n?/g, "\n").replaceAll("\0", "").split("\n");
+  const lines = tablesToLists(md.replace(/\r\n?/g, "\n").replaceAll("\0", "")).split("\n");
   const out = [];
   let fence;
   let quote;
@@ -410,12 +506,12 @@ function truncateHtml(html, limit = TEXT_LIMIT) {
   const closing = /(?:<\/[a-z-]+>)*$/.exec(head)?.[0] ?? "";
   return `${head.slice(0, head.length - closing.length)}…${closing}`;
 }
-function fitHtml(lead, body, limit = TEXT_LIMIT) {
+function fitHtml(lead2, body, limit = TEXT_LIMIT) {
   const sep = "\n\n";
-  if (lead === "") return truncateHtml(body, limit);
-  if (body === "") return truncateHtml(lead, limit);
+  if (lead2 === "") return truncateHtml(body, limit);
+  if (body === "") return truncateHtml(lead2, limit);
   const room = limit - visibleLength(body) - sep.length;
-  if (room >= 2) return `${truncateHtml(lead, room)}${sep}${body}`;
+  if (room >= 2) return `${truncateHtml(lead2, room)}${sep}${body}`;
   return truncateHtml(body, limit);
 }
 function splitHtml(html, limit = TEXT_LIMIT) {
@@ -426,6 +522,7 @@ function splitHtml(html, limit = TEXT_LIMIT) {
   let stack = [];
   let prefix = "";
   let cand;
+  let nl;
   const emit = (toks, count, at) => {
     if (count > 0) parts.push(prefix + toks.map((t) => t.text).join("") + closers(at));
   };
@@ -439,6 +536,7 @@ function splitHtml(html, limit = TEXT_LIMIT) {
       continue;
     }
     if (vis + t.len > limit) {
+      if (nl && nl.vis >= limit / 2) cand = nl;
       if (cand && cand.vis >= limit / 2) {
         emit(cur.slice(0, cand.i), cand.vis, cand.stack);
         const rest = cur.slice(cand.i + 1);
@@ -452,8 +550,10 @@ function splitHtml(html, limit = TEXT_LIMIT) {
         cur = [];
       }
       cand = void 0;
+      nl = void 0;
     }
     if (/^\s$/.test(t.text)) cand = { i: cur.length, vis, stack: [...stack] };
+    if (t.text === "\n") nl = cand;
     cur.push(t);
     vis += t.len;
   }
@@ -499,10 +599,12 @@ var urlButton = (text, url) => isHttp(url) ? [{ text, url }] : [];
 function cardText(card, locale) {
   const url = card.kind === "connect" || card.kind === "bind" ? card.url : card.webUrl;
   const lines = renderCardAsText(card, locale).split("\n");
-  const last = lines[lines.length - 1];
-  if (lines.length > 1 && last?.endsWith(url)) {
-    lines.pop();
-    const label = markdownToTelegramHtml(last.slice(0, last.length - url.length));
+  let at = lines.length - 1;
+  if (card.kind === "question" && card.state === "pending" && card.textReply !== void 0) at--;
+  const line = lines[at];
+  if (at > 0 && line?.endsWith(url)) {
+    lines.splice(at, 1);
+    const label = markdownToTelegramHtml(line.slice(0, line.length - url.length));
     return { body: markdownToTelegramHtml(lines.join("\n")), linkLine: `${label}${htmlLink(url)}` };
   }
   return { body: markdownToTelegramHtml(lines.join("\n")) };
@@ -549,7 +651,9 @@ async function keyboard(card, locale, tokens) {
     case "question": {
       const f = card.form.fields[0];
       const rows = [];
-      if (card.state === "pending" && f && !f.multiSelect && questionRenderableInline(card.form) && "enum" in f.schema) {
+      if (card.state === "pending" && f && !f.multiSelect && // With textReply the Other path is a plain reply: a field with allowOther still gets its
+      // option buttons, never an Other button.
+      questionRenderableInline(card.form, { textReply: card.textReply !== void 0 }) && "enum" in f.schema) {
         for (const option of f.schema.enum) {
           rows.push(
             await callbackButton(tokens, option, {
@@ -1045,14 +1149,14 @@ function createTelegramChannel(o) {
       return text === "" ? [] : splitHtml(markdownToTelegramHtml(message.text)).map((html) => ({ html }));
     }
     const dup = cards.some((c) => cardHeadline(c, locale)?.trim() === text);
-    const lead = text === "" || dup ? "" : markdownToTelegramHtml(message.text);
-    const fit = (p, leading) => ({
+    const lead2 = text === "" || dup ? "" : markdownToTelegramHtml(message.text);
+    const fit2 = (p, leading) => ({
       ...p,
       html: fitHtml(leading, p.html),
-      ...p.withoutUrlButtons && { withoutUrlButtons: fit(p.withoutUrlButtons, leading) }
+      ...p.withoutUrlButtons && { withoutUrlButtons: fit2(p.withoutUrlButtons, leading) }
     });
     const posts = await renderCards(cards, locale, cardTokenStore(o.kv, botId), o.log);
-    return posts.map((p, i) => fit(p, i === 0 ? lead : ""));
+    return posts.map((p, i) => fit2(p, i === 0 ? lead2 : ""));
   }
   async function withUrlButtonFallback(post, attempt) {
     try {
@@ -1242,7 +1346,7 @@ function createTelegramChannel(o) {
 // src/index.ts
 var index_default = defineExtension({
   name: "telegram",
-  version: "0.1.0-rc.4",
+  version: "0.1.0-rc.6",
   sdk: "^0.1.0-rc.4",
   provides: [CHANNEL_EXTENSION_POINT],
   permissions: { network: ["api.telegram.org"] },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capybara-hq/plugin-telegram",
-  "version": "0.1.0-rc.4",
+  "version": "0.1.0-rc.6",
   "type": "module",
   "license": "Apache-2.0",
   "description": "Telegram (channel@1 bot over the Bot API: long polling or webhook, inline keyboard cards)",