Fixed #341

.gitignore

@@ -14,4 +14,6 @@ node_modules/
 package-lock.json
 
 # Filter test runner
-runner.js
+runner.js
+
+perf/

dist/fuse.d.ts

@@ -29,6 +29,7 @@ declare class Fuse<T, O extends Fuse.FuseOptions<T>> {
       )
 
   setCollection(list: ReadonlyArray<T>): ReadonlyArray<T>;
+  list: ReadonlyArray<T>
 }
 
 declare namespace Fuse {

package.json

@@ -15,6 +15,7 @@
   "homepage": "http://fusejs.io",
   "keywords": [
     "fuzzy",
+    "search",
     "bitap"
   ],
   "main": "dist/fuse.js",
@@ -48,5 +49,6 @@
   },
   "files": [
     "dist/"
-  ]
+  ],
+  "dependencies": {}
 }

release.sh

@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+
+version='';
+re="\"(version)\": \"([^\"]*)\"";
+
+while read -r l; do
+    if [[ $l =~ $re ]]; then
+        value="${BASH_REMATCH[2]}";
+        version="$value";
+    fi
+done < package.json;
+
+echo $version;
+
+file_has_changed () {
+  if [ ! -f $1 ]; then
+    return 1
+  fi
+
+  for f in `git ls-files --modified`; do
+    [[ "$f" == "$1" ]] && return 0
+  done
+
+  return 1
+}
+
+version_is_unique () {
+  for v in `git tag -l`; do
+    [[ "$v" == "v$1" ]] && return 1
+  done
+
+  return 0
+}
+
+on_master_branch () {
+  [[ $(git symbolic-ref --short -q HEAD) == "master" ]] && return 0
+  return 1
+}
+
+# version=$(cat VERSION)
+previous_version=$(git describe --abbrev=0)
+
+if ! on_master_branch; then
+  echo -e "\033[0;31mRefusing to release from non master branch.\033[0m"
+  exit 1
+fi
+
+if ! file_has_changed "VERSION"; then
+  echo -e "\033[0;31mRefusing to release because VERSION has not changed.\033[0m"
+  exit 1
+fi
+
+if ! file_has_changed "CHANGELOG.md"; then
+  echo -e "\033[0;31mRefusing to release because CHANGELOG.md has not been updated.\033[0m"
+  exit 1
+fi
+
+if ! file_has_changed "package.json"; then
+  echo -e "\033[0;31mRefusing to release because package.json has not been updated.\033[0m"
+  exit 1
+fi
+
+if ! version_is_unique $version; then
+  echo -e "\033[0;31mRefusing to release because VERSION is not unique.\033[0m"
+  exit 1
+fi
+
+echo -e "\033[1mAbout to release v$version with the following changes:\033[0m"
+git log --date=short --pretty=format:"%ad %h%x09%an%x09%s" $previous_version..HEAD
+
+echo
+
+echo -e "\033[1mThe following files will be part of the release commit:\033[0m"
+git ls-files --modified
+
+echo
+
+read -e -p "Are you sure you want to release? " -n 1 -r
+echo
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+  echo -e "\033[0;32mReleasing...\033[0m"
+  echo
+  # yarn build
+  # git commit -a -m "Build version $version"
+  # git tag -a v$version -m "Version $version"
+  # git push origin master
+  # git push --tags
+
+  # npm publish
+else
+  echo -e "\033[0;31mCancelling...\033[0m"
+fi

src/bitap/bitap_search.js

@@ -1,7 +1,7 @@
 const bitapScore = require('./bitap_score')
 const matchedIndices = require('./bitap_matched_indices')
 
-module.exports = (text, pattern, patternAlphabet, { location = 0, distance = 100, threshold = 0.6, findAllMatches = false, minMatchCharLength = 1 }) => {
+module.exports = (text, pattern, patternAlphabet, { location = 0, distance = 100, threshold = 0.6, findAllMatches = false, minMatchCharLength = 1, includeMatches = false }) => {
   const expectedLocation = location
   // Set starting location at beginning text and initialize the alphabet.
   const textLen = text.length
@@ -135,21 +135,22 @@ module.exports = (text, pattern, patternAlphabet, { location = 0, distance = 100
       distance
     })
 
-    //console.log('score', score, finalScore)
-
     if (score > currentThreshold) {
       break
     }
 
     lastBitArr = bitArr
   }
 
-  //console.log('FINAL SCORE', finalScore)
-
   // Count exact matches (those with a score of 0) to be "almost" exact
-  return {
+  let _res = {
     isMatch: bestLocation >= 0,
     score: finalScore === 0 ? 0.001 : finalScore,
-    matchedIndices: matchedIndices(matchMask, minMatchCharLength)
   }
+
+  if (includeMatches) {
+    _res.matchedIndices = matchedIndices(matchMask, minMatchCharLength)
+  }
+
+  return _res
 }

src/bitap/index.js

@@ -25,7 +25,9 @@ class Bitap {
     // match is found before the end of the same input.
     findAllMatches = false,
     // Minimum number of characters that must be matched before a result is considered a match
-    minMatchCharLength = 1
+    minMatchCharLength = 1,
+
+    includeMatches = false
   }) {
     this.options = {
       location,
@@ -35,31 +37,39 @@ class Bitap {
       isCaseSensitive,
       tokenSeparator,
       findAllMatches,
+      includeMatches,
       minMatchCharLength
     }
 
-    this.pattern = this.options.isCaseSensitive ? pattern : pattern.toLowerCase()
+    this.pattern = isCaseSensitive ? pattern : pattern.toLowerCase()
 
     if (this.pattern.length <= maxPatternLength) {
       this.patternAlphabet = patternAlphabet(this.pattern)
     }
   }
 
   search (text) {
-    if (!this.options.isCaseSensitive) {
+    const { isCaseSensitive, includeMatches } = this.options
+
+    if (!isCaseSensitive) {
       text = text.toLowerCase()
     }
 
     // Exact match
     if (this.pattern === text) {
-      return {
+      let result = {
         isMatch: true,
-        score: 0,
-        matchedIndices: [[0, text.length - 1]]
+        score: 0
+      }
+
+      if (includeMatches) {
+        result.matchedIndices = [[0, text.length - 1]]
       }
+
+      return result
     }
 
-    // When pattern length is greater than the machine word length, just do a a regex comparison
+    // When pattern length is greater than the machine word length, just do a regex comparison
     const { maxPatternLength, tokenSeparator } = this.options
     if (this.pattern.length > maxPatternLength) {
       return bitapRegexSearch(text, this.pattern, tokenSeparator)
@@ -72,13 +82,10 @@ class Bitap {
       distance,
       threshold,
       findAllMatches,
-      minMatchCharLength
+      minMatchCharLength,
+      includeMatches
     })
   }
 }
 
-// let x = new Bitap("od mn war", {})
-// let result = x.search("Old Man's War")
-// console.log(result)
-
 module.exports = Bitap