feat(): add array attributes support

.gitignore

@@ -3,3 +3,4 @@ node_modules
 /coverage
 /dist
 /sql/Generated.sql
+.idea

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/

.nvmrc

@@ -0,0 +1 @@
+10

example/express.ts

@@ -12,6 +12,8 @@ const { TileServer } = require('../dist');
 TileServer({
   maxZoomLevel,
   attributes: ['status', 'speed'],
+  // you can use array attributes, e.g. ?statuses=busy,free
+  // arrayAttributes: ['statuses'],
   filtersToWhere: (filters = { status: undefined, speed: undefined }) => {
     // You are responsible for protecting against SQL injection in this function. Because there are many ways to filter, it depends on the filter type on how to approach this.
 
@@ -23,6 +25,12 @@ TileServer({
     if (filters.speed && ['slow', 'fast'].includes(filters.speed)) {
       whereStatements.push(`speed = '${filters.speed}'`);
     }
+
+    // just example of array attributes:
+    // if (filters.statuses) {
+    //   whereStatements.push(`statuses @> ARRAY[${filters.statuses}]`);
+    // }
+
     return whereStatements;
   },
 }).then(server => {

lib/queries/attributes.ts

@@ -22,3 +22,13 @@ export const attributesToArray = (attributes: string[]) =>
     ? ', ' +
       attributes.map((attribute) => `'${attribute}', ${attribute}`).join(', ')
     : '';
+
+export const customAttributesToArray = (attributes: string[], arrayAttrs) =>
+	attributes.length > 0
+		? ', ' +
+		attributes.map((attribute) => {
+			const value = arrayAttrs.includes(attribute) ? `array_to_string(${attribute}, ',' , '*')` : attribute;
+
+			return `'${attribute}', ${value}`
+		}).join(', ')
+		: '';

lib/queries/builder.ts

@@ -10,6 +10,7 @@ import {
   attributesFirstToSelect,
   attributesToArray,
   attributesToSelect,
+  customAttributesToArray,
 } from './attributes';
 import { defaultGetBaseQuery } from './base';
 import {
@@ -28,6 +29,7 @@ export interface ITileQueryInput extends TileRequest {
   extent: number;
   bufferSize: number;
   attributes: string[];
+  arrayAttributes: string[];
   query: string[];
   debug: boolean;
   zoomToDistance?: ZoomToDistance;
@@ -49,6 +51,7 @@ export function createQueryForTile({
   extent,
   bufferSize,
   attributes,
+  arrayAttributes,
   query,
   debug,
   zoomToDistance = defaultZoomToDistance,
@@ -104,7 +107,7 @@ export function createQueryForTile({
       geometry: 'center',
       extent,
       bufferSize,
-      attributes: attributesToArray(attributes),
+      attributes: customAttributesToArray(attributes, arrayAttributes),
     })})`
   );
 

lib/tiler.ts

@@ -14,6 +14,7 @@ export async function TileServer<T>({
   pgPoolOptions = {},
   filtersToWhere = null,
   attributes = [],
+  arrayAttributes = [],
   debug = false,
 }: TileServerConfig<T>): Promise<TileRenderer<T>> {
   const { Pool } = require('pg');
@@ -87,6 +88,7 @@ export async function TileServer<T>({
           extent,
           bufferSize,
           attributes,
+          arrayAttributes,
           query: filtersQuery,
           debug,
           zoomToDistance,

lib/types/TileServerConfig.ts

@@ -40,6 +40,11 @@ export interface TileServerConfig<T> {
    */
   attributes: string[];
 
+  /**
+   * Array type attributes
+   */
+  arrayAttributes: string[];
+
   /**
    * @description Show debug logging, default false
    */

package.json

@@ -34,7 +34,7 @@
     "ioredis": "^4.16.2",
     "jest": "^24.9.0",
     "lru-cache": "^5.1.1",
-    "pg": "^7.18.2",
+    "pg": "^8.4.1",
     "rollup": "^2.6.1",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",