Skip to content

Fix moby.search() with reserved words #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nordth wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix moby.search() with reserved words #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4048a7f
Fix moby.search() with reserved words
Nordth Nov 20, 2018
11af5e2
Fix moby.search() and moby.reverseSearch()
Nordth Nov 20, 2018
d4f8962
Fix: Unnecessary escape character: \-.
Nordth Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ var fs = require('fs')
var path = require('path')
var thesaurus = require('thesaurus')
var union = require('lodash.union')
var words = {}
var firstWordRegex = new RegExp(/^([\w\-]+),/)
var words = new Map()
var firstWordRegex = new RegExp(/^([\w-]+),/)
var moby = module.exports = {}

fs.readFileSync(path.join(__dirname, 'words.txt'))
.toString()
.split('\n')
.forEach(function (line) {
if (line.match(firstWordRegex)) {
words[line.match(firstWordRegex)[1]] = line.replace(firstWordRegex, '')
words.set(line.match(firstWordRegex)[1], line.replace(firstWordRegex, ''))
}
})

moby.search = function (term) {
if (!term) return []
var result = words[term]
if (!result) result = words[term.toLowerCase()]
var result = words.get(term)
if (!result) result = words.get(term.toLowerCase())
if (!result) return []
result = result.split(',')
result = union(result, thesaurus.find(term))
Expand All @@ -29,8 +29,8 @@ moby.search = function (term) {

moby.reverseSearch = function (term) {
if (!term) return []
return Object.keys(words).filter(function (w) {
return words[w].match(new RegExp(',' + term + ',', 'i'))
return Array.from(words.keys()).filter(function (w) {
return words.get(w).match(new RegExp(',' + term + ',', 'i'))
})
}

Expand Down