fix(search): add support for untyped, grouped search strings

AFFECTS PACKAGES: @esri/arcgis-rest-portal ISSUES CLOSED: #544
Esri · Apr 24, 2019 · 39fc213 · 39fc213
1 parent ff90f51
commit 39fc213
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/arcgis-rest-portal/src/util/SearchQueryBuilder.ts b/packages/arcgis-rest-portal/src/util/SearchQueryBuilder.ts
@@ -137,9 +137,10 @@ export class SearchQueryBuilder implements IParamBuilder {
       );
       return this;
     }
+    this.commit();
     this.openGroups--;
     this.q += ")";
-    return this.commit();
+    return this;
   }
 
   /**

diff --git a/packages/arcgis-rest-portal/test/util/SearchQueryBuilder.test.ts b/packages/arcgis-rest-portal/test/util/SearchQueryBuilder.test.ts
@@ -16,7 +16,7 @@ describe("SearchQueryBuilder", () => {
     console.warn = originalWarn;
   });
 
-  it("should return and empty string when called with no other functions", () => {
+  it("should return an empty string when called with no other functions", () => {
     const query = new SearchQueryBuilder().toParam();
     expect(query).toEqual("");
   });
@@ -86,6 +86,19 @@ describe("SearchQueryBuilder", () => {
     expect(query).toEqual("(title:[a TO z])");
   });
 
+  it("should format a more complex group", () => {
+    const query = new SearchQueryBuilder()
+      .startGroup()
+      .match("California")
+      .or()
+      .match("recent")
+      .endGroup()
+      .and()
+      .match("fires")
+      .toParam();
+    expect(query).toEqual("(California OR recent) AND fires");
+  });
+
   it("should boost the previous search", () => {
     const query = new SearchQueryBuilder()
       .match("test")