Merge pull request #78 from atom-community/bug-fix

Author: aminya

src/TreeFilterer.h

@@ -56,6 +56,10 @@ class TreeFilterer {
 
 
         if (keepReference) {
+            if (candidates_view != nullptr) {
+                // release the already kept reference
+                candidates_view.Unref();
+            }
             // store a view of candidates in case filter was called
             candidates_view = get_ref<ReferenceType, ArrayType>(candidates_);
         }
@@ -135,10 +139,19 @@ class TreeFilterer {
                 if (i_parent_index < parent_indices_len) {
                     const auto parent_index = parent_indices[i_parent_index];
                     // for each parent index get the original object at that index
+                    // BUG this check shouldn't be required
+                    if (parent_index >= get_size(temp_children)) {
+                        continue;
+                    }
+                    assert(parent_index < get_size(temp_children));
                     temp_parent = get_at<ArrayType, NodeType>(temp_children, parent_index);
                     // update the children for the next iteration
                     temp_children = get_children<NodeType, ArrayType, AllocatorType>(temp_parent, children_key, env);
                 } else {
+                    // BUG this check shouldn't be required
+                    if (index >= get_size(temp_children)) {
+                        continue;
+                    }
                     assert(i_parent_index == parent_indices_len);
                     assert(index < get_size(temp_children));
                     // once parent indices finished, we get the index instead of the last parent

src/binding/binding.ts

@@ -67,7 +67,7 @@ export function validate_filterTree(...args: Parameters<Zadeh["filterIndicesTree
 }
 
 export function validate_setTreeFiltererCandidates(...args: Parameters<Zadeh["setTreeFiltererCandidates"]>) {
-  if (!Array.isArray(args[0])) {
+  if (!(Array.isArray(args[0]) && typeof args[1] === "string" && typeof args[2] === "string")) {
     throw new Error(`Invalid arguments for setTreeFiltererCandidates: ${args}`)
   }
 }

src/binding/index.ts

@@ -222,6 +222,10 @@ export class ObjectArrayFilterer<DataKey extends string | number = string> {
     const useExtensionBonus = Boolean(options.useExtensionBonus)
 
     Binding.validate_filter(query, maxResult, usePathScoring, useExtensionBonus)
+    if (query.length === 0) {
+      // optimization for query === ""
+      return []
+    }
     // NOTE calling obj.filter is slower than (obj.filterIndices then map) due to the interop overhead
     return this.obj.filterIndices(query, maxResult, usePathScoring, useExtensionBonus)
   }
@@ -356,6 +360,10 @@ export class TreeFilterer<DataKey extends string = string, ChildrenKey extends s
     const useExtensionBonus = Boolean(options.useExtensionBonus)
 
     Binding.validate_filterTree(query, maxResult, usePathScoring, useExtensionBonus)
+    if (query.length === 0) {
+      // optimization for query === ""
+      return []
+    }
     return this.obj.filterTree(query, maxResult, usePathScoring, useExtensionBonus)
   }
 
@@ -369,6 +377,10 @@ export class TreeFilterer<DataKey extends string = string, ChildrenKey extends s
    */
   filterIndices(query: string, options: TreeFilterOptions = {}): TreeFilterIndicesResult[] {
     parseOptions(options)
+    if (query.length === 0) {
+      // optimization for query === ""
+      return []
+    }
     return this.obj.filterIndicesTree(
       query,
       options.maxResults ?? 0,