natural 8.1.1 → 8.2.0

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/.github/workflows/npm-publish.yml

@@ -6,6 +6,7 @@ name: Node.js Package
 on:
   release:
     types: [created]
+  workflow_dispatch:
 
 jobs:
   build:
@@ -27,10 +28,17 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
           registry-url: https://registry.npmjs.org/
+      - name: Install npm with stage support
+        run: npm install -g npm@^11.15.0
+      - name: Verify Node/npm support for stage
+        run: |
+          node -v
+          npm -v
+          npm help stage
       - run: npm ci
       - run: git config user.name "$GITHUB_ACTOR"
-      - run: npm publish
+      - run: npm stage publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_SECRET}}

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/lib/natural/util/storage/StorageBackend.js

@@ -20,12 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-const PostgresPlugin = require('./Postgres')
-const MongoDBPlugin = require('./MongoDB')
-const RedisPlugin = require('./Redis')
-const MemcachedPlugin = require('./Memcached')
-const FilePlugin = require('./File')
-
 // Enum for different types of storage backends that can be used
 const STORAGE_TYPES = {
   POSTGRES: 'POSTGRES',
@@ -49,6 +43,8 @@ class StorageBackend {
   }
 
   // Sets the storage type. Valid values are POSTGRES, REDIS, MONGODB, MEMCACHED, FILE
+  // Storage plugins are loaded on demand to avoid pulling in database drivers
+  // and their dependencies for users who only need NLP features.
   async setStorageType (storageType) {
     if (!storageType) {
       throw new Error('No storage type specified')
@@ -58,22 +54,32 @@ class StorageBackend {
     }
     this.storageType = storageType
     switch (storageType) {
-      case STORAGE_TYPES.POSTGRES:
+      case STORAGE_TYPES.POSTGRES: {
+        const PostgresPlugin = require('./Postgres')
         this.client = new PostgresPlugin()
         await this.client.configPostgres()
         break
-      case STORAGE_TYPES.REDIS:
+      }
+      case STORAGE_TYPES.REDIS: {
+        const RedisPlugin = require('./Redis')
         this.client = new RedisPlugin()
         break
-      case STORAGE_TYPES.MONGODB:
+      }
+      case STORAGE_TYPES.MONGODB: {
+        const MongoDBPlugin = require('./MongoDB')
         this.client = new MongoDBPlugin()
         break
-      case STORAGE_TYPES.MEMCACHED:
+      }
+      case STORAGE_TYPES.MEMCACHED: {
+        const MemcachedPlugin = require('./Memcached')
         this.client = new MemcachedPlugin()
         break
-      case STORAGE_TYPES.FILE:
+      }
+      case STORAGE_TYPES.FILE: {
+        const FilePlugin = require('./File')
         this.client = new FilePlugin()
         break
+      }
       default:
         throw new Error('Invalid storage type')
     }

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.1",
+  "version": "8.2.0",
   "homepage": "https://github.com/NaturalNode/natural",
   "repository": {
     "type": "git",