koztv-blog-tools 1.3.8 → 1.3.9

package/dist/node.js

@@ -406,108 +406,42 @@ function compressVideo(inputPath, outputPath) {
 }
 function entitiesToMarkdown(text, entities) {
   if (!entities || entities.length === 0) return text;
-  const mergedEntities = [];
-  const processedIndices = /* @__PURE__ */ new Set();
-  const links = [];
-  for (const entity of entities) {
-    if (entity instanceof import_telegram.Api.MessageEntityTextUrl) {
-      links.push({
-        start: entity.offset,
-        end: entity.offset + entity.length,
-        entity
-      });
-    }
-  }
-  const formatEntities = entities.filter(
-    (e) => e instanceof import_telegram.Api.MessageEntityBold || e instanceof import_telegram.Api.MessageEntityItalic
-  );
-  for (let i = 0; i < formatEntities.length; i++) {
-    if (processedIndices.has(entities.indexOf(formatEntities[i]))) continue;
-    const current = formatEntities[i];
-    const currentEnd = current.offset + current.length;
-    const bridgingLink = links.find((l) => l.start === currentEnd);
-    if (bridgingLink) {
-      const nextEntity = formatEntities.find(
-        (e) => e !== current && e.constructor === current.constructor && e.offset === bridgingLink.end
-      );
-      if (nextEntity) {
-        const mergedLength = nextEntity.offset + nextEntity.length - current.offset;
-        if (current instanceof import_telegram.Api.MessageEntityBold) {
-          mergedEntities.push(new import_telegram.Api.MessageEntityBold({ offset: current.offset, length: mergedLength }));
-        } else if (current instanceof import_telegram.Api.MessageEntityItalic) {
-          mergedEntities.push(new import_telegram.Api.MessageEntityItalic({ offset: current.offset, length: mergedLength }));
-        }
-        processedIndices.add(entities.indexOf(current));
-        processedIndices.add(entities.indexOf(nextEntity));
-        continue;
-      }
-    }
-    if (!processedIndices.has(entities.indexOf(current))) {
-      mergedEntities.push(current);
-      processedIndices.add(entities.indexOf(current));
-    }
-  }
-  for (let i = 0; i < entities.length; i++) {
-    if (processedIndices.has(i)) continue;
-    const entity = entities[i];
-    if (!(entity instanceof import_telegram.Api.MessageEntityBold) && !(entity instanceof import_telegram.Api.MessageEntityItalic)) {
-      mergedEntities.push(entity);
-    }
-  }
-  const sorted = [...mergedEntities].sort((a, b) => {
-    if (a.offset !== b.offset) return a.offset - b.offset;
-    return b.length - a.length;
-  });
   const markers = [];
-  for (const entity of sorted) {
-    const start = entity.offset;
-    const end = entity.offset + entity.length;
+  for (const entity of entities) {
+    let start = entity.offset;
+    let end = entity.offset + entity.length;
+    const entityText = text.substring(start, end);
+    const leadingWs = entityText.match(/^\s*/)?.[0].length || 0;
+    const trailingWs = entityText.match(/\s*$/)?.[0].length || 0;
+    if (leadingWs > 0 && leadingWs < entityText.length) start += leadingWs;
+    if (trailingWs > 0 && trailingWs < entityText.length) end -= trailingWs;
     let startMark = "";
     let endMark = "";
-    let priority = 0;
     if (entity instanceof import_telegram.Api.MessageEntityBold) {
       startMark = "**";
       endMark = "**";
-      priority = 1;
-    } else if (entity instanceof import_telegram.Api.MessageEntityItalic) {
-      startMark = "*";
-      endMark = "*";
-      priority = 1;
     } else if (entity instanceof import_telegram.Api.MessageEntityCode) {
       startMark = "`";
       endMark = "`";
-      priority = 2;
     } else if (entity instanceof import_telegram.Api.MessageEntityPre) {
       startMark = "```\n";
       endMark = "\n```";
-      priority = 2;
     } else if (entity instanceof import_telegram.Api.MessageEntityStrike) {
       startMark = "~~";
       endMark = "~~";
-      priority = 1;
-    } else if (entity instanceof import_telegram.Api.MessageEntityUnderline) {
-      startMark = "**";
-      endMark = "**";
-      priority = 1;
     } else if (entity instanceof import_telegram.Api.MessageEntityTextUrl) {
       startMark = "[";
       endMark = `](${entity.url})`;
-      priority = 10;
     }
     if (startMark) {
-      markers.push({ pos: start, insert: startMark, priority });
-      markers.push({ pos: end, insert: endMark, priority: -priority });
+      markers.push({ pos: start, insert: startMark, isEnd: false });
+      markers.push({ pos: end, insert: endMark, isEnd: true });
     }
   }
   markers.sort((a, b) => {
     if (a.pos !== b.pos) return a.pos - b.pos;
-    if (a.priority < 0 && b.priority < 0) {
-      return a.priority - b.priority;
-    }
-    if (a.priority > 0 && b.priority > 0) {
-      return b.priority - a.priority;
-    }
-    return a.priority - b.priority;
+    if (a.isEnd !== b.isEnd) return a.isEnd ? -1 : 1;
+    return 0;
   });
   let result = "";
   let lastPos = 0;
@@ -516,7 +450,7 @@ function entitiesToMarkdown(text, entities) {
     lastPos = marker.pos;
   }
   result += text.substring(lastPos);
-  result = result.replace(/(\S) \*\*/g, "$1** ").replace(/\*\* (\S)/g, " **$1").replace(/(\S) \*/g, "$1* ").replace(/\* (\S)/g, " *$1").replace(/\*{4,}/g, "").replace(/\*{3}/g, "**").replace(/\*\*\s*\n\s*\*\*/g, "\n").replace(/^\*\*\s*$/gm, "").replace(/\n{3,}/g, "\n\n");
+  result = result.replace(/\*\*\s*\*\*/g, " ").replace(/\*{4,}/g, "").replace(/\*{3}/g, "").replace(/\n{3,}/g, "\n\n");
   return result;
 }
 async function defaultReadline(prompt) {

package/dist/node.mjs

@@ -52,108 +52,42 @@ function compressVideo(inputPath, outputPath) {
 }
 function entitiesToMarkdown(text, entities) {
   if (!entities || entities.length === 0) return text;
-  const mergedEntities = [];
-  const processedIndices = /* @__PURE__ */ new Set();
-  const links = [];
-  for (const entity of entities) {
-    if (entity instanceof Api.MessageEntityTextUrl) {
-      links.push({
-        start: entity.offset,
-        end: entity.offset + entity.length,
-        entity
-      });
-    }
-  }
-  const formatEntities = entities.filter(
-    (e) => e instanceof Api.MessageEntityBold || e instanceof Api.MessageEntityItalic
-  );
-  for (let i = 0; i < formatEntities.length; i++) {
-    if (processedIndices.has(entities.indexOf(formatEntities[i]))) continue;
-    const current = formatEntities[i];
-    const currentEnd = current.offset + current.length;
-    const bridgingLink = links.find((l) => l.start === currentEnd);
-    if (bridgingLink) {
-      const nextEntity = formatEntities.find(
-        (e) => e !== current && e.constructor === current.constructor && e.offset === bridgingLink.end
-      );
-      if (nextEntity) {
-        const mergedLength = nextEntity.offset + nextEntity.length - current.offset;
-        if (current instanceof Api.MessageEntityBold) {
-          mergedEntities.push(new Api.MessageEntityBold({ offset: current.offset, length: mergedLength }));
-        } else if (current instanceof Api.MessageEntityItalic) {
-          mergedEntities.push(new Api.MessageEntityItalic({ offset: current.offset, length: mergedLength }));
-        }
-        processedIndices.add(entities.indexOf(current));
-        processedIndices.add(entities.indexOf(nextEntity));
-        continue;
-      }
-    }
-    if (!processedIndices.has(entities.indexOf(current))) {
-      mergedEntities.push(current);
-      processedIndices.add(entities.indexOf(current));
-    }
-  }
-  for (let i = 0; i < entities.length; i++) {
-    if (processedIndices.has(i)) continue;
-    const entity = entities[i];
-    if (!(entity instanceof Api.MessageEntityBold) && !(entity instanceof Api.MessageEntityItalic)) {
-      mergedEntities.push(entity);
-    }
-  }
-  const sorted = [...mergedEntities].sort((a, b) => {
-    if (a.offset !== b.offset) return a.offset - b.offset;
-    return b.length - a.length;
-  });
   const markers = [];
-  for (const entity of sorted) {
-    const start = entity.offset;
-    const end = entity.offset + entity.length;
+  for (const entity of entities) {
+    let start = entity.offset;
+    let end = entity.offset + entity.length;
+    const entityText = text.substring(start, end);
+    const leadingWs = entityText.match(/^\s*/)?.[0].length || 0;
+    const trailingWs = entityText.match(/\s*$/)?.[0].length || 0;
+    if (leadingWs > 0 && leadingWs < entityText.length) start += leadingWs;
+    if (trailingWs > 0 && trailingWs < entityText.length) end -= trailingWs;
     let startMark = "";
     let endMark = "";
-    let priority = 0;
     if (entity instanceof Api.MessageEntityBold) {
       startMark = "**";
       endMark = "**";
-      priority = 1;
-    } else if (entity instanceof Api.MessageEntityItalic) {
-      startMark = "*";
-      endMark = "*";
-      priority = 1;
     } else if (entity instanceof Api.MessageEntityCode) {
       startMark = "`";
       endMark = "`";
-      priority = 2;
     } else if (entity instanceof Api.MessageEntityPre) {
       startMark = "```\n";
       endMark = "\n```";
-      priority = 2;
     } else if (entity instanceof Api.MessageEntityStrike) {
       startMark = "~~";
       endMark = "~~";
-      priority = 1;
-    } else if (entity instanceof Api.MessageEntityUnderline) {
-      startMark = "**";
-      endMark = "**";
-      priority = 1;
     } else if (entity instanceof Api.MessageEntityTextUrl) {
       startMark = "[";
       endMark = `](${entity.url})`;
-      priority = 10;
     }
     if (startMark) {
-      markers.push({ pos: start, insert: startMark, priority });
-      markers.push({ pos: end, insert: endMark, priority: -priority });
+      markers.push({ pos: start, insert: startMark, isEnd: false });
+      markers.push({ pos: end, insert: endMark, isEnd: true });
     }
   }
   markers.sort((a, b) => {
     if (a.pos !== b.pos) return a.pos - b.pos;
-    if (a.priority < 0 && b.priority < 0) {
-      return a.priority - b.priority;
-    }
-    if (a.priority > 0 && b.priority > 0) {
-      return b.priority - a.priority;
-    }
-    return a.priority - b.priority;
+    if (a.isEnd !== b.isEnd) return a.isEnd ? -1 : 1;
+    return 0;
   });
   let result = "";
   let lastPos = 0;
@@ -162,7 +96,7 @@ function entitiesToMarkdown(text, entities) {
     lastPos = marker.pos;
   }
   result += text.substring(lastPos);
-  result = result.replace(/(\S) \*\*/g, "$1** ").replace(/\*\* (\S)/g, " **$1").replace(/(\S) \*/g, "$1* ").replace(/\* (\S)/g, " *$1").replace(/\*{4,}/g, "").replace(/\*{3}/g, "**").replace(/\*\*\s*\n\s*\*\*/g, "\n").replace(/^\*\*\s*$/gm, "").replace(/\n{3,}/g, "\n\n");
+  result = result.replace(/\*\*\s*\*\*/g, " ").replace(/\*{4,}/g, "").replace(/\*{3}/g, "").replace(/\n{3,}/g, "\n\n");
   return result;
 }
 async function defaultReadline(prompt) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koztv-blog-tools",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "Shared utilities for Telegram-based blog sites",
   "main": "dist/index.js",
   "module": "dist/index.mjs",