Merge branch 'master' of https://github.com/FooSoft/yomichan

1 files changed, 74 insertions, 44 deletions

diff --git a/test/test-japanese.js b/test/test-japanese.js
index f4b084ac..87efdfad 100644
--- a/test/test-japanese.js
+++ b/test/test-japanese.js
@@ -176,19 +176,19 @@ function testConvertReading() {
         [['アリガトウ', 'アリガトウ', 'hiragana'], 'ありがとう'],
         [['アリガトウ', 'アリガトウ', 'katakana'], 'アリガトウ'],
         [['アリガトウ', 'アリガトウ', 'romaji'], 'arigatou'],
-        [['アリガトウ', 'アリガトウ', 'none'], null],
+        [['アリガトウ', 'アリガトウ', 'none'], ''],
         [['アリガトウ', 'アリガトウ', 'default'], 'アリガトウ'],
 
         [['ありがとう', 'ありがとう', 'hiragana'], 'ありがとう'],
         [['ありがとう', 'ありがとう', 'katakana'], 'アリガトウ'],
         [['ありがとう', 'ありがとう', 'romaji'], 'arigatou'],
-        [['ありがとう', 'ありがとう', 'none'], null],
+        [['ありがとう', 'ありがとう', 'none'], ''],
         [['ありがとう', 'ありがとう', 'default'], 'ありがとう'],
 
         [['有り難う', 'ありがとう', 'hiragana'], 'ありがとう'],
         [['有り難う', 'ありがとう', 'katakana'], 'アリガトウ'],
         [['有り難う', 'ありがとう', 'romaji'], 'arigatou'],
-        [['有り難う', 'ありがとう', 'none'], null],
+        [['有り難う', 'ありがとう', 'none'], ''],
         [['有り難う', 'ありがとう', 'default'], 'ありがとう'],
 
         // Cases with falsy readings
@@ -196,44 +196,20 @@ function testConvertReading() {
         [['ありがとう', '', 'hiragana'], ''],
         [['ありがとう', '', 'katakana'], ''],
         [['ありがとう', '', 'romaji'], 'arigatou'],
-        [['ありがとう', '', 'none'], null],
+        [['ありがとう', '', 'none'], ''],
         [['ありがとう', '', 'default'], ''],
 
-        [['ありがとう', null, 'hiragana'], ''],
-        [['ありがとう', null, 'katakana'], ''],
-        [['ありがとう', null, 'romaji'], 'arigatou'],
-        [['ありがとう', null, 'none'], null],
-        [['ありがとう', null, 'default'], null],
-
-        [['ありがとう', void 0, 'hiragana'], ''],
-        [['ありがとう', void 0, 'katakana'], ''],
-        [['ありがとう', void 0, 'romaji'], 'arigatou'],
-        [['ありがとう', void 0, 'none'], null],
-        [['ありがとう', void 0, 'default'], void 0],
-
         // Cases with falsy readings and kanji expressions
 
         [['有り難う', '', 'hiragana'], ''],
         [['有り難う', '', 'katakana'], ''],
         [['有り難う', '', 'romaji'], ''],
-        [['有り難う', '', 'none'], null],
-        [['有り難う', '', 'default'], ''],
-
-        [['有り難う', null, 'hiragana'], ''],
-        [['有り難う', null, 'katakana'], ''],
-        [['有り難う', null, 'romaji'], null],
-        [['有り難う', null, 'none'], null],
-        [['有り難う', null, 'default'], null],
-
-        [['有り難う', void 0, 'hiragana'], ''],
-        [['有り難う', void 0, 'katakana'], ''],
-        [['有り難う', void 0, 'romaji'], void 0],
-        [['有り難う', void 0, 'none'], null],
-        [['有り難う', void 0, 'default'], void 0]
+        [['有り難う', '', 'none'], ''],
+        [['有り難う', '', 'default'], '']
     ];
 
-    for (const [[expressionFragment, readingFragment, readingMode], expected] of data) {
-        assert.strictEqual(jp.convertReading(expressionFragment, readingFragment, readingMode), expected);
+    for (const [[expression, reading, readingMode], expected] of data) {
+        assert.strictEqual(jp.convertReading(expression, reading, readingMode), expected);
     }
 }
 
@@ -303,9 +279,9 @@ function testDistributeFurigana() {
             ['有り難う', 'ありがとう'],
             [
                 {text: '有', furigana: 'あ'},
-                {text: 'り'},
+                {text: 'り', furigana: ''},
                 {text: '難', furigana: 'がと'},
-                {text: 'う'}
+                {text: 'う', furigana: ''}
             ]
         ],
         [
@@ -317,23 +293,23 @@ function testDistributeFurigana() {
         [
             ['お祝い', 'おいわい'],
             [
-                {text: 'お'},
+                {text: 'お', furigana: ''},
                 {text: '祝', furigana: 'いわ'},
-                {text: 'い'}
+                {text: 'い', furigana: ''}
             ]
         ],
         [
             ['美味しい', 'おいしい'],
             [
                 {text: '美味', furigana: 'おい'},
-                {text: 'しい'}
+                {text: 'しい', furigana: ''}
             ]
         ],
         [
             ['食べ物', 'たべもの'],
             [
                 {text: '食', furigana: 'た'},
-                {text: 'べ'},
+                {text: 'べ', furigana: ''},
                 {text: '物', furigana: 'もの'}
             ]
         ],
@@ -341,9 +317,9 @@ function testDistributeFurigana() {
             ['試し切り', 'ためしぎり'],
             [
                 {text: '試', furigana: 'ため'},
-                {text: 'し'},
+                {text: 'し', furigana: ''},
                 {text: '切', furigana: 'ぎ'},
-                {text: 'り'}
+                {text: 'り', furigana: ''}
             ]
         ],
         // Ambiguous
@@ -373,16 +349,16 @@ function testDistributeFuriganaInflected() {
             ['美味しい', 'おいしい', '美味しかた'],
             [
                 {text: '美味', furigana: 'おい'},
-                {text: 'し'},
-                {text: 'かた'}
+                {text: 'し', furigana: ''},
+                {text: 'かた', furigana: ''}
             ]
         ],
         [
             ['食べる', 'たべる', '食べた'],
             [
                 {text: '食', furigana: 'た'},
-                {text: 'べ'},
-                {text: 'た'}
+                {text: 'べ', furigana: ''},
+                {text: 'た', furigana: ''}
             ]
         ]
     ];
@@ -393,6 +369,59 @@ function testDistributeFuriganaInflected() {
     }
 }
 
+function testCollapseEmphaticSequences() {
+    const data = [
+        [['かこい', false], ['かこい', [1, 1, 1]]],
+        [['かこい', true], ['かこい', [1, 1, 1]]],
+        [['かっこい', false], ['かっこい', [1, 1, 1, 1]]],
+        [['かっこい', true], ['かこい', [2, 1, 1]]],
+        [['かっっこい', false], ['かっこい', [1, 2, 1, 1]]],
+        [['かっっこい', true], ['かこい', [3, 1, 1]]],
+        [['かっっっこい', false], ['かっこい', [1, 3, 1, 1]]],
+        [['かっっっこい', true], ['かこい', [4, 1, 1]]],
+
+        [['こい', false], ['こい', [1, 1]]],
+        [['こい', true], ['こい', [1, 1]]],
+        [['っこい', false], ['っこい', [1, 1, 1]]],
+        [['っこい', true], ['こい', [2, 1]]],
+        [['っっこい', false], ['っこい', [2, 1, 1]]],
+        [['っっこい', true], ['こい', [3, 1]]],
+        [['っっっこい', false], ['っこい', [3, 1, 1]]],
+        [['っっっこい', true], ['こい', [4, 1]]],
+
+        [['すごい', false], ['すごい', [1, 1, 1]]],
+        [['すごい', true], ['すごい', [1, 1, 1]]],
+        [['すごーい', false], ['すごーい', [1, 1, 1, 1]]],
+        [['すごーい', true], ['すごい', [1, 2, 1]]],
+        [['すごーーい', false], ['すごーい', [1, 1, 2, 1]]],
+        [['すごーーい', true], ['すごい', [1, 3, 1]]],
+        [['すっごーい', false], ['すっごーい', [1, 1, 1, 1, 1]]],
+        [['すっごーい', true], ['すごい', [2, 2, 1]]],
+        [['すっっごーーい', false], ['すっごーい', [1, 2, 1, 2, 1]]],
+        [['すっっごーーい', true], ['すごい', [3, 3, 1]]],
+
+        [['', false], ['', []]],
+        [['', true], ['', []]],
+        [['っ', false], ['っ', [1]]],
+        [['っ', true], ['', [1]]],
+        [['っっ', false], ['っ', [2]]],
+        [['っっ', true], ['', [2]]],
+        [['っっっ', false], ['っ', [3]]],
+        [['っっっ', true], ['', [3]]]
+    ];
+
+    for (const [[text, fullCollapse], [expected, expectedSourceMapping]] of data) {
+        const sourceMap = new TextSourceMap(text);
+        const actual1 = jp.collapseEmphaticSequences(text, fullCollapse, null);
+        const actual2 = jp.collapseEmphaticSequences(text, fullCollapse, sourceMap);
+        assert.strictEqual(actual1, expected);
+        assert.strictEqual(actual2, expected);
+        if (typeof expectedSourceMapping !== 'undefined') {
+            assert.ok(sourceMap.equals(new TextSourceMap(text, expectedSourceMapping)));
+        }
+    }
+}
+
 function testIsMoraPitchHigh() {
     const data = [
         [[0, 0], false],
@@ -462,6 +491,7 @@ function main() {
     testConvertAlphabeticToKana();
     testDistributeFurigana();
     testDistributeFuriganaInflected();
+    testCollapseEmphaticSequences();
     testIsMoraPitchHigh();
     testGetKanaMorae();
 }