tellegram 1.1.2 → 1.1.4

package/index.mjs

@@ -0,0 +1,5 @@
+import convert from './lib/convert.mjs';
+import paginate from './lib/paginate.mjs';
+
+export { convert, paginate };
+export default convert;

package/lib/{convert.js → convert.mjs}

@@ -4,8 +4,8 @@ import stringify from 'remark-stringify';
 import removeComments from 'remark-remove-comments';
 import unified from 'unified';
 
-import { collectDefinitions, removeDefinitions } from './definitions.js';
-import createTellegramOptions from './tellegram.js';
+import { collectDefinitions, removeDefinitions } from './definitions.mjs';
+import createTellegramOptions from './tellegram.mjs';
 
 export default (markdown, unsupportedTagsStrategy = 'escape') => {
     const definitions = {};

package/lib/{paginate.js → paginate.mjs}

@@ -1,5 +1,5 @@
 import assert from 'assert';
-import convert from './convert.js';
+import convert from './convert.mjs';
 
 const MESSAGE_LENGTH_LIMIT = parseInt(4096 * 0.93);   // ~= 3800
 const clarify = str => str.toLowerCase().split(/[^a-zA-Z0-9]+/).filter(x => x);
@@ -12,7 +12,7 @@ const trim = (str, opts) => ensureString(str, { trim: true, ...opts || {} });
 // Is
 const _is = (type, value) => value?.constructor === type;
 const _type = (any) => typeof any === 'undefined' ? 'Undefined'
-    : Object.prototype.toString.call(any).replace(/^\[[^\ ]*\ (.*)\]$/, '$1');
+    : Object.prototype.toString.call(any).replace(/^\[[^ ]* (.*)\]$/, '$1');
 [
     ArrayBuffer, BigInt, Boolean, Error, Number, Object, Set, String, Uint8Array
 ].map(type => {
@@ -66,7 +66,10 @@ const ensureString = (str, options) => {
 export default (message, options) => {
     let [pages, page, size, codeMark, concat, prefix] =
         [[], [], ~~options?.size || MESSAGE_LENGTH_LIMIT, '', '', ''];
-    const countLength = str => convert(str).length;
+    const countLength = pos => {
+        const str = prefix + lines(page) + message.substring(0, pos + 1);
+        return Math.max(str.length, convert(str).length);
+    };
     const submit = () => {
         const content = trim(lines(page));
         content && pages.push(prefix + content + concat + (codeMark ? '\n```' : ''));
@@ -83,17 +86,23 @@ export default (message, options) => {
     while ((message || '').length) {
         let nextN = message.indexOf('\n');                    // 獲得下一個換行
         nextN === -1 && (nextN = message.length);             // 剩下只有一行
-        let [cut, shouldBreak] = [nextN, false];              // 初始化當前預測裁切
-        while (countLength(lines(page) + message.substring(0, cut + 1)) > size) {
-            if (page.length) {
-                submit();
-                shouldBreak = true;
-                break;
+        let cut = nextN;                                      // 初始化當前預測裁切
+        if (countLength(cut) > size && page.length) { submit(); continue; }
+        // cut = Math.min(cut, size);
+        // while (countLength(cut) > size) { cut--; }
+        if (countLength(cut) > size) {
+            let high = Math.min(cut, size);
+            cut = 0;
+            while (cut < high) {
+                let mid = Math.ceil((cut + high) / 2);
+                if (countLength(mid) <= size) {
+                    cut = mid;
+                } else {
+                    high = mid - 1;
+                }
             }
-            cut--;
-            concat = '...';
         }
-        if (shouldBreak) { continue; }
+        concat = cut < nextN ? '...' : '';
         const line = message.substring(0, cut + 1).trimEnd();
         page.push(line);
         /^```.{0,20}$/.test(line) && (codeMark = codeMark ? '' : line);

package/lib/{tellegram.js → tellegram.mjs}

@@ -2,7 +2,7 @@ import defaultHandlers from 'mdast-util-to-markdown/lib/handle/index.js';
 import phrasing from 'mdast-util-to-markdown/lib/util/container-phrasing.js';
 import { toMarkdown as gfmTableToMarkdown } from 'mdast-util-gfm-table';
 
-import { wrap, isURL, escapeSymbols, processUnsupportedTags } from './utils.js';
+import { wrap, isURL, escapeSymbols, processUnsupportedTags } from './utils.mjs';
 
 /**
  * Creates custom `mdast-util-to-markdown` handlers that tailor the output for
@@ -136,7 +136,7 @@ const createHandlers = (definitions, unsupportedTagsStrategy) => ({
         processUnsupportedTags(defaultHandlers.html(node, _parent, context), unsupportedTagsStrategy),
     table: (node, _parent, context) =>
         processUnsupportedTags(gfmTableToMarkdown().handlers.table(node, _parent, context), unsupportedTagsStrategy),
-    thematicBreak: (_node, _parent, _context) =>
+    thematicBreak: () =>
         processUnsupportedTags('---', unsupportedTagsStrategy),
 });
 

package/lib/{utils.js → utils.mjs}

@@ -31,7 +31,7 @@ export function escapeSymbols(text, textType = 'text') {
                 .replace(/\(/g, '\\(')
                 .replace(/\)/g, '\\)')
         case 'ignore_escaped':
-            return text.replace(/(\\.)|([_*\[\]()~`>#+\-=|{}.!])/g, (match, escaped, char) => {
+            return text.replace(/(\\.)|([_*[\]()~`>#+\-=|{}.!])/g, (match, escaped, char) => {
                 if (escaped) {
                     return escaped;
                 }

package/package.json

@@ -1,12 +1,12 @@
 {
     "name": "tellegram",
-    "version": "1.1.2",
+    "version": "1.1.4",
     "description": "Convert LLM-generated markdown into Telegram-specific markdown (MarkdownV2)",
     "type": "module",
-    "main": "index.js",
+    "main": "index.mjs",
     "scripts": {
         "test": "NODE_OPTIONS='--experimental-vm-modules --no-deprecation' npx jest --coverage --verbose",
-        "lint": "eslint",
+        "lint": "eslint . --ext .js,.mjs",
         "semantic-release": "semantic-release",
         "prepare": "husky install",
         "codecov": "codecov"
@@ -14,7 +14,7 @@
     "files": [
         "README.md",
         "LICENSE",
-        "index.js",
+        "index.mjs",
         "lib",
         "types"
     ],
@@ -61,11 +61,11 @@
         "semantic-release": "^17.4.2"
     },
     "lint-staged": {
-        "*.{js,json,md}": [
+        "*.{js,mjs,json,md}": [
             "prettier --write",
             "git add"
         ],
         "*.{css,scss,less}": "stylelint --fix",
-        "*.js": "eslint --cache --fix"
+        "*.{js,mjs}": "eslint --cache --fix"
     }
 }

package/index.js

@@ -1,5 +0,0 @@
-import convert from './lib/convert.js';
-import paginate from './lib/paginate.js';
-
-export { convert, paginate };
-export default convert;