Fix caps, keyboard group logic

Closes GH-37. Closes GH-39. Closes GH-41.
wooorm · Jan 17, 2021 · 9c002d2 · 9c002d2
1 parent bd92048
commit 9c002d2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/lib/suggest.js b/lib/suggest.js
@@ -18,6 +18,7 @@ function suggest(value) {
   var replacementTable = self.replacementTable
   var conversion = self.conversion
   var groups = self.flags.KEY
+  var charAdded = {}
   var suggestions = []
   var weighted = {}
   var memory
@@ -77,8 +78,12 @@ function suggest(value) {
 
   while (++index < length) {
     character = value.charAt(index)
+    before = value.slice(0, index)
+    after = value.slice(index + 1)
     insensitive = character.toLowerCase()
     upper = insensitive !== character
+    charAdded = {}
+
     offset = -1
     count = groups.length
 
@@ -90,15 +95,19 @@ function suggest(value) {
         continue
       }
 
-      before = value.slice(0, position)
-      after = value.slice(position + 1)
       otherOffset = -1
       otherCount = group.length
 
       while (++otherOffset < otherCount) {
         if (otherOffset !== position) {
           otherCharacter = group.charAt(otherOffset)
 
+          if (charAdded[otherCharacter]) {
+            continue
+          }
+
+          charAdded[otherCharacter] = true
+
           if (upper) {
             otherCharacter = otherCharacter.toUpperCase()
           }

diff --git a/test/index.js b/test/index.js
@@ -257,13 +257,13 @@ test('NSpell()', function (t) {
 
     st.deepEqual(
       us.suggest('propper'),
-      ['dropper', 'proper', 'cropper', 'popper', 'propped', 'prosper'],
+      ['proper', 'propped', 'cropper', 'dropper', 'popper', 'prosper'],
       'should suggest alternatives'
     )
 
     st.deepEqual(
       us.suggest('Ghandi'),
-      ['shandy', 'Brandi', 'Ghana', 'Grand', 'Grandee', 'Grands', 'handy'],
+      ['Brandi', 'Ghana', 'Grandee', 'Shanxi', 'hand', 'hands', 'handy'],
       'should suggest alternatives'
     )
 
@@ -301,7 +301,7 @@ test('NSpell()', function (t) {
 
     st.deepEqual(
       us.suggest('collor'),
-      ['color', 'collar', 'colloq'],
+      ['color', 'colloq', 'collar'],
       'should suggest removals'
     )
 
@@ -478,17 +478,17 @@ test('NSpell()', function (t) {
     st.deepEqual(
       us.suggest('dont'),
       [
-        'dent',
         'cont',
         'font',
-        'wont',
+        'dent',
         'dint',
+        'done',
+        'dong',
+        'wont',
         'dolt',
         'don',
         "don't",
         'dona',
-        'done',
-        'dong',
         'dons',
         'dost',
         'dot',
@@ -499,6 +499,12 @@ test('NSpell()', function (t) {
       'should suggest alternatives including correct conjunction'
     )
 
+    st.deepEqual(
+      us.suggest('TODO'),
+      [`DODO`, `TOD`, `TODD`, `TOGO`, `TOJO`, `TOO`, `TOTO`],
+      'should suggest alternatives for uppercase input'
+    )
+
     st.end()
   })