Update spatial queries

Author: abnegate

src/query.ts

@@ -1,5 +1,5 @@
 type QueryTypesSingle = string | number | boolean;
-export type QueryTypesList = string[] | number[] | boolean[] | Query[];
+export type QueryTypesList = string[] | number[] | boolean[] | Query[] | any[];
 export type QueryTypes = QueryTypesSingle | QueryTypesList;
 type AttributesTypes = string | string[];
 
@@ -33,10 +33,10 @@ export class Query {
     });
   }
 
-  static equal = (attribute: string, value: QueryTypes): string =>
+  static equal = (attribute: string, value: QueryTypes | any[]): string =>
     new Query("equal", attribute, value).toString();
 
-  static notEqual = (attribute: string, value: QueryTypes): string =>
+  static notEqual = (attribute: string, value: QueryTypes | any[]): string =>
     new Query("notEqual", attribute, value).toString();
 
   static lessThan = (attribute: string, value: QueryTypes): string =>
@@ -97,7 +97,7 @@ export class Query {
    * @param {string | string[]} value
    * @returns {string}
    */
-  static contains = (attribute: string, value: string | string[]): string =>
+  static contains = (attribute: string, value: string | any[]): string =>
     new Query("contains", attribute, value).toString();
 
   /**
@@ -107,7 +107,7 @@ export class Query {
    * @param {string | string[]} value
    * @returns {string}
    */
-  static notContains = (attribute: string, value: string | string[]): string =>
+  static notContains = (attribute: string, value: string | any[]): string =>
     new Query("notContains", attribute, value).toString();
 
   /**
@@ -224,7 +224,7 @@ export class Query {
    * @returns {string}
    */
   static distanceEqual = (attribute: string, values: any[], distance: number, meters: boolean = true): string =>
-    new Query("distanceEqual", attribute, [values, distance, meters] as QueryTypesList).toString();
+    new Query("distanceEqual", attribute, [[values, distance, meters]] as QueryTypesList).toString();
 
   /**
    * Filter resources where attribute is not at a specific distance from the given coordinates.
@@ -236,7 +236,7 @@ export class Query {
    * @returns {string}
    */
   static distanceNotEqual = (attribute: string, values: any[], distance: number, meters: boolean = true): string =>
-    new Query("distanceNotEqual", attribute, [values, distance, meters] as QueryTypesList).toString();
+    new Query("distanceNotEqual", attribute, [[values, distance, meters]] as QueryTypesList).toString();
 
   /**
    * Filter resources where attribute is at a distance greater than the specified value from the given coordinates.
@@ -248,7 +248,7 @@ export class Query {
    * @returns {string}
    */
   static distanceGreaterThan = (attribute: string, values: any[], distance: number, meters: boolean = true): string =>
-    new Query("distanceGreaterThan", attribute, [values, distance, meters] as QueryTypesList).toString();
+    new Query("distanceGreaterThan", attribute, [[values, distance, meters]] as QueryTypesList).toString();
 
   /**
    * Filter resources where attribute is at a distance less than the specified value from the given coordinates.
@@ -260,7 +260,7 @@ export class Query {
    * @returns {string}
    */
   static distanceLessThan = (attribute: string, values: any[], distance: number, meters: boolean = true): string =>
-    new Query("distanceLessThan", attribute, [values, distance, meters] as QueryTypesList).toString();
+    new Query("distanceLessThan", attribute, [[values, distance, meters]] as QueryTypesList).toString();
 
   /**
    * Filter resources where attribute intersects with the given geometry.
@@ -270,7 +270,7 @@ export class Query {
    * @returns {string}
    */
   static intersects = (attribute: string, values: any[]): string =>
-    new Query("intersects", attribute, values).toString();
+    new Query("intersects", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute does not intersect with the given geometry.
@@ -280,7 +280,7 @@ export class Query {
    * @returns {string}
    */
   static notIntersects = (attribute: string, values: any[]): string =>
-    new Query("notIntersects", attribute, values).toString();
+    new Query("notIntersects", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute crosses the given geometry.
@@ -290,7 +290,7 @@ export class Query {
    * @returns {string}
    */
   static crosses = (attribute: string, values: any[]): string =>
-    new Query("crosses", attribute, values).toString();
+    new Query("crosses", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute does not cross the given geometry.
@@ -300,7 +300,7 @@ export class Query {
    * @returns {string}
    */
   static notCrosses = (attribute: string, values: any[]): string =>
-    new Query("notCrosses", attribute, values).toString();
+    new Query("notCrosses", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute overlaps with the given geometry.
@@ -310,7 +310,7 @@ export class Query {
    * @returns {string}
    */
   static overlaps = (attribute: string, values: any[]): string =>
-    new Query("overlaps", attribute, values).toString();
+    new Query("overlaps", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute does not overlap with the given geometry.
@@ -320,7 +320,7 @@ export class Query {
    * @returns {string}
    */
   static notOverlaps = (attribute: string, values: any[]): string =>
-    new Query("notOverlaps", attribute, values).toString();
+    new Query("notOverlaps", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute touches the given geometry.
@@ -330,7 +330,7 @@ export class Query {
    * @returns {string}
    */
   static touches = (attribute: string, values: any[]): string =>
-    new Query("touches", attribute, values).toString();
+    new Query("touches", attribute, [values]).toString();
 
   /**
    * Filter resources where attribute does not touch the given geometry.
@@ -340,5 +340,5 @@ export class Query {
    * @returns {string}
    */
   static notTouches = (attribute: string, values: any[]): string =>
-    new Query("notTouches", attribute, values).toString();
+    new Query("notTouches", attribute, [values]).toString();
 }