Handle falsy values

Author: doesdev

index.js

@@ -1,6 +1,30 @@
 'use strict'
 
-var leven = require('leven')
+var levenSrc = require('leven')
+
+var maxDist = function (a, b, c) {
+  var aLen = (a || '').length
+  var bLen = (b || '').length
+
+  return (aLen > bLen ? aLen : bLen) || 1
+}
+
+var leven = function (a, b) {
+  if (a === b) return 0
+  if (!a || !b) return maxDist(a, b)
+
+  return levenSrc(a, b)
+}
+
+var levSort = function (src, a, b) {
+  if (!a) return 1
+  if (!b) return -1
+
+  a = leven(src, a)
+  b = leven(src, b)
+
+  return a - b
+}
 
 var levMinInAry = function (array, src) {
   var min = 1000
@@ -19,29 +43,22 @@ var levMinInAry = function (array, src) {
 }
 
 module.exports = function (ary, src1, key1, src2, key2) {
-  return ary.sort(function (a, b) {
+  var sorted = ary.sort(function (a, b) {
     if (key1 instanceof Array) {
       var aLev = levMinInAry(key1.map(function (k) { return a[k] }), src1)
       var bLev = levMinInAry(key1.map(function (k) { return b[k] }), src1)
 
       return aLev - bLev
     }
 
-    if (!key1 && !key2) return leven(src1, a) < leven(src1, b) ? -1 : 1
-
-    if (!key2) return leven(src1, a[key1]) < leven(src1, b[key1]) ? -1 : 1
+    if (!key1 && !key2) return levSort(src1, a, b)
 
-    var score = 0
-    var a1 = leven(src1, a[key1])
-    var b1 = leven(src1, b[key1])
-    var a2 = leven(src2, a[key2])
-    var b2 = leven(src2, b[key2])
+    if (!key2) return levSort(src1, a[key1], b[key1])
 
-    if (a1 < b1) score = score - 10
-    if (a1 > b1) score = score + 10
-    if (a2 < b2) score = score - 1
-    if (a2 > b2) score = score + 1
+    var score = levSort(src1, a[key1], b[key1]) * 10
 
-    return score
+    return score + levSort(src2, a[key2], b[key2])
   })
+
+  return sorted
 }

package.json

@@ -46,7 +46,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "leven": "^2.1.0"
+    "leven": "^3.1.0"
   },
   "devDependencies": {
     "mvt": "^2.0.1"

test.js

@@ -11,6 +11,7 @@ runTests('Testing leven-sort', () => {
       'Carl Martinez',
       'Roger Davis',
       'William George',
+      null,
       'Andrew Torres',
       'Billy Campbell',
       'Alan King',
@@ -28,9 +29,10 @@ runTests('Testing leven-sort', () => {
       'William George',
       'Carl Martinez',
       'Roger Davis',
-      'Dennis Smith',
       'Benjamin Wilson',
-      'Andrew Torres'
+      'Dennis Smith',
+      'Andrew Torres',
+      null
     ]
 
     const levSorted = levenSort(nameAry, sourceName)
@@ -48,6 +50,7 @@ runTests('Testing leven-sort', () => {
       { first: 'William', last: 'George' },
       { first: 'Andrew', last: 'Torres' },
       { first: 'Billy', last: 'Campbell' },
+      { first: null, last: null },
       { first: 'Alan', last: 'King' },
       { first: 'Benjamin', last: 'Wilson' },
       { first: 'Bill', last: 'Griffin' },
@@ -60,12 +63,13 @@ runTests('Testing leven-sort', () => {
       { first: 'Billy', last: 'Griffith' },
       { first: 'Billy', last: 'Campbell' },
       { first: 'Carl', last: 'Martinez' },
-      { first: 'William', last: 'George' },
       { first: 'Alan', last: 'King' },
+      { first: 'William', last: 'George' },
       { first: 'Roger', last: 'Davis' },
       { first: 'Dennis', last: 'Smith' },
       { first: 'Andrew', last: 'Torres' },
-      { first: 'Benjamin', last: 'Wilson' }
+      { first: 'Benjamin', last: 'Wilson' },
+      { first: null, last: null }
     ]
 
     const levSorted = levenSort(nameObjAry, sourceFirst, 'first', sourceLast, 'last')
@@ -83,6 +87,7 @@ runTests('Testing leven-sort', () => {
       { first: 'Andrew', last: 'Torres' },
       { first: 'Billy', last: 'Campbell' },
       { first: 'Alan', last: 'King' },
+      { first: null, last: null },
       { first: 'Benjamin', last: 'Wilson' },
       { first: 'Bill', last: 'Griffin' },
       { first: 'Dennis', last: 'Smith' },
@@ -91,15 +96,16 @@ runTests('Testing leven-sort', () => {
 
     const expect = [
       { first: 'Bill', last: 'Griffin' },
-      { first: 'Billy', last: 'Campbell' },
       { first: 'Billy', last: 'Griffith' },
+      { first: 'Billy', last: 'Campbell' },
       { first: 'Carl', last: 'Martinez' },
       { first: 'Alan', last: 'King' },
-      { first: 'William', last: 'George' },
       { first: 'Benjamin', last: 'Wilson' },
+      { first: 'William', last: 'George' },
       { first: 'Dennis', last: 'Smith' },
       { first: 'Roger', last: 'Davis' },
-      { first: 'Andrew', last: 'Torres' }
+      { first: 'Andrew', last: 'Torres' },
+      { first: null, last: null }
     ]
 
     const levSorted = levenSort(nameObjAry, source, ['first', 'last'])