ikemoji 1.0.2 → 1.0.3

package/index.js

@@ -1,99 +1,155 @@
 /**
  * Telegram Bot API 9.4 – Custom Emoji Helper
- * Author: ikjava
+ * Author: ikjava (fixed version)
  * ✔ UTF-16 correct
  * ✔ ZWJ / skin tone safe
- * ✔ length = 1
  * ✔ Handles multiple consecutive emojis and variation selectors
  * ✔ Telegraf compatible
+ * ✔ Properly handles spaces and all text
  */
 
 const segmenter = new Intl.Segmenter('en', { granularity: 'grapheme' });
 
+/**
+ * Get UTF-16 code unit length (what Telegram API uses)
+ * Emojis like 😀 = 2 units, regular chars = 1 unit
+ */
+function getUtf16Length(str) {
+  let length = 0;
+  for (const char of str) {
+    // Characters outside BMP (>U+FFFF) take 2 UTF-16 code units
+    length += char.codePointAt(0) > 0xFFFF ? 2 : 1;
+  }
+  return length;
+}
+
+/**
+ * Main function: Replace emojis with custom emoji entities
+ * @param {string} text - Original text with emojis
+ * @param {Object} emojiMap - Map of emoji -> custom_emoji_id
+ * @param {Object} options - { stripOriginal: true, skipUnmapped: true }
+ * @returns {{ text: string, entities: Array }}
+ */
 function emo(text, emojiMap, options = {}) {
   const { stripOriginal = true, skipUnmapped = true } = options;
-
   const entities = [];
   let out = '';
-  let offset = 0;
+  let outOffset = 0; // Current UTF-16 offset in output string
 
   for (const { segment } of segmenter.segment(text)) {
     const id = emojiMap[segment];
-
+    
     if (id) {
+      // This emoji has a custom replacement
       if (stripOriginal) {
-        out += '▫️'; // placeholder
+        // Replace with invisible placeholder (1 UTF-16 unit)
+        out += '\u200B'; // Zero-width space
         entities.push({
           type: 'custom_emoji',
-          offset,
+          offset: outOffset,
           length: 1,
           custom_emoji_id: id
         });
-        offset += 1;
+        outOffset += 1;
       } else {
+        // Keep original emoji and add custom entity over it
         out += segment;
+        const segmentUtf16Length = getUtf16Length(segment);
         entities.push({
           type: 'custom_emoji',
-          offset,
-          length: 1,
+          offset: outOffset,
+          length: segmentUtf16Length,
           custom_emoji_id: id
         });
-        offset += segment.length;
+        outOffset += segmentUtf16Length;
       }
     } else {
+      // Not in map
       if (!skipUnmapped || !isEmo(segment)) {
+        // Keep this segment (text, space, or unmapped emoji)
         out += segment;
-        offset += segment.length;
+        outOffset += getUtf16Length(segment);
       }
+      // If skipUnmapped=true and it's an emoji, we skip it entirely
     }
   }
 
   return { text: out, entities };
 }
 
+/**
+ * Generate entities without modifying text
+ * Useful when you want to keep original text but add custom emoji entities
+ */
 function emoEnt(text, emojiMap) {
   const entities = [];
   let offset = 0;
 
   for (const { segment } of segmenter.segment(text)) {
     if (emojiMap[segment]) {
-      entities.push({ type: 'custom_emoji', offset, length: 1, custom_emoji_id: emojiMap[segment] });
+      const segmentUtf16Length = getUtf16Length(segment);
+      entities.push({
+        type: 'custom_emoji',
+        offset,
+        length: segmentUtf16Length,
+        custom_emoji_id: emojiMap[segment]
+      });
     }
-    offset += segment.length;
+    offset += getUtf16Length(segment);
   }
 
   return entities;
 }
 
+/**
+ * Find all unique emojis in text
+ */
 function findEmo(text) {
   const set = new Set();
-
   for (const { segment } of segmenter.segment(text)) {
     if (isEmo(segment)) set.add(segment);
   }
-
   return [...set];
 }
 
+/**
+ * Validate entities array for Telegram API
+ */
 function checkEnt(entities) {
   const errors = [];
-
-  if (entities.length > 100) errors.push(`Too many entities (${entities.length})`);
-
+  
+  if (entities.length > 100) {
+    errors.push(`Too many entities (${entities.length})`);
+  }
+  
   entities.forEach((e, i) => {
-    if (e.type !== 'custom_emoji') errors.push(`Entity ${i}: invalid type`);
-    if (!e.custom_emoji_id) errors.push(`Entity ${i}: missing custom_emoji_id`);
-    if (e.length !== 1) errors.push(`Entity ${i}: length must be 1`);
-    if (typeof e.offset !== 'number' || e.offset < 0) errors.push(`Entity ${i}: invalid offset`);
+    if (e.type !== 'custom_emoji') {
+      errors.push(`Entity ${i}: invalid type`);
+    }
+    if (!e.custom_emoji_id) {
+      errors.push(`Entity ${i}: missing custom_emoji_id`);
+    }
+    if (typeof e.length !== 'number' || e.length < 1) {
+      errors.push(`Entity ${i}: length must be >= 1`);
+    }
+    if (typeof e.offset !== 'number' || e.offset < 0) {
+      errors.push(`Entity ${i}: invalid offset`);
+    }
   });
-
+  
   return { valid: errors.length === 0, errors };
 }
 
+/**
+ * Check if string contains emoji
+ */
 function isEmo(str) {
   return /\p{Extended_Pictographic}/u.test(str);
 }
 
+/**
+ * Merge and sort multiple entity arrays
+ */
 function mergeEntities(baseEntities, newEntities) {
   const all = [...baseEntities, ...newEntities];
   all.sort((a, b) => a.offset - b.offset);
@@ -106,5 +162,6 @@ module.exports = {
   findEmo,
   checkEnt,
   isEmo,
-  mergeEntities
-};
+  mergeEntities,
+  getUtf16Length
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ikemoji",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Telegram Bot API 9.4 custom emoji helper - UTF-16 correct, ZWJ/skin tone safe, Telegraf compatible",
   "main": "index.js",
   "scripts": {