natural 8.1.2 → 8.2.1

package/.github/workflows/node.js.yml

@@ -74,6 +74,7 @@ jobs:
 
       # Save coverage report in Coveralls
       - name: Coveralls
-        uses: coverallsapp/github-action@master
+        if: matrix.node-version == '22.x'
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

package/lib/natural/distance/levenshtein_distance.js

@@ -153,6 +153,7 @@ function levenshteinDistance (source, target, options) {
 
   let lastColMatch = null
   for (let row = 1; row <= sourceLength; row++) {
+    const sourceElement = source[row - 1]
     if (isUnrestrictedDamerau) {
       lastColMatch = null
     }
@@ -160,7 +161,6 @@ function levenshteinDistance (source, target, options) {
       const costToInsert = distanceMatrix[row][column - 1].cost + options.insertion_cost
       const costToDelete = distanceMatrix[row - 1][column].cost + options.deletion_cost
 
-      const sourceElement = source[row - 1]
       const targetElement = target[column - 1]
       let costToSubstitute = distanceMatrix[row - 1][column - 1].cost
       if (sourceElement !== targetElement) {
@@ -218,13 +218,13 @@ function levenshteinDistance (source, target, options) {
 
       distanceMatrix[row][column] = { cost: minCostParent.cost, parentCell: minCostParent.coordinates }
 
-      if (isUnrestrictedDamerau) {
-        lastRowMap[sourceElement] = row
-        if (sourceElement === targetElement) {
-          lastColMatch = column
-        }
+      if (isUnrestrictedDamerau && sourceElement === targetElement) {
+        lastColMatch = column
       }
     }
+    if (isUnrestrictedDamerau) {
+      lastRowMap[sourceElement] = row
+    }
   }
 
   if (!options.search) {

package/lib/natural/trie/trie.js

@@ -46,23 +46,21 @@ class Trie {
       string = string.toLowerCase()
     }
 
-    // If the string has only one letter, mark this as a word.
-    if (string.length === 0) {
-      const wasWord = this.$
-      this.$ = true
-      return wasWord
-    }
-
-    // Make sure theres a Trie node in our dictionary
-    let next = this.dictionary[string[0]]
+    const caseSensitive = this.cs
+    let node = this
 
-    if (!next) {
-      this.dictionary[string[0]] = new Trie(this.cs)
-      next = this.dictionary[string[0]]
+    for (let index = 0, length = string.length; index < length; index++) {
+      const character = string[index]
+      let next = node.dictionary[character]
+      if (!next) {
+        node.dictionary[character] = next = new Trie(caseSensitive)
+      }
+      node = next
     }
 
-    // Continue adding the string
-    return next.addString(string.substring(1))
+    const wasWord = node.$
+    node.$ = true
+    return wasWord
   }
 
   /**
@@ -94,9 +92,11 @@ class Trie {
     }
 
     function get (node, word) {
-      if (!node) return null
-      if (word.length === 0) return node
-      return get(node.dictionary[word[0]], word.substring(1))
+      for (let index = 0, length = word.length; index < length; index++) {
+        if (!node) return null
+        node = node.dictionary[word[index]]
+      }
+      return node || null
     }
 
     function recurse (node, stringAgg, resultsAgg) {
@@ -130,21 +130,15 @@ class Trie {
       string = string.toLowerCase()
     }
 
-    if (string.length === 0) {
-      return this.$
-    }
-
-    // Otherwise, we need to continue searching
-    const firstLetter = string[0]
-    const next = this.dictionary[firstLetter]
-
-    // If we don't have a node, this isn't a word
-    if (!next) {
-      return false
+    let node = this
+    for (let index = 0, length = string.length; index < length; index++) {
+      node = node.dictionary[string[index]]
+      if (!node) {
+        return false
+      }
     }
 
-    // Otherwise continue the search at the next node
-    return next.contains(string.substring(1))
+    return node.$
   }
 
   /**
@@ -161,26 +155,27 @@ class Trie {
       search = search.toLowerCase()
     }
 
-    function recurse (node, search, stringAgg, resultsAgg) {
+    const results = []
+    let node = this
+    const length = search.length
+
+    for (let index = 0; ; index++) {
       // Check if this is a word.
       if (node.$) {
-        resultsAgg.push(stringAgg)
+        results.push(search.slice(0, index))
       }
 
       // Check if the have completed the seearch
-      if (search.length === 0) {
-        return resultsAgg
+      if (index === length) {
+        return results
       }
 
       // Otherwise, continue searching
-      const next = node.dictionary[search[0]]
-      if (!next) {
-        return resultsAgg
+      node = node.dictionary[search[index]]
+      if (!node) {
+        return results
       }
-      return recurse(next, search.substring(1), stringAgg + search[0], resultsAgg)
-    };
-
-    return recurse(this, search, '', [])
+    }
   }
 
   /**
@@ -192,26 +187,33 @@ class Trie {
       search = search.toLowerCase()
     }
 
-    function recurse (node, search, stringAgg, lastWord) {
+    let node = this
+    let lastWordIndex = null
+    const length = search.length
+
+    for (let index = 0; ; index++) {
       // Check if this is a word
       if (node.$) {
-        lastWord = stringAgg
+        lastWordIndex = index
       }
 
       // Check if we have no more to search
-      if (search.length === 0) {
-        return [lastWord, search]
+      if (index === length) {
+        return [
+          lastWordIndex === null ? null : search.slice(0, lastWordIndex),
+          ''
+        ]
       }
 
       // Continue searching
-      const next = node.dictionary[search[0]]
-      if (!next) {
-        return [lastWord, search]
+      node = node.dictionary[search[index]]
+      if (!node) {
+        return [
+          lastWordIndex === null ? null : search.slice(0, lastWordIndex),
+          search.slice(index)
+        ]
       }
-      return recurse(next, search.substring(1), stringAgg + search[0], lastWord)
-    };
-
-    return recurse(this, search, '', null)
+    }
   }
 
   /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "natural",
   "description": "General natural language (tokenizing, stemming (English, Russian, Spanish), part-of-speech tagging, sentiment analysis, classification, inflection, phonetics, tfidf, WordNet, jaro-winkler, Levenshtein distance, Dice's Coefficient) facilities for node.",
-  "version": "8.1.2",
+  "version": "8.2.1",
   "homepage": "https://github.com/NaturalNode/natural",
   "repository": {
     "type": "git",