refactor: update dependencies

src/storage/elasticsearch/common.ts

@@ -24,6 +24,7 @@ import {
 // @elastic/elasticsearch package
 // tslint:disable-next-line:no-implicit-dependencies
 import {NameList} from 'elasticsearch';
+// tslint:disable-next-line:no-implicit-dependencies
 import {Polygon} from 'geojson';
 
 /**
@@ -430,7 +431,7 @@ export interface ESGeoShapeFilter {
      *
      * @see https://www.elastic.co/guide/en/elasticsearch/reference/5.6/query-dsl-geo-shape-query.html#_spatial_relations
      */
-    relation: 'intersects' | 'disjoint' | 'within' | 'contains';
+    relation?: 'intersects' | 'disjoint' | 'within' | 'contains';
 
     /**
      * Geo Shape

src/storage/elasticsearch/query.ts

@@ -27,23 +27,24 @@ import {
 } from '@openstapps/core';
 import {
   ElasticsearchConfig,
-  ESDateRange,
-  ESDateRangeFilter, ESGenericRange, ESGeoShapeFilter, ESNumericRangeFilter,
-  ESRangeFilter,
-  ScriptSort,
-} from './common';
-import {
   ESBooleanFilter,
   ESBooleanFilterArguments,
+  ESDateRange,
+  ESDateRangeFilter,
   ESFunctionScoreQuery,
   ESFunctionScoreQueryFunction,
+  ESGenericRange,
   ESGenericSort,
   ESGeoDistanceFilter,
   ESGeoDistanceFilterArguments,
   ESGeoDistanceSort,
   ESGeoDistanceSortArguments,
+  ESGeoShapeFilter,
+  ESNumericRangeFilter,
+  ESRangeFilter,
   ESTermFilter,
   ESTypeFilter,
+  ScriptSort,
 } from './common';
 
 /**
@@ -95,7 +96,7 @@ export function buildBooleanFilter(booleanFilter: SCSearchBooleanFilter): ESBool
  * @param filter A search filter for the retrieval of the data
  */
 export function buildFilter(filter: SCSearchFilter):
-  ESTermFilter | ESGeoDistanceFilter | ESBooleanFilter<unknown> | ESRangeFilter {
+  ESTermFilter | ESGeoDistanceFilter | ESGeoShapeFilter | ESBooleanFilter<unknown> | ESRangeFilter {
 
   switch (filter.type) {
     case 'value':
@@ -178,14 +179,12 @@ export function buildFilter(filter: SCSearchFilter):
 
       return dateRangeFilter;
     case 'geo':
-      const geoShapeObject: ESGeoShapeFilter = {
+      return {
         [filter.arguments.field]: {
           shape: filter.arguments.shape,
           relation: filter.arguments.spatialRelation,
         },
       };
-
-      return geoShapeObject;
   }
 }