Merge pull request #21 from TwilioDevEd/fix-triple-accents

TwilioDevEd · Jan 13, 2023 · 231a006 · 231a006
2 parents 8bc6c58 + 30cb849
commit 231a006
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/dist/libs/EncodedChar.js b/dist/libs/EncodedChar.js
diff --git a/dist/libs/EncodedChar.js.map b/dist/libs/EncodedChar.js.map
diff --git a/docs/scripts/segmentsCalculator.js b/docs/scripts/segmentsCalculator.js
diff --git a/src/libs/EncodedChar.ts b/src/libs/EncodedChar.ts
@@ -21,7 +21,7 @@ class EncodedChar {
   constructor(char: string, encoding: 'GSM-7' | 'UCS-2') {
     this.raw = char;
     this.encoding = encoding;
-    this.isGSM7 = Boolean(char && UnicodeToGsm[char.charCodeAt(0)]);
+    this.isGSM7 = Boolean(char && char.length === 1 && UnicodeToGsm[char.charCodeAt(0)]);
     if (this.isGSM7) {
       this.codeUnits = UnicodeToGsm[char.charCodeAt(0)];
     } else {

diff --git a/tests/index.test.js b/tests/index.test.js
@@ -1,3 +1,4 @@
+const expectExport = require('expect');
 const { SegmentedMessage } = require('../dist');
 const SmartEncodingMap = require('../dist/libs/SmartEncodingMap').default;
 
@@ -215,4 +216,24 @@ describe('Line break styles tests', () => {
     const segmentedMessage = new SegmentedMessage(testMessage);
     expect(segmentedMessage.numberOfCharacters).toBe(12);
   });
+
+  test('Triple accents characters - Unicode test', () => {
+    const testMessage = 'é́́';
+    const segmentedMessage = new SegmentedMessage(testMessage);
+    expect(segmentedMessage.numberOfCharacters).toBe(1);
+    expect(segmentedMessage.numberOfUnicodeScalars).toBe(4);
+  });
+
+  // Test for https://github.com/TwilioDevEd/message-segment-calculator/issues/17
+  test('Triple accents characters - One Segment test', () => {
+    const testMessage = 'é́́aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+    const segmentedMessage = new SegmentedMessage(testMessage);
+    expect(segmentedMessage.segmentsCount).toBe(1);
+  });
+
+  test('Triple accents characters - Two Segments test', () => {
+    const testMessage = 'é́́aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+    const segmentedMessage = new SegmentedMessage(testMessage);
+    expect(segmentedMessage.segmentsCount).toBe(2);
+  });
 });